You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/01/28 02:47:11 UTC

svn commit: r903935 - in /servicemix/components/bindings/servicemix-cxf-bc/trunk: pom.xml src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java

Author: ffang
Date: Thu Jan 28 01:47:10 2010
New Revision: 903935

URL: http://svn.apache.org/viewvc?rev=903935&view=rev
Log:
[SMXCOMP-700] Upgrade to CXF 2.2.6

Modified:
    servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
    servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java

Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml?rev=903935&r1=903934&r2=903935&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml Thu Jan 28 01:47:10 2010
@@ -48,7 +48,7 @@
     <servicemix-version>3.3.1</servicemix-version>
     <servicemix-shared-version>2010.01-SNAPSHOT</servicemix-shared-version>
     <servicemix-cxf-se-version>2010.01-SNAPSHOT</servicemix-cxf-se-version>
-    <cxf-version>2.2.5</cxf-version>
+    <cxf-version>2.2.6</cxf-version>
     <activemq-version>5.3.0</activemq-version>
     <jetty-version>6.1.14</jetty-version>
     <spring-version>2.5.6</spring-version>

Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java?rev=903935&r1=903934&r2=903935&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java Thu Jan 28 01:47:10 2010
@@ -226,10 +226,17 @@
             Map<String, Object> requestContext =
                 ((BindingProvider)greeter).getRequestContext();
             requestContext.put(CLIENT_ADDRESSING_PROPERTIES, maps);
-            String greeting = greeter.greetMe("explicitly set ot invoke greetMeSomeTime");
+            try {
+                greeter.greetMe("explicitly set ot invoke greetMeSomeTime");
+                fail();
+            } catch (Exception e) {
+                //as deliberately dispatch operation to greetMeSomeTime method
+                //so we should get exception as response message is greetMeSomeTime element
+                //which isn't greetMe element as greetMe method expected
+                assertTrue(e.getMessage().indexOf("Unexpected wrapper element") >= 0);
+            }
             //dispatch operation to to greetMeSomeTime method
-            assertEquals(greeting, "greetMeSomeTime:How are you explicitly set ot invoke greetMeSomeTime");
-            checkVerification();
+            
             //disassociate MAPs from request context
             requestContext.remove(CLIENT_ADDRESSING_PROPERTIES);
         } catch (UndeclaredThrowableException ex) {