svn commit: r917889 - in /camel/trunk/components/camel-soap: ./ src/test/java/org/apache/camel/dataformat/soap/

[ningjiang]

Author: ningjiang
Date: Tue Mar  2 06:05:15 2010
New Revision: 917889

URL: http://svn.apache.org/viewvc?rev=917889&view=rev
Log:
CAMEL-2512 Applied patch with thanks to Christian

Modified:
    camel/trunk/components/camel-soap/pom.xml
    
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
    
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
    
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java

Modified: camel/trunk/components/camel-soap/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=917889&r1=917888&r2=917889&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Tue Mar  2 06:05:15 2010
@@ -32,7 +32,7 @@
     <description>Camel SOAP support</description>
 
     <properties>
-        
<camel.osgi.export.pkg>org.apache.camel.dataformat.soap.*</camel.osgi.export.pkg>
+        <camel.osgi.export.pkg>org.apache.camel.dataformat.soap.*, 
org.xmlsoap.schemas.soap.envelope.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java?rev=917889&r1=917888&r2=917889&view=diff
==============================================================================
--- 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
 (original)
+++ 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
 Tue Mar  2 06:05:15 2010
@@ -57,9 +57,9 @@
     @SuppressWarnings("unchecked")
     public void testRoundTrip() throws Exception {
         context.setTracing(true);
-        Endpoint start = context.getEndpoint("direct:start");
-        proxy = ProxyHelper.createProxy(start,
-                this.getClass().getClassLoader(), CustomerService.class);
+        Endpoint startEndpoint = context.getEndpoint("direct:start");
+        ClassLoader classLoader = 
Thread.currentThread().getContextClassLoader();
+        proxy = ProxyHelper.createProxy(startEndpoint, classLoader, 
CustomerService.class);
 
         GetCustomersByNameResponse response = proxy
                 .getCustomersByName(new GetCustomersByName());

Modified: 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java?rev=917889&r1=917888&r2=917889&view=diff
==============================================================================
--- 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
 (original)
+++ 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
 Tue Mar  2 06:05:15 2010
@@ -80,10 +80,13 @@
         String jaxbPackage = GetCustomersByName.class.getPackage().getName();
         ElementNameStrategy elNameStrat = new 
ServiceInterfaceStrategy(CustomerService.class, true);
         SoapJaxbDataFormat soapDataFormat = new 
SoapJaxbDataFormat(jaxbPackage, elNameStrat);
-        
from("direct:camelClient").onException(NoSuchCustomerException.class).handled(true).unmarshal(soapDataFormat)
-                .end().marshal(soapDataFormat) //
-                .to("direct:cxfEndpoint") //
-                .unmarshal(soapDataFormat);
+        from("direct:camelClient") //
+            .onException(NoSuchCustomerException.class) //
+                .handled(true) //
+                .unmarshal(soapDataFormat) //
+            .end().marshal(soapDataFormat) //
+            .to("direct:cxfEndpoint") //
+            .unmarshal(soapDataFormat);
     }
 
 }

Modified: 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java?rev=917889&r1=917888&r2=917889&view=diff
==============================================================================
--- 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
 (original)
+++ 
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
 Tue Mar  2 06:05:15 2010
@@ -90,11 +90,8 @@
             public void configure() throws Exception {
                 SoapJaxbDataFormat df = createDataFormat();
                 from("direct:start") //
-                        .onException(Exception.class) //
-                            .marshal(df) //
-                            .end() //
-                        .marshal(df) //
-                        .to("mock:result");
+                    .marshal(df) //
+                    .to("mock:result");
             }
         };
     }