camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1155338 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/ examples/camel-example-cxf-tomcat/src/main/resources/ examples/camel-example-cxf/src/main/resources/META-INF/spring/
Date Tue, 09 Aug 2011 12:44:23 GMT
Author: ningjiang
Date: Tue Aug  9 12:44:22 2011
New Revision: 1155338

URL: http://svn.apache.org/viewvc?rev=1155338&view=rev
Log:
 CAMEL-4317 Merged revisions 1155230 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1155230 | ningjiang | 2011-08-09 14:55:40 +0800 (Tue, 09 Aug 2011) | 1 line
  
  Clean up the camel context file of the example after upgrading to CXF 2.4.x
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
    camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
    camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
    camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
    camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
    camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /camel/trunk:1155230

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug  9 12:44:22 2011
@@ -1 +1 @@
-/camel/trunk:1-1148091,1149488,1153146,1153323,1155229,1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327
+/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327

Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml?rev=1155338&r1=1155337&r2=1155338&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
Tue Aug  9 12:44:22 2011
@@ -26,11 +26,8 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd">
 
-    <!-- needed cxf imports -->
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-
+  
     <!-- use a bean to start and stop the real web service (is not Camel specific) -->
     <!-- in a real use-case the real web service would be located on another server
          but we simulate this in the same JVM -->
@@ -70,4 +67,4 @@
     </camelContext>
 
 </beans>
-<!-- END SNIPPET: e1 -->
\ No newline at end of file
+<!-- END SNIPPET: e1 -->

Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml?rev=1155338&r1=1155337&r2=1155338&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
Tue Aug  9 12:44:22 2011
@@ -26,11 +26,7 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd">
 
-    <!-- needed cxf imports -->
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
-    <!-- use the CXF servlet -->
-    <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
     
     <bean id="myRoutes" class="org.apache.camel.example.cxf.CamelRoute"/>
     
@@ -40,4 +36,4 @@
     </camelContext>
 
 </beans>
-<!-- END SNIPPET: e1 -->
\ No newline at end of file
+<!-- END SNIPPET: e1 -->

Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml?rev=1155338&r1=1155337&r2=1155338&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
Tue Aug  9 12:44:22 2011
@@ -32,8 +32,6 @@
     -->
 
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
 
     <bean id = "testBean" class="org.apache.camel.example.cxf.provider.TesterBean" />
 

Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml?rev=1155338&r1=1155337&r2=1155338&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
Tue Aug  9 12:44:22 2011
@@ -22,9 +22,7 @@
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
+        <import resource="classpath:META-INF/cxf/cxf.xml"/>
 
 	<bean id="roundRobinRef"
 		class="org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer" />
@@ -64,4 +62,4 @@
 	</bean>
 
 
-</beans>
\ No newline at end of file
+</beans>

Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml?rev=1155338&r1=1155337&r2=1155338&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
Tue Aug  9 12:44:22 2011
@@ -27,10 +27,7 @@
        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.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-jetty.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
+  <import resource="classpath:META-INF/cxf/cxf.xml"/>
 
   <broker:broker id="broker" useJmx="false" persistent="false" dataDirectory="target/activemq">
     <broker:transportConnectors>
@@ -49,4 +46,4 @@
     		address="jms://"/>
     		
   
-</beans>
\ No newline at end of file
+</beans>

Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml?rev=1155338&r1=1155337&r2=1155338&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
Tue Aug  9 12:44:22 2011
@@ -23,10 +23,7 @@
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
+  <import resource="classpath:META-INF/cxf/cxf.xml"/>
 
   <camel:camelContext id="cxfrs_context">
     <camel:package>org.apache.camel.example.cxf.jaxrs</camel:package>    



Mime
View raw message