diff options
| author | Nino Breuer | 2014-12-01 17:26:59 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-01 17:26:59 +0100 |
| commit | 3f9d9af58d57c49c32a5e63dadf0e7d586bbb487 (patch) | |
| tree | 1778a0c37e0b4c3657686214c7464c49aeecbd49 /dozentenmodul/src/main/java/App.java | |
| parent | • changed label texts, explaining that it is not necessary to upload a new ... (diff) | |
| parent | [client] log4j backend for proxy_vole (diff) | |
| download | tutor-module-3f9d9af58d57c49c32a5e63dadf0e7d586bbb487.tar.gz tutor-module-3f9d9af58d57c49c32a5e63dadf0e7d586bbb487.tar.xz tutor-module-3f9d9af58d57c49c32a5e63dadf0e7d586bbb487.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/App.java')
| -rw-r--r-- | dozentenmodul/src/main/java/App.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java index c7d25c43..2d6be271 100644 --- a/dozentenmodul/src/main/java/App.java +++ b/dozentenmodul/src/main/java/App.java @@ -3,9 +3,6 @@ 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; @@ -13,14 +10,7 @@ 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; @@ -54,7 +44,6 @@ public class App { fa = new FileAppender(new PatternLayout("%d [%F:%M] %m%n"), logFilePath); // All classes should log to file, configure global file appender. BasicConfigurator.configure(fa); -// LOGGER.addAppender(fa); LOGGER.info("Starting logging to: " + logFilePath); } catch (IOException e) { e.printStackTrace(); @@ -74,6 +63,8 @@ public class App { return; } + setupLogger(); + // initialise the proxy settings try { ConfigProxy.init(); @@ -81,8 +72,6 @@ public class App { LOGGER.error("IOException when trying to initialise the proxy, see trace: ", e); } - setupLogger(); - // start the GUI EventQueue.invokeLater(new Runnable() { public void run() { |