*** empty log message ***

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

3 files changed, 16 insertions, 9 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
index 48e82011d..e65c47bad 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
@@ -64,6 +64,20 @@ public class ConfigurationProvider {
      */
   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.
      * 
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 2e133130c..a722868e0 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -81,11 +81,6 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
   //
   // configuration data
   //
-
-	/**
-	 * main configuration file directory name used to configure MOA-ID 
-	 */
-	private String rootConfigFileDir;
   
   /**
 	 * configuration files containing transformations for rendering in the 
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
index 622ae6f82..5859d2ae9 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
@@ -35,10 +35,6 @@ public class ProxyConfigurationProvider extends ConfigurationProvider {
   /** Singleton instance. <code>null</code>, if none has been created. */
   private static ProxyConfigurationProvider instance;
 
-	/**
-	 * main configuration file directory name used to configure MOA-ID 
-	 */
-	private String rootConfigFileDir;
   
   //
   // configuration data
@@ -133,6 +129,8 @@ public class ProxyConfigurationProvider extends ConfigurationProvider {
 				throw new ConfigurationException("config.03", null, t);
 			}
       
+      //TODO enhance: use the getter method in makeAbsoluteURL
+      
       // build the internal datastructures
       builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
       authComponentConnectionParameter = builder.buildAuthComponentConnectionParameter();