MOA-ID 1.1.1D01

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

1 files changed, 21 insertions, 2 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index f91222ac3..6d3e05c29 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -111,7 +111,9 @@ public class ConfigurationBuilder {
   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 */ 
+  /** 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 */ 
   private static final String CONNECTION_PARAMETER_URL_XPATH =
@@ -160,6 +162,12 @@ public class ConfigurationBuilder {
   private static final String TRUSTED_CA_CERTIFICATES_XPATH =
     ROOT + CONF + "TrustedCACertificates";
 
+  
+	/**
+	 * main configuration file directory name used to configure MOA-ID 
+	 */
+	private String rootConfigFileDir;
+  
   /** The root element of the MOA-ID configuration */
   private Element configElem;
 
@@ -168,8 +176,9 @@ public class ConfigurationBuilder {
    * 
    * @param configElem The root element of the MOA-ID configuration.
    */
-  public ConfigurationBuilder(Element configElem) {
+  public ConfigurationBuilder(Element configElem, String rootConfigDir) {
     this.configElem = configElem;
+    this.rootConfigFileDir = rootConfigDir;
   }
 
   /**
@@ -386,10 +395,18 @@ public class ConfigurationBuilder {
     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,""));
     
@@ -422,9 +439,11 @@ public class ConfigurationBuilder {
       Element proxyComponentElem = (Element) XPathUtils.selectSingleNode(oAElem,OA_PROXY_COMPONENT_XPATH);        
       if (proxyComponentElem != null) {
         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.setConnectionBuilderImpl(XPathUtils.getAttributeValue(oAElem,OA_PROXY_CONNECTION_BUILDER_XPATH, null));
             
         ConnectionParameter conPara = buildConnectionParameter(proxyComponentElem);