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 2010/11/19 17:21:40 UTC
svn commit: r1036920 - in /cxf/branches/2.3.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Author: sergeyb
Date: Fri Nov 19 16:21:40 2010
New Revision: 1036920
URL: http://svn.apache.org/viewvc?rev=1036920&view=rev
Log:
Merged revisions 1036917 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1036917 | sergeyb | 2010-11-19 16:18:41 +0000 (Fri, 19 Nov 2010) | 1 line
JAX-RS : fixing the build and minor update to improve the contexts injection via setters
........
Added:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java
- copied unchanged from r1036917, cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 16:21:40 2010
@@ -1 +1 @@
-/cxf/trunk:1036840
+/cxf/trunk:1036840,1036917
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java?rev=1036920&r1=1036919&r2=1036920&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java Fri Nov 19 16:21:40 2010
@@ -66,6 +66,7 @@ public abstract class AbstractResourceIn
resourceClass = rClass;
if (serviceClass.isInterface() && resourceClass != null && !resourceClass.isInterface()) {
findContextFields(resourceClass);
+ findContextSetterMethods(resourceClass);
}
}
Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java?rev=1036920&r1=1036919&r2=1036920&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java Fri Nov 19 16:21:40 2010
@@ -24,14 +24,18 @@ import java.util.Map;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-public class BookStoreNoAnnotationsImpl implements BookStoreNoAnnotationsInterface {
+public class BookStoreNoAnnotationsImpl implements BookStoreNoAnnotationsInterface,
+ HttpHeadersContext {
private Map<Long, Book> books = new HashMap<Long, Book>();
@Context
private UriInfo ui;
+
+ private HttpHeaders hs;
public BookStoreNoAnnotationsImpl() {
Book b = new Book();
@@ -40,8 +44,16 @@ public class BookStoreNoAnnotationsImpl
books.put(b.getId(), b);
}
+ public void setHttpHeaders(HttpHeaders headers) {
+ this.hs = headers;
+ }
+
public Book getBook(Long id) throws BookNotFoundFault {
- if (ui == null) {
+ if (hs == null) {
+ throw new WebApplicationException(Response.serverError().build());
+ }
+ boolean springProxy = hs.getRequestHeader("SpringProxy").contains("true");
+ if (!springProxy && ui == null) {
throw new WebApplicationException(Response.serverError().build());
}
return books.get(id);
Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java?rev=1036920&r1=1036919&r2=1036920&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java Fri Nov 19 16:21:40 2010
@@ -105,6 +105,7 @@ public class JAXRSClientServerProxySprin
URLConnection connect = url.openConnection();
connect.addRequestProperty("Content-Type", "*/*");
connect.addRequestProperty("Accept", "application/xml");
+ connect.addRequestProperty("SpringProxy", "true");
InputStream in = connect.getInputStream();
InputStream expected = getClass()