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 2019/06/06 03:58:48 UTC
[camel] 01/03: CAMEL-13220: Remove deprecated producer.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e3a9301c63f424a726cb2aeb879cf6c24a7339f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 6 05:44:36 2019 +0200
CAMEL-13220: Remove deprecated producer.
---
components/camel-ribbon/pom.xml | 5 +++++
.../component/ribbon/cloud/RibbonServiceCallRegistryRouteTest.java | 4 ++--
.../camel/component/ribbon/cloud/RibbonServiceCallRouteDslTest.java | 2 +-
.../component/ribbon/cloud/RibbonServiceCallRouteMetadataTest.java | 2 +-
.../camel/component/ribbon/cloud/RibbonServiceCallRouteTest.java | 4 ++--
.../component/ribbon/cloud/RibbonServiceCallUpdateRouteTest.java | 4 ++--
.../component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml | 2 +-
.../ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml | 2 +-
.../component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml | 2 +-
9 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
index 8ce01f9..65c45b1 100644
--- a/components/camel-ribbon/pom.xml
+++ b/components/camel-ribbon/pom.xml
@@ -68,6 +68,11 @@
<artifactId>camel-jetty</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http4</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
diff --git a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRegistryRouteTest.java b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRegistryRouteTest.java
index 2dff263..a658d83 100644
--- a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRegistryRouteTest.java
+++ b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRegistryRouteTest.java
@@ -47,8 +47,8 @@ public class RibbonServiceCallRegistryRouteTest extends RibbonServiceCallRouteTe
from("direct:start")
.serviceCall()
.name("myService")
- .component("jetty")
- .end()
+ .component("http")
+ .end()
.to("mock:result");
from("jetty:http://localhost:9090")
.to("mock:9090")
diff --git a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteDslTest.java b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteDslTest.java
index 87bf06e..8421c23 100644
--- a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteDslTest.java
+++ b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteDslTest.java
@@ -44,7 +44,7 @@ public class RibbonServiceCallRouteDslTest extends CamelTestSupport {
from("direct:start")
.serviceCall()
.name("myService")
- .component("jetty")
+ .component("http")
.ribbonLoadBalancer()
.staticServiceDiscovery()
.servers("localhost:9090")
diff --git a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteMetadataTest.java b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteMetadataTest.java
index 9dc17d4..93bee58 100644
--- a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteMetadataTest.java
+++ b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteMetadataTest.java
@@ -55,7 +55,7 @@ public class RibbonServiceCallRouteMetadataTest extends CamelTestSupport {
from("direct:start")
.serviceCall()
.name("myService")
- .expression().simple("jetty:http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/${header.CamelServiceCallServiceMeta[contextPath]}")
+ .expression().simple("http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/${header.CamelServiceCallServiceMeta[contextPath]}")
.loadBalancer(loadBalancer)
.serviceDiscovery(servers)
.end()
diff --git a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteTest.java b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteTest.java
index 40e621a..e4f6b98 100644
--- a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteTest.java
+++ b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallRouteTest.java
@@ -54,10 +54,10 @@ public class RibbonServiceCallRouteTest extends CamelTestSupport {
from("direct:start")
.serviceCall()
.name("myService")
- .component("jetty")
+ .component("http")
.loadBalancer(loadBalancer)
.serviceDiscovery(servers)
- .end()
+ .end()
.to("mock:result");
from("jetty:http://localhost:9090")
.to("mock:9090")
diff --git a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallUpdateRouteTest.java b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallUpdateRouteTest.java
index 9876987..a45cafa 100644
--- a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallUpdateRouteTest.java
+++ b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/RibbonServiceCallUpdateRouteTest.java
@@ -81,10 +81,10 @@ public class RibbonServiceCallUpdateRouteTest extends CamelTestSupport {
from("direct:start")
.serviceCall()
.name("myService")
- .component("jetty")
+ .component("http")
.loadBalancer(loadBalancer)
.serviceDiscovery(servers)
- .end()
+ .end()
.to("mock:result");
from("jetty:http://localhost:9090").routeId("9090")
.to("mock:9090")
diff --git a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
index 692bd68..6de9bad 100644
--- a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
+++ b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
@@ -47,7 +47,7 @@
<route id="scall">
<from uri="direct:start"/>
- <serviceCall name="myService" component="jetty"/>
+ <serviceCall name="myService" component="http"/>
<to uri="mock:result"/>
</route>
diff --git a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
index 368833e..4cd67c1 100644
--- a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
+++ b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
@@ -32,7 +32,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="scall">
<from uri="direct:start"/>
- <serviceCall name="myService" component="jetty">
+ <serviceCall name="myService" component="http">
<!-- enable ribbon load balancer -->
<ribbonLoadBalancer clientName="myClient">
<properties key="listOfServers" value="localhost:{{firstPort}},localhost:{{secondPort}}"/>
diff --git a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
index 63add53..65578bd 100644
--- a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
+++ b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
@@ -32,7 +32,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="scall">
<from uri="direct:start"/>
- <serviceCall name="myService" component="jetty">
+ <serviceCall name="myService" component="http">
<!-- static list of servers -->
<staticServiceDiscovery>
<servers>localhost:{{firstPort}},localhost:{{secondPort}}</servers>