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 2008/12/22 16:06:33 UTC
svn commit: r728708 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/
rt/javascript/s...
Author: sergeyb
Date: Mon Dec 22 07:06:32 2008
New Revision: 728708
URL: http://svn.apache.org/viewvc?rev=728708&view=rev
Log:
Merged revisions 728696 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r728696 | sergeyb | 2008-12-22 14:02:18 +0000 (Mon, 22 Dec 2008) | 1 line
JAXRS : fixing resource injection issue which leads to JAXWS WebServiceContext being lost if jaxws:endpoint is initialized first
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalMessageContext.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 22 07:06:32 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalMessageContext.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalMessageContext.java?rev=728708&r1=728707&r2=728708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalMessageContext.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalMessageContext.java Mon Dec 22 07:06:32 2008
@@ -35,47 +35,47 @@
implements MessageContext {
public Object get(Object key) {
- return get().get(key);
+ return get() != null ? get().get(key) : null;
}
public <T> T getContext(Class<T> contextClass) {
- return get().getContext(contextClass);
+ return get() != null ? get().getContext(contextClass) : null;
}
public HttpHeaders getHttpHeaders() {
- return get().getHttpHeaders();
+ return get() != null ? get().getHttpHeaders() : null;
}
public HttpServletRequest getHttpServletRequest() {
- return get().getHttpServletRequest();
+ return get() != null ? get().getHttpServletRequest() : null;
}
public HttpServletResponse getHttpServletResponse() {
- return get().getHttpServletResponse();
+ return get() != null ? get().getHttpServletResponse() : null;
}
public MessageBodyWorkers getProviders() {
- return get().getProviders();
+ return get() != null ? get().getProviders() : null;
}
public SecurityContext getSecurityContext() {
- return get().getSecurityContext();
+ return get() != null ? get().getSecurityContext() : null;
}
public ServletConfig getServletConfig() {
- return get().getServletConfig();
+ return get() != null ? get().getServletConfig() : null;
}
public ServletContext getServletContext() {
- return get().getServletContext();
+ return get() != null ? get().getServletContext() : null;
}
public UriInfo getUriInfo() {
- return get().getUriInfo();
+ return get() != null ? get().getUriInfo() : null;
}
public Request getRequest() {
- return get().getRequest();
+ return get() != null ? get().getRequest() : null;
}
}
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java?rev=728708&r1=728707&r2=728708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java Mon Dec 22 07:06:32 2008
@@ -79,7 +79,8 @@
fieldProxyMap = new HashMap<Field, ThreadLocalProxy>();
}
fieldProxyMap.put(f, InjectionUtils.createThreadLocalProxy(f.getType()));
- } else if (a.annotationType() == Resource.class) {
+ } else if (a.annotationType() == Resource.class
+ && AnnotationUtils.isContextClass(f.getType())) {
if (resourceFields == null) {
resourceFields = new ArrayList<Field>();
}
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java?rev=728708&r1=728707&r2=728708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java Mon Dec 22 07:06:32 2008
@@ -24,6 +24,7 @@
import java.util.HashSet;
import java.util.Set;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -46,6 +47,7 @@
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.MessageBodyWorkers;
+import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
public final class AnnotationUtils {
@@ -74,7 +76,10 @@
classes.add(Request.class);
classes.add(HttpServletRequest.class);
classes.add(HttpServletResponse.class);
+ classes.add(ServletConfig.class);
classes.add(ServletContext.class);
+ // CXF-specific
+ classes.add(MessageContext.class);
return classes;
}
Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java?rev=728708&r1=728707&r2=728708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java Mon Dec 22 07:06:32 2008
@@ -85,7 +85,7 @@
Notifier notifier =
testUtilities.rhinoCallConvert("testMtoMReply", Notifier.class,
testUtilities.javaToJS(getAddress()));
- boolean notified = notifier.waitForJavascript(1000 * 10);
+ boolean notified = notifier.waitForJavascript(1000 * 30);
assertTrue(notified);
Integer errorStatus = testUtilities.rhinoEvaluateConvert("globalErrorStatus", Integer.class);
String errorText = testUtilities.rhinoEvaluateConvert("globalErrorStatusText", String.class);
Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java?rev=728708&r1=728707&r2=728708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java Mon Dec 22 07:06:32 2008
@@ -22,18 +22,27 @@
import java.util.HashMap;
import java.util.Map;
-import javax.jws.WebService;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+
+import org.apache.cxf.jaxrs.ext.MessageContext;
-@WebService
public class BookStoreSoapRestImpl implements BookStoreJaxrsJaxws {
private Map<Long, Book> books = new HashMap<Long, Book>();
+ @Resource
+ private WebServiceContext jaxwsContext;
+ @Resource
+ private MessageContext jaxrsContext;
+
public BookStoreSoapRestImpl() {
init();
}
public Book getBook(Long id) {
+ System.out.println(getContentType());
return books.get(id);
}
@@ -49,4 +58,17 @@
book.setName("CXF in Action");
books.put(book.getId(), book);
}
+
+ private String getContentType() {
+
+ // TODO : it may be worth indeed to introduce a shared ServiceContext
+ // such that users combining JAXWS and JAXRS won't have to write if/else code
+ HttpServletRequest request = jaxrsContext.getHttpServletRequest();
+ if (request == null) {
+ request = (HttpServletRequest)jaxwsContext.getMessageContext().get(
+ javax.xml.ws.handler.MessageContext.SERVLET_REQUEST);
+ }
+ return request.getContentType();
+ }
+
}