Extended class ...config.ConfigurationBuilder with ...config.proxy.ProxyConfigurationBuilder and moved proxy related methods from class ConfigurationBuilder to class ProxyConfigurationBuilder

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

1 files changed, 4 insertions, 5 deletions

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 fdb7e6f55..572ce5708 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
@@ -7,7 +7,6 @@ import java.net.MalformedURLException;
 
 import org.w3c.dom.Element;
 
-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;
@@ -101,7 +100,7 @@ public class ProxyConfigurationProvider extends ConfigurationProvider {
   private void load(String fileName) throws ConfigurationException {
     FileInputStream stream = null;
     Element configElem;
-    ConfigurationBuilder builder;
+    ProxyConfigurationBuilder builder;
 
     try {
       // load the main config file
@@ -130,12 +129,12 @@ public class ProxyConfigurationProvider extends ConfigurationProvider {
 			}
       
       // build the internal datastructures
-      builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
+      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));
+        onlineApplicationProxyParameter[i].setConfigFileURL(FileUtils.makeAbsoluteURL(onlineApplicationProxyParameter[i].getConfigFileURL(), rootConfigFileDir));
       }
       	
       genericConfiguration = builder.buildGenericConfiguration();