15 files changed, 3901 insertions, 0 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
new file mode 100644
index 000000000..b5275cdd5
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -0,0 +1,989 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config;
+
+import iaik.pki.pathvalidation.ChainingModes;
+import iaik.utils.RFC2253NameParser;
+import iaik.utils.RFC2253NameParserException;
+
+import java.math.BigInteger;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
+
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.auth.data.Schema;
+import at.gv.egovernment.moa.id.auth.data.SchemaImpl;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.config.auth.VerifyInfoboxParameter;
+import at.gv.egovernment.moa.id.config.auth.VerifyInfoboxParameters;
+import at.gv.egovernment.moa.id.data.IssuerAndSerial;
+import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.BoolUtils;
+import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.StringUtils;
+import at.gv.egovernment.moa.util.XPathException;
+import at.gv.egovernment.moa.util.XPathUtils;
+
+/**
+ * A class that builds configuration data from a DOM based representation.
+ * 
+ * @author Patrick Peck
+ * @author Stefan Knirsch
+ * @version $Id$
+ */
+public class ConfigurationBuilder {
+
+  //
+  // XPath namespace prefix shortcuts
+  //
+  /** an XPATH-Expression */ 
+  protected static final String CONF = Constants.MOA_ID_CONFIG_PREFIX + ":";
+  /** an XPATH-Expression */ 
+  protected static final String DSIG = Constants.DSIG_PREFIX + ":";
+
+  //
+  // chaining mode constants appearing in the configuration file
+  //
+  /** an XPATH-Expression */ 
+  protected static final String CM_CHAINING = "chaining";
+  /** an XPATH-Expression */ 
+  protected static final String CM_PKIX = "pkix";
+  /** an XPATH-Expression */ 
+  protected static final String DEFAULT_ENCODING = "UTF-8";
+
+  //
+  // XPath expressions to select certain parts of the configuration
+  //
+  /** an XPATH-Expression */ 
+  protected static final String ROOT = "/" + CONF + "MOA-IDConfiguration/";
+  
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_BKU_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "BKUSelection";
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_BKUSELECT_TEMPLATE_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "Templates/" + CONF + "BKUSelectionTemplate/@URL";
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_TEMPLATE_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "Templates/" + CONF + "Template/@URL";
+  /** an XPATH-Expression */ 
+  protected static final String INPUT_PROCESSOR_TEMPLATE_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "Templates/" + CONF + "InputProcessorSignTemplate/@URL";
+  /** an XPATH-Expression */ 
+   public static final String AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "SecurityLayer/" + CONF + "TransformsInfo/@filename";
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_MOA_SP_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP";
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_MOA_SP_VERIFY_IDENTITY_TRUST_ID_XPATH =
+      ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP/" + CONF + "VerifyIdentityLink/" + CONF + "TrustProfileID";
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_MOA_SP_VERIFY_AUTH_TRUST_ID_XPATH =
+        ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP/" + CONF + "VerifyAuthBlock/" + CONF + "TrustProfileID";
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_MOA_SP_VERIFY_AUTH_VERIFY_ID_XPATH =
+   ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP/" + CONF + "VerifyAuthBlock/" + CONF  + "VerifyTransformsInfoProfileID";
+
+  /** an XPATH-Expression */ 
+  protected static final String AUTH_IDENTITY_LINK_X509SUBJECTNAME_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "IdentityLinkSigners/" + CONF + "X509SubjectName";
+ 
+  /** an XPATH-Expression */ 
+  public static final String AUTH_VERIFY_INFOBOXES_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "VerifyInfoboxes";
+  
+  /** an XPATH-Expression */ 
+  public static final String AUTH_FOREIGN_IDENTITIES_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "ForeignIdentities";
+  
+  /** an XPATH-Expression */ 
+  public static final String AUTH_ONLINEMANDATES_XPATH =
+    ROOT + CONF + "AuthComponent/" + CONF + "OnlineMandates";
+  
+  
+  
+  /** an XPATH-Expression */ 
+  protected static final String OA_XPATH = ROOT + CONF + "OnlineApplication";
+  /** an XPATH-Expression */ 
+  protected static final String OA_LOGIN_XPATH = ROOT + CONF + "OnlineApplication/@loginURL";
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_XPATH = CONF + "AuthComponent";
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_IDENT_NUMBER_XPATH = CONF + "IdentificationNumber";    
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_BKUSELECT_TEMPLATE_XPATH =
+    CONF + "Templates/" + CONF + "BKUSelectionTemplate/@URL";
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_TEMPLATE_XPATH =
+    CONF + "Templates/" + CONF + "Template/@URL";
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_TRANSFORMS_INFO_FILENAME_XPATH = CONF + "TransformsInfo/@filename";
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_VERIFY_INFOBOXES_XPATH = CONF + "VerifyInfoboxes";
+  /** an XPATH-Expression */ 
+  protected static final String OA_AUTH_COMPONENT_MANDATES_PROFILES_XPATH = CONF + "Mandates" + "/" + CONF + "Profiles";
+  /** an XPATH-Expression */ 
+  protected static final String CONNECTION_PARAMETER_URL_XPATH =
+    CONF + "ConnectionParameter/@URL";
+  /** an XPATH-Expression */ 
+  protected static final String CONNECTION_PARAMETER_ACCEPTED_CERTS_XPATH =
+    CONF + "ConnectionParameter/" + CONF + "AcceptedServerCertificates";
+  /** an XPATH-Expression */ 
+  protected static final String CONNECTION_PARAMETERN_KEYSTORE_XPATH =
+    CONF + "ConnectionParameter/" + CONF + "ClientKeyStore";
+  /** an XPATH-Expression */ 
+  protected static final String CONNECTION_PARAMETER_KEYSTORE_PASS_XPATH =
+    CONNECTION_PARAMETERN_KEYSTORE_XPATH + "/@password";
+  /** an XPATH-Expression */ 
+  protected static final String GENERIC_CONFIGURATION_XPATH =
+    ROOT + CONF + "GenericConfiguration";
+  
+  /** an XPATH-Expression */ 
+  protected static final String TRUSTED_BKUS =
+    ROOT + CONF + "TrustedBKUs/" + CONF + "BKUURL";
+  
+  /** an XPATH-Expression */ 
+  protected static final String CHAINING_MODES_XPATH =
+    ROOT + CONF + "ChainingModes";
+  /** an XPATH-Expression */ 
+  protected static final String CHAINING_MODES_DEFAULT_XPATH =
+    CHAINING_MODES_XPATH + "/@systemDefaultMode";
+  /** an XPATH-Expression */ 
+  protected static final String TRUST_ANCHOR_XPATH =
+    ROOT + CONF + "ChainingModes/" + CONF + "TrustAnchor";
+  /** an XPATH-Expression */ 
+  protected static final String ISSUER_XPATH = DSIG + "X509IssuerName";
+  /** an XPATH-Expression */ 
+  protected static final String SERIAL_XPATH = DSIG + "X509SerialNumber";
+  /** an XPATH-Expression */ 
+  protected static final String TRUSTED_CA_CERTIFICATES_XPATH =
+    ROOT + CONF + "TrustedCACertificates";
+  
+  /** an XPATH-Expression */ 
+  protected static final String VERIFY_INFOBOXES_DEFAULT_TRUST_PROFILE_XPATH = CONF + "DefaultTrustProfile";
+  /** an XPATH-Expression */ 
+  protected static final String VERIFY_INFOBOXES_TRUST_PROFILE_ID_XPATH = CONF + "TrustProfileID";
+  /** an XPATH-Expression */ 
+  protected static final String VERIFY_INFOBOXES_INFOBOX_XPATH = CONF + "Infobox";
+  
+  
+
+  
+   /**
+    * main configuration file directory name used to configure MOA-ID 
+    */
+   protected String rootConfigFileDir_;
+  
+  /** The root element of the MOA-ID configuration */
+  protected Element configElem_;
+
+  /**
+   * Creates a new <code>MOAConfigurationProvider</code>.
+   * 
+   * @param configElem The root element of the MOA-ID configuration.
+   */
+  public ConfigurationBuilder(Element configElem, String rootConfigDir) {
+    configElem_ = configElem;
+    rootConfigFileDir_ = rootConfigDir;
+  }
+
+  /**
+   * Returns the root element of the MOA-ID configuration. 
+   * 
+   * @return The root element of the MOA-ID configuration.
+   */
+  public Element getConfigElem() {
+    return configElem_;
+  }
+
+  /**
+   * Build a ConnectionParameter object containing all information
+   * of the moa-sp element in the authentication component 
+   * @return ConnectionParameter of the authentication component moa-sp element 
+   */
+  public ConnectionParameter buildAuthBKUConnectionParameter() {
+
+    Element authBKU = (Element) XPathUtils.selectSingleNode(configElem_, AUTH_BKU_XPATH);
+    if (authBKU==null) return null;
+    return buildConnectionParameter(authBKU);
+  }
+  
+  /**
+   * Build a ConnectionParameter containing all information
+   * of the foreignid element in the authentication component
+   * @return ConnectionParameter of the authentication component foreignid element
+   */
+  public ConnectionParameter buildForeignIDConnectionParameter() {
+     Element foreignid = (Element)XPathUtils.selectSingleNode(configElem_, AUTH_FOREIGN_IDENTITIES_XPATH);
+     if (foreignid==null) return null;
+     return buildConnectionParameter(foreignid);
+
+  }
+  
+  /**
+   * Build a ConnectionParameter containing all information
+   * of the OnlineMandates element in the authentication component
+   * @return ConnectionParameter of the authentication component OnlineMandates element
+   */
+  public ConnectionParameter buildOnlineMandatesConnectionParameter() {
+     Element onlinemandates = (Element)XPathUtils.selectSingleNode(configElem_, AUTH_ONLINEMANDATES_XPATH);
+     if (onlinemandates==null) return null;
+     return buildConnectionParameter(onlinemandates);
+
+  }
+
+  /**
+   * Method buildAuthBKUSelectionType.
+   * 
+   * Build a string with the configuration value of BKUSelectionAlternative
+   * 
+   * @return String
+   */
+  public String buildAuthBKUSelectionType() {
+
+   Element authBKU = (Element) XPathUtils.selectSingleNode(configElem_, AUTH_BKU_XPATH);
+   if (authBKU==null) return null;   
+   return (authBKU).getAttribute("BKUSelectionAlternative");
+  }
+
+  /**
+   * Build a string array with all filenames leading
+   * to the Transforms Information for the Security Layer
+   * @param contextNode The node from which should be searched
+   * @param xpathExpr The XPATH expression for the search
+   * @return String[] of filenames to the Security Layer Transforms Information 
+   *         or <code>null</code> if no transforms are included
+   */
+  public String[] buildTransformsInfoFileNames(Node contextNode, String xpathExpr) {
+    
+    List transformsInfoFileNames = new ArrayList();
+    
+    try {
+      NodeIterator tiIter = XPathUtils.selectNodeIterator(contextNode, xpathExpr);
+      
+      Attr tiElem;
+      while ((tiElem = (Attr) tiIter.nextNode()) != null) {
+        String tiFileName = tiElem.getNodeValue();
+        transformsInfoFileNames.add(tiFileName);
+      }
+      
+      String[] result = new String[transformsInfoFileNames.size()];
+      transformsInfoFileNames.toArray(result);
+  
+      return result;
+    } catch (XPathException xpe) {
+      return new String[0];
+    }
+  }
+  
+  
+  /**
+   * Loads the <code>transformsInfos</code> from files.
+   * @throws Exception on any exception thrown
+   */
+  public String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception {
+    
+    String[] transformsInfos = new String[transformsInfoFileNames.length];
+    for (int i = 0; i < transformsInfoFileNames.length; i++) {
+      String fileURL = transformsInfoFileNames[i];
+
+      //if fileURL is relative to rootConfigFileDir make it absolute          
+      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir_);      
+      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
+      transformsInfos[i] = transformsInfo;
+    }
+    return transformsInfos;
+  }
+
+  /**
+   * Build a ConnectionParameter bean containing all information
+   * of the authentication component moa-sp element 
+   * @return ConnectionParameter of the authentication component moa-sp element 
+   */
+  public ConnectionParameter buildMoaSpConnectionParameter() {
+
+    Element connectionParameter = (Element) XPathUtils.selectSingleNode(configElem_, AUTH_MOA_SP_XPATH);
+    if (connectionParameter==null) return null;
+    return buildConnectionParameter(connectionParameter);
+  }
+
+  /**
+   * Return a string with a url-reference to the VerifyIdentityLink trust 
+   * profile id within the moa-sp part of the authentication component
+   * @return String with a url-reference to the VerifyIdentityLink trust profile ID
+   */
+  public String getMoaSpIdentityLinkTrustProfileID() {
+    return XPathUtils.getElementValue(
+      configElem_,
+      AUTH_MOA_SP_VERIFY_IDENTITY_TRUST_ID_XPATH,
+      "");
+  }
+  /**
+   * Return a string representation of an URL pointing to trusted CA Certificates 
+   * @return String representation of an URL pointing to trusted CA Certificates 
+   */
+  public String getTrustedCACertificates() {
+    return XPathUtils.getElementValue(
+      configElem_,
+      TRUSTED_CA_CERTIFICATES_XPATH,null);
+  }
+  
+  /**
+   * Return a string with a url-reference to the VerifyAuthBlock trust 
+   * profile id within the moa-sp part of the authentication component
+   * @return String with a url-reference to the VerifyAuthBlock trust profile ID
+   */
+  public String getMoaSpAuthBlockTrustProfileID() {
+    return XPathUtils.getElementValue(
+      configElem_,
+      AUTH_MOA_SP_VERIFY_AUTH_TRUST_ID_XPATH,
+      "");
+  }
+  /**
+   * Build a string array with references to all verify transform info 
+   * IDs within the moa-sp part of the authentication component
+   * @return A string array containing all urls to the 
+   * verify transform info IDs
+   */
+  public String[] buildMoaSpAuthBlockVerifyTransformsInfoIDs() {
+
+    List verifyTransformsInfoIDs = new ArrayList();
+    NodeIterator vtIter =
+      XPathUtils.selectNodeIterator(
+        configElem_,
+        AUTH_MOA_SP_VERIFY_AUTH_VERIFY_ID_XPATH);
+    Element vtElem;
+
+    while ((vtElem = (Element) vtIter.nextNode()) != null) {
+
+      String vtInfoIDs = DOMUtils.getText(vtElem);
+      verifyTransformsInfoIDs.add(vtInfoIDs);
+    }
+    String[] result = new String[verifyTransformsInfoIDs.size()];
+    verifyTransformsInfoIDs.toArray(result);
+
+    return result;
+  }
+
+  public List getTrustedBKUs() {
+	  
+	  List trustedBKUs = new ArrayList();
+	    
+	      NodeIterator bkuIter = XPathUtils.selectNodeIterator(configElem_, TRUSTED_BKUS);
+	      
+	      Element vtElem;
+
+	      while ((vtElem = (Element) bkuIter.nextNode()) != null) {
+		      	String bkuURL = DOMUtils.getText(vtElem);
+		      	trustedBKUs.add(bkuURL);
+	      }
+	      
+	      return trustedBKUs;
+	  
+  }
+
+  /**
+   * Returns a list containing all X509 Subject Names 
+   * of the Identity Link Signers
+   * @return a list containing the configured identity-link signer X509 subject names
+   */
+  public List getIdentityLink_X509SubjectNames() {
+
+    Vector x509SubjectNameList = new Vector();
+    NodeIterator x509Iter =
+      XPathUtils.selectNodeIterator(
+        configElem_,
+        AUTH_IDENTITY_LINK_X509SUBJECTNAME_XPATH);
+    Element x509Elem;
+
+    while ((x509Elem = (Element) x509Iter.nextNode()) != null) {
+      String vtInfoIDs = DOMUtils.getText(x509Elem);
+      x509SubjectNameList.add(vtInfoIDs);
+    }
+    
+    // now add the default identity link signers
+    String[] identityLinkSignersWithoutOID = MOAIDAuthConstants.IDENTITY_LINK_SIGNERS_WITHOUT_OID;
+    for (int i=0; i<identityLinkSignersWithoutOID.length; i++) {
+      String identityLinkSigner = identityLinkSignersWithoutOID[i];
+      if (!x509SubjectNameList.contains(identityLinkSigner)) {
+        x509SubjectNameList.add(identityLinkSigner);
+      }
+    }
+   
+    return x509SubjectNameList;
+  }
+
+  /**
+   * Build an array of the OnlineApplication Parameters containing information 
+   * about the authentication component
+   * 
+   * @param defaultVerifyInfoboxParameters Default parameters for verifying additional
+   *                                infoboxes. Maybe <code>null</code>.
+   * @param moaSpIdentityLinkTrustProfileID The ID of the trust profile used for validating
+   *                                the identity link signer certificate. Needed for
+   *                                checking if this ID is not used for validating other 
+   *                                infoboxes.
+   * 
+   * @return An OAProxyParameter array containing beans
+   * with all relevant information for the authentication component of the online 
+   * application
+   */
+  public OAAuthParameter[] buildOnlineApplicationAuthParameters(
+    VerifyInfoboxParameters defaultVerifyInfoboxParameters, String moaSpIdentityLinkTrustProfileID)
+  throws ConfigurationException 
+  {
+
+    String bkuSelectionTemplateURL =     
+        XPathUtils.getAttributeValue(configElem_, AUTH_BKUSELECT_TEMPLATE_XPATH, null);
+    String templateURL =     
+        XPathUtils.getAttributeValue(configElem_, AUTH_TEMPLATE_XPATH, null);
+    String inputProcessorSignTemplateURL =     
+      XPathUtils.getAttributeValue(configElem_, INPUT_PROCESSOR_TEMPLATE_XPATH, null);
+    
+    List OA_set = new ArrayList();
+    NodeList OAIter = XPathUtils.selectNodeList(configElem_, OA_XPATH);
+
+    for (int i = 0; i < OAIter.getLength(); i++) {
+      Element oAElem = (Element) OAIter.item(i);
+      Element authComponent =
+        (Element) XPathUtils.selectSingleNode(oAElem, OA_AUTH_COMPONENT_XPATH);
+
+      OAAuthParameter oap = new OAAuthParameter();
+      String publicURLPrefix = oAElem.getAttribute("publicURLPrefix");
+      oap.setPublicURLPrefix(publicURLPrefix);
+      oap.setKeyBoxIdentier(oAElem.getAttribute("keyBoxIdentifier"));
+      oap.setFriendlyName(oAElem.getAttribute("friendlyName"));
+      
+      // get the type of the online application
+      String oaType = oAElem.getAttribute("type");
+      oap.setOaType(oaType);
+      String slVersion = "1.1";
+      if ("businessService".equalsIgnoreCase(oaType)) {
+        if (authComponent==null) {
+          Logger.error("Missing \"AuthComponent\" for OA of type \"businessService\"");
+          throw new ConfigurationException("config.02", null);
+        } 
+        Element identificationNumberElem =
+          (Element) XPathUtils.selectSingleNode(authComponent, OA_AUTH_COMPONENT_IDENT_NUMBER_XPATH);
+        if (identificationNumberElem==null) {
+          Logger.error("Missing \"IdentificationNumber\" for OA of type \"businessService\"");
+          throw new ConfigurationException("config.02", null);
+        } 
+        Element identificationNumberChild = DOMUtils.getElementFromNodeList(identificationNumberElem.getChildNodes());
+        if (identificationNumberChild == null) {
+          Logger.error("Missing \"IdentificationNumber\" for OA of type \"businessService\"");
+          throw new ConfigurationException("config.02", null);
+        }
+        if ("false".equalsIgnoreCase(oAElem.getAttribute("calculateHPI"))) {
+         oap.setIdentityLinkDomainIdentifier(buildIdentityLinkDomainIdentifier(identificationNumberChild));
+         //BZ.., setting type of IdLinkDomainIdentifier
+         oap.setIdentityLinkDomainIdentifierType(identificationNumberChild.getLocalName());
+         //..BZ
+        } else {
+         // If we have business service and want to dealt with GDA, the security layer can be advised to calulate 
+         // the Health Professional Identifier HPI instead of the wbPK
+            Logger.info("OA uses HPI for Identification");
+         oap.setIdentityLinkDomainIdentifier(Constants.URN_PREFIX_HPI);
+        }
+        
+        // if OA type is "businessSErvice" set slVersion to 1.2 and ignore parameter in config file
+        Logger.info("OA type is \"businessService\"; setting Security Layer version to 1.2");
+        slVersion = "1.2";
+        
+      } else {
+        
+        if (authComponent!=null) {
+          slVersion = authComponent.getAttribute("slVersion");
+        }
+        
+      }
+      oap.setSlVersion(slVersion);
+      //Check if there is an Auth-Block to read from configuration
+      
+      if (authComponent!=null)
+      {
+        oap.setProvideStammzahl(BoolUtils.valueOf(authComponent.getAttribute("provideStammzahl")));
+        oap.setProvideAuthBlock(BoolUtils.valueOf(authComponent.getAttribute("provideAUTHBlock")));
+        oap.setProvideIdentityLink(BoolUtils.valueOf(authComponent.getAttribute("provideIdentityLink")));
+        oap.setProvideCertificate(BoolUtils.valueOf(authComponent.getAttribute("provideCertificate")));        
+        oap.setBkuSelectionTemplateURL(buildTemplateURL(authComponent, OA_AUTH_COMPONENT_BKUSELECT_TEMPLATE_XPATH, bkuSelectionTemplateURL));
+        oap.setTemplateURL(buildTemplateURL(authComponent, OA_AUTH_COMPONENT_TEMPLATE_XPATH, templateURL));        
+        oap.setInputProcessorSignTemplateURL(buildTemplateURL(authComponent, INPUT_PROCESSOR_TEMPLATE_XPATH, inputProcessorSignTemplateURL));        
+        // load OA specific transforms if present
+        String[] transformsInfoFileNames = buildTransformsInfoFileNames(authComponent, OA_AUTH_COMPONENT_TRANSFORMS_INFO_FILENAME_XPATH);        
+        try {
+          oap.setTransformsInfos(loadTransformsInfos(transformsInfoFileNames));
+        } catch (Exception ex) {
+          Logger.error("Error loading transforms specified for OA \"" + publicURLPrefix + "\"; using default transforms.");
+        } 
+        Node verifyInfoboxParamtersNode = XPathUtils.selectSingleNode(authComponent, OA_AUTH_COMPONENT_VERIFY_INFOBOXES_XPATH);
+        oap.setVerifyInfoboxParameters(buildVerifyInfoboxParameters(
+          verifyInfoboxParamtersNode, defaultVerifyInfoboxParameters, moaSpIdentityLinkTrustProfileID));
+        
+        Node mandateProfilesNode = XPathUtils.selectSingleNode(authComponent, OA_AUTH_COMPONENT_MANDATES_PROFILES_XPATH);
+        if (mandateProfilesNode != null) {
+        	if ("businessService".equalsIgnoreCase(oaType)) {        		
+        		Logger.error("No Online Mandate Modus for OA of type \"businessService\" allowed.");
+                throw new ConfigurationException("config.02", null);
+        	}
+        	else {
+        		String profiles = DOMUtils.getText(mandateProfilesNode);
+        		oap.setMandateProfiles(profiles);
+        	}        	
+        }        
+      } 
+      OA_set.add(oap);
+    }
+    OAAuthParameter[] result =
+      new OAAuthParameter[OA_set.size()];
+    OA_set.toArray(result);
+
+    return result;
+
+  }
+  
+  /**
+   * Builds the URL for a BKUSelectionTemplate or a Template. The method selects
+   * the uri string from the MOA ID configuration file via the given xpath expression
+   * and returns either this string or the default value.
+   * 
+   * @param oaAuthComponent The AuthComponent element to get the template from.
+   * @param xpathExpr       The xpath expression for selecting the template uri.
+   * @param defaultURL      The default template url.
+   * @return                The template url. This may either the via xpath selected uri
+   *                        or, if no template is specified within the online appliacation,
+   *                        the default url. Both may be <code>null</code>.
+   */
+  protected String buildTemplateURL(Element oaAuthComponent, String xpathExpr, String defaultURL) {
+    String templateURL = XPathUtils.getAttributeValue(oaAuthComponent, xpathExpr, defaultURL);
+    if (templateURL != null) {
+      templateURL = FileUtils.makeAbsoluteURL(templateURL, rootConfigFileDir_);
+    }
+    return templateURL;
+  }
+
+  
+  /**
+   * Method buildConnectionParameter: internal Method for creating a 
+   * ConnectionParameter object with all data found in the incoming element
+   * @param root This Element contains the ConnectionParameter
+   * @return ConnectionParameter
+   */
+  protected ConnectionParameter buildConnectionParameter(Element root) 
+  {
+    ConnectionParameter result = new ConnectionParameter();
+    result.setAcceptedServerCertificates(
+      XPathUtils.getElementValue(root,CONNECTION_PARAMETER_ACCEPTED_CERTS_XPATH,null));
+    
+    result.setAcceptedServerCertificates(FileUtils.makeAbsoluteURL(
+      result.getAcceptedServerCertificates(), rootConfigFileDir_));
+      
+    result.setUrl(
+      XPathUtils.getAttributeValue(root, CONNECTION_PARAMETER_URL_XPATH, ""));
+    result.setClientKeyStore(
+      XPathUtils.getElementValue(root,CONNECTION_PARAMETERN_KEYSTORE_XPATH,null));
+    
+    result.setClientKeyStore(FileUtils.makeAbsoluteURL(
+      result.getClientKeyStore(), rootConfigFileDir_));
+    
+    result.setClientKeyStorePassword(
+      XPathUtils.getAttributeValue(root,CONNECTION_PARAMETER_KEYSTORE_PASS_XPATH,""));
+    
+    if ((result.getAcceptedServerCertificates()==null)
+        && (result.getUrl()=="")
+        && (result.getClientKeyStore()==null)
+        && (result.getClientKeyStorePassword()==""))
+        return null;
+    
+    return result;
+  }
+
+  
+  /**
+   * Build the mapping of generic configuration properties.
+   * 
+   * @return a {@link Map} of generic configuration properties (a name to value
+   * mapping) from the configuration.
+   */
+  public Map buildGenericConfiguration() {
+
+    Map genericConfiguration = new HashMap();
+    NodeIterator gcIter =
+      XPathUtils.selectNodeIterator(
+        configElem_,
+        GENERIC_CONFIGURATION_XPATH);
+    Element gcElem;
+
+    while ((gcElem = (Element) gcIter.nextNode()) != null) {
+      String gcName = gcElem.getAttribute("name");
+      String gcValue = gcElem.getAttribute("value");
+
+      genericConfiguration.put(gcName, gcValue);
+    }
+
+    return genericConfiguration;
+  }
+  
+
+  /**
+   * Returns the default chaining mode from the configuration.
+   * 
+   * @return The default chaining mode.
+   */
+  public String getDefaultChainingMode() {
+    String defaultChaining =
+      XPathUtils.getAttributeValue(
+        configElem_,
+        CHAINING_MODES_DEFAULT_XPATH,
+        CM_CHAINING);
+
+    return translateChainingMode(defaultChaining);
+
+  }
+  /**
+   * Build the chaining modes for all configured trust anchors.
+   * 
+   * @return The mapping from trust anchors to chaining modes.
+   */
+  public Map buildChainingModes() {
+    Map chainingModes = new HashMap();
+    NodeIterator trustIter =
+      XPathUtils.selectNodeIterator(configElem_, TRUST_ANCHOR_XPATH);
+    Element trustAnchorElem;
+
+    while ((trustAnchorElem = (Element) trustIter.nextNode()) != null) {
+      IssuerAndSerial issuerAndSerial = buildIssuerAndSerial(trustAnchorElem);
+      String mode = trustAnchorElem.getAttribute("mode");
+
+      if (issuerAndSerial != null) {
+        chainingModes.put(issuerAndSerial, translateChainingMode(mode));
+      }
+    }
+
+    return chainingModes;
+  }
+  
+  /**
+   * Build an <code>IssuerAndSerial</code> from the DOM representation.
+   * 
+   * @param root The root element (being of type <code>dsig:
+   * X509IssuerSerialType</code>.
+   * @return The issuer and serial number contained in the <code>root</code>
+   * element or <code>null</code> if could not be built for any reason.
+   */
+  protected IssuerAndSerial buildIssuerAndSerial(Element root) {
+    String issuer = XPathUtils.getElementValue(root, ISSUER_XPATH, null);
+    String serial = XPathUtils.getElementValue(root, SERIAL_XPATH, null);
+
+    if (issuer != null && serial != null) {
+      try {
+        RFC2253NameParser nameParser = new RFC2253NameParser(issuer);
+        Principal issuerDN = nameParser.parse();
+
+        return new IssuerAndSerial(issuerDN, new BigInteger(serial));
+      } catch (RFC2253NameParserException e) {
+        warn("config.09", new Object[] { issuer, serial }, e);
+        return null;
+      } catch (NumberFormatException e) {
+        warn("config.09", new Object[] { issuer, serial }, e);
+        return null;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Translate the chaining mode from the configuration file to one used in the
+   * IAIK MOA API.
+   * 
+   * @param chainingMode The chaining mode from the configuration.
+   * @return The chaining mode as provided by the <code>ChainingModes</code>
+   * interface.
+   * @see iaik.pki.pathvalidation.ChainingModes
+   */
+  protected String translateChainingMode(String chainingMode) {
+    if (chainingMode.equals(CM_CHAINING)) {
+      return ChainingModes.CHAIN_MODE;
+    } else if (chainingMode.equals(CM_PKIX)) {
+      return ChainingModes.PKIX_MODE;
+    } else {
+      return ChainingModes.CHAIN_MODE;
+    }
+  }
+  
+  /**
+   * Builds the IdentityLinkDomainIdentifier as needed for providing it to the
+   * SecurityLayer for computation of the wbPK.
+   * <p>e.g.:<br>
+   * input element:
+   * <br>
+   * <code>&lt;pr:Firmenbuchnummer Identifier="FN"&gt;000468 i&lt;/pr:Firmenbuchnummer&gt;</code>
+   * <p>
+   * return value: <code>urn:publicid:gv.at+wbpk+FN468i</code>
+   * 
+   * @param number  The element holding the identification number of the business
+   *                company.
+   * @return The domain identifier
+   */
+  protected String buildIdentityLinkDomainIdentifier(Element number) {
+    if (number == null) {
+      return null;
+    }
+    String identificationNumber = number.getFirstChild().getNodeValue();
+    String identifier = number.getAttribute("Identifier");
+    // remove all blanks
+    identificationNumber = StringUtils.removeBlanks(identificationNumber);
+    if (number.getLocalName().equals("Firmenbuchnummer") || identifier.equalsIgnoreCase("fn") || identifier.equalsIgnoreCase("xfn")) {
+      // delete zeros from the beginning of the number
+      identificationNumber = StringUtils.deleteLeadingZeros(identificationNumber);
+      // remove hyphens
+      identificationNumber = StringUtils.removeToken(identificationNumber, "-");
+    }
+    StringBuffer identityLinkDomainIdentifier = new StringBuffer(Constants.URN_PREFIX_WBPK);
+    identityLinkDomainIdentifier.append("+");
+    if (!identificationNumber.startsWith(identifier)) {
+      identityLinkDomainIdentifier.append(identifier);
+    }
+    identityLinkDomainIdentifier.append("+");
+    identityLinkDomainIdentifier.append(identificationNumber);
+    return identityLinkDomainIdentifier.toString();
+  }
+  
+    /**
+   * Builds the parameters for verifying additional infoboxes (additional to the
+   * IdentityLink infobox).
+   * 
+   * @param verifyInfoboxesElem     The <code>VerifyInfoboxes</code> element from the 
+   *                                config file. This maybe the global element or the
+   *                                elment from an Online application.
+   * @param defaultVerifyInfoboxParameters Default parameters to be used, if no 
+   *                                <code>VerifyInfoboxes</code> element is present.
+   *                                 This only applies to parameters
+   *                                of an specific online application and is set to 
+   *                                <code>null</code> when building the global parameters.
+   * @param moaSpIdentityLinkTrustProfileID The ID of the trust profile used for validating
+   *                                the identity link signer certificate. Needed for
+   *                                checking if this ID is not used for validating other 
+   *                                infoboxes.
+   *                           
+   * @return A {@link at.gv.egovernment.moa.id.config.auth.VerifyInfoboxParameters VerifyInfoboxParameters}
+   *         object needed for verifying additional infoboxes.
+   *         
+   * @throws ConfigurationException If the trust profile for validating the identity link 
+   *                                signer certificate is used for validating another infobox.
+   */
+  public VerifyInfoboxParameters buildVerifyInfoboxParameters(
+    Node verifyInfoboxesElem, 
+    VerifyInfoboxParameters defaultVerifyInfoboxParameters,
+    String moaSpIdentityLinkTrustProfileID)
+  throws ConfigurationException
+  {
+    
+    if ((verifyInfoboxesElem == null) && (defaultVerifyInfoboxParameters == null)) {
+      return null;
+    }
+    Vector identifiers = new Vector(); 
+    List defaultIdentifiers = null;
+    Map defaultInfoboxParameters = null;
+    if (defaultVerifyInfoboxParameters != null) {
+      defaultIdentifiers = defaultVerifyInfoboxParameters.getIdentifiers();
+      defaultInfoboxParameters = defaultVerifyInfoboxParameters.getInfoboxParameters();
+    }
+    Hashtable infoboxParameters = new Hashtable();
+    if (verifyInfoboxesElem != null) {
+      // get the DefaultTrustProfileID
+      String defaultTrustProfileID = null;    
+      Node defaultTrustProfileNode =
+        XPathUtils.selectSingleNode(verifyInfoboxesElem, VERIFY_INFOBOXES_DEFAULT_TRUST_PROFILE_XPATH);
+      if (defaultTrustProfileNode != null) {
+        Node trustProfileIDNode =
+          XPathUtils.selectSingleNode(defaultTrustProfileNode, VERIFY_INFOBOXES_TRUST_PROFILE_ID_XPATH);
+        defaultTrustProfileID = trustProfileIDNode.getFirstChild().getNodeValue(); 
+        if (defaultTrustProfileID.equals(moaSpIdentityLinkTrustProfileID)) {
+          throw new ConfigurationException("config.15", new Object[] {moaSpIdentityLinkTrustProfileID});
+        }
+      }      
+      // get the Infoboxes
+      NodeList infoboxes = 
+        XPathUtils.selectNodeList(verifyInfoboxesElem, VERIFY_INFOBOXES_INFOBOX_XPATH);        
+      for (int i=0; i<infoboxes.getLength(); i++) {
+        Element infoBoxElem = (Element)infoboxes.item(i);
+        // get the identifier of the infobox
+        String identifier = infoBoxElem.getAttribute("Identifier");
+        identifiers.add(identifier);
+        VerifyInfoboxParameter verifyInfoboxParameter = new VerifyInfoboxParameter(identifier);
+        verifyInfoboxParameter.setFriendlyName(identifier);
+        // get the attributes
+        // (1) required: override global value in any case
+        verifyInfoboxParameter.setRequired(BoolUtils.valueOf(
+          infoBoxElem.getAttribute("required")));
+        // (2) provideStammzahl: override global value in any case
+        verifyInfoboxParameter.setProvideStammzahl(BoolUtils.valueOf(
+          infoBoxElem.getAttribute("provideStammzahl")));
+        // (3) proviedIdentityLink: override global value in any case
+        verifyInfoboxParameter.setProvideIdentityLink(BoolUtils.valueOf(
+          infoBoxElem.getAttribute("provideIdentityLink")));
+        // set default trustprofileID
+        if (defaultTrustProfileID != null) {
+          verifyInfoboxParameter.setTrustProfileID(defaultTrustProfileID);
+        }
+        // get the parameter elements
+        boolean localValidatorClass = false;
+        boolean localFriendlyName = false;
+        List params = DOMUtils.getChildElements(infoBoxElem);
+        Iterator it = params.iterator();
+        while (it.hasNext()) {
+          Element paramElem = (Element)it.next();                 
+          String paramName = paramElem.getLocalName();
+          if (paramName.equals("FriendlyName")) {
+            verifyInfoboxParameter.setFriendlyName(paramElem.getFirstChild().getNodeValue());
+            localFriendlyName = true;
+          } else if (paramName.equals("TrustProfileID")) {
+            String trustProfileID = paramElem.getFirstChild().getNodeValue();
+            if (trustProfileID != null) {
+              if (trustProfileID.equals(moaSpIdentityLinkTrustProfileID)) {
+                throw new ConfigurationException("config.15", new Object[] {moaSpIdentityLinkTrustProfileID});
+              }
+              verifyInfoboxParameter.setTrustProfileID(trustProfileID);
+            } 
+          } else if (paramName.equals("ValidatorClass")) {
+            String validatorClassName = paramElem.getFirstChild().getNodeValue();
+            if (validatorClassName != null) {
+              verifyInfoboxParameter.setValidatorClassName(validatorClassName);
+              localValidatorClass = true;
+            }            
+          } else if (paramName.equals("SchemaLocations")) {
+            List schemaElems = DOMUtils.getChildElements(paramElem);
+            List schemaLocations = new Vector(schemaElems.size());
+            Iterator schemaIterator = schemaElems.iterator();
+            while (schemaIterator.hasNext()) {
+              Element schemaElem = (Element)schemaIterator.next();
+              String namespace = schemaElem.getAttribute("namespace");
+              String schemaLocation = schemaElem.getAttribute("schemaLocation");
+              // avoid adding the same schema twice
+              Iterator schemaLocationIterator = schemaLocations.iterator();
+              boolean add = true;
+              while (schemaLocationIterator.hasNext()) {                
+                String existingNamespace = ((Schema)schemaLocationIterator.next()).getNamespace();
+                if (namespace.equals(existingNamespace)) {
+                  Logger.warn("Multiple schemas specified for namespace \"" + namespace + 
+                    "\"; only using the first one.");
+                  add = false;
+                  break;
+                }
+              }
+              if (add) {
+                schemaLocations.add(new SchemaImpl(namespace, schemaLocation));
+              }
+            }
+            verifyInfoboxParameter.setSchemaLocations(schemaLocations);            
+          } else if (paramName.equals("ApplicationSpecificParameters")) {
+            verifyInfoboxParameter.setApplicationSpecificParams(paramElem);
+          } else if (paramName.equals("ParepSpecificParameters")) {
+            verifyInfoboxParameter.appendParepSpecificParams(paramElem);
+          }
+        }        
+        // use default values for those parameters not yet set by local configuration
+        if (defaultInfoboxParameters != null) {
+          Object defaultVerifyIP = defaultInfoboxParameters.get(identifier);
+          if (defaultVerifyIP != null) {
+            VerifyInfoboxParameter defaultVerifyInfoboxParameter = 
+              (VerifyInfoboxParameter)defaultVerifyIP;
+            // if no friendly is set, use default
+            if (!localFriendlyName) {
+              verifyInfoboxParameter.setFriendlyName(
+                defaultVerifyInfoboxParameter.getFriendlyName());
+            }
+            // if no TrustProfileID is set, use default, if available
+            if (verifyInfoboxParameter.getTrustProfileID() == null) {
+              verifyInfoboxParameter.setTrustProfileID(
+                defaultVerifyInfoboxParameter.getTrustProfileID());
+            } 
+            // if no local validator class is set, use default
+            if (!localValidatorClass) {
+              verifyInfoboxParameter.setValidatorClassName(
+                defaultVerifyInfoboxParameter.getValidatorClassName());
+            }
+            // if no schema locations set, use default         
+            if (verifyInfoboxParameter.getSchemaLocations() == null) {
+              verifyInfoboxParameter.setSchemaLocations(
+                defaultVerifyInfoboxParameter.getSchemaLocations());
+            }
+            // if no application specific parameters set, use default
+            if (verifyInfoboxParameter.getApplicationSpecificParams() == null) {
+              verifyInfoboxParameter.setApplicationSpecificParams(
+                defaultVerifyInfoboxParameter.getApplicationSpecificParams());
+            }
+          }
+        }
+        infoboxParameters.put(identifier, verifyInfoboxParameter);
+      }
+      // add the infobox identifiers not present within the local configuration to the 
+      // identifier list
+      if (defaultIdentifiers != null) {
+        Iterator identifierIterator = defaultIdentifiers.iterator();
+        while (identifierIterator.hasNext()) {
+          String defaultIdentifier = (String)identifierIterator.next();
+          if (!identifiers.contains(defaultIdentifier)) {
+            identifiers.add(defaultIdentifier);
+          }
+        }
+      }
+      return new VerifyInfoboxParameters(identifiers, infoboxParameters);
+    } else {
+      return new VerifyInfoboxParameters(defaultIdentifiers, infoboxParameters);
+    }       
+  }
+
+  /**
+   * Method warn.
+   * @param messageId to identify a country-specific message
+   * @param parameters for the logger
+   */
+  //
+  // various utility methods
+  //
+
+  protected static void warn(String messageId, Object[] parameters) {
+    Logger.warn(MOAIDMessageProvider.getInstance().getMessage(messageId, parameters));
+  }
+
+  /**
+   * Method warn.
+   * @param messageId to identify a country-specific message
+   * @param args for the logger
+   * @param t as throwabl
+   */
+  protected static void warn(String messageId, Object[] args, Throwable t) {
+    Logger.warn(MOAIDMessageProvider.getInstance().getMessage(messageId, args), t);
+  } 
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
new file mode 100644
index 000000000..e5e6c1f55
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
@@ -0,0 +1,46 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config;
+
+import at.gv.egovernment.moa.id.MOAIDException;
+
+/**
+ * Exception signalling an error in the configuration.
+ * 
+ * @author Patrick Peck
+ * @version $Id$
+ */
+public class ConfigurationException extends MOAIDException {
+
+  /**
+   * Create a <code>MOAConfigurationException</code>.
+   */
+  public ConfigurationException(String messageId, Object[] parameters) {
+    super(messageId, parameters);
+  }
+
+  /**
+   * Create a <code>MOAConfigurationException</code>.
+   */
+  public ConfigurationException(
+    String messageId,
+    Object[] parameters,
+    Throwable wrapped) {
+
+    super(messageId, parameters, wrapped);
+  }
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
new file mode 100644
index 000000000..3c1612ef6
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
@@ -0,0 +1,143 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config;
+
+import java.math.BigInteger;
+import java.security.Principal;
+import java.security.cert.X509Certificate;
+import java.util.Map;
+
+import at.gv.egovernment.moa.id.data.IssuerAndSerial;
+
+/**
+ * Base class for <code>AuthConfigurationProvider</code> and <code>ProxyConfigurationProvider</code>,
+ * providing functions common to both of them.
+ *
+ * @author Paul Ivancsics
+ * @version $Id$
+ */
+public class ConfigurationProvider {
+
+  /**
+   * Constructor
+   */
+  public ConfigurationProvider() {
+    super();
+  }
+
+  /** 
+   * The name of the system property which contains the file name of the 
+   * configuration file.
+   */
+  public static final String CONFIG_PROPERTY_NAME =
+    "moa.id.configuration";
+
+  /**
+   * The name of the generic configuration property giving the certstore directory path.
+   */
+  public static final String DIRECTORY_CERTSTORE_PARAMETER_PROPERTY =
+    "DirectoryCertStoreParameters.RootDir";    
+
+	/**
+	 * The name of the generic configuration property switching the ssl revocation checking on/off
+	 */
+	public static final String TRUST_MANAGER_REVOCATION_CHECKING =
+		"TrustManager.RevocationChecking";    
+
+
+  /**
+     * A <code>Map</code> which contains generic configuration information. Maps a
+     * configuration name (a <code>String</code>) to a configuration value (also a
+     * <code>String</code>).
+     */
+  protected Map genericConfiguration;
+
+  /** The default chaining mode. */
+  protected String defaultChainingMode;
+
+  /** 
+     * A <code>Map</code> which contains the <code>IssuerAndSerial</code> to
+     * chaining mode (a <code>String</code>) mapping.
+     */
+  protected Map chainingModes;
+
+  /**
+     * the URL for the trusted CA Certificates
+     */
+  protected String trustedCACertificates;
+
+	/**
+	 * main configuration file directory name used to configure MOA-ID 
+	 */
+	protected String rootConfigFileDir;
+
+	/**
+		 * Returns the main configuration file directory used to configure MOA-ID
+		 * 
+		 * @return the directory
+		 */
+	public String getRootConfigFileDir() {
+		return rootConfigFileDir;
+	}
+
+  /**
+     * Returns the mapping of generic configuration properties.
+     * 
+     * @return The mapping of generic configuration properties (a name to value
+     * mapping) from the configuration.
+     */
+  public Map getGenericConfiguration() {
+    return genericConfiguration;
+  }
+
+  /**
+     * Returns the value of a parameter from the generic configuration section.
+     * 
+     * @return the parameter value; <code>null</code> if no such parameter
+     */
+  public String getGenericConfigurationParameter(String parameter) {
+  	if (! genericConfiguration.containsKey(parameter))
+  		return null;
+    return (String)genericConfiguration.get(parameter);
+  }
+
+  /**
+     * Return the chaining mode for a given trust anchor.
+     * 
+     * @param trustAnchor The trust anchor for which the chaining mode should be
+     * returned.
+     * @return The chaining mode for the given trust anchor. If the trust anchor
+     * has not been configured separately, the system default will be returned.
+     */
+  public String getChainingMode(X509Certificate trustAnchor) {
+    Principal issuer = trustAnchor.getIssuerDN();
+    BigInteger serial = trustAnchor.getSerialNumber();
+    IssuerAndSerial issuerAndSerial = new IssuerAndSerial(issuer, serial);
+  
+    String mode = (String) chainingModes.get(issuerAndSerial);
+    return mode != null ? mode : defaultChainingMode;
+  }
+
+  /**
+   * Returns the trustedCACertificates.
+   * @return String
+   */
+  public String getTrustedCACertificates() {
+    
+    return trustedCACertificates;
+  }
+  
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java
new file mode 100644
index 000000000..9193a591e
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java
@@ -0,0 +1,121 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config;
+
+/**
+ * This bean class is used to store data for various connectionParameter 
+ * within the MOA-ID configuration 
+ * 
+ * @author Stefan Knirsch
+ * @version $Id$
+ */
+public class ConnectionParameter {
+
+  /**
+   * Server URL
+   */
+  private String url;
+  /**
+   * File URL for a directory containing PKCS#12 server SSL certificates.
+   * From these certificates, a X509 trust store will be assembled for use
+   * by a JSSE <code>TrustManager</code>.
+   * This field will only be used in case of an HTTPS URL.
+   */
+  private String acceptedServerCertificates;
+  /**
+   * File URL of a X509 key store containing the private key to be used
+   * for an HTTPS connection when the server requires client authentication.
+   * This field will only be used in case of an HTTPS URL.
+   */
+  private String clientKeyStore;
+  /**
+   * Password protecting the client key store.
+   */
+  private String clientKeyStorePassword;  
+
+	/**
+	 * Checks whether the URL scheme is <code>"https"</code>.
+	 * @return true in case of an URL starting with <code>"https"</code>
+	 */
+	public boolean isHTTPSURL() {
+		return getUrl().indexOf("https") == 0;
+	}
+	  
+  /**
+   * Returns the url.
+   * @return String
+   */
+  public String getUrl() {
+    return url;
+  }
+
+  /**
+   * Returns the acceptedServerCertificates.
+   * @return String
+   */
+  public String getAcceptedServerCertificates() {
+    return acceptedServerCertificates;
+  }
+
+  /**
+   * Sets the acceptedServerCertificates.
+   * @param acceptedServerCertificates The acceptedServerCertificates to set
+   */
+  public void setAcceptedServerCertificates(String acceptedServerCertificates) {
+    this.acceptedServerCertificates = acceptedServerCertificates;
+  }
+
+  /**
+   * Sets the url.
+   * @param url The url to set
+   */
+  public void setUrl(String url) {
+    this.url = url;
+  }
+
+  /**
+   * Returns the clientKeyStore.
+   * @return String
+   */
+  public String getClientKeyStore() {
+    return clientKeyStore;
+  }
+
+  /**
+   * Returns the clientKeyStorePassword.
+   * @return String
+   */
+  public String getClientKeyStorePassword() {
+    return clientKeyStorePassword;
+  }
+
+  /**
+   * Sets the clientKeyStore.
+   * @param clientKeyStore The clientKeyStore to set
+   */
+  public void setClientKeyStore(String clientKeyStore) {
+    this.clientKeyStore = clientKeyStore;
+  }
+
+  /**
+   * Sets the clientKeyStorePassword.
+   * @param clientKeyStorePassword The clientKeyStorePassword to set
+   */
+  public void setClientKeyStorePassword(String clientKeyStorePassword) {
+    this.clientKeyStorePassword = clientKeyStorePassword;
+  }
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
new file mode 100644
index 000000000..f5aa9225a
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
@@ -0,0 +1,115 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config;
+
+/**
+ * Configuration parameters belonging to an online application,
+ * to be used within both, the MOA ID Auth and the 
+ * MOA ID PROXY component.
+ * 
+ * @author Harald Bratko
+ */
+public class OAParameter {
+
+  /**
+   * type of the online application (maybe "PublicService" or "BusinessService")
+   */
+  private String oaType;
+  
+  /**
+   * specifies whether the online application is a business application or not
+   * (<code>true</code> if value of {@link #oaType} is "businessService"
+   */
+  private boolean businessService;
+  
+  /**
+   * public URL prefix of the online application
+   */
+  private String publicURLPrefix;
+  
+  /**
+   * specifies a human readable name of the Online Application
+   */
+  private String friendlyName;
+  
+  /**
+   * Returns the type of the online application.
+   * @return the type of the online application.
+   */
+  public String getOaType() {
+    return oaType;
+  }
+  
+  /**
+   * Returns <code>true</code> is the OA is a businss application, otherwise 
+   * <code>false</code>.
+   * @return <code>true</code> is the OA is a businss application, otherwise 
+   * <code>false</code>
+   */
+  public boolean getBusinessService() {
+    return this.businessService;
+  }
+  
+  /**
+   * Returns the publicURLPrefix.
+   * @return String
+   */
+  public String getPublicURLPrefix() {
+    return publicURLPrefix;
+  }
+  
+  /**
+   * 
+   * Sets the type of the online application.
+   * If the type is "businessService" the value of <code>businessService</code> 
+   * ({@link #getBusinessService()}) is also set to <code>true</code>
+   * @param oaType The type of the online application.
+   */
+  public void setOaType(String oaType) {
+    this.oaType = oaType;
+    if ("businessService".equalsIgnoreCase(oaType)) {
+      this.businessService = true;
+    }
+  }
+  
+  /**
+   * Sets the publicURLPrefix.
+   * @param publicURLPrefix The publicURLPrefix to set
+   */
+  public void setPublicURLPrefix(String publicURLPrefix) {
+    this.publicURLPrefix = publicURLPrefix;
+  }
+  
+  
+  /**
+   * Gets the friendly name of the OA
+   * @return Friendly Name of the OA
+   */
+   public String getFriendlyName() {
+      return friendlyName;
+   }
+   
+   /**
+    * Sets the friendly name of the OA
+    * @param friendlyName
+    */
+   public void setFriendlyName(String friendlyName) {
+      this.friendlyName = friendlyName;
+   }
+  
+  
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetToSectorNameMapper.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetToSectorNameMapper.java
new file mode 100644
index 000000000..af28be56a
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetToSectorNameMapper.java
@@ -0,0 +1,67 @@
+/**

+ * 

+ */

+package at.gv.egovernment.moa.id.config;

+

+import java.util.HashMap;

+import java.util.Map;

+

+/**

+ * @author bzwattendorfer

+ *

+ */

+public class TargetToSectorNameMapper implements TargetsAndSectorNames {

+

+	private static Map targetMap = new HashMap(41);

+	

+	static {

+		targetMap.put(TARGET_AR, TARGET_AR_SECTOR);

+		targetMap.put(TARGET_AS, TARGET_AS_SECTOR);

+		targetMap.put(TARGET_BF, TARGET_BF_SECTOR);

+		targetMap.put(TARGET_BR, TARGET_BR_SECTOR);

+		targetMap.put(TARGET_BW, TARGET_BW_SECTOR);

+		targetMap.put(TARGET_EA, TARGET_EA_SECTOR);

+		targetMap.put(TARGET_EF, TARGET_EF_SECTOR);

+		targetMap.put(TARGET_GH, TARGET_GH_SECTOR);

+		targetMap.put(TARGET_GS, TARGET_GS_SECTOR);

+		targetMap.put(TARGET_GS_RE, TARGET_GS_RE_SECTOR);

+		targetMap.put(TARGET_HR, TARGET_HR_SECTOR);

+		targetMap.put(TARGET_JR, TARGET_JR_SECTOR);

+		targetMap.put(TARGET_KI, TARGET_KI_SECTOR);

+		targetMap.put(TARGET_KL, TARGET_KL_SECTOR);

+		targetMap.put(TARGET_KU, TARGET_KU_SECTOR);

+		targetMap.put(TARGET_LF, TARGET_LF_SECTOR);

+		targetMap.put(TARGET_LV, TARGET_LV_SECTOR);

+		targetMap.put(TARGET_OI, TARGET_OI_SECTOR);

+		targetMap.put(TARGET_PV, TARGET_PV_SECTOR);

+		targetMap.put(TARGET_RD, TARGET_RD_SECTOR);

+		targetMap.put(TARGET_RT, TARGET_RT_SECTOR);

+		targetMap.put(TARGET_SA, TARGET_SA_SECTOR);

+		targetMap.put(TARGET_SF, TARGET_SF_SECTOR);

+		targetMap.put(TARGET_SO, TARGET_SO_SECTOR);

+		targetMap.put(TARGET_SO_VR, TARGET_SO_VR_SECTOR);

+		targetMap.put(TARGET_SR_RG, TARGET_SR_RG_SECTOR);

+		targetMap.put(TARGET_SV, TARGET_SV_SECTOR);

+		targetMap.put(TARGET_UW, TARGET_UW_SECTOR);

+		targetMap.put(TARGET_VT, TARGET_VT_SECTOR);

+		targetMap.put(TARGET_VV, TARGET_VV_SECTOR);

+		targetMap.put(TARGET_WT, TARGET_WT_SECTOR);

+		targetMap.put(TARGET_ZP, TARGET_ZP_SECTOR);

+		targetMap.put(TARGET_BR, TARGET_BR_SECTOR);

+		targetMap.put(TARGET_HR, TARGET_HR_SECTOR);

+		targetMap.put(TARGET_KI, TARGET_KI_SECTOR);

+		targetMap.put(TARGET_OI, TARGET_OI_SECTOR);

+		targetMap.put(TARGET_PV, TARGET_PV_SECTOR);

+		targetMap.put(TARGET_RD, TARGET_RD_SECTOR);

+		targetMap.put(TARGET_VS, TARGET_VS_SECTOR);

+		targetMap.put(TARGET_VS_RG, TARGET_VS_RG_SECTOR);

+		targetMap.put(TARGET_ZU, TARGET_ZU_SECTOR);		

+		

+	}

+	

+	public static String getSectorNameViaTarget(String target) {

+		

+		return targetMap.get(target) != null ? (String) targetMap.get(target) : ""; 

+	}

+	

+}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java
new file mode 100644
index 000000000..c30e7b2b6
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java
@@ -0,0 +1,194 @@
+/**

+ * 

+ */

+package at.gv.egovernment.moa.id.config;

+

+import java.util.HashMap;

+import java.util.Map;

+

+/**

+ * This interface contains all actual possible targets in Austria (shortcuts and friendly names)

+ * Bereichskennung and Tätigkeitsbereich

+ * @author bzwattendorfer

+ *

+ */

+public interface TargetsAndSectorNames {

+	

+	/** Bereichskennung AR */

+	public static String TARGET_AR = "AR";

+	/** Tätigkeitsbereich AR */

+	public static String TARGET_AR_SECTOR = "Arbeit";

+	

+	/** Bereichskennung AS */

+	public static String TARGET_AS = "AS";

+	/** Tätigkeitsbereich AS */

+	public static String TARGET_AS_SECTOR = "Amtliche Statistik";

+	

+	/** Bereichskennung BF */

+	public static String TARGET_BF = "BF";

+	/** Tätigkeitsbereich BF */

+	public static String TARGET_BF_SECTOR = "Bildung und Forschung";

+	

+	/** Bereichskennung BW */

+	public static String TARGET_BW = "BW";

+	/** Tätigkeitsbereich BW */

+	public static String TARGET_BW_SECTOR = "Bauen und Wohnen";

+	

+	/** Bereichskennung EA */

+	public static String TARGET_EA = "EA";

+	/** Tätigkeitsbereich EA */

+	public static String TARGET_EA_SECTOR = "EU und Auswärtige Angelegenheiten";

+	

+	/** Bereichskennung EF */

+	public static String TARGET_EF = "EF";

+	/** Tätigkeitsbereich EF */

+	public static String TARGET_EF_SECTOR = "Ein- und Ausfuhr";

+	

+	/** Bereichskennung GH */

+	public static String TARGET_GH = "GH";

+	/** Tätigkeitsbereich GH */

+	public static String TARGET_GH_SECTOR = "Gesundheit";

+	

+	/** Bereichskennung GS */

+	public static String TARGET_GS = "GS";

+	/** Tätigkeitsbereich GS */

+	public static String TARGET_GS_SECTOR = "Gesellschaft und Soziales";

+	

+	/** Bereichskennung GS-RE */

+	public static String TARGET_GS_RE = "GS-RE";

+	/** Tätigkeitsbereich GS-RE */

+	public static String TARGET_GS_RE_SECTOR = "Restitution";

+	

+	/** Bereichskennung JR */

+	public static String TARGET_JR = "JR";

+	/** Tätigkeitsbereich JR */

+	public static String TARGET_JR_SECTOR = "Justiz/Zivilrechtswesen";

+	

+	/** Bereichskennung KL */

+	public static String TARGET_KL = "KL";

+	/** Tätigkeitsbereich KL */

+	public static String TARGET_KL_SECTOR = "Kultus";

+	

+	/** Bereichskennung KU */

+	public static String TARGET_KU = "KU";

+	/** Tätigkeitsbereich KU */

+	public static String TARGET_KU_SECTOR = "Kunst und Kultur";

+	

+	/** Bereichskennung LF */

+	public static String TARGET_LF = "LF";

+	/** Tätigkeitsbereich LF */

+	public static String TARGET_LF_SECTOR = "Land- und Forstwirtschaft";

+	

+	/** Bereichskennung LV */

+	public static String TARGET_LV = "LV";

+	/** Tätigkeitsbereich LV */

+	public static String TARGET_LV_SECTOR = "Landesverteidigung";

+	

+	/** Bereichskennung RT */

+	public static String TARGET_RT = "RT";

+	/** Tätigkeitsbereich RT */

+	public static String TARGET_RT_SECTOR = "Rundfunk und sonstige " +

+			"Medien sowie Telekommunikation";

+	

+	/** Bereichskennung SA */

+	public static String TARGET_SA = "SA";

+	/** Tätigkeitsbereich SA */

+	public static String TARGET_SA_SECTOR = "Steuern und Abgaben";

+	

+	/** Bereichskennung SF */

+	public static String TARGET_SF = "SF";

+	/** Tätigkeitsbereich SF */

+	public static String TARGET_SF_SECTOR = "Sport und Freizeit";

+	

+	/** Bereichskennung SO */

+	public static String TARGET_SO = "SO";

+	/** Tätigkeitsbereich SO */

+	public static String TARGET_SO_SECTOR = "Sicherheit und Ordnung";

+	

+	/** Bereichskennung SO-VR */

+	public static String TARGET_SO_VR = "SO-VR";

+	/** Tätigkeitsbereich SO-VR */

+	public static String TARGET_SO_VR_SECTOR = "Vereinsregister";

+	

+	/** Bereichskennung SR-RG */

+	public static String TARGET_SR_RG = "SR-RG";

+	/** Tätigkeitsbereich SR-RG */

+	public static String TARGET_SR_RG_SECTOR = "Strafregister";

+	

+	/** Bereichskennung SV */

+	public static String TARGET_SV = "SV";

+	/** Tätigkeitsbereich SV */

+	public static String TARGET_SV_SECTOR = "Sozialversicherung";

+	

+	/** Bereichskennung UW */

+	public static String TARGET_UW = "UW";

+	/** Tätigkeitsbereich UW */

+	public static String TARGET_UW_SECTOR = "Umwelt";

+	

+	/** Bereichskennung VT */

+	public static String TARGET_VT = "VT";

+	/** Tätigkeitsbereich VT */

+	public static String TARGET_VT_SECTOR = "Verkehr und Technik";

+	

+	/** Bereichskennung VV */

+	public static String TARGET_VV = "VV";

+	/** Tätigkeitsbereich VV */

+	public static String TARGET_VV_SECTOR = "Vermögensverwaltung";

+	

+	/** Bereichskennung WT */

+	public static String TARGET_WT = "WT";

+	/** Tätigkeitsbereich WT */

+	public static String TARGET_WT_SECTOR = "Wirtschaft";

+	

+	/** Bereichskennung ZP */

+	public static String TARGET_ZP = "ZP";

+	/** Tätigkeitsbereich ZP */

+	public static String TARGET_ZP_SECTOR = "Personenidentität und Bürgerrechte (zur Person)";

+	

+	/** Bereichskennung BR */

+	public static String TARGET_BR = "BR";

+	/** Tätigkeitsbereich BR */

+	public static String TARGET_BR_SECTOR = "Bereichsübergreifender Rechtsschutz";

+	

+	/** Bereichskennung HR */

+	public static String TARGET_HR = "HR";

+	/** Tätigkeitsbereich HR */

+	public static String TARGET_HR_SECTOR = "Zentrales Rechnungswesen";

+	

+	/** Bereichskennung KI */

+	public static String TARGET_KI = "KI";

+	/** Tätigkeitsbereich KI */

+	public static String TARGET_KI_SECTOR = "Auftraggeberinterne allgemeine Kanzleiindizes";

+	

+	/** Bereichskennung OI */

+	public static String TARGET_OI = "OI";

+	/** Tätigkeitsbereich OI */

+	public static String TARGET_OI_SECTOR = "Öffentlichkeitsarbeit";

+	

+	/** Bereichskennung PV */

+	public static String TARGET_PV = "PV";

+	/** Tätigkeitsbereich PV */

+	public static String TARGET_PV_SECTOR = "Personalverwaltung";

+	

+	/** Bereichskennung RD */

+	public static String TARGET_RD = "RD";

+	/** Tätigkeitsbereich RD */

+	public static String TARGET_RD_SECTOR = "Zentraler Rechtsdienst";

+	

+	/** Bereichskennung VS */

+	public static String TARGET_VS = "VS";

+	/** Tätigkeitsbereich VS */

+	public static String TARGET_VS_SECTOR = "Zentrale Durchführung von Verwaltungsstrafverfahren";

+	

+	/** Bereichskennung VS-RG */

+	public static String TARGET_VS_RG = "VS-RG";

+	/** Tätigkeitsbereich VS-RG */

+	public static String TARGET_VS_RG_SECTOR = "Zentrales Verwaltungsstrafregister";

+	

+	/** Bereichskennung ZU */

+	public static String TARGET_ZU = "ZU";

+	/** Tätigkeitsbereich ZU */

+	public static String TARGET_ZU_SECTOR = "Zustellungen";

+			

+

+}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
new file mode 100644
index 000000000..ceb047280
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -0,0 +1,478 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.auth;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.util.List;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.ConfigurationProvider;
+import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.XPathUtils;
+
+/**
+ * A class providing access to the Auth Part of the MOA-ID configuration data.
+ * 
+ * <p>Configuration data is read from an XML file, whose location is given by
+ * the <code>moa.id.configuration</code> system property.</p>
+ * <p>This class implements the Singleton pattern. The <code>reload()</code>
+ * method can be used to update the configuration data. Therefore, it is not
+ * guaranteed that consecutive calls to <code>getInstance()</code> will return
+ * the same <code>AuthConfigurationProvider</code> all the time. During the
+ * processing of a web service request, the current
+ * <code>TransactionContext</code> should be used to obtain the
+ * <code>AuthConfigurationProvider</code> local to that request.</p>
+ * 
+ * @author Patrick Peck
+ * @author Stefan Knirsch
+ * 
+ * @version $Id$
+ */
+public class AuthConfigurationProvider extends ConfigurationProvider {
+	
+  /**  DEFAULT_ENCODING is "UTF-8" */
+  private static final String DEFAULT_ENCODING="UTF-8";
+  /**
+   * The name of the generic configuration property giving the authentication session time out.
+   */
+  public static final String AUTH_SESSION_TIMEOUT_PROPERTY =
+    "AuthenticationSession.TimeOut";
+  /**
+   * The name of the generic configuration property giving the authentication data time out.
+   */
+  public static final String AUTH_DATA_TIMEOUT_PROPERTY =
+    "AuthenticationData.TimeOut";
+
+  /**
+   * BKUSelectionType HTMLComplete, according to schema type <code>BKUSelectionType</code>
+   */
+  public static final String BKU_SELECTION_TYPE_HTMLCOMPLETE = 
+    "HTMLComplete";
+    
+  /**
+   * BKUSelectionType HTMLSelect, according to schema type <code>BKUSelectionType</code>
+   */
+  public static final String BKU_SELECTION_TYPE_HTMLSELECT = 
+    "HTMLSelect";
+
+	/**
+	 * The name of the generic configuration property allowing https connection to 
+	 * the user frontend servlets ("StartAuthentication" and "SelectBKU" servlets)
+	 */
+	public static final String FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY =
+		"FrontendServlets.EnableHTTPConnection";
+
+	/**
+	 * The name of the generic configuration property allowing to set a individual 
+	 * DATA URL used to communicate with the BKU (SecurityLayer)
+	 */
+	public static final String INDIVIDUAL_DATA_URL_PREFIX =
+		"FrontendServlets.DataURLPrefix";
+    
+  /** Singleton instance. <code>null</code>, if none has been created. */
+  private static AuthConfigurationProvider instance;
+
+  //
+  // configuration data
+  //
+  
+  /**
+	 * configuration files containing transformations for rendering in the 
+	 * secure viewer of the security layer implementation;
+	 * multiple files can be given for different mime types
+	 */
+  private String[] transformsInfoFileNames;
+  
+	/**
+	 * transformations for rendering in the secure viewer of the security layer implementation,
+	 * read from {@link transformsInfoFileNames};
+	 * multiple transformation can be given for different mime types
+	 */
+  private String[] transformsInfos;
+  
+  /**
+   * parameters for connection to MOA SP component
+   */
+  private ConnectionParameter moaSpConnectionParameter;
+  
+
+	/**
+	 * trust profile ID to be used for verifying the identity link signature via MOA ID SP
+	 */  
+  private String moaSpIdentityLinkTrustProfileID;
+	/**
+	 * trust profile ID to be used for verifying the AUTH block signature via MOA ID SP
+	 */  
+  private String moaSpAuthBlockTrustProfileID;
+	/**
+	 * transformations to be used for verifying the AUTH block signature via MOA ID SP
+	 */  
+  private String[] moaSpAuthBlockVerifyTransformsInfoIDs;
+  /**
+   * X509 SubjectNames which will be trusted
+   */
+  private List identityLinkX509SubjectNames;
+  /**
+   * default parameters for verifying additional infoboxes.
+   */
+  private VerifyInfoboxParameters defaultVerifyInfoboxParameters;
+ 
+  /**
+   * configuration parameters for online applications
+   */
+  private OAAuthParameter[] onlineApplicationAuthParameters;
+  /**
+   * the Selection Type of the bku Selection Element
+   */
+  private String bKUSelectionType;
+  /**
+   * is the bku Selection Element present?
+   */
+  private boolean bKUSelectable;
+  /**
+   * the bku Selection Connection Parameters
+   */
+  private ConnectionParameter bKUConnectionParameter;
+  
+  /**
+   * parameter for connection to SZR-GW GetIdentityLink
+   */
+  private ConnectionParameter foreignIDConnectionParameter;
+  
+  /**
+   * parameter for connection to OnlineMandates Service
+   */
+  private ConnectionParameter onlineMandatesConnectionParameter;
+  
+  /**
+   * Parameter for trusted BKUs
+   */
+  private List trustedBKUs;
+  
+ /**
+   * Return the single instance of configuration data.
+   * 
+   * @return AuthConfigurationProvider The current configuration data.
+   * @throws ConfigurationException 
+   */
+  public static synchronized AuthConfigurationProvider getInstance()
+    throws ConfigurationException {
+
+    if (instance == null) {
+      reload();
+    }
+    return instance;
+  }
+
+  /**
+   * Reload the configuration data and set it if successful.
+   * 
+   * @return AuthConfigurationProvider The loaded configuration data.
+   * @throws ConfigurationException Failure to load the configuration data.
+   */
+  public static synchronized AuthConfigurationProvider reload()
+    throws ConfigurationException {
+    String fileName = System.getProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME);
+    if (fileName == null) {
+      throw new ConfigurationException("config.01", null);
+    }
+    Logger.info("Loading MOA-ID-AUTH configuration " + fileName);
+
+    instance = new AuthConfigurationProvider(fileName);
+    return instance;
+  }
+
+  /**
+   * Constructor for AuthConfigurationProvider.
+   * @param fileName
+   * @throws ConfigurationException
+   */
+  public AuthConfigurationProvider(String fileName)
+    throws ConfigurationException {
+
+    load(fileName);
+  }
+
+  /**
+   * Load the configuration data from XML file with the given name and build
+   * the internal data structures representing the MOA ID configuration.
+   * 
+   * @param fileName The name of the XML file to load.
+   * @throws ConfigurationException The MOA configuration could not be
+   * read/built.
+   */
+  private void load(String fileName) throws ConfigurationException {
+    InputStream stream = null;
+    Element configElem;
+    ConfigurationBuilder builder;
+		
+    try {
+      // load the main config file
+      stream = new BufferedInputStream(new FileInputStream(fileName));
+      configElem = DOMUtils.parseXmlValidating(stream);
+    } catch (Throwable t) {
+      throw new ConfigurationException("config.03", null, t);
+    } 
+    finally {
+      try {
+        if (stream != null) {
+          stream.close();
+        }
+      } catch (IOException e) {
+      }
+    }
+		try {
+			// determine the directory of the root config file
+			rootConfigFileDir = new File(fileName).getParent();		
+			try {
+			  rootConfigFileDir = new File(rootConfigFileDir).toURL().toString();
+			} catch (MalformedURLException t) {
+				throw new ConfigurationException("config.03", null, t);
+		  }
+		  		  
+        // build the internal datastructures
+    	builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
+    	bKUConnectionParameter = builder.buildAuthBKUConnectionParameter();
+    	bKUSelectable = (bKUConnectionParameter!=null);
+    	bKUSelectionType = builder.buildAuthBKUSelectionType();
+    	genericConfiguration = builder.buildGenericConfiguration();
+    	transformsInfoFileNames = builder.buildTransformsInfoFileNames(builder.getConfigElem(), ConfigurationBuilder.AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);
+    	transformsInfos = builder.loadTransformsInfos(transformsInfoFileNames);
+    	moaSpConnectionParameter = builder.buildMoaSpConnectionParameter();
+    	moaSpIdentityLinkTrustProfileID = builder.getMoaSpIdentityLinkTrustProfileID();
+    	moaSpAuthBlockTrustProfileID = builder.getMoaSpAuthBlockTrustProfileID();
+    	moaSpAuthBlockVerifyTransformsInfoIDs = builder.buildMoaSpAuthBlockVerifyTransformsInfoIDs();
+        defaultVerifyInfoboxParameters = null;
+        Node defaultVerifyInfoboxParamtersElem = XPathUtils.selectSingleNode(configElem, ConfigurationBuilder.AUTH_VERIFY_INFOBOXES_XPATH);
+        if (defaultVerifyInfoboxParamtersElem != null) {
+          defaultVerifyInfoboxParameters = 
+            builder.buildVerifyInfoboxParameters((Element)defaultVerifyInfoboxParamtersElem, null, moaSpIdentityLinkTrustProfileID);
+        }
+        
+        
+      foreignIDConnectionParameter = builder.buildForeignIDConnectionParameter();
+      onlineMandatesConnectionParameter = builder.buildOnlineMandatesConnectionParameter();
+    	onlineApplicationAuthParameters  = builder.buildOnlineApplicationAuthParameters(defaultVerifyInfoboxParameters, moaSpIdentityLinkTrustProfileID);
+    	identityLinkX509SubjectNames =  builder.getIdentityLink_X509SubjectNames();
+    	defaultChainingMode = builder.getDefaultChainingMode();
+    	chainingModes = builder.buildChainingModes();  
+    	trustedCACertificates = builder.getTrustedCACertificates();
+    	trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);
+    	trustedBKUs = builder.getTrustedBKUs();
+
+    } catch (Throwable t) {
+      throw new ConfigurationException("config.02", null, t);
+  	}
+  }
+
+  /**
+   * Loads the <code>transformsInfos</code> from files.
+   * @throws Exception on any exception thrown
+   */
+//  private void loadTransformsInfos() throws Exception {
+//	 	
+//	 	transformsInfos = new String[transformsInfoFileNames.length];
+//  	for (int i = 0; i < transformsInfoFileNames.length; i++) {
+//  		String fileURL = transformsInfoFileNames[i];
+//
+//			//if fileURL is relative to rootConfigFileDir make it absolute 					
+//			fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);  		
+//			String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
+// 			transformsInfos[i] = transformsInfo;
+//  	}
+//  }
+  
+  /**
+   * Loads the <code>transformsInfos</code> from files.
+   * @throws Exception on any exception thrown
+   */
+  private String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception {
+    
+    String[] transformsInfos = new String[transformsInfoFileNames.length];
+    for (int i = 0; i < transformsInfoFileNames.length; i++) {
+      String fileURL = transformsInfoFileNames[i];
+
+      //if fileURL is relative to rootConfigFileDir make it absolute          
+      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);      
+      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
+      transformsInfos[i] = transformsInfo;
+    }
+    return transformsInfos;
+  }
+  /**
+   * Return a string array with all filenames leading
+   * to the Transforms Information for the Security Layer
+   * @return String[] of filenames to the Security Layer Transforms Information
+   */
+  public String[] getTransformsInfoFileNames()  {
+  	return transformsInfoFileNames;
+  }
+  
+  /**
+   * Build an array of the OnlineApplication Parameters containing information 
+   * about the authentication component
+   * @return An OAProxyParameter array containing beans
+   * with all relevant information for theauthentication component of the online 
+   * application
+   */
+  public OAAuthParameter[] getOnlineApplicationParameters() {
+    return onlineApplicationAuthParameters;
+  }
+
+  /**
+   * Provides configuration information regarding the online application behind
+   * the given URL, relevant to the MOA-ID Auth component.
+   * 
+   * @param oaURL URL requested for an online application
+   * @return an <code>OAAuthParameter</code>, or <code>null</code>
+   * 					if none is applicable
+   */
+  public OAAuthParameter getOnlineApplicationParameter(String oaURL) {
+  	OAAuthParameter[] oaParams = getOnlineApplicationParameters();
+  	for (int i = 0; i < oaParams.length; i++) {
+  		OAAuthParameter oaParam = oaParams[i];
+  		if (oaURL.indexOf(oaParam.getPublicURLPrefix()) == 0)
+  			return oaParam;
+  	}
+    return null;
+  }
+
+  /**
+   * Return a string with a url-reference to the VerifyAuthBlock trust 
+   * profile id within the moa-sp part of the authentication component
+   * 
+   * @return String with a url-reference to the VerifyAuthBlock trust profile ID
+   */
+  public String getMoaSpAuthBlockTrustProfileID() {
+    return moaSpAuthBlockTrustProfileID;
+  }
+
+  /**
+   * Return a string array with references to all verify transform info 
+   * IDs within the moa-sp part of the authentication component
+   * @return A string array containing all urls to the 
+   * verify transform info IDs
+   */
+  public String[] getMoaSpAuthBlockVerifyTransformsInfoIDs() {
+    return moaSpAuthBlockVerifyTransformsInfoIDs;
+  }
+
+  /**
+   * Return a ConnectionParameter bean containing all information
+   * of the authentication component moa-sp element 
+   * @return ConnectionParameter of the authentication component moa-sp element 
+   */
+  public ConnectionParameter getMoaSpConnectionParameter() {
+    return moaSpConnectionParameter;
+  }
+  
+  /**
+   * Return a ConnectionParameter bean containing all information
+   * of the authentication component foreigid element
+   * @return ConnectionParameter of the authentication component foreignid element
+   */
+  public ConnectionParameter getForeignIDConnectionParameter() {
+     return foreignIDConnectionParameter;
+  }
+  
+  /**
+   * Return a ConnectionParameter bean containing all information
+   * of the authentication component OnlineMandates element
+   * @return ConnectionParameter of the authentication component OnlineMandates element
+   */
+  public ConnectionParameter getOnlineMandatesConnectionParameter() {
+     return onlineMandatesConnectionParameter;
+  }
+
+  /**
+   * Return a string with a url-reference to the VerifyIdentityLink trust 
+   * profile id within the moa-sp part of the authentication component
+   * @return String with a url-reference to the VerifyIdentityLink trust profile ID
+   */
+  public String getMoaSpIdentityLinkTrustProfileID() {
+    return moaSpIdentityLinkTrustProfileID;
+  }
+  /**
+   * Returns the transformsInfos.
+   * @return String[]
+   */
+  public String[] getTransformsInfos() {
+    return transformsInfos;
+  }
+
+  /**
+   * Returns the identityLinkX509SubjectNames.
+   * @return List
+   */
+  public List getIdentityLinkX509SubjectNames() {
+    return identityLinkX509SubjectNames;
+  }
+  
+  /**
+   * Returns the trustBKUs.
+   * @return List
+   */
+  public List getTrustedBKUs() {
+    return this.trustedBKUs;
+  }
+
+
+  /**
+   * Returns the bKUConnectionParameter.
+   * @return ConnectionParameter
+   */
+  public ConnectionParameter getBKUConnectionParameter() {
+    return bKUConnectionParameter;
+  }
+
+  /**
+   * Returns the bKUSelectable.
+   * @return boolean
+   */
+  public boolean isBKUSelectable() {
+    return bKUSelectable;
+  }
+
+  /**
+   * Returns the bKUSelectionType.
+   * @return String
+   */
+  public String getBKUSelectionType() {
+    return bKUSelectionType;
+  }
+
+  /**
+   * Returns the defaultVerifyInfoboxParameters.
+   *
+   * @return The defaultVerifyInfoboxParameters.
+   */
+  public VerifyInfoboxParameters getDefaultVerifyInfoboxParameters() {
+    return defaultVerifyInfoboxParameters;
+  }
+
+}
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
new file mode 100644
index 000000000..aa5aa21a3
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -0,0 +1,350 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.auth;
+
+import at.gv.egovernment.moa.id.config.OAParameter;
+
+/**
+ * Configuration parameters belonging to an online application,
+ * to use with the MOA ID Auth component.
+ *
+ * @author Stefan Knirsch
+ * @version $Id$
+ */
+/**
+ * 
+ * 
+ * @author Harald Bratko
+ */
+public class OAAuthParameter extends OAParameter {
+  /**
+   * Sercurity Layer version
+   */
+  private String slVersion;
+  /**
+   * true, if the Security Layer version is version 1.2, otherwise false
+   */
+  private boolean slVersion12;
+  /**
+   * identityLinkDomainIdentifier 
+   * (e.g <code>urn:publicid:gv.at+wbpk+FN468i</code> for a "Firmenbuchnummer") 
+   * <br>
+   * only used within a business application context for providing it to the  
+   * security layer as input for wbPK computation
+   */
+  private String identityLinkDomainIdentifier;  
+   /**
+    * key box Identifier (e.g. CertifiedKeypair, SecureSignatureKeypair)
+    */  
+  private String keyBoxIdentifier;
+  /**
+   * transformations for rendering in the secure viewer of the security layer 
+   * implementation; multiple transformation can be given for different mime types
+   */  
+  private String[] transformsInfos;
+   /**
+    * determines whether "Stammzahl" is to be included in the authentication data
+    */
+  private boolean provideStammzahl;
+   /**
+    * determines whether AUTH block is to be included in the authentication data
+    */
+  private boolean provideAuthBlock;
+   /**
+    * determines whether identity link is to be included in the authentication data
+    */
+  private boolean provideIdentityLink;
+  /**
+   * determines whether the certificate is to be included in the authentication data
+   */
+  private boolean provideCertificate;
+  /**
+   * url to a template for web page "Auswahl der B&uuml;rgerkartenumgebung"
+   */
+  private String bkuSelectionTemplateURL;
+  /**
+   * template for web page "Anmeldung mit B&uuml;rgerkarte"
+   */
+  private String templateURL;
+  /**
+   * template for web page "Signatur der Anmeldedaten"
+   */
+  private String inputProcessorSignTemplateURL;
+  /**
+   * Parameters for verifying infoboxes.
+   */
+  private VerifyInfoboxParameters verifyInfoboxParameters;
+  
+  /**
+   * Parameter for Mandate profiles
+   */
+  private String mandateProfiles;
+  
+  /**
+   * BZ
+   * Type for authentication number (e.g. Firmenbuchnummer)
+   */
+  private String identityLinkDomainIdentifierType;
+  
+  /**
+   * Returns <code>true</code> if the Security Layer version is version 1.2,
+   * otherwise <code>false</code>.
+   * @return <code>true</code> if the Security Layer version is version 1.2,
+   * otherwise <code>false</code>
+   */
+  public boolean getSlVersion12() {
+    return slVersion12;
+  }
+  
+  /**
+   * Returns the security layer version.
+   * @return the security layer version.
+   */
+  public String getSlVersion() {
+    return slVersion;
+  }
+  
+  /**
+   * Returns the identityLinkDomainIdentifier.
+   * @return the identityLinkDomainIdentifier.
+   */
+  public String getIdentityLinkDomainIdentifier() {
+    return identityLinkDomainIdentifier;
+  }
+  
+  /**
+   * Returns the transformsInfos.
+   * @return the transformsInfos.
+   */
+  public String[] getTransformsInfos() {
+    return transformsInfos;
+  }
+  
+  /**
+   * Returns the provideAuthBlock.
+   * @return String
+   */
+  public boolean getProvideAuthBlock() {
+    return provideAuthBlock;
+  }
+
+  /**
+   * Returns the provideIdentityLink.
+   * @return String
+   */
+  public boolean getProvideIdentityLink() {
+    return provideIdentityLink;
+  }
+
+  /**
+   * Returns the provideStammzahl.
+   * @return String
+   */
+  public boolean getProvideStammzahl() {
+    return provideStammzahl;
+  }
+  
+  /**
+   * Returns <code>true</code> if the certificate should be provided within the
+   * authentication data, otherwise <code>false</code>.
+   * @return <code>true</code> if the certificate should be provided, 
+   *         otherwise <code>false</code>
+   */
+  public boolean getProvideCertifcate() {
+    return provideCertificate;
+  }
+  
+   /**
+      * Returns the key box identifier.
+      * @return String
+      */
+    public String getKeyBoxIdentifier() {
+       return keyBoxIdentifier;
+    }
+   
+   /**
+   * Returns the BkuSelectionTemplate url.
+   * @return The BkuSelectionTemplate url or <code>null</code> if no url for
+   *         a BkuSelectionTemplate is set.
+   */
+  public String getBkuSelectionTemplateURL() {
+    return bkuSelectionTemplateURL;
+  }
+  
+  /**
+   * Returns the TemplateURL url.
+   * @return The TemplateURL url or <code>null</code> if no url for
+   *         a Template is set.
+   */
+  public String getTemplateURL() {
+    return templateURL;
+  } 
+  
+  /**
+   * Returns the inputProcessorSignTemplateURL url.
+   * @return The inputProcessorSignTemplateURL url or <code>null</code> if no url for
+   *         a input processor sign template is set.
+   */
+  public String getInputProcessorSignTemplateURL() {
+    return inputProcessorSignTemplateURL;
+  }
+
+  /**
+   * Returns the parameters for verifying additional infoboxes.
+   *
+   * @return The parameters for verifying additional infoboxes.
+   *         Maybe <code>null</code>.
+   */
+  public VerifyInfoboxParameters getVerifyInfoboxParameters() {
+    return verifyInfoboxParameters;
+  }
+   
+  /**
+   * Sets the security layer version.
+   * Also sets <code>slVersion12</code> ({@link #getSlVersion12()}) 
+   * to <code>true</code> if the Security Layer version is 1.2.
+   * @param slVersion The security layer version to be used.
+   */
+  public void setSlVersion(String slVersion) {
+    this.slVersion = slVersion;
+    if ("1.2".equals(slVersion)) {
+      this.slVersion12 = true;
+    }
+  }
+  /**
+   * Sets the IdentityLinkDomainIdentifier.
+   * @param identityLinkDomainIdentifier The IdentityLinkDomainIdentifiern number of the online application.
+   */
+  public void setIdentityLinkDomainIdentifier(String identityLinkDomainIdentifier) {
+    this.identityLinkDomainIdentifier = identityLinkDomainIdentifier;
+  }
+  /**
+   * Sets the transformsInfos.
+   * @param transformsInfos The transformsInfos to be used.
+   */
+  public void setTransformsInfos(String[] transformsInfos) {
+    this.transformsInfos = transformsInfos;
+  }
+  /**
+   * Sets the provideAuthBlock.
+   * @param provideAuthBlock The provideAuthBlock to set
+   */
+  public void setProvideAuthBlock(boolean provideAuthBlock) {
+    this.provideAuthBlock = provideAuthBlock;
+  }
+
+  /**
+   * Sets the provideIdentityLink.
+   * @param provideIdentityLink The provideIdentityLink to set
+   */
+  public void setProvideIdentityLink(boolean provideIdentityLink) {
+    this.provideIdentityLink = provideIdentityLink;
+  }
+
+  /**
+   * Sets the provideStammzahl.
+   * @param provideStammzahl The provideStammzahl to set
+   */
+  public void setProvideStammzahl(boolean provideStammzahl) {
+    this.provideStammzahl = provideStammzahl;
+  }
+  
+  /**
+   * Sets the provideCertificate variable.
+   * @param provideCertificate The provideCertificate value to set
+   */
+  public void setProvideCertificate(boolean provideCertificate) {
+    this.provideCertificate = provideCertificate;
+  }
+
+   /**
+    * Sets the key box identifier.
+    * @param keyBoxIdentifier to set
+    */
+   public void setKeyBoxIdentier(String keyBoxIdentifier) {
+      this.keyBoxIdentifier = keyBoxIdentifier;
+   }
+  
+  /**
+   * Sets the BkuSelectionTemplate url.
+   * @param bkuSelectionTemplateURL The url string specifying the location
+   *        of a BkuSelectionTemplate.
+   */
+   public void setBkuSelectionTemplateURL(String bkuSelectionTemplateURL) {
+      this.bkuSelectionTemplateURL = bkuSelectionTemplateURL;
+   }
+  
+  /**
+   * Sets the Template url.
+   * @param templateURL The url string specifying the location
+   *        of a Template.
+   */
+   public void setTemplateURL(String templateURL) {
+      this.templateURL = templateURL;
+   }
+
+  /**
+   * Sets the input processor sign form template url.
+   *
+   * @param inputProcessorSignTemplateURL The url string specifying the 
+   * location of the input processor sign form
+   */
+  public void setInputProcessorSignTemplateURL(String inputProcessorSignTemplateURL) {
+    this.inputProcessorSignTemplateURL = inputProcessorSignTemplateURL;
+  }
+
+  /**
+   * Sets the parameters for verifying additonal (to the identitylink infobox) infoboxes.
+   *
+   * @param verifyInfoboxParameters The verifyInfoboxParameters to set.
+   */
+  public void setVerifyInfoboxParameters(VerifyInfoboxParameters verifyInfoboxParameters) {
+    this.verifyInfoboxParameters = verifyInfoboxParameters;
+  }
+  
+  /**
+   * Gets the IdentityLinkDomainIdentifier (e.g. Firmenbuchnummer)
+   * @return IdentityLinkDomainIdentifier (e.g. Firmenbuchnummer)
+   */
+  public String getIdentityLinkDomainIdentifierType() {
+      return identityLinkDomainIdentifierType;
+  }
+
+  /**
+   * Sets the IdentityLinkDomainIdentifier (e.g. Firmenbuchnummer)
+   * @param identityLinkDomainIdentifierType The IdentityLinkDomainIdentifier to set (e.g. Firmenbuchnummer)
+   */
+  public void setIdentityLinkDomainIdentifierType(String identityLinkDomainIdentifierType) {
+      this.identityLinkDomainIdentifierType = identityLinkDomainIdentifierType;
+  }
+  
+  /**
+   * Sets the Mandate/Profiles
+   * @param profiles
+   */
+  public void setMandateProfiles(String profiles) {
+	  this.mandateProfiles = profiles;
+  }
+  
+  /**
+   * Returns the Mandates/Profiles
+   * @return
+   */
+  public String getMandateProfiles() {
+	  return this.mandateProfiles;
+  }
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
new file mode 100644
index 000000000..114b5b0fd
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
@@ -0,0 +1,402 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.auth;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.transform.TransformerException;
+
+import org.apache.xpath.XPathAPI;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import at.gv.egovernment.moa.id.auth.data.Schema;
+import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moa.util.StringUtils;
+
+/**
+ * This class is a container for parameters that maybe needed for verifying an infobox.
+ * 
+ * @author Harald Bratko
+ */
+public class VerifyInfoboxParameter {
+  
+  /**
+   * The default package name (first part) of a infobox validator class.
+   */
+  public static final String DEFAULT_PACKAGE_TRUNK = "at.gv.egovernment.moa.id.auth.validator.";
+  
+  /**
+   * The identifier of the infobox to be verified. This identifier must exactly the
+   * identifier of the infobox returned by BKU.
+   */
+  protected String identifier_;
+  
+  /**
+   * The friendly name of the infobox. 
+   * This name is used within browser messages, thus it should be the german equivalent of
+   * the {@link #identifier_ infobox identifier} (e.g. &quot;<code>Stellvertretungen</code>&quot; 
+   * for &quot;<code>Mandates</code>&quot; or &quot;<code>GDAToken</code>&quot; for
+   * &quot;<code>EHSPToken</code>&quot;. 
+   * <br>If not specified within the config file the {@link #identifier_ infobox identifier}
+   * will be used.
+   */
+  protected String friendlyName_;
+  
+  /** 
+   * The Id of the TrustProfile to be used for validating certificates.
+   */
+  protected String trustProfileID_;
+  
+  /**
+   * The full name of the class to be used for verifying the infobox.
+   */
+  protected String validatorClassName_;
+  
+  /**
+   * Schema location URIs that may be needed by the
+   * validator to parse infobox tokens.
+   * Each entry in the list is a {@link at.gv.egovernment.moa.id.auth.data.Schema Schema} 
+   * specifying the location of an XML schema. 
+   */
+  protected List schemaLocations_;
+  
+  /**
+   * Application specific parameters that may be needed for verifying an infobox.
+   */
+  protected Element applicationSpecificParams_;
+  
+  /**
+   * Specifies if the infobox is be required to be returned by the BKU.
+   */
+  protected boolean required_;
+  
+  /**
+   * Specifies whether the <code>Stammzahl</code> should be passed to the verifying
+   * application or not.
+   */
+  protected boolean provideStammzahl_;
+  
+  /**
+   * Specifies whether the <code>identity link</code> should be passed to the verifying
+   * application or not.
+   */
+  protected boolean provideIdentityLink_;
+  
+  /**
+   * Initializes this VerifiyInfoboxParamater with the given identifier and a default
+   * validator class name.
+   * 
+   * @param identifier The identifier of the infobox to be verified.
+   */
+  public VerifyInfoboxParameter(String identifier) {
+    identifier_ = identifier;
+    StringBuffer sb = new StringBuffer(DEFAULT_PACKAGE_TRUNK);
+    sb.append(identifier.toLowerCase());
+    sb.append(".");
+    sb.append(identifier.substring(0, 1).toUpperCase());
+    sb.append(identifier.substring(1));
+    sb.append("Validator");
+    validatorClassName_ = sb.toString();
+  }
+
+  /**
+   * Returns application specific parameters.
+   * Each child element of this element contains a verifying application specific parameter. {@link #applicationSpecificParams_}
+   * 
+   * @see #applicationSpecificParams_ 
+   * 
+   * @return Application specific parameters.
+   */
+  public Element getApplicationSpecificParams() {
+    return applicationSpecificParams_;
+  }
+
+  /**
+   * Sets the application specific parameters.
+   * 
+   * @see #applicationSpecificParams_
+   *
+   * @param applicationSpecificParams The application specific parameters to set.
+   */
+  public void setApplicationSpecificParams(Element applicationSpecificParams) {
+    applicationSpecificParams_ = applicationSpecificParams;
+  }
+
+  /**
+   * Appends special application specific parameters for party representation.
+   * 
+   * @param applicationSpecificParams The application specific parameters for party representation to set.
+   */
+  public void appendParepSpecificParams(Element applicationSpecificParams) {
+    try {
+      if (applicationSpecificParams_==null) {
+        applicationSpecificParams_ = applicationSpecificParams.getOwnerDocument().createElement("ApplicationSpecificParameters");
+      } 
+      Element nameSpaceNode = applicationSpecificParams.getOwnerDocument().createElement("NameSpaceNode");
+      nameSpaceNode.setAttribute("xmlns:" + Constants.MOA_ID_CONFIG_PREFIX, Constants.MOA_ID_CONFIG_NS_URI);
+      NodeList nodeList = XPathAPI.selectNodeList(applicationSpecificParams, "*", nameSpaceNode);
+      if (null!=nodeList) {
+        for (int i=0; i<nodeList.getLength(); i++) {
+          applicationSpecificParams_.appendChild((Node) nodeList.item(i));
+        }
+      }
+    } catch (TransformerException e) {
+      //Do nothing
+    }
+  }
+  
+  /**
+   * Returns the friendly name.
+   * 
+   * @see #friendlyName_
+   *
+   * @return The friendly name.
+   */
+  public String getFriendlyName() {
+    return friendlyName_;
+  }
+
+  /**
+   * Sets the friendly name.
+   *
+   * @param friendlyName The friendly name to set.
+   */
+  public void setFriendlyName(String friendlyName) {
+    friendlyName_ = friendlyName;
+  }
+
+  /**
+   * Returns the infobox identifier.
+   * 
+   * @see #identifier_
+   *
+   * @return The infobox identifier.
+   */
+  public String getIdentifier() {
+    return identifier_;
+  }
+
+  /**
+   * Sets the the infobox identifier.
+   * 
+   * @see #identifier_
+   *
+   * @param identifier The infobox identifier to set.
+   */
+  public void setIdentifier(String identifier) {
+    identifier_ = identifier;
+  }
+
+  /**
+   * Specifies whether the identity link should be passed to the verifying application
+   * or not.
+   *
+   * @return <code>True</code> if the identity link should be passed to the verifying 
+   * application, otherwise <code>false</code>.
+   */
+  public boolean getProvideIdentityLink() {
+    return provideIdentityLink_;
+  }
+
+  /**
+   * Sets the {@link #provideIdentityLink_} parameter.
+   *
+   * @param provideIdentityLink <code>True</code> if the identity link should be passed to 
+   * the verifying application, otherwise <code>false</code>.
+   */
+  public void setProvideIdentityLink(boolean provideIdentityLink) {
+    provideIdentityLink_ = provideIdentityLink;
+  }
+
+  /**
+   * Specifies whether the <code>Stammzahl</code> should be passed to the verifying 
+   * application or not.
+   *
+   * @return <code>True</code> if the <code>Stammzahl</code> should be passed to the  
+   * verifying application, otherwise <code>false</code>.
+   */
+  public boolean getProvideStammzahl() {
+    return provideStammzahl_;
+  }
+
+  /**
+   * Sets the {@link #provideStammzahl_} parameter.
+   *
+   * @param provideStammzahl <code>True</code> if the <code>Stammzahl</code> should be   
+   * passed to the verifying application, otherwise <code>false</code>.
+   */
+  public void setProvideStammzahl(boolean provideStammzahl) {
+    provideStammzahl_ = provideStammzahl;
+  }
+
+  /**
+   * Specifies whether the infobox is required or not.
+   *
+   * @return <code>True</code> if the infobox is required to be returned by the BKU,
+   * otherwise <code>false</code>.
+   */
+  public boolean isRequired() {
+    return required_;
+  }
+
+  /**
+   * Sets the {@link #required_} parameter.
+   *
+   * @param required <code>True</code> if the infobox is required to be returned by the 
+   * BKU, otherwise <code>false</code>.
+   */
+  public void setRequired(boolean required) {
+    required_ = required;
+  }
+
+  /**
+   * Schema location URIs that may be needed by the
+   * validator to parse infobox tokens.
+   * Each entry in the list is a {@link at.gv.egovernment.moa.id.auth.data.Schema Schema} 
+   * specifying the location of an XML schema. 
+   *  
+   * @return A list of {@link at.gv.egovernment.moa.id.auth.data.Schema Schema} objects 
+   *         each of them specifying the location of an XML schema.
+   */
+  public List getSchemaLocations() {
+    return schemaLocations_;
+  }
+
+  /**
+   * Sets the schema locations.
+   * 
+   * @see #schemaLocations_
+   *
+   * @param schemaLocations The schema location list to be set.
+   */
+  public void setSchemaLocations(List schemaLocations) {
+    schemaLocations_ = schemaLocations;
+  }
+
+  /**
+   * Returns the ID of the trust profile to be used for verifying certificates.
+   *
+   * @return The ID of the trust profile to be used for verifying certificates.
+   *         Maybe <code>null</code>.
+   */
+  public String getTrustProfileID() {
+    return trustProfileID_;
+  }
+
+  /**
+   * Sets the ID of the trust profile to be used for verifying certificates.
+   *
+   * @param trustProfileID The ID of the trust profile to be used for verifying certificates.
+   */
+  public void setTrustProfileID(String trustProfileID) {
+    trustProfileID_ = trustProfileID;
+  }
+
+  /**
+   * Returns the name of the class to be used for verifying this infobox.
+   *
+   * @return The name of the class to be used for verifying this infobox.
+   */
+  public String getValidatorClassName() {
+    return validatorClassName_;
+  }
+
+  /**
+   * Sets the name of the class to be used for verifying this infobox.
+   *
+   * @param validatorClassName The name of the class to be used for verifying this infobox.
+   */
+  public void setValidatorClassName(String validatorClassName) {
+    validatorClassName_ = validatorClassName;
+  }
+  
+  /**
+   * Get a string representation of this object.
+   * This method is for debugging purposes only.
+   *
+   * @return A string representation of this object.
+   */
+  public String toString() {
+    
+    StringBuffer buffer = new StringBuffer(1024);
+
+    buffer.append("  <Infobox Identifier=\"");
+    buffer.append(identifier_);
+    buffer.append("\" required=\"");
+    buffer.append(required_);
+    buffer.append("\" provideStammzahl=\"");
+    buffer.append(provideStammzahl_);
+    buffer.append("\" provideIdentityLink=\"");
+    buffer.append(provideIdentityLink_);
+    buffer.append("\">");
+    buffer.append("\n");
+    if (friendlyName_ != null) {
+      buffer.append("    <FriendlyName>");
+      buffer.append(friendlyName_);
+      buffer.append("</FriendlyName>");
+      buffer.append("\n");
+    }
+    if (trustProfileID_ != null) {
+      buffer.append("    <TrustProfileID>");
+      buffer.append(trustProfileID_);
+      buffer.append("</TrustProfileID>");
+      buffer.append("\n");
+    }
+    if (validatorClassName_ != null) {
+      buffer.append("    <ValidatorClass>");
+      buffer.append(validatorClassName_);
+      buffer.append("</ValidatorClass>");
+      buffer.append("\n");    
+    }
+    if (schemaLocations_ != null) {
+      buffer.append("    <SchemaLocations>");
+      buffer.append("\n");
+      Iterator it = schemaLocations_.iterator();
+      while (it.hasNext()) {
+        buffer.append("      <Schema namespace=\"");
+        Schema schema = (Schema)it.next();
+        buffer.append(schema.getNamespace());
+        buffer.append("\" schemaLocation=\"");
+        buffer.append(schema.getSchemaLocation());
+        buffer.append("\"/>\n");
+      }
+      buffer.append("    </SchemaLocations>");
+      buffer.append("\n");
+    }
+    if (applicationSpecificParams_ != null) {
+      try {
+        String applicationSpecificParams = DOMUtils.serializeNode(applicationSpecificParams_);
+        buffer.append("    ");
+        buffer.append(StringUtils.removeXMLDeclaration(applicationSpecificParams));
+        buffer.append("\n");
+      } catch (TransformerException e) {
+        // do nothing
+      } catch (IOException e) {
+        // do nothing
+      }
+    }
+    buffer.append("  </Infobox>");
+    
+
+    return buffer.toString() ;
+  }
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
new file mode 100644
index 000000000..fae42f100
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
@@ -0,0 +1,150 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.auth;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This class contains the parameters for verifying all the infoboxes configured for an
+ * online application.
+ * 
+ * @author Harald Bratko
+ */
+public class VerifyInfoboxParameters {
+  
+  /**
+   * A map of {@link VerifyInfoboxParameter} objects.
+   * Each of these objects contains parameters that maybe needed for validating an
+   * infobox.
+   */
+  protected Map infoboxParameters_;
+  
+  /**
+   * A list of the identifiers of the infoboxes supported by this
+   * VerifyInfoboxParameters;
+   */
+  protected List identifiers_;
+  
+  /**
+   * Holds the (comma separated) identifiers of those infoboxes MOA-IF is able to validate  
+   * in the context of the actual online application. 
+   * The string will be added as value of the <code>PushInfobox</code> parameter in the
+   * HTML form used for reading the infoboxes from the BKU. 
+   */
+  protected String pushInfobox_;
+  
+  /**
+   * Initializes this VerifyInfoboxParameters with an empty {@link #infoboxParameters_}
+   * map.
+   */
+  public VerifyInfoboxParameters() {
+    infoboxParameters_ = new Hashtable();
+    pushInfobox_ = "";
+  }
+  
+  /**
+   * Initializes this VerifyInfoboxParameters with the given 
+   * <code>infoboxParameters</code> map and builds the {@link #pushInfobox_} string
+   * from the keys of the given map.
+   */
+  public VerifyInfoboxParameters(List identifiers, Map infoboxParameters) {
+    identifiers_ = identifiers;
+    infoboxParameters_ = infoboxParameters;
+    // build the pushInfobox string    
+    if ((identifiers != null) && (!identifiers.isEmpty())) {
+      StringBuffer identifiersSB = new StringBuffer();
+      int identifiersNum = identifiers.size();
+      int i = 1;
+      Iterator it = identifiers.iterator();      
+      while (it.hasNext()) {
+        identifiersSB.append((String)it.next());
+        if (i != identifiersNum) {
+          identifiersSB.append(",");
+        }
+        i++;
+      }
+      pushInfobox_ = identifiersSB.toString();     
+    } else {
+      pushInfobox_ = "";
+    }
+  }
+
+  /**
+   * Returns the (comma separated) identifiers of the infoboxes configured for the actual
+   * online application.
+   * 
+   * @see #pushInfobox_
+   *
+   * @return The (comma separated) identifiers of the infoboxes configured for the actual
+   * online application.
+   */
+  public String getPushInfobox() {
+    return pushInfobox_;
+  }
+
+  /**
+   * Sets the {@link #pushInfobox_} string.
+   *
+   * @param pushInfobox The pushInfobox string to be set.
+   */
+  public void setPushInfobox(String pushInfobox) {
+    pushInfobox_ = pushInfobox;
+  }
+
+  /**
+   * Returns map of {@link VerifyInfoboxParameter} objects.
+   * Each of these objects contains parameters that maybe needed for validating an
+   * infobox.
+   *
+   * @return The map of {@link VerifyInfoboxParameter} objects.
+   */
+  public Map getInfoboxParameters() {
+    return infoboxParameters_;
+  }
+
+  /**
+   * Sets the map of {@link VerifyInfoboxParameter} objects.
+   * 
+   * @see #infoboxParameters_
+   *
+   * @param infoboxParameters The infoboxParameters to set.
+   */
+  public void setInfoboxParameters(Map infoboxParameters) {
+    infoboxParameters_ = infoboxParameters;
+  }
+
+  /**
+   * Returns the identifiers of the supported infoboxes. 
+   * 
+   * @return The identifiers.
+   */
+  public List getIdentifiers() {
+    return identifiers_;
+  }
+
+  /**
+   * Sets the identifiers.
+   *
+   * @param identifiers The identifiers to set.
+   */
+  public void setIdentifiers(List identifiers) {
+    identifiers_ = identifiers;
+  }
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
new file mode 100644
index 000000000..b7ed82977
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
@@ -0,0 +1,188 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.proxy;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
+ * These include the login type (stateful or stateless), the HTTP authentication type,
+ * and information needed to add authentication parameters or headers for a URL connection 
+ * to the remote online application.
+ * @see <code>MOAIDConfiguration-1.1.xsd</code>, element <code>Configuration</code>
+ * 
+ * @author Stefan Knirsch
+ * @version $Id$
+ */
+public class OAConfiguration {
+
+  /** Constant for an login method */  
+  public static final String LOGINTYPE_STATEFUL = "stateful";
+  /** Constant for an login method */
+  public static final String LOGINTYPE_STATELESS = "stateless";
+  
+  /** Constant for an auth method */
+  public static final String BASIC_AUTH = "basic";
+  /** Constant for an auth method */
+  public static final String HEADER_AUTH = "header";
+  /** 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";
+  /** Constant for binding */
+  public static final String BINDUNG_NOMATCH = "noMatch";
+  
+  /** login type: stateful or stateless */
+  String loginType;
+  /** authentication type: basic, header, or param */
+  String authType;
+  /** 
+   * mapping of parameter names to AuthenticationData field names
+   * in case of authentication type <code>"header-auth"</code>
+   */
+  Map paramAuthMapping;
+  /** 
+   * mapping of parameter names to AuthenticationData field names
+   * in case of authentication type <code>"param-auth"</code>
+   */
+  Map headerAuthMapping;
+  /** mapping for user ID to be used in case of authentication type <code>"basic-auth"</code> */
+  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.
+   * @return String
+   */
+  public String getBasicAuthPasswordMapping() {
+    return basicAuthPasswordMapping;
+  }
+  
+  /**
+   * Returns the basicAuthUserIDMapping.
+   * @return String
+   */
+  public String getBasicAuthUserIDMapping() {
+    return basicAuthUserIDMapping;
+  }
+  
+  /**
+   * Returns the headerAuthMapping.
+   * @return HashMap
+   */
+  public Map getHeaderAuthMapping() {
+    return headerAuthMapping;
+  }
+  
+  /**
+   * Returns the loginType.
+   * @return String
+   */
+  public String getLoginType() {
+    return loginType;
+  }
+  
+  /**
+   * Returns the paramAuthMapping.
+   * @return HashMap
+   */
+  public Map getParamAuthMapping() {
+    return paramAuthMapping;
+  }
+  
+  /**
+   * Returns the binding.
+   * @return String
+   */
+  public String getBinding() {
+    return binding;
+  }
+  
+  /**
+   * Sets the basicAuthPasswordMapping.
+   * @param basicAuthPassword The basicAuthPasswordMapping to set
+   */
+  public void setBasicAuthPasswordMapping(String basicAuthPassword) {
+    this.basicAuthPasswordMapping = basicAuthPassword;
+  }
+  
+  /**
+   * Sets the basicAuthUserIDMapping.
+   * @param basicAuthUserID The basicAuthUserIDMapping to set
+   */
+  public void setBasicAuthUserIDMapping(String basicAuthUserID) {
+    this.basicAuthUserIDMapping = basicAuthUserID;
+  }
+  
+  /**
+   * Sets the headerAuthMapping.
+   * @param headerAuth The headerAuthMapping to set
+   */
+  public void setHeaderAuthMapping(HashMap headerAuth) {
+    this.headerAuthMapping = headerAuth;
+  }
+  
+  /**
+   * Sets the loginType.
+   * @param loginType The loginType to set
+   */
+  public void setLoginType(String loginType) {
+    this.loginType = loginType;
+  }
+  
+  /**
+   * Sets the paramAuthMapping.
+   * @param paramAuth The paramAuthMapping to set
+   */
+  public void setParamAuthMapping(HashMap paramAuth) {
+    this.paramAuthMapping = paramAuth;
+  }
+  
+  /**
+   * Returns the authType.
+   * @return String
+   */
+  public String getAuthType() {
+    return authType;
+  }
+  
+  /**
+   * Sets the authType.
+   * @param authLoginType The authType to set
+   */
+  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/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
new file mode 100644
index 000000000..2f8691f70
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
@@ -0,0 +1,199 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+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,
+ * to use with the MOA ID Proxy component.
+ * 
+ * @author Stefan Knirsch
+ * @version $Id$
+ */
+public class OAProxyParameter extends OAParameter {
+
+//	/**
+//	 * public URL prefix of the online application
+//	 */
+//  private String publicURLPrefix;
+  /**
+   * URL of online application configuration file;
+   * defaults to relative URL <code>/moaconfig.xml</code>
+   */
+  private String configFileURL;
+  /**
+   * implementation of {@link  at.gv.egovernment.moa.id.proxy.LoginParameterResolver} interface
+   * to be used for authenticating the online application;
+   * defaults to {@link  at.gv.egovernment.moa.id.proxy.DefaultLoginParameterResolver}
+   */
+  private String loginParameterResolverImpl;
+  
+  /**
+   * Configuration Parameter of LoginParameterResolver
+   */  
+  private String loginParameterResolverConfiguration;
+  
+  /**
+   * implementation of {@link  at.gv.egovernment.moa.id.proxy.ConnectionBuilder} interface
+   * to be used for connecting to the online application;
+   * defaults to {@link  at.gv.egovernment.moa.id.proxy.DefaultConnectionBuilder}
+   */
+  private String connectionBuilderImpl;
+  /**
+   * session time out to be used in case of a stateless online application
+   */
+  private int sessionTimeOut;
+  /**
+   * parameters regarding the connection from the proxy to the online application
+   */
+  private ConnectionParameter connectionParameter;
+  /**
+   * parameters for logging into the online application
+   */
+  private OAConfiguration oaConfiguration;
+  
+
+  /**
+   * Returns the configFileURL.
+   * @return String
+   */
+  public String getConfigFileURL() {
+    return configFileURL;
+  }
+
+  /**
+   * Returns the sessionTimeOut.
+   * @return int
+   */
+  public int getSessionTimeOut() {
+    return sessionTimeOut;
+  }
+
+  /**
+   * Returns the connectionParameter.
+   * @return ConnectionParameter
+   */
+  public ConnectionParameter getConnectionParameter() {
+    return connectionParameter;
+  }
+
+  /**
+   * Sets the configFileURL for the proxy.
+   * @param oaProxyConfigFileURL The configFileURL to set
+   */
+  public void setConfigFileURL(String oaProxyConfigFileURL) {
+    this.configFileURL = oaProxyConfigFileURL;
+  }
+
+  /**
+   * Sets the sessionTimeOut for the proxy.
+   * @param oaProxySessionTimeOut The sessionTimeOut to set
+   */
+  public void setSessionTimeOut(int oaProxySessionTimeOut) {
+    this.sessionTimeOut = oaProxySessionTimeOut;
+  }
+
+  /**
+   * Sets the connectionParameter for the proxy.
+   * @param proxyConnectionParameter The connectionParameter to set
+   */
+  public void setConnectionParameter(ConnectionParameter proxyConnectionParameter) {
+    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 connectionBuilderImpl.
+   * @return String
+   */
+  public String getConnectionBuilderImpl() {
+    return connectionBuilderImpl;
+  }
+
+  /**
+   * Returns the loginParameterResolverImpl.
+   * @return String
+   */
+  public String getLoginParameterResolverImpl() {
+    return loginParameterResolverImpl;
+  }
+
+  /**
+   * Returns the loginParameterResolverConfiguration.
+   * @return String
+   */
+  public String getLoginParameterResolverConfiguration() {
+	return loginParameterResolverConfiguration;
+  }
+
+  /**
+   * Sets the connectionBuilderImpl for the proxy.
+   * @param connectionBuilderImpl The connectionBuilderImpl to set
+   */
+  public void setConnectionBuilderImpl(String connectionBuilderImpl) {
+    this.connectionBuilderImpl = connectionBuilderImpl;
+  }
+
+  /**
+   * Sets the loginParameterResolverImpl for the proxy.
+   * @param loginParameterResolverImpl The loginParameterResolverImpl to set
+   */
+  public void setLoginParameterResolverImpl(String loginParameterResolverImpl) {
+    this.loginParameterResolverImpl = loginParameterResolverImpl;
+  }
+
+  /**
+   * Sets the loginParameterResolverConfiguration for the proxy.
+   * @param loginParameterResolverConfiguration The loginParameterResolverImpl to set
+   */
+  public void setLoginParameterResolverConfiguration(String loginParameterResolverConfiguration) {
+	this.loginParameterResolverConfiguration = loginParameterResolverConfiguration;
+  }
+
+  /**
+   * Returns the oaConfiguration.
+   * @return OAConfiguration
+   */
+  public OAConfiguration getOaConfiguration() {
+    return oaConfiguration;
+  }
+
+  /**
+   * Sets the oaConfiguration.
+   * @param oaConfiguration The oaConfiguration to set
+   */
+  public void setOaConfiguration(OAConfiguration oaConfiguration) {
+    this.oaConfiguration = oaConfiguration;
+  }
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java
new file mode 100644
index 000000000..f67349a18
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java
@@ -0,0 +1,256 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.proxy;
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
+
+import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.XPathUtils;
+
+/**
+ * Builds the configuration for MOA-ID Proxy.
+ */
+public class ProxyConfigurationBuilder extends ConfigurationBuilder {
+  
+  /**
+   * Default online application configuration file name
+   * (used when <code>/OnlineApplication/ProxyComponent@configFileURL</code> is <code>null</code>).
+   */
+  public static final String DEFAULT_OA_CONFIG_FILENAME = "MOAConfig.xml";
+
+  /** an XPATH-Expression */ 
+  private static final String PROXY_AUTH_XPATH =
+    ROOT + CONF + "ProxyComponent/" + CONF + "AuthComponent";
+  /** an XPATH-Expression */ 
+  protected static final String ROOTOA = "/" + CONF + "Configuration/";
+    /** an XPATH-Expression */ 
+  private static final String OA_PROXY_COMPONENT_XPATH = CONF + "ProxyComponent";
+  /** an XPATH-Expression */ 
+  private static final String OA_PROXY_COMPONENT_ABSOLUTE_XPATH = ROOT + CONF + "OnlineApplication/" + CONF + "ProxyComponent";
+  /** an XPATH-Expression */ 
+  private static final String OA_PROXY_URL_XPATH = CONF + "ProxyComponent/@configFileURL";
+  /** an XPATH-Expression */ 
+  private static final String OA_PROXY_SESSION_TIMEOUT_XPATH = CONF + "ProxyComponent/@sessionTimeOut";
+  /** an XPATH-Expression */ 
+  private static final String OA_PROXY_LOGIN_PARA_XPATH = CONF + "ProxyComponent/@loginParameterResolverImpl";
+  /** an XPATH-Expression */
+  private static final String OA_PROXY_LOGIN_PARA_CONF_XPATH = CONF + "ProxyComponent/@loginParameterResolverConfiguration";
+    /** an XPATH-Expression */ 
+  private static final String OA_PROXY_CONNECTION_BUILDER_XPATH = CONF + "ProxyComponent/@connectionBuilderImpl";
+  /** an XPATH-Expression */ 
+  protected static final String OACONF_LOGIN_TYPE_XPATH =
+    ROOTOA + CONF + "LoginType";
+  /** an XPATH-Expression */ 
+  protected static final String OACONF_BINDING_TYPE_XPATH =
+    ROOTOA + CONF + "Binding";
+  /** an XPATH-Expression */ 
+  protected static final String OACONF_PARAM_AUTH_PARAMETER_XPATH =
+    ROOTOA + CONF + "ParamAuth/" + CONF + "Parameter";
+  /** an XPATH-Expression */ 
+  protected static final String OACONF_USER_ID_XPATH =
+    ROOTOA + CONF + "BasicAuth/" + CONF + "UserID";
+  /** an XPATH-Expression */ 
+  protected static final String OACONF_PASSWORD_XPATH =
+    ROOTOA + CONF + "BasicAuth/" + CONF + "Password";
+  /** an XPATH-Expression */ 
+  protected static final String OACONF_HEADER_AUTH_HEADER_XPATH =
+    ROOTOA + CONF + "HeaderAuth/" + CONF + "Header";
+
+   /**
+   * Creates a new <code>MOAConfigurationProvider</code>.
+   * 
+   * @param configElem The root element of the MOA-ID configuration.
+   */
+  public ProxyConfigurationBuilder(Element configElem, String rootConfigDir) {
+    super(configElem, rootConfigDir);
+  }
+  
+  /**
+   * Method buildOAConfiguration.
+   * 
+   * Build an {@link OAConfiguration} Object from the given configuration DOM element
+   * 
+   * @param root
+   * @return OAConfiguration
+   * @throws ConfigurationException
+   */
+  public OAConfiguration buildOAConfiguration(Element root) throws ConfigurationException{
+
+    OAConfiguration oaConfiguration = new OAConfiguration();
+
+    //The LoginType hast to be "stateless" or "stateful" to be valid
+
+    oaConfiguration.setLoginType(
+      XPathUtils.getElementValue(root, OACONF_LOGIN_TYPE_XPATH, null));
+    
+    oaConfiguration.setBinding(
+      XPathUtils.getElementValue(root, OACONF_BINDING_TYPE_XPATH, OAConfiguration.BINDUNG_FULL));    
+      
+    //Try to build the Parameter Auth Parameters
+    NodeIterator paramAuthIter =
+      XPathUtils.selectNodeIterator(
+        root,
+        OACONF_PARAM_AUTH_PARAMETER_XPATH);
+    Element paramAuthElem;
+    HashMap paramAuthMap = new HashMap();
+    while ((paramAuthElem = (Element) paramAuthIter.nextNode()) != null) {
+      String name = XPathUtils.getAttributeValue(paramAuthElem, "@Name", null);
+      String value = XPathUtils.getAttributeValue(paramAuthElem, "@Value", null);
+      if (paramAuthMap.containsKey(name))
+        throw new ConfigurationException("config.06", new Object[]{"Doppelter Wert für Parameter per HeaderAuthentication"});
+      paramAuthMap.put(name, value);
+    }
+    oaConfiguration.setParamAuthMapping(paramAuthMap);
+    // Try to build the BasicAuthParameters
+    oaConfiguration.setBasicAuthUserIDMapping(
+      XPathUtils.getElementValue(root, OACONF_USER_ID_XPATH, null));
+    oaConfiguration.setBasicAuthPasswordMapping(
+      XPathUtils.getElementValue(root, OACONF_PASSWORD_XPATH, null));
+
+    //Try to build the Parameter Auth Parameters
+    NodeIterator headerAuthIter = XPathUtils.selectNodeIterator(root,OACONF_HEADER_AUTH_HEADER_XPATH);
+
+    Element headerAuthElem;
+    HashMap headerAuthMap = new HashMap();
+    while ((headerAuthElem = (Element) headerAuthIter.nextNode()) != null) {
+      String name =
+        XPathUtils.getAttributeValue(headerAuthElem, "@Name", null);
+      String value =
+        XPathUtils.getAttributeValue(headerAuthElem, "@Value", null);
+      // Contains Key (Neue Config-Exception: doppelte werte)
+      if (headerAuthMap.containsKey(name))
+        throw new ConfigurationException("config.06", new Object[]{"Doppelter Wert für Parameter per HeaderAuthentication"});
+      headerAuthMap.put(name, value);
+    }
+    oaConfiguration.setHeaderAuthMapping(headerAuthMap);
+
+    if (paramAuthMap.size() == 0) {
+      if (oaConfiguration.getBasicAuthUserIDMapping() == null) {
+        oaConfiguration.setAuthType(OAConfiguration.HEADER_AUTH);
+      }
+      else
+        oaConfiguration.setAuthType(OAConfiguration.BASIC_AUTH);
+    }
+    else
+      oaConfiguration.setAuthType(OAConfiguration.PARAM_AUTH);
+
+    return oaConfiguration;
+  }
+  
+  
+  /**
+   * Build an array of OnlineApplication Parameter Beans containing information 
+   * about the proxy component
+   * @return An OAProxyParameter array containing beans
+   * with all relevant information for the proxy component of the online 
+   * application
+   */
+  public OAProxyParameter[] buildOnlineApplicationProxyParameters() throws ConfigurationException{
+
+    List oA_list = new ArrayList();
+    NodeList OAIter = XPathUtils.selectNodeList(configElem_, OA_XPATH);
+
+    for (int i = 0; i < OAIter.getLength(); i++) {
+      Element oAElem = (Element) OAIter.item(i);
+      
+      Element proxyComponentElem = (Element) XPathUtils.selectSingleNode(oAElem,OA_PROXY_COMPONENT_XPATH);        
+      if (proxyComponentElem != null) {
+        OAProxyParameter oap = new OAProxyParameter();
+      
+        oap.setPublicURLPrefix(oAElem.getAttribute("publicURLPrefix"));
+        oap.setOaType(oAElem.getAttribute("type"));
+        oap.setConfigFileURL(XPathUtils.getAttributeValue(oAElem, OA_PROXY_URL_XPATH, null));
+        oap.setConfigFileURL(FileUtils.makeAbsoluteURL(oap.getConfigFileURL(), rootConfigFileDir_));
+        // default session time out: 3600 sec = 1 h
+        oap.setSessionTimeOut(new Integer(XPathUtils.getAttributeValue(oAElem,OA_PROXY_SESSION_TIMEOUT_XPATH,"3600")).intValue());
+        oap.setLoginParameterResolverImpl(XPathUtils.getAttributeValue(oAElem, OA_PROXY_LOGIN_PARA_XPATH, null));
+        oap.setLoginParameterResolverConfiguration(XPathUtils.getAttributeValue(oAElem, OA_PROXY_LOGIN_PARA_CONF_XPATH, null));
+        oap.setLoginParameterResolverConfiguration(FileUtils.makeAbsoluteURL(oap.getLoginParameterResolverConfiguration(), rootConfigFileDir_));
+        oap.setConnectionBuilderImpl(XPathUtils.getAttributeValue(oAElem,OA_PROXY_CONNECTION_BUILDER_XPATH, null));
+            
+        ConnectionParameter conPara = buildConnectionParameter(proxyComponentElem);
+        oap.setConnectionParameter(conPara);
+  
+        OAConfiguration oaConf = buildOAConfiguration(getOAConfigElement(oap));
+        oap.setOaConfiguration(oaConf);
+        
+        oA_list.add(oap);
+      }
+    }
+    OAProxyParameter[] result =
+      new OAProxyParameter[oA_list.size()];
+    oA_list.toArray(result);
+
+    return result;
+
+  }
+  
+  /**
+   * Reads the configuration file of the online application, and creates a DOM tree from it.
+   * If <code>/OnlineApplication/ProxyComponent@configFileURL</code> is not given, 
+   * uses default configuration file location.
+   * 
+   * @param oap configuration data of online application, meant for use by MOA-ID-PROXY
+   * @return Element DOM tree root element
+   * @throws ConfigurationException on any exception thrown
+   */
+  private Element getOAConfigElement(OAProxyParameter oap) throws ConfigurationException
+  {  
+    try {
+      String configFileURL = oap.getConfigFileURL();
+      if (configFileURL == null) {
+        // use default config file URL, when config file URL is not given
+        configFileURL = oap.getConnectionParameter().getUrl();
+        if (configFileURL.charAt(configFileURL.length() - 1) != '/')
+          configFileURL += "/";
+        configFileURL += DEFAULT_OA_CONFIG_FILENAME;
+      }
+      Logger.info("Loading MOA-OA configuration " + configFileURL);
+      Element configElem = DOMUtils.parseXmlValidating(
+        new ByteArrayInputStream(FileUtils.readURL(configFileURL)));
+      return configElem;
+    }
+    catch (Throwable t) {
+      throw new ConfigurationException("config.03", new Object[] {"OAConfiguration"} , t);
+    }
+  }
+  
+  /**
+   * Build a bean containing all information about the ProxyComponent
+   * @return The ConnectionParameter for the Proxy Component
+   */
+  public ConnectionParameter buildAuthComponentConnectionParameter() 
+  {
+
+    Element connectionParameter = (Element) XPathUtils.selectSingleNode(configElem_, PROXY_AUTH_XPATH);
+    if (connectionParameter==null) return null;
+    return buildConnectionParameter(connectionParameter);
+
+  }
+  
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
new file mode 100644
index 000000000..fbd6474bb
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
@@ -0,0 +1,203 @@
+/*
+* Copyright 2003 Federal Chancellery Austria
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package at.gv.egovernment.moa.id.config.proxy;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.w3c.dom.Element;
+
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.ConfigurationProvider;
+import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moa.util.FileUtils;
+
+/**
+ * A class providing access to the Proxy Part of the MOA-ID configuration data.
+ * 
+ * <p>Configuration data is read from an XML file, whose location is given by
+ * the <code>moa.id.configuration</code> system property.</p>
+ * <p>This class implements the Singleton pattern. The <code>reload()</code>
+ * method can be used to update the configuration data. Therefore, it is not
+ * guaranteed that consecutive calls to <code>getInstance()</code> will return
+ * the same <code>ProxyConfigurationProvider</code> all the time. During the
+ * processing of a web service request, the current
+ * <code>TransactionContext</code> should be used to obtain the
+ * <code>ProxyConfigurationProvider</code> local to that request.</p>
+ * 
+ * @author Stefan Knirsch
+ */
+public class ProxyConfigurationProvider extends ConfigurationProvider {
+
+  /** Singleton instance. <code>null</code>, if none has been created. */
+  private static ProxyConfigurationProvider instance;
+
+  
+  //
+  // configuration data
+  //
+  /**
+   * connection parameters for connection to MOA ID Auth component
+   */
+  private ConnectionParameter authComponentConnectionParameter;
+  /**
+   * configuration parameters for online applications
+   */
+  private OAProxyParameter[] onlineApplicationProxyParameter;
+
+  /**
+   * Return the single instance of configuration data.
+   * 
+   * @return ProxyConfigurationProvider The current configuration data.
+   * @throws ConfigurationException 
+   */
+  public static synchronized ProxyConfigurationProvider getInstance()
+    throws ConfigurationException {
+
+    if (instance == null) {
+      reload();
+    }
+    return instance;
+  }
+
+  /**
+   * Reload the configuration data and set it if successful.
+   * 
+   * @return ProxyConfigurationProvider The loaded configuration data.
+   * @throws ConfigurationException Failure to load the configuration data.
+   */
+  public static synchronized ProxyConfigurationProvider reload()
+    throws ConfigurationException {
+    String fileName = System.getProperty(CONFIG_PROPERTY_NAME);
+    if (fileName == null) {
+      throw new ConfigurationException("config.01", null);
+    }
+    Logger.info("Loading MOA-ID-PROXY configuration " + fileName);
+
+    instance = new ProxyConfigurationProvider(fileName);
+    return instance;
+  }
+
+  /**
+   * Constructor for ProxyConfigurationProvider.
+   */
+  public ProxyConfigurationProvider(String fileName)
+    throws ConfigurationException {
+
+    load(fileName);
+  }
+
+  /**
+   * Load the configuration data from XML file with the given name and build
+   * the internal data structures representing the MOA configuration.
+   * 
+   * @param fileName The name of the XML file to load.
+   * @throws ConfigurationException The MOA configuration could not be
+   * read/built.
+   */
+  private void load(String fileName) throws ConfigurationException {
+    FileInputStream stream = null;
+    Element configElem;
+    ProxyConfigurationBuilder builder;
+
+    try {
+      // load the main config file
+      stream = new FileInputStream(fileName);
+      configElem = DOMUtils.parseXmlValidating(stream);
+    } 
+    catch (Throwable t) {
+      throw new ConfigurationException("config.03", null, t);
+    } 
+    finally {
+      try {
+        if (stream != null) {
+          stream.close();
+        }
+      } 
+      catch (IOException e) {
+      }
+    }
+		try {
+			// determine the directory of the root config file
+			rootConfigFileDir = new File(fileName).getParent();		
+			try {
+				rootConfigFileDir = new File(rootConfigFileDir).toURL().toString();
+			} catch (MalformedURLException t) {
+				throw new ConfigurationException("config.03", null, t);
+			}
+      
+      // build the internal datastructures
+      builder = new ProxyConfigurationBuilder(configElem, rootConfigFileDir);
+      authComponentConnectionParameter = builder.buildAuthComponentConnectionParameter();
+        
+      onlineApplicationProxyParameter = builder.buildOnlineApplicationProxyParameters();
+      for(int i = 0; i < onlineApplicationProxyParameter.length; i++) {
+        onlineApplicationProxyParameter[i].setConfigFileURL(FileUtils.makeAbsoluteURL(onlineApplicationProxyParameter[i].getConfigFileURL(), rootConfigFileDir));
+      }
+      	
+      genericConfiguration = builder.buildGenericConfiguration();
+      defaultChainingMode = builder.getDefaultChainingMode();
+      chainingModes = builder.buildChainingModes();  
+      trustedCACertificates = builder.getTrustedCACertificates();
+			trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);
+
+    } 
+    catch (Throwable t) {
+      throw new ConfigurationException("config.02", null, t);
+    }
+  }
+
+ /**
+   * Return a bean containing all information about the ProxyComponent
+   * @return The ConnectionParameter for the Proxy Component
+   */
+  public ConnectionParameter getAuthComponentConnectionParameter() {
+    return authComponentConnectionParameter;
+  }
+  
+  /**
+   * Build an array of OnlineApplication Parameter Beans containing all
+   * information about the proxy component of the online application
+   * @return An OAProxyParameter array containing beans
+   * with all relevant information for the proxy component of the online 
+   * application
+   */
+  public OAProxyParameter[] getOnlineApplicationParameters() {
+    return onlineApplicationProxyParameter;
+  }
+  /**
+   * Provides configuration information regarding the online application behind
+   * the given URL, relevant to the MOA-ID Proxy component.
+   * 
+   * @param oaURL URL requested for an online application
+   * @return an <code>OAProxyParameter</code>, or <code>null</code>
+   * 					if none is applicable
+   */
+  public OAProxyParameter getOnlineApplicationParameter(String oaURL) {
+  	OAProxyParameter[] oaParams = getOnlineApplicationParameters();
+  	for (int i = 0; i < oaParams.length; i++) {
+  		OAProxyParameter oaParam = oaParams[i];
+  		if (oaURL.startsWith(oaParam.getPublicURLPrefix()))
+  			return oaParam;
+  	}
+    return null;
+  }
+  
+}
\ No newline at end of file