From ba7132f3ce5629cff2cc4857fff7bd672511bee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Fri, 13 Jan 2012 10:18:02 +0100 Subject: Rename projects. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit – jsonrpc → same – master → same-android --- master/AndroidManifest.xml | 17 --- master/pom.xml | 139 --------------------- master/project.properties | 11 -- master/src/main/java/com/orbekk/Broadcast.java | 56 --------- .../main/java/com/orbekk/HelloAndroidActivity.java | 49 -------- master/src/main/java/com/orbekk/PingServer.java | 51 -------- 6 files changed, 323 deletions(-) delete mode 100644 master/AndroidManifest.xml delete mode 100644 master/pom.xml delete mode 100644 master/project.properties delete mode 100644 master/src/main/java/com/orbekk/Broadcast.java delete mode 100644 master/src/main/java/com/orbekk/HelloAndroidActivity.java delete mode 100644 master/src/main/java/com/orbekk/PingServer.java (limited to 'master') diff --git a/master/AndroidManifest.xml b/master/AndroidManifest.xml deleted file mode 100644 index 6a596ed..0000000 --- a/master/AndroidManifest.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/master/pom.xml b/master/pom.xml deleted file mode 100644 index ad0039a..0000000 --- a/master/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - 4.0.0 - com.orbekk - master - 1.0-SNAPSHOT - apk - master - - - - com.google.android - android - 2.1.2 - provided - - - - - commons-logging - commons-logging - 1.1.1 - provided - - - - javax.servlet - servlet-api - 2.5 - provided - - - - javax.portlet - portlet-api - 2.0 - provided - - - - 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 - 0.0-SNAPSHOT - - - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.0.0 - - ${project.basedir}/AndroidManifest.xml - ${project.basedir}/assets - ${project.basedir}/res - ${project.basedir}/src/main/native - - 8 - - true - true - true - - true - - - - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.jayway.maven.plugins.android.generation2 - - - android-maven-plugin - - - [3.0.0,) - - - proguard - - generate-sources - - - - - - - - - - - - - - - diff --git a/master/project.properties b/master/project.properties deleted file mode 100644 index ea89160..0000000 --- a/master/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-8 diff --git a/master/src/main/java/com/orbekk/Broadcast.java b/master/src/main/java/com/orbekk/Broadcast.java deleted file mode 100644 index 84b2d6e..0000000 --- a/master/src/main/java/com/orbekk/Broadcast.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.orbekk; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.SocketException; -import java.net.UnknownHostException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import android.content.Context; -import android.net.DhcpInfo; -import android.net.wifi.WifiManager; - -public class Broadcast { - private Context context; - private Logger logger = LoggerFactory.getLogger(getClass()); - - public Broadcast(Context context) { - this.context = context; - } - - public InetAddress getBroadcastAddress() { - WifiManager wifi = (WifiManager)context.getSystemService(Context.WIFI_SERVICE); - DhcpInfo dhcp = wifi.getDhcpInfo(); - - int broadcast = (dhcp.ipAddress & dhcp.netmask) | ~dhcp.netmask; - byte[] quads = new byte[4]; - for (int k = 0; k < 4; k++) - quads[k] = (byte) ((broadcast >> k * 8) & 0xFF); - try { - return InetAddress.getByAddress(quads); - } catch (UnknownHostException e) { - logger.warn("Failed to find broadcast address."); - return null; - } - } - - public boolean sendBroadcast(byte[] data, int port) { - try { - DatagramSocket socket = new DatagramSocket(port); - socket.setBroadcast(true); - DatagramPacket packet = new DatagramPacket(data, data.length, getBroadcastAddress(), port); - socket.send(packet); - return true; - } catch (SocketException e) { - logger.warn("Failed to send broadcast.", e.fillInStackTrace()); - return false; - } catch (IOException e) { - logger.warn("Error when sending broadcast.", e.fillInStackTrace()); - return false; - } - } -} \ 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 deleted file mode 100644 index 4160bf4..0000000 --- a/master/src/main/java/com/orbekk/HelloAndroidActivity.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.orbekk; - -import com.orbekk.net.Broadcaster; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; - -public class HelloAndroidActivity extends Activity { - - private static String TAG = "master"; - private PingServer pingServer; - - /** - * Called when the activity is first created. - * @param savedInstanceState If the activity is being re-initialized after - * previously being shut down then this Bundle contains the data it most - * recently supplied in onSaveInstanceState(Bundle). Note: Otherwise it is null. - */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - System.setProperty("java.net.preferIPv4Stack", "true"); - System.setProperty("java.net.preferIPv6Addresses", "false"); - - Log.i(TAG, "onCreate"); - setContentView(R.layout.main); - - pingServer = PingServer.createPingServer(10080); - try { - pingServer.start(); - } catch (Exception e) { - throw new RuntimeException(e.getMessage()); - } - -// 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 - protected void onDestroy() { - pingServer.stop(); - super.onDestroy(); - } -} - diff --git a/master/src/main/java/com/orbekk/PingServer.java b/master/src/main/java/com/orbekk/PingServer.java deleted file mode 100644 index 5df2346..0000000 --- a/master/src/main/java/com/orbekk/PingServer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.orbekk; - -import org.eclipse.jetty.server.Server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.googlecode.jsonrpc4j.JsonRpcServer; -import com.orbekk.rpc.PingService; -import com.orbekk.rpc.PingServiceImpl; -import com.orbekk.rpc.RpcHandler; - -public class PingServer { - private Server server; - private Logger logger = LoggerFactory.getLogger(getClass()); - - public PingServer(Server server) { - this.server = server; - } - - public static PingServer createPingServer(int port) { - PingService service = new PingServiceImpl(); - JsonRpcServer jsonServer = new JsonRpcServer(service, PingService.class); - - Server server = new Server(port); - RpcHandler rpcHandler = new RpcHandler(jsonServer); - server.setHandler(rpcHandler); - - return new PingServer(server); - } - - public void start() throws Exception { - logger.info("Starting server."); - server.start(); - } - - public void join() { - try { - server.join(); - } catch (InterruptedException e) { - logger.info("Received InterruptException while waiting for server.", e.fillInStackTrace()); - } - } - - public void stop() { - try { - server.stop(); - } catch (Exception e) { - logger.warn("Exception when stopping server.", e.fillInStackTrace()); - } - } -} -- cgit v1.2.3