6 files changed, 15 insertions, 54 deletions
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java
index 27b512717..e7e490924 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java
@@ -12,22 +12,22 @@ public class ExtendedSAMLAttributeImpl implements ExtendedSAMLAttribute {
    * The value of this SAML attribute. Must be either of type <code>java.lang.String</code>
    * or <code>org.w3c.Element</code>.
    */
-  private Object value_;
+  protected Object value_;
   
   /**
    * The name of this SAML attribute.
    */
-  private String name_;
+  protected String name_;
   
   /**
    * The namespace URI of this SAML attribute.
    */
-  private String namespace_;
+  protected String namespace_;
   
   /**
    * Specifies whether this SAML attribute should be appended to AUTH Block.
    */
-  private int addToAUTHBlock_;
+  protected int addToAUTHBlock_;
 
   /**
    * Sets this ExtendedSAMLAttribute.
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResultImpl.java
index ad2e0134f..c79612e7b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResultImpl.java
@@ -6,7 +6,7 @@ package at.gv.egovernment.moa.id.auth.data;
  * 
  * @author Harald Bratko
  */
-public class InfoboxValidationresultImpl implements InfoboxValidationResult {
+public class InfoboxValidationResultImpl implements InfoboxValidationResult {
   
   /**
    * Indicates whether the validation was successful or not.
@@ -23,9 +23,14 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult {
    */
   protected ExtendedSAMLAttribute[] extendedSamlAttributes_; 
   
+  /**
+   * Empty constructor.
+   */
+  public InfoboxValidationResultImpl() {
+  }
   
   /**
-   * Constructor.
+   * Constructor to set all values.
    * 
    * @param valid                   Global validation result.
    * @param extendedSamlAttributes  SAML attributes that should be appended to the final
@@ -33,7 +38,7 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult {
    *                                or to both.
    * @param errorMessage            An error message if infobox validation fails.
    */
-  public InfoboxValidationresultImpl(
+  public InfoboxValidationResultImpl(
     boolean valid, 
     ExtendedSAMLAttribute[] extendedSamlAttributes,
     String errorMessage)
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java
index 0f78760a8..c7a557290 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java
@@ -1,4 +1,3 @@
-
 package at.gv.egovernment.moa.id.auth.data;
 
 import java.security.PublicKey;
@@ -157,27 +156,6 @@ public interface InfoboxValidatorParams {
   public boolean getHideStammzahl();
   
   /**
-   * Indicates if the infobox validator has to run in the so called 
-   * <code>compatibility mode</code>.
-   * <br>
-   * The <code>compatibility mode</code> is used when the final <code>&lt;saml:Assertion&gt;</code> 
-   * sent to the online application should be rather built on the basis of a 
-   * <code>&lt;pr:PersonData&gt;</code> structure returned by the infobox validator instead 
-   * of the <code>&lt;pr:PersonData&gt;</code> structure extracted from the original identity link.
-   * The <code>compatibility mode</code> is <b>only</b> available within the 
-   * <code>Mandates</code>-infobox context. For all other infoboxes the return value of
-   * this method will be ignored.
-   * (please refer MOA-ID specification for more details).
-   * <p> 
-   * <b>Note:</b> In the current version the <code>compatibility mode</code> is not yet
-   *              supported!
-   * 
-   * @return <code>True</code> if the infobox validator has to run in the so called 
-   * <code>compatibility mode</code>, otherwise <code>false</code>.
-   */
-  public boolean getCompMode();
-  
-  /**
    * Returns application specific parameters.
    * Each child element of this element contains
    * a validating application specific parameter. The  
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java
index e524ff5f5..80ba5995f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java
@@ -82,10 +82,7 @@ public class InfoboxValidatorParamsImpl implements InfoboxValidatorParams {
    * The identity link.
    */
   protected Element identityLink_;
-  /**
-   * Indicates if the infobox validator has to run in the so called <code>compatibility mode</code>.
-   */
-  protected boolean compMode_;
+
   /**
    * Indicates whether source pins (<code>Stammzahl</code>en) must be hidden or not.
    */
@@ -194,13 +191,6 @@ public class InfoboxValidatorParamsImpl implements InfoboxValidatorParams {
   }
   
   /**
-   * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams#getCompMode()
-   */
-  public boolean getCompMode() {
-    return compMode_;
-  }
-  
-  /**
    * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams#getHideStammzahl()
    */
   public boolean getHideStammzahl() {
@@ -345,17 +335,6 @@ public class InfoboxValidatorParamsImpl implements InfoboxValidatorParams {
   }
   
   /**
-   * Sets the {@link #compMode_} parameter. Indicates whether the infobox 
-   * validator has to run in the so called <code>compatibility mode</code>.
-   *
-   * @param compMode <code>True</code> if the infobox validator has to run in the so 
-   *                 called <code>compatibility mode</code>, otherwise <code>false</code>.
-   */
-  public void setCompMode(boolean compMode) {
-    compMode_ = compMode;
-  }
-
-  /**
    * Sets the {@link #hideStammzahl_} parameter. This indicates whether source pins 
    * (<code>Stammzahl</code>en) must be hidden or not.
    *
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java
index e6755b58c..964725416 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java
@@ -10,12 +10,12 @@ public class SchemaImpl implements Schema {
   /**
    * The namespace of this schema.
    */
-  private String namespace_;
+  protected String namespace_;
   
   /**
    * The location (URI) of this schema;
    */
-  private String schemaLocation_;
+  protected String schemaLocation_;
 
   /**
    * Sets the namespace and schema location URIS of this schema.
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
index 2f14eb3c9..c776418ab 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
@@ -2,7 +2,6 @@ package at.gv.egovernment.moa.id.auth.validator;
 
 import at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult;
 import at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams;
-import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttribute;
 
 /**
  * Validates an InfoboxReadResponse.