svn commit: r1326620 - in /karaf/cellar/trunk: ./ hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/ samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/

[jb...@apache.org]

Author: jbonofre
Date: Mon Apr 16 14:00:22 2012
New Revision: 1326620

URL: http://svn.apache.org/viewvc?rev=1326620&view=rev
Log:
[KARAF-1361] Upgrade to Hazelcast 2.0.2

Modified:
    karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
    karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
    karaf/cellar/trunk/pom.xml
    karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java

Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java?rev=1326620&r1=1326619&r2=1326620&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java Mon Apr 16 14:00:22 2012
@@ -15,6 +15,7 @@ package org.apache.karaf.cellar.hazelcas
 
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IQueue;
+import com.hazelcast.core.ItemEvent;
 import com.hazelcast.core.ItemListener;
 import org.apache.karaf.cellar.core.Dispatcher;
 import org.apache.karaf.cellar.core.Node;
@@ -138,12 +139,12 @@ public class QueueConsumer<E extends Eve
     }
 
     @Override
-    public void itemAdded(E event) {
+    public void itemAdded(ItemEvent event) {
 
     }
 
     @Override
-    public void itemRemoved(E event) {
+    public void itemRemoved(ItemEvent event) {
 
     }
 

Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java?rev=1326620&r1=1326619&r2=1326620&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java Mon Apr 16 14:00:22 2012
@@ -15,6 +15,7 @@ package org.apache.karaf.cellar.hazelcas
 
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.ITopic;
+import com.hazelcast.core.Message;
 import com.hazelcast.core.MessageListener;
 import org.apache.karaf.cellar.core.Dispatcher;
 import org.apache.karaf.cellar.core.Node;
@@ -69,6 +70,10 @@ public class TopicConsumer<E extends Eve
         }
     }
 
+    private void consume(Message<E> message) {
+        consume(message.getMessageObject());
+    }
+
     @Override
     public void start() {
         isConsuming = true;
@@ -94,7 +99,7 @@ public class TopicConsumer<E extends Eve
         return isConsuming;
     }
 
-    public void onMessage(E message) {
+    public void onMessage(Message<E> message) {
         consume(message);
     }
 

Modified: karaf/cellar/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/pom.xml?rev=1326620&r1=1326619&r2=1326620&view=diff
==============================================================================
--- karaf/cellar/trunk/pom.xml (original)
+++ karaf/cellar/trunk/pom.xml Mon Apr 16 14:00:22 2012
@@ -38,7 +38,7 @@
         <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
         <felix.configadmin.version>1.2.8</felix.configadmin.version>
         <felix.webconsole.version>3.1.8</felix.webconsole.version>
-        <hazelcast.version>1.9.4.8</hazelcast.version>
+        <hazelcast.version>2.0.2</hazelcast.version>
         <jclouds.version>1.3.1</jclouds.version>
         <joda-time.version>1.6.2</joda-time.version>
         <junit.version>4.7</junit.version>

Modified: karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java?rev=1326620&r1=1326619&r2=1326620&view=diff
==============================================================================
--- karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java (original)
+++ karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java Mon Apr 16 14:00:22 2012
@@ -19,8 +19,8 @@ package org.apache.karaf.cellar.samples.
 public class MessageListener implements com.hazelcast.core.MessageListener {
 
     @Override
-    public void onMessage(Object message) {
-        System.out.println("Received message:"+message);
+    public void onMessage(com.hazelcast.core.Message message) {
+        System.out.println("Received message: " + message);
     }
 
 }