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

Wed, 10 Dec 2008 08:44:43 -0800 

Author: seanoc
Date: Wed Dec 10 08:44:17 2008
New Revision: 725332

URL: http://svn.apache.org/viewvc?rev=725332&view=rev
Log:
Fix for CXF-748

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

Modified: 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/README.txt
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/README.txt?rev=725332&r1=725331&r2=725332&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/README.txt 
(original)
+++ 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/README.txt 
Wed Dec 10 08:44:17 2008
@@ -7,7 +7,7 @@
 The JAX-RS server is configured with a HTTPS listener. The listener 
 requires client authentication so the client must provide suitable 
 credentials. The listener configuration is taken from the 
-"CherryServer.cxf" file located under demo directory.  
+"CherryServer.xml" file located under demo directory.  
 
 The client is configured to provide its certificate "CN=Wibble" and
 chain stored in the Java KeyStore "certs/wibble.jks" to the server. The

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=725332&r1=725331&r2=725332&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 
Wed Dec 10 08:44:17 2008
@@ -29,7 +29,7 @@
     </target> 
         
     <target name="server" description="run demo server" depends="build">
-        <cxfrun classname="demo.jaxrs.server.Server"  
jvmarg1="-Dcxf.config.file=CherryServer.cxf"/>
+        <cxfrun classname="demo.jaxrs.server.Server"  
jvmarg1="-Dcxf.config.file=CherryServer.xml"/>
     </target>
     
     <target name="compile" depends="maybe.generate.code">

Modified: 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/Client.java?rev=725332&r1=725331&r2=725332&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/Client.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/Client.java
 Wed Dec 10 08:44:17 2008
@@ -61,7 +61,7 @@
         System.out.println("\n");
         System.out.println("Sent HTTPS 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("https://localhost:9000/customerservice/customers";);
         RequestEntity entity = new FileRequestEntity(input, "text/xml; 
charset=ISO-8859-1");
@@ -79,7 +79,7 @@
         // Sent HTTP POST request to add customer
         System.out.println("\n");
         System.out.println("Sent HTTPS 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("https://localhost:9000/customerservice/customers";);
         post.addRequestHeader("Accept" , "text/xml");

Reply via email to