[Laszlo-checkins] r11367 - in openlaszlo/trunk: WEB-INF/lps/server/src/org/openlaszlo/remote/json/soap lps/components/rpc/library

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-10-06 19:09:11 -0700 (Mon, 06 Oct 2008)
New Revision: 11367

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/remote/json/soap/ClientSOAPService.java
   openlaszlo/trunk/lps/components/rpc/library/namespace.js
   openlaszlo/trunk/lps/components/rpc/library/qname.js
   openlaszlo/trunk/lps/components/rpc/library/soap.js
Log:
Change 20081006-hqm-Q by hqm at badtzmaru.home on 2008-10-06 22:06:04 EDT
    in /Users/hqm/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: more updating of SOAP library

New Features:

Bugs Fixed:

Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    

Tests:



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/remote/json/soap/ClientSOAPService.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/remote/json/soap/ClientSOAPService.java	2008-10-06 23:00:02 UTC (rev 11366)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/remote/json/soap/ClientSOAPService.java	2008-10-07 02:09:11 UTC (rev 11367)
@@ -156,8 +156,11 @@
             return "null";
         }
         // this can be optimized
-        return ("new QName("+ScriptCompiler.quote(qname.getLocalPart())+","
-                + ScriptCompiler.quote(qname.getNamespaceURI())+")");
+        //return ("new QName("+ScriptCompiler.quote(qname.getLocalPart())+","
+        //+ ScriptCompiler.quote(qname.getNamespaceURI())+")");
+        return ("[" + ScriptCompiler.quote(qname.getLocalPart())
+                + ", " + ScriptCompiler.quote(qname.getNamespaceURI()) +
+                "]");
     }
 
 
@@ -239,19 +242,19 @@
                 body.append(",");
 
                 // QName for array type; null if complex type is not an array
-                body.append("typeQ: ");
+                body.append("\"typeQ\": ");
                 body.append(pushQName(ct.getArrayItemTypeQName()));
                 body.append(",");
 
                 // push members
-                body.append("members: ");
+                body.append("\"members\": ");
                 pushMembers(ct);
                 body.append(",");
 
                 // push base
                 ComplexType base = ct.getBase();
                 QName baseQName = (base != null ? base.getArrayItemTypeQName() : null);
-                body.append("base: ");
+                body.append("\"base\": ");
                 body.append(pushQName(baseQName));
 
                 body.append("}");

Modified: openlaszlo/trunk/lps/components/rpc/library/namespace.js
===================================================================
--- openlaszlo/trunk/lps/components/rpc/library/namespace.js	2008-10-06 23:00:02 UTC (rev 11366)
+++ openlaszlo/trunk/lps/components/rpc/library/namespace.js	2008-10-07 02:09:11 UTC (rev 11367)
@@ -68,7 +68,7 @@
 // DEFINE OBJECT: LzNamespace
 //======================================================================
 
-class LzNamespace {
+dynamic class LzNamespace {
 
 var namespace:String;
 

Modified: openlaszlo/trunk/lps/components/rpc/library/qname.js
===================================================================
--- openlaszlo/trunk/lps/components/rpc/library/qname.js	2008-10-06 23:00:02 UTC (rev 11366)
+++ openlaszlo/trunk/lps/components/rpc/library/qname.js	2008-10-07 02:09:11 UTC (rev 11367)
@@ -74,6 +74,8 @@
 // @param local: local part of the LzQName.
 // @param namespaceURI: namespace URI for the LzQName.
 //==============================================================================
+var QNAME_SUPPORTED_TYPES = {};
+
 public class LzQName {
 
 var __LZns;
@@ -83,14 +85,9 @@
 {
     this.__LZlocal = local;
     this.__LZns = namespaceURI;
-    if (LzQName.SUPPORTED_TYPES == null) {
-        LzQName.SUPPORTED_TYPES = {};
-    }
-    LzQName.SUPPORTED_TYPES[this.toString()] = true;
+    QNAME_SUPPORTED_TYPES[this.toString()] = true;
 }
 
-static var SUPPORTED_TYPES = null;
-
 //-----------------------------------------------------------------------------
 // String representation of this LzQName.
 //-----------------------------------------------------------------------------

Modified: openlaszlo/trunk/lps/components/rpc/library/soap.js
===================================================================
--- openlaszlo/trunk/lps/components/rpc/library/soap.js	2008-10-06 23:00:02 UTC (rev 11366)
+++ openlaszlo/trunk/lps/components/rpc/library/soap.js	2008-10-07 02:09:11 UTC (rev 11367)
@@ -174,7 +174,8 @@
         + "\" xmlns:soapenc=\"" + soapencNS + "\">\n";
 
     for (var i=0; i < args.length; i++) {
-        xml += this.__LZencSerialize(args[i], parts[i][0], parts[i][1], cr);
+        var qname = new LzQName(parts[i][1][0], parts[i][1][1]);
+        xml += this.__LZencSerialize(args[i], parts[i][0], qname, cr);
     }
     xml += "</params>\n";
     return xml;
@@ -359,7 +360,7 @@
 
 override function handleResponse (dreq:LzRPCDataRequest) {
     // The setup of the proxy object comes back as JSON
-    if (dreq.rpcinfo.opinfo && dreq.rpcinfo.opinfo.optype =='LOADOBJECT') {
+    if (dreq.rpcinfo.opinfo && dreq.rpcinfo.opinfo['optype'] =='LOADOBJECT') {
         this.handleJSONRPCresponse(dreq);
     } else {
         // the response to a SOAP operation comes back as XML