Rename projects.

– jsonrpc → same
– master → same-android

6 files changed, 0 insertions, 323 deletions

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.orbekk" android:versionCode="1" android:versionName="1.0-SNAPSHOT">
-<uses-permission android:name="android.permission.INTERNET"/>
-<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-
-  <application android:icon="@drawable/icon" android:label="@string/app_name">
-    <activity android:name=".HelloAndroidActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-
-</manifest>
-
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.orbekk</groupId>
-    <artifactId>master</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>apk</packaging>
-    <name>master</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <version>2.1.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-
-        <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          <version>1.1.1</version>
-          <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-          <version>2.5</version>
-          <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>javax.portlet</groupId>
-          <artifactId>portlet-api</artifactId>
-          <version>2.0</version>
-          <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-android</artifactId>
-            <version>1.6.1-RC1</version>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <version>1.6.4</version>
-          <scope>provided</scope>
-        </dependency>    
-        
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <version>1.6.4</version>
-          <scope>provided</scope>
-        </dependency>    
-        
-        <dependency>
-            <groupId>com.orbekk</groupId>
-            <artifactId>jsonrpc</artifactId>
-            <version>0.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
-                    <assetsDirectory>${project.basedir}/assets</assetsDirectory>
-                    <resourceDirectory>${project.basedir}/res</resourceDirectory>
-                    <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
-                    <sdk>
-                        <platform>8</platform>
-                    </sdk>
-                    <deleteConflictingFiles>true</deleteConflictingFiles>
-                    <extractDuplicates>true</extractDuplicates>
-                    <undeployBeforeDeploy>true</undeployBeforeDeploy>
-                </configuration>
-                <extensions>true</extensions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            com.jayway.maven.plugins.android.generation2
-                                        </groupId>
-                                        <artifactId>
-                                            android-maven-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [3.0.0,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>proguard</goal>
-                                            <goal>
-                                                generate-sources
-                                            </goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
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). <b>Note: Otherwise it is null.</b>
-     */
-    @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());
-        }
-    }
-}