Author: ningjiang Date: Thu Oct 9 23:51:30 2008 New Revision: 703338 URL: http://svn.apache.org/viewvc?rev=703338&view=rev Log: Merged revisions 703313 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r703313 | dkulp | 2008-10-10 10:09:07 +0800 (Fri, 10 Oct 2008) | 9 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=703338&r1=703337&r2=703338&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java Thu Oct 9 23:51:30 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.0.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.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=703338&r1=703337&r2=703338&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Thu Oct 9 23:51:30 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);
