camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject camel git commit: Update to latest CXF release
Date Tue, 17 Feb 2015 17:38:17 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 488042168 -> cb46c6601


Update to latest CXF release

Conflicts:
	parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb46c660
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb46c660
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb46c660

Branch: refs/heads/camel-2.14.x
Commit: cb46c6601a649722256dfaa40fb2b24f60d4ad84
Parents: 4880421
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Feb 17 12:27:29 2015 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Feb 17 12:38:01 2015 -0500

----------------------------------------------------------------------
 parent/pom.xml                                                | 2 +-
 .../org/apache/camel/itest/security/GreeterClientTest.java    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cb46c660/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 781c408..da7d387 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -113,7 +113,7 @@
     <commons-vfs2-version>2.0</commons-vfs2-version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
     <cobertura-maven-plugin-version>2.5.2</cobertura-maven-plugin-version>
-    <cxf-version>3.0.3</cxf-version>
+    <cxf-version>3.0.4</cxf-version>
     <cxf-version-range>[2.7,4.0)</cxf-version-range>
     <cxf-xjc-utils-version>3.0.2</cxf-xjc-utils-version>
     <deltaspike-version>1.0.2</deltaspike-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/cb46c660/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
index 283e354..de22b2e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
@@ -89,10 +89,11 @@ public class GreeterClientTest extends AbstractJUnit4SpringContextTests
{
             sendMessageWithUsernameToken("jim", "foo", "CXF");
             fail("should fail");
         } catch (Exception ex) {
+            String msg = ex.getMessage();
             assertTrue("Get a wrong type exception.", ex instanceof SOAPFaultException);
-            assertTrue("Get a wrong exception message", ex.getMessage().startsWith("The security
token could not be authenticated or authorized"));
-            // CXF 2.4.0 WSecurity doesn't put the authentication exception
-            //assertTrue("Get a wrong exception message", ex.getMessage().endsWith("java.io.IOException:
Wrong password!"));
+            assertTrue("Get a wrong exception message: " + msg,
+                       msg.startsWith("The security token could not be authenticated or authorized")
+                       || msg.startsWith("A security error was encountered when verifying
the messag"));
         }
 
     }


Mime
View raw message