diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/App.java | 15 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/config/ConfigProxy.java | 38 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/util/ShibbolethECP.java | 2 |
3 files changed, 38 insertions, 17 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() { diff --git a/dozentenmodul/src/main/java/config/ConfigProxy.java b/dozentenmodul/src/main/java/config/ConfigProxy.java index 515110bd..a97368d6 100644 --- a/dozentenmodul/src/main/java/config/ConfigProxy.java +++ b/dozentenmodul/src/main/java/config/ConfigProxy.java @@ -1,14 +1,18 @@ package config; - import java.io.IOException; import java.net.ProxySelector; +import java.text.MessageFormat; +import org.apache.log4j.Level; import org.apache.log4j.Logger; +import org.apache.log4j.Priority; import com.btr.proxy.search.ProxySearch; import com.btr.proxy.search.wpad.WpadProxySearchStrategy; import com.btr.proxy.util.ProxyException; +import com.btr.proxy.util.Logger.LogBackEnd; +import com.btr.proxy.util.Logger.LogLevel; /** * Configures the proxy @@ -27,12 +31,38 @@ public class ConfigProxy { * Initialization method. */ public static void init() throws IOException { + // first setup the logger of proxy_vole + com.btr.proxy.util.Logger.setBackend(new LogBackEnd() { + + @SuppressWarnings("deprecation") + public void log(Class<?> clazz, LogLevel loglevel, String msg, + Object... params) { + Priority priority; + switch (loglevel) { + case ERROR: + priority = Level.ERROR; + break; + case WARNING: + priority = Priority.WARN; + break; + case INFO: + priority = Priority.INFO; + break; + default: + priority = Priority.DEBUG; + } + Logger.getLogger(clazz).log(priority, MessageFormat.format(msg, params)); + } + + public boolean isLogginEnabled(LogLevel logLevel) { + return true; + } + }); + // try to find local proxy settings - // TODO: do we actually want to look for local settings rather - // than just forcing WPAD? ProxySearch proxySearch = ProxySearch.getDefaultProxySearch(); ProxySelector myProxySelector = proxySearch.getProxySelector(); - + if (myProxySelector == null) { // didn't work, try WPAD detection LOGGER.error("No suitable proxy settings found, trying WPAD..."); diff --git a/dozentenmodul/src/main/java/util/ShibbolethECP.java b/dozentenmodul/src/main/java/util/ShibbolethECP.java index 78133425..2bc9494f 100644 --- a/dozentenmodul/src/main/java/util/ShibbolethECP.java +++ b/dozentenmodul/src/main/java/util/ShibbolethECP.java @@ -41,6 +41,8 @@ public class ShibbolethECP { * Username as String. * @param pass * Password as String. + * @return + * true if login worked, false otherwise. */ public static Boolean doLogin(final String idpUrl, final String user, final String pass) { |