svn commit: r1214648 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java

2011-12-14 Thread ningjiang
Author: ningjiang
Date: Thu Dec 15 07:55:58 2011
New Revision: 1214648

URL: http://svn.apache.org/viewvc?rev=1214648&view=rev
Log:
Merged revisions 1214639 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1214639 | ningjiang | 2011-12-15 15:10:05 +0800 (Thu, 15 Dec 2011) | 1 line
  
  CAMEL-4781 Improving NoTypeConversionAvailableException message with cause


Modified:
camel/branches/camel-2.8.x/   (props changed)

camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java

Propchange: camel/branches/camel-2.8.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 07:55:58 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639

Propchange: camel/branches/camel-2.8.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java?rev=1214648&r1=1214647&r2=1214648&view=diff
==
--- 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
 Thu Dec 15 07:55:58 2011
@@ -34,8 +34,9 @@ public class NoTypeConversionAvailableEx
 }
 
 public NoTypeConversionAvailableException(Object value, Class type, 
Throwable cause) {
-this(value, type);
-initCause(cause);
+super(createMessage(value, type, cause), cause);
+this.value = value;
+this.type = type;
 }
 
 /**
@@ -71,4 +72,13 @@ public class NoTypeConversionAvailableEx
 return "No type converter available to convert from type: " + (value 
!= null ? value.getClass().getCanonicalName() : null)
   + " to the required type: " + type.getCanonicalName() + " with 
value " + value;
 }
+
+/**
+ * Returns an error message for no type converter available with the cause.
+ */
+public static String createMessage(Object value, Class type, Throwable 
cause) {
+return "Converting Exception when converting from type: "
+   + (value != null ? value.getClass().getCanonicalName() : null) 
+ " to the required type: "
+   + type.getCanonicalName() + " with value " + value + ", which 
is caused by " + cause;
+}
 }




svn commit: r1214640 - in /camel/trunk/tests/camel-itest/src/test: java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-con

2011-12-14 Thread ningjiang
Author: ningjiang
Date: Thu Dec 15 07:13:08 2011
New Revision: 1214640

URL: http://svn.apache.org/viewvc?rev=1214640&view=rev
Log:
Added an cxf file dom related integration test

Added:

camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
   (with props)

camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
   (with props)

Added: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java?rev=1214640&view=auto
==
--- 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
 (added)
+++ 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
 Thu Dec 15 07:13:08 2011
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.greeter;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.junit4.TestSupport;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import 
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@ContextConfiguration
+public class CamelGreeterFileDomTest extends AbstractJUnit4SpringContextTests {
+private static final transient Logger LOG = 
LoggerFactory.getLogger(CamelGreeterFileDomTest.class);
+
+private static final String REQUEST = "http://schemas.xmlsoap.org/soap/envelope/\";>"
++ "http://apache.org/hello_world_soap_http/types\";>"
++ 
"Willem";
+private static Endpoint endpoint;
+@Autowired
+protected CamelContext camelContext;
+
+@BeforeClass
+public static void startServer() throws Exception {
+// Start the Greeter Server
+Object implementor = new GreeterImpl();
+String address = "http://localhost:9000/SoapContext/SoapPort";;
+endpoint = Endpoint.publish(address, implementor);
+LOG.info("The WS endpoint is published! ");
+}
+
+@AfterClass
+public static void stopServer() throws Exception {
+// Shutdown the Greeter Server
+if (endpoint != null) {
+endpoint.stop();
+endpoint = null;
+}
+}
+
+@Test
+public void testMocksAreValid() throws Exception {
+TestSupport.deleteDirectory("target/greeter/response");
+assertNotNull(camelContext);
+
+ProducerTemplate template = camelContext.createProducerTemplate();
+
+Object result = template.sendBody("direct:start", 
ExchangePattern.InOut , 
+   REQUEST);
+
+assertEquals("The result is wrong.", "Hello Willem", result);
+
+File file = new File("target/greeter/response/response.txt");
+assertTrue("File " + file + " should be there.", file.exists());
+}
+
+
+}

Propchange: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
--
svn:eol-style = native

Propchange: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
--
svn:keywords = Rev Date

Added: 
camel/trunk/tests/camel-itest/src/test/resourc

svn commit: r1214639 - /camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java

2011-12-14 Thread ningjiang
Author: ningjiang
Date: Thu Dec 15 07:10:05 2011
New Revision: 1214639

URL: http://svn.apache.org/viewvc?rev=1214639&view=rev
Log:
CAMEL-4781 Improving NoTypeConversionAvailableException message with cause

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java?rev=1214639&r1=1214638&r2=1214639&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
 Thu Dec 15 07:10:05 2011
@@ -34,8 +34,9 @@ public class NoTypeConversionAvailableEx
 }
 
 public NoTypeConversionAvailableException(Object value, Class type, 
Throwable cause) {
-this(value, type);
-initCause(cause);
+super(createMessage(value, type, cause), cause);
+this.value = value;
+this.type = type;
 }
 
 /**
@@ -71,4 +72,13 @@ public class NoTypeConversionAvailableEx
 return "No type converter available to convert from type: " + (value 
!= null ? value.getClass().getCanonicalName() : null)
   + " to the required type: " + type.getCanonicalName() + " with 
value " + value;
 }
+
+/**
+ * Returns an error message for no type converter available with the cause.
+ */
+public static String createMessage(Object value, Class type, Throwable 
cause) {
+return "Converting Exception when converting from type: "
+   + (value != null ? value.getClass().getCanonicalName() : null) 
+ " to the required type: "
+   + type.getCanonicalName() + " with value " + value + ", which 
is caused by " + cause;
+}
 }




svn commit: r1214638 - /camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java

2011-12-14 Thread ningjiang
Author: ningjiang
Date: Thu Dec 15 07:07:53 2011
New Revision: 1214638

URL: http://svn.apache.org/viewvc?rev=1214638&view=rev
Log:
CAMEL-4768 fix a CS error

Modified:

camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java

Modified: 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java?rev=1214638&r1=1214637&r2=1214638&view=diff
==
--- 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 (original)
+++ 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 Thu Dec 15 07:07:53 2011
@@ -17,7 +17,6 @@
 package org.apache.camel.component.http4;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 




svn commit: r1214637 - /camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java

2011-12-14 Thread ningjiang
Author: ningjiang
Date: Thu Dec 15 07:05:11 2011
New Revision: 1214637

URL: http://svn.apache.org/viewvc?rev=1214637&view=rev
Log:
CAMEL-4675: Allign the version number for qpid we use in our component and in 
our feature file

Modified:

camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java

Modified: 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java?rev=1214637&r1=1214636&r2=1214637&view=diff
==
--- 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 (original)
+++ 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 Thu Dec 15 07:05:11 2011
@@ -17,6 +17,7 @@
 package org.apache.camel.component.http4;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 




svn commit: r1214617 [2/2] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone

2011-12-14 Thread hadrian
Modified: camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-guice-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-guice-jms/pom.xml Thu Dec 15 04:12:20 
2011
@@ -23,7 +23,7 @@
 
 org.apache.camel
 examples
-2.9.0
+2.10-SNAPSHOT
 ..
 
 

Modified: camel/trunk/examples/camel-example-jms-file/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-jms-file/pom.xml (original)
+++ camel/trunk/examples/camel-example-jms-file/pom.xml Thu Dec 15 04:12:20 2011
@@ -23,7 +23,7 @@

org.apache.camel
examples
-   2.9.0
+   2.10-SNAPSHOT
..

 

Modified: camel/trunk/examples/camel-example-jmx/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jmx/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-jmx/pom.xml (original)
+++ camel/trunk/examples/camel-example-jmx/pom.xml Thu Dec 15 04:12:20 2011
@@ -21,7 +21,7 @@

org.apache.camel
examples
-   2.9.0
+   2.10-SNAPSHOT
..

 

Modified: camel/trunk/examples/camel-example-loadbalancing/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loadbalancing/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-loadbalancing/pom.xml (original)
+++ camel/trunk/examples/camel-example-loadbalancing/pom.xml Thu Dec 15 
04:12:20 2011
@@ -24,7 +24,7 @@

org.apache.camel
examples
-   2.9.0
+   2.10-SNAPSHOT


camel-example-loadbalancing

Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Thu Dec 15 04:12:20 
2011
@@ -22,7 +22,7 @@

org.apache.camel
examples
-   2.9.0
+   2.10-SNAPSHOT
..

 

Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Thu Dec 15 04:12:20 
2011
@@ -24,7 +24,7 @@
 
 org.apache.camel
 examples
-2.9.0
+2.10-SNAPSHOT
 ..
 
 

Modified: camel/trunk/examples/camel-example-osgi-rmi/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi-rmi/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-osgi-rmi/pom.xml (original)
+++ camel/trunk/examples/camel-example-osgi-rmi/pom.xml Thu Dec 15 04:12:20 2011
@@ -23,7 +23,7 @@
 
 org.apache.camel
 examples
-2.9.0
+2.10-SNAPSHOT
 
 
 camel-example-osgi-rmi

Modified: camel/trunk/examples/camel-example-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-osgi/pom.xml Thu Dec 15 04:12:20 2011
@@ -23,7 +23,7 @@

org.apache.camel
examples
-   2.9.0
+   2.10-SNAPSHOT
..

 

Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=1214617&r1=1214616&r2=1214617&view=diff
==
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/

[CONF] Apache Camel > Camel 2.9.0 Release

2011-12-14 Thread confluence







Camel 2.9.0 Release
Page edited by Claus Ibsen


Comment:
Reverted from v. 158


 Changes (4)
 




...
 || Description || Download Link || PGP Signature file of download || 
| Windows Distribution | [apache-camel-2.9.0-RC1.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.zip] | [apache-camel-2.9.0-RC1.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.zip.asc] | | Unix/Linux/Cygwin Distribution | [apache-camel-2.9.0-RC1.tar.gz|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.tar.gz] | [apache-camel-2.9.0-RC1.tar.gz.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.tar.gz.asc] | 
| Windows Distribution | [apache-camel-2.9.0.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0/apache-camel-2.9.0.zip] | [apache-camel-2.9.0.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0/apache-camel-2.9.0.zip.asc] | | Unix/Linux/Cygwin Distribution | [apache-camel-2.9.0.tar.gz|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0/apache-camel-2.9.0.tar.gz] | [apache-camel-2.9.0.tar.gz.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0/apache-camel-2.9.0.tar.gz.asc] | 
{info:title=The above URLs use redirection} The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using [FireFox|http://www.mozilla.com/en-US/firefox/] 
...
 || Description || Download Link || PGP Signature file of download || 
| Source Distribution | [apache-camel-2.9.0-RC1-src.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1-src.zip] | [apache-camel-2.9.0-RC1-src.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1-src.zip.asc] | 
| Source Distribution | [apache-camel-2.9.0-src.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0/apache-camel-2.9.0-src.zip] | [apache-camel-2.9.0-src.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0/apache-camel-2.9.0-src.zip.asc] | 
 h3. Getting the Binaries using Maven 2 
...


Full Content

Camel 2.9.0 release (currently in progress)




New and Noteworthy

Welcome to the 2.9.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)


	Introduced ThreadPoolFactory with a simpler API for 3rd party SPI. See Threading Model for more details.
	The SOAP data format now supports using multiple parameters on the JAXB objects.
	The Bean component now supports specifying parameter values to use directly in the method syntax. See more details at Bean Binding. For example to invoke a bean with body as first parameter, and a boolean true as second you can now do: .to("bean:myBean?method=myMethod(body, true)")
	The Bean component supports binding to private class beans by fallback to use interface methods.
	Improved labels of all model definitions which appear in Tracer output
	Reduced dependency for camel-core to not require commons-management JAR anymore
	Added blueprint support of cxfrs endpoint.
	Camel no longer depend on using Spring JARs for having Camel enlisted in JMX.
	Introduced a set of Camel JMX annotations in org.apache.camel.api.management that can be used to easily instrument Camel Components, EIPs, custom Processors, Beans etc. for being managed in JMX. Using the Spring JMX annotations is still supported (you would need camel-spring on the classpath).
	Updated the Aggregator2 to allow for manually completing all exchange groups by sending a message containing the header Exchange.AGGREGATION_COMPLETE_ALL_GROUPS set to true.
	Updated the Aggregator2 to support forceCompletionOnStop option to complete all current aggregated exchanges when the context is stopped.
	Removed dependency on Spring JARs in the following components: Validation, XSLT, Velocity, FreeMarker, Flatpack, StringTemplate, iBATIS, Jing, MSV, XQuery, Test, Groovy, Scripting Languages, Mail and Quickfix.
	Using pollEnrich with a file/ftp endpoint will now only poll on demand, beforehand the polling could be started when the route started.
	Added option ReplyToType on JMS to allow people to control which kind of reply queue they are using (temporary, shared, exclusive). Added support for exclusive reply queues. Mind they have some limitations, by which the shared dont have. So use exclusive with a bit caution.
	Added wereSentTo to NotifyBuilder allowing to set expectation t

svn commit: r1214615 [2/2] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone

2011-12-14 Thread hadrian
Modified: camel/trunk/examples/camel-example-etl/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Thu Dec 15 04:10:31 2011
@@ -23,7 +23,7 @@

org.apache.camel
examples
-   2.9-SNAPSHOT
+   2.9.0
..

 

Modified: camel/trunk/examples/camel-example-gae/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-gae/pom.xml (original)
+++ camel/trunk/examples/camel-example-gae/pom.xml Thu Dec 15 04:10:31 2011
@@ -6,7 +6,7 @@
 
 org.apache.camel
 examples
-2.9-SNAPSHOT
+2.9.0
 ..
 
 

Modified: camel/trunk/examples/camel-example-gauth/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-gauth/pom.xml (original)
+++ camel/trunk/examples/camel-example-gauth/pom.xml Thu Dec 15 04:10:31 2011
@@ -6,7 +6,7 @@
 
 org.apache.camel
 examples
-2.9-SNAPSHOT
+2.9.0
 ..
 
 

Modified: camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-guice-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-guice-jms/pom.xml Thu Dec 15 04:10:31 
2011
@@ -23,7 +23,7 @@
 
 org.apache.camel
 examples
-2.9-SNAPSHOT
+2.9.0
 ..
 
 

Modified: camel/trunk/examples/camel-example-jms-file/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-jms-file/pom.xml (original)
+++ camel/trunk/examples/camel-example-jms-file/pom.xml Thu Dec 15 04:10:31 2011
@@ -23,7 +23,7 @@

org.apache.camel
examples
-   2.9-SNAPSHOT
+   2.9.0
..

 

Modified: camel/trunk/examples/camel-example-jmx/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jmx/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-jmx/pom.xml (original)
+++ camel/trunk/examples/camel-example-jmx/pom.xml Thu Dec 15 04:10:31 2011
@@ -21,7 +21,7 @@

org.apache.camel
examples
-   2.9-SNAPSHOT
+   2.9.0
..

 

Modified: camel/trunk/examples/camel-example-loadbalancing/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loadbalancing/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-loadbalancing/pom.xml (original)
+++ camel/trunk/examples/camel-example-loadbalancing/pom.xml Thu Dec 15 
04:10:31 2011
@@ -24,7 +24,7 @@

org.apache.camel
examples
-   2.9-SNAPSHOT
+   2.9.0


camel-example-loadbalancing

Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Thu Dec 15 04:10:31 
2011
@@ -22,7 +22,7 @@

org.apache.camel
examples
-   2.9-SNAPSHOT
+   2.9.0
..

 

Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=1214615&r1=1214614&r2=1214615&view=diff
==
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Thu Dec 15 04:10:31 
2011
@@ -24,7 +24,7 @@
 
  

[CONF] Apache Camel > Camel 2.9.0 Release

2011-12-14 Thread confluence







Camel 2.9.0 Release
Page edited by Reuben Garrett


Comment:
fixed broken links to 2.9.0 distros (doesn't exist yet?) - repointed to 2.9.0-RC1


 Changes (4)
 




...
 || Description || Download Link || PGP Signature file of download || 
| Windows Distribution | [apache-camel-2.9.0.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0/apache-camel-2.9.0.zip] | [apache-camel-2.9.0.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0/apache-camel-2.9.0.zip.asc] | | Unix/Linux/Cygwin Distribution | [apache-camel-2.9.0.tar.gz|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0/apache-camel-2.9.0.tar.gz] | [apache-camel-2.9.0.tar.gz.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0/apache-camel-2.9.0.tar.gz.asc] | 
| Windows Distribution | [apache-camel-2.9.0-RC1.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.zip] | [apache-camel-2.9.0-RC1.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.zip.asc] | | Unix/Linux/Cygwin Distribution | [apache-camel-2.9.0-RC1.tar.gz|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.tar.gz] | [apache-camel-2.9.0-RC1.tar.gz.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1.tar.gz.asc] | 
{info:title=The above URLs use redirection} The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using [FireFox|http://www.mozilla.com/en-US/firefox/] 
...
 || Description || Download Link || PGP Signature file of download || 
| Source Distribution | [apache-camel-2.9.0-src.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0/apache-camel-2.9.0-src.zip] | [apache-camel-2.9.0-src.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0/apache-camel-2.9.0-src.zip.asc] | 
| Source Distribution | [apache-camel-2.9.0-RC1-src.zip|http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1-src.zip] | [apache-camel-2.9.0-RC1-src.zip.asc|http://www.apache.org/dist/camel/apache-camel/2.9.0-RC1/apache-camel-2.9.0-RC1-src.zip.asc] | 
 h3. Getting the Binaries using Maven 2 
...


Full Content

Camel 2.9.0 release (currently in progress)




New and Noteworthy

Welcome to the 2.9.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)


	Introduced ThreadPoolFactory with a simpler API for 3rd party SPI. See Threading Model for more details.
	The SOAP data format now supports using multiple parameters on the JAXB objects.
	The Bean component now supports specifying parameter values to use directly in the method syntax. See more details at Bean Binding. For example to invoke a bean with body as first parameter, and a boolean true as second you can now do: .to("bean:myBean?method=myMethod(body, true)")
	The Bean component supports binding to private class beans by fallback to use interface methods.
	Improved labels of all model definitions which appear in Tracer output
	Reduced dependency for camel-core to not require commons-management JAR anymore
	Added blueprint support of cxfrs endpoint.
	Camel no longer depend on using Spring JARs for having Camel enlisted in JMX.
	Introduced a set of Camel JMX annotations in org.apache.camel.api.management that can be used to easily instrument Camel Components, EIPs, custom Processors, Beans etc. for being managed in JMX. Using the Spring JMX annotations is still supported (you would need camel-spring on the classpath).
	Updated the Aggregator2 to allow for manually completing all exchange groups by sending a message containing the header Exchange.AGGREGATION_COMPLETE_ALL_GROUPS set to true.
	Updated the Aggregator2 to support forceCompletionOnStop option to complete all current aggregated exchanges when the context is stopped.
	Removed dependency on Spring JARs in the following components: Validation, XSLT, Velocity, FreeMarker, Flatpack, StringTemplate, iBATIS, Jing, MSV, XQuery, Test, Groovy, Scripting Languages, Mail and Quickfix.
	Using pollEnrich with a file/ftp endpoint will now only poll on demand, beforehand the polling could be started when the route started.
	Added option ReplyToType on JMS to allow people to control which kind of reply queue they are using (temporary, shared, exclusive). Added support for exclusive reply queues. Mind they have some limitations, by which the shared dont have. So use exclusive with a bit caution.

svn commit: r1214428 - in /camel/trunk: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/bundles.properties

2011-12-14 Thread jbonofre
Author: jbonofre
Date: Wed Dec 14 19:53:21 2011
New Revision: 1214428

URL: http://svn.apache.org/viewvc?rev=1214428&view=rev
Log:
[CAMEL-4777] Remove the geronimo-jsp reference as it's not explicitly used

Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1214428&r1=1214427&r2=1214428&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Dec 14 19:53:21 2011
@@ -74,7 +74,6 @@
 1.1.1
 1.1.1
 1.1
-1.0.1
 1.1.1
 1.1.2
 1.8.4
@@ -1056,11 +1055,6 @@
   
   
 org.apache.geronimo.specs
-geronimo-jsp_2.1_spec
-${geronimo-jsp-spec-version}
-  
-  
-org.apache.geronimo.specs
 geronimo-jta_1.1_spec
 ${geronimo-jta-spec-version}
   

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1214428&r1=1214427&r2=1214428&view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Dec 14 19:53:21 2011
@@ -65,7 +65,6 @@
   2.0.5
   2.3.18_1
   1.0.1
-  1.0.1
   
1.1.3
   1.1.1
   1.1

Modified: 
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties?rev=1214428&r1=1214427&r2=1214428&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties 
Wed Dec 14 19:53:21 2011
@@ -28,10 +28,6 @@ org.apache.servicemix.specs/org.apache.s
 
org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}/jar
 
org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/jar
 
-#Apache Geronimo specs
-org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}/jar
-org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}/jar
-
 #Apache ServiceMix bundles
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}/jar




svn commit: r1214395 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml

2011-12-14 Thread jbonofre
Author: jbonofre
Date: Wed Dec 14 18:21:29 2011
New Revision: 1214395

URL: http://svn.apache.org/viewvc?rev=1214395&view=rev
Log:
[CAMEL-4777] Use Karaf features in place of direct usage of geronimo-serlvet, 
geronimo-jsp, geronimo-el

Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml

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=1214395&r1=1214394&r2=1214395&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
Dec 14 18:21:29 2011
@@ -24,7 +24,6 @@
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}
   
-  
   
 camel-core
 camel-spring
@@ -51,7 +50,6 @@
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}
 mvn:org.apache.camel/camel-test/${pom.version}
   
-
   
 camel-spring
 jetty
@@ -85,14 +83,18 @@
 camel-core
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}
 mvn:commons-codec/commons-codec/${commons-codec}
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
+
+
+jetty
 mvn:org.apache.camel/camel-http/${pom.version}
   
   
 camel-core
 mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
 mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
+
+
+jetty
 mvn:org.apache.camel/camel-http4/${pom.version}
   
   
@@ -215,8 +217,7 @@
   
   
 camel-core
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
-mvn:org.ops4j.pax.web/pax-web-jsp/${pax-web-version}
+war
 mvn:net.sf.dozer/dozer-osgi/${dozer-version}
 mvn:commons-lang/commons-lang/${commons-lang-version}
 mvn:commons-collections/commons-collections/${commons-collections-version}
@@ -319,7 +320,9 @@
   
 camel-core
 mvn:commons-pool/commons-pool/${commons-pool-version}
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
+
+
+jetty
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}
@@ -406,9 +409,7 @@
   
   
 
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
-mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${el-api-1.0-version}
-mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${jsp-api-2.1-version}
+war
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}
 mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}
@@ -417,8 +418,7 @@
   
   
 camel-core
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
-mvn:org.ops4j.pax.web/pax-web-jsp/${pax-web-version}
+war
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}
 mvn:org.apache.camel/camel-juel/${pom.version}
   
@@ -462,7 +462,9 @@
   
 camel-core
 mvn:commons-pool/commons-pool/${commons-pool-version}
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
+
+
+jetty
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}
 mvn:org.mybatis/mybatis/${mybatis-version}
@@ -664,7 +666,9 @@
 mvn:org.apache.camel/camel-tagsoup/${pom.version}
   
   
-mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
+
+
+jetty
 mvn:commons-lang/commons-lang/${commons-lang-version}
 mvn:commons-collections/commons-collections/${commons-collections-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}




svn commit: r1214175 - in /camel/branches/camel-2.8.x: ./ components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ components/camel-hazelcast/src/main/java/org/apache/camel/compo

2011-12-14 Thread davsclaus
Author: davsclaus
Date: Wed Dec 14 11:34:55 2011
New Revision: 1214175

URL: http://svn.apache.org/viewvc?rev=1214175&view=rev
Log:
[CAMEL-4776] Modified Hazelcast helper method to properly add the headers & 
body to the in message.

Modified:
camel/branches/camel-2.8.x/   (props changed)

camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java

camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java

Propchange: camel/branches/camel-2.8.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 11:34:55 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132

Propchange: camel/branches/camel-2.8.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java?rev=1214175&r1=1214174&r2=1214175&view=diff
==
--- 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
 Wed Dec 14 11:34:55 2011
@@ -50,14 +50,14 @@ public class HazelcastComponentHelper {
 }
 
 public static void setListenerHeaders(Exchange ex, String listenerType, 
String listenerAction, String cacheName) {
-ex.getOut().setHeader(HazelcastConstants.CACHE_NAME, cacheName);
+ex.getIn().setHeader(HazelcastConstants.CACHE_NAME, cacheName);
 HazelcastComponentHelper.setListenerHeaders(ex, listenerType, 
listenerAction);
 }
 
 public static void setListenerHeaders(Exchange ex, String listenerType, 
String listenerAction) {
-ex.getOut().setHeader(HazelcastConstants.LISTENER_ACTION, 
listenerAction);
-ex.getOut().setHeader(HazelcastConstants.LISTENER_TYPE, listenerType);
-ex.getOut().setHeader(HazelcastConstants.LISTENER_TIME, new 
Date().getTime());
+ex.getIn().setHeader(HazelcastConstants.LISTENER_ACTION, 
listenerAction);
+ex.getIn().setHeader(HazelcastConstants.LISTENER_TYPE, listenerType);
+ex.getIn().setHeader(HazelcastConstants.LISTENER_TIME, new 
Date().getTime());
 }
 
 /**

Modified: 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java?rev=1214175&r1=1214174&r2=1214175&view=diff
==
--- 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
 Wed Dec 14 11:34:55 2011
@@ -36,11 +36,11 @@ public class CamelListener {
 Exchange exchange = consumer.getEndpoint().createExchange();
 
 // set object to body
-exchange.getOut().setBody(value);
+exchange.getIn().setBody(value);
 
 // set headers
 if (key != null) {
-exchange.getOut().setHeader(HazelcastConstants.OBJECT_ID, key);
+exchange.getIn().setHeader(HazelcastConstants.OBJECT_ID, key);
 }
 
 HazelcastComponentHelper.setListenerHeaders(exchange, 
HazelcastConstants.CACHE_LISTENER, operation, cacheName);




svn commit: r1214132 - in /camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast: HazelcastComponentHelper.java listener/CamelListener.java

2011-12-14 Thread iocanel
Author: iocanel
Date: Wed Dec 14 09:52:52 2011
New Revision: 1214132

URL: http://svn.apache.org/viewvc?rev=1214132&view=rev
Log:
[CAMEL-4776] Modified Hazelcast helper method to properly add the headers & 
body to the in message.

Modified:

camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java

camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java

Modified: 
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java?rev=1214132&r1=1214131&r2=1214132&view=diff
==
--- 
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
 (original)
+++ 
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
 Wed Dec 14 09:52:52 2011
@@ -50,14 +50,14 @@ public class HazelcastComponentHelper {
 }
 
 public static void setListenerHeaders(Exchange ex, String listenerType, 
String listenerAction, String cacheName) {
-ex.getOut().setHeader(HazelcastConstants.CACHE_NAME, cacheName);
+ex.getIn().setHeader(HazelcastConstants.CACHE_NAME, cacheName);
 HazelcastComponentHelper.setListenerHeaders(ex, listenerType, 
listenerAction);
 }
 
 public static void setListenerHeaders(Exchange ex, String listenerType, 
String listenerAction) {
-ex.getOut().setHeader(HazelcastConstants.LISTENER_ACTION, 
listenerAction);
-ex.getOut().setHeader(HazelcastConstants.LISTENER_TYPE, listenerType);
-ex.getOut().setHeader(HazelcastConstants.LISTENER_TIME, new 
Date().getTime());
+ex.getIn().setHeader(HazelcastConstants.LISTENER_ACTION, 
listenerAction);
+ex.getIn().setHeader(HazelcastConstants.LISTENER_TYPE, listenerType);
+ex.getIn().setHeader(HazelcastConstants.LISTENER_TIME, new 
Date().getTime());
 }
 
 /**

Modified: 
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java?rev=1214132&r1=1214131&r2=1214132&view=diff
==
--- 
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
 (original)
+++ 
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
 Wed Dec 14 09:52:52 2011
@@ -36,11 +36,11 @@ public class CamelListener {
 Exchange exchange = consumer.getEndpoint().createExchange();
 
 // set object to body
-exchange.getOut().setBody(value);
+exchange.getIn().setBody(value);
 
 // set headers
 if (key != null) {
-exchange.getOut().setHeader(HazelcastConstants.OBJECT_ID, key);
+exchange.getIn().setHeader(HazelcastConstants.OBJECT_ID, key);
 }
 
 HazelcastComponentHelper.setListenerHeaders(exchange, 
HazelcastConstants.CACHE_LISTENER, operation, cacheName);