You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/07/11 09:34:11 UTC
svn commit: r1145052 - in /cxf/branches/2.4.x-fixes: ./
distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
Author: ffang
Date: Mon Jul 11 07:34:11 2011
New Revision: 1145052
URL: http://svn.apache.org/viewvc?rev=1145052&view=rev
Log:
Merged revisions 1145049 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1145049 | ffang | 2011-07-11 15:28:53 +0800 (δΈ€, 11 7 2011) | 1 line
[CXF-3650]jax-rs basic example doesn't work when there's a space in file path url
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java?rev=1145052&r1=1145051&r2=1145052&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java (original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java Mon Jul 11 07:34:11 2011
@@ -31,6 +31,7 @@ import org.apache.commons.httpclient.met
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.resource.URIResolver;
public final class Client {
@@ -64,7 +65,8 @@ public final class Client {
System.out.println("Sent HTTP PUT request to update customer info");
Client client = new Client();
String inputFile = client.getClass().getResource("update_customer.xml").getFile();
- File input = new File(inputFile);
+ URIResolver resolver = new URIResolver(inputFile);
+ File input = new File(resolver.getURI());
PutMethod put = new PutMethod("http://localhost:9000/customerservice/customers");
RequestEntity entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
put.setRequestEntity(entity);
@@ -85,7 +87,8 @@ public final class Client {
System.out.println("\n");
System.out.println("Sent HTTP POST request to add customer");
inputFile = client.getClass().getResource("add_customer.xml").getFile();
- input = new File(inputFile);
+ resolver = new URIResolver(inputFile);
+ input = new File(resolver.getURI());
PostMethod post = new PostMethod("http://localhost:9000/customerservice/customers");
post.addRequestHeader("Accept" , "text/xml");
entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");