Author: jliu
Date: Wed Nov 14 22:57:01 2007
New Revision: 595225
URL: http://svn.apache.org/viewvc?rev=595225&view=rev
Log:
Refactored restful_http_binding demo to make it more consistent with other
demos.
Added:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/ClientMain.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customer.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundDetails.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundFault.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerService.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerServiceImpl.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customers.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomer.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomers.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/index.jaxb
- copied unchanged from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/index.jaxb
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java
- copied, changed from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/package-info.java
Removed:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/README
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/ClientMain.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customer.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundDetails.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundFault.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerService.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerServiceImpl.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customers.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomer.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomers.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/index.jaxb
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/package-info.java
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/add.xml
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/update.xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/add.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/add.xml?rev=595225&r1=595224&r2=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/add.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/add.xml
Wed Nov 14 22:57:01 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/trunk/distribution/src/main/release/samples/restful_http_binding/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/build.xml?rev=595225&r1=595224&r2=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/build.xml
Wed Nov 14 22:57:01 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>
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/ClientMain.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/ClientMain.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/ClientMain.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/client/ClientMain.java
Wed Nov 14 22:57:01 2007
@@ -16,14 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.client;
import org.apache.cxf.binding.http.HttpBindingFactory;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import demo.restful.server.CustomerService;
+import demo.restful.server.Customers;
+import demo.restful.server.Customer;
+
public final class ClientMain {
private ClientMain() { }
-
+
public static void main(String[] args) throws Exception {
JaxWsProxyFactoryBean sf = new JaxWsProxyFactoryBean();
sf.setServiceClass(CustomerService.class);
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customer.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customer.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customer.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customer.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import javax.xml.bind.annotation.XmlRootElement;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundDetails.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundDetails.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundDetails.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundDetails.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import javax.xml.bind.annotation.XmlRootElement;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundFault.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundFault.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerNotFoundFault.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerNotFoundFault.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import javax.xml.ws.WebFault;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerService.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerService.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerService.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerService.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import javax.jws.WebParam;
import javax.jws.WebResult;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerServiceImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerServiceImpl.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/CustomerServiceImpl.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/CustomerServiceImpl.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import java.util.HashMap;
import java.util.Map;
@@ -69,7 +69,7 @@
final Customer createCustomer() {
Customer c = new Customer();
- c.setName("Dan Diephouse");
+ c.setName("John");
c.setId(123);
return c;
}
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customers.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customers.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Customers.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Customers.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import java.util.Collection;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomer.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomer.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomer.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomer.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import javax.xml.bind.annotation.XmlRootElement;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomers.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomers.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/GetCustomers.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/GetCustomers.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import javax.xml.bind.annotation.XmlRootElement;
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/Main.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.acme.customer;
+package demo.restful.server;
import java.io.FileInputStream;
import java.io.OutputStream;
@@ -46,7 +46,7 @@
public final class Main {
private Main() { }
-
+
public static void main(String[] args) throws Exception {
CustomerServiceImpl bs = new CustomerServiceImpl();
@@ -57,9 +57,9 @@
createJsonRestService(bs);
serveHTML();
-
+
System.out.println("Started CustomerService!");
-
+
System.out.println("Server ready...");
Thread.sleep(5 * 60 * 1000);
Copied:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java
(from r595188,
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/package-info.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/package-info.java&r1=595188&r2=595225&rev=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/package-info.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/restful/server/package-info.java
Wed Nov 14 22:57:01 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
[EMAIL PROTECTED](namespace = "http://customer.acme.com";,
[EMAIL PROTECTED](namespace = "http://demo.restful.server";,
elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package com.acme.customer;
+package demo.restful.server;
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/update.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/update.xml?rev=595225&r1=595224&r2=595225&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/update.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/update.xml
Wed Nov 14 22:57:01 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>
