X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSOAP.java;h=f3ce759de97ccb361e22425b6183af7c02293c23;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=5e6d46302f8395537fb0b59a12473385275379ff;hpb=2ccad2219888c9942f62ae8b4d4207f655690948;p=org.ibex.core.git diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java index 5e6d463..f3ce759 100644 --- a/src/org/xwt/SOAP.java +++ b/src/org/xwt/SOAP.java @@ -1,5 +1,4 @@ -// FIXME -// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; import java.io.*; @@ -20,17 +19,17 @@ import org.bouncycastle.util.encoders.Base64; *
o
to sb
&/
+ /** Appends the SOAP representation of o
to sb
*/
void appendObject(String name, Object o, StringBuffer sb) throws JSExn {
if (o instanceof Number) {
if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) {
@@ -182,10 +181,10 @@ class SOAP /*extends XMLRPC*/ {
sb.append(((Boolean)o).booleanValue() ? "true" : "false");
sb.append("" + name + ">\r\n");
- } else if (o instanceof Res) {
+ } else if (o instanceof Stream) {
try {
sb.append(" <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
- InputStream is = ((Res)o).getInputStream();
+ InputStream is = ((Stream)o).getInputStream();
byte[] buf = new byte[54];
while(true) {
int numread = is.read(buf, 0, 54);
@@ -202,8 +201,8 @@ class SOAP /*extends XMLRPC*/ {
sb.append(((Boolean)o).booleanValue() ? "1" : "0");
sb.append("" + name + ">\r\n");
} catch (IOException e) {
- if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via SOAP");
- if (Log.on) Log.log(this, e);
+ if (Log.on) Log.info(this, "caught IOException while attempting to send a ByteStream via SOAP");
+ if (Log.on) Log.info(this, e);
throw new JSExn("caught IOException while attempting to send a ByteStream via SOAP");
}
@@ -245,7 +244,7 @@ class SOAP /*extends XMLRPC*/ {
}
}
- protected String send(JSArray args, HTTP http) throws JSExn, IOException {
+ protected String buildRequest(JSArray args) throws JSExn, IOException {
// build up the request
StringBuffer content = new StringBuffer();
content.append("SOAPAction: " + action + "\r\n\r\n");
@@ -257,7 +256,7 @@ class SOAP /*extends XMLRPC*/ {
content.append(" xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\">\r\n");
content.append("