RSCH

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d

3 files changed, 34 insertions, 12 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index 6d3e05c29..53f763630 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -355,10 +355,12 @@ public class ConfigurationBuilder {
 
       OAAuthParameter oap = new OAAuthParameter();
       oap.setPublicURLPrefix(oAElem.getAttribute("publicURLPrefix"));
+      oap.setKeyBoxIdentier(oAElem.getAttribute("keyBoxIdentifier"));
+      
       //Check if there is an Auth-Block to read from configuration
       if (authComponent!=null)
       {
-        oap.setProvideZMRZahl(BoolUtils.valueOf(authComponent.getAttribute("provideZMRZahl")));
+        oap.setProvideStammzahl(BoolUtils.valueOf(authComponent.getAttribute("provideStammzahl")));
         oap.setProvideAuthBlock(BoolUtils.valueOf(authComponent.getAttribute("provideAUTHBlock")));
         oap.setProvideIdentityLink(BoolUtils.valueOf(authComponent.getAttribute("provideIdentityLink")));
       }
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index 9ee1ec606..512d571ab 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -13,10 +13,15 @@ public class OAAuthParameter {
 	 * public URL prefix of the online application
 	 */
   private String publicURLPrefix;
+  
 	/**
-	 * determines whether "ZMR-Zahl" is to be included in the authentication data
+	 * key box Identifier (e.g. CertifiedKeyPair, SecureSignatureKeyPair)
+	 */  
+  private String keyBoxIdentifier;
+	/**
+	 * determines whether "Stammzahl" is to be included in the authentication data
 	 */
-  private boolean provideZMRZahl;
+  private boolean provideStammzahl;
 	/**
 	 * determines whether AUTH block is to be included in the authentication data
 	 */
@@ -43,11 +48,11 @@ public class OAAuthParameter {
   }
 
   /**
-   * Returns the provideZMRZahl.
+   * Returns the provideStammzahl.
    * @return String
    */
-  public boolean getProvideZMRZahl() {
-    return provideZMRZahl;
+  public boolean getProvideStammzahl() {
+    return provideStammzahl;
   }
 
   /**
@@ -58,6 +63,14 @@ public class OAAuthParameter {
     return publicURLPrefix;
   }
 
+	/**
+		* Returns the key box identifier.
+		* @return String
+		*/
+	 public String getKeyBoxIdentifier() {
+		 return keyBoxIdentifier;
+	 }
+
   /**
    * Sets the provideAuthBlock.
    * @param provideAuthBlock The provideAuthBlock to set
@@ -75,11 +88,11 @@ public class OAAuthParameter {
   }
 
   /**
-   * Sets the provideZMRZahl.
-   * @param provideZMRZahl The provideZMRZahl to set
+   * Sets the provideStammzahl.
+   * @param provideStammzahl The provideStammzahl to set
    */
-  public void setProvideZMRZahl(boolean provideZMRZahl) {
-    this.provideZMRZahl = provideZMRZahl;
+  public void setProvideStammzahl(boolean provideStammzahl) {
+    this.provideStammzahl = provideStammzahl;
   }
 
   /**
@@ -90,4 +103,13 @@ public class OAAuthParameter {
     this.publicURLPrefix = publicURLPrefix;
   }
 
+	/**
+	 * Sets the key box identifier.
+	 * @param keyBoxIdentifier to set
+	 */
+	public void setKeyBoxIdentier(String keyBoxIdentifier) {
+		this.keyBoxIdentifier = keyBoxIdentifier;
+	}
+
+
 }
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
index 5859d2ae9..fdb7e6f55 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
@@ -129,8 +129,6 @@ public class ProxyConfigurationProvider extends ConfigurationProvider {
 				throw new ConfigurationException("config.03", null, t);
 			}
       
-      //TODO enhance: use the getter method in makeAbsoluteURL
-      
       // build the internal datastructures
       builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
       authComponentConnectionParameter = builder.buildAuthComponentConnectionParameter();