Author: dkulp
Date: Thu Oct 9 19:09:07 2008
New Revision: 703313
URL: http://svn.apache.org/viewvc?rev=703313&view=rev
Log:
Merged revisions 703309 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r703309 | dkulp | 2008-10-09 21:28:47 -0400 (Thu, 09 Oct 2008) | 2 lines
[CXF-1809] If springs CommonAnnotation thing is turned on, let it do the
@Resource/@PostConstruct stuff.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 9 19:09:07 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
+/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
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=703313&r1=703312&r2=703313&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Thu Oct 9 19:09:07 2008
@@ -24,6 +24,9 @@
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
+import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.ResourceInjector;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.resource.ResourceManager;
@@ -42,9 +45,16 @@
private ApplicationContext context;
+ private Bus bus;
+
Jsr250BeanPostProcessor() {
}
+ @Resource
+ public void setBus(Bus b) {
+ bus = b;
+ }
+
public void setApplicationContext(ApplicationContext arg0) throws
BeansException {
context = arg0;
}
@@ -54,6 +64,9 @@
}
public Object postProcessAfterInitialization(Object bean, String beanId)
throws BeansException {
+ if (bus != null) {
+ return bean;
+ }
if (bean != null) {
new ResourceInjector(resourceManager, resolvers).construct(bean);
}
@@ -69,6 +82,9 @@
}
public Object postProcessBeforeInitialization(Object bean, String beanId)
throws BeansException {
+ if (bus != null) {
+ return bean;
+ }
if (bean != null) {
new ResourceInjector(resourceManager, resolvers).inject(bean);
}
@@ -76,6 +92,9 @@
}
public void postProcessBeforeDestruction(Object bean, String beanId) {
+ if (bus != null) {
+ return;
+ }
if (bean != null) {
new ResourceInjector(resourceManager, resolvers).destroy(bean);
}
Modified:
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=703313&r1=703312&r2=703313&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Thu Oct 9 19:09:07 2008
@@ -457,9 +457,10 @@
protected void retrieveListenerFactory() {
if (tlsServerParameters != null) {
- if (null != connector && !(connector instanceof
SslSocketConnector)) {
- throw new RuntimeException("Connector " + connector + " for
JettyServerEngine Port "
- + port + " does not support SSL connections.");
+ if (null != connector && !(connector instanceof
SslSocketConnector)) {
+ LOG.warning("Connector " + connector + " for JettyServerEngine
Port "
+ + port + " does not support SSL connections.");
+ return;
}
connectorFactory =
getHTTPSConnectorFactory(tlsServerParameters);
