camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [6/6] camel git commit: CAMEL-8802 Upgraded CXF version to 3.0.5
Date Wed, 27 May 2015 13:43:23 GMT
CAMEL-8802 Upgraded CXF version to 3.0.5


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

Branch: refs/heads/camel-2.15.x
Commit: 9e23c99b501925f68dd53f0de10d5bfe69281185
Parents: c5ba44b
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Wed May 27 21:35:09 2015 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Wed May 27 21:42:41 2015 +0800

----------------------------------------------------------------------
 .../cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java   | 2 +-
 .../cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9e23c99b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index 8cfe283..be3c9d8 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -307,7 +307,7 @@ public class CxfRsConsumerSimpleBindingTest extends CamelTestSupport {
     
     @Test
     public void testMultipartPostWithoutParameters() throws Exception {
-        HttpPost post = new HttpPost("http://localhost:" + PORT_PATH + "/rest/customerservice/customers/multipart");
+        HttpPost post = new HttpPost("http://localhost:" + PORT_PATH + "/rest/customerservice/customers/multipart/withoutParameters");
         MultipartEntityBuilder builder = MultipartEntityBuilder.create().setMode(HttpMultipartMode.STRICT);
         builder.addBinaryBody("part1", new File(this.getClass().getClassLoader().getResource("java.jpg").toURI()),
ContentType.create("image/jpeg"), "java.jpg");
         builder.addBinaryBody("part2", new File(this.getClass().getClassLoader().getResource("java.jpg").toURI()),
ContentType.create("image/jpeg"), "java.jpg");

http://git-wip-us.apache.org/repos/asf/camel/blob/9e23c99b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index 7281e6e..66f08ab 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -36,7 +36,8 @@ public class MultipartCustomer {
         return null;
     }
     
-    @POST
+    @POST @Path("/withoutParameters")
+    // Added the path due to change of CXF-6321
     public Response multipartPostWithoutParameters(
             @Multipart(value = "part1", type = "image/jpeg") DataHandler dh1, 
             @Multipart(value = "part2", type = "image/jpeg") DataHandler dh2, 


Mime
View raw message