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/04/06 09:59:00 UTC
[camel] 07/14: CAMEL-13380: camel-core - Move cloud out into
camel-cloud component. Woprk in progress
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch cloud2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b6019213a760da6ef34225c988fbf2eaedb078b7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Apr 5 17:14:55 2019 +0200
CAMEL-13380: camel-core - Move cloud out into camel-cloud component. Woprk in progress
---
components/camel-consul/pom.xml | 3 +--
components/camel-zookeeper/pom.xml | 3 +--
.../org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java | 6 +++---
parent/pom.xml | 5 +++++
platforms/karaf/features/src/main/resources/features.xml | 1 +
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 6d18805..9ad068e 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -37,10 +37,9 @@
</properties>
<dependencies>
- <!-- core required: org.apache.camel.cloud, org.apache.camel.impl.cloud -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
<groupId>com.orbitz.consul</groupId>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index a60be71..952e1e4 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -38,10 +38,9 @@
<dependencies>
- <!-- requires camel-core due camel-cloud and others -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
index 3626ef8..0d9b5c0 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
@@ -47,7 +47,9 @@ import static org.apache.camel.support.CamelContextHelper.lookup;
public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCallDefinition> {
- protected ServiceCallProcessorFactory() {
+ private volatile ServiceCallDefinition definition;
+
+ public ServiceCallProcessorFactory() {
super(ServiceCallDefinition.class);
}
@@ -55,8 +57,6 @@ public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCa
// Processor Factory
// *****************************
- private volatile ServiceCallDefinition definition;
-
@Override
public Processor doCreateProcessor(RouteContext routeContext, ServiceCallDefinition definition) throws Exception {
this.definition = definition;
diff --git a/parent/pom.xml b/parent/pom.xml
index f90c53a..6073d3d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -827,6 +827,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cloud</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-headersmap</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 205442d..f5bc782 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -52,6 +52,7 @@
<bundle>mvn:org.apache.camel/camel-management-impl/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-cloud/${project.version}</bundle>
<!-- core components -->
<bundle>mvn:org.apache.camel/camel-browse/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-controlbus/${project.version}</bundle>