Author: jochen
Date: Sat Nov 5 13:11:29 2005
New Revision: 331034
URL: http://svn.apache.org/viewcvs?rev=331034&view=rev
Log:
Started conversion to Maven 2.
Added:
webservices/xmlrpc/branches/b20050512_streaming/.wtpmodules
webservices/xmlrpc/branches/b20050512_streaming/pom.xml
- copied, changed from r328736,
webservices/xmlrpc/branches/b20050512_streaming/project.xml
Removed:
webservices/xmlrpc/branches/b20050512_streaming/project.xml
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/BaseTest.properties
Modified:
webservices/xmlrpc/branches/b20050512_streaming/.classpath
webservices/xmlrpc/branches/b20050512_streaming/.project
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/util/HttpUtil.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/WebServer.java
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SerializerTest.java
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SunHttpTransportProvider.java
Modified: webservices/xmlrpc/branches/b20050512_streaming/.classpath
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/.classpath?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
--- webservices/xmlrpc/branches/b20050512_streaming/.classpath (original)
+++ webservices/xmlrpc/branches/b20050512_streaming/.classpath Sat Nov 5
13:11:29 2005
@@ -1,26 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
<classpath>
- <classpathentry excluding="" kind="src" path="src/java">
- </classpathentry>
- <classpathentry output="target/test-classes" kind="src" path="src/test">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar">
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- </classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
- </classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar">
- </classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/servletapi/jars/servletapi-2.4.jar">
- </classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/ws-commons-util/jars/ws-commons-util-1.0.jar">
- </classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/ws-commons-java5/jars/ws-commons-java5-1.0.jar">
- </classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/jaxme/jars/jaxmeapi-0.5.jar">
- </classpathentry>
- <classpathentry kind="output" path="target/classes">
- </classpathentry>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/test" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/testResources"
output="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB"
sourcepath="JRE_SRC"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/ws-commons-java5/ws-commons-java5/1.0/ws-commons-java5-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.1.3/log4j-1.1.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/ws-commons-util/ws-commons-util/1.0/ws-commons-util-1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/jaxme/jaxmeapi/0.5/jaxmeapi-0.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
</classpath>
Modified: webservices/xmlrpc/branches/b20050512_streaming/.project
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/.project?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
--- webservices/xmlrpc/branches/b20050512_streaming/.project (original)
+++ webservices/xmlrpc/branches/b20050512_streaming/.project Sat Nov 5
13:11:29 2005
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
<projectDescription>
<name>xmlrpc</name>
- <comment>Apache XML-RPC is a Java implementation of , a popular protocol
that uses XML over HTTP to implement remote procedure calls. Apache XML-RPC was
previously known as Helma XML-RPC. If you have code using the Helma library,
all you should have to do is change the import statements in your code from
helma.xmlrpc.* to org.apache.xmlrpc.*.</comment>
- <projects>
- </projects>
+ <comment>Apache XML-RPC is a Java implementation of XML-RPC, a popular
protocol
+ that uses XML over HTTP to implement remote procedure calls.
+ Compared to SOAP, or JAX-RPC, it is stable, much simpler and easier to
+ handle. Version 3 of Apache XML-RPC introduces several important vendor
+ extensions over the original XML-RPC specification.</comment>
+ <projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
+ <arguments/>
</buildCommand>
</buildSpec>
<natures>
Added: webservices/xmlrpc/branches/b20050512_streaming/.wtpmodules
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/.wtpmodules?rev=331034&view=auto
==============================================================================
--- webservices/xmlrpc/branches/b20050512_streaming/.wtpmodules (added)
+++ webservices/xmlrpc/branches/b20050512_streaming/.wtpmodules Sat Nov 5
13:11:29 2005
@@ -0,0 +1,8 @@
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="xmlrpc">
+ <module-type module-type-id="jst.utility">
+ <property name="java-output-path" value="/target/classes"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="src/java"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Copied: webservices/xmlrpc/branches/b20050512_streaming/pom.xml (from r328736,
webservices/xmlrpc/branches/b20050512_streaming/project.xml)
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/pom.xml?p2=webservices/xmlrpc/branches/b20050512_streaming/pom.xml&p1=webservices/xmlrpc/branches/b20050512_streaming/project.xml&r1=328736&r2=331034&rev=331034&view=diff
==============================================================================
--- webservices/xmlrpc/branches/b20050512_streaming/project.xml (original)
+++ webservices/xmlrpc/branches/b20050512_streaming/pom.xml Sat Nov 5 13:11:29
2005
@@ -1,98 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <pomVersion>3</pomVersion>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.xmlrpc</groupId>
<artifactId>xmlrpc</artifactId>
- <name>xmlrpc</name>
- <groupId>xmlrpc</groupId>
-
<distributionSite>http://www.apache.org/dyn/closer.cgi/ws/xmlrpc/</distributionSite>
- <id>xmlrpc</id>
- <currentVersion>3.0-dev</currentVersion>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://ws.apache.org/</url>
- <logo>/images/project-logo.jpg</logo>
- </organization>
- <inceptionYear>2001</inceptionYear>
- <package>org.apache.xmlrpc</package>
- <logo>/images/xmlrpc-logo.gif</logo>
- <shortDescription>XML RPC Server and Clients</shortDescription>
- <!-- Gump integration -->
- <gumpRepositoryId>jakarta</gumpRepositoryId>
- <description>Apache XML-RPC is a Java implementation of , a popular
protocol
- that uses XML over HTTP to implement remote procedure calls.
- Apache XML-RPC was previously known as Helma XML-RPC. If you
- have code using the Helma library, all you should have to do is
- change the import statements in your code from helma.xmlrpc.* to
- org.apache.xmlrpc.*.</description>
+ <name>Apache XML-RPC</name>
+ <version>3.0-dev</version>
+ <description>
+ Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
+ that uses XML over HTTP to implement remote procedure calls.
+ Compared to SOAP, or JAX-RPC, it is stable, much simpler and easier to
+ handle. Version 3 of Apache XML-RPC introduces several important vendor
+ extensions over the original XML-RPC specification.
+ </description>
<url>http://ws.apache.org/xmlrpc/</url>
-
<issueTrackingUrl>http://issues.apache.org/jira/browse/XMLRPC</issueTrackingUrl>
- <siteAddress>ws.apache.org</siteAddress>
- <siteDirectory>/www/ws.apache.org/xmlrpc/</siteDirectory>
-
<distributionDirectory>/www/www.apache.org/dist/ws/xmlrpc/</distributionDirectory>
- <repository>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/xmlrpc/branches/b20050512_streaming/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/xmlrpc/branches/b20050512_streaming/</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/webservices/xmlrpc/branches/b20050512_streaming/</url>
- </repository>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>XMLRPC_1_0</tag>
- </version>
- <version>
- <id>1.1</id>
- <name>1.1</name>
- <tag>XMLRPC_1_1</tag>
- </version>
- <version>
- <id>1.2</id>
- <name>1.2</name>
- <tag>XMLRPC_1_2_BRANCH</tag>
- </version>
- <version>
- <id>2.0</id>
- <name>2.0</name>
- <tag>XMLRPC_2_0_BRANCH</tag>
- </version>
- </versions>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/XMLRPC</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Gump</system>
+
<url>http://vmgump.apache.org/gump/public/ws-xmlrpc/xmlrpc/index.html</url>
+ </ciManagement>
+ <inceptionYear>2001</inceptionYear>
<mailingLists>
- <mailingList>
- <name>XML-RPC User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.eu.apache.org/mod_mbox/ws-xmlrpc-user/</archive>
- </mailingList>
- <mailingList>
- <name>XML-RPC Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.eu.apache.org/mod_mbox/ws-xmlrpc-dev/</archive>
- </mailingList>
+ <mailingList>
+ <name>XML-RPC Users</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>xmlrpc-user@ws.apache.org</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/ws-xmlrpc-user/</archive>
+ <otherArchives>
+
<otherArchive>http://marc.theaimsgroup.com/?l=xmlrpc-user</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>XML-RPC Developers</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>xmlrpc-dev@ws.apache.org</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/ws-xmlrpc-dev/</archive>
+ <otherArchives>
+
<otherArchive>http://marc.theaimsgroup.com/?l=xmlrpc-dev</otherArchive>
+ </otherArchives>
+ </mailingList>
</mailingLists>
<developers>
<developer>
- <name>Hannes Wallnoefer</name>
- <id>hannes</id>
- <email>[EMAIL PROTECTED]</email>
+ <name>Andrew Evers</name>
+ <id>aevers</id>
+ <email>[EMAIL PROTECTED]</email>
</developer>
<developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>dlr@finemaltcoding.com</email>
- <organization>CollabNet, Inc.</organization>
+ <name>Siegfried Goeschl</name>
+ <id>sgoeschl</id>
+ <email>[EMAIL PROTECTED]</email>
</developer>
<developer>
- <name>Jon Scott Stevens</name>
- <id>jon</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>CollabNet, Inc.</organization>
+ <name>Henri Gomez</name>
+ <id>hgomez</id>
+ <email>[EMAIL PROTECTED]</email>
</developer>
<developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Zenplex</organization>
+ <name>Ryan Hoegg</name>
+ <id>rhoegg</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>ISIS Networks</organization>
+ </developer>
+ <developer>
+ <name>Daniel Rall</name>
+ <id>dlr</id>
+ <email>dlr@finemaltcoding.com</email>
+ <organization>CollabNet, Inc.</organization>
</developer>
<developer>
<name>Leonard Richarson</name>
@@ -101,21 +79,15 @@
<organization>CollabNet, Inc.</organization>
</developer>
<developer>
- <name>John Wilson</name>
- <id>jwilson</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>The Wilson Partnership</organization>
- </developer>
- <developer>
- <name>Ryan Hoegg</name>
- <id>rhoegg</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>ISIS Networks</organization>
+ <name>Jon Scott Stevens</name>
+ <id>jon</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>CollabNet, Inc.</organization>
</developer>
<developer>
- <name>Andrew Evers</name>
- <id>aevers</id>
- <email>[EMAIL PROTECTED]</email>
+ <name>Hannes Wallnoefer</name>
+ <id>hannes</id>
+ <email>[EMAIL PROTECTED]</email>
</developer>
<developer>
<name>Jochen Wiedmann</name>
@@ -123,127 +95,81 @@
<email>[EMAIL PROTECTED]</email>
</developer>
<developer>
- <name>Henri Gomez</name>
- <id>hgomez</id>
- <email>[EMAIL PROTECTED]</email>
+ <name>John Wilson</name>
+ <id>jwilson</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>The Wilson Partnership</organization>
</developer>
<developer>
- <name>Siegfried Goeschl</name>
- <id>sgoeschl</id>
- <email>[EMAIL PROTECTED]</email>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Zenplex</organization>
</developer>
</developers>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+
<connection>http://svn.apache.org/repos/asf/webservices/xmlrpc/</connection>
+
<developerConnection>https://svn.apache.org/repos/asf/webservices/xmlrpc/</developerConnection>
+ <tag>b20050512_streaming</tag>
+ <url>http://svn.apache.org/viewcvs.cgi/webservices/xmlrpc/</url>
+ </scm>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/testResources</directory>
+ </testResource>
+ </testResources>
+ </build>
<dependencies>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>2.0.2</version>
<type>jar</type>
- <url>http://jakarta.apache.org/commons/httpclient/</url>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.2</version>
- <type>jar</type>
- <url>http://jakarta.apache.org/commons/logging.html</url>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<version>2.4</version>
- <type>jar</type>
- <url>http://java.sun.com/products/servlet/download.html</url>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- <type>jar</type>
- <url>http://www.junit.org/</url>
</dependency>
<dependency>
<groupId>ws-commons-util</groupId>
<artifactId>ws-commons-util</artifactId>
<version>1.0</version>
- <type>jar</type>
- <url>http://ws.apache.org/commons/util</url>
</dependency>
<dependency>
<groupId>ws-commons-java5</groupId>
<artifactId>ws-commons-java5</artifactId>
<version>1.0</version>
- <type>jar</type>
- <url>http://ws.apache.org/commons/java5</url>
</dependency>
- <!-- This dependencies are only required for JDK 1.3.x -->
- <!-- dependency>
- <groupId>jsse</groupId>
- <artifactId>jsse</artifactId>
- <version>1.0.2</version>
- <url>http://java.sun.com/products/jsse/</url>
- </dependency>
- <dependency>
- <groupId>jsse</groupId>
- <artifactId>jnet</artifactId>
- <version>1.0.2</version>
- <url>http://java.sun.com/products/jsse/</url>
- </dependency>
- <dependency>
- <groupId>jsse</groupId>
- <artifactId>jcert</artifactId>
- <version>1.0.2</version>
- <url>http://java.sun.com/products/jsse/</url>
- </dependency -->
- <!-- dependency>
- <groupId>fesi</groupId>
- <artifactId>fesi</artifactId>
- <version>1.1.5</version>
- <url>http://home.worldcom.ch/jmlugrin/fesi/</url>
- </dependency -->
<dependency>
<groupId>jaxme</groupId>
<artifactId>jaxmeapi</artifactId>
<version>0.5</version>
- <type>jar</type>
</dependency>
</dependencies>
- <build>
- <nagEmailAddress>xmlrpc-dev@ws.apache.org</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <!-- Unit test classes -->
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <!-- TODO: There are more tests available -->
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <!-- Exclude abstract tests -->
- <exclude>**/LocalServerRpcTest.java</exclude>
- <exclude>**/XmlRpcTransportTest.java</exclude>
- </excludes>
- </unitTest>
- <!-- Integration unit test classes -->
- <integrationUnitTest />
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
- <jars />
- </build>
- <reports>
- <report>maven-jdepend-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-pmd-plugin</report>
- <report>maven-faq-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-clover-plugin</report>
- </reports>
</project>
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
Sat Nov 5 13:11:29 2005
@@ -16,7 +16,6 @@
package org.apache.xmlrpc.client;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.java
Sat Nov 5 13:11:29 2005
@@ -17,7 +17,7 @@
/** Factory for the lite HTTP transport,
- * [EMAIL PROTECTED] org.apache.xmlrpc.client.XmlRpcLiteTransport}.
+ * [EMAIL PROTECTED] org.apache.xmlrpc.client.XmlRpcLiteHttpTransport}.
*/
public class XmlRpcLiteHttpTransportFactory extends XmlRpcTransportFactoryImpl
{
/** Creates a new instance.
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/util/HttpUtil.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/util/HttpUtil.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/util/HttpUtil.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/util/HttpUtil.java
Sat Nov 5 13:11:29 2005
@@ -18,9 +18,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.List;
import java.util.StringTokenizer;
import org.apache.ws.commons.util.Base64;
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
Sat Nov 5 13:11:29 2005
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.Socket;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -31,15 +32,24 @@
*/
public class ServletConnection implements Task {
private final WebServer webServer;
+ private final HttpServlet servlet;
private final XmlRpcStreamServer xmlRpcServer;
private final Socket socket;
private final HttpServletRequest request;
private final HttpServletResponse response;
- public ServletConnection(WebServer pWebServer,
+ /** Creates a new instance.
+ * @param pWebServer The webserver, which is creating this connection.
+ * @param pServlet The servlet, which ought to handle the request.
+ * @param pXmlRpcServer The XmlRpcServer being used.
+ * @param pSocket The socket, to which the client is connected.
+ * @throws IOException
+ */
+ public ServletConnection(WebServer pWebServer, HttpServlet pServlet,
XmlRpcStreamServer
pXmlRpcServer,
Socket pSocket) throws
IOException {
webServer = pWebServer;
+ servlet = pServlet;
xmlRpcServer = pXmlRpcServer;
socket = pSocket;
request = new HttpServletRequestImpl(socket);
@@ -47,8 +57,6 @@
}
public void run() throws Throwable {
- // TODO Auto-generated method stub
-
+ servlet.service(request, response);
}
-
}
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
Sat Nov 5 13:11:29 2005
@@ -19,7 +19,7 @@
import java.net.InetAddress;
import java.net.Socket;
-import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
import org.apache.xmlrpc.server.XmlRpcStreamServer;
import org.apache.xmlrpc.util.ThreadPool;
@@ -63,28 +63,34 @@
public int getStatusCode() { return statusCode; }
}
+ private final HttpServlet servlet;
+
/** Creates a new instance, which is listening on all
* local IP addresses and the given port.
+ * @param pServlet The servlet, which is handling requests.
* @param pPort The servers port number; 0 for a random
* port being choosen.
*/
- public ServletWebServer(int pPort) {
+ public ServletWebServer(HttpServlet pServlet, int pPort) {
super(pPort);
+ servlet = pServlet;
}
/** Creates a new instance, which is listening on the
* given IP address and the given port.
+ * @param pServlet The servlet, which is handling requests.
* @param pPort The servers port number; 0 for a random
* port being choosen.
* @param pAddr The servers IP address.
*/
- public ServletWebServer(int pPort, InetAddress pAddr) {
+ public ServletWebServer(HttpServlet pServlet, int pPort, InetAddress
pAddr) {
super(pPort, pAddr);
+ servlet = pServlet;
}
protected ThreadPool.Task newTask(WebServer pWebServer,
XmlRpcStreamServer pXmlRpcServer,
Socket pSocket) throws IOException {
- return new ServletConnection(pWebServer, pXmlRpcServer,
pSocket);
+ return new ServletConnection(pWebServer, servlet,
pXmlRpcServer, pSocket);
}
}
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/WebServer.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/WebServer.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/WebServer.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/WebServer.java
Sat Nov 5 13:11:29 2005
@@ -52,7 +52,7 @@
if ("*".equals(next)) {
pattern[i] = 256;
} else {
- pattern[i] = (byte)
Integer.parseInt(next);
+ pattern[i] =
Integer.parseInt(next);
}
}
} catch (Exception e) {
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SerializerTest.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SerializerTest.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SerializerTest.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SerializerTest.java
Sat Nov 5 13:11:29 2005
@@ -16,10 +16,11 @@
package org.apache.xmlrpc.test;
import java.io.StringWriter;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.ws.commons.serialize.XMLWriter;
import org.apache.ws.commons.serialize.XMLWriterImpl;
import org.apache.xmlrpc.XmlRpcException;
@@ -31,8 +32,6 @@
import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
import org.apache.xmlrpc.serializer.XmlRpcWriter;
import org.xml.sax.SAXException;
-
-import junit.framework.TestCase;
/** A test case for the various serializers.
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SunHttpTransportProvider.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SunHttpTransportProvider.java?rev=331034&r1=331033&r2=331034&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SunHttpTransportProvider.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/test/org/apache/xmlrpc/test/SunHttpTransportProvider.java
Sat Nov 5 13:11:29 2005
@@ -29,6 +29,7 @@
public class SunHttpTransportProvider extends WebServerProvider {
/** Creates a new instance.
* @param pMapping The test servers handler mapping.
+ * @param pContentLength Number of bytes being transmitted.
*/
public SunHttpTransportProvider(XmlRpcHandlerMapping pMapping, boolean
pContentLength) {
super(pMapping, pContentLength);
