svn commit: r1411343 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/jax_rs/basic/ distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/ distribution/src/main/release/samples/jax_rs/basic/src/main/...

[gmazza]

Author: gmazza
Date: Mon Nov 19 18:20:32 2012
New Revision: 1411343

URL: http://svn.apache.org/viewvc?rev=1411343&view=rev
Log:
Merged revisions 1411342 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1411342 | gmazza | 2012-11-19 13:19:12 -0500 (Mon, 19 Nov 2012) | 1 line
  
  Updated sample to remove antrun plugin.
........

Added:
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/
      - copied from r1411342, 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/add_customer.xml
      - copied unchanged from r1411342, 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/add_customer.xml
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/update_customer.xml
      - copied unchanged from r1411342, 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/resources/update_customer.xml
Removed:
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/add_customer.xml
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/update_customer.xml
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
    
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=1411343&r1=1411342&r2=1411343&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
 (original)
+++ 
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
 Mon Nov 19 18:20:32 2012
@@ -43,24 +43,6 @@
                     <target>1.5</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/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java?rev=1411343&r1=1411342&r2=1411343&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
 Mon Nov 19 18:20:32 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";);