Author: davsclaus
Date: Thu May 19 07:02:00 2011
New Revision: 1124563
URL: http://svn.apache.org/viewvc?rev=1124563&view=rev
Log:
CAMEL-3982: Upgraded to hazelcast 1.9.3. Thanks to Claus Straube for the patch.
Modified:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java?rev=1124563&r1=1124562&r2=1124563&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
Thu May 19 07:02:00 2011
@@ -20,7 +20,6 @@ import java.util.List;
import com.hazelcast.core.Hazelcast;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -31,28 +30,21 @@ public class HazelcastListProducerTest e
@Override
public void setUp() throws Exception {
+ super.setUp();
+
list = Hazelcast.getList("bar");
list.clear();
-
- super.setUp();
}
- // @Test
- public void add() throws InterruptedException {
- List<Object> list = Hazelcast.getList("bar");
- list.clear();
+ @Test
+ public void addValue() throws InterruptedException {
template.sendBody("direct:add", "bar");
-
assertTrue(list.contains("bar"));
-
- list.clear();
}
- // @Test
+ @Test
public void removeValue() throws InterruptedException {
- List<String> list = Hazelcast.getList("bar");
- list.clear();
list.add("foo1");
list.add("foo2");
@@ -65,16 +57,11 @@ public class HazelcastListProducerTest e
assertEquals(2, list.size());
assertTrue(list.contains("foo1") && list.contains("foo3"));
-
- list.clear();
}
- @Test(expected = CamelExecutionException.class)
- public void get() {
- // unsupported operation
-
- List<String> list = Hazelcast.getList("bar");
- list.clear();
+ @Test
+ public void getValueWithIdx() {
+ // unsupported operation --> supported since 1.9.3
list.add("foo1");
list.add("foo2");
@@ -83,16 +70,13 @@ public class HazelcastListProducerTest e
template.sendBodyAndHeader("direct:get", "test",
HazelcastConstants.OBJECT_POS, 1);
- assertEquals("test", consumer.receiveBody("seda:out", 5000,
String.class));
+ assertEquals("foo2", consumer.receiveBody("seda:out", 5000,
String.class));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void setValueWithIdx() {
- // unsupported operation
-
- List<String> list = Hazelcast.getList("bar");
- list.clear();
+ // unsupported operation --> supported since 1.9.3
list.add("foo1");
list.add("foo2");
@@ -106,12 +90,9 @@ public class HazelcastListProducerTest e
}
- // @Test(expected=CamelExecutionException.class)
+ @Test
public void removeValueWithIdx() {
- // unsupported operation
-
- List<String> list = Hazelcast.getList("bar");
- list.clear();
+ // unsupported operation --> supported since 1.9.3
list.add("foo1");
list.add("foo2");
@@ -162,3 +143,4 @@ public class HazelcastListProducerTest e
}
}
+
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1124563&r1=1124562&r2=1124563&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu May 19 07:02:00 2011
@@ -78,7 +78,7 @@
<hamcrest-version>1.2-dev1</hamcrest-version>
<hawtbuf-version>1.2</hawtbuf-version>
<hawtdb-version>1.5</hawtdb-version>
- <hazelcast-version>1.9.2</hazelcast-version>
+ <hazelcast-version>1.9.3</hazelcast-version>
<hibernate-version>3.2.6.ga</hibernate-version>
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1124563&r1=1124562&r2=1124563&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
May 19 07:02:00 2011
@@ -277,6 +277,17 @@
<bundle
dependency="true">mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
<bundle>mvn:org.apache.camel/camel-groovy/${pom.version}</bundle>
</feature>
+ <feature name='camel-hazelcast' version='${pom.version}' resolver='(obr)'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle
dependency="true">mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-hazelcast/${pom.version}</bundle>
+ </feature>
+ <feature name='camel-hawtdb' version='${pom.version}' resolver='(obr)'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle
dependency="true">mvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+ <bundle
dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
+ </feature>
<feature name='camel-hl7' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
@@ -290,12 +301,6 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
</feature>
- <feature name='camel-hawtdb' version='${pom.version}' resolver='(obr)'>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle
dependency="true">mvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
- <bundle
dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
- </feature>
<feature name='camel-ibatis' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
@@ -649,9 +654,4 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-xstream/${pom.version}</bundle>
</feature>
- <feature name='camel-hazelcast' version='${pom.version}' resolver='(obr)'>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle
dependency="true">mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-hazelcast/${pom.version}</bundle>
- </feature>
</features>
