Author: dkulp
Date: Tue Jun 30 13:25:07 2009
New Revision: 789712
URL: http://svn.apache.org/viewvc?rev=789712&view=rev
Log:
Merged revisions 789704 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r789704 | dkulp | 2009-06-30 09:13:33 -0400 (Tue, 30 Jun 2009) | 2 lines
[CXF-2210] Change JSR250BeanPostProcess to check the context itself to
see if Spring is handling the JSR250 annotations.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
cxf/branches/2.2.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 13:25:07 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=789712&r1=789711&r2=789712&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Tue Jun 30 13:25:07 2009
@@ -24,9 +24,7 @@
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;
@@ -45,18 +43,20 @@
private ApplicationContext context;
- private Bus bus;
+ private boolean isProcessing = true;
Jsr250BeanPostProcessor() {
}
- @Resource
- public void setBus(Bus b) {
- bus = b;
- }
-
public void setApplicationContext(ApplicationContext arg0) throws
BeansException {
- context = arg0;
+ context = arg0;
+ try {
+ Class<?> cls = Class
+
.forName("org.springframework.context.annotation.CommonAnnotationBeanPostProcessor");
+ isProcessing = context.getBeanNamesForType(cls, true,
false).length == 0;
+ } catch (ClassNotFoundException e) {
+ isProcessing = true;
+ }
}
public int getOrder() {
@@ -64,7 +64,7 @@
}
public Object postProcessAfterInitialization(Object bean, String beanId)
throws BeansException {
- if (bus != null) {
+ if (!isProcessing) {
return bean;
}
if (bean != null) {
@@ -82,7 +82,7 @@
}
public Object postProcessBeforeInitialization(Object bean, String beanId)
throws BeansException {
- if (bus != null) {
+ if (!isProcessing) {
return bean;
}
if (bean != null) {
@@ -92,7 +92,7 @@
}
public void postProcessBeforeDestruction(Object bean, String beanId) {
- if (bus != null) {
+ if (!isProcessing) {
return;
}
if (bean != null) {
Modified:
cxf/branches/2.2.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml?rev=789712&r1=789711&r2=789712&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml
Tue Jun 30 13:25:07 2009
@@ -19,10 +19,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:foo="http://cxf.apache.org/configuration/foo";
+ xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
+ <!-- For Testing using the Swing commons processor, uncomment one of:
+ <bean
class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
+ <context:annotation-config/>
+ -->
<bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
<bean id="org.apache.cxf.bus.spring.BusApplicationListener"
class="org.apache.cxf.bus.spring.BusApplicationListener"/>
<bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"
class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
