HttpServlet that acts as a XML-RPC proxy.
Index: src/java/org/apache/xmlrpc/XmlRpcServer.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/XmlRpcServer.java,v
retrieving revision 1.24
diff -u -r1.24 XmlRpcServer.java
--- src/java/org/apache/xmlrpc/XmlRpcServer.java 20 Mar 2002 15:11:03 -0000 1.24
+++ src/java/org/apache/xmlrpc/XmlRpcServer.java 8 Jun 2002 11:29:52 -0000
@@ -61,10 +61,11 @@
import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.EmptyStackException;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.Stack;
-import java.util.Vector;
+import java.util.List;
/**
* A multithreaded, reusable XML-RPC server object. The name may be misleading
@@ -80,7 +81,7 @@
{
private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
- private Hashtable handlers;
+ private Map handlers;
private Stack pool;
private int workers;
@@ -90,7 +91,7 @@
*/
public XmlRpcServer()
{
- handlers = new Hashtable();
+ handlers = AggregateFactory.newMap();
pool = new Stack();
workers = 0;
}
@@ -185,7 +186,7 @@
*/
class Worker extends XmlRpc
{
- private Vector inParams;
+ private List inParams;
private ByteArrayOutputStream buffer;
private XmlWriter writer;
@@ -194,7 +195,7 @@
*/
protected Worker()
{
- inParams = new Vector();
+ inParams = new ArrayList();
buffer = new ByteArrayOutputStream();
}
@@ -212,7 +213,7 @@
{
// Release most of our resources
buffer.reset();
- inParams.removeAllElements();
+ inParams.clear();
}
}
@@ -391,7 +392,7 @@
*/
void objectParsed(Object what)
{
- inParams.addElement(what);
+ inParams.add(what);
}
/**
@@ -417,7 +418,7 @@
throws XmlRpcException, IOException
{
// System.err.println("error: "+message);
- Hashtable h = new Hashtable();
+ Map h = AggregateFactory.newMap();
h.put("faultCode", new Integer(code));
h.put("faultString", message);
writer.startElement("methodResponse");
@@ -452,7 +453,7 @@
/**
* main method, sucht methode in object, wenn gefunden dann aufrufen.
*/
- public Object execute(String methodName, Vector params) throws Exception
+ public Object execute(String methodName, List params) throws Exception
{
// Array mit Classtype bilden, ObjectAry mit Values bilden
Class[] argClasses = null;
@@ -463,7 +464,7 @@
argValues = new Object[params.size()];
for (int i = 0; i < params.size(); i++)
{
- argValues[i] = params.elementAt(i);
+ argValues[i] = params.get(i);
if (argValues[i] instanceof Integer)
{
argClasses[i] = Integer.TYPE;
Index: src/java/org/apache/xmlrpc/applet/JSXmlRpcApplet.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/applet/JSXmlRpcApplet.java,v
retrieving revision 1.3
diff -u -r1.3 JSXmlRpcApplet.java
--- src/java/org/apache/xmlrpc/applet/JSXmlRpcApplet.java 20 Mar 2002 15:11:03 -0000 1.3
+++ src/java/org/apache/xmlrpc/applet/JSXmlRpcApplet.java 8 Jun 2002 11:30:06 -0000
@@ -56,8 +56,10 @@
*/
import java.util.Date;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.Map;
+import java.util.List;
+
+import org.apache.xmlrpc.AggregateFactory;
/**
@@ -67,8 +69,8 @@
* Explorer 4.0 on Windows 95/NT, but not on IE/Mac.
*
* Results from XML-RPC calls are exposed to JavaScript as the are, i.e.
- * <structs>s are Hashtables
- * and <array>s are Vectors
+ * <structs>s are Hashtables
+ * and <array>s are Vectors
* and can be accessed thru their public methods. It seems like Date objects are
* not converted properly between JavaScript and Java, so the dateArg methods
* take long values instead of Date objects as parameters (date.getTime()).
@@ -80,7 +82,7 @@
public Object loaded = null;
private String errorMessage;
- private Vector arguments;
+ private List arguments;
/**
*
@@ -88,7 +90,7 @@
public void init()
{
initClient();
- arguments = new Vector();
+ arguments = AggregateFactory.newList();
loaded = Boolean.TRUE;
System.out.println("JSXmlRpcApplet initialized");
}
@@ -96,140 +98,140 @@
// add ints (primitve != object) to structs, vectors
public void addIntArg(int value)
{
- arguments.addElement(new Integer(value));
+ arguments.add(new Integer(value));
}
- public void addIntArgToStruct(Hashtable struct, String key, int value)
+ public void addIntArgToStruct(Map struct, String key, int value)
{
struct.put(key, new Integer(value));
}
- public void addIntArgToArray(Vector ary, int value)
+ public void addIntArgToArray(List ary, int value)
{
- ary.addElement(new Integer(value));
+ ary.add(new Integer(value));
}
// add floats/doubles to structs, vectors
public void addDoubleArg(float value)
{
- arguments.addElement(new Double(value));
+ arguments.add(new Double(value));
}
- public void addDoubleArgToStruct(Hashtable struct, String key, float value)
+ public void addDoubleArgToStruct(Map struct, String key, float value)
{
struct.put(key, new Double(value));
}
- public void addDoubleArgToArray(Vector ary, float value)
+ public void addDoubleArgToArray(List ary, float value)
{
- ary.addElement(new Double(value));
+ ary.add(new Double(value));
}
public void addDoubleArg(double value)
{
- arguments.addElement(new Double(value));
+ arguments.add(new Double(value));
}
- public void addDoubleArgToStruct(Hashtable struct, String key, double value)
+ public void addDoubleArgToStruct(Map struct, String key, double value)
{
struct.put(key, new Double(value));
}
- public void addDoubleArgToArray(Vector ary, double value)
+ public void addDoubleArgToArray(List ary, double value)
{
- ary.addElement(new Double(value));
+ ary.add(new Double(value));
}
// add bools to structs, vectors
public void addBooleanArg(boolean value)
{
- arguments.addElement(new Boolean(value));
+ arguments.add(new Boolean(value));
}
- public void addBooleanArgToStruct(Hashtable struct, String key,
+ public void addBooleanArgToStruct(Map struct, String key,
boolean value)
{
struct.put(key, new Boolean(value));
}
- public void addBooleanArgToArray(Vector ary, boolean value)
+ public void addBooleanArgToArray(List ary, boolean value)
{
- ary.addElement(new Boolean(value));
+ ary.add(new Boolean(value));
}
// add Dates to structs, vectors Date argument in SystemTimeMillis (seems to be the way)
public void addDateArg(long dateNo)
{
- arguments.addElement(new Date(dateNo));
+ arguments.add(new Date(dateNo));
}
- public void addDateArgToStruct(Hashtable struct, String key, long dateNo)
+ public void addDateArgToStruct(Map struct, String key, long dateNo)
{
struct.put(key, new Date(dateNo));
}
- public void addDateArgToArray(Vector ary, long dateNo)
+ public void addDateArgToArray(List ary, long dateNo)
{
- ary.addElement(new Date(dateNo));
+ ary.add(new Date(dateNo));
}
// add String arguments
public void addStringArg(String str)
{
- arguments.addElement(str);
+ arguments.add(str);
}
- public void addStringArgToStruct(Hashtable struct, String key, String str)
+ public void addStringArgToStruct(Map struct, String key, String str)
{
struct.put(key, str);
}
- public void addStringArgToArray(Vector ary, String str)
+ public void addStringArgToArray(List ary, String str)
{
- ary.addElement (str);
+ ary.add(str);
}
// add Array arguments
- public Vector addArrayArg()
+ public List addArrayArg()
{
- Vector v = new Vector();
- arguments.addElement(v);
+ List v = AggregateFactory.newList();
+ arguments.add(v);
return v;
}
- public Vector addArrayArgToStruct(Hashtable struct, String key)
+ public List addArrayArgToStruct(Map struct, String key)
{
- Vector v = new Vector();
+ List v = AggregateFactory.newList();
struct.put(key, v);
return v;
}
- public Vector addArrayArgToArray(Vector ary)
+ public List addArrayArgToArray(List ary)
{
- Vector v = new Vector();
- ary.addElement(v);
+ List v = AggregateFactory.newList();
+ ary.add(v);
return v;
}
// add Struct arguments
- public Hashtable addStructArg()
+ public Map addStructArg()
{
- Hashtable ht = new Hashtable();
- arguments.addElement(ht);
+ Map ht = AggregateFactory.newMap();
+ arguments.add(ht);
return ht;
}
- public Hashtable addStructArgToStruct(Hashtable struct, String key)
+ public Map addStructArgToStruct(Map struct, String key)
{
- Hashtable ht = new Hashtable();
+ Map ht = AggregateFactory.newMap();
struct.put(key, ht);
return ht;
}
- public Hashtable addStructArgToArray(Vector ary)
+ public Map addStructArgToArray(List ary)
{
- Hashtable ht = new Hashtable();
- ary.addElement(ht);
+ Map ht = AggregateFactory.newMap();
+ ary.add(ht);
return ht;
}
@@ -241,7 +243,7 @@
public void reset()
{
- arguments = new Vector();
+ arguments = AggregateFactory.newList();
}
public Object execute(String methodName)
@@ -263,7 +265,7 @@
}
}
// reset argument array for reuse
- arguments = new Vector();
+ arguments = AggregateFactory.newList();
showStatus("");
return returnValue;
Index: src/java/org/apache/xmlrpc/applet/SimpleXmlRpcClient.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/applet/SimpleXmlRpcClient.java,v
retrieving revision 1.4
diff -u -r1.4 SimpleXmlRpcClient.java
--- src/java/org/apache/xmlrpc/applet/SimpleXmlRpcClient.java 20 Mar 2002 15:11:03 -0000 1.4
+++ src/java/org/apache/xmlrpc/applet/SimpleXmlRpcClient.java 8 Jun 2002 11:30:05 -0000
@@ -67,10 +67,12 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Stack;
-import java.util.Vector;
+import java.util.List;
+
+import org.apache.xmlrpc.AggregateFactory;
import org.apache.xmlrpc.Base64;
import org.xml.sax.AttributeList;
import org.xml.sax.HandlerBase;
@@ -122,7 +124,7 @@
* @throws XmlRpcException
* @throws IOException
*/
- public Object execute(String method, Vector params)
+ public Object execute(String method, List params)
throws XmlRpcException, IOException
{
return new XmlRpcSupport (url).execute (method, params);
@@ -247,26 +249,26 @@
writer.write(Base64.encode((byte[]) what));
writer.endElement("base64");
}
- else if (what instanceof Vector)
+ else if (what instanceof List)
{
writer.startElement("array");
writer.startElement("data");
- Vector v = (Vector) what;
+ List v = (List) what;
int l2 = v.size();
for (int i2 = 0; i2 < l2; i2++)
{
- writeObject(v.elementAt(i2), writer);
+ writeObject(v.get(i2), writer);
}
writer.endElement("data");
writer.endElement("array");
}
- else if (what instanceof Hashtable)
+ else if (what instanceof Map)
{
writer.startElement("struct");
- Hashtable h = (Hashtable) what;
- for (Enumeration e = h.keys (); e.hasMoreElements (); )
+ Map h = (Map) what;
+ for (Iterator i = h.keySet().iterator(); i.hasNext(); )
{
- String nextkey = (String) e.nextElement ();
+ String nextkey = (String) i.next();
Object nextval = h.get(nextkey);
writer.startElement("member");
writer.startElement("name");
@@ -294,7 +296,7 @@
* @exception IOException If the call could not be made for lower level
* problems.
*/
- public Object execute(String method, Vector arguments)
+ public Object execute(String method, List arguments)
throws XmlRpcException, IOException
{
fault = false;
@@ -332,7 +334,7 @@
XmlRpcException exception = null;
try
{
- Hashtable f = (Hashtable) result;
+ Map f = (Map) result;
String faultString = (String) f.get("faultString");
int faultCode = Integer.parseInt(f.get("faultCode").toString());
exception = new XmlRpcException(faultCode, faultString.trim());
@@ -359,7 +361,7 @@
/**
* Generate an XML-RPC request from a method name and a parameter vector.
*/
- void writeRequest (XmlWriter writer, String method, Vector params)
+ void writeRequest (XmlWriter writer, String method, List params)
throws IOException
{
writer.startElement("methodCall");
@@ -371,7 +373,7 @@
for (int i = 0; i < l; i++)
{
writer.startElement("param");
- writeObject(params.elementAt (i), writer);
+ writeObject(params.get(i), writer);
writer.endElement("param");
}
writer.endElement("params");
@@ -564,8 +566,8 @@
// the name to use for the next member of struct values
String nextMemberName;
- Hashtable struct;
- Vector array;
+ Map struct;
+ List array;
/**
* Constructor.
@@ -582,7 +584,7 @@
{
if (type == ARRAY)
{
- array.addElement(child.value);
+ array.add(child.value);
}
else if (type == STRUCT)
{
@@ -600,13 +602,13 @@
this.type = type;
if (type == ARRAY)
{
- value = new Vector();
- array = new Vector();
+ value = AggregateFactory.newList();
+ array = AggregateFactory.newList();
}
if (type == STRUCT)
{
- value = new Hashtable();
- struct = new Hashtable();
+ value = AggregateFactory.newMap();
+ struct = AggregateFactory.newMap();
}
}
Index: src/java/org/apache/xmlrpc/applet/XmlRpcApplet.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/applet/XmlRpcApplet.java,v
retrieving revision 1.2
diff -u -r1.2 XmlRpcApplet.java
--- src/java/org/apache/xmlrpc/applet/XmlRpcApplet.java 20 Mar 2002 15:11:03 -0000 1.2
+++ src/java/org/apache/xmlrpc/applet/XmlRpcApplet.java 8 Jun 2002 11:30:07 -0000
@@ -59,7 +59,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Vector;
+import java.util.List;
/**
@@ -136,7 +136,7 @@
/**
* Calls the XML-RPC server with the specified methodname and argument list.
*/
- public Object execute(String methodName, Vector arguments)
+ public Object execute(String methodName, List arguments)
throws XmlRpcException, IOException
{
if (client == null)
Index: src/java/org/apache/xmlrpc/fesi/FesiRpcExtension.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/fesi/FesiRpcExtension.java,v
retrieving revision 1.2
diff -u -r1.2 FesiRpcExtension.java
--- src/java/org/apache/xmlrpc/fesi/FesiRpcExtension.java 20 Mar 2002 15:11:04 -0000 1.2
+++ src/java/org/apache/xmlrpc/fesi/FesiRpcExtension.java 8 Jun 2002 11:30:01 -0000
@@ -71,7 +71,9 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Vector;
+import java.util.List;
+
+import org.apache.xmlrpc.AggregateFactory;
import org.apache.xmlrpc.XmlRpcClient;
/**
@@ -280,12 +282,12 @@
long now = System.currentTimeMillis();
Object retval = null;
int l = arguments.length;
- Vector v = new Vector();
+ List v = AggregateFactory.newList();
for (int i = 0; i < l; i++)
{
Object arg = FesiRpcUtil.convertE2J(arguments[i]);
// System.out.println ("converted to J: "+arg.getClass ());
- v.addElement(arg);
+ v.add(arg);
}
// System.out.println ("spent "+(System.currentTimeMillis ()-now)+" millis in argument conversion");
ESObject esretval = ObjectObject.createObject(evaluator);
Index: src/java/org/apache/xmlrpc/fesi/FesiRpcServer.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/fesi/FesiRpcServer.java,v
retrieving revision 1.2
diff -u -r1.2 FesiRpcServer.java
--- src/java/org/apache/xmlrpc/fesi/FesiRpcServer.java 20 Mar 2002 15:11:04 -0000 1.2
+++ src/java/org/apache/xmlrpc/fesi/FesiRpcServer.java 8 Jun 2002 11:30:02 -0000
@@ -62,7 +62,7 @@
import FESI.Interpreter.Evaluator;
import java.io.IOException;
import java.util.StringTokenizer;
-import java.util.Vector;
+import java.util.List;
import org.apache.xmlrpc.WebServer;
import org.apache.xmlrpc.XmlRpcHandler;
@@ -151,7 +151,7 @@
/**
*
*/
- public Object execute(String method, Vector argvec) throws Exception
+ public Object execute(String method, List argvec) throws Exception
{
// convert arguments
int l = argvec.size();
@@ -181,7 +181,7 @@
ESValue args[] = new ESValue[l];
for (int i = 0; i < l; i++)
{
- args[i] = FesiRpcUtil.convertJ2E(argvec.elementAt(i),
+ args[i] = FesiRpcUtil.convertJ2E(argvec.get(i),
evaluator);
}
Object retval = FesiRpcUtil.convertE2J(
Index: src/java/org/apache/xmlrpc/fesi/FesiRpcUtil.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/fesi/FesiRpcUtil.java,v
retrieving revision 1.2
diff -u -r1.2 FesiRpcUtil.java
--- src/java/org/apache/xmlrpc/fesi/FesiRpcUtil.java 20 Mar 2002 15:11:04 -0000 1.2
+++ src/java/org/apache/xmlrpc/fesi/FesiRpcUtil.java 8 Jun 2002 11:29:59 -0000
@@ -70,8 +70,11 @@
import FESI.Interpreter.Evaluator;
import java.util.Date;
import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.List;
+
+import org.apache.xmlrpc.AggregateFactory;
import org.apache.xmlrpc.XmlRpc;
/**
@@ -89,26 +92,26 @@
{
return ESNull.theNull;
}
- if (what instanceof Vector)
+ if (what instanceof List)
{
- Vector v = (Vector) what;
+ List v = (List) what;
ArrayPrototype retval = new ArrayPrototype(
evaluator.getArrayPrototype(), evaluator);
int l = v.size();
for (int i = 0; i < l; i++)
{
- retval.putProperty(i, convertJ2E(v.elementAt(i), evaluator));
+ retval.putProperty(i, convertJ2E(v.get(i), evaluator));
}
return retval;
}
- if (what instanceof Hashtable)
+ if (what instanceof Map)
{
- Hashtable t = (Hashtable) what;
+ Map t = (Map) what;
ESObject retval = new ObjectPrototype(
evaluator.getObjectPrototype(), evaluator);
- for (Enumeration e = t.keys(); e.hasMoreElements();)
+ for (Iterator i = t.keySet().iterator(); i.hasNext();)
{
- String next = (String) e.nextElement();
+ String next = (String) i.next();
retval.putProperty(next, convertJ2E(t.get(next), evaluator),
next.hashCode());
}
@@ -149,18 +152,18 @@
{
ArrayPrototype a = (ArrayPrototype) what;
int l = a.size();
- Vector v = new Vector();
+ List v = AggregateFactory.newList();
for (int i = 0; i < l; i++)
{
Object nj = convertE2J(a.getProperty(i));
- v.addElement(nj);
+ v.add(nj);
}
return v;
}
if (what instanceof ObjectPrototype)
{
ObjectPrototype o = (ObjectPrototype) what;
- Hashtable t = new Hashtable();
+ Map t = AggregateFactory.newMap();
for (Enumeration e = o.getProperties(); e.hasMoreElements();)
{
String next = (String) e.nextElement();
Index: src/java/org/apache/xmlrpc/secure/SecureXmlRpcClient.java
===================================================================
RCS file: /home/cvspublic/xml-rpc/src/java/org/apache/xmlrpc/secure/SecureXmlRpcClient.java,v
retrieving revision 1.3
diff -u -r1.3 SecureXmlRpcClient.java
--- src/java/org/apache/xmlrpc/secure/SecureXmlRpcClient.java 13 Feb 2002 01:08:41 -0000 1.3
+++ src/java/org/apache/xmlrpc/secure/SecureXmlRpcClient.java 8 Jun 2002 11:30:03 -0000
@@ -55,11 +55,11 @@
*