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/09/14 12:31:21 UTC
[1/6] git commit: Polished and removed old 1.x api which we no longer
support in camel-hazelcast
Updated Branches:
refs/heads/camel-2.10.x 0db45d083 -> ee5ca5cdd
refs/heads/camel-2.11.x 93116d156 -> 4225d51ff
refs/heads/camel-2.12.x ed6e772b0 -> d4531f8e2
refs/heads/master 71b216526 -> 655746a8e
Polished and removed old 1.x api which we no longer support in camel-hazelcast
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05958abe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05958abe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05958abe
Branch: refs/heads/master
Commit: 05958abeb2851b81f7310319a2666c8dc5192675
Parents: 71b2165
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:23 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:28:23 2013 +0200
----------------------------------------------------------------------
.../hazelcast/listener/CamelItemListener.java | 20 ++------------------
.../hazelcast/listener/CamelListener.java | 10 ++++++----
2 files changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/05958abe/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
index 1b14327..3fe1373 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
@@ -31,27 +31,11 @@ public class CamelItemListener extends CamelListener implements ItemListener<Obj
super(consumer, cacheName);
}
- /**
- * @deprecated is using the Hazelcast 1.x API
- */
- @Deprecated
- public void itemAdded(Object item) {
- this.sendExchange(HazelcastConstants.ADDED, null, item);
- }
-
- /**
- * @deprecated is using the Hazelcast 1.x API
- */
- @Deprecated
- public void itemRemoved(Object item) {
- this.sendExchange(HazelcastConstants.REMOVED, null, item);
- }
-
public void itemAdded(ItemEvent<Object> itemEvent) {
- itemAdded(itemEvent.getItem());
+ this.sendExchange(HazelcastConstants.ADDED, null, itemEvent);
}
public void itemRemoved(ItemEvent<Object> itemEvent) {
- itemRemoved(itemEvent.getItem());
+ this.sendExchange(HazelcastConstants.REMOVED, null, itemEvent);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/05958abe/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
index 5264d92..e43100e 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
@@ -47,10 +47,12 @@ public class CamelListener {
try {
consumer.getProcessor().process(exchange);
} catch (Exception e) {
- if (exchange.getException() != null) {
- consumer.getExceptionHandler().handleException(String.format("Error processing exchange for hazelcast consumer on object '%s' in cache '%s'.", key, cacheName), exchange,
- exchange.getException());
- }
+ exchange.setException(e);
+ }
+
+ if (exchange.getException() != null) {
+ consumer.getExceptionHandler().handleException(String.format("Error processing exchange for hazelcast consumer on object '%s' in cache '%s'.", key, cacheName), exchange,
+ exchange.getException());
}
}
[4/6] git commit: CAMEL-6740: System property
org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to
Seiji Sogabe for the patch.
Posted by da...@apache.org.
CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d4531f8e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d4531f8e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d4531f8e
Branch: refs/heads/camel-2.12.x
Commit: d4531f8e290cee69f29c6af208f3f8475f5062ea
Parents: ccb855f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:29:20 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/management/DefaultManagementAgent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d4531f8e/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index 99c8e20..f134ae4 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -86,8 +86,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
protected void finalizeSettings() {
- // TODO: System properties ought to take precedence, over configured options
-
if (registryPort == null) {
registryPort = Integer.getInteger(JmxSystemPropertyKeys.REGISTRY_PORT, DEFAULT_REGISTRY_PORT);
}
@@ -113,7 +111,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
if (System.getProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS) != null) {
usePlatformMBeanServer = Boolean.getBoolean(JmxSystemPropertyKeys.USE_PLATFORM_MBS);
}
-
if (System.getProperty(JmxSystemPropertyKeys.REGISTER_ALWAYS) != null) {
registerAlways = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_ALWAYS);
}
@@ -123,6 +120,9 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
if (System.getProperty(JmxSystemPropertyKeys.MASK) != null) {
mask = Boolean.getBoolean(JmxSystemPropertyKeys.MASK);
}
+ if (System.getProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR) != null) {
+ createConnector = Boolean.getBoolean(JmxSystemPropertyKeys.CREATE_CONNECTOR);
+ }
}
public void setRegistryPort(Integer port) {
[6/6] git commit: CAMEL-6740: System property
org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to
Seiji Sogabe for the patch.
Posted by da...@apache.org.
CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch.
Conflicts:
camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee5ca5cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee5ca5cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee5ca5cd
Branch: refs/heads/camel-2.10.x
Commit: ee5ca5cdd4454bc5985d951785c391e4b8c7f0b2
Parents: 0db45d0
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:30:45 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/management/DefaultManagementAgent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee5ca5cd/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index 5f4edad..66b46d3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -85,8 +85,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
protected void finalizeSettings() {
- // TODO: System properties ought to take precedence, over configured options
-
if (registryPort == null) {
registryPort = Integer.getInteger(JmxSystemPropertyKeys.REGISTRY_PORT, DEFAULT_REGISTRY_PORT);
}
@@ -112,13 +110,15 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
if (System.getProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS) != null) {
usePlatformMBeanServer = Boolean.getBoolean(JmxSystemPropertyKeys.USE_PLATFORM_MBS);
}
-
if (System.getProperty(JmxSystemPropertyKeys.REGISTER_ALWAYS) != null) {
registerAlways = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_ALWAYS);
}
if (System.getProperty(JmxSystemPropertyKeys.REGISTER_NEW_ROUTES) != null) {
registerNewRoutes = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_NEW_ROUTES);
}
+ if (System.getProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR) != null) {
+ createConnector = Boolean.getBoolean(JmxSystemPropertyKeys.CREATE_CONNECTOR);
+ }
}
public void setRegistryPort(Integer port) {
[2/6] git commit: CAMEL-6740: System property
org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to
Seiji Sogabe for the patch.
Posted by da...@apache.org.
CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/655746a8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/655746a8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/655746a8
Branch: refs/heads/master
Commit: 655746a8e86692669fa2dd234db4a1ecd7655f10
Parents: 05958ab
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:28:55 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/management/DefaultManagementAgent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/655746a8/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index 99c8e20..f134ae4 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -86,8 +86,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
protected void finalizeSettings() {
- // TODO: System properties ought to take precedence, over configured options
-
if (registryPort == null) {
registryPort = Integer.getInteger(JmxSystemPropertyKeys.REGISTRY_PORT, DEFAULT_REGISTRY_PORT);
}
@@ -113,7 +111,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
if (System.getProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS) != null) {
usePlatformMBeanServer = Boolean.getBoolean(JmxSystemPropertyKeys.USE_PLATFORM_MBS);
}
-
if (System.getProperty(JmxSystemPropertyKeys.REGISTER_ALWAYS) != null) {
registerAlways = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_ALWAYS);
}
@@ -123,6 +120,9 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
if (System.getProperty(JmxSystemPropertyKeys.MASK) != null) {
mask = Boolean.getBoolean(JmxSystemPropertyKeys.MASK);
}
+ if (System.getProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR) != null) {
+ createConnector = Boolean.getBoolean(JmxSystemPropertyKeys.CREATE_CONNECTOR);
+ }
}
public void setRegistryPort(Integer port) {
[3/6] git commit: Polished and removed old 1.x api which we no longer
support in camel-hazelcast
Posted by da...@apache.org.
Polished and removed old 1.x api which we no longer support in camel-hazelcast
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ccb855f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ccb855f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ccb855f0
Branch: refs/heads/camel-2.12.x
Commit: ccb855f026af839406304314252c62371b81f981
Parents: ed6e772
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:23 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:29:13 2013 +0200
----------------------------------------------------------------------
.../hazelcast/listener/CamelItemListener.java | 20 ++------------------
.../hazelcast/listener/CamelListener.java | 10 ++++++----
2 files changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ccb855f0/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
index 1b14327..3fe1373 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
@@ -31,27 +31,11 @@ public class CamelItemListener extends CamelListener implements ItemListener<Obj
super(consumer, cacheName);
}
- /**
- * @deprecated is using the Hazelcast 1.x API
- */
- @Deprecated
- public void itemAdded(Object item) {
- this.sendExchange(HazelcastConstants.ADDED, null, item);
- }
-
- /**
- * @deprecated is using the Hazelcast 1.x API
- */
- @Deprecated
- public void itemRemoved(Object item) {
- this.sendExchange(HazelcastConstants.REMOVED, null, item);
- }
-
public void itemAdded(ItemEvent<Object> itemEvent) {
- itemAdded(itemEvent.getItem());
+ this.sendExchange(HazelcastConstants.ADDED, null, itemEvent);
}
public void itemRemoved(ItemEvent<Object> itemEvent) {
- itemRemoved(itemEvent.getItem());
+ this.sendExchange(HazelcastConstants.REMOVED, null, itemEvent);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ccb855f0/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
index 5264d92..e43100e 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
@@ -47,10 +47,12 @@ public class CamelListener {
try {
consumer.getProcessor().process(exchange);
} catch (Exception e) {
- if (exchange.getException() != null) {
- consumer.getExceptionHandler().handleException(String.format("Error processing exchange for hazelcast consumer on object '%s' in cache '%s'.", key, cacheName), exchange,
- exchange.getException());
- }
+ exchange.setException(e);
+ }
+
+ if (exchange.getException() != null) {
+ consumer.getExceptionHandler().handleException(String.format("Error processing exchange for hazelcast consumer on object '%s' in cache '%s'.", key, cacheName), exchange,
+ exchange.getException());
}
}
[5/6] git commit: CAMEL-6740: System property
org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to
Seiji Sogabe for the patch.
Posted by da...@apache.org.
CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch.
Conflicts:
camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4225d51f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4225d51f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4225d51f
Branch: refs/heads/camel-2.11.x
Commit: 4225d51ff252a1d15e2bd0d7e12ce1d15c277ce3
Parents: 93116d1
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:30:20 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/management/DefaultManagementAgent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4225d51f/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index 78fc97a..0402d1a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -85,8 +85,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
protected void finalizeSettings() {
- // TODO: System properties ought to take precedence, over configured options
-
if (registryPort == null) {
registryPort = Integer.getInteger(JmxSystemPropertyKeys.REGISTRY_PORT, DEFAULT_REGISTRY_PORT);
}
@@ -112,13 +110,15 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
if (System.getProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS) != null) {
usePlatformMBeanServer = Boolean.getBoolean(JmxSystemPropertyKeys.USE_PLATFORM_MBS);
}
-
if (System.getProperty(JmxSystemPropertyKeys.REGISTER_ALWAYS) != null) {
registerAlways = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_ALWAYS);
}
if (System.getProperty(JmxSystemPropertyKeys.REGISTER_NEW_ROUTES) != null) {
registerNewRoutes = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_NEW_ROUTES);
}
+ if (System.getProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR) != null) {
+ createConnector = Boolean.getBoolean(JmxSystemPropertyKeys.CREATE_CONNECTOR);
+ }
}
public void setRegistryPort(Integer port) {