You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/08/25 11:56:58 UTC
[1/2] git commit: Upgraded to latest rxjava
Updated Branches:
refs/heads/master 6ff502f63 -> 05d3301cc
Upgraded to latest rxjava
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2704f68b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2704f68b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2704f68b
Branch: refs/heads/master
Commit: 2704f68b7b782d90d750a664890688ff05c9cfc4
Parents: 6ff502f
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 25 09:34:54 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 25 09:34:54 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/rx/support/ObserverSender.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2704f68b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
index fcff057..435ddd8 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
@@ -47,7 +47,7 @@ public class ObserverSender implements Observer {
}
}
- public void onError(Exception e) {
+ public void onError(Throwable e) {
Exchange exchange = producer.createExchange();
exchange.setException(e);
send(exchange);
http://git-wip-us.apache.org/repos/asf/camel/blob/2704f68b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 88372f4..110b109 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -331,7 +331,7 @@
<rhino-version>1.7R2</rhino-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
- <rxjava-version>0.9.2</rxjava-version>
+ <rxjava-version>0.10.1</rxjava-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.5.0.2_1</saxon-bundle-version>
<saxon-version>9.5.0.2</saxon-version>
[2/2] git commit: CAMEL-6067: Added deleteJob/pauseJob options to
quartz components. So ppl can decide whether to delete/pause the jobs when
stopping.
Posted by da...@apache.org.
CAMEL-6067: Added deleteJob/pauseJob options to quartz components. So ppl can decide whether to delete/pause the jobs when stopping.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05d3301c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05d3301c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05d3301c
Branch: refs/heads/master
Commit: 05d3301cca5b9547130f9a0f2286b45c55cbc492
Parents: 2704f68
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 25 11:12:43 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 25 11:12:43 2013 +0200
----------------------------------------------------------------------
.../camel/component/quartz/QuartzComponent.java | 2 +-
.../camel/component/quartz/QuartzEndpoint.java | 28 +++++++++++++++++++-
.../camel/component/quartz2/QuartzEndpoint.java | 25 +++++++++++++++--
3 files changed, 51 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/05d3301c/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
index 54acc74..c9579ca 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
@@ -287,7 +287,7 @@ public class QuartzComponent extends DefaultComponent implements StartupListener
// do not pause jobs which are clustered, as we want the jobs to continue running on the other nodes
LOG.debug("Cannot delete job using trigger: {}/{} as the JobStore is clustered.", group, name);
} else {
- Trigger trigger = getScheduler().getTrigger(name, group);
+ Trigger trigger = getScheduler().getTrigger(name, group);
if (trigger != null) {
LOG.debug("Deleting job using trigger: {}/{}", group, name);
getScheduler().unscheduleJob(name, group);
http://git-wip-us.apache.org/repos/asf/camel/blob/05d3301c/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
index 0114f66..5c0be0f 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
@@ -50,6 +50,8 @@ public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableServi
private JobDetail jobDetail = new JobDetail();
private volatile boolean started;
private volatile boolean stateful;
+ private boolean deleteJob = true;
+ private boolean pauseJob;
public QuartzEndpoint(final String endpointUri, final QuartzComponent component) {
super(endpointUri, component);
@@ -200,6 +202,22 @@ public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableServi
this.stateful = stateful;
}
+ public boolean isDeleteJob() {
+ return deleteJob;
+ }
+
+ public void setDeleteJob(boolean deleteJob) {
+ this.deleteJob = deleteJob;
+ }
+
+ public boolean isPauseJob() {
+ return pauseJob;
+ }
+
+ public void setPauseJob(boolean pauseJob) {
+ this.pauseJob = pauseJob;
+ }
+
// Implementation methods
// -------------------------------------------------------------------------
@@ -234,6 +252,10 @@ public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableServi
protected void doStart() throws Exception {
ObjectHelper.notNull(getComponent(), "QuartzComponent", this);
ServiceHelper.startService(loadBalancer);
+
+ if (isDeleteJob() && isPauseJob()) {
+ throw new IllegalArgumentException("Cannot have both options deleteJob and pauseJob enabled");
+ }
}
@Override
@@ -244,6 +266,10 @@ public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableServi
@Override
protected void doShutdown() throws Exception {
ObjectHelper.notNull(trigger, "trigger");
- deleteTrigger(getTrigger());
+ if (isDeleteJob()) {
+ deleteTrigger(getTrigger());
+ } else if (isPauseJob()) {
+ pauseTrigger(getTrigger());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/05d3301c/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
index c8f78b3..9d37cd8 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
@@ -58,6 +58,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
private boolean stateful;
private boolean fireNow;
private boolean deleteJob = true;
+ private boolean pauseJob;
/** In case of scheduler has already started, we want the trigger start slightly after current time to
* ensure endpoint is fully started before the job kicks in. */
private long triggerStartDelay = 500; // in millis second
@@ -90,6 +91,14 @@ public class QuartzEndpoint extends DefaultEndpoint {
return deleteJob;
}
+ public boolean isPauseJob() {
+ return pauseJob;
+ }
+
+ public void setPauseJob(boolean pauseJob) {
+ this.pauseJob = pauseJob;
+ }
+
public void setTriggerStartDelay(long triggerStartDelay) {
this.triggerStartDelay = triggerStartDelay;
}
@@ -156,6 +165,10 @@ public class QuartzEndpoint extends DefaultEndpoint {
@Override
protected void doStart() throws Exception {
+ if (isDeleteJob() && isPauseJob()) {
+ throw new IllegalArgumentException("Cannot have both options deleteJob and pauseJob enabled");
+ }
+
addJobInScheduler();
}
@@ -178,6 +191,14 @@ public class QuartzEndpoint extends DefaultEndpoint {
jobAdded.set(false);
}
+ } else if (pauseJob) {
+ boolean isClustered = scheduler.getMetaData().isJobStoreClustered();
+ if (!scheduler.isShutdown() && !isClustered) {
+ LOG.info("Pausing job {}", triggerKey);
+ scheduler.pauseTrigger(triggerKey);
+
+ jobAdded.set(false);
+ }
}
// Decrement camel job count for this endpoint
@@ -188,7 +209,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
private void addJobInScheduler() throws Exception {
// Add or use existing trigger to/from scheduler
Scheduler scheduler = getComponent().getScheduler();
- JobDetail jobDetail = null;
+ JobDetail jobDetail;
Trigger trigger = scheduler.getTrigger(triggerKey);
if (trigger == null) {
jobDetail = createJobDetail();
@@ -244,7 +265,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
}
private Trigger createTrigger() throws Exception {
- Trigger result = null;
+ Trigger result;
Date startTime = new Date();
if (getComponent().getScheduler().isStarted()) {
startTime = new Date(System.currentTimeMillis() + triggerStartDelay);