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 80d1e980842dfc844416b98db504c887cf944763 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Apr 1 04:45:17 2019 +0200 CAMEL-13380: camel-core - Move cloud out into camel-cloud component. Woprk in progress --- .../apache/camel/cloud/DiscoverableService.java | 0 .../apache/camel/cloud/ServiceCallConstants.java | 0 .../org/apache/camel/cloud/ServiceChooser.java | 0 .../apache/camel/cloud/ServiceChooserAware.java | 0 .../apache/camel/cloud/ServiceChooserFactory.java | 0 .../org/apache/camel/cloud/ServiceDefinition.java | 0 .../org/apache/camel/cloud/ServiceDiscovery.java | 0 .../apache/camel/cloud/ServiceDiscoveryAware.java | 0 .../camel/cloud/ServiceDiscoveryFactory.java | 0 .../camel/cloud/ServiceExpressionFactory.java | 0 .../org/apache/camel/cloud/ServiceFactory.java | 0 .../java/org/apache/camel/cloud/ServiceFilter.java | 0 .../org/apache/camel/cloud/ServiceFilterAware.java | 0 .../apache/camel/cloud/ServiceFilterFactory.java | 0 .../java/org/apache/camel/cloud/ServiceHealth.java | 0 .../apache/camel/cloud/ServiceLoadBalancer.java | 0 .../camel/cloud/ServiceLoadBalancerFactory.java | 0 .../camel/cloud/ServiceLoadBalancerFunction.java | 0 .../org/apache/camel/cloud/ServiceRegistry.java | 0 .../main/java/org/apache/camel/cloud/package.html | 0 core/camel-cloud/pom.xml | 66 ++++++++++++++++++++++ .../camel/impl/cloud/AbstractServiceRegistry.java | 0 .../camel/impl/cloud/BlacklistServiceFilter.java | 0 .../impl/cloud/BlacklistServiceFilterFactory.java | 0 .../camel/impl/cloud/CachingServiceDiscovery.java | 0 .../impl/cloud/CachingServiceDiscoveryFactory.java | 0 .../camel/impl/cloud/CombinedServiceDiscovery.java | 0 .../cloud/CombinedServiceDiscoveryFactory.java | 0 .../camel/impl/cloud/CombinedServiceFilter.java | 0 .../impl/cloud/CombinedServiceFilterFactory.java | 0 .../impl/cloud/DefaultServiceCallExpression.java | 4 +- .../impl/cloud/DefaultServiceCallProcessor.java | 0 .../camel/impl/cloud/DefaultServiceDefinition.java | 0 .../camel/impl/cloud/DefaultServiceDiscovery.java | 0 .../camel/impl/cloud/DefaultServiceFilter.java | 0 .../camel/impl/cloud/DefaultServiceHealth.java | 0 .../impl/cloud/DefaultServiceLoadBalancer.java | 0 .../cloud/DefaultServiceLoadBalancerFactory.java | 0 .../camel/impl/cloud/HealthyServiceFilter.java | 0 .../impl/cloud/HealthyServiceFilterFactory.java | 0 .../camel/impl/cloud/PassThroughServiceFilter.java | 0 .../cloud/PassThroughServiceFilterFactory.java | 0 .../camel/impl/cloud/RandomServiceChooser.java | 0 .../camel/impl/cloud/RoundRobinServiceChooser.java | 0 .../impl}/cloud/ServiceCallExpressionSupport.java | 3 +- .../impl/cloud/ServiceRegistrationRoutePolicy.java | 0 .../ServiceRegistrationRoutePolicyFactory.java | 0 .../camel/impl/cloud/ServiceRegistryHelper.java | 0 .../camel/impl/cloud/ServiceRegistrySelectors.java | 0 .../camel/impl/cloud/StaticServiceDiscovery.java | 0 .../impl/cloud/StaticServiceDiscoveryFactory.java | 0 .../java/org/apache/camel/impl/cloud/package.html | 0 core/pom.xml | 1 + 53 files changed, 70 insertions(+), 4 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/DiscoverableService.java b/core/camel-api/src/main/java/org/apache/camel/cloud/DiscoverableService.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/DiscoverableService.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/DiscoverableService.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooser.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceChooser.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooser.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceChooser.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDefinition.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDefinition.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDefinition.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDefinition.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFactory.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFactory.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFactory.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFactory.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilter.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFilter.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilter.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFilter.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceHealth.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceHealth.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceRegistry.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceRegistry.java similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceRegistry.java rename to core/camel-api/src/main/java/org/apache/camel/cloud/ServiceRegistry.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/package.html b/core/camel-api/src/main/java/org/apache/camel/cloud/package.html similarity index 100% rename from core/camel-base/src/main/java/org/apache/camel/cloud/package.html rename to core/camel-api/src/main/java/org/apache/camel/cloud/package.html diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml new file mode 100644 index 0000000..3ac8325 --- /dev/null +++ b/core/camel-cloud/pom.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>core</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-cloud</artifactId> + <packaging>jar</packaging> + <name>Camel :: Cloud</name> + <description>Camel Cloud support</description> + + <properties> + <firstVersion>3.0</firstVersion> + <label>cloud</label> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>spi-annotations</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>meta-annotations</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-support</artifactId> + </dependency> + <dependency> + <groupId>com.github.ben-manes.caffeine</groupId> + <artifactId>caffeine</artifactId> + <version>${caffeine-version}</version> + </dependency> + + </dependencies> + +</project> diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java similarity index 94% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java index 8b8c5ad..58ccb3e 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java @@ -16,13 +16,11 @@ */ package org.apache.camel.impl.cloud; -import org.apache.camel.cloud.ServiceCallExpressionSupport; -import org.apache.camel.model.cloud.ServiceCallDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Support class for custom implementations of {@link ServiceCallDefinition ServiceCall EIP} components. + * Support class for custom implementations of ServiceCall EIP components. * <p/> * Below are some examples how to call a service and what Camel endpoint URI is constructed based on the input: * <pre> diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java diff --git a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallExpressionSupport.java similarity index 96% rename from core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallExpressionSupport.java index 1879209..dd69366 100644 --- a/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallExpressionSupport.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.cloud; +package org.apache.camel.impl.cloud; import org.apache.camel.Exchange; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.cloud.ServiceCallConstants; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.support.ExpressionAdapter; diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cloud/package.html b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/package.html similarity index 100% rename from core/camel-core/src/main/java/org/apache/camel/impl/cloud/package.html rename to core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/package.html diff --git a/core/pom.xml b/core/pom.xml index a8fbeb3..08b7958 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -40,6 +40,7 @@ <module>camel-support</module> <module>camel-caffeine-lrucache</module> <module>camel-headersmap</module> + <module>camel-cloud</module> <module>camel-management-api</module> <module>camel-management-impl</module> <module>camel-base</module>
