summaryrefslogtreecommitdiff
path: root/master/src/main/java/com/orbekk
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-10 17:36:00 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-10 17:36:49 +0100
commit4825f9142e872f8572b628d6e9b1e671575a6873 (patch)
treea8a16176c73ab4fa7df6420a73253e483c6c5f44 /master/src/main/java/com/orbekk
parent6596cf75382de7fd7f2a8b868a70cfa0442a4ea5 (diff)
Switch from log4j to slf4j.
Slf4j works on Android easily.
Diffstat (limited to 'master/src/main/java/com/orbekk')
-rw-r--r--master/src/main/java/com/orbekk/Broadcast.java5
-rw-r--r--master/src/main/java/com/orbekk/ConfigureLog4J.java18
-rw-r--r--master/src/main/java/com/orbekk/HelloAndroidActivity.java23
-rw-r--r--master/src/main/java/com/orbekk/PingServer.java7
4 files changed, 12 insertions, 41 deletions
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;