From a63e922375434b9d8f7effffe14845d240b430f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 10 Jan 2012 15:38:31 +0100 Subject: Remove rpctest project. Apache xmlrpc doesn't work on Android because of a mismatch in Java core classes [1]. Remove rpctest project. In my master's project, jsonrpc4j will be used instead of xmlrpc. [1] http://code.google.com/p/android/issues/detail?id=9493 --- 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 -- 9 files changed, 214 deletions(-) delete mode 100644 rpctest/pom.xml delete mode 100644 rpctest/src/main/java/com/orbekk/App.java delete mode 100644 rpctest/src/main/java/com/orbekk/Calculator.java delete mode 100644 rpctest/src/main/java/com/orbekk/CalculatorImpl.java delete mode 100644 rpctest/src/main/java/com/orbekk/Client.java delete mode 100644 rpctest/src/main/java/com/orbekk/ServerTest.java delete mode 100644 rpctest/src/main/resources/log4j.properties delete mode 100644 rpctest/src/test/java/com/orbekk/AppTest.java delete mode 100644 rpctest/target/classes/log4j.properties diff --git a/rpctest/pom.xml b/rpctest/pom.xml deleted file mode 100644 index 36fd446..0000000 --- a/rpctest/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - 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 deleted file mode 100644 index 8459172..0000000 --- a/rpctest/src/main/java/com/orbekk/App.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 8fda63c..0000000 --- a/rpctest/src/main/java/com/orbekk/Calculator.java +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 5540f3a..0000000 --- a/rpctest/src/main/java/com/orbekk/CalculatorImpl.java +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index dca3018..0000000 --- a/rpctest/src/main/java/com/orbekk/Client.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index e8c9a3e..0000000 --- a/rpctest/src/main/java/com/orbekk/ServerTest.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index 6ca6c6f..0000000 --- a/rpctest/src/main/resources/log4j.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 9201a36..0000000 --- a/rpctest/src/test/java/com/orbekk/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 6ca6c6f..0000000 --- a/rpctest/target/classes/log4j.properties +++ /dev/null @@ -1,5 +0,0 @@ -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