Author: ningjiang Date: Fri Dec 30 09:10:20 2011 New Revision: 1225776 URL: http://svn.apache.org/viewvc?rev=1225776&view=rev Log: Clean up the configure code of spring-config
Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml?rev=1225776&r1=1225775&r2=1225776&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml (original) +++ camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml Fri Dec 30 09:10:20 2011 @@ -8,9 +8,7 @@ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.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-camel.xml" /> - + <import resource="classpath:spring-config/jms-applicationContext.xml" /> Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml?rev=1225776&r1=1225775&r2=1225776&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml (original) +++ camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml Fri Dec 30 09:10:20 2011 @@ -23,9 +23,7 @@ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.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-camel.xml" /> - + <import resource="classpath:spring-config/jms-applicationContext.xml" /> <client id="org.apache.camel.itest.customerrelations.CustomerServiceV1" Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml?rev=1225776&r1=1225775&r2=1225776&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml (original) +++ camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml Fri Dec 30 09:10:20 2011 @@ -10,9 +10,7 @@ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.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-camel.xml" /> - + <broker:broker useJmx="false" persistent="false" brokerName="localhost"> <broker:transportConnectors> <broker:transportConnector name="vm" uri="vm://localhost"/> Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml?rev=1225776&r1=1225775&r2=1225776&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml (original) +++ camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml Fri Dec 30 09:10:20 2011 @@ -26,9 +26,7 @@ http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.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-camel.xml" /> - + <import resource="classpath:spring-config/jms-applicationContext.xml" /> <broker:broker useJmx="false" persistent="false" brokerName="localhost">