Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	pom.xml

1 files changed, 20 insertions, 1 deletions

diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
index 09069ac7f..d6c14fd07 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
@@ -182,6 +182,26 @@ public class Configuration {
 		return Boolean.parseBoolean(props.getProperty("general.login.pvp2.binding.resp.redirect", "false"));
 	}
 	
+
+	public boolean setAuthnContextClassRef() {
+		return Boolean.parseBoolean(props.getProperty("general.login.pvp2.req.set.authncontextclassref", "true"));
+	}
+	
+	public String getAuthnContextClassRefValue() {
+		return props.getProperty("general.login.pvp2.req.authncontextclassref.value");
+		
+	}
+	
+	public String getScopeRequesterId() {
+		return props.getProperty("general.login.pvp2.sp.requesterId");
+	}
+	
+	public boolean setNameIdPolicy() {
+			return Boolean.parseBoolean(props.getProperty("general.login.pvp2.req.set.nameIDPolicy", "true"));
+	}
+
+
+	
 	public void initializePVP2Login() throws ConfigurationException {
 		if (!pvp2logininitialzied)
 			initalPVP2Login();
@@ -276,6 +296,5 @@ public class Configuration {
 			throw new ConfigurationException("PVP2 authentification can not be initialized.", e);
 		}	
 	}
-
 		
 }