Merge branch 'moa-2.1-Snapshot'

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
	pom.xml

1 files changed, 19 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/CPEPS.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/CPEPS.java
index 6e67b4219..3f4be5093 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/CPEPS.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/CPEPS.java
@@ -45,6 +45,8 @@ public class CPEPS {
 	/**  URL of C-PEPS */

 	private URL pepsURL;

 	

+	private Boolean isXMLSignatureSupported;

+

 	/** Specific attributes to be requested for this C-PEPS */

 	private List<RequestedAttribute> countrySpecificRequestedAttributes = new ArrayList<RequestedAttribute>();

 	

@@ -53,10 +55,11 @@ public class CPEPS {
 	 * @param countryCode ISO Country Code of C-PEPS

 	 * @param pepsURL URL of C-PEPS

 	 */

-	public CPEPS(String countryCode, URL pepsURL) {

+	public CPEPS(String countryCode, URL pepsURL, Boolean isXMLSignatureSupported) {

 		super();

 		this.countryCode = countryCode;

 		this.pepsURL = pepsURL;

+		this.isXMLSignatureSupported = isXMLSignatureSupported;

 	}

 

 	/**

@@ -92,6 +95,21 @@ public class CPEPS {
 	}

 

 	/**

+	 * Returns weather the C-PEPS supports XMl Signatures or not (important for ERnB)

+	 */

+	public Boolean isXMLSignatureSupported() {

+		return isXMLSignatureSupported;

+	}

+

+	/**

+	 * Sets weather the C-PEPS supports XMl Signatures or not (important for ERnB)

+	 * @param isXMLSignatureSupported C-PEPS XML Signature support

+	 */

+	public void setXMLSignatureSupported(boolean isXMLSignatureSupported) {

+		this.isXMLSignatureSupported = isXMLSignatureSupported;

+	}

+	

+	/**

 	 * Gets the country specific attributes of this C-PEPS

 	 * @return List of country specific attributes

 	 */