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:18:41 UTC
svn commit: r1036917 - in /cxf/trunk:
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:18:41 2010
New Revision: 1036917
URL: http://svn.apache.org/viewvc?rev=1036917&view=rev
Log:
JAX-RS : fixing the build and minor update to improve the contexts injection via setters
Added:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java (with props)
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java?rev=1036917&r1=1036916&r2=1036917&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java Fri Nov 19 16:18:41 2010
@@ -66,6 +66,7 @@ public abstract class AbstractResourceIn
resourceClass = rClass;
if (serviceClass.isInterface() && resourceClass != null && !resourceClass.isInterface()) {
findContextFields(resourceClass);
+ findContextSetterMethods(resourceClass);
}
}
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java?rev=1036917&r1=1036916&r2=1036917&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java Fri Nov 19 16:18:41 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);
Added: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java?rev=1036917&view=auto
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java (added)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java Fri Nov 19 16:18:41 2010
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+
+public interface HttpHeadersContext {
+ @Context
+ void setHttpHeaders(HttpHeaders sc);
+}
Propchange: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/HttpHeadersContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java?rev=1036917&r1=1036916&r2=1036917&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java Fri Nov 19 16:18:41 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()