Return-Path: 
 <commits-return-14067-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 13389 invoked from network); 4 Mar 2011 20:34:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 4 Mar 2011 20:34:17 -0000
Received: (qmail 47876 invoked by uid 500); 4 Mar 2011 20:34:17 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 47823 invoked by uid 500); 4 Mar 2011 20:34:17 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 47815 invoked by uid 99); 4 Mar 2011 20:34:17 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 20:34:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 20:34:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 74F452388ACC; Fri,  4 Mar 2011 20:33:51 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1078120 [2/3] - in /cxf/trunk:
 api/src/main/java/org/apache/cxf/configuration/
 rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/
 rt/bindings/corba/src/main/resources/META-INF/cxf/
 rt/bindings/http/src/main/resources/MET...
Date: Fri, 04 Mar 2011 20:33:49 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110304203351.74F452388ACC@eris.apache.org>

Modified: cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml Fri Mar  4 20:33:44 2011
@@ -27,10 +27,6 @@
               http://www.springframework.org/schema/beans/spring-beans.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-http-jetty.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
   
   <jaxws:server id="hw-service-endpoint" 
     address="http://localhost:8808/HelloWorldDocLit" >

Modified: cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml Fri Mar  4 20:33:44 2011
@@ -27,11 +27,6 @@
               http://www.springframework.org/schema/beans/spring-beans.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-http-jetty.xml" />
- <import
-  resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
 
 
  <jaxws:server id="hwg-service-endpoint"

Modified: cxf/trunk/rt/javascript/src/test/resources/MtoMBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/MtoMBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/MtoMBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/MtoMBeans.xml Fri Mar  4 20:33:44 2011
@@ -27,11 +27,6 @@
               http://www.springframework.org/schema/beans/spring-beans.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-xml.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
               
  <jaxws:server id="mtom-service-endpoint" 
     address="http://localhost:8808/mtom" >

Modified: cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml Fri Mar  4 20:33:44 2011
@@ -27,9 +27,6 @@
               http://www.springframework.org/schema/beans/spring-beans.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-http-jetty.xml" />
   
   <bean id='rpc-service' class='org.apache.cxf.javascript.fortest.SimpleRPCImpl'/>
   

Modified: cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml Fri Mar  4 20:33:44 2011
@@ -32,11 +32,6 @@
               http://www.springframework.org/schema/beans/spring-beans.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-xml.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
 
 	<httpj:engine-factory bus="cxf">
 		<httpj:engine port="8808">

Modified: cxf/trunk/rt/javascript/src/test/resources/attributeTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/attributeTestBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/attributeTestBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/attributeTestBeans.xml Fri Mar  4 20:33:44 2011
@@ -26,9 +26,6 @@ under the License.
 						http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
 	<!-- CXF -->
 	<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-jaxws.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
 
    <bean id="attribute-test-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
     <property name="serviceClass" value="org.apache.cxf.javascript.fortest.AttributeTestService"/>

Modified: cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml Fri Mar  4 20:33:44 2011
@@ -27,9 +27,6 @@ under the License.
 						
 	<!-- CXF -->
 	<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-jaxws.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
 	
 <!--  We use a client for the service for basic tests. We don't need a server at all. -->
   <bean id="simple-dlwu-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >

Modified: cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Mar  4 20:33:44 2011
@@ -1 +1 @@
-org.apache.cxf.management.jmx.InstrumentationManagerImpl:org.apache.cxf.management.InstrumentationManager:false           
+org.apache.cxf.management.jmx.InstrumentationManagerImpl:org.apache.cxf.management.InstrumentationManager:true           

Modified: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Mar  4 20:33:44 2011
@@ -1,3 +1,3 @@
-org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory::false
+org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory::true
 org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory::true
 

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml Fri Mar  4 20:33:44 2011
@@ -46,6 +46,5 @@
 	    </httpj:connector> 
 	  </httpj:engine>
    </httpj:engine-factory>  
-   <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-   </bean> 
+
 </beans>
\ No newline at end of file

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml Fri Mar  4 20:33:44 2011
@@ -42,8 +42,5 @@
 	    </httpj:tlsServerParameters>
 	  </httpj:engine>
    </httpj:engine-factory>
-  
-   <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-   </bean> 
 
 </beans>

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Fri Mar  4 20:33:44 2011
@@ -48,10 +48,6 @@ public class ApplicationContextTest exte
     
     private static final String S1 = 
         ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
-    private static final String S2 = 
-        ApplicationContextTest.class.getResource("/META-INF/cxf/cxf-extension-http.xml").toString();
-    private static final String S3 = 
-        ApplicationContextTest.class.getResource("/META-INF/cxf/cxf-extension-http-jetty.xml").toString();
     
     @BeforeClass
     public static void classUp() {
@@ -70,7 +66,7 @@ public class ApplicationContextTest exte
             .getResource("/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml").toString();
     
         try {
-            new TestApplicationContext(new String[] {S1, S2, S3, s4});
+            new TestApplicationContext(new String[] {S1, s4});
             fail("Expected XmlBeanDefinitionStoreException not thrown.");
         } catch (XmlBeanDefinitionStoreException ex) {
             assertTrue(ex.getCause() instanceof SAXParseException);
@@ -83,7 +79,7 @@ public class ApplicationContextTest exte
             .getResource("/org/apache/cxf/transport/http_jetty/spring/beans.xml").toString();
         
         TestApplicationContext ctx = new TestApplicationContext(
-            new String[] {S1, S2, S3, s4});
+            new String[] {S1, s4});
         
         //ctx.refresh();
         checkContext(ctx);
@@ -94,7 +90,7 @@ public class ApplicationContextTest exte
             .getResource("/org/apache/cxf/transport/http_jetty/spring/beans-props.xml").toString();
         
         TestApplicationContext ctx = new TestApplicationContext(
-            new String[] {S1, S2, S3, s4});
+            new String[] {S1, s4});
         checkContext(ctx);
     }
     private void checkContext(TestApplicationContext ctx) throws Exception {

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml Fri Mar  4 20:33:44 2011
@@ -23,8 +23,6 @@
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-            
     <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"
 	  id="org.apache.cxf.transport.servlet.ServletTransportFactory">
         <property name="bus" ref="cxf"/>

Modified: cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java (original)
+++ cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java Fri Mar  4 20:33:44 2011
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
 import javax.annotation.Resource;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.message.Message;
@@ -43,6 +44,7 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
+@NoJSR250Annotations(unlessNull = { "bus" })
 public class LocalTransportFactory extends AbstractTransportFactory
     implements DestinationFactory, ConduitInitiator {
    
@@ -68,9 +70,12 @@ public class LocalTransportFactory exten
     private Set<String> messageFilterProperties;
     private Set<String> messageIncludeProperties;
     private Set<String> uriPrefixes = new HashSet<String>(URI_PREFIXES);
-    
+
     public LocalTransportFactory() {
-        super(DEFAULT_NAMESPACES);
+        this(null);
+    }
+    public LocalTransportFactory(Bus b) {
+        super(DEFAULT_NAMESPACES, b);
         
         messageFilterProperties = new HashSet<String>();
         messageIncludeProperties = new HashSet<String>();

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java Fri Mar  4 20:33:44 2011
@@ -50,7 +50,7 @@ public class EndpointReferenceDomainExpr
     
     private Unmarshaller unmarshaller;
     
-    EndpointReferenceDomainExpressionBuilder() {
+    public EndpointReferenceDomainExpressionBuilder() {
 
     }  
     

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java Fri Mar  4 20:33:44 2011
@@ -21,7 +21,9 @@ package org.apache.cxf.ws.policy.spring;
 
 import org.w3c.dom.Element;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
+import org.apache.cxf.configuration.spring.BusWiringType;
 import org.apache.cxf.ws.policy.AlternativeSelector;
 import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.ws.policy.PolicyEngineImpl;
@@ -33,7 +35,7 @@ import org.springframework.beans.factory
 
 public class PolicyEngineBeanDefinitionParser extends AbstractBeanDefinitionParser {
     protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
-        bean.addConstructorArgReference(PolicyEngine.class.getName());
+        super.addBusWiringAttribute(bean, BusWiringType.CONSTRUCTOR);
         super.doParse(element, ctx, bean);
     }
     
@@ -61,8 +63,8 @@ public class PolicyEngineBeanDefinitionP
         
         private PolicyEngineImpl engine;
         
-        public PolicyEngineConfig(PolicyEngine e) {
-            engine = (PolicyEngineImpl)e;
+        public PolicyEngineConfig(Bus bus) {
+            engine = (PolicyEngineImpl)bus.getExtension(PolicyEngine.class);
         }
         
         public boolean getEnabled() {

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java Fri Mar  4 20:33:44 2011
@@ -41,15 +41,13 @@ import static org.junit.Assert.assertNot
 @ContextConfiguration
 public class PolicyEngineImplInitTest {
 
-    @Resource
-    PolicyEngineImpl pe;
 
     @Resource
     Bus bus;
 
     @Before
     public void setUp() throws Exception {
-        assertNotNull(pe);
+        assertNotNull(bus);
     }
     
     @After

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml Fri Mar  4 20:33:44 2011
@@ -26,16 +26,11 @@
 http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     
+    <import resource="classpath:META-INF/cxf/cxf.xml" />
+    
     <bean class="org.apache.cxf.ws.policy.PolicyExtensionsTest$TestAssertionBuilder"/>
     <bean class="org.apache.cxf.ws.policy.PolicyExtensionsTest$TestPolicyInterceptorProvider"/>
 
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
-    <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
-    <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
-    <import resource="../../../../../META-INF/cxf/cxf-extension-policy.xml"/>  
     
     <!-- use bean ids if you want to load multiple external attachment providers -->
     

Modified: cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml (original)
+++ cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml Fri Mar  4 20:33:44 2011
@@ -24,6 +24,5 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://schemas.synyx.org/hades http://schemas.synyx.org/hades/hades.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-policy.xml"/>
 
 </beans>

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml Fri Mar  4 20:33:44 2011
@@ -22,14 +22,6 @@
        xsi:schemaLocation="
 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 id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager">
-        <property name="bus" ref="cxf"/>
-    </bean>
-    <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
-    <bean class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
-    <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
-    
-    <import resource="../../../../../META-INF/cxf/cxf-extension-rm.xml"/>  
+    <import resource="classpath:/META-INF/cxf/cxf.xml"/>  
     
 </beans>

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Fri Mar  4 20:33:44 2011
@@ -119,12 +119,20 @@ public class PolicyBasedWSS4JInIntercept
         if (o instanceof Properties) {
             properties = (Properties)o;
         } else if (o instanceof String) {
+            URL url = null;
             ResourceManager rm = message.getExchange().get(Bus.class).getExtension(ResourceManager.class);
-            URL url = rm.resolveResource((String)o, URL.class);
+            url = rm.resolveResource((String)o, URL.class);
             try {
                 if (url == null) {
                     url = ClassLoaderUtils.getResource((String)o, AbstractWSS4JInterceptor.class);
                 }
+                if (url == null) {
+                    try {
+                        url = new URL((String)o);
+                    } catch (Exception ex) {
+                        //ignore
+                    }
+                }
                 if (url != null) {
                     properties = new Properties();
                     InputStream ins = url.openStream();

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Mar  4 20:33:44 2011
@@ -1085,6 +1085,13 @@ public abstract class AbstractBindingBui
                 if (url == null) {
                     url = ClassLoaderUtils.getResource((String)o, this.getClass());
                 }
+                if (url == null) {
+                    try {
+                        url = new URL((String)o);
+                    } catch (Exception ex) {
+                        //ignore
+                    }
+                }
                 if (url != null) {
                     InputStream ins = url.openStream();
                     properties = new Properties();

Modified: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml Fri Mar  4 20:33:44 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/cxf-servlet.xml" />
 
 	<jaxws:endpoint 

Modified: cxf/trunk/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/aegisJaxWsBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/aegisJaxWsBeans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/aegisJaxWsBeans.xml Fri Mar  4 20:33:44 2011
@@ -33,10 +33,6 @@ http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.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-http-jetty.xml" />
 		
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 	

Modified: cxf/trunk/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml Fri Mar  4 20:33:44 2011
@@ -33,9 +33,6 @@ http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.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-http-jetty.xml" />
 	
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 	

Modified: cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml Fri Mar  4 20:33:44 2011
@@ -33,10 +33,6 @@ http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.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-http-jetty.xml" />
 		
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 	

Modified: cxf/trunk/systests/databinding/src/test/resources/extrajaxbclass.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/extrajaxbclass.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/extrajaxbclass.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/extrajaxbclass.xml Fri Mar  4 20:33:44 2011
@@ -29,9 +29,6 @@ under the License.
 		
 	<!-- CXF -->
 	<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-http-jetty.xml" />
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 

Modified: cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml Fri Mar  4 20:33:44 2011
@@ -23,9 +23,6 @@ http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.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-http-jetty.xml" />
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

Modified: cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -36,7 +36,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-servlet.xml" />
   
   <simple:server address="/service"

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/jms_server_config.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/jms_server_config.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/jms_server_config.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/jms_server_config.xml Fri Mar  4 20:33:44 2011
@@ -31,8 +31,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-jms.xml" />
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/core
 http://cxf.apache.org/schemas/core.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-servlet.xml" />
 
   <bean class="org.apache.cxf.systest.jaxrs.BookStoreSpring" id="serviceBean"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -35,7 +35,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
   
   <jaxrs:server id="atomservice"

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/core
 http://cxf.apache.org/schemas/core.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-servlet.xml" />
 
   <bean class="org.apache.cxf.systest.jaxrs.BookStoreSpring" id="serviceBean"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/core
 http://cxf.apache.org/schemas/core.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-servlet.xml" />
 
   <bean class="org.apache.cxf.systest.jaxrs.BookStoreDispatch" id="serviceBean"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -31,7 +31,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
 
   <jaxrs:server address="/jaas">

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -35,7 +35,6 @@ http://www.springframework.org/schema/ut
 http://www.springframework.org/schema/util/spring-util.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-servlet.xml" />
 
 	<bean id = "atomPullServer" class="org.apache.cxf.management.web.logging.atom.AtomPullServer" 

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -35,7 +35,6 @@ http://www.springframework.org/schema/ut
 http://www.springframework.org/schema/util/spring-util.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-servlet.xml" />
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/core
 http://cxf.apache.org/schemas/core.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-servlet.xml" />
 
   <bean class="org.apache.cxf.systest.jaxrs.JAXRSOverlappingDestinationsTest.Resource" 

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -37,7 +37,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
 
   <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.BookStore"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
 
   <jaxrs:server id="bookservice"

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
 
   <jaxrs:server id="bookservice"

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -40,7 +40,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
 
   <jaxrs:server id="bookservice"

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -31,7 +31,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
 
   <jaxrs:server id="bookservice"

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -33,9 +33,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -34,7 +34,6 @@ http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.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-servlet.xml" />
   
   <jaxrs:server id="bookservice"

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -35,7 +35,6 @@ http://www.springframework.org/schema/ut
 http://www.springframework.org/schema/util/spring-util.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-servlet.xml" />
 	
 	<jaxrs:server address="/">

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml Fri Mar  4 20:33:44 2011
@@ -25,8 +25,6 @@ http://www.springframework.org/schema/be
 
 
 	<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" />
 
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapDispatchPort" createdFromAPI="true">
          <jaxws:features>

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml Fri Mar  4 20:33:44 2011
@@ -26,10 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
 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-http-jetty.xml" /> 
-<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
  
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 	

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml Fri Mar  4 20:33:44 2011
@@ -26,10 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
 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-http-jetty.xml" /> 
-<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
  
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 	

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml Fri Mar  4 20:33:44 2011
@@ -26,10 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
 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-http-jetty.xml" /> 
-<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
  
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 	

Modified: cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/context.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/context.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/context.xml (original)
+++ cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/context.xml Fri Mar  4 20:33:44 2011
@@ -6,9 +6,6 @@
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.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-jaxws.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
 	
 <!-- This test is not run with a servlet container. It tests non-servlet publication. -->
 <bean id="servicebean" class="org.apache.cxf.systest.jaxws.beanpostprocessor.WebServiceRUs"/>

Modified: cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/customized-context.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/customized-context.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/customized-context.xml (original)
+++ cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/beanpostprocessor/customized-context.xml Fri Mar  4 20:33:44 2011
@@ -6,10 +6,6 @@
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.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-jaxws.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http-binding.xml"/>
 	
 <!-- This test is not run with a servlet container. It tests non-servlet publication. -->
 <bean id="servicebean" class="org.apache.cxf.systest.jaxws.beanpostprocessor.WebServiceRUs"/>

Modified: cxf/trunk/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml Fri Mar  4 20:33:44 2011
@@ -36,7 +36,6 @@
               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-servlet.xml"/>
 
   <http:destination name="{http://apache.org/hello_world}Mortimer.http-destination">

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf Fri Mar  4 20:33:44 2011
@@ -26,11 +26,13 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:cxf="http://cxf.apache.org/core"
   xmlns:sec="http://cxf.apache.org/configuration/security"
   xmlns:http="http://cxf.apache.org/transports/http/configuration"
   xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
   xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
   xsi:schemaLocation="
+    http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
   		   http://cxf.apache.org/configuration/security
   		      http://cxf.apache.org/schemas/configuration/security.xsd
            http://cxf.apache.org/transports/http/configuration
@@ -72,12 +74,10 @@
 	  </httpj:engine>
    </httpj:engine-factory>
   
-   <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+   <cxf:bus>
+        <cxf:inInterceptors>
                 <bean class="org.apache.cxf.systest.http.PushBack401"/>
-            </list>
-        </property>
-   </bean> 
+        </cxf:inInterceptors>
+   </cxf:bus>
 
 </beans>

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf Fri Mar  4 20:33:44 2011
@@ -73,6 +73,4 @@
 	  </httpj:engine>
    </httpj:engine-factory>
    
-  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
-  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf Fri Mar  4 20:33:44 2011
@@ -71,6 +71,4 @@
 	  </httpj:engine>
    </httpj:engine-factory>  
   
-  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
-  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf Fri Mar  4 20:33:44 2011
@@ -73,6 +73,4 @@
 	  </httpj:engine>
    </httpj:engine-factory>  
   
-  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
-  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf Fri Mar  4 20:33:44 2011
@@ -73,6 +73,4 @@
 	  </httpj:engine>
    </httpj:engine-factory>  
   
-  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
-  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java Fri Mar  4 20:33:44 2011
@@ -92,9 +92,6 @@ public class EngineLifecycleTest extends
         applicationContext = new GenericApplicationContext();
         readBeans(new ClassPathResource("/org/apache/cxf/systest/http_jetty/cxf.xml"));
         readBeans(new ClassPathResource("META-INF/cxf/cxf.xml"));
-        readBeans(new ClassPathResource("META-INF/cxf/cxf-extension-soap.xml"));
-        readBeans(new ClassPathResource("META-INF/cxf/cxf-extension-http.xml"));
-        readBeans(new ClassPathResource("META-INF/cxf/cxf-extension-http-jetty.xml"));
         readBeans(new ClassPathResource("jetty-engine.xml", getClass()));
         if (includeService) {
             readBeans(new ClassPathResource("server-lifecycle-beans.xml", getClass()));

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml Fri Mar  4 20:33:44 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-jms.xml"/>
     <!--jaxws:endpoint
         id="GreerterJMSService"
         implementor="org.apache.cxf.systest.jms.GreeterImplQueueOneWay"

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml Fri Mar  4 20:33:44 2011
@@ -31,8 +31,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-jms.xml" />
  
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
  

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml Fri Mar  4 20:33:44 2011
@@ -25,8 +25,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-binding.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
   
   <bean id="JaxWsServiceFactoryBean" class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean">

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-auto-launch.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-auto-launch.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-auto-launch.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-auto-launch.xml Fri Mar  4 20:33:44 2011
@@ -25,7 +25,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-servlet.xml"/>
   
   <bean id="postprocess" class="org.apache.cxf.jaxws.spring.JaxWsWebServicePublisherBeanPostProcessor"/>

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-error.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-error.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-error.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-error.xml Fri Mar  4 20:33:44 2011
@@ -25,8 +25,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-binding.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
   
   

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml Fri Mar  4 20:33:44 2011
@@ -22,7 +22,6 @@
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.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-servlet.xml"/>
   
   <bean id="greeterServerFactory"

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring.xml Fri Mar  4 20:33:44 2011
@@ -25,8 +25,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-binding.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
   
   

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml Fri Mar  4 20:33:44 2011
@@ -8,7 +8,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
 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-servlet.xml" /> 
     <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> 
     <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml Fri Mar  4 20:33:44 2011
@@ -26,9 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
 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-http-jetty.xml" /> 
 
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/servlet.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/servlet.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/servlet.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/servlet.xml Fri Mar  4 20:33:44 2011
@@ -25,7 +25,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-servlet.xml"/>
   
 </beans>
\ No newline at end of file

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml Fri Mar  4 20:33:44 2011
@@ -22,20 +22,21 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
        xmlns:coloc="http://cxf.apache.org/binding/coloc"
+              xmlns:cxf="http://cxf.apache.org/core"
+       
        xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+       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="faultOutbound" class="org.apache.cxf.systest.coloc.ThrowFaultInterceptor"/>
 
     <!-- Adding interceptors to the bus will add it to all services/endpoints-->
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="outInterceptors">
-            <list>
-                <ref bean="faultOutbound"/>
-            </list>
-        </property>
-    </bean>
+    <cxf:bus>
+        <cxf:outInterceptors>
+            <ref bean="faultOutbound"/>
+        </cxf:outInterceptors>
+    </cxf:bus>
 
     <jaxws:client name="{http://apache.org/headers/rpc_lit}SoapPort"
                   createdFromAPI="true">

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/cxf.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/cxf.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/cxf.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/cxf.xml Fri Mar  4 20:33:44 2011
@@ -22,8 +22,11 @@
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xmlns:jms="http://cxf.apache.org/transports/jms"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:cxf="http://cxf.apache.org/core"
+       
        xsi:schemaLocation="
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+       http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.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">
@@ -69,14 +72,12 @@ http://www.springframework.org/schema/be
     <bean id="faultOutbound" class="org.apache.cxf.systest.coloc.ThrowFaultInterceptor"/>
 
     <!-- Adding interceptors to the bus will add it to all services/endpoints-->
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="outInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:outInterceptors>
                 <ref bean="colocOutbound"/>
                 <ref bean="faultOutbound"/>
-            </list>
-        </property>
-    </bean>
+        </cxf:outInterceptors>
+    </cxf:bus>
 
     <!-- Avoid upfront Conduit creation, as client-side transport resources
          are not required in the coloc case -->

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml Fri Mar  4 20:33:44 2011
@@ -59,6 +59,5 @@ http://www.springframework.org/schema/be
                 <value>test</value>
             </list>
         </property>
-        <property name="factory" ref="org.apache.cxf.binding.corba.CorbaBindingFactory"/>
     </bean>
 </beans>

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml Fri Mar  4 20:33:44 2011
@@ -21,9 +21,11 @@
 <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"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
        xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+        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">
   
@@ -39,33 +41,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: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml Fri Mar  4 20:33:44 2011
@@ -19,8 +19,11 @@
 -->
 <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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+        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"/>
     <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
@@ -28,35 +31,27 @@ http://www.springframework.org/schema/be
     <bean id="logOut" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
     <bean id="catcher" class="org.apache.cxf.systest.interceptor.FaultHandlingInterceptor"/>
     
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
+    <cxf:bus>
+        <cxf:inInterceptors>
                 <ref bean="logIn"/>
                 <ref bean="mapCodec"/>
                 <ref bean="mapAggregator"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
+        </cxf:inInterceptors>
+        <cxf:outInterceptors>
                 <ref bean="logOut"/>
                 <ref bean="mapCodec"/>
                 <ref bean="mapAggregator"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
                 <ref bean="logOut"/>
                 <ref bean="catcher"/>
                 <ref bean="mapCodec"/>
                 <ref bean="mapAggregator"/>
-            </list>
-        </property>
-        <property name="inFaultInterceptors">
-            <list>
+        </cxf:outFaultInterceptors>
+        <cxf:inFaultInterceptors>
                 <ref bean="mapCodec"/>
                 <ref bean="mapAggregator"/>
-            </list>
-        </property>
-    </bean>
+        </cxf:inFaultInterceptors>
+    </cxf:bus>    
     
 </beans>

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml Fri Mar  4 20:33:44 2011
@@ -19,31 +19,26 @@
 -->
 <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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+        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="logIn" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
     <bean id="logOut" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
     <bean id="catcher" class="org.apache.cxf.systest.interceptor.FaultHandlingInterceptor"/>
     
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-        <property name="inInterceptors">
-            <list>
-                <ref bean="logIn"/>
-            </list>
-        </property>
-        <property name="outInterceptors">
-            <list>
-                <ref bean="logOut"/>
-            </list>
-        </property>
-        <property name="outFaultInterceptors">
-            <list>
-                <ref bean="logOut"/>
-                <ref bean="catcher"/>
-            </list>
-        </property>
-    </bean>
-    
+    <cxf:bus>
+        <cxf:inInterceptors>
+            <ref bean="logIn"/>
+        </cxf:inInterceptors>
+        <cxf:outInterceptors>
+            <ref bean="logOut"/>
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>
+            <ref bean="logOut"/>
+            <ref bean="catcher"/>
+        </cxf:outFaultInterceptors>
+    </cxf:bus>    
 </beans>

Modified: cxf/trunk/systests/uncategorized/src/test/resources/crossSchemaBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/resources/crossSchemaBeans.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/resources/crossSchemaBeans.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/resources/crossSchemaBeans.xml Fri Mar  4 20:33:44 2011
@@ -29,10 +29,6 @@ under the License.
 		
 	<!-- CXF -->
 	<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-jaxws.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
 
     <bean class="org.apache.cxf.systest.wsdl.LifeCycleListenerTester" id="listenerTest"/>
 

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml?rev=1078120&r1=1078119&r2=1078120&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml Fri Mar  4 20:33:44 2011
@@ -28,12 +28,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-xml.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-addr.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-policy.xml" />
 
 	<jaxws:endpoint
 		id="asyncMessagingProvider"