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 2012/08/05 22:12:16 UTC
svn commit: r1369661 - in /cxf/branches/2.6.x-fixes: ./
testutils/src/main/java/org/apache/cxf/customer/bare/
testutils/src/main/java/org/apache/cxf/customer/book/
testutils/src/main/java/org/apache/cxf/customer/wraped/
Author: sergeyb
Date: Sun Aug 5 20:12:15 2012
New Revision: 1369661
URL: http://svn.apache.org/viewvc?rev=1369661&view=rev
Log:
Merged revisions 1369660 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1369660 | sergeyb | 2012-08-05 23:10:21 +0300 (Sun, 05 Aug 2012) | 1 line
Fixing the build failure, mvn install alone did not caught it
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java
cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookService.java
cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrapped.java
cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1369660
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java?rev=1369661&r1=1369660&r2=1369661&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java (original)
+++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java Sun Aug 5 20:12:15 2012
@@ -33,11 +33,6 @@ import org.apache.cxf.customer.Customer;
import org.apache.cxf.customer.CustomerNotFoundDetails;
import org.apache.cxf.customer.CustomerNotFoundFault;
import org.apache.cxf.customer.Customers;
-import org.codehaus.jra.Delete;
-import org.codehaus.jra.Get;
-import org.codehaus.jra.HttpResource;
-import org.codehaus.jra.Post;
-import org.codehaus.jra.Put;
// END SNIPPET: service
@WebService(targetNamespace = "http://cxf.apache.org/jra")
@@ -53,8 +48,6 @@ public class CustomerService {
customers.put(customer.getId(), customer);
}
- @Get
- @HttpResource(location = "/customers")
@WebMethod
@WebResult(name = "customers")
public Customers getCustomers(@WebParam(name = "GetCustomers") GetCustomers req) {
@@ -68,8 +61,6 @@ public class CustomerService {
return cbean;
}
- @Get
- @HttpResource(location = "/customers/{id}")
@WebMethod
@WebResult(name = "customer")
public Customer getCustomer(@WebParam(name = "getCustomer") GetCustomer getCustomer)
@@ -83,23 +74,17 @@ public class CustomerService {
return c;
}
- @Get
- @HttpResource(location = "/customers/details/{id}")
@WebMethod
public String getSomeDetails(@WebParam(name = "getSomeDetails") GetCustomer getCustomer)
throws CustomerNotFoundFault {
return "some details";
}
- @Put
- @HttpResource(location = "/customers/{id}")
@WebMethod
public void updateCustomer(@WebParam(name = "customer") Customer c) {
customers.put(c.getId(), c);
}
- @Post
- @HttpResource(location = "/customers")
@WebMethod
public void addCustomer(@WebParam(name = "customer") Customer c) {
long id = ++currentId;
@@ -108,8 +93,6 @@ public class CustomerService {
customers.put(id, c);
}
- @Delete
- @HttpResource(location = "/customers/{id}")
@WebMethod
public void deleteCustomer(long id) {
customers.remove(id);
Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookService.java?rev=1369661&r1=1369660&r2=1369661&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookService.java (original)
+++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookService.java Sun Aug 5 20:12:15 2012
@@ -23,46 +23,28 @@ import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-import org.codehaus.jra.Delete;
-import org.codehaus.jra.Get;
-import org.codehaus.jra.HttpResource;
-import org.codehaus.jra.Post;
-import org.codehaus.jra.Put;
-
@WebService(targetNamespace = "http://book.acme.com")
public interface BookService {
- @Get
- @HttpResource(location = "/books")
@WebResult(name = "Books")
Books getBooks();
- @Get
- @HttpResource(location = "/books/{id}")
@WebResult(name = "Book")
Book getBook(@WebParam(name = "GetBook")
GetBook getBook) throws BookNotFoundFault;
- @Get
- @HttpResource(location = "/books/another/{id}")
@WebResult(name = "Book")
Book getAnotherBook(@WebParam(name = "GetAnotherBook")
GetAnotherBook getAnotherBook) throws BookNotFoundFault;
- @Put
- @HttpResource(location = "/books/{id}")
void updateBook(@WebParam(name = "Book")
Book c);
- @Post
- @HttpResource(location = "/books")
@WebResult(name = "book")
long addBook(@WebParam(name = "Book")
Book c);
- @Delete
- @HttpResource(location = "/books/{id}")
void deleteBook(@WebParam(name = "id")
long id) throws BookNotFoundFault;
Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrapped.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrapped.java?rev=1369661&r1=1369660&r2=1369661&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrapped.java (original)
+++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrapped.java Sun Aug 5 20:12:15 2012
@@ -24,15 +24,10 @@ import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-import org.codehaus.jra.Get;
-import org.codehaus.jra.HttpResource;
-
@WebService(targetNamespace = "http://book.customer.cxf.apache.org/")
public interface BookServiceWrapped {
- @Get
- @HttpResource(location = "/books/{id}")
@WebResult(name = "Book")
Book getBook(@WebParam(name = "id")long bookid) throws BookNotFoundFault;
Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java?rev=1369661&r1=1369660&r2=1369661&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java (original)
+++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java Sun Aug 5 20:12:15 2012
@@ -28,11 +28,6 @@ import javax.jws.WebService;
import org.apache.cxf.customer.Customer;
import org.apache.cxf.customer.Customers;
-import org.codehaus.jra.Delete;
-import org.codehaus.jra.Get;
-import org.codehaus.jra.HttpResource;
-import org.codehaus.jra.Post;
-import org.codehaus.jra.Put;
// END SNIPPET: service
@WebService(targetNamespace = "http://cxf.apache.org/jra")
@@ -45,8 +40,6 @@ public class CustomerService {
customers.put(customer.getId(), customer);
}
- @Get
- @HttpResource(location = "/customers")
@WebMethod
@WebResult(name = "customers")
public Customers getCustomers() {
@@ -55,24 +48,18 @@ public class CustomerService {
return cbean;
}
- @Get
- @HttpResource(location = "/customers/{id}")
@WebMethod
@WebResult(name = "customer")
public Customer getCustomer(@WebParam(name = "id") Long id) {
return customers.get(id);
}
- @Put
- @HttpResource(location = "/customers/{id}")
@WebMethod
public void updateCustomer(@WebParam(name = "id") String id,
@WebParam(name = "customer") Customer c) {
customers.put(c.getId(), c);
}
- @Post
- @HttpResource(location = "/customers")
@WebMethod
public void addCustomer(@WebParam(name = "customer") Customer c) {
long id = ++currentId;
@@ -81,8 +68,6 @@ public class CustomerService {
customers.put(id, c);
}
- @Delete
- @HttpResource(location = "/customers/{id}")
@WebMethod
public void deleteCustomer(String id) {
customers.remove(new Long(id));