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 2008/12/11 13:18:55 UTC

svn commit: r725671 - in /cxf/trunk/distribution/src/main/release/samples/jax_rs: basic/ basic/src/demo/jaxrs/client/ basic_https/

Author: seanoc
Date: Thu Dec 11 04:18:54 2008
New Revision: 725671

URL: http://svn.apache.org/viewvc?rev=725671&view=rev
Log:
Keep demos consistent using .xml suffixes.

Added:
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml
      - copied unchanged from r725663, cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.txt
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml
      - copied unchanged from r725663, cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.txt
Removed:
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.txt
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.txt
Modified:
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/build.xml

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=725671&r1=725670&r2=725671&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 Thu Dec 11 04:18:54 2008
@@ -30,8 +30,8 @@
 	    	        </goals>
 	    	        <configuration>
 	    	            <tasks>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.txt" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.txt" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
 	    	            </tasks>
 	    	        </configuration>
 	    	    </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java?rev=725671&r1=725670&r2=725671&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java Thu Dec 11 04:18:54 2008
@@ -63,7 +63,7 @@
         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.txt").getFile();
+        String inputFile = client.getClass().getResource("update_customer.xml").getFile();
         File input = new File(inputFile);
         PutMethod put = new PutMethod("http://localhost:9000/customerservice/customers");
         RequestEntity entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
@@ -84,7 +84,7 @@
         // 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.txt").getFile();
+        inputFile = client.getClass().getResource("add_customer.xml").getFile();
         input = new File(inputFile);
         PostMethod post = new PostMethod("http://localhost:9000/customerservice/customers");
         post.addRequestHeader("Accept" , "text/xml");

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/build.xml?rev=725671&r1=725670&r2=725671&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/build.xml Thu Dec 11 04:18:54 2008
@@ -47,8 +47,8 @@
         </javac>
 
         <copy todir="${build.classes.dir}">
-            <fileset dir="${basedir}/src" includes="**/*.xml, **/*.txt" />
-            <fileset dir="${build.src.dir}" includes="**/*.xml, **/*.txt" />
+            <fileset dir="${basedir}/src" includes="**/*.xml />
+            <fileset dir="${build.src.dir}" includes="**/*.xml />
         </copy>
     </target>
 </project>