Author: akarpe Date: Thu Jun 23 16:33:01 2011 New Revision: 1138971 URL: http://svn.apache.org/viewvc?rev=1138971&view=rev Log: Revised Patch for CAMEL-4055 to comply with Camel Constant naming conventions
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.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=1138971&r1=1138970&r2=1138971&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 16:33:01 2011 @@ -32,23 +32,23 @@ public final class HazelcastConstants { /* * incoming header properties */ - public static final String OBJECT_ID = "HazelcastObjectId"; - public static final String OBJECT_POS = "HazelcastObjectIndex"; - public static final String QUERY = "HazelcastQuery"; + public static final String OBJECT_ID = "CamelHazelcastObjectId"; + public static final String OBJECT_POS = "CamelHazelcastObjectIndex"; + public static final String QUERY = "CamelHazelcastQuery"; /* * outgoing header properties */ - 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"; + public static final String LISTENER_ACTION = "CamelHazelcastListenerAction"; + public static final String LISTENER_TYPE = "CamelHazelcastListenerType"; + public static final String LISTENER_TIME = "CamelHazelcastListenerTime"; + public static final String INSTANCE_HOST = "CamelHazelcastInstanceHost"; + public static final String INSTANCE_PORT = "CamelHazelcastInstancePort"; + public static final String CACHE_NAME = "CamelHazelcastCacheName"; + public static final String CACHE_TYPE = "CamelHazelcastCacheType"; // actions (put, delete, get, update) - public static final String OPERATION = "HazelcastOperationType"; + public static final String OPERATION = "CamelHazelcastOperationType"; 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/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=1138971&r1=1138970&r2=1138971&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 16:33:01 2011 @@ -25,7 +25,7 @@ <route> <from uri="direct:set" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>setvalue</constant> </setHeader> <to uri="hazelcast:atomicvalue:foo" /> @@ -33,7 +33,7 @@ <route> <from uri="direct:get" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> <to uri="hazelcast:atomicvalue:foo" /> @@ -41,7 +41,7 @@ <route> <from uri="direct:increment" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>increment</constant> </setHeader> <to uri="hazelcast:atomicvalue:foo" /> @@ -49,7 +49,7 @@ <route> <from uri="direct:decrement" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>decrement</constant> </setHeader> <to uri="hazelcast:atomicvalue:foo" /> @@ -57,7 +57,7 @@ <route> <from uri="direct:destroy" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <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=1138971&r1=1138970&r2=1138971&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 16:33:01 2011 @@ -25,7 +25,7 @@ <route> <from uri="direct:put" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>put</constant> </setHeader> <to uri="hazelcast:map:foo" /> @@ -33,7 +33,7 @@ <route> <from uri="direct:update" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>update</constant> </setHeader> <to uri="hazelcast:map:foo" /> @@ -41,7 +41,7 @@ <route> <from uri="direct:get" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> <to uri="hazelcast:map:foo" /> @@ -50,7 +50,7 @@ <route> <from uri="direct:delete" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>delete</constant> </setHeader> <to uri="hazelcast:map:foo" /> @@ -58,7 +58,7 @@ <route> <from uri="direct:query" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <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=1138971&r1=1138970&r2=1138971&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 16:33:01 2011 @@ -25,7 +25,7 @@ <route> <from uri="direct:put" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>put</constant> </setHeader> <to uri="hazelcast:multimap:foo" /> @@ -33,7 +33,7 @@ <route> <from uri="direct:removevalue" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>removevalue</constant> </setHeader> <to uri="hazelcast:multimap:foo" /> @@ -41,7 +41,7 @@ <route> <from uri="direct:get" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> <to uri="hazelcast:multimap:foo" /> @@ -50,7 +50,7 @@ <route> <from uri="direct:delete" /> - <setHeader headerName="HazelcastOperationType"> + <setHeader headerName="CamelHazelcastOperationType"> <constant>delete</constant> </setHeader> <to uri="hazelcast:multimap:foo" />