You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/05/06 13:15:41 UTC

[1/2] git commit: Fixing the test due to the latest Jetty adding some unexpected text in case of escaped eceptions

Repository: cxf
Updated Branches:
  refs/heads/master 17d844c86 -> 3da0b5c05


Fixing the test due to the latest Jetty adding some unexpected text in case of escaped eceptions


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

Branch: refs/heads/master
Commit: 17c66755fc2376920f9b20b8e28a8314ec0de0c0
Parents: 217cf55
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Tue May 6 12:15:00 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Tue May 6 12:15:00 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/17c66755/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 34aad22..42abdc9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -782,7 +782,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
     @Test
     public void testPropogateException() throws Exception {
         getAndCompare("http://localhost:" + PORT + "/bookstore/propagate-exception",
-                      "", "application/xml", 500);
+                      "Error: 500", "application/xml", 500);
     }
     
     @Test

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


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

Branch: refs/heads/master
Commit: 3da0b5c050b1f3d95147ffbed3b5f37b4d36d89b
Parents: 17c6675 17d844c
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Tue May 6 12:15:28 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Tue May 6 12:15:28 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------