diff --git a/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties b/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties
new file mode 100644
index 0000000000000000000000000000000000000000..17eead1bc1594ac9fc749b332fc304f498b1ee3d
--- /dev/null
+++ b/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Tue Feb 28 13:29:14 CET 2012
diff --git a/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock b/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock
new file mode 100644
index 0000000000000000000000000000000000000000..40fdece9d24d300eb3ed6177f4a7a7952db584cd
--- /dev/null
+++ b/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin b/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3d0a6f4b6a1f0da3c2f53058bdab5b98af1c5a3d
Binary files /dev/null and b/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin b/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7613866b12d1123b4a73e072eec4c60686044225
Binary files /dev/null and b/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin b/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9d13c2d5dcba3c285bf11d060155d60f2a35628f
Binary files /dev/null and b/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin differ
diff --git a/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin b/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3cd567e2dd4097bb87458583275ede59c922594d
Binary files /dev/null and b/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index d7c72411d75955877eed32c81a016bdebae8aa59..0000000000000000000000000000000000000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-
-# Append to CPACK_SOURCE_IGNORE_FILES a semicolon-separated list of
-# directories (or patterns, but directories should suffice) that should
-# be excluded from the distro. This is not the place to put things that
-# should be ignored everywhere, like "build" directories; that happens in
-# rosbuild/rosbuild.cmake. Here should be listed packages that aren't
-# ready for inclusion in a distro.
-#
-# This list is combined with the list in rosbuild/rosbuild.cmake. Note
-# that CMake 2.6 may be required to ensure that the two lists are combined
-# properly. CMake 2.4 seems to have unpredictable scoping rules for such
-# variables.
-#list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
-
-rosbuild_make_distribution(0.2.0)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8b09720b1e2c616a52626f61ec6d4df04acc0f18..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: all clean test
-
-all:
- mvn install
-
-clean:
- mvn clean
-
-test:
- mvn test
diff --git a/README b/README
index 438ade3c47db1f01407164de715907eee0263392..12339fb5afb3ce95749f8aabca1c26c0907ce016 100644
--- a/README
+++ b/README
@@ -1,3 +1,3 @@
-Visit the rosjava wiki for instructions.
+Visit the rosjava_core wiki for instructions.
-http://ros.org/wiki/rosjava
+http://ros.org/wiki/rosjava_core
diff --git a/apache_xmlrpc/Makefile b/apache_xmlrpc/Makefile
deleted file mode 100644
index 8b09720b1e2c616a52626f61ec6d4df04acc0f18..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: all clean test
-
-all:
- mvn install
-
-clean:
- mvn clean
-
-test:
- mvn test
diff --git a/apache_xmlrpc/client/pom.xml b/apache_xmlrpc/client/pom.xml
deleted file mode 100644
index d32df4b84de123dd99a7cb2b9cc022ffd1fc5c07..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/client/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>
- <artifactId>org.ros.org.apache.xmlrpc.client</artifactId>
- <packaging>jar</packaging>
- <name>Apache XML-RPC Client Library</name>
-
- <parent>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc</artifactId>
- <version>3.1.3</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc.common</artifactId>
- <version>3.1.3</version>
- </dependency>
- <dependency>
- <groupId>ws-commons-util</groupId>
- <artifactId>ws-commons-util</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/apache_xmlrpc/common/pom.xml b/apache_xmlrpc/common/pom.xml
deleted file mode 100644
index 54cfdd1df4710b6e652c5f45fb29cac2102c5f1e..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/common/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>
- <artifactId>org.ros.org.apache.xmlrpc.common</artifactId>
- <packaging>jar</packaging>
- <name>Apache XML-RPC Common Library</name>
-
- <parent>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc</artifactId>
- <version>3.1.3</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>ws-commons-util</groupId>
- <artifactId>ws-commons-util</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/apache_xmlrpc/manifest.xml b/apache_xmlrpc/manifest.xml
deleted file mode 100644
index aa709f918e47f166d6364693dab6f1556c0a49ab..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/manifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<package>
- <description brief="apache_xmlrpc">
- apache_xmlrpc
- </description>
- <author>Apache Foundation</author>
- <license>Apache License 2.0</license>
- <review status="unreviewed" notes="" />
- <url>http://ros.org/wiki/apache_xmlrpc</url>
-</package>
-
diff --git a/apache_xmlrpc/pom.xml b/apache_xmlrpc/pom.xml
deleted file mode 100644
index ee748f267fa59608183de0e165d724605c858e7d..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc</artifactId>
- <name>Apache XML-RPC</name>
- <version>3.1.3</version>
- <description>
- A rosjava modification to Apache XML-RPC.
- </description>
- <packaging>pom</packaging>
- <inceptionYear>2001</inceptionYear>
-
- <modules>
- <module>common</module>
- <module>client</module>
- <module>server</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.httpclient</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>ws-commons-util</groupId>
- <artifactId>ws-commons-util</artifactId>
- <version>1.0.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
diff --git a/apache_xmlrpc/server/pom.xml b/apache_xmlrpc/server/pom.xml
deleted file mode 100644
index 8d24193413f56e5d5c00cf02fcef4071f76bb7a5..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/server/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>
- <artifactId>org.ros.org.apache.xmlrpc.server</artifactId>
- <packaging>jar</packaging>
- <name>Apache XML-RPC Server Library</name>
-
- <parent>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc</artifactId>
- <version>3.1.3</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/xmlrpc/test/ScalabilityTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc.common</artifactId>
- <version>3.1.3</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/apache_xmlrpc/src/changes/changes.xml b/apache_xmlrpc/src/changes/changes.xml
deleted file mode 100644
index ad2b99d2ffb185544444c2986518dd9fa3132b84..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/changes/changes.xml
+++ /dev/null
@@ -1,447 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<document>
- <properties>
- <title>Changes in Apache XML-RPC</title>
- </properties>
- <body>
- <release version="3.1.3" date="2010-Feb-06">
- <action dev="jochen" type="fix">
- The version number in the clients user agent string is now
- updated automatically.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-168">
- Fixed a deadlock in the ThreadPool.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-174" due-to="Livnat Peer" due-to-email="livnats@gmail.com">
- The ClientFactory is now supporting an empty remote class.
- </action>
- <action dev="jochen" type="add" due-to="Gam" due-to-email="gamaliel@fastmail.fm">
- Added support for configured timeouts to the XmlRpcSun15HttpTransport class.
- </action>
- <action dev="jochen" type="fix" due-to="Johan Hôgre" due-to-email="johan.hagre@home.se">
- Fixed a potential security hole: The client has been able to include server side resources
- into the request by using external entities.
- </action>
- </release>
-
- <release version="3.1.2" date="2009-Apr-19">
- <action dev="jochen" type="fix" due-to="Mark Gertsvolf" due-to-email="markg@nortel.com"
- issue="XMLRPC-162">
- Eliminated a possible race condition in the ThreadPool.
- </action>
- <action dev="jochen" type="fix" due-to="Mark Gertsvolf" due-to-email="markg@nortel.com"
- issue="XMLRPC-161">
- The ThreadPool could create more threads than configured.
- </action>
- <action dev="jochen" type="fix" due-to="James Baldassari" due-to-email="jbaldassari at gmail dot com"
- issue="XMLRPC-160">
- Weakened the access control in the WebServer class in order to make
- subclassing easier.
- </action>
- <action dev="jochen" type="fix" due-to="Brandon DuRette" due-to-email="brandond@alum.mit.edu"
- issue="XMLRPC-159">
- Improved the handling of HTTP status codes that indicate an error.
- </action>
- <action dev="jochen" type="fix" due-to="Alan Burlison" due-to-email="Alan.Burlison@sun.com">
- Fixed a possible NPE in case of a malformed HTTP request in the WebServer.
- </action>
- <action dev="jochen" type="fix" due-to="Alan Burlison" due-to-email="Alan.Burlison@sun.com"
- issue="XMLRPC-166">
- The webserver's connection timeout wasn't applied to the ServletWebServer.
- </action>
- <action dev="jochen" type="fix" due-to="Alan Burlison" due-to-email="Alan.Burlison@sun.com"
- issue="XMLRPC-166">
- A client could prevent other clients from connecting by not sending any data.
- </action>
- <action dev="jochen" type="fix" due-to="Greg Wurth" due-to-email="hackwurth@mac.com"
- issue="XMLRPC-164">
- The platforms default encoding has been used at some point when decoding HTTP headers.
- </action>
- </release>
-
- <release version="3.1.1" date="2008-Aug-10">
- <action dev="jochen" type="fix" due-to="Póka Balázs" due-to-email="p.balazs@gmail.com">
- The XmlRpcCommonsTransport is now always declaring its entities as repeatable.
- </action>
- <action dev="jochen" type="add" due-to="Andreas Sahlbach" due-to-email="andreas.sahlbach@gmail.com"
- issue="XMLRPC-149">
- It is now possible to set the clients user-agent header in the client configuration.
- </action>
- <action dev="jochen" type="fix" due-to="Andreas Sahlbach" due-to-email="andreas.sahlbach@gmail.com"
- issue="XMLRPC-148">
- Ensured that the server replies with a spec compliant request, if the client uses the
- content-length header.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-150">
- The XmlRpcSunHttpTransportFactory wasn't thread safe.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-101" due-to="Julio Francisco Veronelli" due-to-email="ckjfveronelli@fibertel.com.ar">
- Added support for javax.net.ssl.SSLSocketFactory and javax.net.Proxy.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-151">
- Added some clarification on the handling of Object[] and java.util.List to
- the page on "XML-RPC Data Types".
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-157" due-to="Kay Tiong Khoo" due-to-email="kaytiong@gmail.com">
- Minor grammar improvements.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-156">
- Added the XmlRpcErrorHandler, which allows to customize the error logging.
- This allows, for example, to minimize the logging for business exceptions.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-155">
- Documented, that called methods are choosen based on their signature.
- In particular, multiple methods with the same name are supported.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-158">
- Fixed the FAQ entry on how to obtain the clients IP address.
- </action>
- </release>
- <release version="3.1" date="2007-Aug-31">
- <action dev="jochen" type="add">
- Introduced the "enabledForExceptions" property.
- </action>
- <action dev="jochen" type="add">
- Added support for void methods, if extensions are turned on.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-118" due-to="Perry Nguyen"
- due-to-email="pfnguyen@hanhuy.com">
- Added PropertyHandlerMapping.load(ClassLoader, Map).
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-117" due-to="Jimisola Laursen"
- due-to-email="jimisola@jimisola.com">
- The authentication handler, type converter and requestprocessor factories
- are now configurable as properties of the XmlRpcServlet.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-116" due-to="Jimisola Laursen"
- due-to-email="jimisola@jimisola.com">
- Atomic properties of XmlRpcServer are now configurable as init parameters
- in the XmlRpcServlet.
- </action>
- <action dev="jochen" type="fix">
- Reworked the WebServer/ThreadPool framework in order to ensure a clean
- shutdown.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-124" due-to="Jimisola Laursen"
- due-to-email="jimisola@jimisola.com">
- The configuration framework, as introduced by XMLRPC-116, was applicable
- to the configuration only, and not to the XmlRpcServlet, or the
- XmlRpcServletServer.
- </action>
- <action dev="jochen" type="add">
- Introduced the method AbstractReflectiveHandlerMapping.isHandlerMethod().
- This should allow users to prevent remote invocation of certain methods,
- for example initialization stuff.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-126"
- due-to="Eugene Prokopiev" due-to-email="prokopiev@stc.donpac.ru">
- The ClientFactory is now able to use a custom name for the remote
- handler. So far, it was always using the interface name.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-127">
- It is now possible to have other objects than strings as
- map keys.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-131"
- due-to="Steffen Pingel" due-to-email="steffenp@gmx.de">
- Made extending the XmlRpcCommonsTransportFactory easier.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-132"
- due-to="Andrew Norman" due-to-email="anorman@piczoinc.com">
- Added support for redirects.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-136"
- due-to="Mario Linke" due-to-email="linke.mario@web.de">
- Fixed an invalid example in the "advanced" document.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-140">
- An invalid dateTime value is now causing a more informative
- error message.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-144"
- due-to="Steve Cohen" due-to-email="sc1478@att.com">
- The redirect handling (XMLRPC-132) wasn't actually working,
- because it treated an URI as a charset name.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-145"
- due-to="Gamaliel Amaudruz" due-to-email="gamaliel@fastmail.fm">
- Address matching in the Webserver wasn't actually working,
- because casting of integers to bytes was implemented wrong.
- </action>
- <action dev="jochen" type="fix">
- Make the HttpClient creation in XmlRpcCommonsTransport and the
- URLConnection creation in XmlRpcSunHttpTransport protected.
- This is required for cookie support.
- </action>
- <action dev="jochen" type="fix">
- The WebServer was producing invalid error responses, if contentLengthOptional
- was set.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-113" due-to="Juha Syrjala"
- due-to-email="Juha.Syrjala@hiq.fi">
- If the server was throwing an XmlRpcException, then the fault code and fault
- string weren't given to the client.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-114">
- The WebServer replies with an HTTP error 401 now, if the
- client uses chunked encoding.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-74">
- The properties "Extension-Name", "Specification-Vendor", "Specification-Version",
- "Specification-Title", "Implementation-Vendor-Id",
- "Implementation-Vendor" and "Implementation-Version" are now
- present in the MANIFEST files.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-115">
- An NPE was thrown, if the clients request didn't contain a "params" element.
- </action>
- <action dev="jochen" type="fix" due-to="Jonathan Oexner"
- due-to-email="jonathan.oexner@alum.wpi.edu">
- The method TimingOutCallback.waitForResponse is now checking, whether
- a response has already arrived before waiting.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-119">
- Fixed a serious performance problem, if the XML parser was sending large
- content in small pieces. This could happen, for example, if the content
- contained a large number of character entities.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-120"
- due-to="Juho Yli-Krekola" due-to-email="Juho.Yli-Krekola@iki.fi">
- The configuration of the reply timeout in the commons transport was wrong.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-133"
- due-to="Carsten Wolters" due-to-email="c.wolters@gmx.de">
- The DateParser is now treating an empty string as null.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-134"
- due-to="Sir Bode Rafael" due-to-email="sirboderafael@gmail.com">
- Fixed a broken link referring to an "SSL with Jetty" HOW-TO.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-141"
- due-to="Keith McNeill" due-to-email="mcneill@streambase.com">
- The XmlRpcRequestParser and XmlRpcResponseParser didn't reset
- their internal state within startDocument(). Consequently, they
- haven't been reusable.
- </action>
- </release>
- <release version="3.0" date="30-Aug-2006">
- <action dev="jochen" type="fix" due-to="Matt Preston"
- due-to-email="matt@knowledgeview.co.uk" issue="XMLRPC-100">
- Fixed the spelling of CharSetXmlWriterFactory, which made
- the class basically useless.
- </action>
- <action dev="jochen" type="fix" due-to="Stanislav Miklik"
- due-to-email="stanislav.miklik@gmail.com">
- Fixed that the WebServer didn't wait before retrying to
- bind to the server socket.
- </action>
- <action dev="jochen" type="fix" due-to="Stanislav Miklik"
- due-to-email="stanislav.miklik@gmail.com">
- Fixed an endless loop, if the WebServer threw a BindException.
- </action>
- <action dev="jochen" type="fix" due-to="Landon Fuller"
- due-to-email="landonf@threerings.net" issue="XMLRPC-104">
- A NullPointerException was triggered, if the BasicEncoding was set to null.
- </action>
- <action dev="jochen" type="fix" due-to="Landon Fuller"
- due-to-email="landonf@threerings.net" issue="XMLRPC-104">
- Basic authentication didn't work, if the base64 encoded string with
- user name and password contained more than 72 characters.
- </action>
- <action dev="jochen" type="fix">
- Basic authentication didn't work with the commons http transport,
- because the commons httpclient wasn't configured to send credentials
- by default. (It was waiting for a challenge.)
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-105">
- Basic authentication didn't work with the commons http transport,
- if user name or password contained non-ASCII characters.
- </action>
- <action dev="jochen" type="fix" due-to="Randall Bryant"
- due-to-email="randall@magpieti.com">
- The releaseWorker() method wasn't called for the server.
- </action>
- <action dev="jochen" type="fix">
- Fixed a bug in the web servers thread pool, which caused that
- threads haven't been reused.
- </action>
- <action dev="jochen" type="fix" due-to="Jason McLaurin"
- due-to-email="jmclaurin@petronworld.com">
- Documentation improvements
- </action>
- <action dev="jochen" type="add">
- Added documentation on custom data types.
- </action>
- <action dev="jochen" type="add" due-to="Catalin Hritcu"
- due-to-email="Catalin.Hritcu@gmail.com" issue="XMLRPC-107">
- The XmlRpcLiteHttpTransport is now creating a socket
- in a protected methods. This allows to switch to
- alternative socket implementations.
- </action>
- <action dev="jochen" type="fix" due-to="Catalin Hritcu"
- due-to-email="Catalin.Hritcu@gmail.com" issue="XMLRPC-108">
- More documentation fixes.
- </action>
- <action dev="jochen" type="fix" due-to="Catalin Hritcu"
- due-to-email="Catalin.Hritcu@gmail.com" issue="XMLRPC-109">
- Fixed an invalid FAQ example.
- </action>
- </release>
- <release version="3.0rc1" date="27-Jul-2006">
- <action dev="jochen" type="fix" due-to="Alan Burlison"
- due-to-email="Alan.Burlison@sun.com">
- Added a missing "synchronized" to the TimingOutCallback.
- </action>
- <action dev="jochen" type="fix" due-to="Chris Conrad"
- due-to-email="rhavyn@gmail.com" issue="XMLRPC-94">
- Fixed an invalid index, that caused the ReflectiveXmlRpcHandler to fail
- detecting a method.
- </action>
- <action dev="jochen" type="add" issue="XMLRPC-93">
- Added documentation for accessing an SSL server.
- </action>
- <action dev="jochen" type="add" due-to="Jimisola Laursen"
- due-to-email="jimisola@jimisola.com" issue="XMLRPC-96">
- A null parameter list is now treated as an empty object array.
- </action>
- <action dev="jochen" type="fix" due-to="Jimisola Laursen"
- due-to-email="jimisola@jimisola.com" issue="XMLRPC-97">
- The type long was missing in types.apt.
- </action>
- </release>
- <release version="3.0b1" date="24-Jun-2006">
- <action dev="hgomez" type="add">
- Add connectionTimeout and replyTimeout in RPC clients.
- CommonsTransport support connection and reply timeout, liteHttpTransport only support reply timeout
- </action>
- <action dev="jochen" type="fix" due-to="Marek Ludha"
- due-to-email="mludha@gmail.com">
- The value created by HttpUtil.encodeBasicAuthentication(...)
- was terminated with a line feed, which is invalid for
- use in HTTP headers.
- </action>
- <action dev="hgomez" type="add">
- add support for BigDecimal and BigInteger in extensions.
- </action>
- <action dev="jochen" type="fix" due-to="Walter Mundt"
- due-to-email="Walter.Mundt@coleengineering.com">
- Nested object arrays could not be parsed.
- </action>
- <action dev="jochen" type="fix" due-to="Walter Mundt"
- due-to-email="Walter.Mundt@coleengineering.com">
- The "string" tag could not be parsed.
- </action>
- <action dev="jochen" type="add" due-to="Walter Mundt"
- due-to-email="Walter.Mundt@coleengineering.com"
- issue="XMLRPC-76">
- Added the DynamicHandlerMapping.
- </action>
- <action dev="jochen" type="fix" due-to="Walter Mundt"
- due-to-email="Walter.Mundt@coleengineering.com">
- XmlRpcException.printStackTrace() was throwing
- an NPE, if no linked exception was present.
- </action>
- <action dev="jochen" type="add">
- The project is now splitted into three jar files:
- common, client, and server.
- </action>
- <action dev="jochen" type="fix" due-to="Brad Karp"
- due-to-email="bkarp@cs.ucl.ac.uk">
- The Base64 encoder doesn't accept buffers of length 0. Such a buffer
- was passed, if the byte array to encode has itself length 0.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-79">
- HTTP/1.0 requires a content-length header. The Lite HTTP transport
- doesn't support HTTP/1.1, so it refuses the "contentLengthOptional"
- setting from now on.
- </action>
- <action dev="jochen" type="add" due-to="Mark Petrovic"
- due-to-email="mspetrovic@gmail.com">
- Added support for initializable handlers.
- </action>
- <action dev="jochen" type="add" due-to="Ken Weiner"
- due-to-email="kweiner@gmail.com" issue="XMLRPC-56">
- Added the TimingOutCallback, which allows to abort a request,
- if the server doesn't reply within a given time.
- </action>
- <action dev="hgomez" type="fix">
- Fixed that dateTime values must not include timezone values.
- </action>
- <action dev="jochen" type="add" due-to="Denis Carniel"
- due-to-email="2nis@aktiv-design.com" issue="XMLRPC-84">
- The XmlRpcServlet allows to configure its "enabledForExtensions"
- value as an init parameter.
- </action>
- <action dev="jochen" type="add">
- It is now possible to create and initialize handler objects per
- request.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-89">
- Added partial support for automatic conversion of object arrays
- to lists, or vectors. Same for maps to hash tables, or properties.
- </action>
- </release>
- <release version="3.0a1" date="17-Feb-2005">
- <action dev="jochen" type="add">
- Complete rewrite, adding vendor extensions:
- Streaming mode, support for all primitive Java types,
- nulls, DOM elements, and JAXB objects.
- </action>
- </release>
- <release version="2.0.2" date="Not yet released">
- <action dev="jochen" type="fix" issue="XMLRPC-67"
- due-to="Mike Bailey" due-to-email="mike at blueoak.com">
- A missing increment in LiteXmlRpcTransport.initConnection()
- prevented, that the method could finally fail, resulting
- in a never ending loop.
- </action>
- </release>
- <release version="2.0.1" date="28-Dec-2005">
- <action dev="jochen" type="fix" issue="XMLRPC-68"
- due-to="Johan Oskarson" due-to-email="johan at oskarsson.nu">
- The Webserver class was unable to handle basic authentication,
- because the BASE64 codec wasn't initialized.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-69"
- due-to="Claude Zervas" due-to-email="claude at utlco.com">
- The characters 0x20, 0xe000, and 0x10000 have been escaped
- without reason.
- </action>
- <action dev="jochen" type="fix" issue="XMLRPC-73"
- due-to="Thomas Mohaupt" due-to-email="Thomas.Mohaupt at gmail.com">
- The wrong version of commons-codec was downloaded by build.xml.
- </action>
- <action dev="jochen" type="add"
- due-to="Jimisola Laursen" due-to-email="jimisola@jimisola.com">
- Added the CommonsXmlRpcTransportFactory.
- </action>
- <action dev="jochen" type="add"
- due-to="Henry Story" due-to-email="henry.story@bblfish.net">
- Added the possibility to specify a timezone for interpreting
- incoming date values.
- </action>
- <action dev="jochen" type="add">
- Upgrade to commons-httpclient 3.0.
- </action>
- </release>
- </body>
-</document>
diff --git a/apache_xmlrpc/src/main/osgi/apache_xmlrpc.bnd b/apache_xmlrpc/src/main/osgi/apache_xmlrpc.bnd
deleted file mode 100644
index 263a1ee22d2e7a7fb4b40a1fc8d19bac4b8ea134..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/main/osgi/apache_xmlrpc.bnd
+++ /dev/null
@@ -1,8 +0,0 @@
-bundle.version=3.1.3
--output: target/org.ros.rosjava.apache-xmlrpc-${bundle.version}.jar
-
-Bundle-Name: org.ros.rosjava.apache-xmlrpc
-Bundle-SymbolicName: org.ros.rosjava.apache-xmlrpc
-Bundle-Version: ${bundle.version}
-
-Export-Package: org.apache.xmlrpc.*
diff --git a/apache_xmlrpc/src/site/apt/advanced.apt b/apache_xmlrpc/src/site/apt/advanced.apt
deleted file mode 100644
index 4b0585aa9ced735455308ba179cb1cf778a7f29f..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/advanced.apt
+++ /dev/null
@@ -1,290 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- ---------------------------
- Advanced Programming Topics
- ---------------------------
-
- This page describes some advanced topics.
-
-Dynamic proxies
-
- Dynamic proxies are an extremely comfortable way of Client programming.
- Basically, the idea is as follows: All request processors on the server
- side are splitted into interface and implementation. The interfaces are
- shared between client and server, typically within some common jar file.
- Now, rather than using the
- {{{apidocs/org/apache/xmlrpc/client/XmlRpcClient.html}XmlRpcClient}}
- directly,
- the programmer creates an instance of
- {{{apidocs/org/apache/xmlrpc/client/util/ClientFactory.html}ClientFactory}},
- which is configured with an
- {{{apidocs/org/apache/xmlrpc/client/XmlRpcClient.html}XmlRpcClient}}.
-
- The {{{apidocs/org/apache/xmlrpc/client/util/ClientFactory.html}factory}}
- can take an interface as input and returns an implementation,
- which internally calls the server by using the
- {{{apidocs/org/apache/xmlrpc/client/XmlRpcClient.html}XmlRpcClient}}.
-
- Perhaps some code shows more than words. First of all, let's create
- a request processor interface.
-
------------------------------------------------------------------------------------
- package com.foo;
-
- public interface Adder {
- public int add(int pNum1, int pNum2);
- }
------------------------------------------------------------------------------------
-
- The server contains the request processors implementation:
-
------------------------------------------------------------------------------------
- package com.foo;
-
- public class AdderImpl implements Adder {
- public int add(int pNum1, int pNum2) {
- return pNum1 + pNum2;
- }
- }
------------------------------------------------------------------------------------
-
- And here is how the client would use this:
-
------------------------------------------------------------------------------------
- import com.foo.Adder;
- import java.net.URL;
- import org.apache.xmlrpc.client.XmlRpcClient;
- import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
- import org.apache.xmlrpc.client.util.ClientFactory;
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL("http://127.0.0.1:8080/xmlrpc"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- ClientFactory factory = new ClientFactory(client);
- Adder adder = (Adder) factory.newInstance(Adder.class);
- int sum = adder.add(2, 4);
------------------------------------------------------------------------------------
-
-* Exception handling
-
- Currently, exceptions are a problem: If the server throws an exception
- (for example an IOException), then the client receives an XmlRpcException.
- Consequently, the generated implementation will attempt to throw the
- XmlRpcException.
-
- Unfortunately, the method signature will of course contain an IOException,
- but rarely an XmlRpcException. As the XmlRpcException cannot be thrown,
- it is converted into an UndeclaredThrowableException.
-
- This is no problem, if you are prepared for runtime exceptions by enclosing
- your code with proper exception handlers. (Of course, the exception handlers
- may be in a calling method.) Only if you want to catch the exception (for
- example, because you expect an error at a certain point), then you need
- to consider, which exception is being trapped: If the method exposes
- XmlRpcException, then you'll need to catch the XmlRpcException.
- Otherwise, it's UndeclaredThrowableException.
-
- It is recommended to use the property enabledForExceptions. If this property
- is set, then the server will attempt to convert the exception into a byte
- array, which is transmitted to the client. The client will be able to
- convert the byte array back into an exception and throw that, as if it
- came right out of the client. Note, that this approach may cause security
- and privacy issues, because the serialized exception may, in theory, contain
- arbitrary objects.
-
-* Cookie handling
-
- Cookie has not yet been generalized. In other words, it depends on the
- transport.
-
- * The XmlRpcLiteHttpTransport doesn't have support for cookies.
- * The XmlRpcSunHttpTransport requires hand written code for setting
- and getting the cookies or using a cookie library. (The latter is
- recommended, of course.) In either way, you've got to use a custom
- transport and overwrite the methods newURLConnection(URL),
- initHttpHeaders(XmlRpcRequest), and close():
-
------------------------------------------------------------------------------------
- import java.net.URLConnection;
- import org.apache.xmlrpc.client.XmlRpcClient;
- import org.apache.xmlrpc.client.XmlRpcSunHttpTransport;
- import org.apache.xmlrpc.client.XmlRpcTransport;
- import org.apache.xmlrpc.client.XmlRpcTransportFactory;
-
- final XmlRpcClient client = new XmlRpcClient();
- XmlRpcTransportFactory factory = new XmlRpcTransportFactory(){
- public XmlRpcTransport getTransport(){
- private URLConnection conn;
- protected URLConnection newURLConnection(URL pURL) throws IOException {
- conn = super.newURLConnection(pURL);
- return conn;
- }
- protected void initHttpHeaders(XmlRpcRequest pRequest) {
- super.initHttpHeaders(pRequest);
- setCookies(conn);
- }
- protected void close() throws XmlRpcClientException {
- getCookies(conn);
- }
- private void setCookies(URLConnection pConn) {
- // Implement me ...
- }
- private void getCookies(URLConnection pConn) {
- // Implement me ...
- }
- }
- };
- client.setTransportFactory(factory);
------------------------------------------------------------------------------------
-
- * The XmlRpcCommonsHttpTransport requires that the HttpClient is being
- reused. (By default, a new HttpClient is created for any connection.)
- To reuse the HttpClient, set it on the transport factory:
-
------------------------------------------------------------------------------------
- import org.apache.commons.httpclient.HttpClient;
- import org.apache.commons.httpclient.HttpState;
- import org.apache.xmlrpc.client.XmlRpcClient;
- import org.apache.xmlrpc.client.XmlRpcCommonsTransport;
- import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory;
-
- final XmlRpcClient client = new XmlRpcClient();
- final HttpClient httpClient = new HttpClient();
- final XmlRpcCommonsTransportFactory factory = new XmlRpcCommonsTransportFactory(client);
- factory.setHttpClient(httpClient);
- client.setTransportFactory(factory);
- final HttpState httpState = client.getState();
------------------------------------------------------------------------------------
-
- Cookies may now be read or set on the httpState object.
-
- Note, that this means losing the XmlRpcClients multithreading abilities!
- The factory above is obviously bound to the HttpClient, which must be
- bound to a thread. If you need to set cookies initially, overwrite the
- transport method initHttpHeaders(XmlRpcRequest) as well.
-
-* Custom data types
-
- Apache XML-RPC was built with extensibility in mind. In particular, it was
- written to support custom data types.
-
- The data type handling is completely left to the
- {{{apidocs/org/apache/xmlrpc/common/TypeFactory.html}TypeFactory}}. In
- other words, adding support for custom data types is as simple as
- providing your own type factory. This is typically done by subclassing
- {{{apidocs/org/apache/xmlrpc/common/TypeFactoryImpl.html}TypeFactoryImpl}}.
-
- We'll illustrate the concept by creating a type factory, which uses a
- non-standard date format for transmitting date values. First of all,
- we've got to implement the subclass:
-
------------------------------------------------------------------------------------
- import java.text.DateFormat;
- import java.text.SimpleDateFormat;
- import org.apache.xmlrpc.common.TypeFactoryImpl;
- import org.apache.xmlrpc.common.XmlRpcController;
- import org.apache.xmlrpc.parser.DateParser;
- import org.apache.xmlrpc.parser.TypeParser;
- import org.apache.xmlrpc.serializer.DateSerializer;
- import org.apache.xmlrpc.serializer.TypeSerializer;
- import org.apache.ws.commons.util.NamespaceContextImpl;
-
- public class MyTypeFactory extends TypeFactoryImpl {
- public MyTypeFactory(XmlRpcController pController) {
- super(pController);
- }
-
- private DateFormat newFormat() {
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
- }
-
- public TypeParser getParser(XmlRpcStreamConfig pConfig, NamespaceContextImpl pContext, String pURI, String pLocalName) {
- if (DateSerializer.DATE_TAG.equals(pLocalName)) {
- return new DateParser(pFormat);
- } else {
- return super.getParser(pConfig, pContext, pURI, pLocalName);
- }
- }
-
- public TypeSerializer getSerializer(XmlRpcStreamConfig pConfig, Object pObject) throws SAXException {
- if (pObject instanceof Date) {
- return new DateSerializer(newFormat());
- } else {
- return super.getSerializer(pConfig, pObject);
- }
- }
- }
------------------------------------------------------------------------------------
-
- On the client side, we've got to tell the
- {{{apidocs/org/apache/xmlrpc/client/XmlRpcClient.html}XmlRpcClient}} to use the
- new factory. That's as simple as typing
-
------------------------------------------------------------------------------------
- XmlRpcClient client = new XmlRpcClient();
- client.setTypeFactory(new MyTypeFactory());
------------------------------------------------------------------------------------
-
- Things are a little bit more difficult on the server side. Basically all we need
- to do is setting the type factory on the
- {{{apidocs/org/apache/xmlrpc/server/XmlRpcServer.html}XmlRpcServer}}. The question
- is, how to obtain the server object. That depends on the environment. If you
- are using the XmlRpcServlet, then you've got to derive a subclass:
-
------------------------------------------------------------------------------------
- import org.apache.xmlrpc.webserver.XmlRpcServletServer;
- import org.apache.xmlrpc.webserver.XmlRpcServlet;
-
- public class MyXmlRpcServlet extends XmlRpcServlet {
- protected XmlRpcServletServer newXmlRpcServer(ServletConfig pConfig) {
- XmlRpcServletServer server = super.newXmlRpcServer(pConfig);
- server.setTypeFactory(new MyTypeFactory(server));
- return server;
- }
- }
------------------------------------------------------------------------------------
-
- And, if you are using the
- {{{apidocs/org/apache/xmlrpc/webserver/WebServer.html}WebServer}}, you've got
- to override a similar method:
-
------------------------------------------------------------------------------------
- import java.net.InetAddress;
- import org.apache.xmlrpc.server.XmlRpcStreamServer;
- import org.apache.xmlrpc.webserver.WebServer;
-
- public class MyWebServer extends WebServer {
- public MyWebServer(int pPort) {
- super(pPort);
- }
-
- public MyWebServer(int pPort, InetAddress pAddr) {
- super(pPort, pAddr);
- }
-
- protected XmlRpcStreamServer newXmlRpcStreamServer() {
- XmlRpcStreamServer server = new ConnectionServer();
- server.setTypeFactory(new MyTypeFactory());
- return server;
- }
- }
------------------------------------------------------------------------------------
-
\ No newline at end of file
diff --git a/apache_xmlrpc/src/site/apt/client.apt b/apache_xmlrpc/src/site/apt/client.apt
deleted file mode 100644
index e13b038bad8e9dd364b439f6688ae7bbb2be711f..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/client.apt
+++ /dev/null
@@ -1,229 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- -------------------------
- The Apache XML-RPC Client
- -------------------------
-
-The XmlRpcClient
-
- Before talking to an XML-RPC server, you need an instance of
- {{{apidocs/org/apache/xmlrpc/client/XmlRpcClient.html}XmlRpcClient}}.
-
- The XmlRpcClient is a stateless, thread safe object. The clients
- configuration occurs by setting the following objects:
-
-*------------------+--------------------------------------------------------------+
-| Name | Description |
-*------------------+--------------------------------------------------------------+
-| ClientConfig | This object is an instance of |
-| | {{{apidocs/org/apache/xmlrpc/client/XmlRpcClientConfig.html} |
-| | XmlRpcClientConfig}}. It has a lot of atomic properties, |
-| | that specify details like server URL, credentials, character |
-| | set, and the like. |
-*------------------+--------------------------------------------------------------+
-| TransportFactory | The task of the transport factory is to create an object, |
-| | which uses the client configuration for talking to the |
-| | server. For example, there is a transport factory, which |
-| | uses the java.net classes. Another example is a transport |
-| | factory based on the Jakarta Commons Http Client. However, |
-| | transport factories don't need to use HTTP: An excellent |
-| | example is the local transport factory, which talks to an |
-| | embedded server. This last factory is, of course, very |
-| | useful for debugging. |
-*------------------+--------------------------------------------------------------+
-| XmlWriterFactory | The XmlWriter is an object, which creates XML for you. |
-| | Typically, you do not need to care for this object, because |
-| | the defaults should be fine. However, it is useful, if you |
-| | need a special XML syntax. |
-*------------------+--------------------------------------------------------------+
-
- So, let's have a look at a first example:
-
------------------------------------------------------------------------------------
- import org.apache.xmlrpc.client.XmlRpcClient;
- import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL("http://127.0.0.1:8080/xmlrpc"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- Object[] params = new Object[]{new Integer(33), new Integer(9)};
- Integer result = (Integer) client.execute("Calculator.add", params);
------------------------------------------------------------------------------------
-
- In other words, we invoke the remote method <Calculator.add>, passing the arguments
- 2 and 3. Hopefully, we know <the answer>. :-)
-
-The Transport Factory
-
- The above example uses the java.net.URLConnection classes to talk to the server.
- What, if you'd prefer to use the {{{http://jakarta.apache.org/commons/httpclient}
- Jakarta HTTP Client}}? There's basically just a single line, you'd need to add:
-
------------------------------------------------------------------------------------
- import org.apache.xmlrpc.client.XmlRpcClient;
- import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
- import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory;
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL("http://127.0.0.1:8080/XmlRpcServlet"));
- XmlRpcClient client = new XmlRpcClient();
- client.setTransportFactory(new XmlRpcCommonsTransportFactory(client));
- client.setConfig(config);
- Object[] params = new Object[]{new Integer(2), new Integer(3)};
- Integer result = (Integer) client.execute("Calculator.add", params);
------------------------------------------------------------------------------------
-
- In other words, the transport factory determines the way, how the client
- communicates with the server. The most important transport factories are:
-
-*--------------------------------+-------------------------------------------+
-| Name | Description |
-*--------------------------------+-------------------------------------------+
-| XmlRpcSunHttpTransportFactory | This is the default factory, connecting |
-| | to an HTTP server using the |
-| | <<<java.net.HttpURLConnection>>>. |
-*--------------------------------+-------------------------------------------+
-| XmlRpcCommonsTransportFactory | Another HTTP transport factory, which |
-| | uses the Jakarta Commons HttpClient. |
-| | The main advantage over the default |
-| | factory is, that the Commons HttpClient |
-| | allows direct access to the result |
-| | document. This allows a much lower |
-| | memory profile. |
-*--------------------------------+-------------------------------------------+
-| XmlRpcLiteHttpTransportFactory | Yet another HTTP transport factory, which |
-| | is based on an own and very lightweight |
-| | HTTP client. It is possibly the fastest |
-| | of the HTTP transport factories. On the |
-| | other hand, it doesn't support HTTP/1.1, |
-| | thus cannot use keepalive connections. |
-*--------------------------------+-------------------------------------------+
-| XmlRpcLocalTransportFactory | This transport factory has an embedded |
-| | XML-RPC server, which is invoked via |
-| | direct Java calls. This is particularly |
-| | useful for debugging and development. |
-*--------------------------------+-------------------------------------------+
-
-The Client Configuration
-
- The transport factory uses the clients configuration. Obviously, the
- clients configuration depends on the transport factory. In particular,
- different transport factories depend on different configuration types:
-
- * The HTTP transport factories need an instance of
- <<<org.apache.xmlrpc.client.XmlRpcHttpClientConfig>>>.
-
- * The local transport factory requires an instance of
-
- <<<org.apache.xmlrpc.client.XmlRpcLocalClientConfig>>>.
-
- For convenience, you can simply use the
- <<<org.apache.xmlrpc.client.XmlRpcClientConfigImpl>>>, which implements
- both interfaces.
-
- Let's have a look at the various properties, which HTTP client configurations
- accept:
-
-*-----------------------+---------------------------------------------------+
-| Property Name | Description |
-*-----------------------+---------------------------------------------------+
-| basicUserName | The user name and password, if your HTTP server |
-| basicPassword | requires basic authentication. |
-*-----------------------+---------------------------------------------------+
-| basicEncoding | Specifies the encoding being used to create the |
-| | base 64 encoded Authorization header, which is |
-| | being used for basic authentication. |
-| | |
-| | By default, the value of the encoding property |
-| | is used. The encoding property itself defaults to |
-| | UTF-8. |
-*-----------------------+---------------------------------------------------+
-| contentLengthOptional | Enables the faster and memory saving streaming |
-| | mode: The client will not set the content-length |
-| | header and the request is directly written to the |
-| | HTTP requests output stream. The XML-RPC |
-| | specification requires setting a content-length |
-| | header. For that reason, the streaming mode is |
-| | only available, if the property |
-| | enabledForExtensions is set was well. |
-*-----------------------+---------------------------------------------------+
-| enabledForExceptions | Whether the client should request, that the |
-| | server returns exceptions as serializable objects.|
-| | If the server does, then the client will |
-| | deserialize such exceptions and throw them, as |
-| | if they had been cause within the clients code. |
-*-----------------------+---------------------------------------------------+
-| enabledForExtensions | Whether the vendor extensions of Apache XML-RPC |
-| | should be enabled. By default, Apache XML-RPC is |
-| | strictly compliant to the XML-RPC specification. |
-| | Unfortunately, this specification has serious |
-| | limitations. For example, it requires setting a |
-| | content-length header. This enforces writing the |
-| | XML-RPC request and response to byte arrays, |
-| | before sending them over the net. |
-| | |
-| | Vendor extensions include the very fast and |
-| | memory saving streaming mode (by disabling the |
-| | content-length header), the compression of |
-| | request and/or response. In particular, a lot of |
-| | additional data types may be transmitted, when |
-| | extensions are enabled: longs, shorts, bytes, |
-| | floats, DOM nodes, instances of |
-| | java.io.Serializable, or JAXB objects. |
-*-----------------------+---------------------------------------------------+
-| encoding | Sets the encoding, which is used for creating the |
-| | XML-RPC request. The default encoding is UTF-8. |
-| | |
-| | Typically, the encoding is also used for the |
-| | basic authentications, if any. However, you may |
-| | specify a different encoding for the credentials |
-| | using the basicEncoding property. |
-*-----------------------+---------------------------------------------------+
-| gzipCompressing | Whether the XML-RPC request should be compressed. |
-| | Request compression is violating the XML-RPC |
-| | specification, that's why gzipCompressing is only |
-| | available, if the enabledForExtension property is |
-| | also set. For the same reason, you should not |
-| | assume, that the server is able to handle |
-| | compressed requests, unless you know, that the |
-| | server is itself running version 3 of |
-| | Apache XML-RPC. |
-*-----------------------+---------------------------------------------------+
-| gzipRequesting | Requests, that the server will be compressing the |
-| | response. Response compression is violating the |
-| | XML-RPC specification. Therefore, this feature is |
-| | only available, if the enabledForExtension |
-| | property is set. Also, do not assume, that the |
-| | server will actually compress the response, |
-| | unless it is an Apache XML-RPC 3 server. |
-*-----------------------+---------------------------------------------------+
-
- And these properties are for configuring the local transport factory:
-
-*-----------------------+---------------------------------------------------+
-| Property Name | Description |
-*-----------------------+---------------------------------------------------+
-| xmlRpcServer | This is the embedded XML-RPC server, which is |
-| | called to execute the clients requests. |
-| | Obviously, this is an extremely fast transport. |
-| | However, its main use is for debugging and |
-| | development. |
-*-----------------------+---------------------------------------------------+
diff --git a/apache_xmlrpc/src/site/apt/contributing.apt b/apache_xmlrpc/src/site/apt/contributing.apt
deleted file mode 100644
index 7bc513f61b2a81c2eb66f98d4138339d47c09d1b..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/contributing.apt
+++ /dev/null
@@ -1,45 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- ------------
- Contributing
- ------------
-
-Contributing
-
- A great {{{http://jakarta.apache.org/site/contributing.html}description}}
- of contributing to Apache XML-RPC is available from the Jakarta
- project.
-
-Submitting Patches
-
- The preferred patch format is unidiff. The best way to generate a patch
- is by checking out the sources, applying your changes and running
-
----------------------------------------------------------------------------------
- svn diff
----------------------------------------------------------------------------------
-
- Emails containing patches should be sent to the mailing list
- xmlrpc-dev@ws.apache.org, and prefix their subject lines with <<[PATCH]>>.
- Patches are also accepted via the
- {{{http://issues.apache.org/jira/browse/XMLRPC}issue tracker}}.
- The Jakarta project provides a description of
- {{{http://jakarta.apache.org/site/source.html}life with ASF source code}}
- -- look for the <<Patches>> section.
diff --git a/apache_xmlrpc/src/site/apt/download.apt b/apache_xmlrpc/src/site/apt/download.apt
deleted file mode 100644
index 4603baf3fd1ced47942756bfc0f9a36a497b9178..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/download.apt
+++ /dev/null
@@ -1,34 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- ---------
- Downloads
- ---------
-
-Downloading Apache XML-RPC
-
- You can download the current version of Apache XML-RPC from
- {{{http://www.apache.org/dyn/closer.cgi/ws/xmlrpc/}
- distribution directory}}.
-
- Alternatively, you can get the latest code snapshot via
- {{{http://svn.apache.org/repos/asf/webservices/xmlrpc/trunk}Subversion}}.
-
- Information on how to build and use the software is included in the
- package.
diff --git a/apache_xmlrpc/src/site/apt/extensions.apt b/apache_xmlrpc/src/site/apt/extensions.apt
deleted file mode 100644
index 845348d88c4084f2baf9772e08b7887c570428ea..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/extensions.apt
+++ /dev/null
@@ -1,155 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- --------------------------------
- Apache XML-RPC Vendor Extensions
- --------------------------------
-
-Introduction
-
- The {{{http://www.xmlrpc.com/spec}XML-RPC specification}} has been
- published in 1999. In the past 6 years, it was subject to some
- minor corrections. Some things have been made clearer. However, it
- hasn't really changed or evolved. Dave Winer, the XML-RPC specifications
- author, has always rejected any suggestions in that direction. Of course,
- he did so with a good reason: One of XML-RPC's major targets was
- portability over arbitrary platforms and programming languages. Clearly,
- this target has been met and any further development would mean putting
- this at risk.
-
- On the other hand, this is most unfortunate: Obeying the specification
- means accepting really serious limitations. For example, one cannot even
- use all of Java's primitive data types, although nowadays they have
- equivalents in almost any programming language. Possibly even more
- important is the requirement to send a content-length header: HTTP/1.1
- and its chunk encoding are the definite standard in 2005 for both HTTP
- clients and servers. Consequently, the content-length header is, at
- best, superfluos. Of course, having an additional header wouldn't be
- too much of a problem. But calculating the header value enforces, that
- request and response are written to byte arrays, before actually sending
- them. This is both slow and memory consuming.
-
- Version 3 of Apache XML-RPC is a compromise: By default it
- still meets the specification. However, you <<may>> enable additional
- features, called vendor extensions. Of course, these features only work,
- if you have a streaming version of Apache XML-RPC on both sides. In
- practice, it occurs very frequently, that both sides are controlled by
- the same people. Besides, the vendor extensions are documented very
- clearly here: Adding these features to an existing XML-RPC library
- would mean almost no effort, so possibly someone does. You'r welcome.
-
- But the purpose of this document is more than documentation: It is also
- to receive feedback and discuss the extensions specification and
- implementation. Nothing is fixed, and everything can be changed.
-
-Enabling extensions
-
- Vendor extensions cannot be used, unless they are explicitly enabled.
- In some cases, you have to enable specific features, for example
- request compression. But in all cases, you need to enable the use
- of vendor extensions at all, because that is the step, where you
- knowingly say: "I know, I am now in violation of the original XML-RPC
- specification."
-
- For that reasons, both server and client have a property
- <<<enabledForExtensions>>> in their respective configuration. Setting
- this property to true enables the extensions.
-
-Streaming Mode
-
- Putting the client or the server into streaming mode means, that
- data being sent to the other side is almost directly written to
- the network connection. (Besides, of course, using a moderately
- sized <<<BufferedOutputStream>>>, because one would not want to
- have a network connection for any <<<write()>>> call.)
-
- In particular, the request, or response, isn't written to a
- <<<ByteArrayOutputStream>>> internally. Without streaming mode,
- this is always the case. But there is more: For example, the
- base64 encoder is also writing directly without internal buffering.
- (There are few other base64 encoders around, which support streaming
- mode.)
-
- To enable streaming mode on the client, set the properties
- <<<enabledForExtensions>>> and <<<contentLengthOptional>>>. This
- will take care for the request, which is being sent to the server.
-
- On the server, things are a little bit more complicated. Currently,
- the server behaves as follows: If streaming mode is disabled, then
- the server will always behave like a standard XML-RPC server.
- Otherwise, the server will verify, whether the client sends a
- content-length header. If so, then the server assumes that the
- client is able to accept a missing content-length header in the
- response as well. Otherwise, the server will still disable streaming
- for this particular requests. In other words, traditional clients
- will still receive a traditional response and one server can serve
- both data types.
-
-Compression
-
- HTTP Request compression is a standard HTTP feature and works by
- using the HTTP headers <<<Accept-Encoding>>> and <<<Content-Encoding>>>.
- In other words, it is quite likely, that request compression is
- supported by your HTTP client or server library. For example, the
- Apache httpd does so by using the <<<mod_deflate>>> module.
-
- Of course, it's more convenient to have the XML-RPC library doing
- this. If the client should compress the response, then you need
- to set the properties <<<enabledForExtensions>>> and
- <<<gzipCompressing>>>. The XML-RPC request will be compressed
- (on-the-fly in streaming mode, of course) and the HTTP header
- <<<Content-Encoding>>> will be set to <<<gzip>>>. Needless to say,
- you may only do so, if the server is ready to accept such requests.
-
- Compressing the request doesn't mean that the response is compressed
- as well. First of all, the server will only send a compressed response,
- if the server property <<<enabledForExtensions>>> is set. Additionally,
- the server will read the HTTP header <<<Accept-Encoding>>>: If it
- doesn't contain <<<gzip>>> encoding, then compression cannot take
- place. In other words, the client must send this header. You need
- to set the client properties <<<enabledForCompression>>> and
- <<<gzipRequesting>>> to achieve that.
-
-Data Types
-
- Enabling vendor extensions means also, that several additional
- data types may be sent. (See {{{./types.html}Data Types}} for
- details.) These different data types require an extension of the
- XML-RPC network protocol.
-
- All of these data types are using a special XML namespace. Using this
- namespace is a clear indication, that these data types are in violation
- to the XML-RPC specification.
-
- For example, sending an integer value looks like the following:
-----------------------------------------------------------------------------
- <i4>347</i4>
-----------------------------------------------------------------------------
- 32 bit integers are valid data types in XML-RPC. So we do not need
- to use a separate namespace here. 64 bit integers aren't valid XML-RPC
- data types. So we need to use our namespace when sending them:
-----------------------------------------------------------------------------
- <i8 xmlns="http://ws.apache.org/xmlrpc/namespaces/extensions">78934</i8>
-----------------------------------------------------------------------------
-
-Exception Handling
-
- If the server property "enabledForExceptions" is turned on, then the server
- will convert exceptions into a byte array and send them to the client within
- a "faultCause" message.
diff --git a/apache_xmlrpc/src/site/apt/index.apt b/apache_xmlrpc/src/site/apt/index.apt
deleted file mode 100644
index 53cc40482855e9f923615882c5323bed151366d0..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/index.apt
+++ /dev/null
@@ -1,46 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- --------------
- Apache XML-RPC
- --------------
-
-About Apache XML-RPC
-
- Apache XML-RPC is a Java implementation of
- {{{http://www.xmlrpc.com/}XML-RPC}}, a popular protocol that
- uses XML over HTTP to implement remote procedure calls.
-
- Version 3 of Apache XML-RPC is still compliant to the
- {{{http://www.xmlrpc.com/spec}XML-RPC specification}}.
- However, the user may enable several vendor extensions
- are available, that greatly extend the power of XML-RPC:
-
- * All primitive Java types are supported, including long,
- byte, short, and double.
-
- * Calendar objects are supported. In particular, timezone
- settings, and milliseconds may be sent.
-
- * DOM nodes, or JAXB objects, can be transmitted. So are
- objects implementing the java.io.Serializable interface.
-
- * Both server and client can operate in a streaming mode,
- which preserves resources much better than the default
- mode, which is based on large internal byte arrays.
diff --git a/apache_xmlrpc/src/site/apt/introspection.apt b/apache_xmlrpc/src/site/apt/introspection.apt
deleted file mode 100644
index 28d488eb1f2fe0c74581467381ef38f400e3ee8f..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/introspection.apt
+++ /dev/null
@@ -1,79 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- ---------------------------
- Advanced Programming Topics
- ---------------------------
-
- Apache XML-RPC supports XML-RPC introspection, as specified by
- {{{http://scripts.incutio.com/xmlrpc/introspection.html}
- http://scripts.incutio.com/xmlrpc/introspection.html}}. This
- page describes how to configure the XML-RPC server for
- introspection.
-
-What is introspection?
-
- Introspection is the servers ability to provide metadata
- to the client. The client may ask "What method names does
- the server offer?", "How do I invoke method 'foo'?", or
- "Can you give me help on method 'foo'?".
-
- The client does so by invoking the special methods
- "system.listMethods", "system.methodSignature" and
- "system.methodHelp". These are described in detail in the
- non-official specification for XML-RPC introspection, which
- you'll find at
- {{{http://scripts.incutio.com/xmlrpc/introspection.html}
- http://scripts.incutio.com/xmlrpc/introspection.html}}.
-
-How do I configure the server for introspection?
-
- The server requires a special mapping. Basically, you simply add
- a "system" handler, which is implemented by the class
- <<<XmlRpcSystemImpl>>>. Here's how you would do that in the
- <<<XmlRpcServlet>>>:
-
----------------------------------------------------------
- public class MyXmlRpcServlet extends XmlRpcServlet {
- protected XmlRpcHandlerMapping newXmlRpcHandlerMapping()
- throws XmlRpcException {
- PropertyHandlerMapping mapping =
- (PropertyHandlerMapping) newXmlRpcHandlerMapping();
- XmlRpcSystemImpl.addSystemHandler(mapping);
- }
- }
----------------------------------------------------------
-
- Quite similar, you would override a protected method, if you
- prefer using the <<<WebServer>>> class:
-
----------------------------------------------------------
- public class MyWebServer extends WebServer {
- public MyWebServer(int pPort) {
- super(pPort);
- }
-
- protected XmlRpcStreamServer newXmlRpcStreamServer(){
- XmlRpcStreamServer xmlRpcStreamServer = new ConnectionServer();
- PropertyHandlerMapping mapping = (PropertyHandlerMapping) xmlRpcStreamServer.getHandlerMapping();
- XmlRpcSystemImpl.addSystemHandler(mapping);
- return xmlRpcStreamServer;
- }
- }
----------------------------------------------------------
diff --git a/apache_xmlrpc/src/site/apt/links.apt b/apache_xmlrpc/src/site/apt/links.apt
deleted file mode 100644
index 455d642ac5b07d9efc8d2d3eed82919bcacb896b..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/links.apt
+++ /dev/null
@@ -1,37 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- --------------------------------
- External Links
- --------------------------------
-
- Below you'll find some links to external sources, that deal with
- Apache XML-RPC.
-
-Specifications
-
- * The {{{http://www.xmlrpc.com/spec}XML-RPC specification}}
-
-Examples and Tutorials
-
- * A simple, yet complete example of using the XmlRpcServlet by
- {{{http://radioae6rt.wordpress.com/2006/04/23/running-an-xml-rpc-server-as-a-java-servlet/}Mark Petrovic}}
- * An example of initializing handlers by using so-called
- persistent objects, written by
- {{{http://blog.buttermountain.co.uk/2006/11/06/accessing-persistent-objects-with-apache-ws-xmlrpc-30-a-documented-example/}Iain Bullard}}.
diff --git a/apache_xmlrpc/src/site/apt/server.apt b/apache_xmlrpc/src/site/apt/server.apt
deleted file mode 100644
index fe0c2e65bd256749a3add0b2eefccdba9f2897bb..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/server.apt
+++ /dev/null
@@ -1,351 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- -------------------------
- The Apache XML-RPC Server
- -------------------------
-
-
-Server-side XML-RPC
-
- If you have read and understood the previous document about the
- {{{./client.html}Apache XML-RPC client}}, then the server isn't too
- much news.
-
- First of all, there is an object, called the XmlRpcServer. This objects
- purpose is to receive and execute XML-RPC calls by the clients. The
- XmlRpcServer <<can>> be embedded into a servlet container, or another
- HTTP server (for example, the minimal web server, that comes with
- XML-RPC), but it doesn't need to. Take the local transport as an
- example: In that case the XML-RPC server is simply embedded into the
- client application.
-
- Like the XmlRpcClient, the XmlRpcServer needs a configuration, which
- is given by the XmlRpcServerConfigImpl object.
-
-The XML-RPC Servlet
-
- The easiest way to create an XML-RPC Server is the XmlRpcServlet, which
- has an automatically embedded instance of XmlRpcServer. This servlet allows
- you to create a server within 10 minutes or so:
-
- [[1]] Create a class, or a set of classes, which are implementing
- the remote procedure calls. Here's an example of such a class:
-
------------------------------------------------------------------------------------
- package org.apache.xmlrpc.demo;
- public class Calculator {
- public int add(int i1, int i2) {
- return i1 + i2;
- }
- public int subtract(int i1, int i2) {
- return i1 - i2;
- }
- }
------------------------------------------------------------------------------------
-
- This class has two public, non-static methods, which should
- be available to the clients.
-
- [[2]] Create a property file, which contains at least one property.
- The property name is arbitrary, and the property value is the
- fully qualified name of the Calculator class. For example, like
- that:
-
------------------------------------------------------------------------------------
- Calculator=org.apache.xmlrpc.demo.Calculator
------------------------------------------------------------------------------------
-
- The property file must be called <<<XmlRpcServlet.properties>>>,
- and it must be located in the package org.apache.xmlrpc.webserver.
- In other words, you would typically put it into the directory
- org/apache/xmlrpc/webserver and add it to your jar file.
-
- [[3]] Add entries like the following to your war files web.xml:
-
------------------------------------------------------------------------------------
- <servlet>
- <servlet-name>XmlRpcServlet</servlet-name>
- <servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
- <init-param>
- <param-name>enabledForExtensions</param-name>
- <param-value>true</param-value>
- <description>
- Sets, whether the servlet supports vendor extensions for XML-RPC.
- </description>
- </init-param>
- </servlet>
- <servlet-mapping>
- <servlet-name>XmlRpcServlet</servlet-name>
- <url-pattern>/xmlrpc</url-pattern>
- </servlet-mapping>
------------------------------------------------------------------------------------
-
- That's it! You have just created your first XML-RPC server. :-)
-
-The Server configuration
-
- Unlike in the case of the clients configuration, there isn't much to
- configure on the server. The reason is, that most things depend on the
- client and the HTTP headers, which are received by the client. There
- is one very important property to configure, though:
-
-*-----------------------+---------------------------------------------------+
-| Property Name | Description |
-*-----------------------+---------------------------------------------------+
-| enabledForExceptions | If the server catches an exception, and this |
-| | property is set, then the server will convert |
-| | the exception into a byte array (by using an |
-| | ObjectOutputStream) and return the exception to |
-| | the client. Note, that this may have privacy |
-| | or even security implications, because Exceptions |
-| | may contain arbitrary Java objects, which you |
-| | possibly do not want to be sent to the client. |
-*-----------------------+---------------------------------------------------+
-| enabledForExtensions | Whether the vendor extensions of Apache XML-RPC |
-| | should be enabled. By default, Apache XML-RPC is |
-| | strictly compliant to the XML-RPC specification. |
-| | |
-| | Enabling this property doesn't indicate, that the |
-| | server is unable to serve requests by standard |
-| | clients: In contrary, the servers behaviour |
-| | depends on the client. Setting this property to |
-| | true will only advice the server, that it <<may>> |
-| | accept requests, which ask for vendor extensions. |
-| | |
-| | For example, if a client sends a content-length |
-| | header, then the server assumes, that the client |
-| | <<wants>> a content-length header in the request |
-| | and disables the streaming mode. |
-*-----------------------+---------------------------------------------------+
-
-Basic Authentication
-
- Basic authentication is frequently used to authenticate and authorize
- users. Within Apache XML-RPC, basic authentication is done by the
- {{{apidocs/org/apache/xmlrpc/XmlRpcHandler.html}XmlRpcHandler}}.
- The handler receives an instance of
- {{{apidocs/org/apache/xmlrpc/XmlRpcRequest.html}XmlRpcRequest}}. This
- object has a method <<<getConfig()>>>, which returns an instance of
- {{{apidocs/org/apache/xmlrpc/XmlRpcRequestConfig.html}XmlRpcRequestConfig}}.
-
- If you are running within a HTTP server, then the request configuration
- may be casted to an instance of
- {{{apidocs/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.html}XmlRpcHttpRequestConfig}}.
- This object has methods <<<getBasicUserName()>>>, and <<<getBasicPassword()>>>,
- which provide the necessary details.
-
- In other words: Your task is to provide your own instance of
- {{{apidocs/org/apache/xmlrpc/server/XmlRpcHandlerMapping.html}XmlRpcHandlerMapping}},
- which creates your own handlers. And your own handlers are responsible to
- validate the basic authentication details.
-
- Here's an example servlet, which overrides the default
- {{{apidocs/org/apache/xmlrpc/server/PropertyHandlerMapping.html}PropertyHandlerMapping}}.
-
------------------------------------------------------------------------------------
- public class MyServlet extends XmlRpcServlet {
- private boolean isAuthenticated(String pUserName, String pPassword) {
- return "foo".equals(pUserName) && "bar".equals(pPassword);
- }
- protected XmlRpcHandlerMapping newXmlRpcHandlerMapping() throws XmlRpcException {
- PropertyHandlerMapping mapping
- = (PropertyHandlerMapping) super.newXmlRpcHandlerMapping();
- AbstractReflectiveHandlerMapping.AuthenticationHandler handler =
- new AbstractReflectiveHandlerMapping.AuthenticationHandler(){
- public boolean isAuthorized(XmlRpcRequest pRequest){
- XmlRpcHttpRequestConfig config =
- (XmlRpcHttpRequestConfig) pRequest.getConfig();
- return isAuthenticated(config.getBasicUserName(),
- config.getBasicPassword());
- };
- };
- mapping.setAuthenticationHandler(handler);
- return mapping;
- }
- }
------------------------------------------------------------------------------------
-
-The WebServer class
-
- The {{{apidocs/org/apache/xmlrpc/webserver/WebServer.html}WebServer}} is a
- minimal HTTP server, that might be used as an embedded web server.
-
- Use of the WebServer has grown very popular amongst users of Apache XML-RPC.
- Why this is the case, can hardly be explained, because the WebServer is at
- best a workaround, compared to full blown servlet engines like Tomcat or
- Jetty. For example, under heavy load it will almost definitely be slower
- than a real servlet engine, because it does neither support proper keepalive
- (multiple requests per physical connection) nor chunked mode (in other words,
- it cannot stream requests).
-
- If you still insist in using the WebServer, it is recommended to use its
- subclass, the
- {{{apidocs/org/apache/xmlrpc/webserver/ServletWebServer.html}ServletWebServer}}
- instead, which offers a minimal subset of the servlet API. In other words,
- you keep yourself the option to migrate to a real servlet engine later.
-
- Use of the WebServer goes roughly like this: First of all, create a property
- file (for example "MyHandlers.properties") and add it to your jar file. The
- property keys are handler names and the property values are the handler classes.
- Once that is done, create an instance of WebServer.
-
------------------------------------------------------------------------------------
- package org.apache.xmlrpc.demo.webserver;
-
- import java.net.InetAddress;
-
- import org.apache.xmlrpc.common.TypeConverterFactoryImpl;
- import org.apache.xmlrpc.demo.webserver.proxy.impls.AdderImpl;
- import org.apache.xmlrpc.server.PropertyHandlerMapping;
- import org.apache.xmlrpc.server.XmlRpcServer;
- import org.apache.xmlrpc.server.XmlRpcServerConfigImpl;
- import org.apache.xmlrpc.webserver.WebServer;
-
- public class Server {
- private static final int port = 8080;
-
- public static void main(String[] args) throws Exception {
- WebServer webServer = new WebServer(port);
-
- XmlRpcServer xmlRpcServer = webServer.getXmlRpcServer();
-
- PropertyHandlerMapping phm = new PropertyHandlerMapping();
- /* Load handler definitions from a property file.
- * The property file might look like:
- * Calculator=org.apache.xmlrpc.demo.Calculator
- * org.apache.xmlrpc.demo.proxy.Adder=org.apache.xmlrpc.demo.proxy.AdderImpl
- */
- phm.load(Thread.currentThread().getContextClassLoader(),
- "MyHandlers.properties");
-
- /* You may also provide the handler classes directly,
- * like this:
- * phm.addHandler("Calculator",
- * org.apache.xmlrpc.demo.Calculator.class);
- * phm.addHandler(org.apache.xmlrpc.demo.proxy.Adder.class.getName(),
- * org.apache.xmlrpc.demo.proxy.AdderImpl.class);
- */
- xmlRpcServer.setHandlerMapping(phm);
-
- XmlRpcServerConfigImpl serverConfig =
- (XmlRpcServerConfigImpl) xmlRpcServer.getConfig();
- serverConfig.setEnabledForExtensions(true);
- serverConfig.setContentLengthOptional(false);
-
- webServer.start();
- }
- }
------------------------------------------------------------------------------------
-
- The Calculator class can be found above. The Adder and AdderImpl classes can
- be found in the {{{advanced.html}proxy example}}.
-
- Jimisola Laursen, who provided the above example, has also supplied an example
- for the client:
-
------------------------------------------------------------------------------------
- package org.apache.xmlrpc.demo.client;
-
- import java.net.MalformedURLException;
- import java.net.URL;
-
- import org.apache.xmlrpc.XmlRpcException;
- import org.apache.xmlrpc.client.XmlRpcClient;
- import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
- import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory;
- import org.apache.xmlrpc.client.util.ClientFactory;
- import org.apache.xmlrpc.demo.proxy.Adder;
-
- public class Client {
- public static void main(String[] args) throws Exception {
- // create configuration
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL("http://127.0.0.1:8080/xmlrpc"));
- config.setEnabledForExtensions(true);
- config.setConnectionTimeout(60 * 1000);
- config.setReplyTimeout(60 * 1000);
-
- XmlRpcClient client = new XmlRpcClient();
-
- // use Commons HttpClient as transport
- client.setTransportFactory(
- new XmlRpcCommonsTransportFactory(client));
- // set configuration
- client.setConfig(config);
-
- // make the a regular call
- Object[] params = new Object[]
- { new Integer(2), new Integer(3) };
- Integer result = (Integer) client.execute("Calculator.add", params);
- System.out.println("2 + 3 = " + result);
-
- // make a call using dynamic proxy
- ClientFactory factory = new ClientFactory(client);
- Adder adder = (Adder) factory.newInstance(Adder.class);
- int sum = adder.add(2, 4);
- System.out.println("2 + 4 = " + sum);
- }
- }
------------------------------------------------------------------------------------
-
-
-The ServletWebServer class
-
- This is a subclass of the standalone WebServer, which offers a minimal
- servlet API. It is recommended to use this class, rather than the
- WebServer, because it offers you a smooth migration path to a full
- blown servlet engine.
-
- Use of the
- {{{apidocs/org/apache/xmlrpc/webserver/ServletWebServer.html}ServletWebServer}}
- goes like this: First of all, create a servlet. It may be an instance of
- {@link XmlRpcServlet} or a subclass thereof. Note, that servlets are stateless:
- One servlet may be used by multiple threads (aka requests) concurrently. In
- other words, the servlet must not have any instance variables, other than those
- which are read only after the servlets initialization.
-
- The XmlRpcServlet is by default using a property file named
- <<<org/apache/xmlrpc/server/webserver/XmlRpcServlet.properties>>>.
- See the
- {{{apidocs/org/apache/xmlrpc/server/PropertyHandlerMapping.html}PropertyHandlerMapping}}
- for details on the property file.
-
------------------------------------------------------------------------------------
- package org.apache.xmlrpc.demo.webserver;
-
- import java.net.InetAddress;
-
- import org.apache.xmlrpc.common.TypeConverterFactoryImpl;
- import org.apache.xmlrpc.demo.webserver.proxy.impls.AdderImpl;
- import org.apache.xmlrpc.server.PropertyHandlerMapping;
- import org.apache.xmlrpc.server.XmlRpcServer;
- import org.apache.xmlrpc.server.XmlRpcServerConfigImpl;
- import org.apache.xmlrpc.webserver.ServletWebServer;
-
- public class ServletServer {
- private static final int port = 8080;
-
- public static void main(String[] args) throws Exception {
- XmlRpcServlet servlet = new XmlRpcServlet();
- ServletWebServer webServer = new ServletWebServer(servlet, port);
- webServer.start();
- }
- }
------------------------------------------------------------------------------------
diff --git a/apache_xmlrpc/src/site/apt/ssl.apt b/apache_xmlrpc/src/site/apt/ssl.apt
deleted file mode 100644
index c4fca32851c8674b1d40b2efc6dc8dd8327eb863..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/ssl.apt
+++ /dev/null
@@ -1,149 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- ---------
- Using SSL
- ---------
-
- This page describes how to configure a client for using SSL (aka https).
- Server configuration is out of this documents scope, because it clearly
- depends on the webserver. We refer, for example, to the
- {{{http://tomcat.apache.org/tomcat-5.5-doc/ssl-howto.html} Tomcat SSL HowTo}}
- or to the FAQ entry on
- {{{http://docs.codehaus.org/display/JETTY/How+to+configure+SSL} SSL with Jetty}}.
-
-Background
-
- Client configuration for SSL is not as simple as one might expect. This
- is surprising, because using SSL with a browser is as simple as typing in
- an https URL into the browsers input field.
-
- Thus, the first thing to keep in mind: Never start with Apache XML-RPC as
- a client. It is much better to create a simple static page and point your
- browser to the static pages URL. If you get this working, then you may
- assume that all remaining problems rest with the client.
-
- If you did that, you may have noticed, that the browser brings up a
- warning, that your web server is "not trusted". This is typically the
- case, if you did not buy a certificate: For the case of simplicity,
- developers are typically creating a so-called "self-signed certificate".
-
- And that's exactly your most likely problem: Like pressing the browsers
- button to "Accept the certificate" (temporarily or permanently), you've
- got to tell your Java client, that you want to accept the certificate.
-
-Choose the right URL
-
- Typically, your server may be accessible with multiple URL's. For example,
- on my machine the following URL's will all reach the same servlet:
-
- https://mcjwi.eur.ad.sag/xmlrpc
- https://localhost/xmlrpc
- https://127.0.0.1/xmlrpc
-
- Unfortunately, at most one will work in the most cases. The question is:
- How do I choose the right one?
-
- The answer is given by the certificate field CN. For example, my self
- certified key looks like this:
-
- Owner: CN=mcjwi.eur.ad.sag, OU=-, O=-, L=-, ST=-, C=-
- Issuer: CN=mcjwi.eur.ad.sag, OU=-, O=-, L=-, ST=-, C=-
-
- Note, that you've got to pick a proper CN when generating the certificate!
- If you are self-certifying the key and the keytool asks you for your own
- name: Ignore it. In your case the proper reply is the host name.
-
-The quick and dirty solution
-
- Yes, there is a quick and dirty solution: Just tell your client, that you
- want to accept any certificate, regardless of issuer and host. This can be
- done by installing a custom TrustManager and a HostnameVerifier. Add the
- following code to your clients initialization:
-
------------------------------------------------------------------------------------
- import java.security.cert.X509Certificate;
-
- import javax.net.ssl.HostnameVerifier;
- import javax.net.ssl.HttpsURLConnection;
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSession;
- import javax.net.ssl.TrustManager;
- import javax.net.ssl.X509TrustManager;
-
- // Create a trust manager that does not validate certificate chains
- TrustManager[] trustAllCerts = new TrustManager[] {
- new X509TrustManager() {
- public X509Certificate[] getAcceptedIssuers() {
- return null;
- }
-
- public void checkClientTrusted(X509Certificate[] certs, String authType) {
- // Trust always
- }
-
- public void checkServerTrusted(X509Certificate[] certs, String authType) {
- // Trust always
- }
- }
- };
-
- // Install the all-trusting trust manager
- SSLContext sc = SSLContext.getInstance("SSL");
- // Create empty HostnameVerifier
- HostnameVerifier hv = new HostnameVerifier() {
- public boolean verify(String arg0, SSLSession arg1) {
- return true;
- }
- };
-
- sc.init(null, trustAllCerts, new java.security.SecureRandom());
- HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
- HttpsURLConnection.setDefaultHostnameVerifier(hv);
------------------------------------------------------------------------------------
-
-The recommended solution
-
- Needless to say, the quick and dirty solution may is insecure, because it can
- your requests can be intercepted by a man-in-the-middle attack. Fortunately,
- there is also a clean solution: Import the servers public key into your
- truststore.
-
- As a first step, you've got to obtain the servers public key. Assuming, that
- the key is in your keystore, you may export it by running
-
------------------------------------------------------------------------------------
- keytool -export -alias tomcat -rfc -file tomcat.crt
------------------------------------------------------------------------------------
-
- This example would export the public key named "tomcat" (which is used by
- Tomcat) into the file "tomcat.crt". The key would be read from your default
- keystore, which is the file .keystore in your home directory (something like
- "c:\Documents and Settings\jwi\.keystore" on windows or "/home/jwi/.keystore"
- on Linux/Unix).
-
- Obviously, this first step must be done on the server. The second step would
- be to create a truststore on your client by importing the file "tomcat.crt":
-
------------------------------------------------------------------------------------
- keytool -import -alias servercert -file tomcat.crt -keystore truststore
------------------------------------------------------------------------------------
-
- The option "-keystore truststore" specifies a file name. Of course, this may
- as well be an absolute path.
diff --git a/apache_xmlrpc/src/site/apt/types.apt b/apache_xmlrpc/src/site/apt/types.apt
deleted file mode 100644
index f073adba4a88ce33820a8b8c6c262fb4269508ac..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/apt/types.apt
+++ /dev/null
@@ -1,110 +0,0 @@
-~~
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
- ------------------
- XML-RPC Data Types
- ------------------
-
-Data Types
-
- The {{{http://www.xmlrpc.com/spec}XML-RPC specification}} defines the following
- available data types:
-
-*--------------------+--------------------+-------------------------------------+
-| Java Type | XML Tag Name | Description |
-*--------------------+--------------------+-------------------------------------+
-| Integer | <i4>, or | A 32-bit, signed, and non-null, |
-| | <int> | integer value. |
-*--------------------+--------------------+-------------------------------------+
-| Boolean | <boolean> | A non-null, boolean value (0, or |
-| | | 1). |
-*--------------------+--------------------+-------------------------------------+
-| String | <string> | A string, non-null. |
-*--------------------+--------------------+-------------------------------------+
-| Double | <double> | A signed, non-null, double |
-| | | precision, floating point number. |
-| | | (64 bit) |
-*--------------------+--------------------+-------------------------------------+
-| java.util.Date | <dateTime.iso8601> | A pseudo ISO8601 timestamp, like |
-| | | 19980717T14:08:55. However, |
-| | | compared to a true ISO8601 value, |
-| | | milliseconds, and time zone |
-| | | informations are missing. |
-*--------------------+--------------------+-------------------------------------+
-| byte[] | <base64> | A base64 encoded byte array. |
-*--------------------+--------------------+-------------------------------------+
-| java.util.Map | <struct> | A key value pair. The keys are |
-| | | strings. The values may be any |
-| | | valid data type, including another |
-| | | map. |
-*--------------------+--------------------+-------------------------------------+
-| Object[] | <array> | An array of objects. The array |
-| java.util.List | | elements may be any valid data |
-| | | type, including another array. |
-| | | |
-| | | The server may return other arrays (for
-| | | example String[]) or lists (using |
-| | | generics). However, the client will |
-| | | always return an Object[], because |
-| | | the XML-RPC protocol doesn't include|
-| | | between different array types. |
-*--------------------+--------------------+-------------------------------------+
-
- If the property <<<enabledForExtensions>>> is set, then additional data
- types become valid. (Both client and server do support this property.)
-
-*----------------------+--------------------+-------------------------------------+
-| Java Type | XML Tag Name | Description |
-*----------------------+--------------------+-------------------------------------+
-| None | <ex:nil> | A typeless null value. |
-*----------------------+--------------------+-------------------------------------+
-| Byte | <ex:i1> | A 8-bit, signed, and non-null, |
-| | | integer value. |
-*----------------------+--------------------+-------------------------------------+
-| Float | <ex:float> | A signed, non-null, double |
-| | | precision, floating point number. |
-| | | (32 bit) |
-*----------------------+--------------------+-------------------------------------+
-| Long | <ex:i8> | A 64-bit, signed, and non-null, |
-| | | integer value. |
-*----------------------+--------------------+-------------------------------------+
-| org.w3c.dom.Node | <ex:dom> | A DOM node, which is being |
-| | | transmitted as an embedded XML |
-| | | fragment. |
-*----------------------+--------------------+-------------------------------------+
-| Short | <ex:i2> | A 16-bit, signed, and non-null, |
-| | | integer value. |
-*----------------------+--------------------+-------------------------------------+
-| java.io.Serializable | <ex:serializable> | An object, which is converted into |
-| | | a serialized representation and |
-| | | transmitted as a base 64 encoded |
-| | | byte array. |
-*----------------------+--------------------+-------------------------------------+
-| BigDecimal | <ex:bigdecimal> | A BigDecimal |
-*----------------------+--------------------+-------------------------------------+
-| BigInteger | <ex:biginteger> | A BigInteger |
-*----------------------+--------------------+-------------------------------------+
-| java.util.Calendar | <ex:dateTime> | Unlike the dateTime.iso8601 type, |
-| | | this is a full blown xs:dateTime |
-| | | value. In particular, it includes |
-| | | milliseconds, and timezone settings.|
-*----------------------+--------------------+-------------------------------------+
-
- In the above table, the prefix <<<ex>>> refers to the namespace URI
- <<<http://ws.apache.org/xmlrpc/namespaces/extensions>>>.
diff --git a/apache_xmlrpc/src/site/fml/faq.fml b/apache_xmlrpc/src/site/fml/faq.fml
deleted file mode 100644
index 56bdd9ad92995fbc2d632a1f2a8a0a2474a0f975..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/fml/faq.fml
+++ /dev/null
@@ -1,270 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<faqs title="FAQ">
- <part id="client">
- <faq id="arrays">
- <question>Why do I receive a ClassCastException, if the server returns an array?</question>
- <answer>
- <p>The problem is typically caused by code like the following:</p>
- <source><![CDATA[
- Integer[] result = server.execute("Server.foo", param);
- ]]></source>
- <p>The problem is in the fact, that the XML-RPC response tells
- the client, that the server returns an array. It doesn't tell
- what type the array has. In other words, the client will
- always receive an object array. The workaround is to use
- code like the following:</p>
- <source><![CDATA[
- Object[] result = (Integer[])server.execute("Server.foo", param);
- for (int i = 0; i < result.length; i++) {
- Integer num = (Integer) result[i];
- ...
- }
- ]]></source>
-
- </answer>
- </faq>
-
- <faq id="compression_request">
- <question>How do I enable request compression?</question>
- <answer>
- <p>That's simple: Set the properties "enabledForExtensions"
- and "gzipCompressing". That said, note the following
- hints:</p>
- <ul>
- <li>Setting these properties will only work, if the XML-RPC
- server is aware of request compression. Compression is a
- violation of the XML-RPC specification, so typically the
- server will refuse the request, unless it is an Apache
- XML-RPC server with version 2 or later. (Apache XML-RPC 2
- supports request compression, although it was officially
- designed to be strictly compliant to the XML-RPC specification.
- However, noone was aware, that compression violates the
- specification. :-)</li>
- <li>Compressing the request doesn't mean that the response
- will also be compressed. You need to request response
- compression to achieve that.</li>
- <li>Additionally, be aware of the following: Compression
- depends on HTTP/1.1 features. In particular, you must
- not use the LiteHttpTransport.</li>
- </ul>
- </answer>
- </faq>
-
- <faq id="compression_response">
- <question>How do I enable response compression?</question>
- <answer>
- <p>That's as simple as enabling request compression: Set the
- properties "enabledForExtensions" and "gzipRequesting".
- That said, note the following hints:</p>
- <ul>
- <li>Requesting gzip compression is a standard HTTP feature.
- In other words, you may safely request compression from
- any XML-RPC server, even if it doesn't run Apache XML-RPC.
- </li>
- <li>However, requesting compression doesn't necessarily mean,
- that the response *is* compressed. It depends on the server.</li>
- <li>Additionally, be aware of the following: Compression
- depends on HTTP/1.1 features. In particular, you must
- not use the LiteHttpTransport.</li>
- </ul>
- </answer>
- </faq>
-
- <faq id="timeout_callback">
- <question>Is it possible to specify a timeout, after which the
- client stops waiting for the servers response?</question>
- <answer>
- <p>Yes, use the class TimingOutCallback.</p>
- <source><![CDATA[
- // Wait for 10 seconds.
- TimingOutCallback callback = new TimingOutCallback(10 * 1000);
- XmlRpcClient client = new XmlRpcClient(url);
- client.executeAsync(methodName, params, callback);
- try {
- return callback.waitForResponse();
- } catch (TimeoutException e) {
- System.out.println("No response from server.");
- } catch (Exception e) {
- System.out.println("Server returned an error message.");
- }
- ]]></source>
- </answer>
- </faq>
-
- <faq id="nonstandard_date_format">
- <question>I've got a server, which is expecting a non-standard
- date format. How can I ensure, that my date values have the
- right format?</question>
- <answer>
- <p>You've got to use a special type factory. An example is
- contained in the documentation on
- {{{advanced.html}advanced topics}}.</p>
- </answer>
- </faq>
-
- <faq id="nonstandard_double_format">
- <question>I've got a server, which is expecting a non-standard
- double format. How can I ensure, that my double values have the
- right format?</question>
- <answer>
- <p>You've got to use a special type factory. An example is
- contained in the documentation on
- {{{advanced.html}advanced topics}}.</p>
- </answer>
- </faq>
-
- <faq id="java_version">
- <question>I am using Java 1.4 (or Java 1.5, or later). Can I use
- javax.net.ssl.SSLSocketFactory? (Or the java.net.Proxy?)</question>
- <answer>
- <p>Yes, you can. Use the org.apache.xmlrpc.client.XmlRpcSun14HttpTransportFactory.
- (Or the org.apache.xmlrpc.client.XmlRpcSun15HttpTransportFactory.)</p>
- <p>The XmlRpcClient will detect the Java version you are using and
- automatically create the respective factory. In other words, all you
- need to do is cast the XmlRpcTransportFactory to the proper class.
- For example:</p>
-<source>
- XmlRpcClient myClient;
- XmlRpcTransportFactory factory = myClient.getTransportFactory();
- ((XmlRpcSun15HttpTransportFactory) factory).setProxy(String pHost, int pPort);
-</source>
- <p>With the Lite HTTP transport factory, things are slightly different:
- You have to explicitly create an instance of XmlRpcLite14HttpTransportFactory.</p>
- </answer>
- </faq>
- </part>
-
- <part id="server">
- <faq id="logging">
- <question>How do I reduce the servers error logging?</question>
- <answer>Create a subclass of XmlRpcErrorLogger and set it on the
- XmlRpcStreamServer.</answer>
- </faq>
-
- <faq id="streaming_mode">
- <question>How do I enable streaming mode?</question>
- <answer>
- <p>Set the property "enabledForExtensions". Note, that enabling
- the streaming mode doesn't mean, that all responses are served
- in streaming mode. It depends on the clients:</p>
- <ul>
- <li>If a client sends a content-length header, then the server
- assumes, that the client is a traditional XML-RPC application
- and doesn't support the vendor extensions from Apache XML-RPC.
- Consequently, the server assumes, that it needs to set the
- content-length header itself and disables the streaming mode
- for that particular request.</li>
- <li>However, if the client doesn't send a content-length header,
- then the server assumes that it will be able to accept any
- standard HTTP/1.1 request and enable the streaming mode.
- Streaming mode means, in particular, that the response will
- not contain a content-length header.</li>
- </ul>
- </answer>
- </faq>
-
- <faq id="basic_authentication">
- <question>How do I configure the server for basic authentication?</question>
- <answer>
- <p>Basically you've got to provide an AuthenticationHandler.
- See the {{{server.html}server documentation}} for an example.</p>
- </answer>
- </faq>
-
- <faq id="handler_initialization">
- <question>How do I initalize the request processors?</question>
- <answer>
- <p>The PropertyHandlerMapping assumes, that request processors are
- POJO's (plain old java objects). However, this is not always
- desirable. For example, sometimes it is assumed that handlers
- need to be initialized by the servlet, which is configured through
- parameters.</p>
- <p>The recommended solution is to configure your server with a
- special request processor factory.</p>
-<source>
-public interface InitializableRequestProcessor {
- void init(HttpServlet pServlet) throws XmlRpcException;
-}
-
-public class MyXmlRpcServlet extends XmlRpcServlet {
- protected PropertyHandlerMapping newPropertyHandlerMapping(URL url) throws IOException, XmlRpcException {
- PropertyHandlerMapping mapping = new PropertyHandlerMapping();
- RequestProcessorFactoryFactory factory = new RequestSpecificProcessorFactoryFactory(){
- protected Object newRequestProcessor(Class pClass, XmlRpcRequest pRequest) {
- InitializableRequestProcessor proc = super.newRequestProcessor(pClass, pRequest);
- proc.init(MyXmlRpcServlet.this);
- return proc;
- }
- };
- mapping.setRequestProcessorFactoryFactory(mapping);
- mapping.load(Thread.currentThread().getContextClassLoader(), url);
- return mapping;
- }
-
-}
-</source>
- </answer>
- </faq>
-
- <faq id="client_ip">
- <question>How to I get the clients IP address in a handler?</question>
- <answer>
- <p>That's a similar question than the question on initializing handlers.
- The main difference is, that in this case you want to initialize the
- handler with any request. In other words, you might achieve the goal
- by creating a RequestProcessorFactoryFactory, that provides the
- necessary details. However, there is an easier solution, which we
- will demonstrate here: Use a ThreadLocal.</p>
- <p>The class ThreadLocal allows to create information at some point
- in the source code and use this information at one or more completely
- different and decoupled places. The only assumption is, that you
- are in the same thread. This is exactly our situation: We create
- the information when processing of the XML-RPC request starts
- and read it within the handler.</p>
- <p>In the example below, you'd obtain the clients IP address by
- writing <code>ClientInfoServlet.getClientIpAddress()</code>.</p>
- <source><![CDATA[
-public static class ClientInfoServlet extends XmlRpcServlet {
- private static ThreadLocal clientIpAddress = new ThreadLocal();
-
- public static String getClientIpAddress() {
- return (String) clientIpAddress.get();
- }
-
- public void doPost(HttpServletRequest pRequest, HttpServletResponse pResponse)
- throws IOException, ServletException {
- clientIpAddress.set(pRequest.getRemoteAddr());
- super.doPost(pRequest, pResponse);
- }
-}
- ]]></source>
- </answer>
- </faq>
-
- <faq id="client_ip_webserver">
- <question>How to I get the clients IP address in a handler when using the WebServer class?</question>
- <answer>
- Use the ServletWebServer class and see the answer to the previous question.
- </answer>
- </faq>
- </part>
-</faqs>
diff --git a/apache_xmlrpc/src/site/site.xml b/apache_xmlrpc/src/site/site.xml
deleted file mode 100644
index e78da2432735441430da572ff2881860f3d42757..0000000000000000000000000000000000000000
--- a/apache_xmlrpc/src/site/site.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project name="ws-xmlrpc">
- <bannerLeft>
- <name>Apache XML-RPC</name>
- <src>http://ws.apache.org/xmlrpc/images/xmlrpc-logo.gif</src>
- <href>http://ws.apache.org/xmlrpc/</href>
- </bannerLeft>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Webservices" href="http://ws.apache.org/"/>
- <item name="XML-RPC" href="http://ws.apache.org/xmlrpc/"/>
- </links>
-
- <menu name="XML-RPC">
- <item name="Overview" href="/index.html"/>
- <item name="Download" href="/download.html"/>
- <item name="Changes" href="/changes-report.html"/>
- <item name="Mailing Lists" href="/mail-lists.html"/>
- <item name="Contributing" href="/contributing.html"/>
- <item name="XML-RPC 2" href="http://ws.apache.org/xmlrpc/xmlrpc2"/>
- <item name="Links" href="/links.html"/>
- </menu>
-
- <menu name="Documentation">
- <item name="Client Classes" href="/client.html"/>
- <item name="Server Side XML-RPC" href="/server.html"/>
- <item name="Vendor Extensions" href="/extensions.html"/>
- <item name="SSL" href="/ssl.html"/>
- <item name="Introspection" href="/introspection.html"/>
- <item name="Advanced Techniques" href="/advanced.html"/>
- <item name="XML-RPC Types" href="/types.html"/>
- <item name="FAQ" href="/faq.html"/>
- <item name="Javadocs" href="/apidocs/index.html"/>
- </menu>
-
- ${reports}
-
- </body></project>
diff --git a/apache_xmlrpc/src/site/xdoc/images/feather.gif b/apache_xmlrpc/src/site/xdoc/images/feather.gif
deleted file mode 100644
index 813bc9376add42de41b3642f0edb420259b1e065..0000000000000000000000000000000000000000
Binary files a/apache_xmlrpc/src/site/xdoc/images/feather.gif and /dev/null differ
diff --git a/apache_xmlrpc/src/site/xdoc/images/group-logo.gif b/apache_xmlrpc/src/site/xdoc/images/group-logo.gif
deleted file mode 100644
index 57e4b36a16e071d0141f657e3820de361e2d0f03..0000000000000000000000000000000000000000
Binary files a/apache_xmlrpc/src/site/xdoc/images/group-logo.gif and /dev/null differ
diff --git a/apache_xmlrpc/src/site/xdoc/images/project-logo.jpg b/apache_xmlrpc/src/site/xdoc/images/project-logo.jpg
deleted file mode 100644
index bac2bfb7448eb963d5916611c8d49b4c7db520d7..0000000000000000000000000000000000000000
Binary files a/apache_xmlrpc/src/site/xdoc/images/project-logo.jpg and /dev/null differ
diff --git a/apache_xmlrpc/src/site/xdoc/images/xml-logo.gif b/apache_xmlrpc/src/site/xdoc/images/xml-logo.gif
deleted file mode 100644
index 3f232bae9e89b5f9b5408f9200ba96da636e68b0..0000000000000000000000000000000000000000
Binary files a/apache_xmlrpc/src/site/xdoc/images/xml-logo.gif and /dev/null differ
diff --git a/apache_xmlrpc/src/site/xdoc/images/xmlrpc-logo.gif b/apache_xmlrpc/src/site/xdoc/images/xmlrpc-logo.gif
deleted file mode 100644
index 4be8d197cf6273ea5e743e48e2b41f5a5b7aa748..0000000000000000000000000000000000000000
Binary files a/apache_xmlrpc/src/site/xdoc/images/xmlrpc-logo.gif and /dev/null differ
diff --git a/apache_xmlrpc/LICENSE b/apache_xmlrpc_client/LICENSE
similarity index 100%
rename from apache_xmlrpc/LICENSE
rename to apache_xmlrpc_client/LICENSE
diff --git a/apache_xmlrpc/NOTICE b/apache_xmlrpc_client/NOTICE
similarity index 100%
rename from apache_xmlrpc/NOTICE
rename to apache_xmlrpc_client/NOTICE
diff --git a/apache_xmlrpc/README b/apache_xmlrpc_client/README
similarity index 100%
rename from apache_xmlrpc/README
rename to apache_xmlrpc_client/README
diff --git a/apache_xmlrpc_client/build.gradle b/apache_xmlrpc_client/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..9245673e55a88ef71e9492c63989e7e3b89bfab6
--- /dev/null
+++ b/apache_xmlrpc_client/build.gradle
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile project(':apache_xmlrpc_common')
+ compile 'org.apache.ws.commons:ws-commons-util:1.0.1'
+}
+
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/AsyncCallback.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/AsyncCallback.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/AsyncCallback.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/AsyncCallback.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.properties b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.properties
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.properties
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClient.properties
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfig.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfig.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfig.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfig.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientDefaults.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientDefaults.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientDefaults.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientDefaults.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientException.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientException.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientException.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientException.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorker.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorker.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorker.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorker.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransportException.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransportException.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransportException.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcHttpTransportException.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLite14HttpTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun14HttpTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSun15HttpTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransport.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransport.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransport.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransport.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactory.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportImpl.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportImpl.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportImpl.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/XmlRpcTransportImpl.java
diff --git a/apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/util/ClientFactory.java b/apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/util/ClientFactory.java
similarity index 100%
rename from apache_xmlrpc/client/src/main/java/org/apache/xmlrpc/client/util/ClientFactory.java
rename to apache_xmlrpc_client/src/main/java/org/apache/xmlrpc/client/util/ClientFactory.java
diff --git a/apache_xmlrpc/client/src/main/resources/org/apache/xmlrpc/client/XmlRpcClient.properties b/apache_xmlrpc_client/src/main/resources/org/apache/xmlrpc/client/XmlRpcClient.properties
similarity index 100%
rename from apache_xmlrpc/client/src/main/resources/org/apache/xmlrpc/client/XmlRpcClient.properties
rename to apache_xmlrpc_client/src/main/resources/org/apache/xmlrpc/client/XmlRpcClient.properties
diff --git a/apache_xmlrpc_common/LICENSE b/apache_xmlrpc_common/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..75b52484ea471f882c29e02693b4f02dba175b5e
--- /dev/null
+++ b/apache_xmlrpc_common/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/apache_xmlrpc_common/NOTICE b/apache_xmlrpc_common/NOTICE
new file mode 100644
index 0000000000000000000000000000000000000000..3a6553bd7fc7fd860ee1f40a4d7cbb0294da7134
--- /dev/null
+++ b/apache_xmlrpc_common/NOTICE
@@ -0,0 +1,5 @@
+Apache XML-RPC
+Copyright 1999-2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/apache_xmlrpc_common/README b/apache_xmlrpc_common/README
new file mode 100644
index 0000000000000000000000000000000000000000..893ac4d28cf02da54fc433171dfa8f9045798ceb
--- /dev/null
+++ b/apache_xmlrpc_common/README
@@ -0,0 +1 @@
+Based on Apache 3.1.3
diff --git a/apache_xmlrpc_common/build.gradle b/apache_xmlrpc_common/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..49b9f4a9b7f7b1293259866b1ec6a62446546122
--- /dev/null
+++ b/apache_xmlrpc_common/build.gradle
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile 'org.apache.commons:com.springsource.org.apache.commons.httpclient:3.1.0'
+ compile 'org.apache.ws.commons:ws-commons-util:1.0.1'
+}
+
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcConfig.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcConfig.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcConfig.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcConfig.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcConfigImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcConfigImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcConfigImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcConfigImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcException.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcException.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcException.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcException.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcHandler.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcHandler.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcHandler.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcHandler.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcRequest.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcRequest.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcRequest.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcRequest.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcRequestConfig.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcRequestConfig.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/XmlRpcRequestConfig.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/XmlRpcRequestConfig.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/LocalStreamConnection.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/LocalStreamConnection.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/LocalStreamConnection.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/LocalStreamConnection.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/ServerStreamConnection.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/ServerStreamConnection.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/ServerStreamConnection.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/ServerStreamConnection.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeConverter.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeConverter.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeConverter.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeConverter.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactoryImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactoryImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactoryImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeConverterFactoryImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeFactoryImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeFactoryImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/TypeFactoryImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/TypeFactoryImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcController.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcController.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcController.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcController.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcExtensionException.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcExtensionException.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcExtensionException.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcExtensionException.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpConfig.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpConfig.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpConfig.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpConfig.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcInvocationException.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcInvocationException.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcInvocationException.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcInvocationException.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcLoadException.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcLoadException.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcLoadException.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcLoadException.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessor.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessor.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessor.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessor.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamConfig.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamConfig.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamConfig.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamConfig.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorker.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorker.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorker.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorker.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorkerFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorkerFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorkerFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/common/XmlRpcWorkerFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/AtomicParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/AtomicParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/AtomicParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/AtomicParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/BigDecimalParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/BigDecimalParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/BigDecimalParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/BigDecimalParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/BigIntegerParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/BigIntegerParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/BigIntegerParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/BigIntegerParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/BooleanParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/BooleanParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/BooleanParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/BooleanParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/ByteArrayParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/ByteArrayParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/ByteArrayParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/ByteArrayParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/CalendarParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/CalendarParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/CalendarParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/CalendarParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/DateParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/DateParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/DateParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/DateParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/DoubleParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/DoubleParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/DoubleParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/DoubleParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/ExtParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/ExtParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/ExtParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/ExtParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/FloatParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/FloatParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/FloatParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/FloatParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I1Parser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I1Parser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I1Parser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I1Parser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I2Parser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I2Parser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I2Parser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I2Parser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I4Parser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I4Parser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I4Parser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I4Parser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I8Parser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I8Parser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/I8Parser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/I8Parser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/LongParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/LongParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/LongParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/LongParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/MapParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/MapParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/MapParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/MapParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/NodeParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/NodeParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/NodeParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/NodeParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/NullParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/NullParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/NullParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/NullParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/ObjectArrayParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/ObjectArrayParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/ObjectArrayParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/ObjectArrayParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/StringParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/StringParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/StringParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/StringParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/TypeParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/TypeParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/TypeParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/TypeParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/TypeParserImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/TypeParserImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/TypeParserImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/TypeParserImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcRequestParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/XmlRpcRequestParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcRequestParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/XmlRpcRequestParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BigDecimalSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BigDecimalSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BigDecimalSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BigDecimalSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BigIntegerSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BigIntegerSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BigIntegerSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BigIntegerSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BooleanSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BooleanSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/BooleanSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/BooleanSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ByteArraySerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ByteArraySerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ByteArraySerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ByteArraySerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/CalendarSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/CalendarSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/CalendarSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/CalendarSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/DateSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/DateSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/DateSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/DateSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/DoubleSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/DoubleSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/DoubleSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/DoubleSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ExtSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ExtSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ExtSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ExtSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/FloatSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/FloatSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/FloatSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/FloatSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I1Serializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I1Serializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I1Serializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I1Serializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I2Serializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I2Serializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I2Serializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I2Serializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I4Serializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I4Serializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I4Serializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I4Serializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I8Serializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I8Serializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/I8Serializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/I8Serializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ListSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ListSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ListSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ListSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/MapSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/MapSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/MapSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/MapSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/NodeSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/NodeSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/NodeSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/NodeSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/NullSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/NullSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/NullSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/NullSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ObjectArraySerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ObjectArraySerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/ObjectArraySerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/ObjectArraySerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/SerializableSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/SerializableSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/SerializableSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/SerializableSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/StringSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/StringSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/StringSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/StringSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializer.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializer.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializer.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializerImpl.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializerImpl.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializerImpl.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/TypeSerializerImpl.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/XmlRpcWriter.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/XmlRpcWriter.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/XmlRpcWriter.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/XmlRpcWriter.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/XmlWriterFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/XmlWriterFactory.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/serializer/XmlWriterFactory.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/serializer/XmlWriterFactory.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/HttpUtil.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/HttpUtil.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/HttpUtil.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/HttpUtil.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/LimitedInputStream.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/LimitedInputStream.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/LimitedInputStream.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/LimitedInputStream.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/ReflectionUtil.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/ReflectionUtil.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/ReflectionUtil.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/ReflectionUtil.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/ThreadPool.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/ThreadPool.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/ThreadPool.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/ThreadPool.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.java
diff --git a/apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/XmlRpcIOException.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/XmlRpcIOException.java
similarity index 100%
rename from apache_xmlrpc/common/src/main/java/org/apache/xmlrpc/util/XmlRpcIOException.java
rename to apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/util/XmlRpcIOException.java
diff --git a/apache_xmlrpc_server/LICENSE b/apache_xmlrpc_server/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..75b52484ea471f882c29e02693b4f02dba175b5e
--- /dev/null
+++ b/apache_xmlrpc_server/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/apache_xmlrpc_server/NOTICE b/apache_xmlrpc_server/NOTICE
new file mode 100644
index 0000000000000000000000000000000000000000..3a6553bd7fc7fd860ee1f40a4d7cbb0294da7134
--- /dev/null
+++ b/apache_xmlrpc_server/NOTICE
@@ -0,0 +1,5 @@
+Apache XML-RPC
+Copyright 1999-2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/apache_xmlrpc_server/README b/apache_xmlrpc_server/README
new file mode 100644
index 0000000000000000000000000000000000000000..893ac4d28cf02da54fc433171dfa8f9045798ceb
--- /dev/null
+++ b/apache_xmlrpc_server/README
@@ -0,0 +1 @@
+Based on Apache 3.1.3
diff --git a/apache_xmlrpc_server/build.gradle b/apache_xmlrpc_server/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..87ee83d3858a1773dcca9c224fd22855535d98f4
--- /dev/null
+++ b/apache_xmlrpc_server/build.gradle
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile project(':apache_xmlrpc_common')
+ compile 'org.apache.commons:com.springsource.org.apache.commons.logging:1.1.1'
+}
+
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/Util.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/Util.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/Util.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/Util.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/PropertyHandlerMapping.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/PropertyHandlerMapping.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/PropertyHandlerMapping.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/PropertyHandlerMapping.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/ServerHttpConnection.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/ServerHttpConnection.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/ServerHttpConnection.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/ServerHttpConnection.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcErrorLogger.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcErrorLogger.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcErrorLogger.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcErrorLogger.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcHandlerMapping.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcHandlerMapping.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcHandlerMapping.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcHandlerMapping.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServer.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServer.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServer.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServer.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServer.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServer.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServer.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServer.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfig.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfig.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfig.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfig.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorker.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorker.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorker.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorker.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcStreamServer.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcStreamServer.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/server/XmlRpcStreamServer.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/server/XmlRpcStreamServer.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/Connection.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/Connection.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/Connection.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/Connection.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/ConnectionServer.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/ConnectionServer.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/ConnectionServer.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/ConnectionServer.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/RequestData.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/RequestData.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/RequestData.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/RequestData.java
diff --git a/apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/WebServer.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/WebServer.java
similarity index 100%
rename from apache_xmlrpc/server/src/main/java/org/apache/xmlrpc/webserver/WebServer.java
rename to apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/webserver/WebServer.java
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..fb41d53b457fc87fef505348910c0127ddf97aa5
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+subprojects {
+ apply plugin: 'java'
+ apply plugin: 'osgi'
+ apply plugin: 'maven'
+ apply plugin: 'eclipse'
+
+ group = 'ros.rosjava_core'
+ version = '0.0.0-SNAPSHOT'
+ sourceCompatibility = 1.6
+
+ repositories {
+ mavenLocal()
+ maven {
+ url 'http://robotbrains.hideho.org/nexus/content/groups/ros-public'
+ }
+ }
+}
+
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 9e88036edc1e6d6b3da596332226c8c102c5b912..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.ros</groupId>
- <artifactId>rosjava_core</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>rosjava_core</name>
- <url>http://www.ros.org/rosjava_core</url>
-
- <repositories>
- <repository>
- <id>org.ros.release</id>
- <url>https://robotbrains.hideho.org/nexus/content/groups/ros-public</url>
- </repository>
- </repositories>
-
- <modules>
- <module>apache_xmlrpc</module>
- <module>rosjava_bootstrap</module>
- <module>rosjava</module>
- <module>rosjava_geometry</module>
- <module>rosjava_tutorial_pubsub</module>
- <module>rosjava_actionlib</module>
- <module>rosjava_actionlib_tutorial</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties
new file mode 100644
index 0000000000000000000000000000000000000000..d0b70e6d72cf78ad4086cfd7244c96141ca92a55
--- /dev/null
+++ b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Tue Feb 28 11:34:15 CET 2012
diff --git a/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock
new file mode 100644
index 0000000000000000000000000000000000000000..40fdece9d24d300eb3ed6177f4a7a7952db584cd
--- /dev/null
+++ b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin
new file mode 100644
index 0000000000000000000000000000000000000000..811e3aa156eec5d36e886d886ff0261f4ba33ca3
Binary files /dev/null and b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin differ
diff --git a/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000000000000000000000000000000000000..811e3aa156eec5d36e886d886ff0261f4ba33ca3
Binary files /dev/null and b/rosjava/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin differ
diff --git a/rosjava/CMakeLists.txt b/rosjava/CMakeLists.txt
deleted file mode 100644
index 944d1f254fa603252dceab64a14746f59b540e7e..0000000000000000000000000000000000000000
--- a/rosjava/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-rosbuild_init()
-# for now we're just using the rosmake integration to run the integration tests
-# This will remain the case until we figure out to properly integrate Java and
-# rosmake.
-
-# integration tests
-rosbuild_add_rostest(test/slave_api.rostest)
-rosbuild_add_rostest(test/slave_api_simtime.rostest)
-rosbuild_add_rostest(test/string_passthrough.rostest)
-rosbuild_add_rostest(test/int64_passthrough.rostest)
-rosbuild_add_rostest(test/testheader_passthrough.rostest)
-rosbuild_add_rostest(test/composite_passthrough.rostest)
-rosbuild_add_rostest(test/parameter_client.rostest)
diff --git a/rosjava/Makefile b/rosjava/Makefile
deleted file mode 100644
index 8b09720b1e2c616a52626f61ec6d4df04acc0f18..0000000000000000000000000000000000000000
--- a/rosjava/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: all clean test
-
-all:
- mvn install
-
-clean:
- mvn clean
-
-test:
- mvn test
diff --git a/rosjava/build.gradle b/rosjava/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..9434a75d60138c28519c9e0eb1527bbd8ccf41e5
--- /dev/null
+++ b/rosjava/build.gradle
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile project(':rosjava_bootstrap')
+ compile project(':apache_xmlrpc_common')
+ compile project(':apache_xmlrpc_server')
+ compile project(':apache_xmlrpc_client')
+ compile 'ros:message.std_msgs:0.0.0-SNAPSHOT'
+ compile 'ros:message.rosgraph_msgs:0.0.0-SNAPSHOT'
+ compile 'ros:message.test_ros:0.0.0-SNAPSHOT'
+ compile 'ros:service.test_ros:0.0.0-SNAPSHOT'
+ compile 'org.jboss.netty:netty:3.2.4.Final'
+ compile 'com.google.guava:guava:r07'
+ compile 'dnsjava:dnsjava:2.1.1'
+ compile 'org.apache.commons:com.springsource.org.apache.commons.logging:1.1.1'
+ compile 'org.apache.commons:com.springsource.org.apache.commons.net:2.0.0'
+ testCompile 'junit:junit:4.8.2'
+ testCompile 'org.mockito:mockito-all:1.8.5'
+}
+
+jar {
+ manifest {
+ version = '0.0.0-SNAPSHOT'
+ symbolicName = 'org.ros.rosjava'
+ instruction 'Export-Package', '!org.ros.internal.*, org.ros.*'
+ instruction 'Private-Package', 'org.ros.internal.*'
+ }
+}
diff --git a/rosjava/pom.xml b/rosjava/pom.xml
deleted file mode 100644
index d0c5d2cf22c6519b3b089534372d85ac31bf0d6a..0000000000000000000000000000000000000000
--- a/rosjava/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.ros</groupId>
- <artifactId>org.ros.rosjava</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>rosjava</name>
- <url>http://www.ros.org/rosjava</url>
-
- <repositories>
- <repository>
- <id>org.ros.release</id>
- <url>http://robotbrains.hideho.org/nexus/content/groups/ros-public</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>org.ros.rosjava</Bundle-Name>
- <Bundle-SymbolicName>org.ros.rosjava</Bundle-SymbolicName>
- <Bundle-Version>0.0.0</Bundle-Version>
- <Export-Package>!org.ros.internal.*, org.ros.*</Export-Package>
- <Private-Package>org.ros.internal.*</Private-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.rosjava_bootstrap</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.message.std_msgs</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.message.rosgraph_msgs</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.message.test_ros</artifactId>
- <version>0.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.service.test_ros</artifactId>
- <version>0.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc.common</artifactId>
- <version>3.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc.server</artifactId>
- <version>3.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>org.ros.org.apache.xmlrpc.client</artifactId>
- <version>3.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.2.4.Final</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r07</version>
- </dependency>
- <dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.net</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/rosjava/src/main/java/org/ros/RosRun.java b/rosjava/src/main/java/org/ros/RosRun.java
index 24914298ddaff500dd48f4a9bacb7db79434869e..49a55e849fc5e05419defae34657b6bc401f7edc 100644
--- a/rosjava/src/main/java/org/ros/RosRun.java
+++ b/rosjava/src/main/java/org/ros/RosRun.java
@@ -27,25 +27,17 @@ import org.ros.node.NodeMain;
import org.ros.node.NodeMainExecutor;
/**
- * This is a rosrun-compatible loader for rosjava-based nodes.
+ * This is a main class entry point for executing {@link NodeMain}s.
*
* @author kwc@willowgarage.com (Ken Conley)
+ * @author damonkohler@google.com (Damon Kohler)
*/
public class RosRun {
public static void printUsage() {
- System.err
- .println("Usage: rosrun rosjava_bootstrap run.py org.foo.MyNode [args] __name:=<node name>");
+ System.err.println("Usage: java -jar my_package.jar com.example.MyNodeMain [args]");
}
- /**
- * Usage:
- *
- * rosrun rosjava_bootstrap run.py org.foo.Node [args] __name:=<node name>
- *
- * @param argv
- * @throws Exception
- */
public static void main(String[] argv) throws Exception {
if (argv.length == 0) {
printUsage();
diff --git a/rosjava_actionlib/Makefile b/rosjava_actionlib/Makefile
deleted file mode 100644
index fbbff912c8950da42f28298b9051dbfac924dbfd..0000000000000000000000000000000000000000
--- a/rosjava_actionlib/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(shell rospack find rosjava_bootstrap)/rosjava.mk
diff --git a/rosjava_actionlib/build.gradle b/rosjava_actionlib/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..f2bd80dcc49e656ae361c4f9f2e5a463400015c0
--- /dev/null
+++ b/rosjava_actionlib/build.gradle
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile project(':rosjava')
+ compile 'ros:message.actionlib_msgs:0.0.0-SNAPSHOT'
+}
diff --git a/rosjava_actionlib/manifest.xml b/rosjava_actionlib/manifest.xml
index a29bbf17229d17b4c899f936ce34265d51b3f743..4a803664d657a8a17cc3ea9b4804aa1822719231 100644
--- a/rosjava_actionlib/manifest.xml
+++ b/rosjava_actionlib/manifest.xml
@@ -1,21 +1,12 @@
<package>
- <description brief="Pure Java ROS actionlib library.">
- An implementation of actionlib in pure-Java ROS.
+ <description brief="rosjava_actionlib">
+ An implementation of actionlib in pure-Java.
</description>
<author>Keith Hughes/khughes@google.com</author>
<license>Apache License 2.0</license>
- <review status="unreviewed" notes=""/>
- <url>http://rosjava.googlecode.com/</url>
- <depend package="rosjava"/>
- <depend package="actionlib_msgs"/>
- <depend package="actionlib_tutorials"/>
-
- <export>
- <rosjava-src location="src/main/java" />
- <rosjava-src location="src/tutorials/java" />
-
- <rosjava-pathelement location="target" groupId="org.ros" artifactId="org.ros.rosjava.actionlib_java" version="0.0.0" built="true" />
- </export>
+ <review status="unreviewed" notes="" />
+ <url>http://ros.org/wiki/rosjava_actionlib</url>
+ <depend package="actionlib_msgs"/>
</package>
diff --git a/rosjava_actionlib/pom.xml b/rosjava_actionlib/pom.xml
deleted file mode 100644
index f7e86609048a4f712a2c2db89bd1c3ea5762d124..0000000000000000000000000000000000000000
--- a/rosjava_actionlib/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.ros</groupId>
- <artifactId>org.ros.rosjava_actionlib</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>rosjava_actionlib</name>
-
- <dependencies>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.rosjava</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.message.actionlib_msgs</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/rosjava_actionlib/src/main/osgi/actionlib_java.bnd b/rosjava_actionlib/src/main/osgi/actionlib_java.bnd
deleted file mode 100644
index 6bf089fc7a074277de14336e4abd0acfe5a0ed04..0000000000000000000000000000000000000000
--- a/rosjava_actionlib/src/main/osgi/actionlib_java.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-bundle.version=0.0.0
--output: target/org.ros.rosjava.actionlib_java-${bundle.version}.jar
-
-Bundle-Name: org.ros.rosjava.actionlib_java
-Bundle-SymbolicName: org.ros.rosjava.actionlib_java
-Bundle-Version: ${bundle.version}
-
-Export-Package: org.ros.actionlib.*
-Import-Package: *
diff --git a/rosjava_actionlib_tutorial/Makefile b/rosjava_actionlib_tutorial/Makefile
deleted file mode 100644
index 8b09720b1e2c616a52626f61ec6d4df04acc0f18..0000000000000000000000000000000000000000
--- a/rosjava_actionlib_tutorial/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: all clean test
-
-all:
- mvn install
-
-clean:
- mvn clean
-
-test:
- mvn test
diff --git a/rosjava_actionlib_tutorial/build.gradle b/rosjava_actionlib_tutorial/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..8c06998c3efba3f0041272d1dfc1ddc4062a17de
--- /dev/null
+++ b/rosjava_actionlib_tutorial/build.gradle
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile project(':rosjava_actionlib')
+ compile 'ros:message.actionlib_tutorials:0.0.0-SNAPSHOT'
+}
diff --git a/rosjava_actionlib_tutorial/manifest.xml b/rosjava_actionlib_tutorial/manifest.xml
index f05c47f5b44a0d390e9754d0585143b1d0d0eb6a..9edfa061837b6047911d93fd9dc42d8fe5965adb 100644
--- a/rosjava_actionlib_tutorial/manifest.xml
+++ b/rosjava_actionlib_tutorial/manifest.xml
@@ -6,5 +6,7 @@
<license>Apache License 2.0</license>
<review status="unreviewed" notes=""/>
<url>http://ros.org/wiki/rosjava_actionlib_tutorial</url>
+
+ <depend package="actionlib_tutorials" />
</package>
diff --git a/rosjava_actionlib_tutorial/pom.xml b/rosjava_actionlib_tutorial/pom.xml
deleted file mode 100644
index 744ef313a5abb17a793face52be9878dd363bf63..0000000000000000000000000000000000000000
--- a/rosjava_actionlib_tutorial/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.ros</groupId>
- <artifactId>org.ros.rosjava_actionlib_tutorial</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>rosjava_actionlib_tutorial</name>
-
- <dependencies>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.rosjava_actionlib</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.message.actionlib_tutorials</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties
new file mode 100644
index 0000000000000000000000000000000000000000..43b13728c23a72cc10a1b94319131aad0d85f970
--- /dev/null
+++ b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Tue Feb 28 09:35:28 CET 2012
diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock
new file mode 100644
index 0000000000000000000000000000000000000000..40fdece9d24d300eb3ed6177f4a7a7952db584cd
--- /dev/null
+++ b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1994afe634093031c7eee19d5ae56e50ca79e98d
Binary files /dev/null and b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin differ
diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d34d774e01d0e8476255bb899da007becd88a639
Binary files /dev/null and b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin differ
diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2a9b50a5d93b31a99e11c241f1288227368843e6
Binary files /dev/null and b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin differ
diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a085d070669f9f4f7764e101f259919305a7a8b3
Binary files /dev/null and b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin differ
diff --git a/rosjava_bootstrap/Makefile b/rosjava_bootstrap/Makefile
deleted file mode 100644
index 8b09720b1e2c616a52626f61ec6d4df04acc0f18..0000000000000000000000000000000000000000
--- a/rosjava_bootstrap/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: all clean test
-
-all:
- mvn install
-
-clean:
- mvn clean
-
-test:
- mvn test
diff --git a/rosjava_bootstrap/build.gradle b/rosjava_bootstrap/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..70d4f5dcded50b5066b72ebd5faa0eed2f6e84b5
--- /dev/null
+++ b/rosjava_bootstrap/build.gradle
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+jar {
+ manifest {
+ version = '0.0.0-SNAPSHOT'
+ symbolicName = 'org.ros.rosjava_bootstrap'
+ instruction 'Export-Package', 'org.ros.message'
+ }
+}
diff --git a/rosjava_bootstrap/pom.xml b/rosjava_bootstrap/pom.xml
deleted file mode 100644
index a1e88c0123d700ef7fa3b318cf70b583e940816e..0000000000000000000000000000000000000000
--- a/rosjava_bootstrap/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<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>org.ros</groupId>
- <artifactId>org.ros.rosjava_bootstrap</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>rosjava_bootstrap</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-ManifestVersion>3</Bundle-ManifestVersion>
- <Bundle-SymbolicName>org.ros.rosjava_bootstrap</Bundle-SymbolicName>
- <Bundle-Version>0.0.0</Bundle-Version>
- <Export-Package>org.ros.message</Export-Package>
- <Fragment-Host>org.ros.rosjava; bundle-version="[0.0.0,1.0.0)"</Fragment-Host>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/rosjava_bootstrap/scripts/install_generated_modules.py b/rosjava_bootstrap/scripts/install_generated_modules.py
index e66b4bfd9e405664f782b2b932e0614f7be7e8fe..d2aacaf0e26b84d8dcd001811c622c513eea2eab 100755
--- a/rosjava_bootstrap/scripts/install_generated_modules.py
+++ b/rosjava_bootstrap/scripts/install_generated_modules.py
@@ -29,24 +29,24 @@ from rosjava_bootstrap import java_srvs
_DEPENDENCY_TAG = """
<dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.%s.%s</artifactId>
- <version>0.0.0</version>
+ <groupId>ros</groupId>
+ <artifactId>%s.%s</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
</dependency>"""
_POM = """<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>org.ros</groupId>
+ <groupId>ros</groupId>
<artifactId>%(artifact_id)s</artifactId>
<packaging>jar</packaging>
- <version>0.0.0</version>
+ <version>0.0.0-SNAPSHOT</version>
<name>%(artifact_id)s</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.rosjava_bootstrap</artifactId>
- <version>0.0.0</version>
+ <groupId>ros.rosjava_core</groupId>
+ <artifactId>rosjava_bootstrap</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
</dependency>%(dependency_tags)s
</dependencies>
</project>"""
@@ -66,26 +66,27 @@ def _is_srv_package(package):
return bool(d and os.path.isdir(d))
-def _build_dependency_tags(rospack, package):
+def _build_dependency_tags(rospack, package, artifact_type):
dependency_tags = set()
# Everything implicitly depends on std_msgs.
- dependency_tags.add(_DEPENDENCY_TAG % (_MESSAGE, 'std_msgs'))
+ if package != 'std_msgs':
+ dependency_tags.add(_DEPENDENCY_TAG % (_MESSAGE, 'std_msgs'))
for dependency in rospack.depends([package])[package]:
if _is_msg_package(dependency):
dependency_tags.add(_DEPENDENCY_TAG % (_MESSAGE, dependency))
if _is_srv_package(dependency):
dependency_tags.add(_DEPENDENCY_TAG % (_SERVICE, dependency))
# Services implicitly depend upon the package's messages if they exist.
- if _is_srv_package(package) and _is_msg_package(package):
+ if artifact_type == _SERVICE and _is_srv_package(package) and _is_msg_package(package):
dependency_tags.add(_DEPENDENCY_TAG % (_MESSAGE, package))
return dependency_tags
def _write_pom(rospack, package, artifact_type, directory):
- dependency_tags = _build_dependency_tags(rospack, package)
+ dependency_tags = _build_dependency_tags(rospack, package, artifact_type)
with open(os.path.join(directory, 'pom.xml'), 'w') as pom:
pom.write(_POM % {
- 'artifact_id': 'org.ros.%s.%s' % (artifact_type, package),
+ 'artifact_id': '%s.%s' % (artifact_type, package),
'dependency_tags': ''.join(dependency_tags),
})
@@ -93,7 +94,7 @@ def _write_pom(rospack, package, artifact_type, directory):
def _install_package(rospack, package, artifact_type):
if (package, artifact_type) in _installed_packages:
return
- sys.stdout.write('\nInstalling: org.ros.%s.%s\n' % (artifact_type, package))
+ sys.stdout.write('\nInstalling: %s.%s\n' % (artifact_type, package))
directory = tempfile.mkdtemp()
_write_pom(rospack, package, artifact_type, directory)
message_directory = os.path.join(directory, 'src/main/java')
diff --git a/rosjava_geometry/Makefile b/rosjava_geometry/Makefile
deleted file mode 100644
index 8b09720b1e2c616a52626f61ec6d4df04acc0f18..0000000000000000000000000000000000000000
--- a/rosjava_geometry/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: all clean test
-
-all:
- mvn install
-
-clean:
- mvn clean
-
-test:
- mvn test
diff --git a/rosjava_geometry/build.gradle b/rosjava_geometry/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..0a7d3cdc56e55c915fcbd69e993f097bd628a1d0
--- /dev/null
+++ b/rosjava_geometry/build.gradle
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+dependencies {
+ compile project(':rosjava')
+ compile 'ros:message.geometry_msgs:0.0.0-SNAPSHOT'
+ testCompile 'junit:junit:4.8.2'
+}
diff --git a/rosjava_geometry/manifest.xml b/rosjava_geometry/manifest.xml
index c8c7d3969c534bbbc4dc5d42472c73e46970dddf..603ee72cd150bf944f29a0d84f9184194a6d080d 100644
--- a/rosjava_geometry/manifest.xml
+++ b/rosjava_geometry/manifest.xml
@@ -1,23 +1,12 @@
<package>
<description brief="rosjava_geometry">
-
rosjava_geometry
-
</description>
<author>Lorenz Moesenlechner</author>
- <license>BSD</license>
+ <license>Apache License 2.0</license>
<review status="unreviewed" notes="" />
<url>http://ros.org/wiki/rosjava_geometry</url>
- <depend package="rosjava_bootstrap" />
- <depend package="rosjava" />
- <depend package="geometry_msgs" />
- <export>
- <rosjava-src location="src/main/java" />
- <rosjava-src location="src/test/java" scope="test" />
- <rosjava-pathelement location="target/" groupId="org.ros" artifactId="org.ros.geometry" version="0.0.0" built="true" />
- <rosjava-pathelement groupId="junit" artifactId="junit" version="4.8.2" scope="test" />
- </export>
+ <depend package="geometry_msgs" />
</package>
-
diff --git a/rosjava_geometry/pom.xml b/rosjava_geometry/pom.xml
deleted file mode 100644
index 1b39a0e6ee2a86a3fd05a9c9648b17d68b5bdbf8..0000000000000000000000000000000000000000
--- a/rosjava_geometry/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.ros</groupId>
- <artifactId>org.ros.rosjava_geometry</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>rosjava_geometry</name>
- <url>http://www.ros.org/rosjava_geometry</url>
-
- <repositories>
- <repository>
- <id>org.ros.release</id>
- <url>http://robotbrains.hideho.org/nexus/content/groups/ros-public</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.rosjava</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.message.geometry_msgs</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/rosjava_tutorial_pubsub/Makefile b/rosjava_tutorial_pubsub/Makefile
deleted file mode 100644
index fbbff912c8950da42f28298b9051dbfac924dbfd..0000000000000000000000000000000000000000
--- a/rosjava_tutorial_pubsub/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(shell rospack find rosjava_bootstrap)/rosjava.mk
diff --git a/rosjava_tutorial_pubsub/build.gradle b/rosjava_tutorial_pubsub/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..b3c0d175ab54de7815d2ed935a406773c0d90eef
--- /dev/null
+++ b/rosjava_tutorial_pubsub/build.gradle
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+apply plugin: 'application'
+
+mainClassName = 'org.ros.RosRun'
+
+dependencies {
+ compile project(':rosjava')
+}
diff --git a/rosjava_tutorial_pubsub/manifest.xml b/rosjava_tutorial_pubsub/manifest.xml
index c1d950ef9102f520e519512b588b93079d655182..5f4fae11e1701758d5800daee5f500a5ba65d132 100644
--- a/rosjava_tutorial_pubsub/manifest.xml
+++ b/rosjava_tutorial_pubsub/manifest.xml
@@ -7,7 +7,6 @@
<review status="unreviewed" notes="" />
<url>http://ros.org/wiki/rosjava_tutorial_pubsub</url>
- <depend package="rosjava" />
<depend package="std_msgs" />
</package>
diff --git a/rosjava_tutorial_pubsub/pom.xml b/rosjava_tutorial_pubsub/pom.xml
deleted file mode 100644
index 10566049f93d6af3403154a3bcfc19b9dea57e75..0000000000000000000000000000000000000000
--- a/rosjava_tutorial_pubsub/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>org.ros</groupId>
- <artifactId>org.ros.rosjava_tutorial_pubsub</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>rosjava_tutorial_pubsub</name>
- <url>http://www.ros.org/rosjava_tutorial_pubsub</url>
-
- <repositories>
- <repository>
- <id>org.ros.release</id>
- <url>http://robotbrains.hideho.org/nexus/content/groups/ros-public</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>${settings.localRepository}</classpathPrefix>
- <classpathLayoutType>repository</classpathLayoutType>
- <mainClass>org.ros.RosRun</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.ros</groupId>
- <artifactId>org.ros.rosjava</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..8e54649535a9cfa11d8e63077bf9561f02078c78
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+include 'rosjava_bootstrap', 'apache_xmlrpc_common', 'apache_xmlrpc_client',
+ 'apache_xmlrpc_server', 'rosjava', 'rosjava_geometry',
+ 'rosjava_tutorial_pubsub', 'rosjava_actionlib',
+ 'rosjava_actionlib_tutorial'