From 9a554911174e096b95e99527eac04627400c41ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 10 Jan 2012 15:34:55 +0100 Subject: Initial import of maven projects. jsonrpc - Common classes. rpctest - A small xmlrpc project. master - Android application containing broadcast code and ping service. --- jsonrpc/pom.xml | 89 ++++++++++++++ .../java/com/orbekk/net/BroadcastListener.java | 49 ++++++++ jsonrpc/src/main/java/com/orbekk/rpc/App.java | 29 +++++ jsonrpc/src/main/java/com/orbekk/rpc/Client.java | 25 ++++ .../src/main/java/com/orbekk/rpc/PingService.java | 5 + .../main/java/com/orbekk/rpc/PingServiceImpl.java | 8 ++ .../src/main/java/com/orbekk/rpc/RpcHandler.java | 27 +++++ jsonrpc/src/main/resources/log4j.properties | 5 + jsonrpc/target/classes/log4j.properties | 5 + master/AndroidManifest.xml | 17 +++ master/pom.xml | 129 +++++++++++++++++++++ master/project.properties | 11 ++ master/src/main/java/com/orbekk/Broadcast.java | 55 +++++++++ .../src/main/java/com/orbekk/ConfigureLog4J.java | 18 +++ .../main/java/com/orbekk/HelloAndroidActivity.java | 62 ++++++++++ master/src/main/java/com/orbekk/PingServer.java | 50 ++++++++ rpctest/pom.xml | 63 ++++++++++ rpctest/src/main/java/com/orbekk/App.java | 13 +++ rpctest/src/main/java/com/orbekk/Calculator.java | 5 + .../src/main/java/com/orbekk/CalculatorImpl.java | 7 ++ rpctest/src/main/java/com/orbekk/Client.java | 27 +++++ rpctest/src/main/java/com/orbekk/ServerTest.java | 51 ++++++++ rpctest/src/main/resources/log4j.properties | 5 + rpctest/src/test/java/com/orbekk/AppTest.java | 38 ++++++ rpctest/target/classes/log4j.properties | 5 + 25 files changed, 798 insertions(+) create mode 100644 jsonrpc/pom.xml create mode 100644 jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java create mode 100644 jsonrpc/src/main/java/com/orbekk/rpc/App.java create mode 100644 jsonrpc/src/main/java/com/orbekk/rpc/Client.java create mode 100644 jsonrpc/src/main/java/com/orbekk/rpc/PingService.java create mode 100644 jsonrpc/src/main/java/com/orbekk/rpc/PingServiceImpl.java create mode 100644 jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java create mode 100644 jsonrpc/src/main/resources/log4j.properties create mode 100644 jsonrpc/target/classes/log4j.properties create mode 100644 master/AndroidManifest.xml create mode 100644 master/pom.xml create mode 100644 master/project.properties create mode 100644 master/src/main/java/com/orbekk/Broadcast.java create mode 100644 master/src/main/java/com/orbekk/ConfigureLog4J.java create mode 100644 master/src/main/java/com/orbekk/HelloAndroidActivity.java create mode 100644 master/src/main/java/com/orbekk/PingServer.java create mode 100644 rpctest/pom.xml create mode 100644 rpctest/src/main/java/com/orbekk/App.java create mode 100644 rpctest/src/main/java/com/orbekk/Calculator.java create mode 100644 rpctest/src/main/java/com/orbekk/CalculatorImpl.java create mode 100644 rpctest/src/main/java/com/orbekk/Client.java create mode 100644 rpctest/src/main/java/com/orbekk/ServerTest.java create mode 100644 rpctest/src/main/resources/log4j.properties create mode 100644 rpctest/src/test/java/com/orbekk/AppTest.java create mode 100644 rpctest/target/classes/log4j.properties diff --git a/jsonrpc/pom.xml b/jsonrpc/pom.xml new file mode 100644 index 0000000..4d06cfd --- /dev/null +++ b/jsonrpc/pom.xml @@ -0,0 +1,89 @@ + + 4.0.0 + + com.orbekk + jsonrpc + 0.0-SNAPSHOT + jar + + jsonrpc + http://maven.apache.org + + + UTF-8 + + + + + jsonrpc3j-webdav-maven-repo + jsonrpc4j maven repository + http://jsonrpc4j.googlecode.com/svn/maven/repo/ + default + + + + + + com.googlecode + jsonrpc4j + 0.18 + + + + org.codehaus.jackson + jackson-mapper-asl + 1.7.5 + + + + junit + junit + 4.10 + test + + + + log4j + log4j + 1.2.16 + + + + javax.servlet + servlet-api + 2.5 + + + + javax.portlet + portlet-api + 2.0 + + + + org.eclipse.jetty + jetty-servlet + 8.0.0.M3 + + + + org.eclipse.jetty + jetty-server + 8.0.0.M3 + + + + + + + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + diff --git a/jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java b/jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java new file mode 100644 index 0000000..50cdbc7 --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/net/BroadcastListener.java @@ -0,0 +1,49 @@ +package com.orbekk.net; + +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.SocketException; + +import org.apache.log4j.Logger; + +public class BroadcastListener { + private int port; + private Logger logger = Logger.getLogger(getClass()); + + public BroadcastListener(int port) { + this.port = port; + } + + public boolean listen() { + logger.info("Waiting for broadcast on port " + port); + DatagramSocket socket; + try { + socket = new DatagramSocket(port); + } catch (SocketException e) { + logger.warn("Failed to create socket.", e.fillInStackTrace()); + return true; + } + try { + socket.setBroadcast(true); + } catch (SocketException e) { + logger.warn(e.fillInStackTrace()); + } + byte[] buffer = new byte[2048]; + DatagramPacket packet = new DatagramPacket(buffer, buffer.length); + try { + socket.receive(packet); + } catch (IOException e) { + logger.warn(e.fillInStackTrace()); + } + logger.info("Received broadcast from " + packet.getAddress() + + ": " + new String(packet.getData())); + return true; + } + + public static void main(String[] args) { + int port = Integer.parseInt(args[0]); + BroadcastListener listener = new BroadcastListener(port); + System.out.println("Received broadcast: " + listener.listen()); + } +} diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/App.java b/jsonrpc/src/main/java/com/orbekk/rpc/App.java new file mode 100644 index 0000000..e112008 --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/rpc/App.java @@ -0,0 +1,29 @@ +package com.orbekk.rpc; + +import org.eclipse.jetty.server.Server; + +import com.googlecode.jsonrpc4j.JsonRpcServer; + +public class App { + public static void main(String[] args) { + PingService service = new PingServiceImpl(); + JsonRpcServer jsonServer = new JsonRpcServer(service, PingService.class); + + Server server = new Server(10080); + RpcHandler rpcHandler = new RpcHandler(jsonServer); + server.setHandler(rpcHandler); + + try { + server.start(); + } catch (Exception e) { + System.out.println("Could not start jetty server."); + e.printStackTrace(); + } + + try { + server.join(); + } catch (InterruptedException e) { + System.out.println("Interrupt"); + } + } +} diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/Client.java b/jsonrpc/src/main/java/com/orbekk/rpc/Client.java new file mode 100644 index 0000000..bfb6c52 --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/rpc/Client.java @@ -0,0 +1,25 @@ +package com.orbekk.rpc; + +import java.net.MalformedURLException; +import java.net.URL; + +import com.googlecode.jsonrpc4j.JsonRpcHttpClient; +import com.googlecode.jsonrpc4j.ProxyUtil; + +public class Client { + + public static void main(String[] args) { + JsonRpcHttpClient client = null; + try { + client = new JsonRpcHttpClient( + new URL("http://10.0.0.96:10080/PingService.json")); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + PingService service = ProxyUtil.createProxy( + client.getClass().getClassLoader(), + PingService.class, + client); + System.out.println(service.ping()); + } +} diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/PingService.java b/jsonrpc/src/main/java/com/orbekk/rpc/PingService.java new file mode 100644 index 0000000..353f7c5 --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/rpc/PingService.java @@ -0,0 +1,5 @@ +package com.orbekk.rpc; + +public interface PingService { + String ping(); +} diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/PingServiceImpl.java b/jsonrpc/src/main/java/com/orbekk/rpc/PingServiceImpl.java new file mode 100644 index 0000000..9472846 --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/rpc/PingServiceImpl.java @@ -0,0 +1,8 @@ +package com.orbekk.rpc; + +public class PingServiceImpl implements PingService { + @Override + public String ping() { + return "Pong"; + } +} diff --git a/jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java b/jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java new file mode 100644 index 0000000..bc76e4e --- /dev/null +++ b/jsonrpc/src/main/java/com/orbekk/rpc/RpcHandler.java @@ -0,0 +1,27 @@ +package com.orbekk.rpc; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; + +import com.googlecode.jsonrpc4j.JsonRpcServer; + +public class RpcHandler extends AbstractHandler { + private JsonRpcServer rpcServer; + + public RpcHandler(JsonRpcServer rpcServer) { + this.rpcServer = rpcServer; + } + + @Override + public void handle(String target, Request baseRequest, + HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + rpcServer.handle(request, response); + } +} diff --git a/jsonrpc/src/main/resources/log4j.properties b/jsonrpc/src/main/resources/log4j.properties new file mode 100644 index 0000000..6ca6c6f --- /dev/null +++ b/jsonrpc/src/main/resources/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootLogger=DEBUG, A1 + +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n diff --git a/jsonrpc/target/classes/log4j.properties b/jsonrpc/target/classes/log4j.properties new file mode 100644 index 0000000..6ca6c6f --- /dev/null +++ b/jsonrpc/target/classes/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootLogger=DEBUG, A1 + +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n diff --git a/master/AndroidManifest.xml b/master/AndroidManifest.xml new file mode 100644 index 0000000..6a596ed --- /dev/null +++ b/master/AndroidManifest.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/master/pom.xml b/master/pom.xml new file mode 100644 index 0000000..77fb614 --- /dev/null +++ b/master/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + com.orbekk + master + 1.0-SNAPSHOT + apk + master + + + + com.google.android + android + 2.1.2 + provided + + + + log4j + log4j + 1.2.16 + + + + commons-logging + commons-logging + 1.1.1 + provided + + + + javax.servlet + servlet-api + 2.5 + provided + + + + javax.portlet + portlet-api + 2.0 + provided + + + + de.mindpipe.android + android-logging-log4j + 1.0.2 + + + + + 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 new file mode 100644 index 0000000..ea89160 --- /dev/null +++ b/master/project.properties @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..bacde0d --- /dev/null +++ b/master/src/main/java/com/orbekk/Broadcast.java @@ -0,0 +1,55 @@ +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.apache.log4j.Logger; + +import android.content.Context; +import android.net.DhcpInfo; +import android.net.wifi.WifiManager; + +public class Broadcast { + private Context context; + private Logger logger = Logger.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/ConfigureLog4J.java b/master/src/main/java/com/orbekk/ConfigureLog4J.java new file mode 100644 index 0000000..e6b1ac5 --- /dev/null +++ b/master/src/main/java/com/orbekk/ConfigureLog4J.java @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000..a142214 --- /dev/null +++ b/master/src/main/java/com/orbekk/HelloAndroidActivity.java @@ -0,0 +1,62 @@ +package com.orbekk; + +import org.apache.log4j.Level; + +import de.mindpipe.android.logging.log4j.LogConfigurator; +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; + + 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 + * 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"); + configureLog4j(); + 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); + } + + @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 new file mode 100644 index 0000000..b1126d4 --- /dev/null +++ b/master/src/main/java/com/orbekk/PingServer.java @@ -0,0 +1,50 @@ +package com.orbekk; + +import org.apache.log4j.Logger; +import org.eclipse.jetty.server.Server; + +import com.googlecode.jsonrpc4j.JsonRpcServer; +import com.orbekk.rpc.PingService; +import com.orbekk.rpc.PingServiceImpl; +import com.orbekk.rpc.RpcHandler; + +public class PingServer { + Server server; + Logger logger = Logger.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()); + } + } +} diff --git a/rpctest/pom.xml b/rpctest/pom.xml new file mode 100644 index 0000000..36fd446 --- /dev/null +++ b/rpctest/pom.xml @@ -0,0 +1,63 @@ + + 4.0.0 + + com.orbekk + rpctest + 0.0-SNAPSHOT + jar + + rpctest + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 3.8.1 + test + + + + org.apache.xmlrpc + xmlrpc-server + 3.1.3 + + + + org.apache.xmlrpc + xmlrpc-client + 3.1.3 + + + + org.apache.xmlrpc + xmlrpc-common + 3.1.3 + + + + log4j + log4j + 1.2.16 + + + + + + + + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + diff --git a/rpctest/src/main/java/com/orbekk/App.java b/rpctest/src/main/java/com/orbekk/App.java new file mode 100644 index 0000000..8459172 --- /dev/null +++ b/rpctest/src/main/java/com/orbekk/App.java @@ -0,0 +1,13 @@ +package com.orbekk; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/rpctest/src/main/java/com/orbekk/Calculator.java b/rpctest/src/main/java/com/orbekk/Calculator.java new file mode 100644 index 0000000..8fda63c --- /dev/null +++ b/rpctest/src/main/java/com/orbekk/Calculator.java @@ -0,0 +1,5 @@ +package com.orbekk; + +interface Calculator { + int add(int x, int y); +} diff --git a/rpctest/src/main/java/com/orbekk/CalculatorImpl.java b/rpctest/src/main/java/com/orbekk/CalculatorImpl.java new file mode 100644 index 0000000..5540f3a --- /dev/null +++ b/rpctest/src/main/java/com/orbekk/CalculatorImpl.java @@ -0,0 +1,7 @@ +package com.orbekk; + +public class CalculatorImpl implements Calculator { + public int add(int x, int y) { + return x + y; + } +} diff --git a/rpctest/src/main/java/com/orbekk/Client.java b/rpctest/src/main/java/com/orbekk/Client.java new file mode 100644 index 0000000..dca3018 --- /dev/null +++ b/rpctest/src/main/java/com/orbekk/Client.java @@ -0,0 +1,27 @@ +package com.orbekk; + +import java.net.URL; +import org.apache.log4j.Logger; +import org.apache.xmlrpc.client.XmlRpcClient; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; +import org.apache.xmlrpc.client.util.ClientFactory; + +public class Client { + public static void main(String[] args) throws Exception { + Logger logger = Logger.getLogger("Client"); + logger.info("Client starting."); + XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl(); + config.setServerURL(new URL("http://localhost:10080/xmlrpc")); + XmlRpcClient client = new XmlRpcClient(); + client.setConfig(config); + ClientFactory factory = new ClientFactory(client); + Calculator calculator = (Calculator)factory.newInstance( + Calculator.class); + int sum = calculator.add(40, 2); + for (int i = 0; i < 100; i++) { + sum = calculator.add(40, 2); + } + System.out.println("The answer is " + sum); + logger.info("Client finished."); + } +} diff --git a/rpctest/src/main/java/com/orbekk/ServerTest.java b/rpctest/src/main/java/com/orbekk/ServerTest.java new file mode 100644 index 0000000..e8c9a3e --- /dev/null +++ b/rpctest/src/main/java/com/orbekk/ServerTest.java @@ -0,0 +1,51 @@ +package com.orbekk; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.server.PropertyHandlerMapping; +import org.apache.xmlrpc.server.XmlRpcHandlerMapping; +import org.apache.xmlrpc.webserver.ServletWebServer; +import org.apache.xmlrpc.webserver.XmlRpcServlet; + +public class ServerTest { + final static int port = 10080; + + public static class HandlerServlet extends XmlRpcServlet { + private XmlRpcHandlerMapping mapping; + + public HandlerServlet(XmlRpcHandlerMapping mapping) + throws ServletException { + this.mapping = mapping; + } + + @Override + protected XmlRpcHandlerMapping newXmlRpcHandlerMapping() + throws XmlRpcException { + return mapping; + } + } + + public static void main(String[] args) { + System.out.println("Starting " + ServerTest.class.getName()); + try { + PropertyHandlerMapping phm = new PropertyHandlerMapping(); + phm.setVoidMethodEnabled(true); + phm.addHandler(Calculator.class.getName(), CalculatorImpl.class); + + XmlRpcServlet servlet = new HandlerServlet(phm); + ServletWebServer server = new ServletWebServer(servlet, port); + server.start(); + } catch (XmlRpcException e) { + System.err.println("Error creating property mapping."); + e.printStackTrace(); + } catch (ServletException e) { + System.err.println("Unable to initialize servlet."); + e.printStackTrace(); + } catch (IOException e) { + System.err.println("Exception from web server."); + e.printStackTrace(); + } + } +} diff --git a/rpctest/src/main/resources/log4j.properties b/rpctest/src/main/resources/log4j.properties new file mode 100644 index 0000000..6ca6c6f --- /dev/null +++ b/rpctest/src/main/resources/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootLogger=DEBUG, A1 + +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n diff --git a/rpctest/src/test/java/com/orbekk/AppTest.java b/rpctest/src/test/java/com/orbekk/AppTest.java new file mode 100644 index 0000000..9201a36 --- /dev/null +++ b/rpctest/src/test/java/com/orbekk/AppTest.java @@ -0,0 +1,38 @@ +package com.orbekk; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/rpctest/target/classes/log4j.properties b/rpctest/target/classes/log4j.properties new file mode 100644 index 0000000..6ca6c6f --- /dev/null +++ b/rpctest/target/classes/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootLogger=DEBUG, A1 + +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n -- cgit v1.2.3