cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r598028 - in /incubator/cxf/trunk/rt: frontend/simple/src/main/java/org/apache/cxf/service/factory/ javascript/src/main/java/org/apache/cxf/javascript/ javascript/src/main/java/org/apache/cxf/javascript/service/ javascript/src/test/java/org...
Date Sun, 25 Nov 2007 19:00:57 GMT
Author: bimargulies
Date: Sun Nov 25 11:00:56 2007
New Revision: 598028

URL: http://svn.apache.org/viewvc?rev=598028&view=rev
Log:
Pass doc/lit/wrapped tests for javascript except when the automatic wrapper generator creates
an overly ugly schema. Perhaps javascript needs to cope with these, but perhaps not as much
as
we need to get some other things done.

Modified:
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
    incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties
    incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Sun Nov 25 11:00:56 2007
@@ -604,7 +604,6 @@
                             mpi.setElement(true);
                             mpi.setElementQName(qn);
 
-
                             checkForElement(serviceInfo, mpi);
                         }
                     }
@@ -1158,7 +1157,6 @@
         }
         if (part.getElementQName() == null) {
             part.setElementQName(inMsg.getName());
-//Benson            checkForElement(op.getInterface().getService(), part);
         } else if (!part.getElementQName().equals(op.getInput().getName())) {
             op.getInput().setName(part.getElementQName());
         }

Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
(original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
Sun Nov 25 11:00:56 2007
@@ -23,5 +23,6 @@
 NON_ELEMENT_CHILD=JavaScript limitation: Non-Element sequence member {0} of {1}. {2}
 ABSTRACT_ELEMENT=JavaScript limitation: Abstract element {0} of {1}. {2}
 ELEMENT_HAS_NO_TYPE= Element {0} has no type in the schema. {1}
+ELEMENT_TYPE_MISSING= Element {0} references type {1} which is not defined.
 
 

Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java
Sun Nov 25 11:00:56 2007
@@ -64,7 +64,6 @@
         Message message = new Message(messageKey, LOG, subject.getQName(), 
                                       cleanedUpSchemaSource(subject));
         throw new UnsupportedConstruct(message);
-        
     }
     
     public static void unsupportedConstruct(String messageKey, String what, XmlSchemaType
subject) {
@@ -129,6 +128,15 @@
                                                String referencingURI, 
                                                XmlSchemaElement element,
                                                XmlSchemaType containingType) {
+        if (element.getSchemaTypeName() != null) {
+            XmlSchemaType type = xmlSchemaCollection.getTypeByQName(element.getSchemaTypeName());
+            if (type == null) {
+                Message message = new Message("ELEMENT_TYPE_MISSING", LOG, element.getQName(),
+                                              element.getSchemaTypeName().toString());
+                throw new UnsupportedConstruct(message);
+            }
+            return type;
+        }
         assert element != null;
         if (referencingURI == null && containingType != null) {
             referencingURI = containingType.getQName().getNamespaceURI();

Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
Sun Nov 25 11:00:56 2007
@@ -54,8 +54,6 @@
 import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
 
 public class ServiceJavascriptBuilder extends ServiceModelVisitor {
     private static final Logger LOG = LogUtils.getL7dLogger(ServiceJavascriptBuilder.class);
@@ -72,7 +70,23 @@
     private Set<MessageInfo> outputMessagesWithNameConflicts;
     private SchemaCollection xmlSchemaCollection;
     private SchemaInfo serviceSchemaInfo;
-    private XmlSchemaElement wrapperElement;
+    
+    private boolean isWrapped;
+    // facts about the wrapper when there is one.
+    private MessagePartInfo inputWrapperPartInfo;
+    private String inputWrapperClassName;
+    private XmlSchemaElement inputWrapperElement;
+    private XmlSchemaComplexType inputWrapperComplexType;
+
+    private MessagePartInfo outputWrapperPartInfo;
+    private String outputWrapperClassName;
+    private XmlSchemaElement outputWrapperElement;
+    private XmlSchemaComplexType outputWrapperComplexType;
+
+    // Javascript parameter names for the input parameters,
+    // derived from the parts.
+    private List<String> inputParameterNames = new ArrayList<String>();
+    
     private NamespacePrefixAccumulator prefixAccumulator;
     private BindingInfo xmlBindingInfo;
     private Map<String, OperationInfo> localOperationsNameMap;
@@ -182,21 +196,22 @@
         if (isRPC) {
             unsupportedConstruct("RPC", op.getInterface().getName().toString());
         }
-        boolean isWrapped = op.isUnwrappedCapable();
-        List<String> inputParameterNames = new ArrayList<String>();
-        MessageInfo inputMessage = op.getInput();
-        String wrapperClassName = null;
+        
+        isWrapped = op.isUnwrappedCapable();
+        
         StringBuilder parameterList = new StringBuilder();
 
-        List<MessagePartInfo> parts = null;
-
-        if (inputMessage != null) {
-            parts = inputMessage.getMessageParts();
-            if (isWrapped) {
-                wrapperClassName = setupWrapperElement(inputParameterNames, parts);
-            }
+        inputParameterNames = new ArrayList<String>();
+        
+        if (isWrapped) {
+            collectWrapperElementInfo();
+        } else {
+            //TODO:
+            // build parameter list from parts
+        }
 
-            buildParameterList(inputParameterNames, parameterList);
+        if (op.getInput() != null) {
+            buildParameterList(parameterList);
         }
 
         MessageInfo outputMessage = op.getOutput();
@@ -204,23 +219,22 @@
 
         buildErrorFunction(); // fault part some day.
 
-        buildOperationFunction(inputParameterNames, inputMessage, parameterList);
+        buildOperationFunction(parameterList);
 
-        createInputSerializer(inputMessage, isWrapped, inputParameterNames, wrapperClassName,
parts);
+        createInputSerializer();
 
         if (outputMessage != null) {
             createResponseDeserializer(outputMessage);
         }
     }
 
-    private void buildOperationFunction(List<String> inputParameterNames,
-                                        MessageInfo inputMessage, 
-                                        StringBuilder parameterList) {
+    private void buildOperationFunction(StringBuilder parameterList) {
         code.append("function " 
                     +  opFunctionGlobalName
                     + "(successCallback, errorCallback"
                     + ((parameterList.length() > 0) ? ", " + parameterList : "") + ")
{\n");
         utils.appendLine("var xml = null;");
+        MessageInfo inputMessage = currentOperation.getInput();
         if (inputMessage != null) {
             utils.appendLine("var args = new Array(" + inputParameterNames.size() + ");");
             int px = 0;
@@ -233,7 +247,7 @@
                                                        inputMessage, 
                                                        inputMessage.getName())
                              + "_serializeInput"
-                             + "(args);");
+                             + "(this.jsutils, args);");
         }
         utils.appendLine("this.client = new CxfApacheOrgClient(this.jsutils);");
         // we need to pass the caller's callback functions to our callback
@@ -330,7 +344,7 @@
                     + successFunctionGlobalName + ";\n\n");
     }
 
-    private void buildParameterList(List<String> inputParameterNames, StringBuilder
parameterList) {
+    private void buildParameterList(StringBuilder parameterList) {
         for (String param : inputParameterNames) {
             parameterList.append(param);
             parameterList.append(", ");
@@ -345,6 +359,8 @@
         return getFunctionGlobalName(message.getName(), "deserializeResponse");
     }
 
+    // This ignores 'wrapped', because it assumes one part that we can use one way or 
+    // the other. For simple cases, this is certainly OK.
     private void createResponseDeserializer(MessageInfo outputMessage) {
         List<MessagePartInfo> parts = outputMessage.getMessageParts();
         if (parts.size() != 1) {
@@ -358,42 +374,43 @@
         XmlSchemaComplexType type = (XmlSchemaComplexType)element.getElement().getSchemaType();
         assert type != null;
         String typeObjectName = nameManager.getJavascriptName(type);
+        assert outputWrapperClassName.equals(typeObjectName);
         utils
             .appendLine("var returnObject = " + typeObjectName + "_deserialize (cxfjsutils,
partElement);\n");
         utils.appendLine("return returnObject;");
         code.append("}\n");
     }
 
-    private void createInputSerializer(MessageInfo msg, boolean isWrapped, List<String>
inputParameterNames,
-                                       String wrapperClassName, List<MessagePartInfo>
parts) {
-        List<ElementAndNames> elements = new ArrayList<ElementAndNames>();
+    private void createInputSerializer() {
         
-        String serializerFunctionGlobalName = getFunctionGlobalName(msg.getName(), "serializeInput");
+        // We are working on a wrapped method, then we use the wrapper element.
+        // If we are working on an unwrapped method, we will have to work from the unwrapped
parts.
+        
+        MessageInfo message = currentOperation.getInput();
+        String serializerFunctionGlobalName = getFunctionGlobalName(message.getName(), "serializeInput");
         String serializerFunctionPropertyName = 
-            getFunctionPropertyName(inputMessagesWithNameConflicts, msg, msg.getName())
+            getFunctionPropertyName(inputMessagesWithNameConflicts, message, message.getName())
             + "_serializeInput";
 
-        code.append("function " + serializerFunctionGlobalName + "(args) {\n");
-        getElementsForParts(elements, parts);
-
-        // if not wrapped, the param array matches up with the parts. If
-        // wrapped, the members of it have to be packed into an object.
+        code.append("function " + serializerFunctionGlobalName + "(cxfutils, args) {\n");
+        String wrapperXmlElementName = null; 
 
+        // for the wrapped case, we can name the object for Javascript after whatever we
like.
+        // we could use the wrapped part, or we could use a conventional name.
         if (isWrapped) {
-            String partJavascriptVar = elements.get(0).getJavascriptName();
-            utils.appendLine("var " + partJavascriptVar + " = new " + wrapperClassName +
"();");
+            wrapperXmlElementName = 
+                prefixAccumulator.xmlElementString(inputWrapperPartInfo.getConcreteName());
+            utils.appendLine("var wrapperObj = new " + inputWrapperClassName + "();");
             int px = 0;
             for (String param : inputParameterNames) {
-                utils.appendLine(partJavascriptVar + ".set" + StringUtils.capitalize(param)
+ "(args[" + px
+                utils.appendLine("wrapperObj.set" + StringUtils.capitalize(param) + "(args["
+ px
                                  + "]);");
                 px++;
             }
-            // stick this into the array in slot 0.
-            utils.appendLine("args[0] = " + partJavascriptVar + ";");
+        } else {
+            // TODO: implement unwrapped.
         }
 
-        utils.appendLine("var cxfutils = new CxfApacheOrgUtil();");
-
         if (soapBindingInfo != null) {
             SoapVersion soapVersion = soapBindingInfo.getSoapVersion();
             assert soapVersion.getVersion() == 1.1;
@@ -406,17 +423,29 @@
         }
 
         utils.setXmlStringAccumulator("xml");
-
-        int px = 0;
-        for (ElementAndNames partElement : elements) {
-            LOG.fine("Serialize part - message " + msg.getName() + " part " + partElement.getXmlName());

-            utils.generateCodeToSerializeElement("cxfutils", partElement.getElement(),
-                                                 "args[" + px + "]",
-                                                 partElement.getXmlName(), xmlSchemaCollection,
-                                                 serviceSchemaInfo.getNamespaceURI(), null);
-            px++;
+        
+        if (isWrapped) {
+            utils.generateCodeToSerializeElement("cxfutils", 
+                                                 inputWrapperElement, 
+                                                 "wrapperObj",
+                                                 wrapperXmlElementName,
+                                                 xmlSchemaCollection, 
+                                                 serviceSchemaInfo.getNamespaceURI(),
+                                                 null);
+        } else {
+            // TODO: code unwrapped.
         }
 
+//        int px = 0;
+//        for (ElementAndNames partElement : elements) {
+//            LOG.fine("Serialize part - message " + msg.getName() + " part " + partElement.getXmlName());

+//            utils.generateCodeToSerializeElement("cxfutils", partElement.getElement(),
+//                                                 "args[" + px + "]",
+//                                                 partElement.getXmlName(), xmlSchemaCollection,
+//                                                 serviceSchemaInfo.getNamespaceURI(), null);
+//            px++;
+//        }
+
         utils.appendLine("xml = xml + cxfutils.endSoap11Message();");
         utils.appendLine("return xml;");
         code.append("}\n\n");
@@ -454,34 +483,61 @@
         }
     }
 
-    private String setupWrapperElement(List<String> inputParameterNames, List<MessagePartInfo>
parts) {
-        String wrapperClassName;
-        // expect one input part.
-        assert parts.size() == 1;
-        MessagePartInfo wrapperPart = parts.get(0);
-        // we expect a type
-        assert wrapperPart.isElement();
-        wrapperElement = (XmlSchemaElement)wrapperPart.getXmlSchema();
-        XmlSchemaComplexType wrapperType = (XmlSchemaComplexType)XmlSchemaUtils
-            .getElementType(xmlSchemaCollection, 
-                            currentOperation.getName().getNamespaceURI(), wrapperElement,
null);
-        wrapperClassName = nameManager.getJavascriptName(wrapperType);
-        XmlSchemaSequence wrapperTypeSequence = XmlSchemaUtils.getSequence(wrapperType);
-        for (int i = 0; i < wrapperTypeSequence.getItems().getCount(); i++) {
-            XmlSchemaObject thing = wrapperTypeSequence.getItems().getItem(i);
-            if (!(thing instanceof XmlSchemaElement)) {
-                XmlSchemaUtils.unsupportedConstruct("NON_ELEMENT_CHILD", thing.getClass().getSimpleName(),
-                                                    wrapperType);
+    // This function generated Javascript names for the parameters. 
+    private void collectWrapperElementInfo() {
+        
+        if (currentOperation.getInput() != null) {
+            inputWrapperPartInfo = currentOperation.getInput().getMessagePart(0);
+
+            List<MessagePartInfo> unwrappedParts = 
+                currentOperation.getUnwrappedOperation().getInput().getMessageParts();
+
+            for (MessagePartInfo mpi : unwrappedParts) {
+                inputParameterNames.add(mpi.getName().getLocalPart());
             }
 
-            XmlSchemaElement elChild = (XmlSchemaElement)thing;
-            if (elChild.getRefName() != null) {
-                inputParameterNames.add(elChild.getRefName().getLocalPart());
-            } else {
-                inputParameterNames.add(elChild.getQName().getLocalPart());
+            inputWrapperPartInfo = currentOperation.getInput().getMessagePart(0);
+            assert inputWrapperPartInfo.isElement();
+
+            inputWrapperElement = (XmlSchemaElement)inputWrapperPartInfo.getXmlSchema();
+            if (inputWrapperElement == null) {
+                inputWrapperElement = 
+                    XmlSchemaUtils.findElementByRefName(xmlSchemaCollection, 
+                                                        inputWrapperPartInfo.getElementQName(),
+                                                        serviceInfo.getTargetNamespace());
+            }
+            inputWrapperComplexType = (XmlSchemaComplexType)inputWrapperElement.getSchemaType();
+            if (inputWrapperComplexType == null) {
+                inputWrapperComplexType = (XmlSchemaComplexType)
+                    XmlSchemaUtils.getElementType(xmlSchemaCollection, 
+                                                  serviceInfo.getTargetNamespace(), 
+                                                  inputWrapperElement, 
+                                                  null);
+            }
+            inputWrapperClassName = nameManager.getJavascriptName(inputWrapperComplexType);
+        }
+
+        if (currentOperation.getOutput() != null) {
+            outputWrapperPartInfo = currentOperation.getOutput().getMessagePart(0);
+            assert outputWrapperPartInfo.isElement();
+
+            outputWrapperElement = (XmlSchemaElement)outputWrapperPartInfo.getXmlSchema();
+            if (outputWrapperElement == null) {
+                outputWrapperElement = 
+                    XmlSchemaUtils.findElementByRefName(xmlSchemaCollection, 
+                                                        outputWrapperPartInfo.getElementQName(),
+                                                        serviceInfo.getTargetNamespace());
+            }
+            outputWrapperComplexType = (XmlSchemaComplexType)outputWrapperElement.getSchemaType();
+            if (outputWrapperComplexType == null) {
+                outputWrapperComplexType = (XmlSchemaComplexType)
+                    XmlSchemaUtils.getElementType(xmlSchemaCollection, 
+                                                  serviceInfo.getTargetNamespace(), 
+                                                  outputWrapperElement, 
+                                                  null);
             }
+            outputWrapperClassName = nameManager.getJavascriptName(outputWrapperComplexType);
         }
-        return wrapperClassName;
     }
 
     @Override

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
Sun Nov 25 11:00:56 2007
@@ -134,7 +134,7 @@
         return null;
     }
     
-    @org.junit.Ignore
+    @org.junit.Ignore // problems with names on auto-generated wrappers!
     @Test
     public void callFunctionWithBeans() {
         LOG.info("about to call test4/beanFunction");
@@ -251,7 +251,7 @@
             }
         });
     }
-
+    
     @Test
     public void callTest2WithNullString() {
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
Sun Nov 25 11:00:56 2007
@@ -250,7 +250,7 @@
     private void doSend(byte[] dataToSend, boolean xml) {
         // avoid warnings on stuff we arent using yet.
         if (storedUser != null || storedPassword != null) {
-            LOG.finest(storedUser + storedPassword);
+            //
         }
         // 1 check state
         if (readyState != jsGet_OPENED()) {

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java
Sun Nov 25 11:00:56 2007
@@ -21,10 +21,13 @@
 
 import javax.jws.WebService;
 
+import org.apache.cxf.feature.Features;
+
 /**
  * 
  */
 @WebService(endpointInterface = "org.apache.cxf.javascript.fortest.SimpleDocLitWrapped")
+@Features(features = "org.apache.cxf.feature.LoggingFeature")   
 public class SimpleDocLitWrappedImpl implements SimpleDocLitWrapped {
     
     private String lastString;

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties Sun Nov 25 11:00:56
2007
@@ -23,10 +23,10 @@
 .level= INFO
 java.util.logging.ConsoleHandler.level = FINEST
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-#org.apache.cxf.javascript.service.ServiceJavascriptBuilder.level=FINE
-#org.apache.cxf.javascript.types.SchemaJavascriptBuilder.level=WARNING
+#org.apache.cxf.javascript.service.ServiceJavascriptBuilder.level=FINEST
+#org.apache.cxf.javascript.types.SchemaJavascriptBuilder.level=FINEST
 #org.apache.cxf.javascript.JavascriptTestUtilities.level=FINE
-#org.apache.cxf.javascript.JsXMLHttpRequest.level = WARNING
+org.apache.cxf.javascript.JsXMLHttpRequest.level = FINE
 #org.apache.cxf.javascript.service.DocLitWrappedTest.level=FINE
 
 

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js?rev=598028&r1=598027&r2=598028&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
Sun Nov 25 11:00:56 2007
@@ -62,7 +62,7 @@
 	intf.url = url;
 	// param order is from propOrder on the wrapper class.
 	intf.basicTypeFunctionReturnString(test1SuccessCallback, test1ErrorCallback,
-									   doubleArg, floatArg, intArg, longArg, stringArg
+									   stringArg, intArg, longArg, floatArg, doubleArg 
 									   ); 
     // Return the notifier as a convenience to the Java code.
 	return globalNotifier;



Mime
View raw message