MOA-ID 2.x Configuration implemented

  -SSO deaktivated
  -Login with mandate and normal tested

1 files changed, 9 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
index 61f38412e..e075c99ef 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
@@ -33,7 +33,7 @@ import java.security.GeneralSecurityException;
 import javax.net.ssl.SSLSocketFactory;
 
 import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.id.config.legacy.ConnectionParameter;
 import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
 import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
 import at.gv.egovernment.moa.id.iaik.config.LoggerConfigImpl;
@@ -91,8 +91,10 @@ public class MOAIDProxyInitializer {
     ConnectionParameter connParamAuth = proxyConf.getAuthComponentConnectionParameter();
     if (connParamAuth!=null) {
 	    if (connParamAuth.isHTTPSURL()) {
-	      SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(proxyConf, connParamAuth);
-	      AxisSecureSocketFactory.initialize(ssf);
+	    	
+	    	//TODO: einkommentieren!!!!
+	      //SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(proxyConf, connParamAuth);
+	      //AxisSecureSocketFactory.initialize(ssf);
 	    }
     } else {
     	throw new ConfigurationException("config.16", null);
@@ -104,8 +106,10 @@ public class MOAIDProxyInitializer {
     for (int i = 0; i < oaParams.length; i++) {
       OAProxyParameter oaParam = oaParams[i];
       ConnectionParameter oaConnParam = oaParam.getConnectionParameter();
-      if (oaConnParam.isHTTPSURL())
-        SSLUtils.getSSLSocketFactory(proxyConf, oaConnParam);
+      if (oaConnParam.isHTTPSURL());
+    	  
+    	//TODO: einkommentieren!!!!
+        //SSLUtils.getSSLSocketFactory(proxyConf, oaConnParam);
     }
     
     // Initializes the ConnectionBuilderFactory from configuration data