Author: ningjiang
Date: Mon Sep 3 22:45:17 2007
New Revision: 572532
URL: http://svn.apache.org/viewvc?rev=572532&view=rev
Log:
Fixed the spring configuration's bus attribute setting bug
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=572532&r1=572531&r2=572532&view=diff
==============================================================================
---
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Mon Sep 3 22:45:17 2007
@@ -69,10 +69,15 @@
} else if ("abstract".equals(name)) {
bean.setAbstract(true);
} else if (!"id".equals(name) && !"name".equals(name)) {
- if ("bus".equals(name)) {
- setBus = true;
- }
- mapAttribute(bean, element, name, val);
+ if ("bus".equals(name)) {
+ if (val != null && val.trim().length() > 0
+ && ctx.getRegistry().containsBeanDefinition(val)) {
+ bean.addPropertyReference(name, val);
+ setBus = true;
+ }
+ } else {
+ mapAttribute(bean, element, name, val);
+ }
}
}
return setBus;
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml?rev=572532&r1=572531&r2=572532&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
Mon Sep 3 22:45:17 2007
@@ -54,7 +54,8 @@
<jaxws:server id="inlineInvoker"
serviceClass="org.apache.hello_world_soap_http.GreeterImpl"
- address="http://localhost:8080/simpleWithAddress";>
+ address="http://localhost:8080/simpleWithAddress";
+ bus="cxf" >
<jaxws:invoker>
<bean class="org.apache.cxf.service.invoker.BeanInvoker">
<constructor-arg>
