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 5978cf5cab600dfb541a6b59f226aed2651d2c5d Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Jun 6 13:18:40 2019 +0200 CAMEL-13618: camel3 - Move FileWatcherReloadStrategy out of camel-core --- MIGRATION.md | 2 ++ .../main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java | 2 +- core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java | 2 +- .../org/apache/camel/{impl => reload}/FileWatcherReloadStrategy.java | 2 +- .../java/org/apache/camel/{impl => reload}/ReloadStrategySupport.java | 2 +- .../java/org/apache/camel/impl/model/FileWatcherReloadStrategyTest.java | 2 +- .../apache/camel/management/ManagedFileWatcherReloadStrategyTest.java | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/MIGRATION.md b/MIGRATION.md index 84c6ddd..a8e3279 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -255,6 +255,8 @@ The annotation `org.apache.camel.language.SpEL` has been moved to `org.apache.ca Rename various APIs in camel-core to fix the typo `chiper` to `cipher`. +The classes `ReloadStrategySupport` and `FileWatcherReloadStrategy` has been moved from package `org.apache.camel.impl` to `org.apache.camel.reload`. + #### camel-test If you are using camel-test and override the `createRegistry` method, for example to register beans from the `JndiRegisty` class, then this is no longer necessary, and instead diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java index a3c4c85..5085eff 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java @@ -39,10 +39,10 @@ import org.apache.camel.component.properties.PropertiesParser; import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.health.HealthCheckService; -import org.apache.camel.impl.FileWatcherReloadStrategy; import org.apache.camel.model.Model; import org.apache.camel.processor.interceptor.BacklogTracer; import org.apache.camel.processor.interceptor.HandleFault; +import org.apache.camel.reload.FileWatcherReloadStrategy; import org.apache.camel.spi.AsyncProcessorAwaitManager; import org.apache.camel.spi.BeanRepository; import org.apache.camel.spi.EndpointStrategy; diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java index dd0b85b..7394bb5 100644 --- a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java +++ b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java @@ -49,7 +49,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.health.HealthCheckService; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.FileWatcherReloadStrategy; +import org.apache.camel.reload.FileWatcherReloadStrategy; import org.apache.camel.model.Model; import org.apache.camel.model.RouteDefinition; import org.apache.camel.processor.interceptor.BacklogTracer; diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java b/core/camel-core/src/main/java/org/apache/camel/reload/FileWatcherReloadStrategy.java similarity index 99% rename from core/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java rename to core/camel-core/src/main/java/org/apache/camel/reload/FileWatcherReloadStrategy.java index e027286..ca10bcc 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java +++ b/core/camel-core/src/main/java/org/apache/camel/reload/FileWatcherReloadStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.impl; +package org.apache.camel.reload; import java.io.File; import java.io.InputStream; diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java b/core/camel-core/src/main/java/org/apache/camel/reload/ReloadStrategySupport.java similarity index 99% rename from core/camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java rename to core/camel-core/src/main/java/org/apache/camel/reload/ReloadStrategySupport.java index 7fe59a0..49d548e 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java +++ b/core/camel-core/src/main/java/org/apache/camel/reload/ReloadStrategySupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.impl; +package org.apache.camel.reload; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/model/FileWatcherReloadStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/model/FileWatcherReloadStrategyTest.java index d6b7b60..402dede 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/model/FileWatcherReloadStrategyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/model/FileWatcherReloadStrategyTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.impl.FileWatcherReloadStrategy; +import org.apache.camel.reload.FileWatcherReloadStrategy; import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.CamelEvent.RouteAddedEvent; import org.apache.camel.support.EventNotifierSupport; diff --git a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedFileWatcherReloadStrategyTest.java b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedFileWatcherReloadStrategyTest.java index f41ea73..377fe5d 100644 --- a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedFileWatcherReloadStrategyTest.java +++ b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedFileWatcherReloadStrategyTest.java @@ -20,7 +20,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.impl.FileWatcherReloadStrategy; +import org.apache.camel.reload.FileWatcherReloadStrategy; import org.junit.Test; public class ManagedFileWatcherReloadStrategyTest extends ManagementTestSupport {