updated for wbPK

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

2 files changed, 101 insertions, 57 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index ba4a9e367..27d91bf1f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
@@ -15,7 +15,8 @@ public class AuthenticationSession {
 	 */
 	private String sessionID;
 	/**
-	 * "Geschäftsbereich" the online application belongs to
+	 * "Gesch&auml;ftsbereich" the online application belongs to; maybe <code>null</code>
+   * if the online application is a business application
 	 */
 	private String target;
 	/**
@@ -34,6 +35,10 @@ public class AuthenticationSession {
    * HTML template URL
    */
   private String templateURL;
+  /**
+   * URL of the BKU
+   */
+  private String bkuURL;
 	/**
 	 * identity link read from smartcard
 	 */
@@ -49,8 +54,13 @@ public class AuthenticationSession {
 	/**
 	 * timestamp logging when identity link has been received
 	 */
-	private Date timestampIdentityLink;
-	
+	private Date timestampIdentityLink; 
+  /**
+   * Indicates whether the corresponding online application is a business
+   * service or not
+   */
+  private boolean businessService;
+  
   /**
    * Constructor for AuthenticationSession.
    * 
@@ -108,6 +118,14 @@ public class AuthenticationSession {
   public String getPublicOAURLPrefix() {
     return oaPublicURLPrefix;
   }
+  
+  /**
+   * Returns the BKU URL.
+   * @return String
+   */
+  public String getBkuURL() {
+    return bkuURL;
+  }
 
   /**
    * Returns the target.
@@ -132,6 +150,14 @@ public class AuthenticationSession {
   public void setPublicOAURLPrefix(String url) {
     this.oaPublicURLPrefix = url;
   }
+  
+  /**
+   * Sets the bkuURL
+   * @param url The BKU URL to set
+   */
+  public void setBkuURL(String url) {
+    this.bkuURL = url;
+  }
 
   /**
    * Sets the target.
@@ -180,6 +206,23 @@ public class AuthenticationSession {
   public Date getTimestampIdentityLink() {
     return timestampIdentityLink;
   }
+  
+  /**
+   * Returns the businessService.
+   * @return <code>true</code> if the corresponding online application is
+   * a business application, otherwise <code>false</code>
+   */
+  public boolean getBusinessService() {
+    return businessService;
+  }
+  
+  /**
+   * Sets the businessService variable.
+   * @param businessService the value for setting the businessService variable.
+   */
+  public void setBusinessService(boolean businessService) {
+    this.businessService = businessService;
+  }
 
   /**
    * Returns the timestampStart.
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
index c787b2a81..76ba6366d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
@@ -9,17 +9,18 @@ package at.gv.egovernment.moa.id.auth.data;
  * 
  */
 public class SAMLAttribute {
-/** the name to be stored */
-private String name;
-/** the namespace to be stored */
-private String namespace;
-/** the value to be stored */
-private String value;
+  
+  /** the name to be stored */
+  private String name;
+  /** the namespace to be stored */
+  private String namespace;
+  /** the value to be stored */
+  private Object value;
 
   /**
    * Constructor for SAMLAttribute.
    */
-  public SAMLAttribute(String name, String namespace, String value) {
+  public SAMLAttribute(String name, String namespace, Object value) {
 
   this.name = name;
   this.namespace = namespace;
@@ -27,52 +28,52 @@ private String value;
 
   }
 
-/**
- * Returns the name.
- * @return String
- */
-public String getName() {
-  return name;
-}
-
-/**
- * Returns the namespace.
- * @return String
- */
-public String getNamespace() {
-  return namespace;
-}
-
-/**
- * Returns the value.
- * @return String
- */
-public String getValue() {
-  return value;
-}
-
-/**
- * Sets the name.
- * @param name The name to set
- */
-public void setName(String name) {
-  this.name = name;
-}
-
-/**
- * Sets the namespace.
- * @param namespace The namespace to set
- */
-public void setNamespace(String namespace) {
-  this.namespace = namespace;
-}
-
-/**
- * Sets the value.
- * @param value The value to set
- */
-public void setValue(String value) {
-  this.value = value;
-}
+  /**
+   * Returns the name.
+   * @return String
+   */
+  public String getName() {
+    return name;
+  }
+  
+  /**
+   * Returns the namespace.
+   * @return String
+   */
+  public String getNamespace() {
+    return namespace;
+  }
+  
+  /**
+   * Returns the value.
+   * @return String
+   */
+  public Object getValue() {
+    return value;
+  }
+  
+  /**
+   * Sets the name.
+   * @param name The name to set
+   */
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  /**
+   * Sets the namespace.
+   * @param namespace The namespace to set
+   */
+  public void setNamespace(String namespace) {
+    this.namespace = namespace;
+  }
+  
+  /**
+   * Sets the value.
+   * @param value The value to set
+   */
+  public void setValue(Object value) {
+    this.value = value;
+  }
 
 }