From ee5ba936cfc216e96c48ae3ce88f87f6f5e3a3c7 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 1 Dec 2014 16:31:20 +0100
Subject: [client] minor comment fixes

---
 dozentenmodul/src/main/java/config/ConfigProxy.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'dozentenmodul/src/main/java/config/ConfigProxy.java')

diff --git a/dozentenmodul/src/main/java/config/ConfigProxy.java b/dozentenmodul/src/main/java/config/ConfigProxy.java
index 515110bd..c545c4b4 100644
--- a/dozentenmodul/src/main/java/config/ConfigProxy.java
+++ b/dozentenmodul/src/main/java/config/ConfigProxy.java
@@ -28,8 +28,6 @@ public class ConfigProxy {
 	 */
 	public static void init() throws IOException {
 		// 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();
 		
-- 
cgit v1.2.3-55-g7522


From cdeb8c2768171c1558cb1ac3ba499855a567c2e8 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 1 Dec 2014 17:18:54 +0100
Subject: [client] log4j backend for proxy_vole

fixes the proxy stuff not beeing logged correctly
---
 dozentenmodul/src/main/java/App.java               | 15 ++-------
 .../src/main/java/config/ConfigProxy.java          | 36 ++++++++++++++++++++--
 2 files changed, 36 insertions(+), 15 deletions(-)

(limited to 'dozentenmodul/src/main/java/config/ConfigProxy.java')

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 c545c4b4..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,10 +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
 		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...");
-- 
cgit v1.2.3-55-g7522