You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/10/12 05:03:31 UTC
svn commit: r1182180 - in /camel/branches/camel-2.8.x: ./
components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/
Author: dkulp
Date: Wed Oct 12 03:03:30 2011
New Revision: 1182180
URL: http://svn.apache.org/viewvc?rev=1182180&view=rev
Log:
Merged revisions 1179666 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1179666 | cschneider | 2011-10-06 11:28:06 -0400 (Thu, 06 Oct 2011) | 1 line
Removing unnecessary spring imports
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCxfServerTest-context.xml
camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfClientTest-context.xml
camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfServerTest-context.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCxfServerTest-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCxfServerTest-context.xml?rev=1182180&r1=1182179&r2=1182180&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCxfServerTest-context.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCxfServerTest-context.xml Wed Oct 12 03:03:30 2011
@@ -26,9 +26,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-camel.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-camel.xml" />
<bean id="serviceImpl" class="org.apache.camel.dataformat.soap.MultiPartCustomerServiceImpl"/>
Modified: camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfClientTest-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfClientTest-context.xml?rev=1182180&r1=1182179&r2=1182180&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfClientTest-context.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfClientTest-context.xml Wed Oct 12 03:03:30 2011
@@ -27,8 +27,6 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-camel.xml" />
<jaxws:client id="customerServiceCxfProxy"
Modified: camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfServerTest-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfServerTest-context.xml?rev=1182180&r1=1182179&r2=1182180&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfServerTest-context.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapCxfServerTest-context.xml Wed Oct 12 03:03:30 2011
@@ -27,8 +27,6 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-camel.xml" />
<bean id="serviceImpl" class="org.apache.camel.dataformat.soap.CustomerServiceImpl"/>