[jbossws-commits] JBossWS SVN: r6746 - in stack/cxf/trunk: modules/client/src/main/resources/META-INF and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Apr 29 07:08:57 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-04-29 07:08:57 -0400 (Tue, 29 Apr 2008)
New Revision: 6746
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2160] upgrading to CXF 2.1
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-29 11:08:57 UTC (rev 6746)
@@ -1,10 +0,0 @@
-Apache CXF is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,5 +24,8 @@
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"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
+ id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
</beans>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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,9 +53,11 @@
</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"/>
<property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/>
</bean>
@@ -62,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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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>
@@ -53,7 +56,7 @@
<property name="customEditors">
<map>
<entry key="org.apache.cxf.binding.soap.SoapVersion">
- <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/>
+ <bean class="org.apache.cxf.binding.soap.SoapVersionEditor"/>
</entry>
</map>
</property>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,17 +24,17 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
<bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
- <constructor-arg>
+ <property name="resolvers">
<list>
<bean class="org.apache.cxf.resource.ClasspathResolver"/>
<bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
<bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
</list>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.configuration.Configurer"
@@ -42,32 +42,32 @@
</bean>
<bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.binding.BindingFactory"/>
<property name="idsProperty" value="activationNamespaces"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
@@ -96,14 +96,14 @@
<bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
- <constructor-arg ref="cxf"/>
- <constructor-arg>
+ <property name="bus" ref="cxf"/>
+ <property name="queryHandlers">
<list>
<bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
- <constructor-arg ref="cxf"/>
+ <property name="bus" ref="cxf"/>
</bean>
</list>
- </constructor-arg>
+ </property>
</bean>
<bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
@@ -115,4 +115,8 @@
<bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
<property name="bus" ref="cxf"/>
</bean>
+
+ <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
</beans>
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-29 11:08:57 UTC (rev 6746)
@@ -1,10 +0,0 @@
-Apache CXF is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,5 +24,8 @@
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"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
+ id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
</beans>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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,9 +53,11 @@
</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"/>
<property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/>
</bean>
@@ -62,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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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>
@@ -53,7 +56,7 @@
<property name="customEditors">
<map>
<entry key="org.apache.cxf.binding.soap.SoapVersion">
- <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/>
+ <bean class="org.apache.cxf.binding.soap.SoapVersionEditor"/>
</entry>
</map>
</property>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -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: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,17 +24,17 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
<bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
- <constructor-arg>
+ <property name="resolvers">
<list>
<bean class="org.apache.cxf.resource.ClasspathResolver"/>
<bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
<bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
</list>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.configuration.Configurer"
@@ -42,32 +42,32 @@
</bean>
<bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.binding.BindingFactory"/>
<property name="idsProperty" value="activationNamespaces"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
@@ -96,14 +96,14 @@
<bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
- <constructor-arg ref="cxf"/>
- <constructor-arg>
+ <property name="bus" ref="cxf"/>
+ <property name="queryHandlers">
<list>
<bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
- <constructor-arg ref="cxf"/>
+ <property name="bus" ref="cxf"/>
</bean>
</list>
- </constructor-arg>
+ </property>
</bean>
<bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
@@ -115,4 +115,8 @@
<bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
<property name="bus" ref="cxf"/>
</bean>
+
+ <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
</beans>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/pom.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -100,7 +100,7 @@
<!-- Properties -->
<properties>
- <cxf.version>2.0.5-incubator</cxf.version>
+ <cxf.version>2.1</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version>
@@ -113,9 +113,10 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <jaxws.api.version>2.0</jaxws.api.version>
+ <jaxws.api.version>2.1-1</jaxws.api.version>
<juddi.service.version>1.2.0.GA</juddi.service.version>
<saaj.api.version>1.3</saaj.api.version>
+ <fastinfoset.api.version>1.2.2</fastinfoset.api.version>
</properties>
<!-- DependencyManagement -->
@@ -235,11 +236,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -284,6 +280,11 @@
<version>${jaxws.api.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>${fastinfoset.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>${cxf.stax.version}</version>
Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -49,6 +49,7 @@
<include name="**/wstx.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
+ <include name="**/FastInfoset.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -85,6 +86,7 @@
<include name="**/wsdl4j.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
+ <include name="**/FastInfoset.jar"/>
</patternset>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -84,6 +84,7 @@
<include>*:wsdl4j:jar</include>
<include>*:xml-resolver:jar</include>
<include>*:XmlSchema:jar</include>
+ <include>*:FastInfoset:jar</include>
</includes>
</dependencySet>
<dependencySet>
More information about the jbossws-commits
mailing list