You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2019/08/17 15:18:13 UTC
[camel] branch master updated: cleanups for camel-quartz2 to
camel-quartz component renaming
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4fca029 cleanups for camel-quartz2 to camel-quartz component renaming
4fca029 is described below
commit 4fca029c74985970a602f9a55445ed62af8489c0
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sat Aug 17 17:17:57 2019 +0200
cleanups for camel-quartz2 to camel-quartz component renaming
---
.../camel/component/mail/MailComponentTest.java | 2 +-
components/camel-quartz/pom.xml | 2 +-
.../src/main/docs/quartz-component.adoc | 8 +-
.../component/{quartz2 => quartz}/CamelJob.java | 14 ++--
.../{quartz2 => quartz}/QuartzComponent.java | 3 +-
.../{quartz2 => quartz}/QuartzConstants.java | 4 +-
.../{quartz2 => quartz}/QuartzConsumer.java | 2 +-
.../{quartz2 => quartz}/QuartzEndpoint.java | 18 ++---
.../{quartz2 => quartz}/QuartzHelper.java | 8 +-
.../{quartz2 => quartz}/QuartzMessage.java | 2 +-
.../{quartz2 => quartz}/StatefulCamelJob.java | 2 +-
.../QuartzScheduledPollConsumerJob.java | 4 +-
.../QuartzScheduledPollConsumerScheduler.java | 8 +-
.../CronScheduledRoutePolicy.java | 12 +--
.../{quartz2 => quartz}/ScheduledJob.java | 6 +-
.../{quartz2 => quartz}/ScheduledJobState.java | 2 +-
.../{quartz2 => quartz}/ScheduledRouteDetails.java | 2 +-
.../{quartz2 => quartz}/ScheduledRoutePolicy.java | 44 +++++------
.../ScheduledRoutePolicyConstants.java | 6 +-
.../SimpleScheduledRoutePolicy.java | 18 ++---
.../{quartz2 => quartz}/BaseQuartzTest.java | 2 +-
.../DelegateEndpointQuartzTest.java | 16 ++--
.../QuartUnderscoreTimerNameTest.java | 4 +-
.../QuartzAddDynamicRouteTest.java | 4 +-
...uartzAddRoutesAfterCamelContextStartedTest.java | 2 +-
.../{quartz2 => quartz}/QuartzAutoStartTest.java | 2 +-
...omponentCamelContextSchedulerIsolationTest.java | 2 +-
...tzComponentCamelContextSharedSchedulerTest.java | 12 +--
.../{quartz2 => quartz}/QuartzComponentTest.java | 2 +-
.../QuartzCronRouteDurableJobTest.java | 4 +-
.../{quartz2 => quartz}/QuartzCronRouteTest.java | 4 +-
.../QuartzCronRouteWithSmallCacheTest.java | 4 +-
.../QuartzCronTriggerRouteTest.java | 2 +-
.../QuartzCustomCalendarFireTest.java | 2 +-
.../QuartzCustomCalendarNoFireTest.java | 2 +-
.../QuartzEndpointConfigureTest.java | 4 +-
.../{quartz2 => quartz}/QuartzInterruptTest.java | 4 +-
.../QuartzJobRouteUnderscoreTest.java | 4 +-
.../{quartz2 => quartz}/QuartzManagementTest.java | 2 +-
.../QuartzManuallyTriggerJobTest.java | 12 +--
.../QuartzNameCollisionTest.java | 2 +-
.../QuartzOneCamelContextRestartTest.java | 2 +-
.../QuartzOneCamelContextSuspendResumeTest.java | 2 +-
.../{quartz2 => quartz}/QuartzPropertiesTest.java | 6 +-
.../QuartzRepeatIntervalTest.java | 4 +-
.../QuartzRouteFireNowOnlyOnceTest.java | 6 +-
.../QuartzRouteFireNowTest.java | 6 +-
.../QuartzRouteRestartTest.java | 10 +--
.../{quartz2 => quartz}/QuartzRouteTest.java | 4 +-
.../{quartz2 => quartz}/QuartzSimpleRouteTest.java | 4 +-
.../QuartzStartDelayedOptionTest.java | 2 +-
.../QuartzStartDelayedTest.java | 2 +-
.../QuartzStartDelayedWithReferenceTest.java | 2 +-
.../QuartzStatefulJobRouteTest.java | 4 +-
.../{quartz2 => quartz}/QuartzStopRouteTest.java | 4 +-
.../QuartzSuspendRouteTest.java | 4 +-
.../QuartzTwoCamelContextRestartTest.java | 2 +-
.../QuartzTwoCamelContextSameNameClashTest.java | 4 +-
.../QuartzTwoCamelContextSuspendResumeTest.java | 2 +-
.../QuartzTwoCamelContextTest.java | 14 ++--
...QuartzConsumerTwoAppsClusteredFailoverTest.java | 14 ++--
...QuartzConsumerTwoAppsClusteredRecoveryTest.java | 8 +-
.../SpringQuartzCronRouteTest.java | 4 +-
...PersistentStoreRestartAppChangeOptionsTest.java | 22 +++---
.../SpringQuartzPersistentStoreRestartAppTest.java | 8 +-
...pringQuartzPersistentStoreRestartRouteTest.java | 4 +-
.../SpringQuartzPersistentStoreTest.java | 4 +-
.../StatefulQuartzRouteTest.java | 2 +-
.../FileConsumerQuartzSchedulerRestartTest.java | 2 +-
.../FileConsumerQuartzSchedulerTest.java | 2 +-
.../CronScheduledRoutePolicyTest.java | 50 ++++++------
.../{quartz2 => quartz}/DateFactory.java | 2 +-
.../MultiplePoliciesOnRouteTest.java | 20 ++---
.../{quartz2 => quartz}/MyRoutePolicy.java | 4 +-
.../RouteAutoStopFalseCronScheduledPolicyTest.java | 2 +-
.../SimpleScheduledCombinedRoutePolicyTest.java | 18 ++---
.../SimpleScheduledRoutePolicyTest.java | 88 +++++++++++-----------
.../SpringCronScheduledRoutePolicyTest.java | 12 +--
.../SpringMultiplePoliciesOnRouteTest.java | 6 +-
.../SpringQuartzTwoAppsClusteredFailoverTest.java | 8 +-
.../SpringScheduledRoutePolicyTest.java | 50 ++++++------
.../SpringSimpleScheduledRoutePolicyTest.java | 14 ++--
.../SpringQuartzConsumerClusteredAppDatabase.xml | 0
.../SpringQuartzConsumerClusteredAppOne.xml | 4 +-
.../SpringQuartzConsumerClusteredAppTwo.xml | 4 +-
...SpringQuartzConsumerRecoveryClusteredAppOne.xml | 4 +-
...SpringQuartzConsumerRecoveryClusteredAppTwo.xml | 2 +-
.../SpringQuartzCronRouteTest.xml | 0
...entStoreRestartAppChangeCronExpressionTest1.xml | 2 +-
...entStoreRestartAppChangeCronExpressionTest2.xml | 2 +-
...entStoreRestartAppChangeCronExpressionTest3.xml | 2 +-
...PersistentStoreRestartAppChangeOptionsTest1.xml | 2 +-
...PersistentStoreRestartAppChangeOptionsTest2.xml | 2 +-
.../SpringQuartzPersistentStoreRestartTest.xml | 2 +-
.../SpringQuartzPersistentStoreTest.xml | 2 +-
.../quartz}/myquartz.properties | 0
.../{quartz2 => quartz}/CronPolicies.xml | 10 +--
.../{quartz2 => quartz}/MultiplePolicies.xml | 4 +-
.../{quartz2 => quartz}/SimplePolicies.xml | 12 +--
.../SpringQuartzClusteredAppDatabase.xml | 0
.../SpringQuartzClusteredAppOne.xml | 4 +-
.../SpringQuartzClusteredAppTwo.xml | 4 +-
.../quartz}/myquartz.properties | 0
.../src/test/resources/tables_derby.sql | 22 +++---
...ointTest.java => MasterQuartzEndpointTest.java} | 2 +-
...xt.xml => MasterQuartzEndpointTest-context.xml} | 0
core/camel-core/pom.xml | 2 +-
.../camel/support/ScheduledPollEndpoint.java | 6 +-
.../modules/ROOT/pages/quartz-component.adoc | 8 +-
.../ROOT/pages/cronscheduledroutepolicy.adoc | 2 +-
.../META-INF/spring-configuration-metadata.json | 52 ++++++-------
.../META-INF/spring-configuration-metadata.json | 50 ++++++------
.../META-INF/spring-configuration-metadata.json | 52 ++++++-------
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 2 +-
.../QuartzComponentAutoConfiguration.java | 4 +-
.../springboot/QuartzComponentConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../camel/itest/CamelQuartzJmxUpdateTest.java | 2 +-
...UpdateTest.xml => CamelQuartzJmxUpdateTest.xml} | 0
.../quartz/FtpCronScheduledRoutePolicyTest.java | 2 +-
121 files changed, 480 insertions(+), 481 deletions(-)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
index bbf8e95..f07ce4e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.mail;
import javax.mail.Message;
import org.apache.camel.Endpoint;
-import org.apache.camel.pollconsumer.quartz2.QuartzScheduledPollConsumerScheduler;
+import org.apache.camel.pollconsumer.quartz.QuartzScheduledPollConsumerScheduler;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index 2a83c12..ca2248d 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz2-version}</version>
+ <version>${quartz-version}</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
diff --git a/components/camel-quartz/src/main/docs/quartz-component.adoc b/components/camel-quartz/src/main/docs/quartz-component.adoc
index 95a743f..6fc93ce 100644
--- a/components/camel-quartz/src/main/docs/quartz-component.adoc
+++ b/components/camel-quartz/src/main/docs/quartz-component.adoc
@@ -176,7 +176,7 @@ for the next execution.
If you run in OSGi such as Apache ServiceMix, or Apache Karaf, and have
multiple bundles with Camel routes that start from
-xref:quartz-component.adoc[Quartz] endpoints, then make sure if you assign an `id`
+xref:quartz-component.adoc[Quartz] endpoints, then make sure if you assign an `id`
to the `<camelContext>` that this id is unique, as this is
required by the `QuartzScheduler` in the OSGi container. If you do not
set any `id` on `<camelContext>` then a unique id is auto assigned, and there is no problem.
@@ -205,7 +205,7 @@ To do this you can configure this in Spring XML as follows
[source,xml]
----
-<bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+<bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="propertiesFile" value="com/mycompany/myquartz.properties"/>
</bean>
----
@@ -228,7 +228,7 @@ This is an example:
[source,xml]
----
-<bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+<bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="startDelayedSeconds" value="5"/>
</bean>
----
@@ -441,7 +441,7 @@ and used.
|===
*Important:* Remember configuring these options from the endpoint
-URIs must be prefixed with `scheduler.`.
+URIs must be prefixed with `scheduler.`.
For example to configure the trigger id and group:
[source,java]
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java
similarity index 97%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java
index 8131632..80d2f51 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.Collection;
@@ -105,18 +105,18 @@ public class CamelJob implements Job {
protected QuartzEndpoint lookupQuartzEndpoint(CamelContext camelContext, JobExecutionContext quartzContext) throws JobExecutionException {
TriggerKey triggerKey = quartzContext.getTrigger().getKey();
- JobDetail jobDetail = quartzContext.getJobDetail();
+ JobDetail jobDetail = quartzContext.getJobDetail();
JobKey jobKey = jobDetail.getKey();
if (LOG.isDebugEnabled()) {
LOG.debug("Looking up existing QuartzEndpoint with triggerKey={}", triggerKey);
}
-
+
// check all active routes for the quartz endpoint this task matches
// as we prefer to use the existing endpoint from the routes
for (Route route : camelContext.getRoutes()) {
Endpoint endpoint = route.getEndpoint();
if (endpoint instanceof DelegateEndpoint) {
- endpoint = ((DelegateEndpoint)endpoint).getEndpoint();
+ endpoint = ((DelegateEndpoint)endpoint).getEndpoint();
}
if (endpoint instanceof QuartzEndpoint) {
QuartzEndpoint quartzEndpoint = (QuartzEndpoint) endpoint;
@@ -133,7 +133,7 @@ public class CamelJob implements Job {
// fallback and lookup existing from registry (eg maybe a @Consume POJO with a quartz endpoint, and thus not from a route)
String endpointUri = quartzContext.getMergedJobDataMap().getString(QuartzConstants.QUARTZ_ENDPOINT_URI);
-
+
QuartzEndpoint result;
// Even though the same camelContext.getEndpoint call, but if/else display different log.
@@ -142,10 +142,10 @@ public class CamelJob implements Job {
LOG.debug("Getting Endpoint from camelContext.");
}
result = camelContext.getEndpoint(endpointUri, QuartzEndpoint.class);
- } else if ((result = searchForEndpointMatch(camelContext, endpointUri)) != null) {
+ } else if ((result = searchForEndpointMatch(camelContext, endpointUri)) != null) {
if (LOG.isDebugEnabled()) {
LOG.debug("Found match for endpoint URI = {} by searching endpoint list.", endpointUri);
- }
+ }
} else {
LOG.warn("Cannot find existing QuartzEndpoint with uri: {}. Creating new endpoint instance.", endpointUri);
result = camelContext.getEndpoint(endpointUri, QuartzEndpoint.class);
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
similarity index 99%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
index 83a0efd..72d53aa 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.io.IOException;
import java.io.InputStream;
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExtendedStartupListener;
-import org.apache.camel.StartupListener;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java
similarity index 97%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java
index 0992c9b..c3cff26 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
/**
* Provide some constants used in this component package.
@@ -34,7 +34,7 @@ public final class QuartzConstants {
public static final String QUARTZ_TRIGGER_CRON_TIMEZONE = "CamelQuartzTriggerCronTimeZone";
public static final String QUARTZ_TRIGGER_SIMPLE_REPEAT_COUNTER = "CamelQuartzTriggerSimpleRepeatCounter";
public static final String QUARTZ_TRIGGER_SIMPLE_REPEAT_INTERVAL = "CamelQuartzTriggerSimpleRepeatInterval";
-
+
public static final String QUARTZ_CAMEL_CUSTOM_CALENDAR = "CamelQuartzCustomCalendar";
private QuartzConstants() {
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
similarity index 97%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
index 7bacf40..e61d301 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
similarity index 98%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
index 0a878ff..1a70c24 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.Date;
import java.util.Map;
@@ -288,7 +288,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
public void setTriggerKey(TriggerKey triggerKey) {
this.triggerKey = triggerKey;
}
-
+
public Calendar getCustomCalendar() {
return customCalendar;
}
@@ -379,14 +379,14 @@ public class QuartzEndpoint extends DefaultEndpoint {
scheduler.scheduleJob(jobDetail, trigger);
} catch (ObjectAlreadyExistsException ex) {
// some other VM might may have stored the job & trigger in DB in clustered mode, in the mean time
- if (!(getComponent().isClustered())) {
+ if (!(getComponent().isClustered())) {
throw ex;
- } else {
- trigger = scheduler.getTrigger(triggerKey);
- if (trigger == null) {
- throw new SchedulerException("Trigger could not be found in quartz scheduler.");
+ } else {
+ trigger = scheduler.getTrigger(triggerKey);
+ if (trigger == null) {
+ throw new SchedulerException("Trigger could not be found in quartz scheduler.");
}
- }
+ }
}
}
@@ -578,7 +578,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
if (jobPaused.get() || isClustered) {
return;
}
-
+
jobPaused.set(true);
if (!scheduler.isShutdown()) {
log.info("Pausing trigger {}", triggerKey);
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
similarity index 98%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
index 60917c7..456d55b 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.quartz.JobDataMap;
@@ -39,11 +39,11 @@ public final class QuartzHelper {
return camelContext.getName();
}
}
-
+
/**
* Adds the current CamelContext name and endpoint URI to the Job's jobData
* map.
- *
+ *
* @param camelContext The currently active camelContext
* @param jobDetail The job for which the jobData map shall be updated
* @param endpointUri URI of the endpoint name, if any. May be {@code null}
@@ -55,7 +55,7 @@ public final class QuartzHelper {
/**
* Adds the current CamelContext name and endpoint URI to the Job's jobData
* map.
- *
+ *
* @param camelContext The currently active camelContext
* @param jobDetail The job for which the jobData map shall be updated
* @param endpointUri URI of the endpoint name, if any. May be {@code null}
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java
similarity index 98%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java
index 8e7b351..7d961ed 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.Map;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
index 49554b9..79ddf5b 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.PersistJobDataAfterExecution;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java
index 37c6398..f60f295 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.pollconsumer.quartz2;
+package org.apache.camel.pollconsumer.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Route;
-import org.apache.camel.component.quartz2.CamelJob;
+import org.apache.camel.component.quartz.CamelJob;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
similarity index 98%
rename from components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
rename to components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
index bf0156d..9ef5cc1 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.pollconsumer.quartz2;
+package org.apache.camel.pollconsumer.quartz;
import java.util.TimeZone;
@@ -23,9 +23,9 @@ import org.apache.camel.Consumer;
import org.apache.camel.NonManagedService;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.quartz2.QuartzComponent;
-import org.apache.camel.component.quartz2.QuartzConstants;
-import org.apache.camel.component.quartz2.QuartzHelper;
+import org.apache.camel.component.quartz.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzConstants;
+import org.apache.camel.component.quartz.QuartzHelper;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.StringHelper;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
similarity index 97%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
index abfbd9a..95c45fd 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.quartz.CronScheduleBuilder;
import org.quartz.Trigger;
import org.quartz.TriggerBuilder;
@@ -111,10 +111,10 @@ public class CronScheduledRoutePolicy extends ScheduledRoutePolicy implements Sc
.withSchedule(scheduleBuilder)
.build();
}
-
+
return trigger;
}
-
+
public void setRouteStartTime(String routeStartTime) {
this.routeStartTime = routeStartTime;
}
@@ -146,7 +146,7 @@ public class CronScheduledRoutePolicy extends ScheduledRoutePolicy implements Sc
public String getRouteResumeTime() {
return routeResumeTime;
}
-
+
public String getTimeZone() {
return timeZoneString;
}
@@ -154,6 +154,6 @@ public class CronScheduledRoutePolicy extends ScheduledRoutePolicy implements Sc
public void setTimeZone(String timeZone) {
this.timeZoneString = timeZone;
this.timeZone = TimeZone.getTimeZone(timeZone);
- }
+ }
}
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
index 4fa9866..63a7d12 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.io.Serializable;
import java.util.List;
@@ -40,9 +40,9 @@ public class ScheduledJob implements Job, Serializable, ScheduledRoutePolicyCons
SchedulerContext schedulerContext = getSchedulerContext(jobExecutionContext);
ScheduledJobState state = (ScheduledJobState) schedulerContext.get(jobExecutionContext.getJobDetail().getKey().toString());
- Action storedAction = state.getAction();
+ Action storedAction = state.getAction();
Route storedRoute = state.getRoute();
-
+
List<RoutePolicy> policyList = storedRoute.getRouteContext().getRoutePolicyList();
for (RoutePolicy policy : policyList) {
try {
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java
index 2dcad06..541d380 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.apache.camel.Route;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRouteDetails.java
similarity index 98%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRouteDetails.java
index 28d5851..004f7fd 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRouteDetails.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.quartz.JobKey;
import org.quartz.TriggerKey;
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
index 7ebf60c..0aaaf13 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -24,7 +24,7 @@ import org.apache.camel.NonManagedService;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.support.RoutePolicySupport;
import org.apache.camel.support.service.ServiceHelper;
import org.quartz.JobBuilder;
@@ -38,14 +38,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This is Quartz2.x based RoutePolicy implementation that re-use almost identical to "camel-quartz" component.
+ * This is Quartz based RoutePolicy implementation that re-use almost identical to "camel-quartz" component.
*
* The following has been updated:
* - Changed and used Quartz 2.x API call on all the area affected.
* - Stored JobKey and TriggerKey instead of JobDetail and Trigger objects in ScheduledRouteDetails.
* - ScheduledJobState is stored using full JobKey.toString() instead of just jobName.
*
- * See org.apache.camel.component.quartz2.QuartzComponent
+ * See org.apache.camel.component.quartz.QuartzComponent
*
*/
public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements ScheduledRoutePolicyConstants, NonManagedService {
@@ -90,9 +90,9 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
} else {
LOG.warn("Route is not in a started state and cannot be resumed. The current route state is {}", routeStatus);
}
- }
+ }
}
-
+
@Override
public void onRemove(Route route) {
try {
@@ -107,7 +107,7 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
JobDetail jobDetail = createJobDetail(action, route);
Trigger trigger = createTrigger(action, route);
updateScheduledRouteDetails(action, jobDetail, trigger, route);
-
+
loadCallbackDataIntoSchedulerContext(jobDetail, action, route);
boolean isClustered = route.getCamelContext().getComponent("quartz", QuartzComponent.class).isClustered();
@@ -134,15 +134,15 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
public void pauseRouteTrigger(Action action, String routeId) throws SchedulerException {
TriggerKey triggerKey = retrieveTriggerKey(action, routeId);
-
+
getScheduler().pauseTrigger(triggerKey);
LOG.debug("Scheduled trigger: {} is paused", triggerKey);
}
-
+
public void resumeRouteTrigger(Action action, String routeId) throws SchedulerException {
TriggerKey triggerKey = retrieveTriggerKey(action, routeId);
-
+
getScheduler().resumeTrigger(triggerKey);
LOG.debug("Scheduled trigger: {} is resumed", triggerKey);
@@ -168,17 +168,17 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
public void deleteRouteJob(Action action, ScheduledRouteDetails scheduledRouteDetails) throws SchedulerException {
JobKey jobKey = retrieveJobKey(action, scheduledRouteDetails);
-
+
if (!getScheduler().isShutdown()) {
getScheduler().deleteJob(jobKey);
}
LOG.debug("Scheduled job: {} is deleted", jobKey);
}
-
+
protected JobDetail createJobDetail(Action action, Route route) throws Exception {
JobDetail jobDetail = null;
-
+
if (action == Action.START) {
jobDetail = JobBuilder.newJob(ScheduledJob.class).withIdentity(JOB_START + route.getId(), JOB_GROUP + route.getId()).build();
} else if (action == Action.STOP) {
@@ -188,10 +188,10 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
} else if (action == Action.RESUME) {
jobDetail = JobBuilder.newJob(ScheduledJob.class).withIdentity(JOB_RESUME + route.getId(), JOB_GROUP + route.getId()).build();
}
-
+
return jobDetail;
}
-
+
protected void updateScheduledRouteDetails(Action action, JobDetail jobDetail, Trigger trigger, Route route) throws Exception {
ScheduledRouteDetails scheduledRouteDetails = getScheduledRouteDetails(route.getId());
if (action == Action.START) {
@@ -211,8 +211,8 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
protected void loadCallbackDataIntoSchedulerContext(JobDetail jobDetail, Action action, Route route) throws SchedulerException {
getScheduler().getContext().put(jobDetail.getKey().toString(), new ScheduledJobState(action, route));
- }
-
+ }
+
public TriggerKey retrieveTriggerKey(Action action, String routeId) {
ScheduledRouteDetails scheduledRouteDetails = getScheduledRouteDetails(routeId);
TriggerKey result = null;
@@ -226,10 +226,10 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
} else if (action == Action.RESUME) {
result = scheduledRouteDetails.getResumeTriggerKey();
}
-
+
return result;
}
-
+
public JobKey retrieveJobKey(Action action, ScheduledRouteDetails scheduledRouteDetails) {
JobKey result = null;
@@ -242,10 +242,10 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
} else if (action == Action.RESUME) {
result = scheduledRouteDetails.getResumeJobKey();
}
-
+
return result;
}
-
+
protected void registerRouteToScheduledRouteDetails(Route route) {
ScheduledRouteDetails scheduledRouteDetails = new ScheduledRouteDetails();
scheduledRouteDetailsMap.put(route.getId(), scheduledRouteDetails);
@@ -277,6 +277,6 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
public TimeUnit getTimeUnit() {
return timeUnit;
- }
+ }
}
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java
index 8ef3b82..9da96ca 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
/**
* Quartz constants.
@@ -23,7 +23,7 @@ public interface ScheduledRoutePolicyConstants {
enum Action {
START, STOP, SUSPEND, RESUME
};
-
+
String SCHEDULED_ROUTE = "ScheduledRoute";
String SCHEDULED_TRIGGER = "ScheduledTrigger";
String SCHEDULED_ACTION = "ScheduledAction";
@@ -37,5 +37,5 @@ public interface ScheduledRoutePolicyConstants {
String TRIGGER_SUSPEND = "trigger-" + Action.SUSPEND + "-";
String TRIGGER_RESUME = "trigger-" + Action.RESUME + "-";
String TRIGGER_GROUP = "triggerGroup-";
-
+
}
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
similarity index 96%
rename from components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
index 88eb174..2410ae3 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.quartz.SimpleScheduleBuilder;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
@@ -34,13 +34,13 @@ public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
private Date routeStopDate;
private int routeStopRepeatCount;
private long routeStopRepeatInterval;
- private Date routeSuspendDate;
+ private Date routeSuspendDate;
private int routeSuspendRepeatCount;
private long routeSuspendRepeatInterval;
- private Date routeResumeDate;
+ private Date routeResumeDate;
private int routeResumeRepeatCount;
- private long routeResumeRepeatInterval;
-
+ private long routeResumeRepeatInterval;
+
@Override
public void onInit(Route route) {
try {
@@ -89,7 +89,7 @@ public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
@Override
protected Trigger createTrigger(Action action, Route route) throws Exception {
SimpleTrigger trigger = null;
-
+
if (action == Action.START) {
trigger = TriggerBuilder.newTrigger()
.withIdentity(TRIGGER_START + route.getId(), TRIGGER_GROUP + route.getId())
@@ -123,7 +123,7 @@ public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
.startAt(routeResumeDate == null ? new Date() : routeResumeDate)
.build();
}
-
+
return trigger;
}
@@ -222,5 +222,5 @@ public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
public long getRouteResumeRepeatInterval() {
return routeResumeRepeatInterval;
}
-
+
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
index 0493c4c..07680e6 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java
index e8e25ef..8815b5f 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.Map;
@@ -34,12 +34,12 @@ import org.junit.Test;
import org.quartz.JobDetail;
public class DelegateEndpointQuartzTest extends CamelTestSupport {
-
+
@Test
public void testQuartzCronRoute() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(3);
-
+
assertMockEndpointsSatisfied();
JobDetail job = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
@@ -62,13 +62,13 @@ public class DelegateEndpointQuartzTest extends CamelTestSupport {
protected void bindToRegistry(Registry registry) throws Exception {
registry.bind("my", new MyComponent());
}
-
+
class MyComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
throws Exception {
-
+
String childUri = remaining;
// we need to apply the params here
if (parameters != null && parameters.size() > 0) {
@@ -79,12 +79,12 @@ public class DelegateEndpointQuartzTest extends CamelTestSupport {
Endpoint childEndpoint = context.getEndpoint(childUri);
return new MyEndpoint(uri, childEndpoint);
}
-
+
}
-
+
class MyEndpoint extends DefaultEndpoint implements DelegateEndpoint {
private final Endpoint childEndpoint;
-
+
MyEndpoint(String uri, Endpoint childEndpoint) {
super(uri, null);
this.childEndpoint = childEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java
index 1d00eec..b4b63b2 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -39,4 +39,4 @@ public class QuartUnderscoreTimerNameTest extends BaseQuartzTest {
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java
index bd7ac1d..916860f 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -55,4 +55,4 @@ public class QuartzAddDynamicRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java
index 7bab767..2a0ac48 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java
index 63bae6c..79fb532 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java
index 8ee0be9..42b60dd 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.api.management.JmxSystemPropertyKeys;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java
index 2a7d514..2a4dd99 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -56,8 +56,8 @@ public class QuartzComponentCamelContextSharedSchedulerTest {
public void configure() throws Exception {
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
}
- });
-
+ });
+
camel2.start();
}
@@ -78,14 +78,14 @@ public class QuartzComponentCamelContextSharedSchedulerTest {
JobDetail detail = mock1.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/2 * * * * ?"), CoreMatchers.is(true));
-
+
camel1.stop();
mock2.assertIsSatisfied();
detail = mock2.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/1 * * * * ?"), CoreMatchers.is(true));
-
- camel2.stop();
+
+ camel2.stop();
}
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
index c435320..6b662cc 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.junit.Test;
import org.quartz.Scheduler;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteDurableJobTest.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteDurableJobTest.java
index 94f39ed..60afa46 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteDurableJobTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
@@ -33,4 +33,4 @@ public class QuartzCronRouteDurableJobTest extends QuartzCronRouteTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java
index eb32cd4..e71ce9d 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -56,4 +56,4 @@ public class QuartzCronRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java
index db1080f..e31794d 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -65,4 +65,4 @@ public class QuartzCronRouteWithSmallCacheTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java
index e37630c..87d20ba 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java
index 550cfc8..1d0fd35 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.Date;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java
index 48a26dd..e3d39b7 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.Date;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
similarity index 99%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
index 124e907..eb8b1ed 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.Endpoint;
import org.junit.Test;
@@ -159,4 +159,4 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
return assertIsInstanceOf(QuartzEndpoint.class, endpoint);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java
index cb3bd30..9ba5f3b 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -46,4 +46,4 @@ public class QuartzInterruptTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
index 7adec60..5630397 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -46,4 +46,4 @@ public class QuartzJobRouteUnderscoreTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
index 60b7818..feb79b4 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import javax.management.MBeanServer;
import javax.management.ObjectName;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java
index 2ecbe6f..3bef831 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.ArrayList;
@@ -38,17 +38,17 @@ public class QuartzManuallyTriggerJobTest extends BaseQuartzTest {
QuartzComponent component = context.getComponent("quartz", QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
-
+
// collect all jobKeys of this route (ideally only one).
ArrayList<JobKey> jobKeys = new ArrayList<>();
for (String group : scheduler.getJobGroupNames()) {
for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher.jobGroupEquals(group))) {
jobKeys.add(jobKey);
}
- }
-
+ }
+
JobDataMap jobDataMap = scheduler.getJobDetail(jobKeys.get(0)).getJobDataMap();
-
+
// trigger job manually
scheduler.triggerJob(jobKeys.get(0), jobDataMap);
assertMockEndpointsSatisfied();
@@ -62,4 +62,4 @@ public class QuartzManuallyTriggerJobTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java
similarity index 99%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java
index dfcbfdf..d9aa0ea 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java
index 2184206..d372e89 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java
index 1800bd2..27ff9cd 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
similarity index 94%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
index cc35c99..cbe802a 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.io.InputStream;
import java.util.Properties;
@@ -42,7 +42,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
public void testQuartzPropertiesFile() throws Exception {
quartz = context.getComponent("quartz", QuartzComponent.class);
- quartz.setPropertiesFile("org/apache/camel/component/quartz2/myquartz.properties");
+ quartz.setPropertiesFile("org/apache/camel/component/quartz/myquartz.properties");
quartz.start();
@@ -69,7 +69,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
quartz = context.getComponent("quartz", QuartzComponent.class);
Properties prop = new Properties();
- InputStream is = context.getClassResolver().loadResourceAsStream("org/apache/camel/component/quartz2/myquartz.properties");
+ InputStream is = context.getClassResolver().loadResourceAsStream("org/apache/camel/component/quartz/myquartz.properties");
prop.load(is);
quartz.setProperties(prop);
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java
index 39344d8..7707f5c 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -42,4 +42,4 @@ public class QuartzRepeatIntervalTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java
index 400564d..8ec6df2 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -34,7 +34,7 @@ public class QuartzRouteFireNowOnlyOnceTest extends BaseQuartzTest {
// lets test the receive worked
resultEndpoint.assertIsSatisfied();
}
-
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@@ -47,4 +47,4 @@ public class QuartzRouteFireNowOnlyOnceTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java
index dff0be3..031f0f4 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -34,7 +34,7 @@ public class QuartzRouteFireNowTest extends BaseQuartzTest {
// lets test the receive worked
resultEndpoint.assertIsSatisfied();
}
-
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@@ -47,4 +47,4 @@ public class QuartzRouteFireNowTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java
index 2f8685d..a71a8cf 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -33,12 +33,12 @@ public class QuartzRouteRestartTest extends BaseQuartzTest {
context().getRouteController().stopRoute("trigger");
mock.reset();
mock.expectedMessageCount(0);
-
+
// wait a bit
Thread.sleep(2000);
-
+
assertMockEndpointsSatisfied();
-
+
// start route, and we got messages again
mock.reset();
mock.expectedMinimumMessageCount(1);
@@ -57,5 +57,5 @@ public class QuartzRouteRestartTest extends BaseQuartzTest {
}
};
}
-
+
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
index 63e300c..9c12141 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -44,4 +44,4 @@ public class QuartzRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java
index 69b951c..8a6017f 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -55,4 +55,4 @@ public class QuartzSimpleRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java
index 2058d36..ffa9937 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java
index 8097771..750aa6d 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedWithReferenceTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedWithReferenceTest.java
index 79fd62b..4dd8589 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedWithReferenceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java
index 6e6cefa..21ec377 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -54,4 +54,4 @@ public class QuartzStatefulJobRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
index cd16c35..ef7a265 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -62,4 +62,4 @@ public class QuartzStopRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
index 423cf4a..49043f8 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -62,4 +62,4 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
index 2e64299..660eaf3 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
index ca4ee72..78f359a 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -77,7 +77,7 @@ public class QuartzTwoCamelContextSameNameClashTest extends Assert {
mock2.assertIsSatisfied();
- camel2.stop();
+ camel2.stop();
}
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java
index 1a73ab7..4cd712e 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
index b956937..0196894 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -71,15 +71,15 @@ public class QuartzTwoCamelContextTest extends Assert {
mock2.assertIsSatisfied();
- camel2.stop();
+ camel2.stop();
}
-
+
@Test
public void testThirdCamelContext() throws Exception {
camel1.stop();
-
+
camel2.stop();
-
+
DefaultCamelContext camel3 = new DefaultCamelContext();
camel3.setName("camel-3");
camel3.addRoutes(new RouteBuilder() {
@@ -89,10 +89,10 @@ public class QuartzTwoCamelContextTest extends Assert {
}
});
camel3.start();
-
+
MockEndpoint mock3 = camel3.getEndpoint("mock:three", MockEndpoint.class);
mock3.expectedMinimumMessageCount(2);
-
+
mock3.assertIsSatisfied();
camel3.stop();
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
similarity index 92%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
index daed623..96944e7 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -34,15 +34,15 @@ public class SpringQuartzConsumerTwoAppsClusteredFailoverTest extends TestSuppor
@Test
public void testQuartzPersistentStoreClusteredApp() throws Exception {
// boot up the database the two apps are going to share inside a clustered quartz setup
- AbstractXmlApplicationContext db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml");
+ AbstractXmlApplicationContext db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppDatabase.xml");
db.start();
// now launch the first clustered app which will acquire the quartz database lock and become the master
- AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml");
+ AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml");
app.start();
// as well as the second one which will run in slave mode as it will not be able to acquire the same lock
- AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml");
+ AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml");
app2.start();
CamelContext camel = app.getBean("camelContext", CamelContext.class);
@@ -85,15 +85,15 @@ public class SpringQuartzConsumerTwoAppsClusteredFailoverTest extends TestSuppor
// and as the last step shutdown the second app as well as the database
IOHelper.close(app2, db);
}
-
+
private static class ClusteringPredicate implements Predicate {
private final String expectedPayload;
-
+
ClusteringPredicate(boolean pings) {
expectedPayload = pings ? "clustering PINGS!" : "clustering PONGS!";
}
-
+
@Override
public boolean matches(Exchange exchange) {
return exchange.getIn().getBody().equals(expectedPayload);
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
similarity index 93%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
index 72a401f..9594909 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -38,10 +38,10 @@ public class SpringQuartzConsumerTwoAppsClusteredRecoveryTest extends TestSuppor
@Test
public void testQuartzPersistentStoreClusteredApp() throws Exception {
// boot up the database the two apps are going to share inside a clustered quartz setup
- AbstractXmlApplicationContext db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml");
+ AbstractXmlApplicationContext db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppDatabase.xml");
// now launch the first clustered app which will acquire the quartz database lock and become the master
- AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml");
+ AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppOne.xml");
// now let's simulate a crash of the first app (the quartz instance 'app-one')
log.warn("The first app is going to crash NOW!");
@@ -54,7 +54,7 @@ public class SpringQuartzConsumerTwoAppsClusteredRecoveryTest extends TestSuppor
Thread.sleep(2000);
// as well as the second one which will run in slave mode as it will not be able to acquire the same lock
- AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml");
+ AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppTwo.xml");
app2.start();
// wait long enough until the second app takes it over...
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java
similarity index 93%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java
index 0ea0ad5..0786270 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
@@ -26,7 +26,7 @@ public class SpringQuartzCronRouteTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzCronRouteTest.xml");
}
@Test
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
similarity index 89%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
index 5a22364..2f0d214 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.test.junit4.TestSupport;
import org.apache.camel.util.IOHelper;
@@ -41,10 +41,10 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
@BeforeClass
public static void prepareDB() {
// boot up the database the two invocations are going to share inside a clustered quartz setup
- db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml");
+ db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppDatabase.xml");
db.start();
}
-
+
@AfterClass
public static void shutdownDB() {
db.close();
@@ -67,7 +67,7 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
// After that it asserts that two cron expressions are not equal.
// load spring app
- app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml");
+ app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml");
app.start();
CamelContext camel = app.getBean("camelContext", CamelContext.class);
assertNotNull(camel);
@@ -79,7 +79,7 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
log.info("Restarting ...");
// load spring app
- app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml");
+ app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml");
app2.start();
CamelContext camel2 = app2.getBean("camelContext", CamelContext.class);
assertNotNull(camel2);
@@ -87,9 +87,9 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
app2.stop();
assertNotEquals(cronExpression, cronExpression2);
-
+
// load spring app
- app3 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml");
+ app3 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml");
app3.start();
CamelContext camel3 = app3.getBean("camelContext3", CamelContext.class);
assertNotNull(camel3);
@@ -107,7 +107,7 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
// After that it asserts that two options are not equal.
// load spring app
- AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml");
+ AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml");
app.start();
CamelContext camel = app.getBean("camelContext", CamelContext.class);
assertNotNull(camel);
@@ -120,7 +120,7 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
log.info("Restarting ...");
// load spring app
- AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml");
+ AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml");
app2.start();
CamelContext camel2 = app2.getBean("camelContext", CamelContext.class);
assertNotNull(camel2);
@@ -144,7 +144,7 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
// After that it asserts that two options are not equal.
// load spring app
- app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml");
+ app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml");
app.start();
CamelContext camel = app.getBean("camelContext", CamelContext.class);
assertNotNull(camel);
@@ -156,7 +156,7 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
log.info("Restarting ...");
// load spring app
- AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml");
+ AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml");
app2.start();
CamelContext camel2 = app2.getBean("camelContext", CamelContext.class);
assertNotNull(camel2);
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
similarity index 92%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index 77ff2d5..18aefc7 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,7 +29,7 @@ public class SpringQuartzPersistentStoreRestartAppTest extends TestSupport {
@Test
public void testQuartzPersistentStoreRestart() throws Exception {
// load spring app
- AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml");
+ AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml");
app.start();
@@ -42,7 +42,7 @@ public class SpringQuartzPersistentStoreRestartAppTest extends TestSupport {
mock.assertIsSatisfied();
app.stop();
-
+
log.info("Restarting ...");
log.info("Restarting ...");
log.info("Restarting ...");
@@ -55,7 +55,7 @@ public class SpringQuartzPersistentStoreRestartAppTest extends TestSupport {
// is supposed to handle and start again
// load spring app
- AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml");
+ AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml");
app2.start();
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java
similarity index 95%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java
index 7b68de2..d0a1031 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
@@ -26,7 +26,7 @@ public class SpringQuartzPersistentStoreRestartRouteTest extends CamelSpringTest
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml");
}
@Test
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java
similarity index 93%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java
index 59ffb21..b5e16ad 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
@@ -26,7 +26,7 @@ public class SpringQuartzPersistentStoreTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml");
}
@Test
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
index ca39142..8c3b2c1 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2;
+package org.apache.camel.component.quartz;
import java.util.List;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
similarity index 98%
rename from components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
index 5778a5b..2bd3435 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.pollconsumer.quartz2;
+package org.apache.camel.pollconsumer.quartz;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java
index 7c781d8..afecee1 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.pollconsumer.quartz2;
+package org.apache.camel.pollconsumer.quartz;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
similarity index 92%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
index 6bc7cac..ee045ea 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -26,7 +26,7 @@ import org.apache.camel.SuspendableService;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -46,7 +46,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
success2.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/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("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
@@ -114,13 +114,13 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
- public void configure() {
+ public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
policy.setRouteStartTime("*/3 * * * * ?");
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
@@ -129,7 +129,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
});
context.start();
context.getRouteController().stopRoute("test", 1000, TimeUnit.MILLISECONDS);
-
+
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Started);
template.sendBody("direct:start", "Ready or not, Here, I come");
@@ -141,14 +141,14 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
@Test
public void testScheduledStopRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
policy.setRouteStopTime("*/3 * * * * ?");
policy.setRouteStopGracePeriod(0);
policy.setTimeUnit(TimeUnit.MILLISECONDS);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
@@ -156,7 +156,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
-
+
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Stopped);
}
@@ -170,7 +170,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
final CountDownLatch stoppedLatch = new CountDownLatch(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy() {
@@ -215,13 +215,13 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
success.assertIsSatisfied();
}
-
+
@Test
public void testScheduledStopRoutePolicyWithExtraPolicy() throws Exception {
final MyRoutePolicy myPolicy = new MyRoutePolicy();
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
@@ -236,31 +236,31 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
-
+
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Stopped);
assertTrue("Should have called onStart", myPolicy.isStart());
assertTrue("Should have called onStop", myPolicy.isStop());
}
-
+
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
policy.setRouteSuspendTime("*/3 * * * * ?");
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
.to("mock:unreachable");
- }
+ }
});
context.start();
-
+
Thread.sleep(5000);
// when suspending its only the consumer that suspends
@@ -269,24 +269,24 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
SuspendableService ss = (SuspendableService) consumer;
assertTrue("Consumer should be suspended", ss.isSuspended());
}
-
+
@Test
public void testScheduledResumeRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
policy.setRouteResumeTime("*/3 * * * * ?");
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
.to("mock:success");
- }
+ }
});
context.start();
@@ -298,6 +298,6 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
template.sendBody("direct:start", "Ready or not, Here, I come");
success.assertIsSatisfied();
- }
+ }
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/DateFactory.java
similarity index 95%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/DateFactory.java
index 4548f10..3224c86 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/DateFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.Date;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
similarity index 91%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
index dcdaa8b..6463391 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.Date;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -37,7 +37,7 @@ public class MultiplePoliciesOnRouteTest extends CamelTestSupport {
registry.bind("startPolicy", createRouteStartPolicy());
registry.bind("throttlePolicy", createThrottlePolicy());
}
-
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -49,24 +49,24 @@ public class MultiplePoliciesOnRouteTest extends CamelTestSupport {
policy.setRouteStartDate(new Date(startTime));
policy.setRouteStartRepeatCount(1);
policy.setRouteStartRepeatInterval(3000);
-
+
return policy;
}
-
+
private RoutePolicy createThrottlePolicy() {
ThrottlingInflightRoutePolicy policy = new ThrottlingInflightRoutePolicy();
policy.setMaxInflightExchanges(10);
return policy;
}
-
+
@Test
public void testMultiplePoliciesOnRoute() throws Exception {
- MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMinimumMessageCount(size - 10);
-
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
- public void configure() {
+ public void configure() {
from(url)
.routeId("test")
.routePolicyRef("startPolicy, throttlePolicy")
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java
similarity index 96%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java
index c7560fe..578c1bd 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.apache.camel.Route;
@@ -22,7 +22,7 @@ import org.apache.camel.Route;
*
*/
public class MyRoutePolicy extends org.apache.camel.support.RoutePolicySupport {
-
+
private boolean start;
private boolean stop;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java
similarity index 97%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java
index 458c4b4..e7d980c 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
similarity index 90%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
index 9a98301..8d7f85b 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.Date;
@@ -22,12 +22,12 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
-
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -35,13 +35,13 @@ public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
@Test
public void testScheduledStartAndStopRoutePolicy() throws Exception {
- MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
- public void configure() {
+ public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
long startTime = System.currentTimeMillis() + 3000L;
long stopTime = System.currentTimeMillis() + 8000L;
@@ -51,7 +51,7 @@ public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
policy.setRouteStopDate(new Date(stopTime));
policy.setRouteStopRepeatCount(1);
policy.setRouteStopRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
@@ -59,13 +59,13 @@ public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
-
+
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Started);
template.sendBody("direct:start", "Ready or not, Here, I come");
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Stopped);
-
+
context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
similarity index 90%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
index 3e0d536..569ca97 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.Date;
import java.util.concurrent.TimeUnit;
@@ -24,7 +24,7 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(SimpleScheduledRoutePolicyTest.class);
-
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -41,19 +41,19 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
@Test
public void testScheduledStartRoutePolicy() throws Exception {
- MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
- public void configure() {
+ public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
long startTime = System.currentTimeMillis() + 3000L;
policy.setRouteStartDate(new Date(startTime));
policy.setRouteStartRepeatCount(1);
policy.setRouteStartRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
@@ -62,7 +62,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
});
context.start();
context.getRouteController().stopRoute("test", 1000, TimeUnit.MILLISECONDS);
-
+
Thread.sleep(5000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Started);
template.sendBody("direct:start", "Ready or not, Here, I come");
@@ -74,7 +74,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
@Test
public void testScheduledStopRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -82,7 +82,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
policy.setRouteStopDate(new Date(startTime));
policy.setRouteStopRepeatCount(1);
policy.setRouteStopRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
@@ -90,7 +90,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
-
+
Thread.sleep(4000);
assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Stopped);
@@ -100,15 +100,15 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
template.sendBody("direct:start", "Ready or not, Here, I come");
} catch (CamelExecutionException e) {
consumerStopped = true;
- }
+ }
assertTrue(consumerStopped);
context.getComponent("quartz", QuartzComponent.class).stop();
- }
-
+ }
+
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -116,15 +116,15 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
policy.setRouteSuspendDate(new Date(startTime));
policy.setRouteSuspendRepeatCount(1);
policy.setRouteSuspendRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
.to("mock:unreachable");
- }
+ }
});
context.start();
-
+
Thread.sleep(4000);
boolean consumerSuspended = false;
@@ -132,18 +132,18 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
template.sendBody("direct:start", "Ready or not, Here, I come");
} catch (CamelExecutionException e) {
consumerSuspended = true;
- }
+ }
assertTrue(consumerSuspended);
context.getComponent("quartz", QuartzComponent.class).stop();
- }
-
+ }
+
@Test
public void testScheduledResumeRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -151,12 +151,12 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
policy.setRouteResumeDate(new Date(startTime));
policy.setRouteResumeRepeatCount(1);
policy.setRouteResumeRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
.to("mock:success");
- }
+ }
});
context.start();
@@ -166,22 +166,22 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
LOG.debug("Consumer successfully suspended");
- }
-
+ }
+
Thread.sleep(4000);
template.sendBody("direct:start", "Ready or not, Here, I come");
-
+
context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
-
+
@Test
public void testScheduledSuspendAndResumeRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -193,37 +193,37 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
policy.setRouteResumeDate(new Date(resumeTime));
policy.setRouteResumeRepeatCount(1);
policy.setRouteResumeRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
.to("mock:success");
- }
+ }
});
context.start();
Thread.sleep(1000);
-
+
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
LOG.debug("Consumer successfully suspended");
- }
-
+ }
+
Thread.sleep(4000);
template.sendBody("direct:start", "Ready or not, Here, I come");
-
+
context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
-
+
@Test
public void testScheduledSuspendAndRestartPolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("direct", DirectComponent.class).setBlock(false);
- context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+ context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -234,28 +234,28 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
policy.setRouteStartDate(new Date(startTime));
policy.setRouteResumeRepeatCount(1);
policy.setRouteResumeRepeatInterval(3000);
-
+
from("direct:start")
.routeId("test")
.routePolicy(policy)
.to("mock:success");
- }
+ }
});
context.start();
Thread.sleep(1000);
-
+
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
LOG.debug("Consumer successfully suspended");
- }
-
+ }
+
Thread.sleep(4000);
template.sendBody("direct:start", "Ready or not, Here, I come");
-
+
context.getComponent("quartz", QuartzComponent.class).stop();
success.assertIsSatisfied();
}
-
+
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java
similarity index 92%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java
index 5938d24..2a8ab15 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.junit.Before;
import org.junit.Test;
@@ -24,10 +24,10 @@ public class SpringCronScheduledRoutePolicyTest extends SpringScheduledRoutePoli
@Before
public void setUp() {
- setApplicationContext(new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz2/CronPolicies.xml"));
+ setApplicationContext(new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/CronPolicies.xml"));
setTestType(TestType.CRON);
}
-
+
@Test
public void testScheduledStartRoutePolicy() throws Exception {
startTest();
@@ -37,15 +37,15 @@ public class SpringCronScheduledRoutePolicyTest extends SpringScheduledRoutePoli
public void testScheduledStopRoutePolicy() throws Exception {
stopTest();
}
-
+
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
suspendTest();
}
-
+
@Test
public void testScheduledResumeRoutePolicy() throws Exception {
resumeTest();
}
-
+
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
similarity index 94%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
index 039ef61..33d3920 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
@@ -42,7 +42,7 @@ public class SpringMultiplePoliciesOnRouteTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/MultiplePolicies.xml");
}
-
+
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
similarity index 93%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
index cdec0b2..cb78915 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
@@ -34,13 +34,13 @@ public class SpringQuartzTwoAppsClusteredFailoverTest extends TestSupport {
@Test
public void testQuartzPersistentStoreClusteredApp() throws Exception {
// boot up the database the two apps are going to share inside a clustered quartz setup
- AbstractXmlApplicationContext db = new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml");
+ AbstractXmlApplicationContext db = new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppDatabase.xml");
// now launch the first clustered app which will acquire the quartz database lock and become the master
- AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml");
+ AbstractXmlApplicationContext app = new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml");
// as well as the second one which will run in slave mode as it will not be able to acquire the same lock
- AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml");
+ AbstractXmlApplicationContext app2 = new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml");
CamelContext camel = app.getBean("camelContext", CamelContext.class);
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
similarity index 92%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
index 9c36a29..37f56b4 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -37,16 +37,16 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport {
SIMPLE, CRON
}
private ClassPathXmlApplicationContext applicationContext;
- private TestType testType;
-
+ private TestType testType;
+
public void startTest() throws Exception {
CamelContext context = startRouteWithPolicy("startPolicy");
-
+
MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class);
mock.expectedMinimumMessageCount(1);
-
+
context.getRouteController().stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS);
-
+
Thread.sleep(4000);
assertTrue(context.getRouteController().getRouteStatus("testRoute") == ServiceStatus.Started);
context.createProducerTemplate().sendBody("direct:start", "Ready or not, Here, I come");
@@ -55,69 +55,69 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport {
mock.assertIsSatisfied();
}
-
+
public void stopTest() throws Exception {
boolean consumerStopped = false;
-
+
CamelContext context = startRouteWithPolicy("stopPolicy");
-
+
Thread.sleep(4000);
assertTrue(context.getRouteController().getRouteStatus("testRoute") == ServiceStatus.Stopped);
try {
context.createProducerTemplate().sendBody("direct:start", "Ready or not, Here, I come");
} catch (CamelExecutionException e) {
consumerStopped = true;
- }
+ }
context.stop();
assertTrue(consumerStopped);
}
-
-
+
+
public void suspendTest() throws Exception {
boolean consumerSuspended = false;
CamelContext context = startRouteWithPolicy("suspendPolicy");
-
+
Thread.sleep(4000);
try {
context.createProducerTemplate().sendBody("direct:start", "Ready or not, Here, I come");
} catch (CamelExecutionException e) {
consumerSuspended = true;
- }
-
+ }
+
context.stop();
assertTrue(consumerSuspended);
}
-
+
public void resumeTest() throws Exception {
CamelContext context = startRouteWithPolicy("resumePolicy");
-
+
MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class);
mock.expectedMinimumMessageCount(1);
ServiceHelper.suspendService(context.getRoute("testRoute").getConsumer());
-
+
Thread.sleep(4000);
context.createProducerTemplate().sendBody("direct:start", "Ready or not, Here, I come");
-
+
context.stop();
mock.assertIsSatisfied();
}
-
+
@SuppressWarnings("unchecked")
private CamelContext startRouteWithPolicy(String policyBeanName) throws Exception {
CamelContext context = new DefaultCamelContext();
List<RouteDefinition> routes = (List<RouteDefinition>)applicationContext.getBean("testRouteContext");
RoutePolicy policy = applicationContext.getBean(policyBeanName, RoutePolicy.class);
- assertTrue(getTestType() == TestType.SIMPLE
- ? policy instanceof SimpleScheduledRoutePolicy
+ assertTrue(getTestType() == TestType.SIMPLE
+ ? policy instanceof SimpleScheduledRoutePolicy
: policy instanceof CronScheduledRoutePolicy);
routes.get(0).routePolicy(policy);
((ModelCamelContext)context).addRouteDefinitions(routes);
context.start();
return context;
}
-
+
public ClassPathXmlApplicationContext getApplicationContext() {
return applicationContext;
}
@@ -132,6 +132,6 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport {
public void setTestType(TestType testType) {
this.testType = testType;
- }
-
+ }
+
}
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java
similarity index 92%
rename from components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java
index 58b919a..c691a6a 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.routepolicy.quartz2;
+package org.apache.camel.routepolicy.quartz;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringSimpleScheduledRoutePolicyTest extends SpringScheduledRoutePolicyTest {
-
+
@Before
public void setUp() {
- setApplicationContext(new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz2/SimplePolicies.xml"));
+ setApplicationContext(new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/SimplePolicies.xml"));
setTestType(TestType.SIMPLE);
}
-
+
@Test
public void testScheduledStartRoutePolicy() throws Exception {
startTest();
@@ -37,15 +37,15 @@ public class SpringSimpleScheduledRoutePolicyTest extends SpringScheduledRoutePo
public void testScheduledStopRoutePolicy() throws Exception {
stopTest();
}
-
+
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
suspendTest();
}
-
+
@Test
public void testScheduledResumeRoutePolicy() throws Exception {
resumeTest();
}
-
+
}
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppDatabase.xml
similarity index 100%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppDatabase.xml
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
similarity index 95%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
index 5cc84e0..2cc2325 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
@@ -64,7 +64,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=-1" />
+ <from uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1" />
<transform>
<simple>clustering PINGS!</simple>
</transform>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
similarity index 94%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
index 9fa4792..88e5366 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
@@ -62,7 +62,7 @@
<camelContext id="camelContext2" 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=-1" />
+ <from uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1" />
<transform>
<simple>clustering PONGS!</simple>
</transform>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppOne.xml
similarity index 96%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppOne.xml
index 3693d73..04b9cf7 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppOne.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
@@ -61,7 +61,7 @@
</property>
</bean>
- <bean id="myProcessor" class="org.apache.camel.component.quartz2.SpringQuartzConsumerTwoAppsClusteredRecoveryTest$MyProcessor" />
+ <bean id="myProcessor" class="org.apache.camel.component.quartz.SpringQuartzConsumerTwoAppsClusteredRecoveryTest$MyProcessor" />
<camelContext id="camelContext" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
similarity index 97%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
index 000fadf..f7cfd15 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.xml
similarity index 100%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.xml
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
similarity index 99%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
index 42f13cc..22c7a1d 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartzBean" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartzBean" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
similarity index 99%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
index 16ff9bb..f4bc022 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartzBean" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartzBean" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
similarity index 99%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
index 07e6488..c39ece0 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartzBean" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartzBean" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
similarity index 99%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
index b7da3be..aabba79 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartzBean" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartzBean" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
similarity index 99%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
index e6c1aa3..8158f49 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartzBean" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartzBean" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml
similarity index 97%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml
index b47c19d..c2bddae 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml
@@ -31,7 +31,7 @@
<!-- do not load script as database alreaady exists -->
</jdbc:embedded-database>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml
similarity index 97%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml
index aecd77c..16c1a7a 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml
@@ -31,7 +31,7 @@
<jdbc:script location="classpath:tables_derby.sql"/>
</jdbc:embedded-database>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/myquartz.properties
similarity index 100%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/myquartz.properties
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml
similarity index 92%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml
index 23bc973..edc91aa 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml
@@ -24,21 +24,21 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="defaultPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy"/>
+ <bean id="defaultPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy"/>
- <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+ <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<property name="routeStartTime" value="*/3 * * * * ?"/>
</bean>
- <bean id="stopPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+ <bean id="stopPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<property name="routeStopTime" value="*/3 * * * * ?"/>
</bean>
- <bean id="suspendPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+ <bean id="suspendPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<property name="routeSuspendTime" value="*/3 * * * * ?"/>
</bean>
- <bean id="resumePolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+ <bean id="resumePolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<property name="routeResumeTime" value="*/3 * * * * ?"/>
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/MultiplePolicies.xml
similarity index 93%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/MultiplePolicies.xml
index 9792fbe..aaba715 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/MultiplePolicies.xml
@@ -24,11 +24,11 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="now" class="org.apache.camel.routepolicy.quartz2.DateFactory" factory-method="createDate">
+ <bean id="now" class="org.apache.camel.routepolicy.quartz.DateFactory" factory-method="createDate">
<constructor-arg index="0" value="3000"/>
</bean>
- <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz2.SimpleScheduledRoutePolicy">
+ <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz.SimpleScheduledRoutePolicy">
<property name="routeStartDate" ref="now"/>
<property name="routeStartRepeatCount" value="1"/>
<property name="routeStartRepeatInterval" value="3000"/>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
similarity index 90%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
index 7dc3d8a..dea8d06 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
@@ -24,31 +24,31 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="now" class="org.apache.camel.routepolicy.quartz2.DateFactory" factory-method="createDate">
+ <bean id="now" class="org.apache.camel.routepolicy.quartz.DateFactory" factory-method="createDate">
<constructor-arg index="0" value="3000"/>
</bean>
- <bean id="defaultPolicy" class="org.apache.camel.routepolicy.quartz2.SimpleScheduledRoutePolicy"/>
+ <bean id="defaultPolicy" class="org.apache.camel.routepolicy.quartz.SimpleScheduledRoutePolicy"/>
- <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz2.SimpleScheduledRoutePolicy">
+ <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz.SimpleScheduledRoutePolicy">
<property name="routeStartDate" ref="now"/>
<property name="routeStartRepeatCount" value="1"/>
<property name="routeStartRepeatInterval" value="3000"/>
</bean>
- <bean id="stopPolicy" class="org.apache.camel.routepolicy.quartz2.SimpleScheduledRoutePolicy">
+ <bean id="stopPolicy" class="org.apache.camel.routepolicy.quartz.SimpleScheduledRoutePolicy">
<property name="routeStopDate" ref="now"/>
<property name="routeStopRepeatCount" value="1"/>
<property name="routeStopRepeatInterval" value="3000"/>
</bean>
- <bean id="suspendPolicy" class="org.apache.camel.routepolicy.quartz2.SimpleScheduledRoutePolicy">
+ <bean id="suspendPolicy" class="org.apache.camel.routepolicy.quartz.SimpleScheduledRoutePolicy">
<property name="routeSuspendDate" ref="now"/>
<property name="routeSuspendRepeatCount" value="1"/>
<property name="routeSuspendRepeatInterval" value="3000"/>
</bean>
- <bean id="resumePolicy" class="org.apache.camel.routepolicy.quartz2.SimpleScheduledRoutePolicy">
+ <bean id="resumePolicy" class="org.apache.camel.routepolicy.quartz.SimpleScheduledRoutePolicy">
<property name="routeResumeDate" ref="now"/>
<property name="routeResumeRepeatCount" value="1"/>
<property name="routeResumeRepeatInterval" value="3000"/>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppDatabase.xml
similarity index 100%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppDatabase.xml
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
similarity index 96%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
index e6ac1e6..4391af6 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
@@ -59,7 +59,7 @@
</property>
</bean>
- <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+ <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
similarity index 96%
rename from components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
index ff82210..7211636 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
@@ -33,7 +33,7 @@
<property name="password" value="" />
</bean>
- <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+ <bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="scheduler" ref="scheduler"/>
</bean>
@@ -59,7 +59,7 @@
</property>
</bean>
- <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+ <bean id="startPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/myquartz.properties
similarity index 100%
rename from components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/myquartz.properties
diff --git a/components/camel-quartz/src/test/resources/tables_derby.sql b/components/camel-quartz/src/test/resources/tables_derby.sql
index c64ca62..7fbdae2 100644
--- a/components/camel-quartz/src/test/resources/tables_derby.sql
+++ b/components/camel-quartz/src/test/resources/tables_derby.sql
@@ -15,14 +15,14 @@
-- limitations under the License.
--
---
+--
-- Apache Derby scripts by Steve Stewart, updated by Ronald Pomeroy
-- Based on Srinivas Venkatarangaiah's file for Cloudscape
---
+--
-- Known to work with Apache Derby 10.0.2.1, or 10.6.2.1
--
-- Updated by Zemian Deng <sa...@gmail.com> on 08/21/2011
--- * Fixed nullable fields on qrtz_simprop_triggers table.
+-- * Fixed nullable fields on qrtz_simprop_triggers table.
-- * Added Derby QuickStart comments and drop tables statements.
--
-- DerbyDB + Quartz Quick Guide:
@@ -30,19 +30,19 @@
-- 1. Create a derby.properties file under JavaDB directory, and have the following:
-- derby.connection.requireAuthentication = true
-- derby.authentication.provider = BUILTIN
--- derby.user.quartz2=quartz2123
+-- derby.user.quartz=quartz123
-- 2. Start the DB server by running bin/startNetworkServer script.
-- 3. On a new terminal, run bin/ij tool to bring up an SQL prompt, then run:
--- connect 'jdbc:derby://localhost:1527/quartz2;user=quartz2;password=quartz2123;create=true';
+-- connect 'jdbc:derby://localhost:1527/quartz;user=quartz;password=quartz123;create=true';
-- run 'quartz/docs/dbTables/tables_derby.sql';
-- Now in quartz.properties, you may use these properties:
-- org.quartz.dataSource.quartzDataSource.driver = org.apache.derby.jdbc.ClientDriver
--- org.quartz.dataSource.quartzDataSource.URL = jdbc:derby://localhost:1527/quartz2
--- org.quartz.dataSource.quartzDataSource.user = quartz2
--- org.quartz.dataSource.quartzDataSource.password = quartz2123
+-- org.quartz.dataSource.quartzDataSource.URL = jdbc:derby://localhost:1527/quartz
+-- org.quartz.dataSource.quartzDataSource.user = quartz
+-- org.quartz.dataSource.quartzDataSource.password = quartz123
--
--- Auto drop and reset tables
+-- Auto drop and reset tables
-- Derby doesn't support if exists condition on table drop, so user must manually do this step if needed to.
-- drop table qrtz_fired_triggers;
-- drop table qrtz_paused_trigger_grps;
@@ -113,7 +113,7 @@ foreign key (sched_name,trigger_name,trigger_group) references qrtz_triggers(sch
);
create table qrtz_simprop_triggers
- (
+ (
sched_name varchar(120) not null,
trigger_name varchar(200) not null,
trigger_group varchar(200) not null,
@@ -129,7 +129,7 @@ create table qrtz_simprop_triggers
bool_prop_1 varchar(5),
bool_prop_2 varchar(5),
primary key (sched_name,trigger_name,trigger_group),
- foreign key (sched_name,trigger_name,trigger_group)
+ foreign key (sched_name,trigger_name,trigger_group)
references qrtz_triggers(sched_name,trigger_name,trigger_group)
);
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
similarity index 96%
rename from components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java
rename to components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
index 9091bd9..a6d7a1f 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
@@ -29,7 +29,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
-public class MasterQuartz2EndpointTest extends AbstractJUnit4SpringContextTests {
+public class MasterQuartzEndpointTest extends AbstractJUnit4SpringContextTests {
protected static ZKServerFactoryBean lastServerBean;
diff --git a/components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest-context.xml b/components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest-context.xml
similarity index 100%
rename from components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest-context.xml
rename to components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest-context.xml
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 118b999..e686b7b 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -39,7 +39,7 @@
org.apache.camel.spring.util;${camel.osgi.import.strict.version},
org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
- org.apache.camel.pollconsumer.quartz2;${camel.osgi.import.strict.version},
+ org.apache.camel.pollconsumer.quartz;${camel.osgi.import.strict.version},
net.sf.saxon
</camel.osgi.dynamic>
</properties>
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
index c3e0c0c..ace9815 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.UriParam;
public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
private static final String SPRING_SCHEDULER = "org.apache.camel.spring.pollingconsumer.SpringScheduledPollConsumerScheduler";
- private static final String QUARTZ_2_SCHEDULER = "org.apache.camel.pollconsumer.quartz2.QuartzScheduledPollConsumerScheduler";
+ private static final String QUARTZ_SCHEDULER = "org.apache.camel.pollconsumer.quartz.QuartzScheduledPollConsumerScheduler";
// if adding more options then align with org.apache.camel.support.ScheduledPollConsumer
@UriParam(optionalPrefix = "consumer.", defaultValue = "true", label = "consumer,scheduler",
@@ -126,10 +126,10 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
} else if ("quartz".equals(schedulerName)) {
// special for scheduler if its "spring" or "quartz"
try {
- Class<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(QUARTZ_2_SCHEDULER, ScheduledPollConsumerScheduler.class);
+ Class<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(QUARTZ_SCHEDULER, ScheduledPollConsumerScheduler.class);
setScheduler(getCamelContext().getInjector().newInstance(clazz));
} catch (ClassNotFoundException e) {
- throw new IllegalArgumentException("Cannot load " + QUARTZ_2_SCHEDULER + " from classpath. Make sure camel-quartz.jar is on the classpath.", e);
+ throw new IllegalArgumentException("Cannot load " + QUARTZ_SCHEDULER + " from classpath. Make sure camel-quartz.jar is on the classpath.", e);
}
} else {
// must refer to a custom scheduler by the given name
diff --git a/docs/components/modules/ROOT/pages/quartz-component.adoc b/docs/components/modules/ROOT/pages/quartz-component.adoc
index 95a743f..6fc93ce 100644
--- a/docs/components/modules/ROOT/pages/quartz-component.adoc
+++ b/docs/components/modules/ROOT/pages/quartz-component.adoc
@@ -176,7 +176,7 @@ for the next execution.
If you run in OSGi such as Apache ServiceMix, or Apache Karaf, and have
multiple bundles with Camel routes that start from
-xref:quartz-component.adoc[Quartz] endpoints, then make sure if you assign an `id`
+xref:quartz-component.adoc[Quartz] endpoints, then make sure if you assign an `id`
to the `<camelContext>` that this id is unique, as this is
required by the `QuartzScheduler` in the OSGi container. If you do not
set any `id` on `<camelContext>` then a unique id is auto assigned, and there is no problem.
@@ -205,7 +205,7 @@ To do this you can configure this in Spring XML as follows
[source,xml]
----
-<bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+<bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="propertiesFile" value="com/mycompany/myquartz.properties"/>
</bean>
----
@@ -228,7 +228,7 @@ This is an example:
[source,xml]
----
-<bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent">
+<bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
<property name="startDelayedSeconds" value="5"/>
</bean>
----
@@ -441,7 +441,7 @@ and used.
|===
*Important:* Remember configuring these options from the endpoint
-URIs must be prefixed with `scheduler.`.
+URIs must be prefixed with `scheduler.`.
For example to configure the trigger id and group:
[source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc b/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc
index 5050547..3551f51 100644
--- a/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc
+++ b/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc
@@ -35,7 +35,7 @@ xref:components::quartz-component.adoc[Quartz] based implementation of this rout
[source,xml]
----
-<bean id="myStartPolicy" class="org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy">
+<bean id="myStartPolicy" class="org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy">
<!-- start every 5min from monday to saturday -->
<property name="routeStartTime" value="0 0/5 * ? * 1-6 *" />
</bean>
diff --git a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
index 6274334..4a57a9d 100644
--- a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -91,9 +91,9 @@
"sourceType":"org.apache.camel.component.properties.PropertiesComponent"
},
{
- "name":"camel.component.quartz2",
+ "name":"camel.component.quartz",
"description":"Provides a scheduled delivery of messages using the Quartz 2.x scheduler.",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent"
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent"
},
{
"name":"camel.component.ref",
@@ -1990,81 +1990,81 @@
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.auto-start-scheduler",
+ "name":"camel.component.quartz.auto-start-scheduler",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether or not the scheduler should be auto started. This options is default true",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.start-delayed-seconds",
+ "name":"camel.component.quartz.start-delayed-seconds",
"type":"java.lang.Integer",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Seconds to wait before starting the quartz scheduler."
},
{
- "name":"camel.component.quartz2.prefix-job-name-with-endpoint-id",
+ "name":"camel.component.quartz.prefix-job-name-with-endpoint-id",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to prefix the quartz job with the endpoint id. This option is default false.",
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.enable-jmx",
+ "name":"camel.component.quartz.enable-jmx",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.properties",
+ "name":"camel.component.quartz.properties",
"type":"java.util.Properties",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Properties to configure the Quartz scheduler."
},
{
- "name":"camel.component.quartz2.properties-file",
+ "name":"camel.component.quartz.properties-file",
"type":"java.lang.String",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"File name of the properties to load from the classpath"
},
{
- "name":"camel.component.quartz2.prefix-instance-name",
+ "name":"camel.component.quartz.prefix-instance-name",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's.",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.interrupt-jobs-on-shutdown",
+ "name":"camel.component.quartz.interrupt-jobs-on-shutdown",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted.",
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.scheduler-factory",
+ "name":"camel.component.quartz.scheduler-factory",
"type":"org.quartz.SchedulerFactory",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"To use the custom SchedulerFactory which is used to create the Scheduler."
},
{
- "name":"camel.component.quartz2.scheduler",
+ "name":"camel.component.quartz.scheduler",
"type":"org.quartz.Scheduler",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"To use the custom configured Quartz scheduler, instead of creating a new Scheduler."
},
{
- "name":"camel.component.quartz2.resolve-property-placeholders",
+ "name":"camel.component.quartz.resolve-property-placeholders",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders.",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.basic-property-binding",
+ "name":"camel.component.quartz.basic-property-binding",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
"defaultValue":"false"
},
diff --git a/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
index 76c501f..fe7e9a8 100644
--- a/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -31,9 +31,9 @@
"sourceType":"org.apache.camel.component.properties.PropertiesComponent"
},
{
- "name":"camel.component.quartz2",
+ "name":"camel.component.quartz",
"description":"Provides a scheduled delivery of messages using the Quartz 2.x scheduler.",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent"
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent"
}
],
"properties":[
@@ -886,81 +886,81 @@
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.auto-start-scheduler",
+ "name":"camel.component.quartz.auto-start-scheduler",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether or not the scheduler should be auto started. This options is default true",
"defaultValue":"true"
},
{
"name":"camel.component.quartz.start-delayed-seconds",
"type":"java.lang.Integer",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Seconds to wait before starting the quartz scheduler."
},
{
- "name":"camel.component.quartz2.prefix-job-name-with-endpoint-id",
+ "name":"camel.component.quartz.prefix-job-name-with-endpoint-id",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to prefix the quartz job with the endpoint id. This option is default false.",
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.enable-jmx",
+ "name":"camel.component.quartz.enable-jmx",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.properties",
+ "name":"camel.component.quartz.properties",
"type":"java.util.Properties",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Properties to configure the Quartz scheduler."
},
{
- "name":"camel.component.quartz2.properties-file",
+ "name":"camel.component.quartz.properties-file",
"type":"java.lang.String",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"File name of the properties to load from the classpath"
},
{
- "name":"camel.component.quartz2.prefix-instance-name",
+ "name":"camel.component.quartz.prefix-instance-name",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's.",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.interrupt-jobs-on-shutdown",
+ "name":"camel.component.quartz.interrupt-jobs-on-shutdown",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted.",
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.scheduler-factory",
+ "name":"camel.component.quartz.scheduler-factory",
"type":"org.quartz.SchedulerFactory",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"To use the custom SchedulerFactory which is used to create the Scheduler."
},
{
- "name":"camel.component.quartz2.scheduler",
+ "name":"camel.component.quartz.scheduler",
"type":"org.quartz.Scheduler",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"To use the custom configured Quartz scheduler, instead of creating a new Scheduler."
},
{
- "name":"camel.component.quartz2.resolve-property-placeholders",
+ "name":"camel.component.quartz.resolve-property-placeholders",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders.",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.basic-property-binding",
+ "name":"camel.component.quartz.basic-property-binding",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
"defaultValue":"false"
}
diff --git a/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
index 33e1b21..aa0aa03 100644
--- a/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -86,9 +86,9 @@
"sourceType":"org.apache.camel.component.properties.PropertiesComponent"
},
{
- "name":"camel.component.quartz2",
+ "name":"camel.component.quartz",
"description":"Provides a scheduled delivery of messages using the Quartz 2.x scheduler.",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent"
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent"
},
{
"name":"camel.component.ref",
@@ -1197,81 +1197,81 @@
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.auto-start-scheduler",
+ "name":"camel.component.quartz.auto-start-scheduler",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether or not the scheduler should be auto started. This options is default true",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.start-delayed-seconds",
+ "name":"camel.component.quartz.start-delayed-seconds",
"type":"java.lang.Integer",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Seconds to wait before starting the quartz scheduler."
},
{
- "name":"camel.component.quartz2.prefix-job-name-with-endpoint-id",
+ "name":"camel.component.quartz.prefix-job-name-with-endpoint-id",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to prefix the quartz job with the endpoint id. This option is default false.",
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.enable-jmx",
+ "name":"camel.component.quartz.enable-jmx",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.properties",
+ "name":"camel.component.quartz.properties",
"type":"java.util.Properties",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Properties to configure the Quartz scheduler."
},
{
- "name":"camel.component.quartz2.properties-file",
+ "name":"camel.component.quartz.properties-file",
"type":"java.lang.String",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"File name of the properties to load from the classpath"
},
{
- "name":"camel.component.quartz2.prefix-instance-name",
+ "name":"camel.component.quartz.prefix-instance-name",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's.",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.interrupt-jobs-on-shutdown",
+ "name":"camel.component.quartz.interrupt-jobs-on-shutdown",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted.",
"defaultValue":"false"
},
{
- "name":"camel.component.quartz2.scheduler-factory",
+ "name":"camel.component.quartz.scheduler-factory",
"type":"org.quartz.SchedulerFactory",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"To use the custom SchedulerFactory which is used to create the Scheduler."
},
{
- "name":"camel.component.quartz2.scheduler",
+ "name":"camel.component.quartz.scheduler",
"type":"org.quartz.Scheduler",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"To use the custom configured Quartz scheduler, instead of creating a new Scheduler."
},
{
- "name":"camel.component.quartz2.resolve-property-placeholders",
+ "name":"camel.component.quartz.resolve-property-placeholders",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders.",
"defaultValue":"true"
},
{
- "name":"camel.component.quartz2.basic-property-binding",
+ "name":"camel.component.quartz.basic-property-binding",
"type":"java.lang.Boolean",
- "sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
+ "sourceType":"org.apache.camel.component.quartz.QuartzComponent",
"description":"Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
"defaultValue":"false"
},
diff --git a/parent/pom.xml b/parent/pom.xml
index 82751d5..673f31c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -525,7 +525,7 @@
<qpid-broker-version>7.1.4</qpid-broker-version>
<qpid-proton-j-version>0.33.1</qpid-proton-j-version>
<qpid-jms-client-version>0.44.0</qpid-jms-client-version>
- <quartz2-version>2.3.1</quartz2-version>
+ <quartz-version>2.3.1</quartz-version>
<quickfixj-version>2.1.1</quickfixj-version>
<rabbitmq-amqp-client-version>5.7.3</rabbitmq-amqp-client-version>
<reactive-streams-version>1.0.2</reactive-streams-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 842e053..d016e58 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2055,7 +2055,7 @@
<feature name='camel-quartz' version='${project.version}' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.c3p0/${c3p0-bundle-version}</bundle>
<bundle dependency='true'>mvn:com.zaxxer/HikariCP-java7/${hikaricp-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.quartz-scheduler/quartz/${quartz2-version}$overwrite=merge&DynamicImport-Package=org.apache.camel.component.quartz2</bundle>
+ <bundle dependency='true'>wrap:mvn:org.quartz-scheduler/quartz/${quartz-version}$overwrite=merge&DynamicImport-Package=org.apache.camel.component.quartz</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-quartz/${project.version}</bundle>
</feature>
diff --git a/platforms/spring-boot/components-starter/camel-quartz-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/quartz/springboot/QuartzComponentAutoConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-quartz-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/quartz/springboot/QuartzComponentAutoConfiguration.java
index 9d60448..bae4d0d 100644
--- a/platforms/spring-boot/components-starter/camel-quartz-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/quartz/springboot/QuartzComponentAutoConfiguration.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2.springboot;
+package org.apache.camel.component.quartz.springboot;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.quartz2.QuartzComponent;
+import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.spi.HasId;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
diff --git a/platforms/spring-boot/components-starter/camel-quartz-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/quartz/springboot/QuartzComponentConfiguration.java
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-quartz-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/quartz/springboot/QuartzComponentConfiguration.java
index 51be5bd..5220bc8 100644
--- a/platforms/spring-boot/components-starter/camel-quartz-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/quartz/springboot/QuartzComponentConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.quartz2.springboot;
+package org.apache.camel.component.quartz.springboot;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
diff --git a/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
index 23dc2bb..7a90802 100644
--- a/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.quartz2.springboot.QuartzComponentAutoConfiguration
+org.apache.camel.component.quartz.springboot.QuartzComponentAutoConfiguration
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java
index b4a9389..83175d1 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java
@@ -58,7 +58,7 @@ public class CamelQuartzJmxUpdateTest extends AbstractFeatureTest {
installCamelFeature("camel-quartz");
// install the camel blueprint xml file we use in this test
- URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml",
+ URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelQuartzJmxUpdateTest.xml",
CamelQuartzJmxUpdateTest.class.getClassLoader());
installBlueprintAsBundle("CamelQuartzJmxUpdateTest", url, true);
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartzJmxUpdateTest.xml
similarity index 100%
rename from tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml
rename to tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartzJmxUpdateTest.xml
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java
index 57577d0..4997568 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.routepolicy.quartz2.CronScheduledRoutePolicy;
+import org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerFactory;