Author: dkulp
Date: Thu Nov 15 08:53:55 2007
New Revision: 595353

URL: http://svn.apache.org/viewvc?rev=595353&view=rev
Log:
Merged revisions 595225 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r595225 | jliu | 2007-11-15 01:57:01 -0500 (Thu, 15 Nov 2007) | 1 line
  
  Refactored restful_http_binding demo to make it more consistent with other demos.
........

Added:
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/
      - copied from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/
      - copied from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/
      - copied from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/
      - copied from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/index.jaxb
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/index.jaxb
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java
      - copied unchanged from r595225, incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java
Removed:
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/README
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/ClientMain.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customer.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundDetails.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundFault.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerService.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerServiceImpl.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customers.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomer.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomers.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/index.jaxb
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/package-info.java
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/add.xml
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/build.xml
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/update.xml

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

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/add.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/add.xml?rev=595353&r1=595352&r2=595353&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/add.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/add.xml Thu Nov 15 08:53:55 2007
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<customer xmlns="http://customer.acme.com">
+<customer xmlns="http://server.restful.demo">
 <name>Jim Bob</name>
 </customer>

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/build.xml?rev=595353&r1=595352&r2=595353&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/build.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/build.xml Thu Nov 15 08:53:55 2007
@@ -23,11 +23,11 @@
     <import file="../common_build.xml"/>        
         
     <target name="client" description="run demo client" depends="build">
-        <cxfrun classname="com.acme.customer.ClientMain"/>
+        <cxfrun classname="demo.restful.client.ClientMain"/>
     </target> 
         
     <target name="server" description="run demo server" depends="build">
-        <cxfrun classname="com.acme.customer.Main"/>
+        <cxfrun classname="demo.restful.server.Main"/>
     </target>
 
 </project>

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/update.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/update.xml?rev=595353&r1=595352&r2=595353&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/update.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/restful_http_binding/update.xml Thu Nov 15 08:53:55 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<customer xmlns="http://customer.acme.com">
+<customer xmlns="http://server.restful.demo">
 <id>123</id>
-<name>Danno Manno</name>
+<name>Danno</name>
 </customer>