You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2007/11/24 04:23:35 UTC

svn commit: r597787 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/interceptor/ databinding/jaxb/src/test/java/org/apache/cxf/jaxb/ javascript/src/main/java/org/apache/cxf/javascript/service/ javascript/src/test/java/org/apache/cxf/jav...

Author: bimargulies
Date: Fri Nov 23 19:23:33 2007
New Revision: 597787

URL: http://svn.apache.org/viewvc?rev=597787&view=rev
Log:
Some cleanup derived from research related to JAXB.

Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.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/resources/logging.properties

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?rev=597787&r1=597786&r2=597787&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java Fri Nov 23 19:23:33 2007
@@ -82,7 +82,7 @@
             return;
         }
 
-        //bop might be a unwrpped, wrap it back so that we can get correct info 
+        //bop might be a unwrapped, wrap it back so that we can get correct info 
         if (bop != null && bop.isUnwrapped()) {
             bop = bop.getWrappedOperation();
         }

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java?rev=597787&r1=597786&r2=597787&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java Fri Nov 23 19:23:33 2007
@@ -49,7 +49,6 @@
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
@@ -67,7 +66,6 @@
     PhaseInterceptorChain chain;
     MessageImpl message;
     Bus bus;
-    ServiceInfo serviceInfo;
     BindingInfo bindingInfo;
     Service service;
     EndpointInfo endpointInfo;

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=597787&r1=597786&r2=597787&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 Fri Nov 23 19:23:33 2007
@@ -409,7 +409,9 @@
 
         int px = 0;
         for (ElementAndNames partElement : elements) {
-            utils.generateCodeToSerializeElement("cxfutils", partElement.getElement(), "args[" + px + "]",
+            LOG.fine("Serialize part - message " + msg.getName() + " part " + partElement.getXmlName()); 
+            utils.generateCodeToSerializeElement("cxfutils", partElement.getElement(),
+                                                 "args[" + px + "]",
                                                  partElement.getXmlName(), xmlSchemaCollection,
                                                  serviceSchemaInfo.getNamespaceURI(), null);
             px++;

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=597787&r1=597786&r2=597787&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 Fri Nov 23 19:23:33 2007
@@ -64,17 +64,6 @@
         return furl.toString();
     }
 
-    // just one test function to avoid muddles with engine startup/shutdown
-    //@Test
-    public void runTests() throws Exception {
-
-        callMethodWithWrappers();
-        callMethodWithoutWrappers();
-        callTest2WithNullString();
-        callIntReturnMethod();
-        callFunctionWithBeans();
-    }
-
     @Before
     public void setupRhino() throws Exception {
         testUtilities.setBus(getBean(Bus.class, "cxf"));

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=597787&r1=597786&r2=597787&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties Fri Nov 23 19:23:33 2007
@@ -23,9 +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=WARNING
+#org.apache.cxf.javascript.service.ServiceJavascriptBuilder.level=FINE
 #org.apache.cxf.javascript.types.SchemaJavascriptBuilder.level=WARNING
 #org.apache.cxf.javascript.JavascriptTestUtilities.level=FINE
 #org.apache.cxf.javascript.JsXMLHttpRequest.level = WARNING
 #org.apache.cxf.javascript.service.DocLitWrappedTest.level=FINE
+