Author: akarpe
Date: Thu Jun 23 15:27:15 2011
New Revision: 1138929
URL: http://svn.apache.org/viewvc?rev=1138929&view=rev
Log:
Fix for CAMEL-4055.Thanks to patch submitted by Ioannis Polyzos
Modified:
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
Modified:
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java?rev=1138929&r1=1138928&r2=1138929&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
(original)
+++
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
Thu Jun 23 15:27:15 2011
@@ -32,23 +32,23 @@ public final class HazelcastConstants {
/*
* incoming header properties
*/
- public static final String OBJECT_ID = "hazelcast.objectId";
- public static final String OBJECT_POS = "hazelcast.objectIndex";
- public static final String QUERY = "hazelcast.query";
+ public static final String OBJECT_ID = "HazelcastObjectId";
+ public static final String OBJECT_POS = "HazelcastObjectIndex";
+ public static final String QUERY = "HazelcastQuery";
/*
* outgoing header properties
*/
- public static final String LISTENER_ACTION = "hazelcast.listener.action";
- public static final String LISTENER_TYPE = "hazelcast.listener.type";
- public static final String LISTENER_TIME = "hazelcast.listener.time";
- public static final String INSTANCE_HOST = "hazelcast.instance.host";
- public static final String INSTANCE_PORT = "hazelcast.instance.port";
- public static final String CACHE_NAME = "hazelcast.cache.name";
- public static final String CACHE_TYPE = "hazelcast.cache.type";
+ public static final String LISTENER_ACTION = "HazelcastListenerAction";
+ public static final String LISTENER_TYPE = "HazelcastListenerType";
+ public static final String LISTENER_TIME = "HazelcastListenerTime";
+ public static final String INSTANCE_HOST = "HazelcastInstanceHost";
+ public static final String INSTANCE_PORT = "HazelcastInstancePort";
+ public static final String CACHE_NAME = "HazelcastCacheName";
+ public static final String CACHE_TYPE = "HazelcastCacheType";
// actions (put, delete, get, update)
- public static final String OPERATION = "hazelcast.operation.type";
+ public static final String OPERATION = "HazelcastOperationType";
public static final int PUT_OPERATION = 1;
public static final int DELETE_OPERATION = 2;
public static final int GET_OPERATION = 3;
Modified:
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java?rev=1138929&r1=1138928&r2=1138929&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java
(original)
+++
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java
Thu Jun 23 15:27:15 2011
@@ -22,6 +22,7 @@ import java.util.concurrent.BlockingQueu
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
+import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.camel.impl.DefaultExchangeHolder;
@@ -63,6 +64,9 @@ public class HazelcastSedaProducer exten
}
queue.add(obj);
+
+ // finally copy headers
+ HazelcastComponentHelper.copyHeaders(exchange);
}
}
Modified:
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml?rev=1138929&r1=1138928&r2=1138929&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml
Thu Jun 23 15:27:15 2011
@@ -25,39 +25,39 @@
<route>
<from uri="direct:set" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>setvalue</constant>
</setHeader>
<to uri="hazelcast:atomicvalue:foo" />
</route>
-
+
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast:atomicvalue:foo" />
</route>
-
+
<route>
<from uri="direct:increment" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>increment</constant>
</setHeader>
<to uri="hazelcast:atomicvalue:foo" />
</route>
-
+
<route>
<from uri="direct:decrement" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>decrement</constant>
</setHeader>
<to uri="hazelcast:atomicvalue:foo" />
</route>
-
+
<route>
<from uri="direct:destroy" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>destroy</constant>
</setHeader>
<to uri="hazelcast:atomicvalue:foo" />
Modified:
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml?rev=1138929&r1=1138928&r2=1138929&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml
Thu Jun 23 15:27:15 2011
@@ -25,7 +25,7 @@
<route>
<from uri="direct:put" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast:map:foo" />
@@ -33,7 +33,7 @@
<route>
<from uri="direct:update" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>update</constant>
</setHeader>
<to uri="hazelcast:map:foo" />
@@ -41,7 +41,7 @@
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast:map:foo" />
@@ -50,7 +50,7 @@
<route>
<from uri="direct:delete" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast:map:foo" />
@@ -58,7 +58,7 @@
<route>
<from uri="direct:query" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>query</constant>
</setHeader>
<to uri="hazelcast:map:foo" />
Modified:
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml?rev=1138929&r1=1138928&r2=1138929&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml
Thu Jun 23 15:27:15 2011
@@ -25,7 +25,7 @@
<route>
<from uri="direct:put" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>put</constant>
</setHeader>
<to uri="hazelcast:multimap:foo" />
@@ -33,7 +33,7 @@
<route>
<from uri="direct:removevalue" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>removevalue</constant>
</setHeader>
<to uri="hazelcast:multimap:foo" />
@@ -41,7 +41,7 @@
<route>
<from uri="direct:get" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>get</constant>
</setHeader>
<to uri="hazelcast:multimap:foo" />
@@ -50,7 +50,7 @@
<route>
<from uri="direct:delete" />
- <setHeader headerName="hazelcast.operation.type">
+ <setHeader headerName="HazelcastOperationType">
<constant>delete</constant>
</setHeader>
<to uri="hazelcast:multimap:foo" />
