X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSOAP.java;h=f3ce759de97ccb361e22425b6183af7c02293c23;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=a36e9a986538153d5a1f1a93d50008d4253fae48;hpb=1296555e827bcd7606b7d82b6c1f2a875ff22e2c;p=org.ibex.core.git

diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index a36e9a9..f3ce759 100644
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -1,10 +1,10 @@
-// Copyright 2002 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.*;
 import java.net.*;
 import java.util.*;
-import org.mozilla.javascript.*;
+import org.xwt.js.*;
 import org.xwt.util.*;
 import org.bouncycastle.util.encoders.Base64;
 
@@ -28,8 +28,8 @@ class SOAP extends XMLRPC {
     String nameSpace = null;
 
     /** When you get a property from an SOAP, it just returns another SOAP with the property name tacked onto methodname. */
-    public Object get(String name, Scriptable start) {
-        return new SOAP(url.toString(), (methodname.equals("") ? "" : methodname + ".") + name, action, nameSpace);
+    public Object get(String name) {
+        return new SOAP(url.toString(), (method.equals("") ? "" : method + ".") + name, http, action, nameSpace);
     }
 
 
@@ -41,9 +41,9 @@ class SOAP extends XMLRPC {
         if (name.equals("SOAP-ENV:Envelope")) return;
         if (name.equals("SOAP-ENV:Body")) return;
         if (name.equals("SOAP-ENV:Fault")) fault = true;
-
+ 
         // add a generic struct; we'll change this if our type is different
-        objects.addElement(new JSObject(false));
+        objects.addElement(new JS());
 
         for(int i=0; i<keys.length; i++) {
             String key = keys[i];
@@ -67,9 +67,9 @@ class SOAP extends XMLRPC {
                 } else if (value.endsWith("null")) {
                     objects.removeElementAt(objects.size() - 1);
                     objects.addElement(null);
-                } else if (value.endsWith("arrayType") || value.endsWith("Array") || key.endsWith("arrayType")) {
+                } else if (value.endsWith("arrayType") || value.endsWith("JSArray") || key.endsWith("arrayType")) {
                     objects.removeElementAt(objects.size() - 1);
-                    objects.addElement(Context.enter().newArray(org.xwt.util.JSObject.defaultObjects, new Object[] { } ));
+                    objects.addElement(new JSArray());
                 }
             }
         }
@@ -92,9 +92,9 @@ class SOAP extends XMLRPC {
 
             } else if (me instanceof byte[]) {
                 objects.removeElementAt(objects.size() - 1);
-                objects.addElement(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))));
+                objects.addElement(new Stream.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size())), null));
                 content.reset();                
-                
+
             } else if (me instanceof Integer) {
                 objects.removeElementAt(objects.size() - 1);
                 objects.addElement(new Integer(new String(content.getBuf(), 0, content.size())));
@@ -147,40 +147,44 @@ class SOAP extends XMLRPC {
         if (objects.size() < 2) return;
 
         // our parent "should" be an aggregate type -- add ourselves to it.
-        if (parent != null && parent instanceof NativeArray) {
+        if (parent != null && parent instanceof JSArray) {
             objects.removeElementAt(objects.size() - 1);
-            ((NativeArray)parent).put((int)((NativeArray)parent).jsGet_length(), (NativeArray)parent, me);
+            ((JSArray)parent).addElement(me);
 
-        } else if (parent != null && parent instanceof Scriptable) {
+        } else if (parent != null && parent instanceof JS) {
             objects.removeElementAt(objects.size() - 1);
-            ((Scriptable)parent).put(name, (Scriptable)parent, me);
+            try {
+                ((JS)parent).put(name, me);
+            } catch (JSExn e) {
+                throw new Error("this should never happen");
+            }
 
         }
 
     }
 
     /** Appends the SOAP representation of <code>o</code> to <code>sb</code> */
-    void appendObject(String name, Object o, StringBuffer sb) throws JavaScriptException {
+    void appendObject(String name, Object o, StringBuffer sb) throws JSExn {
         if (o instanceof Number) {
             if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) {
                 sb.append("                <" + name + " xsi:type=\"xsd:int\">");
                 sb.append(((Number)o).intValue());
-                sb.append("</" + name + ">\n");
+                sb.append("</" + name + ">\r\n");
             } else {
                 sb.append("                <" + name + " xsi:type=\"xsd:double\">");
                 sb.append(o);
-                sb.append("</" + name + ">\n");
+                sb.append("</" + name + ">\r\n");
             }
 
         } else if (o instanceof Boolean) {
             sb.append("                <" + name + " xsi:type=\"xsd:boolean\">");
             sb.append(((Boolean)o).booleanValue() ? "true" : "false");
-            sb.append("</" + name + ">\n");
+            sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof ByteStream) {
+        } else if (o instanceof Stream) {
             try {
-                sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\n");
-                InputStream is = ((ByteStream)o).getInputStream();
+                sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
+                InputStream is = ((Stream)o).getInputStream();
                 byte[] buf = new byte[54];
                 while(true) {
                     int numread = is.read(buf, 0, 54);
@@ -192,14 +196,14 @@ class SOAP extends XMLRPC {
                     }
                     sb.append("              ");
                     sb.append(new String(Base64.encode(writebuf)));
-                    sb.append("\n");
+                    sb.append("\r\n");
                 }
                 sb.append(((Boolean)o).booleanValue() ? "1" : "0");
-                sb.append("</" + name + ">\n");
+                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);
-                throw new JavaScriptException("caught IOException while attempting to send a ByteStream via SOAP");
+                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");
             }
 
         } else if (o instanceof String) {
@@ -219,51 +223,58 @@ class SOAP extends XMLRPC {
                     i = oldi = i + 1;
                 }
             }
-            sb.append("</" + name + ">\n");
+            sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof NativeArray) {
-            NativeArray na = (NativeArray)o;
-            sb.append("                <" + name + " SOAP-ENC:arrayType=\"xsd:ur-type[" + na.jsGet_length() + "]\">");
-            for(int i=0; i<na.jsGet_length(); i++)
-                appendObject("item", na.get(i, na), sb);
-            sb.append("</" + name + ">\n");
+        } else if (o instanceof JSArray) {
+            JSArray a = (JSArray)o;
+            sb.append("                <" + name + " SOAP-ENC:arrayType=\"xsd:ur-type[" + a.length() + "]\">");
+            for(int i=0; i<a.length(); i++) appendObject("item", a.elementAt(i), sb);
+            sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof Scriptable && !(o instanceof Undefined)) {
-            Scriptable s = (Scriptable)o;
+        } else if (o instanceof JS) {
+            JS j = (JS)o;
             sb.append("                <" + name + ">");
-            Object[] ids = s.getIds();
-            for(int i=0; i<ids.length; i++)
-                appendObject(ids[i].toString(), s.get(ids[i].toString(), s), sb);
-            sb.append("</" + name + ">\n");
+            Enumeration e = j.keys();
+            while(e.hasMoreElements()) {
+                Object key = e.nextElement();
+                appendObject((String)key, j.get(key), sb);
+            }
+            sb.append("</" + name + ">\r\n");
+
         }
     }
 
-    protected String send(Object[] args, HTTP http) throws JavaScriptException, IOException {
+    protected String buildRequest(JSArray args) throws JSExn, IOException {
         // build up the request
         StringBuffer content = new StringBuffer();
-        content.append("<?xml version=\"1.0\"?>\n");
-        content.append("<SOAP-ENV:Envelope SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"\n");
-        content.append("                   xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\"\n");
-        content.append("                   xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"\n");
-        content.append("                   xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\"\n");
-        content.append("                   xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\">\n");
-        content.append("<SOAP-ENV:Body>\n");
+        content.append("SOAPAction: " + action + "\r\n\r\n");
+        content.append("<?xml version=\"1.0\"?>\r\n");
+        content.append("<SOAP-ENV:Envelope SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"\r\n");
+        content.append("                   xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\"\r\n");
+        content.append("                   xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"\r\n");
+        content.append("                   xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\"\r\n");
+        content.append("                   xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\">\r\n");
+        content.append("<SOAP-ENV:Body>\r\n");
         content.append("    <");
-        content.append(methodname);
+        content.append(method);
         content.append(nameSpace != null ? " xmlns=\"" + nameSpace + "\"" : "");
-        content.append(">\n");
-        if (args.length > 0) {
-            Object[] o = ((Scriptable)args[0]).getIds();
-            for(int i=0; i<o.length; i++)
-                appendObject(o[i].toString(), ((Scriptable)args[0]).get(o[i].toString(), (Scriptable)args[0]), content);
+        content.append(">\r\n");
+        if (args.length() > 0) {
+            Enumeration e = ((JS)args.elementAt(0)).keys();
+            while(e.hasMoreElements()) {
+                Object key = e.nextElement();
+                appendObject((String)key, ((JS)args.elementAt(0)).get(key), content);
+            }
         }
-        content.append("    </" + methodname + "></SOAP-ENV:Body></SOAP-ENV:Envelope>");
-        http.addHeader("SOAPAction", action);
+        content.append("    </" + method + "></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n");
         return content.toString();
     }
 
     SOAP(String url, String methodname, String action, String nameSpace) {
-        super(url, methodname);
+        this(url, methodname, new HTTP(url), action, nameSpace);
+    }
+    SOAP(String url, String methodname, HTTP http, String action, String nameSpace) {
+        super(url, methodname, http);
         this.action = action;
         this.nameSpace = nameSpace;
     }