From 4825f9142e872f8572b628d6e9b1e671575a6873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 10 Jan 2012 17:36:00 +0100 Subject: Switch from log4j to slf4j. Slf4j works on Android easily. --- master/pom.xml | 32 ++++++++++++++-------- master/src/main/java/com/orbekk/Broadcast.java | 5 ++-- .../src/main/java/com/orbekk/ConfigureLog4J.java | 18 ------------ .../main/java/com/orbekk/HelloAndroidActivity.java | 23 ++++------------ master/src/main/java/com/orbekk/PingServer.java | 7 +++-- 5 files changed, 33 insertions(+), 52 deletions(-) delete mode 100644 master/src/main/java/com/orbekk/ConfigureLog4J.java (limited to 'master') diff --git a/master/pom.xml b/master/pom.xml index 77fb614..ad0039a 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -1,5 +1,7 @@ - 4.0.0 com.orbekk @@ -16,11 +18,6 @@ provided - - log4j - log4j - 1.2.16 - commons-logging @@ -44,12 +41,25 @@ - de.mindpipe.android - android-logging-log4j - 1.0.2 + org.slf4j + slf4j-android + 1.6.1-RC1 - - + + + org.slf4j + slf4j-api + 1.6.4 + provided + + + + org.slf4j + slf4j-log4j12 + 1.6.4 + provided + + com.orbekk jsonrpc diff --git a/master/src/main/java/com/orbekk/Broadcast.java b/master/src/main/java/com/orbekk/Broadcast.java index bacde0d..84b2d6e 100644 --- a/master/src/main/java/com/orbekk/Broadcast.java +++ b/master/src/main/java/com/orbekk/Broadcast.java @@ -7,7 +7,8 @@ import java.net.InetAddress; import java.net.SocketException; import java.net.UnknownHostException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import android.content.Context; import android.net.DhcpInfo; @@ -15,7 +16,7 @@ import android.net.wifi.WifiManager; public class Broadcast { private Context context; - private Logger logger = Logger.getLogger(getClass()); + private Logger logger = LoggerFactory.getLogger(getClass()); public Broadcast(Context context) { this.context = context; diff --git a/master/src/main/java/com/orbekk/ConfigureLog4J.java b/master/src/main/java/com/orbekk/ConfigureLog4J.java deleted file mode 100644 index e6b1ac5..0000000 --- a/master/src/main/java/com/orbekk/ConfigureLog4J.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.orbekk; -import org.apache.log4j.Level; -import android.os.Environment; -import de.mindpipe.android.logging.log4j.LogConfigurator; - -public class ConfigureLog4J { - static { - final LogConfigurator logConfigurator = new LogConfigurator(); - - logConfigurator.setFileName(Environment.getExternalStorageDirectory() + "myapp.log"); - logConfigurator.setRootLevel(Level.DEBUG); - logConfigurator.setUseLogCatAppender(true); - // Set log level of a specific logger - // logConfigurator.setLevel("org.apache", Level.ERROR); - logConfigurator.configure(); - System.err.println("GOT HERE."); - } -} \ No newline at end of file diff --git a/master/src/main/java/com/orbekk/HelloAndroidActivity.java b/master/src/main/java/com/orbekk/HelloAndroidActivity.java index a142214..4160bf4 100644 --- a/master/src/main/java/com/orbekk/HelloAndroidActivity.java +++ b/master/src/main/java/com/orbekk/HelloAndroidActivity.java @@ -1,8 +1,7 @@ package com.orbekk; -import org.apache.log4j.Level; +import com.orbekk.net.Broadcaster; -import de.mindpipe.android.logging.log4j.LogConfigurator; import android.app.Activity; import android.os.Bundle; import android.util.Log; @@ -12,19 +11,6 @@ public class HelloAndroidActivity extends Activity { private static String TAG = "master"; private PingServer pingServer; - private void configureLog4j() { - final LogConfigurator logConfigurator = new LogConfigurator(); - - //logConfigurator.setFileName(Environment.getExternalStorageDirectory() + "myapp.log"); - logConfigurator.setRootLevel(Level.DEBUG); - logConfigurator.setUseLogCatAppender(true); - logConfigurator.setUseFileAppender(false); - // Set log level of a specific logger - // logConfigurator.setLevel("org.apache", Level.ERROR); - logConfigurator.configure(); - System.err.println("GOT HERE."); - } - /** * Called when the activity is first created. * @param savedInstanceState If the activity is being re-initialized after @@ -39,7 +25,6 @@ public class HelloAndroidActivity extends Activity { System.setProperty("java.net.preferIPv6Addresses", "false"); Log.i(TAG, "onCreate"); - configureLog4j(); setContentView(R.layout.main); pingServer = PingServer.createPingServer(10080); @@ -49,8 +34,10 @@ public class HelloAndroidActivity extends Activity { throw new RuntimeException(e.getMessage()); } - Broadcast broadcast = new Broadcast(this); - broadcast.sendBroadcast("Broadcast test".getBytes(), 10010); +// Broadcast broadcast = new Broadcast(this); +// broadcast.sendBroadcast("Broadcast test".getBytes(), 10010); + Broadcaster broadcaster = new Broadcaster(); + Log.i(TAG, "Broadcast success: " + broadcaster.sendBroadcast(10010, "Broadcast test from Android".getBytes())); } @Override diff --git a/master/src/main/java/com/orbekk/PingServer.java b/master/src/main/java/com/orbekk/PingServer.java index b1126d4..5df2346 100644 --- a/master/src/main/java/com/orbekk/PingServer.java +++ b/master/src/main/java/com/orbekk/PingServer.java @@ -1,7 +1,8 @@ package com.orbekk; -import org.apache.log4j.Logger; import org.eclipse.jetty.server.Server; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.googlecode.jsonrpc4j.JsonRpcServer; import com.orbekk.rpc.PingService; @@ -9,8 +10,8 @@ import com.orbekk.rpc.PingServiceImpl; import com.orbekk.rpc.RpcHandler; public class PingServer { - Server server; - Logger logger = Logger.getLogger(getClass()); + private Server server; + private Logger logger = LoggerFactory.getLogger(getClass()); public PingServer(Server server) { this.server = server; -- cgit v1.2.3