servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1097694 - in /servicemix/smx4/features/trunk: ./ assembly/src/main/filtered-resources/ camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/ camel/...
Date Fri, 29 Apr 2011 05:52:17 GMT
Author: ffang
Date: Fri Apr 29 05:52:16 2011
New Revision: 1097694

URL: http://svn.apache.org/viewvc?rev=1097694&view=rev
Log:
[SMX4-815]upgrade to cxf 2.4.0

Modified:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
    servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java
    servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
    servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
    servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
    servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/parent/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Fri Apr 29 05:52:16 2011
@@ -46,12 +46,12 @@
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.neethi/neethi/${neethi.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
@@ -227,7 +227,7 @@
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
         <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6.bundle.version}</bundle>
@@ -237,7 +237,7 @@
     </feature>
     <feature name="servicemix-jms" version="${servicemix.components.version}" resolver="(obr)">
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
-        <bundle dependency="true">mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap/${servicemix.components.version}</bundle>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java Fri Apr 29 05:52:16 2011
@@ -17,6 +17,8 @@
 package org.apache.servicemix.camel.nmr;
 
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import javax.naming.Context;
@@ -100,6 +102,9 @@ public class ExceptionHandleTest extends
         CamelTransportFactory camelTransportFactory = (CamelTransportFactory) bus.getExtension(ConduitInitiatorManager.class)
             .getConduitInitiator(CamelTransportFactory.TRANSPORT_ID);
         camelTransportFactory.setCamelContext(camelContext);
+        List<String> ids = new ArrayList<String>();
+        ids.add(CamelTransportFactory.TRANSPORT_ID);
+        camelTransportFactory.setTransportIds(ids);
         smxComponent = new ServiceMixComponent();
         nmr = new ServiceMix();
         ((ServiceMix)nmr).init();

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java Fri Apr 29 05:52:16 2011
@@ -112,7 +112,6 @@ public class WSRMTest extends CamelTestS
     public void testDecoupled() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("/org/apache/servicemix/camel/ws/rm/decoupled.xml");
-        BusFactory.setDefaultBus(bus);
         LoggingInInterceptor in = new LoggingInInterceptor();
         bus.getInInterceptors().add(in);
         bus.getInFaultInterceptors().add(in);

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml Fri Apr 29 05:52:16 2011
@@ -33,9 +33,6 @@
     ">
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
     
     <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
         <property name="bus" ref="cxf"/>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/wsa_interceptors.xml Fri Apr 29 05:52:16 2011
@@ -21,7 +21,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:cxf="http://cxf.apache.org/core"
        xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
   
@@ -31,33 +33,25 @@ http://www.springframework.org/schema/be
 
     <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
 
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:inInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="loggingIn"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
+        </cxf:inFaultInterceptors>
+        <cxf:outInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-    </bean>
+        </cxf:outFaultInterceptors>
+    </cxf:bus>
 
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" 
                   createdFromAPI="true">

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/addr.xml Fri Apr 29 05:52:16 2011
@@ -28,7 +28,7 @@ http://www.springframework.org/schema/be
       <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
     </http:conduit>
 
-    <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
+    <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
         <property name="bus" ref="cxf"/>
         <property name="enabled" value="true"/>
     </bean>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/policy/server.xml Fri Apr 29 05:52:16 2011
@@ -33,9 +33,6 @@
     ">
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
     
     <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
         <property name="bus" ref="cxf"/>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml Fri Apr 29 05:52:16 2011
@@ -20,7 +20,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
+       xmlns:cxf="http://cxf.apache.org/core"
        xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
   
@@ -31,33 +33,24 @@ http://www.springframework.org/schema/be
     <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
     <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
 
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
 
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:inInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
+        </cxf:inFaultInterceptors>
+        <cxf:outInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
-            </list>
-        </property>
-    </bean>
+        </cxf:outFaultInterceptors>
+    </cxf:bus>
 
 </beans>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/message-loss-server.xml Fri Apr 29 05:52:16 2011
@@ -22,7 +22,9 @@
     xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
     xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
     xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+    xmlns:cxf="http://cxf.apache.org/core"
     xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
 http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
@@ -40,41 +42,33 @@ http://www.springframework.org/schema/be
 
     <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
 
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:inInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalIn"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalIn"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
+        </cxf:inFaultInterceptors>
+        <cxf:outInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalOut"/>
                 <ref bean="rmCodec"/>
                 <ref bean="messageLoss"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalOut"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-    </bean>
+        </cxf:outFaultInterceptors>
+    </cxf:bus>
     
     
 

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/rminterceptors.xml Fri Apr 29 05:52:16 2011
@@ -19,7 +19,9 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:cxf="http://cxf.apache.org/core"
        xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
@@ -33,38 +35,30 @@ http://www.springframework.org/schema/be
     <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
 
 
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:inInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalIn"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalIn"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
+        </cxf:inFaultInterceptors>
+        <cxf:outInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalOut"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="rmLogicalOut"/>
                 <ref bean="rmCodec"/>
-            </list>
-        </property>
-    </bean>
+        </cxf:outFaultInterceptors>
+    </cxf:bus>
 </beans>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml Fri Apr 29 05:52:16 2011
@@ -32,10 +32,6 @@
         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
     
     <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
         <property name="bus" ref="cxf"/>
@@ -62,24 +58,22 @@
         <cxf:features>
             <bean class="org.apache.cxf.feature.LoggingFeature"/>
         </cxf:features>
-        <cxf:outInterceptors>
-            <ref bean="mapAggregator"/>
-            <ref bean="mapCodec"/>
-        </cxf:outInterceptors>
         <cxf:inInterceptors>
-            <ref bean="mapCodec"/>
-            <ref bean="mapAggregator"/>
+                <ref bean="mapAggregator"/>
+                <ref bean="mapCodec"/>
         </cxf:inInterceptors>
-        
-        <cxf:outFaultInterceptors>
-            <ref bean="mapAggregator"/>
-            <ref bean="mapCodec"/>
-        </cxf:outFaultInterceptors>
         <cxf:inFaultInterceptors>
-            <ref bean="mapCodec"/>
-            <ref bean="mapAggregator"/>
+                <ref bean="mapAggregator"/>
+                <ref bean="mapCodec"/>
         </cxf:inFaultInterceptors>
-
+        <cxf:outInterceptors>
+                <ref bean="mapAggregator"/>
+                <ref bean="mapCodec"/>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
+                <ref bean="mapAggregator"/>
+                <ref bean="mapCodec"/>
+        </cxf:outFaultInterceptors>
     </cxf:cxfEndpoint>
 
 

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/twoway-endpoint-specific.xml Fri Apr 29 05:52:16 2011
@@ -19,7 +19,9 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:cxf="http://cxf.apache.org/core"
        xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
   
   
@@ -55,24 +57,19 @@ http://www.springframework.org/schema/be
     <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
 
     <!--WS-A Interceptors not required in Fault Chain-->
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:inInterceptors>
                 <ref bean="rmLogicalIn"/>
                 <ref bean="rmCodec"/>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="wrapperClassIn"/>
                 <ref bean="holderIn"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
                 <ref bean="clientFaultConv"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
+        </cxf:inFaultInterceptors>
+        <cxf:outInterceptors>
                 <ref bean="rmLogicalOut"/>
                 <ref bean="rmCodec"/>
                 <ref bean="mapAggregator"/>
@@ -80,17 +77,14 @@ http://www.springframework.org/schema/be
                 <ref bean="wrapperClassOut"/>
                 <ref bean="holderOut"/>
                 <ref bean="messageSender"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
                 <ref bean="rmLogicalOut"/>
                 <ref bean="rmCodec"/>
                 <ref bean="mapAggregator"/>
                 <ref bean="mapCodec"/>
                 <ref bean="messageSender"/>
-            </list>
-        </property>
-    </bean> 
+        </cxf:outFaultInterceptors>
+    </cxf:bus> 
 
 </beans>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml Fri Apr 29 05:52:16 2011
@@ -32,9 +32,6 @@
         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
     
     <bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="true">
         <property name="bus" ref="cxf"/>

Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -30,7 +30,6 @@
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
     <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
     <import resource="classpath:org/apache/servicemix/camel/nmr/camel-nmr.xml" />
 

Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Fri Apr 29 05:52:16 2011
@@ -70,7 +70,7 @@
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.binding,
                             org.apache.cxf.jaxrs.utils,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.springframework.beans.factory.config,
                             org.apache.servicemix.examples.cxf.jaxrs,
                             org.apache.commons.httpclient,

Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -27,8 +27,6 @@ http://cxf.apache.org/jaxrs http://cxf.a
 http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxrs:server id="customerService" address="/crm">

Modified: servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -26,7 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
     <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
 
     <jaxws:endpoint id="helloWorld"

Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Fri Apr 29 05:52:16 2011
@@ -63,7 +63,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.apache.servicemix.util,
                             org.springframework.beans.factory.config
                         </Import-Package>

Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -26,8 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxws:endpoint id="helloWorld"

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml Fri Apr 29 05:52:16 2011
@@ -134,7 +134,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.apache.cxf.feature,
                             org.apache.cxf.interceptor,
                             org.apache.cxf.ws.addressing,

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -31,8 +31,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxws:endpoint id="WsAddressingEndpoint"

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml Fri Apr 29 05:52:16 2011
@@ -95,7 +95,7 @@
                             org.apache.cxf.resource,
                             org.apache.cxf.interceptor, org.apache.cxf.io, org.apache.cxf.message, org.apache.cxf.phase,
                             org.apache.cxf.ws.addressing, org.apache.cxf.ws.rm,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.apache.servicemix.util,
                             org.springframework.beans.factory.config
                         </Import-Package>

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/java/org/apache/servicemix/samples/cxf_ws_rm/MessageLossSimulator.java Fri Apr 29 05:52:16 2011
@@ -106,7 +106,7 @@ public class MessageLossSimulator extend
         @Override
         protected void onFirstWrite() throws IOException {
             if (LOG.isLoggable(Level.FINE)) {
-                BigInteger nr = RMContextUtils.retrieveRMProperties(outMessage, true)
+                Long nr = RMContextUtils.retrieveRMProperties(outMessage, true)
                     .getSequence().getMessageNumber();
                 LOG.fine("Losing message " + nr);
             }

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -35,11 +35,6 @@
           http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-rm.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-addr.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
 
     <jaxws:endpoint id="helloWorld"
                     implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml Fri Apr 29 05:52:16 2011
@@ -68,7 +68,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.apache.cxf.ws.security.wss4j,
                             org.springframework.beans.factory.config,
                             javax.security.auth.callback,

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java Fri Apr 29 05:52:16 2011
@@ -31,7 +31,7 @@ public class ServerPasswordCallback impl
 
         WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
 
-        if (pc.getIdentifer().equals("joe")) {
+        if (pc.getIdentifier().equals("joe")) {
             pc.setPassword("password");
         }
     }

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -26,8 +26,6 @@ under the License.
     http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <bean id="myPasswordCallback" class="org.apache.servicemix.examples.cxf.ServerPasswordCallback"/>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml Fri Apr 29 05:52:16 2011
@@ -90,7 +90,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.springframework.beans.factory.config
                         </Import-Package>
                         <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -30,8 +30,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxws:endpoint id="SoapHandlerEndpoint"

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml Fri Apr 29 05:52:16 2011
@@ -70,7 +70,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.springframework.beans.factory.config,
                             org.apache.servicemix.examples.cxf
                         </Import-Package>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -28,8 +28,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxws:endpoint id="HTTPEndpoint"

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -29,8 +29,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
 
     <jaxws:endpoint id="JMSEndpoint"
         implementor="org.apache.servicemix.examples.cxf_jms_osgi.HelloWorldImpl"

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/pom.xml Fri Apr 29 05:52:16 2011
@@ -92,7 +92,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.springframework.beans.factory.config
                         </Import-Package>
                         <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-mtom-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -28,8 +28,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxws:endpoint id="MtomEndpoint"

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -28,7 +28,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
     <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
 
     <jaxws:endpoint id="NMREndpoint"

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml Fri Apr 29 05:52:16 2011
@@ -90,7 +90,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.springframework.beans.factory.config
                         </Import-Package>
                         <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -28,8 +28,6 @@
         http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <jaxws:endpoint id="SoapHandlerEndpoint"

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml Fri Apr 29 05:52:16 2011
@@ -66,7 +66,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.apache.cxf.ws.security.wss4j,
                             org.springframework.beans.factory.config,
                             javax.security.auth.callback,

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java Fri Apr 29 05:52:16 2011
@@ -31,7 +31,7 @@ public class ServerPasswordCallback impl
 
         WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
 
-        if (pc.getIdentifer().equals("joe")) {
+        if (pc.getIdentifier().equals("joe")) {
             pc.setPassword("password");
         }
     }

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml Fri Apr 29 05:52:16 2011
@@ -26,8 +26,6 @@ under the License.
     http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
     <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
 
     <bean id="myPasswordCallback" class="org.apache.servicemix.examples.cxf.ServerPasswordCallback"/>

Modified: servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml Fri Apr 29 05:52:16 2011
@@ -86,7 +86,7 @@
                             org.apache.cxf.bus.resource,
                             org.apache.cxf.configuration.spring,
                             org.apache.cxf.resource,
-                            org.apache.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http,
                             org.springframework.beans.factory.config
                         </Import-Package>
                         <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Fri Apr 29 05:52:16 2011
@@ -80,8 +80,8 @@
             <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -100,8 +100,8 @@
             <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
+            <groupId>org.apache.ws.xmlschema</groupId>
+            <artifactId>xmlschema-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Fri Apr 29 05:52:16 2011
@@ -72,13 +72,13 @@ public class CXFNMRIntegrationTest exten
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cglib"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.neethi"),
+            getBundle("org.apache.neethi", "neethi"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.saaj-impl"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
             getBundle("org.codehaus.woodstox", "stax2-api"),
             getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
-            getBundle("org.apache.ws.commons.schema", "XmlSchema"),
+            getBundle("org.apache.ws.xmlschema", "xmlschema-core"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.bcel"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces"),

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Fri Apr 29 05:52:16 2011
@@ -107,12 +107,12 @@ public class IntegrationTest extends Abs
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cglib"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.neethi"),
+            getBundle("org.apache.neethi", "neethi"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.saaj-impl"),
             getBundle("org.codehaus.woodstox", "stax2-api"),
             getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
-            getBundle("org.apache.ws.commons.schema", "XmlSchema"),
+            getBundle("org.apache.ws.xmlschema", "xmlschema-core"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.bcel"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces"),

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Fri Apr 29 05:52:16 2011
@@ -40,7 +40,7 @@
 
   <!-- Properties -->
   <properties>
-    <cxf.version>2.3.3</cxf.version>
+    <cxf.version>2.4.0</cxf.version>
     <servicemix.nmr.version>1.5.0-SNAPSHOT</servicemix.nmr.version>
   </properties>
 
@@ -488,4 +488,4 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1097694&r1=1097693&r2=1097694&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Apr 29 05:52:16 2011
@@ -165,7 +165,6 @@
         <josql.bundle.version>1.5_4</josql.bundle.version>
         <jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
         <mvel.bundle.version>2.0.8_4</mvel.bundle.version>
-        <neethi.bundle.version>2.0.4_3</neethi.bundle.version>
         <opensaml.bundle.version>1.1_5</opensaml.bundle.version>
         <oscore.bundle.version>2.2.4_4</oscore.bundle.version>
         <osworkflow.bundle.version>2.7.0_4</osworkflow.bundle.version>
@@ -216,10 +215,11 @@
         <spring.osgi.version>1.2.0</spring.osgi.version>
         <woodstox.version>4.1.1</woodstox.version>
         <woodstox.stax2-api.version>3.0.2</woodstox.stax2-api.version>    
-        <wss4j.version>1.5.11</wss4j.version>
+        <wss4j.version>1.6.0</wss4j.version>
+        <neethi.version>3.0.0</neethi.version>
         <xfire.version>1.0.1</xfire.version>
         <xbean.version>3.7</xbean.version>
-        <xmlschema.version>1.4.7</xmlschema.version>
+        <xmlschema.version>2.0</xmlschema.version>
     </properties>
 
     <dependencyManagement>
@@ -449,9 +449,9 @@
                <version>${mvel.bundle.version}</version>
            </dependency>
            <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
-               <version>${neethi.bundle.version}</version>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>${neethi.version}</version>
            </dependency>
            <dependency>
                <groupId>org.apache.servicemix.bundles</groupId>
@@ -596,10 +596,21 @@
                <version>${commons-jexl.version}</version>
            </dependency>
            <dependency>
-               <groupId>org.apache.ws.commons.schema</groupId>
-               <artifactId>XmlSchema</artifactId>
-               <version>${xmlschema.version}</version>
-           </dependency>
+                <groupId>org.apache.ws.xmlschema</groupId>
+                <artifactId>xmlschema-core</artifactId>
+                <version>${xmlschema.version}</version>
+                <exclusions>
+                    <!-- on IBM jdk, XmlSchema pulls these in -->
+                    <exclusion>
+                        <groupId>org.apache.bcel</groupId>
+                        <artifactId>bcel</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xalan</groupId>
+                        <artifactId>xalan</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
            <dependency>
                <groupId>org.apache.ws.commons.axiom</groupId>
                <artifactId>axiom-api</artifactId>



Mime
View raw message