updated for wbPK

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

2 files changed, 47 insertions, 20 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
index c9a13fee5..ef7c7e323 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
@@ -27,6 +27,14 @@ public class OAConfiguration {
   /** Constant for an auth method */
   public static final String PARAM_AUTH = "param";
   
+  
+  /** Constant for binding */  
+  public static final String BINDUNG_USERNAME = "userName";
+  /** Constant for binding */
+  public static final String BINDUNG_FULL = "full";
+  /** Constant for binding */
+  public static final String BINDUNG_NONE = "none";
+  
   /** login type: stateful or stateless */
   String loginType;
   /** authentication type: basic, header, or param */
@@ -45,6 +53,8 @@ public class OAConfiguration {
   String basicAuthUserIDMapping;
   /** mapping for password to be used in case of authentication type <code>"basic-auth"</code> */
   String basicAuthPasswordMapping;
+  /** Binding for basic authentication */
+  String binding;
   
   /**
    * Returns the basicAuthPasswordMapping.
@@ -87,6 +97,14 @@ public class OAConfiguration {
   }
   
   /**
+   * Returns the binding.
+   * @return String
+   */
+  public String getBinding() {
+    return binding;
+  }
+  
+  /**
    * Sets the basicAuthPasswordMapping.
    * @param basicAuthPasswordMapping The basicAuthPasswordMapping to set
    */
@@ -141,5 +159,13 @@ public class OAConfiguration {
   public void setAuthType(String authLoginType) {
     this.authType = authLoginType;
   }
+  
+  /**
+   * Sets the binding.
+   * @param binding The binding to be set.
+   */
+  public void setBinding (String binding) {
+    this.binding = binding;
+  }
 
 }
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
index a16dcfa26..12b16c115 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
@@ -1,6 +1,7 @@
 package at.gv.egovernment.moa.id.config.proxy;
 
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.id.config.OAParameter;
 
 /**
  * Configuration parameters belonging to an online application,
@@ -9,12 +10,12 @@ import at.gv.egovernment.moa.id.config.ConnectionParameter;
  * @author Stefan Knirsch
  * @version $Id$
  */
-public class OAProxyParameter {
+public class OAProxyParameter extends OAParameter {
 
-	/**
-	 * public URL prefix of the online application
-	 */
-  private String publicURLPrefix;
+//	/**
+//	 * public URL prefix of the online application
+//	 */
+//  private String publicURLPrefix;
   /**
    * URL of online application configuration file;
    * defaults to relative URL <code>/moaconfig.xml</code>
@@ -100,21 +101,21 @@ public class OAProxyParameter {
     this.connectionParameter = proxyConnectionParameter;
   }
 
-  /**
-   * Returns the publicURLPrefix.
-   * @return String
-   */
-  public String getPublicURLPrefix() {
-    return publicURLPrefix;
-  }
-
-  /**
-   * Sets the publicURLPrefix.
-   * @param publicURLPrefix The publicURLPrefix to set
-   */
-  public void setPublicURLPrefix(String url) {
-    this.publicURLPrefix = url;
-  }
+//  /**
+//   * Returns the publicURLPrefix.
+//   * @return String
+//   */
+//  public String getPublicURLPrefix() {
+//    return publicURLPrefix;
+//  }
+//
+//  /**
+//   * Sets the publicURLPrefix.
+//   * @param publicURLPrefix The publicURLPrefix to set
+//   */
+//  public void setPublicURLPrefix(String url) {
+//    this.publicURLPrefix = url;
+//  }
 
   /**
    * Returns the connectionBuilderImpl.