Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	dozentenmodul/src/main/java/gui/intro/Login_GUI.java

1 files changed, 18 insertions, 0 deletions

diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index 4b7a24ef..c7d25c43 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -3,6 +3,9 @@ import gui.intro.Login_GUI;
 import java.awt.EventQueue;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
 
 import javax.swing.JOptionPane;
 
@@ -10,8 +13,16 @@ import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
+import org.openslx.network.ProxyConfiguration;
 
+import com.btr.proxy.search.ProxySearch;
+import com.btr.proxy.search.ProxySearch.Strategy;
+import com.btr.proxy.search.wpad.WpadProxySearchStrategy;
+import com.btr.proxy.util.ProxyException;
+
+import util.ShibbolethECP;
 import config.Config;
+import config.ConfigProxy;
 
 
 public class App {
@@ -63,6 +74,13 @@ public class App {
 			return;
 		}
 
+		// initialise the proxy settings
+		try {
+			ConfigProxy.init();
+		} catch (IOException e) {
+			LOGGER.error("IOException when trying to initialise the proxy, see trace: ", e);
+		}
+
 		setupLogger();
 
 		// start the GUI