This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2450fd9fabbc4ba3800039f098dfbf2381e17bbb
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Aug 6 09:43:45 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-quartz2 to
camel-quartz
---
components/{camel-quartz2 => camel-quartz}/pom.xml | 6 +++---
.../src/main/docs/quartz2-component.adoc | 0
.../apache/camel/component/quartz2/CamelJob.java | 0
.../camel/component/quartz2/QuartzComponent.java | 2 +-
.../camel/component/quartz2/QuartzConstants.java | 0
.../camel/component/quartz2/QuartzConsumer.java | 0
.../camel/component/quartz2/QuartzEndpoint.java | 2 +-
.../camel/component/quartz2/QuartzHelper.java | 0
.../camel/component/quartz2/QuartzMessage.java | 0
.../camel/component/quartz2/StatefulCamelJob.java | 0
.../quartz2/QuartzScheduledPollConsumerJob.java | 0
.../QuartzScheduledPollConsumerScheduler.java | 4 ++--
.../quartz2/CronScheduledRoutePolicy.java | 2 +-
.../camel/routepolicy/quartz2/ScheduledJob.java | 0
.../routepolicy/quartz2/ScheduledJobState.java | 0
.../routepolicy/quartz2/ScheduledRouteDetails.java | 0
.../routepolicy/quartz2/ScheduledRoutePolicy.java | 2 +-
.../quartz2/ScheduledRoutePolicyConstants.java | 0
.../quartz2/SimpleScheduledRoutePolicy.java | 2 +-
.../camel/component/quartz2/BaseQuartzTest.java | 2 +-
.../quartz2/DelegateEndpointQuartzTest.java | 2 +-
.../quartz2/QuartUnderscoreTimerNameTest.java | 2 +-
.../quartz2/QuartzAddDynamicRouteTest.java | 2 +-
...uartzAddRoutesAfterCamelContextStartedTest.java | 2 +-
.../component/quartz2/QuartzAutoStartTest.java | 4 ++--
...omponentCamelContextSchedulerIsolationTest.java | 2 +-
...tzComponentCamelContextSharedSchedulerTest.java | 8 ++++----
.../component/quartz2/QuartzComponentTest.java | 0
.../quartz2/QuartzCronRouteDurableJobTest.java | 2 +-
.../component/quartz2/QuartzCronRouteTest.java | 2 +-
.../quartz2/QuartzCronRouteWithSmallCacheTest.java | 2 +-
.../quartz2/QuartzCronTriggerRouteTest.java | 2 +-
.../quartz2/QuartzCustomCalendarFireTest.java | 4 ++--
.../quartz2/QuartzCustomCalendarNoFireTest.java | 4 ++--
.../quartz2/QuartzEndpointConfigureTest.java | 18 ++++++++--------
.../component/quartz2/QuartzInterruptTest.java | 6 +++---
.../quartz2/QuartzJobRouteUnderscoreTest.java | 2 +-
.../component/quartz2/QuartzManagementTest.java | 2 +-
.../quartz2/QuartzManuallyTriggerJobTest.java | 4 ++--
.../component/quartz2/QuartzNameCollisionTest.java | 20 +++++++++---------
.../quartz2/QuartzOneCamelContextRestartTest.java | 2 +-
.../QuartzOneCamelContextSuspendResumeTest.java | 2 +-
.../component/quartz2/QuartzPropertiesTest.java | 6 +++---
.../quartz2/QuartzRepeatIntervalTest.java | 2 +-
.../quartz2/QuartzRouteFireNowOnlyOnceTest.java | 2 +-
.../component/quartz2/QuartzRouteFireNowTest.java | 2 +-
.../component/quartz2/QuartzRouteRestartTest.java | 2 +-
.../camel/component/quartz2/QuartzRouteTest.java | 2 +-
.../component/quartz2/QuartzSimpleRouteTest.java | 2 +-
.../quartz2/QuartzStartDelayedOptionTest.java | 2 +-
.../component/quartz2/QuartzStartDelayedTest.java | 4 ++--
.../QuartzStartDelayedWithReferenceTest.java | 4 ++--
.../quartz2/QuartzStatefulJobRouteTest.java | 2 +-
.../component/quartz2/QuartzStopRouteTest.java | 2 +-
.../component/quartz2/QuartzSuspendRouteTest.java | 2 +-
.../quartz2/QuartzTwoCamelContextRestartTest.java | 4 ++--
.../QuartzTwoCamelContextSameNameClashTest.java | 4 ++--
.../QuartzTwoCamelContextSuspendResumeTest.java | 4 ++--
.../quartz2/QuartzTwoCamelContextTest.java | 6 +++---
...QuartzConsumerTwoAppsClusteredFailoverTest.java | 0
...QuartzConsumerTwoAppsClusteredRecoveryTest.java | 0
.../quartz2/SpringQuartzCronRouteTest.java | 0
...PersistentStoreRestartAppChangeOptionsTest.java | 0
.../SpringQuartzPersistentStoreRestartAppTest.java | 0
...pringQuartzPersistentStoreRestartRouteTest.java | 0
.../quartz2/SpringQuartzPersistentStoreTest.java | 0
.../component/quartz2/StatefulQuartzRouteTest.java | 2 +-
.../FileConsumerQuartzSchedulerRestartTest.java | 0
.../quartz2/FileConsumerQuartzSchedulerTest.java | 0
.../quartz2/CronScheduledRoutePolicyTest.java | 18 ++++++++--------
.../camel/routepolicy/quartz2/DateFactory.java | 0
.../quartz2/MultiplePoliciesOnRouteTest.java | 4 ++--
.../camel/routepolicy/quartz2/MyRoutePolicy.java | 0
.../RouteAutoStopFalseCronScheduledPolicyTest.java | 0
.../SimpleScheduledCombinedRoutePolicyTest.java | 4 ++--
.../quartz2/SimpleScheduledRoutePolicyTest.java | 24 +++++++++++-----------
.../SpringCronScheduledRoutePolicyTest.java | 0
.../quartz2/SpringMultiplePoliciesOnRouteTest.java | 0
.../SpringQuartzTwoAppsClusteredFailoverTest.java | 0
.../quartz2/SpringScheduledRoutePolicyTest.java | 0
.../SpringSimpleScheduledRoutePolicyTest.java | 0
.../src/test/resources/log4j2.properties | 2 +-
.../SpringQuartzConsumerClusteredAppDatabase.xml | 0
.../SpringQuartzConsumerClusteredAppOne.xml | 0
.../SpringQuartzConsumerClusteredAppTwo.xml | 0
...SpringQuartzConsumerRecoveryClusteredAppOne.xml | 2 +-
...SpringQuartzConsumerRecoveryClusteredAppTwo.xml | 2 +-
.../quartz2/SpringQuartzCronRouteTest.xml | 2 +-
...entStoreRestartAppChangeCronExpressionTest1.xml | 0
...entStoreRestartAppChangeCronExpressionTest2.xml | 0
...entStoreRestartAppChangeCronExpressionTest3.xml | 0
...PersistentStoreRestartAppChangeOptionsTest1.xml | 0
...PersistentStoreRestartAppChangeOptionsTest2.xml | 0
.../SpringQuartzPersistentStoreRestartTest.xml | 2 +-
.../quartz2/SpringQuartzPersistentStoreTest.xml | 2 +-
.../camel/component}/quartz2/myquartz.properties | 0
.../camel/routepolicy/quartz2/CronPolicies.xml | 0
.../camel/routepolicy/quartz2/MultiplePolicies.xml | 0
.../camel/routepolicy/quartz2/SimplePolicies.xml | 0
.../quartz2/SpringQuartzClusteredAppDatabase.xml | 0
.../quartz2/SpringQuartzClusteredAppOne.xml | 0
.../quartz2/SpringQuartzClusteredAppTwo.xml | 0
.../camel/routepolicy}/quartz2/myquartz.properties | 0
.../src/test/resources/tables_derby.sql | 0
.../endpoint/dsl/QuartzEndpointBuilderFactory.java | 12 +++++------
.../pom.xml | 8 ++++----
.../QuartzComponentAutoConfiguration.java | 8 ++++----
.../springboot/QuartzComponentConfiguration.java | 4 ++--
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 1 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../additional-spring-configuration-metadata.json | 10 ---------
platforms/spring-boot/components-starter/pom.xml | 1 +
114 files changed, 135 insertions(+), 143 deletions(-)
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz/pom.xml
similarity index 96%
rename from components/camel-quartz2/pom.xml
rename to components/camel-quartz/pom.xml
index 20a6aac..2a83c12 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -27,10 +27,10 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-quartz2</artifactId>
+ <artifactId>camel-quartz</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Quartz2</name>
- <description>Camel Quartz2 support</description>
+ <name>Camel :: Quartz</name>
+ <description>Camel Quartz support</description>
<dependencies>
<dependency>
diff --git a/components/camel-quartz2/src/main/docs/quartz2-component.adoc
b/components/camel-quartz/src/main/docs/quartz2-component.adoc
similarity index 100%
rename from components/camel-quartz2/src/main/docs/quartz2-component.adoc
rename to components/camel-quartz/src/main/docs/quartz2-component.adoc
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
similarity index 99%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
index f0fe409..83a0efd 100644
---
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
@@ -50,7 +50,7 @@ import org.quartz.impl.StdSchedulerFactory;
* of the code, but mostly has been re-written in attempt to be more easier to
maintain, and use Quartz more
* fully.</p>
*/
-@Component("quartz,quartz2")
+@Component("quartz")
public class QuartzComponent extends DefaultComponent implements
ExtendedStartupListener {
@Metadata(label = "advanced")
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
similarity index 99%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
index 407d11f..0a878ff 100644
---
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
@@ -53,7 +53,7 @@ import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
/**
* Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
*/
-@UriEndpoint(firstVersion = "2.12.0", scheme = "quartz2", title = "Quartz2",
syntax = "quartz2:groupName/triggerName", consumerOnly = true, label =
"scheduling")
+@UriEndpoint(firstVersion = "2.12.0", scheme = "quartz", title = "Quartz",
syntax = "quartz:groupName/triggerName", consumerOnly = true, label =
"scheduling")
public class QuartzEndpoint extends DefaultEndpoint {
private TriggerKey triggerKey;
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
similarity index 99%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
index 2ff32ec..bf0156d 100644
---
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
@@ -168,7 +168,7 @@ public class QuartzScheduledPollConsumerScheduler extends
ServiceSupport impleme
if (quartzScheduler == null) {
// get the scheduler form the quartz component
- QuartzComponent quartz = getCamelContext().getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = getCamelContext().getComponent("quartz",
QuartzComponent.class);
setQuartzScheduler(quartz.getScheduler());
}
@@ -237,7 +237,7 @@ public class QuartzScheduledPollConsumerScheduler extends
ServiceSupport impleme
quartzScheduler.scheduleJob(job, trigger);
} catch (ObjectAlreadyExistsException ex) {
// some other VM might may have stored the job & trigger
in DB in clustered mode, in the mean time
- QuartzComponent quartz =
getCamelContext().getComponent("quartz2", QuartzComponent.class);
+ QuartzComponent quartz =
getCamelContext().getComponent("quartz", QuartzComponent.class);
if (!(quartz.isClustered())) {
throw ex;
} else {
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
similarity index 99%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
index 5d8eb2b..abfbd9a 100644
---
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
@@ -45,7 +45,7 @@ public class CronScheduledRoutePolicy extends
ScheduledRoutePolicy implements Sc
}
protected void doOnInit(Route route) throws Exception {
- QuartzComponent quartz =
route.getCamelContext().getComponent("quartz2", QuartzComponent.class);
+ QuartzComponent quartz =
route.getCamelContext().getComponent("quartz", QuartzComponent.class);
setScheduler(quartz.getScheduler());
// Important: do not start scheduler as QuartzComponent does that
automatic
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
similarity index 99%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
index 7b4833d..7ebf60c 100644
---
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
@@ -110,7 +110,7 @@ public abstract class ScheduledRoutePolicy extends
RoutePolicySupport implements
loadCallbackDataIntoSchedulerContext(jobDetail, action, route);
- boolean isClustered = route.getCamelContext().getComponent("quartz2",
QuartzComponent.class).isClustered();
+ boolean isClustered = route.getCamelContext().getComponent("quartz",
QuartzComponent.class).isClustered();
if (isClustered) {
// check to see if the same job has already been setup through
another node of the cluster
JobDetail existingJobDetail =
getScheduler().getJobDetail(jobDetail.getKey());
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
similarity index 100%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
diff --git
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
similarity index 99%
rename from
components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
rename to
components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
index f79d6d8..88eb174 100644
---
a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
@@ -51,7 +51,7 @@ public class SimpleScheduledRoutePolicy extends
ScheduledRoutePolicy {
}
protected void doOnInit(Route route) throws Exception {
- QuartzComponent quartz =
route.getCamelContext().getComponent("quartz2", QuartzComponent.class);
+ QuartzComponent quartz =
route.getCamelContext().getComponent("quartz", QuartzComponent.class);
setScheduler(quartz.getScheduler());
// Important: do not start scheduler as QuartzComponent does that
automatic
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
index 917d1ba..0493c4c 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
@@ -30,7 +30,7 @@ public class BaseQuartzTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- QuartzComponent quartz = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = context.getComponent("quartz",
QuartzComponent.class);
quartz.setEnableJmx(useJmx());
return context;
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
similarity index 97%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
index 9814a81..e8e25ef 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
@@ -53,7 +53,7 @@ public class DelegateEndpointQuartzTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("my:quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:result");
+
from("my:quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
index c9cf6c5..1d00eec 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
@@ -34,7 +34,7 @@ public class QuartUnderscoreTimerNameTest extends
BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://my_group?cron=0/1+*+*+*+*+?").to("mock:result");
+ from("quartz://my_group?cron=0/1+*+*+*+*+?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
index d23de7f..bd7ac1d 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
@@ -39,7 +39,7 @@ public class QuartzAddDynamicRouteTest extends BaseQuartzTest
{
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
.to("direct:foo");
}
});
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
similarity index 92%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
index 6994067..7bab767 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
@@ -34,7 +34,7 @@ public class QuartzAddRoutesAfterCamelContextStartedTest
extends BaseQuartzTest
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=1000&trigger.repeatCount=1").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=1000&trigger.repeatCount=1").to("mock:result");
}
});
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
similarity index 89%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
index fc654f5..63bae6c 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
@@ -27,7 +27,7 @@ public class QuartzAutoStartTest extends BaseQuartzTest {
MockEndpoint mock = getMockEndpoint("mock:one");
mock.expectedMessageCount(0);
- QuartzComponent quartz = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = context.getComponent("quartz",
QuartzComponent.class);
assertFalse("Should not have started scheduler",
quartz.getScheduler().isStarted());
Thread.sleep(2000);
@@ -50,7 +50,7 @@ public class QuartzAutoStartTest extends BaseQuartzTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?&autoStartScheduler=false").to("mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?&autoStartScheduler=false").to("mock:one");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
similarity index 97%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
index d303a9f..8ee0be9 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
@@ -68,7 +68,7 @@ public class
QuartzComponentCamelContextSchedulerIsolationTest {
* Get the quartz component for the provided camel context.
*/
private QuartzComponent getQuartzComponent(CamelContext context) {
- return context.getComponent("quartz2", QuartzComponent.class);
+ return context.getComponent("quartz", QuartzComponent.class);
}
/**
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
similarity index 90%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
index 56754c2..2a7d514 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
@@ -39,7 +39,7 @@ public class QuartzComponentCamelContextSharedSchedulerTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:one");
}
});
camel1.start();
@@ -47,14 +47,14 @@ public class QuartzComponentCamelContextSharedSchedulerTest
{
camel2 = new DefaultCamelContext();
camel2.setName("camel-2");
- Scheduler camel1Scheduler = camel1.getComponent("quartz2",
QuartzComponent.class).getScheduler();
- QuartzComponent camel2QuartzComponent = camel2.getComponent("quartz2",
QuartzComponent.class);
+ Scheduler camel1Scheduler = camel1.getComponent("quartz",
QuartzComponent.class).getScheduler();
+ QuartzComponent camel2QuartzComponent = camel2.getComponent("quartz",
QuartzComponent.class);
camel2QuartzComponent.setScheduler(camel1Scheduler);
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
}
});
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
similarity index 91%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
index 4b86b9f..94f39ed 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
@@ -29,7 +29,7 @@ public class QuartzCronRouteDurableJobTest extends
QuartzCronRouteTest {
public void configure() {
// triggers every 1th second at precise 00,01,02,03..59
// notice we must use + as space when configured using URI
parameter
-
from("quartz2://myGroup/myTimerName?durableJob=true&recoverableJob=true&cron=0/1+*+*+*+*+?").to("mock:result");
+
from("quartz://myGroup/myTimerName?durableJob=true&recoverableJob=true&cron=0/1+*+*+*+*+?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
similarity index 96%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
index 5f90637..eb32cd4 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
@@ -52,7 +52,7 @@ public class QuartzCronRouteTest extends BaseQuartzTest {
return new RouteBuilder() {
public void configure() {
// triggers every 1th second at precise 00,01,02,03..59
- from("quartz2://myGroup/myTimerName?cron=0/1 * * * *
?").to("mock:result");
+ from("quartz://myGroup/myTimerName?cron=0/1 * * * *
?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
similarity index 96%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
index 86ac3db..db1080f 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
@@ -55,7 +55,7 @@ public class QuartzCronRouteWithSmallCacheTest extends
BaseQuartzTest {
public void configure() {
from("direct:foo").to("log:foo");
-
from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(new
Processor() {
+
from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(new Processor()
{
@Override
public void process(Exchange exchange) throws Exception {
latch.countDown();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
index e3d35ca..e37630c 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
@@ -43,7 +43,7 @@ public class QuartzCronTriggerRouteTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?&trigger.timeZone=UTC").to("mock:result");
+
from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?&trigger.timeZone=UTC").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
index b305cc1..550cfc8 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
@@ -36,7 +36,7 @@ public class QuartzCustomCalendarFireTest extends
BaseQuartzTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(0);
- QuartzComponent component = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent component = context.getComponent("quartz",
QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
Calendar c =
scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
@@ -65,7 +65,7 @@ public class QuartzCustomCalendarFireTest extends
BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
+
from("quartz://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
index ae71728..48a26dd 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
@@ -36,7 +36,7 @@ public class QuartzCustomCalendarNoFireTest extends
BaseQuartzTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(0);
- QuartzComponent component = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent component = context.getComponent("quartz",
QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
Calendar c =
scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
@@ -62,7 +62,7 @@ public class QuartzCustomCalendarNoFireTest extends
BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
+
from("quartz://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
index d6d4665..124e907 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
@@ -30,7 +30,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureGroupAndName() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2://myGroup/myName?trigger.repeatCount=3&trigger.repeatInterval=1000");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myName?trigger.repeatCount=3&trigger.repeatInterval=1000");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -48,7 +48,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureName() throws Exception {
- QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2://myName");
+ QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myName");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -62,7 +62,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureCronExpression() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -81,7 +81,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureAnotherCronExpression() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2://myGroup/myTimerName?cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0+*+*+*+?");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -100,7 +100,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureJobName() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2://myGroup/myTimerName?job.name=hadrian&cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myTimerName?job.name=hadrian&cron=0+0+*+*+*+?");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -117,7 +117,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureNoDoubleSlashNoCron() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2:myGroup/myTimerName");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName");
TriggerKey triggerKey = endpoint.getTriggerKey();
assertEquals("getName()", "myTimerName", triggerKey.getName());
@@ -126,7 +126,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureNoDoubleSlashQuestionCron() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2:myGroup/myTimerName?cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -145,11 +145,11 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureDeleteJob() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz2:myGroup/myTimerName?cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
assertEquals("cron expression", "0 0 * * * ?", endpoint.getCron());
assertEquals("deleteJob", true, endpoint.isDeleteJob());
- endpoint =
resolveMandatoryEndpoint("quartz2:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false");
+ endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false");
assertEquals("cron expression", "1 0 * * * ?", endpoint.getCron());
assertEquals("deleteJob", false, endpoint.isDeleteJob());
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
similarity index 86%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
index e446655..cb3bd30 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
@@ -31,7 +31,7 @@ public class QuartzInterruptTest extends BaseQuartzTest {
// lets test the receive worked
resultEndpoint.assertIsSatisfied();
- QuartzComponent quartz = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = context.getComponent("quartz",
QuartzComponent.class);
quartz.stop();
}
@@ -39,10 +39,10 @@ public class QuartzInterruptTest extends BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- QuartzComponent quartz = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = context.getComponent("quartz",
QuartzComponent.class);
quartz.setInterruptJobsOnShutdown(true);
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=100").routeId("myRoute").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=100").routeId("myRoute").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
index bc336f8..7adec60 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
@@ -41,7 +41,7 @@ public class QuartzJobRouteUnderscoreTest extends
BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://my_group/my_timer?trigger.repeatInterval=2&trigger.repeatCount=1&job.name=my_job")
+
from("quartz://my_group/my_timer?trigger.repeatInterval=2&trigger.repeatCount=1&job.name=my_job")
.to("mock:result");
}
};
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
index 99388df..60b7818 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
@@ -55,7 +55,7 @@ public class QuartzManagementTest extends BaseQuartzTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
index 8cbd598..2ecbe6f 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
@@ -36,7 +36,7 @@ public class QuartzManuallyTriggerJobTest extends
BaseQuartzTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- QuartzComponent component = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent component = context.getComponent("quartz",
QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
// collect all jobKeys of this route (ideally only one).
@@ -58,7 +58,7 @@ public class QuartzManuallyTriggerJobTest extends
BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://MyTimer?cron=05+00+00+*+*+?").to("mock:result");
+ from("quartz://MyTimer?cron=05+00+00+*+*+?").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
similarity index 85%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
index fc31f3a..dfcbfdf 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
@@ -40,7 +40,7 @@ public class QuartzNameCollisionTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
}
});
camel1.start();
@@ -49,7 +49,7 @@ public class QuartzNameCollisionTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("log:two",
"mock:two");
+
from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("log:two",
"mock:two");
}
});
Assert.fail("Should have thrown an exception");
@@ -66,7 +66,7 @@ public class QuartzNameCollisionTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
}
});
camel1.start();
@@ -76,7 +76,7 @@ public class QuartzNameCollisionTest {
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName=0/2+*+*+*+*+?").to("log:two", "mock:two");
+
from("quartz://myGroup/myTimerName=0/2+*+*+*+*+?").to("log:two", "mock:two");
}
});
camel2.start();
@@ -92,7 +92,7 @@ public class QuartzNameCollisionTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?stateful=true&cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?stateful=true&cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
}
});
camel1.start();
@@ -102,7 +102,7 @@ public class QuartzNameCollisionTest {
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?stateful=true").to("log:two", "mock:two");
+
from("quartz://myGroup/myTimerName?stateful=true").to("log:two", "mock:two");
}
});
camel2.start();
@@ -119,7 +119,7 @@ public class QuartzNameCollisionTest {
camel.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
}
});
@@ -148,20 +148,20 @@ public class QuartzNameCollisionTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").id("route-1").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").id("route-1").to("log:one",
"mock:one");
}
});
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup2/myTimerName?cron=0/1+*+*+*+*+?").id("route-2").to("log:one",
"mock:one");
+
from("quartz://myGroup2/myTimerName?cron=0/1+*+*+*+*+?").id("route-2").to("log:one",
"mock:one");
}
});
camel1.start();
- QuartzComponent component = (QuartzComponent)
camel1.getComponent("quartz2");
+ QuartzComponent component = (QuartzComponent)
camel1.getComponent("quartz");
Scheduler scheduler = component.getScheduler();
TriggerKey triggerKey = TriggerKey.triggerKey("myTimerName",
"myGroup");
Trigger trigger = scheduler.getTrigger(triggerKey);
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
index 9d6671c..2184206 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
@@ -34,7 +34,7 @@ public class QuartzOneCamelContextRestartTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
}
});
camel1.start();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
index e179227..1800bd2 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
@@ -34,7 +34,7 @@ public class QuartzOneCamelContextSuspendResumeTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
}
});
camel1.start();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
similarity index 92%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
index c16b882..cc35c99 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
@@ -40,7 +40,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
@Test
public void testQuartzPropertiesFile() throws Exception {
- quartz = context.getComponent("quartz2", QuartzComponent.class);
+ quartz = context.getComponent("quartz", QuartzComponent.class);
quartz.setPropertiesFile("org/apache/camel/component/quartz2/myquartz.properties");
@@ -52,7 +52,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
@Test
public void testQuartzPropertiesFileNotFound() throws Exception {
- quartz = context.getComponent("quartz2", QuartzComponent.class);
+ quartz = context.getComponent("quartz", QuartzComponent.class);
quartz.setPropertiesFile("doesnotexist.properties");
@@ -66,7 +66,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
@Test
public void testQuartzProperties() throws Exception {
- quartz = context.getComponent("quartz2", QuartzComponent.class);
+ quartz = context.getComponent("quartz", QuartzComponent.class);
Properties prop = new Properties();
InputStream is =
context.getClassResolver().loadResourceAsStream("org/apache/camel/component/quartz2/myquartz.properties");
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
index 1369398..39344d8 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
@@ -36,7 +36,7 @@ public class QuartzRepeatIntervalTest extends BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=50").routeId("myRoute")
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=50").routeId("myRoute")
.to("log:result")
.to("mock:result");
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
index 286d92e..400564d 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
@@ -40,7 +40,7 @@ public class QuartzRouteFireNowOnlyOnceTest extends
BaseQuartzTest {
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
-
from("quartz2://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=0")
+
from("quartz://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=0")
.to("log:quartz")
.to("mock:result");
// END SNIPPET: example
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
index 78ed2ce..dff0be3 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
@@ -40,7 +40,7 @@ public class QuartzRouteFireNowTest extends BaseQuartzTest {
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
-
from("quartz2://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=2")
+
from("quartz://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=2")
.to("log:quartz")
.to("mock:result");
// END SNIPPET: example
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
index 1670614..2f8685d 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
@@ -52,7 +52,7 @@ public class QuartzRouteRestartTest extends BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://groupName/timerName?cron=0/1+*+*+*+*+?").routeId("trigger")
+
from("quartz://groupName/timerName?cron=0/1+*+*+*+*+?").routeId("trigger")
.to("mock:result");
}
};
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
similarity index 92%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
index f3380e6..63e300c 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
@@ -39,7 +39,7 @@ public class QuartzRouteTest extends BaseQuartzTest {
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
// END SNIPPET: example
}
};
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
index 856f5e1..69b951c 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
@@ -51,7 +51,7 @@ public class QuartzSimpleRouteTest extends BaseQuartzTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.repeatCount=-1").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.repeatCount=-1").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
similarity index 91%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
index b8366a4..2058d36 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
@@ -37,7 +37,7 @@ public class QuartzStartDelayedOptionTest extends
BaseQuartzTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?startDelayedSeconds=2&trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
+
from("quartz://myGroup/myTimerName?startDelayedSeconds=2&trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
.to("mock:result");
}
};
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
similarity index 90%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
index 925bc8a..8097771 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
@@ -37,10 +37,10 @@ public class QuartzStartDelayedTest extends BaseQuartzTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- QuartzComponent quartz = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = context.getComponent("quartz",
QuartzComponent.class);
quartz.setStartDelayedSeconds(2);
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
similarity index 89%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
index 251878f..79fd62b 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
@@ -32,10 +32,10 @@ public class QuartzStartDelayedWithReferenceTest extends
QuartzStartDelayedTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- QuartzComponent quartz = context.getComponent("quartz2",
QuartzComponent.class);
+ QuartzComponent quartz = context.getComponent("quartz",
QuartzComponent.class);
quartz.setStartDelayedSeconds(2);
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=#interval&trigger.repeatCount=#count").routeId("myRoute").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=#interval&trigger.repeatCount=#count").routeId("myRoute").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
similarity index 95%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
index 99c4e13..6e6cefa 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
@@ -50,7 +50,7 @@ public class QuartzStatefulJobRouteTest extends
BaseQuartzTest {
public void configure() {
// triggers every 2th second at precise 00,02,04,06..58
// notice we must use + as space when configured using URI
parameter
-
from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?&stateful=true").to("mock:result");
+
from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?&stateful=true").to("mock:result");
}
};
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
similarity index 96%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
index 008ce5c..cd16c35 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
@@ -55,7 +55,7 @@ public class QuartzStopRouteTest extends BaseQuartzTest {
// START SNIPPET: e1
// triggers every second at precise 00,01,02,03..59
// notice we must use + as space when configured using URI
parameter
- from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
+ from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
.routeId("foo")
.to("log:result", "mock:result");
// END SNIPPET: e1
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
similarity index 96%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
index 44e4001..423cf4a 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
@@ -55,7 +55,7 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest {
// START SNIPPET: e1
// triggers every second at precise 00,01,02,03..59
// notice we must use + as space when configured using URI
parameter
- from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
+ from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
.routeId("foo")
.to("log:result", "mock:result");
// END SNIPPET: e1
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
similarity index 92%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
index 0fe5c88..2e64299 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
@@ -35,7 +35,7 @@ public class QuartzTwoCamelContextRestartTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one",
"mock:one");
}
});
camel1.start();
@@ -45,7 +45,7 @@ public class QuartzTwoCamelContextRestartTest {
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("log:two",
"mock:two");
+
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("log:two",
"mock:two");
}
});
camel2.start();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
index 99fc066..ca4ee72 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
@@ -36,7 +36,7 @@ public class QuartzTwoCamelContextSameNameClashTest extends
Assert {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
+ from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
.log("Fired one")
.to("mock:one");
}
@@ -48,7 +48,7 @@ public class QuartzTwoCamelContextSameNameClashTest extends
Assert {
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?")
+
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?")
.log("Fired two")
.to("mock:two");
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
index af4b1cd..1a73ab7 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
@@ -35,7 +35,7 @@ public class QuartzTwoCamelContextSuspendResumeTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
}
});
camel1.start();
@@ -45,7 +45,7 @@ public class QuartzTwoCamelContextSuspendResumeTest {
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
}
});
camel2.start();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
similarity index 91%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
index 6db308d..b956937 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
@@ -36,7 +36,7 @@ public class QuartzTwoCamelContextTest extends Assert {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
}
});
camel1.start();
@@ -46,7 +46,7 @@ public class QuartzTwoCamelContextTest extends Assert {
camel2.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
}
});
camel2.start();
@@ -85,7 +85,7 @@ public class QuartzTwoCamelContextTest extends Assert {
camel3.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("quartz2://myThirdGroup/myThirdTimerName?cron=0/1+*+*+*+*+?").to("mock:three");
+
from("quartz://myThirdGroup/myThirdTimerName?cron=0/1+*+*+*+*+?").to("mock:three");
}
});
camel3.start();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
similarity index 94%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
index 8f76dc4..ca39142 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
@@ -51,7 +51,7 @@ public class StatefulQuartzRouteTest extends BaseQuartzTest {
@Override
public void configure() {
// START SNIPPET: example
-
from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1&stateful=true").to("mock:result");
+
from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1&stateful=true").to("mock:result");
// END SNIPPET: example
}
};
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
similarity index 90%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
index fcd2649..6bc7cac 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
@@ -46,7 +46,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
success2.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -81,7 +81,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicyWithTwoRoutes() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new
CronScheduledRoutePolicy();
@@ -114,7 +114,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -134,14 +134,14 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
assertTrue(context.getRouteController().getRouteStatus("test") ==
ServiceStatus.Started);
template.sendBody("direct:start", "Ready or not, Here, I come");
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
@Test
public void testScheduledStopRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new
CronScheduledRoutePolicy();
@@ -170,7 +170,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
final CountDownLatch stoppedLatch = new CountDownLatch(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new
CronScheduledRoutePolicy() {
@@ -221,7 +221,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
final MyRoutePolicy myPolicy = new MyRoutePolicy();
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new
CronScheduledRoutePolicy();
@@ -247,7 +247,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new
CronScheduledRoutePolicy();
@@ -276,7 +276,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new
CronScheduledRoutePolicy();
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
index e7a84a0..dcdaa8b 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
@@ -64,7 +64,7 @@ public class MultiplePoliciesOnRouteTest extends
CamelTestSupport {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMinimumMessageCount(size - 10);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
from(url)
@@ -82,7 +82,7 @@ public class MultiplePoliciesOnRouteTest extends
CamelTestSupport {
Thread.sleep(3);
}
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
similarity index 93%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
index 1ceda59..9a98301 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
@@ -39,7 +39,7 @@ public class SimpleScheduledCombinedRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -66,7 +66,7 @@ public class SimpleScheduledCombinedRoutePolicyTest extends
CamelTestSupport {
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") ==
ServiceStatus.Stopped);
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
similarity index 88%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
index 19dbd18..3e0d536 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
@@ -45,7 +45,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -67,14 +67,14 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
assertTrue(context.getRouteController().getRouteStatus("test") ==
ServiceStatus.Started);
template.sendBody("direct:start", "Ready or not, Here, I come");
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
@Test
public void testScheduledStopRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -102,13 +102,13 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
consumerStopped = true;
}
assertTrue(consumerStopped);
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
}
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -134,7 +134,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
consumerSuspended = true;
}
assertTrue(consumerSuspended);
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
}
@Test
@@ -143,7 +143,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -171,7 +171,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
Thread.sleep(4000);
template.sendBody("direct:start", "Ready or not, Here, I come");
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
@@ -181,7 +181,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -213,7 +213,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
Thread.sleep(4000);
template.sendBody("direct:start", "Ready or not, Here, I come");
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
@@ -223,7 +223,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new
SimpleScheduledRoutePolicy();
@@ -254,7 +254,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
Thread.sleep(4000);
template.sendBody("direct:start", "Ready or not, Here, I come");
- context.getComponent("quartz2", QuartzComponent.class).stop();
+ context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
similarity index 100%
rename from
components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
rename to
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
diff --git a/components/camel-quartz2/src/test/resources/log4j2.properties
b/components/camel-quartz/src/test/resources/log4j2.properties
similarity index 96%
rename from components/camel-quartz2/src/test/resources/log4j2.properties
rename to components/camel-quartz/src/test/resources/log4j2.properties
index 6c6f71b..f696bf1 100644
--- a/components/camel-quartz2/src/test/resources/log4j2.properties
+++ b/components/camel-quartz/src/test/resources/log4j2.properties
@@ -17,7 +17,7 @@
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-quartz2-test.log
+appender.file.fileName = target/camel-quartz-test.log
appender.file.layout.type = PatternLayout
appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
appender.out.type = Console
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
similarity index 95%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
index a313a40..3693d73 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
@@ -66,7 +66,7 @@
<camelContext id="camelContext" shutdownEager="false"
xmlns="http://camel.apache.org/schema/spring";>
<template id="template" />
<route id="myRoute">
- <from
uri="quartz2://app/test?trigger.repeatInterval=1000&trigger.repeatCount=2&durableJob=true&stateful=true&recoverableJob=true"
/>
+ <from
uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=2&durableJob=true&stateful=true&recoverableJob=true"
/>
<transform>
<simple>clustering PINGS!</simple>
</transform>
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
similarity index 95%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
index 42e16a8..000fadf 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
@@ -62,7 +62,7 @@
<camelContext id="camelContext2" shutdownEager="true"
xmlns="http://camel.apache.org/schema/spring";>
<template id="template" />
<route id="myRoute">
- <from
uri="quartz2://app/test?trigger.repeatInterval=1000&trigger.repeatCount=2&durableJob=true&stateful=true&recoverableJob=true"
/>
+ <from
uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=2&durableJob=true&stateful=true&recoverableJob=true"
/>
<transform>
<simple>clustering PONGS!</simple>
</transform>
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
similarity index 95%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
index 7e2e650..197690a 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from uri="quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?"/>
+ <from uri="quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?"/>
<to uri="mock:result"/>
</route>
</camelContext>
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
similarity index 96%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
index 4a933a5..b47c19d 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
@@ -60,7 +60,7 @@
<camelContext id="camelContext" managementNamePattern="#name#"
xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="quartz2://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1&stateful=true"/>
+ <from
uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1&stateful=true"/>
<to uri="log:trigger"/>
<to uri="mock:result"/>
</route>
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
similarity index 96%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
index c109132..aecd77c 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
@@ -60,7 +60,7 @@
<camelContext id="camelContext" managementNamePattern="#name#"
xmlns="http://camel.apache.org/schema/spring";>
<route id="myRoute">
- <from
uri="quartz2://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1&stateful=true"/>
+ <from
uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1&stateful=true"/>
<to uri="log:trigger"/>
<to uri="mock:result"/>
</route>
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
rename to
components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
similarity index 100%
rename from
components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
rename to
components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
diff --git a/components/camel-quartz2/src/test/resources/tables_derby.sql
b/components/camel-quartz/src/test/resources/tables_derby.sql
similarity index 100%
rename from components/camel-quartz2/src/test/resources/tables_derby.sql
rename to components/camel-quartz/src/test/resources/tables_derby.sql
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index e46536a..9e4e237 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -32,7 +32,7 @@ public interface QuartzEndpointBuilderFactory {
/**
- * Builder for endpoint for the Quartz2 component.
+ * Builder for endpoint for the Quartz component.
*/
public interface QuartzEndpointBuilder extends EndpointConsumerBuilder {
default AdvancedQuartzEndpointBuilder advanced() {
@@ -282,7 +282,7 @@ public interface QuartzEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint for the Quartz2 component.
+ * Advanced builder for endpoint for the Quartz component.
*/
public interface AdvancedQuartzEndpointBuilder
extends
@@ -474,14 +474,14 @@ public interface QuartzEndpointBuilderFactory {
}
}
/**
- * Quartz2 (camel-quartz2)
+ * Quartz (camel-quartz)
* Provides a scheduled delivery of messages using the Quartz 2.x
scheduler.
*
* Category: scheduling
* Available as of version: 2.12
- * Maven coordinates: org.apache.camel:camel-quartz2
+ * Maven coordinates: org.apache.camel:camel-quartz
*
- * Syntax: <code>quartz2:groupName/triggerName</code>
+ * Syntax: <code>quartz:groupName/triggerName</code>
*
* Path parameter: groupName
* The quartz group name to use. The combination of group name and timer
@@ -495,7 +495,7 @@ public interface QuartzEndpointBuilderFactory {
default QuartzEndpointBuilder quartz(String path) {
class QuartzEndpointBuilderImpl extends AbstractEndpointBuilder
implements QuartzEndpointBuilder, AdvancedQuartzEndpointBuilder {
public QuartzEndpointBuilderImpl(String path) {
- super("quartz2", path);
+ super("quartz", path);
}
}
return new QuartzEndpointBuilderImpl(path);
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-quartz-starter/pom.xml
similarity index 89%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-quartz-starter/pom.xml
index bc0c012..d4199a6 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/pom.xml
@@ -24,10 +24,10 @@
<artifactId>components-starter</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-quartz2-starter</artifactId>
+ <artifactId>camel-quartz-starter</artifactId>
<packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Quartz2</name>
- <description>Spring-Boot Starter for Camel Quartz2 support</description>
+ <name>Spring-Boot Starter :: Camel :: Quartz</name>
+ <description>Spring-Boot Starter for Camel Quartz support</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-quartz2</artifactId>
+ <artifactId>camel-quartz</artifactId>
<version>${project.version}</version>
</dependency>
<!--START OF GENERATED CODE-->
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
similarity index 96%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
rename to
platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
index 8c9f48f..9d60448 100644
---
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
@@ -70,12 +70,12 @@ public class QuartzComponentAutoConfiguration {
static class GroupConditions extends GroupCondition {
public GroupConditions() {
- super("camel.component", "camel.component.quartz2");
+ super("camel.component", "camel.component.quartz");
}
}
@Lazy
- @Bean(name = "quartz2-component")
+ @Bean(name = "quartz-component")
@ConditionalOnMissingBean(QuartzComponent.class)
public QuartzComponent configureQuartzComponent() throws Exception {
QuartzComponent component = new QuartzComponent();
@@ -110,12 +110,12 @@ public class QuartzComponentAutoConfiguration {
? HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.quartz2.customizer",
+ "camel.component.quartz.customizer",
((HasId) customizer).getId())
: HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.quartz2.customizer");
+ "camel.component.quartz.customizer");
if (useCustomizer) {
LOGGER.debug("Configure component {}, with customizer {}",
component, customizer);
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
similarity index 97%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
rename to
platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
index f286e95..3793200 100644
---
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
@@ -26,13 +26,13 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.quartz2")
+@ConfigurationProperties(prefix = "camel.component.quartz")
public class QuartzComponentConfiguration
extends
ComponentConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the quartz2 component. This is
+ * Whether to enable auto configuration of the quartz component. This is
* enabled by default.
*/
private Boolean enabled;
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/LICENSE.txt
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/LICENSE.txt
rename to
platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/LICENSE.txt
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/NOTICE.txt
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/NOTICE.txt
rename to
platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/NOTICE.txt
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.factories
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
similarity index 99%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.factories
rename to
platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
index 0d49d0a..23dc2bb 100644
---
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.factories
+++
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
@@ -14,5 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
+
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.quartz2.springboot.QuartzComponentAutoConfiguration
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.provides
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from
platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.provides
rename to
platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.provides
index 4dee0bb9..2af2772 100644
---
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.provides
+++
b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-provides: camel-quartz2
+provides: camel-quartz
diff --git
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
b/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index cd6b5fe..0000000
---
a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "properties": [
- {
- "defaultValue": true,
- "name": "camel.component.quartz2.enabled",
- "description": "Enable quartz2 component",
- "type": "java.lang.Boolean"
- }
- ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/pom.xml
b/platforms/spring-boot/components-starter/pom.xml
index 350a6cc..2f7a8d3 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -299,6 +299,7 @@
<module>camel-protobuf-starter</module>
<module>camel-pubnub-starter</module>
<module>camel-pulsar-starter</module>
+ <module>camel-quartz-starter</module>
<module>camel-quartz2-starter</module>
<module>camel-quickfix-starter</module>
<module>camel-rabbitmq-starter</module>
