finish first beta-version of ELGA mandate-service client-module

2 files changed, 27 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/IPVPAuthnRequestBuilderConfiguruation.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/IPVPAuthnRequestBuilderConfiguruation.java
index e209d0bc5..6e1798ed1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/IPVPAuthnRequestBuilderConfiguruation.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/IPVPAuthnRequestBuilderConfiguruation.java
@@ -119,11 +119,28 @@ public interface IPVPAuthnRequestBuilderConfiguruation {
 	public String getSubjectNameID();
 
 	/**
+	 * Define the qualifier of the <code>SubjectNameID</code>
+	 * <br><br>
+	 * Like: 'urn:publicid:gv.at:cdid+BF'
+	 * 
+	 * @return qualifier, or null if no qualifier should be set
+	 */
+	public String getSubjectNameIDQualifier();
+	
+	/**
 	 * Define the format of the subjectNameID, which is included in authn-request
 	 * 
 	 * 
 	 * @return nameIDFormat, of SAML2 'transient' if nothing is defined
 	 */
 	public String getSubjectNameIDFormat();
+
+	/**
+	 * Define a SP specific SAMK2 requestID
+	 * 
+	 * @return requestID, or null if the requestID should be generated automatically
+	 */
+	public String getRequestID();
+
 	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
index bbf395a6f..58210a72c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
@@ -28,7 +28,6 @@ import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -92,18 +91,18 @@ public class PVPConfiguration {
 	private static String moaIDVersion = null;
 	
 	//PVP2 generalpvpconfigdb;
-	Properties props;
-	String rootDir = null;
+	//Properties props;
+	//String rootDir = null;
 	
 	private PVPConfiguration() {
-		 try {
-			//generalpvpconfigdb = AuthConfigurationProvider.getInstance().getGeneralPVP2DBConfig();
-			props = AuthConfigurationProviderFactory.getInstance().getGeneralPVP2ProperiesConfig();
-			rootDir = AuthConfigurationProviderFactory.getInstance().getRootConfigFileDir();				
-						
-		} catch (ConfigurationException e) {
-			e.printStackTrace();
-		}
+//		 try {
+//			//generalpvpconfigdb = AuthConfigurationProvider.getInstance().getGeneralPVP2DBConfig();
+//			//props = AuthConfigurationProviderFactory.getInstance().getGeneralPVP2ProperiesConfig();
+//			//rootDir = AuthConfigurationProviderFactory.getInstance().getRootConfigFileDir();				
+//						
+//		} catch (ConfigurationException e) {
+//			e.printStackTrace();
+//		}
 	}
 	
 	public List<String> getIDPPublicPath() throws ConfigurationException {