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 2012/03/13 05:58:20 UTC
svn commit: r1299973 - in /camel/trunk: components/camel-hazelcast/pom.xml
components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
parent/pom.xml
Author: davsclaus
Date: Tue Mar 13 04:58:19 2012
New Revision: 1299973
URL: http://svn.apache.org/viewvc?rev=1299973&view=rev
Log:
CAMEL-5077: Upgrade to hazelcast 2.0.1
Modified:
camel/trunk/components/camel-hazelcast/pom.xml
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/pom.xml?rev=1299973&r1=1299972&r2=1299973&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/pom.xml (original)
+++ camel/trunk/components/camel-hazelcast/pom.xml Tue Mar 13 04:58:19 2012
@@ -32,7 +32,10 @@
<description>Camel HazelCast based work queue implementation</description>
<properties>
- <camel.osgi.export.pkg>
+ <camel.osgi.import.before.defaults>
+ com.hazelcast.*;version="[1.9,3)"
+ </camel.osgi.import.before.defaults>
+ <camel.osgi.export.pkg>
org.apache.camel.component.hazelcast.*;${camel.osgi.version},
org.apache.camel.processor.idempotent.hazelcast.*
</camel.osgi.export.pkg>
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java?rev=1299973&r1=1299972&r2=1299973&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java Tue Mar 13 04:58:19 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.hazelcast.listener;
+import com.hazelcast.core.ItemEvent;
import com.hazelcast.core.ItemListener;
import org.apache.camel.component.hazelcast.HazelcastConstants;
@@ -30,12 +31,27 @@ public class CamelItemListener extends C
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());
+ }
+
+ public void itemRemoved(ItemEvent<Object> itemEvent) {
+ itemRemoved(itemEvent.getItem());
+ }
}
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1299973&r1=1299972&r2=1299973&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Mar 13 04:58:19 2012
@@ -89,7 +89,7 @@
<hapi-version>1.2</hapi-version>
<hawtbuf-version>1.7</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
- <hazelcast-version>1.9.4.8</hazelcast-version>
+ <hazelcast-version>2.0.1</hazelcast-version>
<hibernate-version>3.2.6.ga</hibernate-version>
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>2.2.8</hsqldb-version>