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 2016/02/13 09:32:50 UTC
[1/3] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master 9c167d947 -> d022baa67
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9c2856a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9c2856a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9c2856a
Branch: refs/heads/master
Commit: c9c2856a15e9e46b67d6f915bd10b8c92ccb3ec7
Parents: 9c167d9
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 13 08:57:59 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 13 08:57:59 2016 +0100
----------------------------------------------------------------------
examples/camel-example-spring-jms/pom.xml | 4 +---
.../resources/META-INF/spring/camel-server.xml | 7 ++++++-
.../src/main/resources/features.xml | 19 ++++---------------
3 files changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c9c2856a/examples/camel-example-spring-jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index ea68978..0bc84f3 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -27,9 +27,7 @@
<artifactId>camel-example-spring-jms</artifactId>
<packaging>bundle</packaging>
<name>Camel :: Example :: Spring :: JMS</name>
- <description>An example using Spring XML to talk to the JMS server from different kind of client techniques
- and having AOP aspect to perform audit trails in the Camel Server
- </description>
+ <description>An example using Spring XML to talk to the JMS server from different kind of client techniques</description>
<properties>
<camel.osgi.export.pkg>org.apache.camel.example.server.*</camel.osgi.export.pkg>
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional>
http://git-wip-us.apache.org/repos/asf/camel/blob/c9c2856a/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml b/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
index d162d2d..679d1f4 100644
--- a/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
+++ b/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
@@ -64,7 +64,12 @@
<!-- START SNIPPET: e5 -->
<!-- lets configure the Camel ActiveMQ to use the embedded ActiveMQ broker declared above -->
<bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
- <property name="brokerURL" value="vm://myBroker"/>
+ <property name="connectionFactory">
+ <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://myBroker"/>
+ <property name="trustAllPackages" value="true"/>
+ </bean>
+ </property>
</bean>
<!-- END SNIPPET: e5 -->
http://git-wip-us.apache.org/repos/asf/camel/blob/c9c2856a/examples/camel-example-spring-jms/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/src/main/resources/features.xml b/examples/camel-example-spring-jms/src/main/resources/features.xml
index a5fd2e5..85c5305 100644
--- a/examples/camel-example-spring-jms/src/main/resources/features.xml
+++ b/examples/camel-example-spring-jms/src/main/resources/features.xml
@@ -17,22 +17,11 @@
-->
<features>
<repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
-
- <feature name='activemq-feature' version='${project.version}'>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
- <bundle>mvn:org.apache.xbean/xbean-spring/3.4.3</bundle>
- <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-camel/${activemq-version}</bundle>
- </feature>
-
+ <repository>mvn:org.apache.activemq/activemq-karaf/${activemq-version}/xml/features</repository>
+
<feature name='camel-example-spring-jms' version='${project.version}'>
+ <feature>activemq-broker-noweb</feature>
+ <feature>activemq-camel</feature>
<feature version="${project.version}">camel</feature>
<feature version="${project.version}">camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-example-spring-jms/${project.version}</bundle>
[2/3] camel git commit: Polished to have a reason why rejected in the
exception
Posted by da...@apache.org.
Polished to have a reason why rejected in the exception
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b444042f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b444042f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b444042f
Branch: refs/heads/master
Commit: b444042ff79a78f9678129a75fba37210e5bff51
Parents: c9c2856
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 13 09:13:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 13 09:14:34 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/processor/CamelInternalProcessor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b444042f/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 32f8b38..7ce5a4d 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -271,9 +271,10 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
// determine if we can still run, or the camel context is forcing a shutdown
boolean forceShutdown = exchange.getContext().getShutdownStrategy().forceShutdown(this);
if (forceShutdown) {
- LOG.debug("Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: {}", exchange);
+ String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange;
+ LOG.debug(msg);
if (exchange.getException() == null) {
- exchange.setException(new RejectedExecutionException());
+ exchange.setException(new RejectedExecutionException(msg));
}
return false;
}
[3/3] camel git commit: A bit better error message in throttler if it
was interrupted during force shutdown of Camel
Posted by da...@apache.org.
A bit better error message in throttler if it was interrupted during force shutdown of Camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d022baa6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d022baa6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d022baa6
Branch: refs/heads/master
Commit: d022baa6726045fcdd467e7939d3916d7c0cbe03
Parents: b444042
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 13 09:32:04 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 13 09:32:04 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/processor/Throttler.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d022baa6/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Throttler.java b/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
index dda02ec..5fe3b46 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
@@ -173,6 +173,18 @@ public class Throttler extends DelegateAsyncProcessor implements Traceable, IdAw
callback.done(doneSync);
return doneSync;
+ } catch (final InterruptedException e) {
+ // determine if we can still run, or the camel context is forcing a shutdown
+ boolean forceShutdown = exchange.getContext().getShutdownStrategy().forceShutdown(this);
+ if (forceShutdown) {
+ String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange;
+ log.debug(msg);
+ exchange.setException(new RejectedExecutionException(msg, e));
+ } else {
+ exchange.setException(e);
+ }
+ callback.done(doneSync);
+ return doneSync;
} catch (final Throwable t) {
exchange.setException(t);
callback.done(doneSync);