Author: dkulp
Date: Fri Feb 29 09:07:20 2008
New Revision: 632393
URL: http://svn.apache.org/viewvc?rev=632393&view=rev
Log:
Merged revisions 632089 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r632089 | dkulp | 2008-02-28 13:58:19 -0500 (Thu, 28 Feb 2008) | 2 lines
Fix problems with WebServiceContextResourceResolver not getting registered so
the Context isn't properly injected
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextResourceResolver.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextResourceResolver.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextResourceResolver.java?rev=632393&r1=632392&r2=632393&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextResourceResolver.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextResourceResolver.java
Fri Feb 29 09:07:20 2008
@@ -21,12 +21,29 @@
import java.io.InputStream;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import javax.xml.ws.WebServiceContext;
+import org.apache.cxf.Bus;
+import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
public class WebServiceContextResourceResolver implements ResourceResolver {
+
+ @Resource
+ Bus bus;
+
+ @PostConstruct
+ public void register() {
+ if (bus != null
+ && bus.getExtension(ResourceManager.class) != null) {
+ bus.getExtension(ResourceManager.class).addResourceResolver(this);
+ }
+ }
+
+
public final InputStream getAsStream(final String string) {
return null;