You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2012/11/19 19:19:13 UTC
svn commit: r1411342 - in
/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic: ./
src/main/java/demo/jaxrs/client/ src/main/resources/
Author: gmazza
Date: Mon Nov 19 18:19:12 2012
New Revision: 1411342
URL: http://svn.apache.org/viewvc?rev=1411342&view=rev
Log:
Updated sample to remove antrun plugin.
Added:
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/add_customer.xml
- copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/add_customer.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/update_customer.xml
- copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/update_customer.xml
Removed:
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/add_customer.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/update_customer.xml
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=1411342&r1=1411341&r2=1411342&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml Mon Nov 19 18:19:12 2012
@@ -43,24 +43,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${basedir}/src/main/java/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
- <copy file="${basedir}/src/main/java/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java?rev=1411342&r1=1411341&r2=1411342&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java Mon Nov 19 18:19:12 2012
@@ -64,7 +64,7 @@ public final class Client {
System.out.println("\n");
System.out.println("Sent HTTP PUT request to update customer info");
Client client = new Client();
- String inputFile = client.getClass().getResource("update_customer.xml").getFile();
+ String inputFile = client.getClass().getResource("/update_customer.xml").getFile();
URIResolver resolver = new URIResolver(inputFile);
File input = new File(resolver.getURI());
PutMethod put = new PutMethod("http://localhost:9000/customerservice/customers");
@@ -86,7 +86,7 @@ public final class Client {
// Sent HTTP POST request to add customer
System.out.println("\n");
System.out.println("Sent HTTP POST request to add customer");
- inputFile = client.getClass().getResource("add_customer.xml").getFile();
+ inputFile = client.getClass().getResource("/add_customer.xml").getFile();
resolver = new URIResolver(inputFile);
input = new File(resolver.getURI());
PostMethod post = new PostMethod("http://localhost:9000/customerservice/customers");