jvanzyl 01/07/20 15:44:49
Modified: src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpc.java TurbineXmlRpcService.java
XmlRpcService.java
src/java/org/apache/turbine/services/xmlrpc/util
AuthenticatedFileHandler.java
Log:
- using the xml.apache.org xmlrpc package :-)
Revision Changes Path
1.15 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpc.java
Index: TurbineXmlRpc.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpc.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineXmlRpc.java 2001/07/17 11:37:33 1.14
+++ TurbineXmlRpc.java 2001/07/20 22:44:49 1.15
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import helma.xmlrpc.XmlRpcException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -63,6 +62,7 @@
import org.apache.turbine.services.ServiceBroker;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.ServiceException;
+import org.apache.xmlrpc.XmlRpcException;
/**
* This is a static accesor class for {@link XmlRpcService}.
1.33 +9 -9
jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TurbineXmlRpcService.java 2001/07/17 11:37:33 1.32
+++ TurbineXmlRpcService.java 2001/07/20 22:44:49 1.33
@@ -54,13 +54,6 @@
* <http://www.apache.org/>.
*/
-import helma.xmlrpc.WebServer;
-import helma.xmlrpc.XmlRpc;
-import helma.xmlrpc.XmlRpcClient;
-import helma.xmlrpc.XmlRpcException;
-import helma.xmlrpc.XmlRpcServer;
-import helma.xmlrpc.secure.SecureWebServer;
-import helma.xmlrpc.secure.SecurityTool;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
@@ -74,6 +67,13 @@
import org.apache.turbine.services.ServiceBroker;
import org.apache.turbine.services.xmlrpc.util.FileTransfer;
import org.apache.turbine.services.ServiceException;
+import org.apache.xmlrpc.WebServer;
+import org.apache.xmlrpc.XmlRpc;
+import org.apache.xmlrpc.XmlRpcClient;
+import org.apache.xmlrpc.XmlRpcException;
+import org.apache.xmlrpc.XmlRpcServer;
+import org.apache.xmlrpc.secure.SecureWebServer;
+import org.apache.xmlrpc.secure.SecurityTool;
import org.apache.velocity.runtime.configuration.Configuration;
@@ -97,7 +97,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineXmlRpcService.java,v 1.32 2001/07/17 11:37:33 jvanzyl Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.33 2001/07/20 22:44:49 jvanzyl Exp $
*/
public class TurbineXmlRpcService
extends BaseService
@@ -613,7 +613,7 @@
*/
public void shutdown()
{
- // Stop the XML RPC server. helma.xmlrpc.WebServer blocks in a call to
+ // Stop the XML RPC server. org.apache.xmlrpc.WebServer blocks in a call to
// ServerSocket.accept() until a socket connection is made.
webserver.shutdown();
try
1.18 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/XmlRpcService.java
Index: XmlRpcService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/XmlRpcService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XmlRpcService.java 2001/07/17 11:37:33 1.17
+++ XmlRpcService.java 2001/07/20 22:44:49 1.18
@@ -54,13 +54,13 @@
* <http://www.apache.org/>.
*/
-import helma.xmlrpc.XmlRpcException;
import java.util.Vector;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import org.apache.turbine.services.Service;
import org.apache.turbine.services.ServiceException;
+import org.apache.xmlrpc.XmlRpcException;
/**
* The interface an XmlRpcService implements.
@@ -69,7 +69,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Magn�s ��r Torfason</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: XmlRpcService.java,v 1.17 2001/07/17 11:37:33 jvanzyl Exp $
+ * @version $Id: XmlRpcService.java,v 1.18 2001/07/20 22:44:49 jvanzyl Exp $
*/
public interface XmlRpcService
extends Service
1.4 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
Index: AuthenticatedFileHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AuthenticatedFileHandler.java 2001/07/15 18:25:12 1.3
+++ AuthenticatedFileHandler.java 2001/07/20 22:44:49 1.4
@@ -57,7 +57,7 @@
import java.util.Vector;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.security.entity.User;
-import helma.xmlrpc.AuthenticatedXmlRpcHandler;
+import org.apache.xmlrpc.AuthenticatedXmlRpcHandler;
/**
* An authenticated Handler for use with the XML-RPC service that will deal
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
