Author: sergeyb
Date: Fri Feb 3 17:39:00 2012
New Revision: 1240255
URL: http://svn.apache.org/viewvc?rev=1240255&view=rev
Log:
Merged revisions 1240252 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1240252 | sergeyb | 2012-02-03 17:34:33 +0000 (Fri, 03 Feb 2012) | 1 line
Updating the client proxy to ignore the Context parameters
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 3 17:39:00 2012
@@ -1 +1 @@
-/cxf/trunk:1236624,1236769,1236849,1237715,1238046,1239365,1240136
+/cxf/trunk:1236624,1236769,1236849,1237715,1238046,1239365,1240136,1240252
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1240255&r1=1240254&r2=1240255&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Fri Feb 3 17:39:00 2012
@@ -205,7 +205,8 @@ public class ClientProxyImpl extends Abs
}
for (Parameter p : parameters) {
if (p.getType() == ParameterType.CONTEXT) {
- reportInvalidResourceMethod(ori.getMethodToInvoke(),
"NO_CONTEXT_PARAMETERS");
+ // ignore
+ continue;
}
map.add(p.getType(), p);
}
Modified:
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java?rev=1240255&r1=1240254&r2=1240255&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
Fri Feb 3 17:39:00 2012
@@ -32,7 +32,9 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
public interface BookSubresource {
@@ -42,6 +44,11 @@ public interface BookSubresource {
Book getTheBook() throws BookNotFoundFault;
@GET
+ @Path("/subresource")
+ @Produces("application/xml")
+ Book getTheBookWithContext(@Context UriInfo ui) throws BookNotFoundFault;
+
+ @GET
@Path("/subresource/noproduces")
Book getTheBookNoProduces() throws BookNotFoundFault;
Modified:
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java?rev=1240255&r1=1240254&r2=1240255&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
Fri Feb 3 17:39:00 2012
@@ -21,6 +21,8 @@ package org.apache.cxf.systest.jaxrs;
import java.util.List;
+import javax.ws.rs.core.UriInfo;
+
public class BookSubresourceImpl implements BookSubresource {
@@ -101,4 +103,9 @@ public class BookSubresourceImpl impleme
return order;
}
+ @Override
+ public Book getTheBookWithContext(UriInfo ui) throws BookNotFoundFault {
+ return getTheBook();
+ }
+
}
Modified:
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java?rev=1240255&r1=1240254&r2=1240255&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
Fri Feb 3 17:39:00 2012
@@ -89,7 +89,7 @@ public class JAXRSSoapBookTest extends A
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerRestSoap.class, true));
+ launchServer(BookServerRestSoap.class));
}
@Test
@@ -457,6 +457,18 @@ public class JAXRSSoapBookTest extends A
}
@Test
+ public void testGetBookSubresourceClientWithContext() throws Exception {
+
+ String baseAddress = "http://localhost:"; + PORT +
"/test/services/rest";
+ BookStoreJaxrsJaxws proxy = JAXRSClientFactory.create(baseAddress,
+
BookStoreJaxrsJaxws.class);
+ BookSubresource bs = proxy.getBookSubresource("125");
+ Book b = bs.getTheBookWithContext(null);
+ assertEquals(125, b.getId());
+ assertEquals("CXF in Action", b.getName());
+ }
+
+ @Test
public void testGetBookSubresourceClientNoProduces() throws Exception {
String baseAddress = "http://localhost:"; + PORT +
"/test/services/rest";
