You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/11/04 09:45:26 UTC
svn commit: r1030857 - in /camel/trunk/components/camel-spring-ws/src:
main/java/org/apache/camel/component/spring/ws/
main/java/org/apache/camel/component/spring/ws/bean/
main/resources/META-INF/services/org/apache/camel/component/
test/java/org/apach...
Author: davsclaus
Date: Thu Nov 4 08:45:25 2010
New Revision: 1030857
URL: http://svn.apache.org/viewvc?rev=1030857&view=rev
Log:
CAMEL-3105: Renamed springws to spring-ws as component name.
Added:
camel/trunk/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/component/spring-ws
Removed:
camel/trunk/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/component/springws
Modified:
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java
camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml
camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml
camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest-context.xml
camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml
camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest-context.xml
Modified: camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java (original)
+++ camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java Thu Nov 4 08:45:25 2010
@@ -133,7 +133,7 @@ public class SpringWebserviceComponent e
CamelEndpointMapping endpointMapping = resolveAndRemoveReferenceParameter(parameters, "endpointMapping", CamelEndpointMapping.class, null);
if (endpointMapping == null && configuration.getEndpointDispatcher() == null) {
throw new IllegalArgumentException("No CamelEndpointMapping found in Spring ApplicationContext."
- + " This bean is required for Spring-WS consumer support (unless the 'springws:beanname:' URI scheme is used)");
+ + " This bean is required for Spring-WS consumer support (unless the 'spring-ws:beanname:' URI scheme is used)");
}
configuration.setEndpointMapping(endpointMapping);
}
Modified: camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java (original)
+++ camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java Thu Nov 4 08:45:25 2010
@@ -24,9 +24,9 @@ import org.springframework.ws.server.end
/**
* Spring {@link MessageEndpoint} for dispatching messages received by Spring-WS to a Camel
* endpoint. This class needs to be registered in the Spring <tt>ApplicationContext</tt>
- * when consuming messages using the <tt>springws:beanname:</tt> URI scheme.
+ * when consuming messages using the <tt>spring-ws:beanname:</tt> URI scheme.
* <p/>
- * For example, when using a route such as <tt>from("springws:beanname:stockQuote").to("...");</tt>
+ * For example, when using a route such as <tt>from("spring-ws:beanname:stockQuote").to("...");</tt>
* the following bean definition needs to be present in the <tt>ApplicationContext</tt>:
* <p/>
* {@code
Modified: camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java (original)
+++ camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java Thu Nov 4 08:45:25 2010
@@ -55,16 +55,16 @@ import org.springframework.xml.xpath.XPa
* consuming messages using any of the following URI schemes:
* <p/>
* <ul>
- * <li><tt>springws:rootqname:</tt><br/>
+ * <li><tt>spring-ws:rootqname:</tt><br/>
* Equivalent to endpoint mappings specified through {@link org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping}
* <p/>
- * <li><tt>springws:soapaction:</tt><br/>
+ * <li><tt>spring-ws:soapaction:</tt><br/>
* Equivalent to endpoint mappings specified through {@link org.springframework.ws.soap.server.endpoint.mapping.SoapActionEndpointMapping}
* <p/>
- * <li><tt>springws:uri:</tt><br/>
+ * <li><tt>spring-ws:uri:</tt><br/>
* Equivalent to endpoint mappings specified through {@link org.springframework.ws.server.endpoint.mapping.UriEndpointMapping}
* <p/>
- * <li><tt>springws:xpathresult:</tt><br/>
+ * <li><tt>spring-ws:xpathresult:</tt><br/>
* Equivalent to endpoint mappings specified through {@link org.springframework.ws.server.endpoint.mapping.XPathPayloadEndpointMapping}
* </ul>
*
Added: camel/trunk/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/component/spring-ws
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/component/spring-ws?rev=1030857&view=auto
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/component/spring-ws (added)
+++ camel/trunk/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/component/spring-ws Thu Nov 4 08:45:25 2010
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class=org.apache.camel.component.spring.ws.SpringWebserviceComponent
\ No newline at end of file
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java Thu Nov 4 08:45:25 2010
@@ -92,17 +92,17 @@ public class ConsumerMarshallingRouteTes
// request webservice
from("direct:webservice-marshall")
.marshal(jaxb)
- .to("springws:http://localhost/?soapAction=http://www.stockquotes.edu/GetQuote&webServiceTemplate=#webServiceTemplate")
+ .to("spring-ws:http://localhost/?soapAction=http://www.stockquotes.edu/GetQuote&webServiceTemplate=#webServiceTemplate")
.convertBodyTo(String.class);
// request webservice
from("direct:webservice-marshall-unmarshall")
.marshal(jaxb)
- .to("springws:http://localhost/?soapAction=http://www.stockquotes.edu/GetQuote&webServiceTemplate=#webServiceTemplate")
+ .to("spring-ws:http://localhost/?soapAction=http://www.stockquotes.edu/GetQuote&webServiceTemplate=#webServiceTemplate")
.unmarshal(jaxb);
// provide web service
- from("springws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping").process(
+ from("spring-ws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping").process(
new StockQuoteResponseProcessor());
}
};
Modified: camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml (original)
+++ camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml Thu Nov 4 08:45:25 2010
@@ -26,7 +26,7 @@
<!-- ============================== -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="springws:beanname:QuoteEndpointDispatcher"/>
+ <from uri="spring-ws:beanname:QuoteEndpointDispatcher"/>
<to uri="responseProcessor"/>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml (original)
+++ camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml Thu Nov 4 08:45:25 2010
@@ -26,19 +26,19 @@
<!-- ============================== -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="springws:rootqname:{http://www.webserviceX.NET/}GetQuote?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:rootqname:{http://www.webserviceX.NET/}GetQuote?endpointMapping=#endpointMapping"/>
<to uri="responseProcessor"/>
</route>
<route>
- <from uri="springws:soapaction:http://www.webserviceX.NET/GetQuote?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:soapaction:http://www.webserviceX.NET/GetQuote?endpointMapping=#endpointMapping"/>
<to uri="responseProcessor"/>
</route>
<route>
- <from uri="springws:uri:http://localhost/stockquote2?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:uri:http://localhost/stockquote2?endpointMapping=#endpointMapping"/>
<to uri="responseProcessor"/>
</route>
<route>
- <from uri="springws:xpathresult:GRABME?expression=//GetQuote&endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:xpathresult:GRABME?expression=//GetQuote&endpointMapping=#endpointMapping"/>
<to uri="responseProcessor"/>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest-context.xml?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest-context.xml (original)
+++ camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest-context.xml Thu Nov 4 08:45:25 2010
@@ -26,23 +26,23 @@
<!-- ============================== -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="springws:rootqname:{http://www.stockquotes.edu/}SomeElement?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:rootqname:{http://www.stockquotes.edu/}SomeElement?endpointMapping=#endpointMapping"/>
<to uri="mock:testRootQNameDummy"/>
</route>
<route>
- <from uri="springws:rootqname:{http://www.stockquotes.edu/}GetQuote?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:rootqname:{http://www.stockquotes.edu/}GetQuote?endpointMapping=#endpointMapping"/>
<to uri="mock:testRootQName"/>
</route>
<route>
- <from uri="springws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/>
<to uri="mock:testSoapAction"/>
</route>
<route>
- <from uri="springws:uri:http://localhost/stockquote2?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:uri:http://localhost/stockquote2?endpointMapping=#endpointMapping"/>
<to uri="mock:testUri"/>
</route>
<route>
- <from uri="springws:xpathresult:GRABME?expression=//GetQuote&endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:xpathresult:GRABME?expression=//GetQuote&endpointMapping=#endpointMapping"/>
<to uri="mock:testXPath"/>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml (original)
+++ camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml Thu Nov 4 08:45:25 2010
@@ -25,29 +25,29 @@
<!-- producer routes (web service clients) -->
<route>
<from uri="direct:stockQuoteWebservice"/>
- <to uri="springws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
+ <to uri="spring-ws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceAsString"/>
- <to uri="springws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
+ <to uri="spring-ws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
<convertBodyTo type="java.lang.String"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceWithDefaultTemplate"/>
- <to uri="springws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
+ <to uri="spring-ws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceWithNonDefaultMessageFactory"/>
- <to uri="springws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote&messageFactory=#messageFactory"/>
+ <to uri="spring-ws:http://localhost?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote&messageFactory=#messageFactory"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceWithoutDefaultUri"/>
- <to uri="springws:http://dummy?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
+ <to uri="spring-ws:http://dummy?webServiceTemplate=#webServiceTemplate&soapAction=http://www.stockquotes.edu/GetQuote"/>
<convertBodyTo type="java.lang.String"/>
</route>
<!-- consumer route (providing the actual web service) -->
<route>
- <from uri="springws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/>
+ <from uri="spring-ws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/>
<to uri="responseProcessor"/>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest-context.xml?rev=1030857&r1=1030856&r2=1030857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest-context.xml (original)
+++ camel/trunk/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest-context.xml Thu Nov 4 08:45:25 2010
@@ -30,24 +30,24 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:stockQuoteWebservice"/>
- <to uri="springws:http://www.webservicex.net/stockquote.asmx?webServiceTemplate=#webServiceTemplate&soapAction=http://www.webserviceX.NET/GetQuote"/>
+ <to uri="spring-ws:http://www.webservicex.net/stockquote.asmx?webServiceTemplate=#webServiceTemplate&soapAction=http://www.webserviceX.NET/GetQuote"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceAsString"/>
- <to uri="springws:http://www.webservicex.net/stockquote.asmx?webServiceTemplate=#webServiceTemplate&soapAction=http://www.webserviceX.NET/GetQuote"/>
+ <to uri="spring-ws:http://www.webservicex.net/stockquote.asmx?webServiceTemplate=#webServiceTemplate&soapAction=http://www.webserviceX.NET/GetQuote"/>
<convertBodyTo type="java.lang.String"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceWithDefaultTemplate"/>
- <to uri="springws:http://www.webservicex.net/stockquote.asmx?soapAction=http://www.webserviceX.NET/GetQuote"/>
+ <to uri="spring-ws:http://www.webservicex.net/stockquote.asmx?soapAction=http://www.webserviceX.NET/GetQuote"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceWithNonDefaultMessageFactory"/>
- <to uri="springws:http://www.webservicex.net/stockquote.asmx?messageFactory=#messageFactory&soapAction=http://www.webserviceX.NET/GetQuote"/>
+ <to uri="spring-ws:http://www.webservicex.net/stockquote.asmx?messageFactory=#messageFactory&soapAction=http://www.webserviceX.NET/GetQuote"/>
</route>
<route>
<from uri="direct:stockQuoteWebserviceWithoutDefaultUri"/>
- <to uri="springws:http://dummy?webServiceTemplate=#webServiceTemplate&soapAction=http://www.webserviceX.NET/GetQuote"/>
+ <to uri="spring-ws:http://dummy?webServiceTemplate=#webServiceTemplate&soapAction=http://www.webserviceX.NET/GetQuote"/>
<convertBodyTo type="java.lang.String"/>
</route>
</camelContext>