Author: dkulp
Date: Thu Jan 17 12:14:49 2008
New Revision: 612964
URL: http://svn.apache.org/viewvc?rev=612964&view=rev
Log:
Merged revisions 612955 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r612955 | dkulp | 2008-01-17 15:02:47 -0500 (Thu, 17 Jan 2008) | 2 lines
Add bean id's for all the beans so if the extension is imported twice, beans
don't get recreated and overwrite anything from the first instance.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
incubator/cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/cxf/cxf-extension-management.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
Thu Jan 17 12:14:49 2008
@@ -24,7 +24,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.binding.http.HttpBindingFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.binding.http.HttpBindingFactory"
+ id="org.apache.cxf.binding.http.HttpBindingFactory"
+ lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://apache.org/cxf/binding/http</value>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
Thu Jan 17 12:14:49 2008
@@ -22,7 +22,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.binding.jbi.JBIBindingFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.binding.jbi.JBIBindingFactory"
+ id="org.apache.cxf.binding.jbi.JBIBindingFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="activationNamespaces">
<set>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
Thu Jan 17 12:14:49 2008
@@ -25,6 +25,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
<bean class="org.apache.cxf.binding.object.ObjectBindingFactory"
+ id="org.apache.cxf.binding.object.ObjectBindingFactory"
lazy-init="true"
depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" >
<property name="bus" ref="cxf"/>
<property name="activationNamespaces">
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
Thu Jan 17 12:14:49 2008
@@ -24,7 +24,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.binding.soap.SoapBindingFactory"
lazy-init="true">
+ <bean id="org.apache.cxf.binding.soap.SoapBindingFactory"
+ class="org.apache.cxf.binding.soap.SoapBindingFactory"
lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://schemas.xmlsoap.org/soap/</value>
@@ -37,7 +38,9 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.binding.soap.SoapTransportFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.binding.soap.SoapTransportFactory"
+ id="org.apache.cxf.binding.soap.SoapTransportFactory"
+ lazy-init="true">
<property name="transportIds">
<list>
<value>http://schemas.xmlsoap.org/soap/</value>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
Thu Jan 17 12:14:49 2008
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.binding.xml.XMLBindingFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.binding.xml.XMLBindingFactory"
+ id="org.apache.cxf.binding.xml.XMLBindingFactory"
+ lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://cxf.apache.org/bindings/xformat</value>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
Thu Jan 17 12:14:49 2008
@@ -24,5 +24,6 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean
class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
lazy-init="false"/>
+ <bean
class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
+ id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
lazy-init="false"/>
</beans>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/cxf/cxf-extension-management.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/cxf/cxf-extension-management.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/cxf/cxf-extension-management.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/cxf/cxf-extension-management.xml
Thu Jan 17 12:14:49 2008
@@ -23,7 +23,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl"
class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
+ <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl"
+ class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="false"/>
<property name="threaded" value="false"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
Thu Jan 17 12:14:49 2008
@@ -26,6 +26,7 @@
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
+ id="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
lazy-init="false"
depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory">
<property name="bus" ref="cxf"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
Thu Jan 17 12:14:49 2008
@@ -23,8 +23,10 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean
class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
- <bean
class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
+ <bean
class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"
+ id="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
+ <bean
class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"
+ id="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
<bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
Thu Jan 17 12:14:49 2008
@@ -23,7 +23,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory">
+ <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"
+ id="org.apache.cxf.transport.servlet.ServletTransportFactory">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<set>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
Thu Jan 17 12:14:49 2008
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.transport.jbi.JBITransportFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.transport.jbi.JBITransportFactory"
+ id="org.apache.cxf.transport.jbi.JBITransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
Thu Jan 17 12:14:49 2008
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.transport.jms.JMSTransportFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.transport.jms.JMSTransportFactory"
+ id="org.apache.cxf.transport.jms.JMSTransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
Thu Jan 17 12:14:49 2008
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean class="org.apache.cxf.transport.local.LocalTransportFactory"
lazy-init="true">
+ <bean class="org.apache.cxf.transport.local.LocalTransportFactory"
+ id="org.apache.cxf.transport.local.LocalTransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
Thu Jan 17 12:14:49 2008
@@ -22,11 +22,13 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean
class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
+ <bean
class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"
+ id="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
<constructor-arg ref="cxf"/>
</bean>
- <bean
class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
+ <bean
class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"
+
id="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
<bean
id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder">
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/resources/META-INF/cxf/cxf-extension-policy.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
Thu Jan 17 12:14:49 2008
@@ -31,7 +31,8 @@
</constructor-arg>
</bean>
- <bean class="org.apache.cxf.ws.policy.PolicyConstants"/>
+ <bean class="org.apache.cxf.ws.policy.PolicyConstants"
+ id="org.apache.cxf.ws.policy.PolicyConstants"/>
<bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry"
class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl">
<constructor-arg>
@@ -52,7 +53,8 @@
</constructor-arg>
</bean>
- <bean
class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
+ <bean
class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"
+
id="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
<bean id="org.apache.cxf.ws.policy.PolicyBuilder"
class="org.apache.cxf.ws.policy.PolicyBuilderImpl">
<property name="bus" ref="cxf"/>
@@ -63,17 +65,21 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean
class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
+ <bean
class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"
+
id="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
<constructor-arg ref="cxf"/>
</bean>
- <bean
class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
+ <bean
class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"
+ id="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
<constructor-arg ref="cxf"/>
</bean>
<!-- MTOM Policy Support -->
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
+ <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"
+ id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
+ <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
</beans>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/resources/META-INF/cxf/cxf-extension-rm.xml?rev=612964&r1=612963&r2=612964&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
Thu Jan 17 12:14:49 2008
@@ -27,7 +27,8 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
+ <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
<constructor-arg><ref bean="cxf"/></constructor-arg>
</bean>
