[1/2] git commit: Added 2 missing components to kit

2014-03-19 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x c96ad1c51 -> 432841316
  refs/heads/master fe35597a9 -> 6b6a387d8


Added 2 missing components to kit


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b6a387d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b6a387d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b6a387d

Branch: refs/heads/master
Commit: 6b6a387d8d885afb3717bb40eb3c27e496db29ab
Parents: fe35597
Author: Claus Ibsen 
Authored: Thu Mar 20 07:53:03 2014 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 20 07:53:03 2014 +0100

--
 apache-camel/pom.xml |  8 
 apache-camel/src/main/descriptors/common-bin.xml |  2 ++
 parent/pom.xml   | 10 ++
 3 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6b6a387d/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 7d05fa5..c938b91 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -257,6 +257,14 @@
 
 
   org.apache.camel
+  camel-ical
+
+
+  org.apache.camel
+  camel-infinispan
+
+
+  org.apache.camel
   camel-irc
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/6b6a387d/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 86e6931..b29b384 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -77,6 +77,8 @@
 org.apache.camel:camel-http
 org.apache.camel:camel-http4
 org.apache.camel:camel-ibatis
+org.apache.camel:camel-ical
+org.apache.camel:camel-infinispan
 org.apache.camel:camel-irc
 org.apache.camel:camel-jackson
 org.apache.camel:camel-jasypt

http://git-wip-us.apache.org/repos/asf/camel/blob/6b6a387d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0d3b6ec..6cfc10f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -784,6 +784,16 @@
   
   
 org.apache.camel
+camel-ical
+${project.version}
+  
+  
+org.apache.camel
+camel-infinispan
+${project.version}
+  
+  
+org.apache.camel
 camel-irc
 ${project.version}

[2/2] git commit: Added 2 missing components to kit

2014-03-19 Thread davsclaus 
Added 2 missing components to kit


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43284131
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43284131
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43284131

Branch: refs/heads/camel-2.13.x
Commit: 432841316422d2e3a5c54206d4377992edc711ec
Parents: c96ad1c
Author: Claus Ibsen 
Authored: Thu Mar 20 07:53:03 2014 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 20 07:53:20 2014 +0100

--
 apache-camel/pom.xml |  8 
 apache-camel/src/main/descriptors/common-bin.xml |  2 ++
 parent/pom.xml   | 10 ++
 3 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/43284131/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 2aa1235..422422e 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -257,6 +257,14 @@
 
 
   org.apache.camel
+  camel-ical
+
+
+  org.apache.camel
+  camel-infinispan
+
+
+  org.apache.camel
   camel-irc
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/43284131/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 86e6931..b29b384 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -77,6 +77,8 @@
 org.apache.camel:camel-http
 org.apache.camel:camel-http4
 org.apache.camel:camel-ibatis
+org.apache.camel:camel-ical
+org.apache.camel:camel-infinispan
 org.apache.camel:camel-irc
 org.apache.camel:camel-jackson
 org.apache.camel:camel-jasypt

http://git-wip-us.apache.org/repos/asf/camel/blob/43284131/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 039ac15..e0e0d80 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -784,6 +784,16 @@
   
   
 org.apache.camel
+camel-ical
+${project.version}
+  
+  
+org.apache.camel
+camel-infinispan
+${project.version}
+  
+  
+org.apache.camel
 camel-irc
 ${project.version}

svn commit: r902426 - in /websites/production/camel/content: cache/main.pageCache components.html transport.html

2014-03-19 Thread buildbot 
Author: buildbot
Date: Thu Mar 20 00:21:30 2014
New Revision: 902426

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/components.html
websites/production/camel/content/transport.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/components.html
==
--- websites/production/camel/content/components.html (original)
+++ websites/production/camel/content/components.html Thu Mar 20 00:21:30 2014
@@ -86,21 +86,14 @@

 
 
-Components Included
-
-Camel includes the following Component implementations via URIs.
-
-
+Components IncludedCamel includes 
the following Component 
implementations via URIs.
 important
 Icon
 
-
-Make sure to read How do I configure endpoints to 
learn more about configuring endpoints. For example how to refer to beans in 
the Registry or how to use raw values 
for password options, and using property placeholders etc.
+Make sure to read How do I configure endpoints to 
learn more about configuring endpoints. For example how to refer to beans in 
the Registry or how to use raw values 
for password options, and using property placeholders etc.
 
 
-
-
-Component / ArtifactId / 
URIDescriptionAHC / 
camel-ahc
+Component / ArtifactId / 
URIDescriptionAHC / 
camel-ahc
 
 To call 
external HTTP services using http://github.com/sonatype/async-http-client"; rel="nofollow">Async Http 
ClientAMQP / 
camel-amqp
@@ -558,13 +551,7 @@ disruptor-vm:someName[?

[CONF] Apache Camel > Components

2014-03-19 Thread Robert Liguori (Confluence) 














  


Robert Liguori edited the page:
 


Components   






...



 Tip








title
important


 




 Make sure to read How do I configure endpoints to learn more about configuring endpoints. For example how to refer to beans in the Registry or how to use raw values for password options, and using property placeholders etc. 



 



 Include Page









Component List


 




External Components
The following components are not part of the standard Apache Camel distribution and are available under a variety of licenses but can be used to extend Camel's functionality.

svn commit: r902305 - in /websites/production/camel/content: cache/main.pageCache rabbitmq.html

2014-03-19 Thread buildbot 
Author: buildbot
Date: Wed Mar 19 10:19:28 2014
New Revision: 902305

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/rabbitmq.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/rabbitmq.html
==
--- websites/production/camel/content/rabbitmq.html (original)
+++ websites/production/camel/content/rabbitmq.html Wed Mar 19 10:19:28 2014
@@ -98,7 +98,7 @@
 
 Where hostname is the hostname of the running 
rabbitmq instance or cluster. Port is optional and if not specified then 
defaults to the RabbitMQ client default (5672). The exchange name determines 
which exchange produced messages will sent to. In the case of consumers, the 
exchange name determines which exchange the queue will bind to.Options
- Property  Default  Description  autoAck  true  If messages should be auto 
acknowledged  autoDelete  true  If it is true, the exchange will be 
deleted when it is no longer in use  durable  true  If we are 
declaring a durable exchange (the exchange will survive a server restart) 
 
queue  random uuid  The queue to receive messages from 
 
routingKey  null  The routing key to use when binding a consumer queue 
to the exchange. For producer routing keys, you set the header (see header 
section)  
threadPoolSize  10  The consumer uses a Thread Pool 
Executor with a fixed number of threads. This setting allows you to set that 
number of threads.  username  null  username in case of authenticated access 
 
password  null  password for authenticated access 
 
vhost  /  the vhost for the channel  exchangeType 
 
direct  Camel 2.12.2: The exchange type such 
as direct or topic.  bridgeEndpoint  false  Camel 2.12.3: 
If the bridgeEndpoint is true, the producer will ignore the message of 
rabbitmq.EXCHANGE_NAME  addresses  null  Camel 2.12.3: If this 
option is set, camel-rabbitmq will try to create connection based o
 n the setting of option addresses. The addresses value is a string which looks 
like "server1:12345, server2:12345"
+ Property  Default  Description  autoAck  true  If messages should be auto 
acknowledged  autoDelete  true  If it is true, the exchange will be 
deleted when it is no longer in use  durable  true  If we are 
declaring a durable exchange (the exchange will survive a server restart) 
 
queue  random uuid  The queue to receive messages from 
 
routingKey  null  The routing key to use when binding a consumer queue 
to the exchange. For producer routing keys, you set the header (see header 
section)  
threadPoolSize  10  The consumer uses a Thread Pool 
Executor with a fixed number of threads. This setting allows you to set that 
number of threads.  username  null  username in case of authenticated access 
 
password  null  password for authenticated access 
 
vhost  /  the vhost for the channel  exchangeType 
 
direct  Camel 2.12.2: The exchange type such 
as direct or topic.  bridgeEndpoint  false  Camel 2.12.3: 
If the bridgeEndpoint is true, the producer will ignore the message header of 
"rabbitmq.EXCHANGE_NAME" and "rabbitmq.ROUTING_KEY"  addresses 
 null 
 Camel 
2.12.3: If this option is set, camel-rabbitmq w
 ill try to create connection based on the setting of option addresses. The 
addresses value is a string which looks like "server1:12345, 
server2:12345"
 HeadersThe following headers are set 
on exchanges when consuming messages.
  Property  Value  rabbitmq.ROUTING_KEY  The routing key that was used 
to receive the message, or the routing key that will be used when producing a 
message  
rabbitmq.EXCHANGE_NAME  The exchange the message was received from 
 
rabbitmq.DELIVERY_TAG  The rabbitmq delivery tag of the received message 

 The following headers are used by the producer. If these are set on 
the camel exchange then they will be set on the RabbitMQ message.

[2/3] git commit: CAMEL-7310: Polished

2014-03-19 Thread davsclaus 
CAMEL-7310: Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c96ad1c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c96ad1c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c96ad1c5

Branch: refs/heads/camel-2.13.x
Commit: c96ad1c5107caa6c05fbaec083ef3a48a20b1ee9
Parents: 8d83cbe
Author: Claus Ibsen 
Authored: Wed Mar 19 11:01:08 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 11:01:24 2014 +0100

--
 .../java/org/apache/camel/component/restlet/RestletProducer.java| 1 -
 .../apache/camel/component/restlet/RestletProducerTimeoutTest.java  | 1 -
 2 files changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c96ad1c5/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 1d28cdb..37e1996 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -43,7 +43,6 @@ public class RestletProducer extends DefaultAsyncProducer {
 private static final Pattern PATTERN = 
Pattern.compile("\\(([\\w\\.]*)\\)");
 private Client client;
 private boolean throwException;
-private boolean forceSync;
 
 public RestletProducer(RestletEndpoint endpoint) throws Exception {
 super(endpoint);

http://git-wip-us.apache.org/repos/asf/camel/blob/c96ad1c5/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
index c670cf4..13643f5 100644
--- 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
@@ -30,7 +30,6 @@ public class RestletProducerTimeoutTest extends 
RestletTestSupport {
 fail("Should have thrown exception");
 } catch (Exception ex) {
 // expected
-ex.printStackTrace();
 }
 }

[1/3] git commit: CAMEL-7310: Polished

2014-03-19 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 524c13d10 -> 24d46af39
  refs/heads/camel-2.13.x 8d83cbe57 -> c96ad1c51
  refs/heads/master 1ebfd0aa5 -> fe35597a9


CAMEL-7310: Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe35597a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe35597a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe35597a

Branch: refs/heads/master
Commit: fe35597a910c1588ade52c7f1f9d130934a4f966
Parents: 1ebfd0a
Author: Claus Ibsen 
Authored: Wed Mar 19 11:01:08 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 11:01:08 2014 +0100

--
 .../java/org/apache/camel/component/restlet/RestletProducer.java| 1 -
 .../apache/camel/component/restlet/RestletProducerTimeoutTest.java  | 1 -
 2 files changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fe35597a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 1d28cdb..37e1996 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -43,7 +43,6 @@ public class RestletProducer extends DefaultAsyncProducer {
 private static final Pattern PATTERN = 
Pattern.compile("\\(([\\w\\.]*)\\)");
 private Client client;
 private boolean throwException;
-private boolean forceSync;
 
 public RestletProducer(RestletEndpoint endpoint) throws Exception {
 super(endpoint);

http://git-wip-us.apache.org/repos/asf/camel/blob/fe35597a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
index c670cf4..13643f5 100644
--- 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
@@ -30,7 +30,6 @@ public class RestletProducerTimeoutTest extends 
RestletTestSupport {
 fail("Should have thrown exception");
 } catch (Exception ex) {
 // expected
-ex.printStackTrace();
 }
 }

[3/3] git commit: CAMEL-7310: Polished

2014-03-19 Thread davsclaus 
CAMEL-7310: Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24d46af3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24d46af3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24d46af3

Branch: refs/heads/camel-2.12.x
Commit: 24d46af3930adb91f2d6681977204f7d254b4bda
Parents: 524c13d
Author: Claus Ibsen 
Authored: Wed Mar 19 11:01:08 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 11:01:38 2014 +0100

--
 .../java/org/apache/camel/component/restlet/RestletProducer.java| 1 -
 .../apache/camel/component/restlet/RestletProducerTimeoutTest.java  | 1 -
 2 files changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/24d46af3/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 1d28cdb..37e1996 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -43,7 +43,6 @@ public class RestletProducer extends DefaultAsyncProducer {
 private static final Pattern PATTERN = 
Pattern.compile("\\(([\\w\\.]*)\\)");
 private Client client;
 private boolean throwException;
-private boolean forceSync;
 
 public RestletProducer(RestletEndpoint endpoint) throws Exception {
 super(endpoint);

http://git-wip-us.apache.org/repos/asf/camel/blob/24d46af3/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
index c670cf4..13643f5 100644
--- 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
@@ -30,7 +30,6 @@ public class RestletProducerTimeoutTest extends 
RestletTestSupport {
 fail("Should have thrown exception");
 } catch (Exception ex) {
 // expected
-ex.printStackTrace();
 }
 }

[CONF] Apache Camel > RabbitMQ

2014-03-19 Thread willem jiang (Confluence) 














  


willem jiang edited the page:
 


RabbitMQ   






...



 Wiki Markup




 {div:class=confluenceTableSmall}
|| Property || Default || Description ||
| {{autoAck}} | {{true}} | If messages should be auto acknowledged |
| {{autoDelete}} | {{true}} | If it is true, the exchange will be deleted when it is no longer in use |
| {{durable}} | {{true}} | If we are declaring a durable exchange (the exchange will survive a server restart) |
| {{queue}} | {{random uuid}} | The queue to receive messages from |
| {{routingKey}} | {{null}} | The routing key to use when binding a consumer queue to the exchange. For producer routing keys, you set the header (see header section) |
| {{threadPoolSize}} | {{10}} | The consumer uses a Thread Pool Executor with a fixed number of threads. This setting allows you to set that number of threads. |
| {{username}} | {{null}} | username in case of authenticated access |
| {{password}} | {{null}} | password for authenticated access |
| {{vhost}} | {{/}} | the vhost for the channel |
| {{exchangeType}} | {{direct}} | *Camel 2.12.2:* The exchange type such as direct or topic. |
| {{bridgeEndpoint}} | {{false}} | *Camel 2.12.3:* If the bridgeEndpoint is true, the producer will ignore the message header of "rabbitmq.EXCHANGE_NAME" and "rabbitmq.ROUTING_KEY" |
| {{addresses}} | {{null}} | *Camel 2.12.3:* If this option is set, camel-rabbitmq will try to create connection based on the setting of option addresses. The addresses value is a string which looks like "server1:12345, server2:12345"|
{div} 



...






 View Online  · Like  · View Changes  
 Stop watching space  · Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[2/3] git commit: CAMEL-7311: camel-mail should not fetch attachments if mapMailMessage=false as part of message copy during UoW.

2014-03-19 Thread davsclaus 
CAMEL-7311: camel-mail should not fetch attachments if mapMailMessage=false as 
part of message copy during UoW.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d83cbe5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d83cbe5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d83cbe5

Branch: refs/heads/camel-2.13.x
Commit: 8d83cbe57b36b1683c7e506114b579525f69ab05
Parents: d5e6e1d
Author: Claus Ibsen 
Authored: Wed Mar 19 10:51:02 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 10:51:18 2014 +0100

--
 .../apache/camel/component/mail/MailEndpoint.java |  2 +-
 .../apache/camel/component/mail/MailMessage.java  | 18 ++
 2 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8d83cbe5/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index bed5b3f..b4bd387 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -119,7 +119,7 @@ public class MailEndpoint extends ScheduledPollEndpoint {
 private Exchange createExchange(ExchangePattern pattern, Message message) {
 Exchange exchange = new DefaultExchange(this, pattern);
 exchange.setProperty(Exchange.BINDING, getBinding());
-exchange.setIn(new MailMessage(message));
+exchange.setIn(new MailMessage(message, 
getConfiguration().isMapMailMessage()));
 return exchange;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/8d83cbe5/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
index 365ca29..7416a46 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
@@ -35,12 +35,18 @@ public class MailMessage extends DefaultMessage {
 // mail content, see more in MailBinding
 private Message originalMailMessage;
 private Message mailMessage;
+private boolean mapMailMessage;
 
 public MailMessage() {
 }
 
 public MailMessage(Message message) {
+this(message, true);
+}
+
+public MailMessage(Message message, boolean mapMailMessage) {
 this.originalMailMessage = this.mailMessage = message;
+this.mapMailMessage = mapMailMessage;
 }
 
 @Override
@@ -56,10 +62,13 @@ public class MailMessage extends DefaultMessage {
 MailMessage answer = (MailMessage)super.copy();
 answer.originalMailMessage = originalMailMessage;
 answer.mailMessage = mailMessage;
-// force attachments to be created (by getting attachments) to ensure 
they are always available due Camel error handler
-// makes defensive copies, and we have optimized it to avoid 
populating initial attachments, when not needed,
-// as all other Camel components do not use attachments
-getAttachments();
+
+if (mapMailMessage) {
+// force attachments to be created (by getting attachments) to 
ensure they are always available due Camel error handler
+// makes defensive copies, and we have optimized it to avoid 
populating initial attachments, when not needed,
+// as all other Camel components do not use attachments
+getAttachments();
+}
 return answer;
 }
 
@@ -132,6 +141,7 @@ public class MailMessage extends DefaultMessage {
 MailMessage mailMessage = (MailMessage) that;
 this.originalMailMessage = mailMessage.originalMailMessage;
 this.mailMessage = mailMessage.mailMessage;
+this.mapMailMessage = mailMessage.mapMailMessage;
 }
 }

[1/3] git commit: CAMEL-7311: camel-mail should not fetch attachments if mapMailMessage=false as part of message copy during UoW.

2014-03-19 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 11db66d85 -> 524c13d10
  refs/heads/camel-2.13.x d5e6e1dc6 -> 8d83cbe57
  refs/heads/master 6a635c0d3 -> 1ebfd0aa5


CAMEL-7311: camel-mail should not fetch attachments if mapMailMessage=false as 
part of message copy during UoW.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ebfd0aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ebfd0aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ebfd0aa

Branch: refs/heads/master
Commit: 1ebfd0aa5e28edb38af4fef13bdabe1e208d07eb
Parents: 6a635c0
Author: Claus Ibsen 
Authored: Wed Mar 19 10:51:02 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 10:51:02 2014 +0100

--
 .../apache/camel/component/mail/MailEndpoint.java |  2 +-
 .../apache/camel/component/mail/MailMessage.java  | 18 ++
 2 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1ebfd0aa/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index bed5b3f..b4bd387 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -119,7 +119,7 @@ public class MailEndpoint extends ScheduledPollEndpoint {
 private Exchange createExchange(ExchangePattern pattern, Message message) {
 Exchange exchange = new DefaultExchange(this, pattern);
 exchange.setProperty(Exchange.BINDING, getBinding());
-exchange.setIn(new MailMessage(message));
+exchange.setIn(new MailMessage(message, 
getConfiguration().isMapMailMessage()));
 return exchange;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1ebfd0aa/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
index 365ca29..7416a46 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
@@ -35,12 +35,18 @@ public class MailMessage extends DefaultMessage {
 // mail content, see more in MailBinding
 private Message originalMailMessage;
 private Message mailMessage;
+private boolean mapMailMessage;
 
 public MailMessage() {
 }
 
 public MailMessage(Message message) {
+this(message, true);
+}
+
+public MailMessage(Message message, boolean mapMailMessage) {
 this.originalMailMessage = this.mailMessage = message;
+this.mapMailMessage = mapMailMessage;
 }
 
 @Override
@@ -56,10 +62,13 @@ public class MailMessage extends DefaultMessage {
 MailMessage answer = (MailMessage)super.copy();
 answer.originalMailMessage = originalMailMessage;
 answer.mailMessage = mailMessage;
-// force attachments to be created (by getting attachments) to ensure 
they are always available due Camel error handler
-// makes defensive copies, and we have optimized it to avoid 
populating initial attachments, when not needed,
-// as all other Camel components do not use attachments
-getAttachments();
+
+if (mapMailMessage) {
+// force attachments to be created (by getting attachments) to 
ensure they are always available due Camel error handler
+// makes defensive copies, and we have optimized it to avoid 
populating initial attachments, when not needed,
+// as all other Camel components do not use attachments
+getAttachments();
+}
 return answer;
 }
 
@@ -132,6 +141,7 @@ public class MailMessage extends DefaultMessage {
 MailMessage mailMessage = (MailMessage) that;
 this.originalMailMessage = mailMessage.originalMailMessage;
 this.mailMessage = mailMessage.mailMessage;
+this.mapMailMessage = mailMessage.mapMailMessage;
 }
 }

[3/3] git commit: CAMEL-7311: camel-mail should not fetch attachments if mapMailMessage=false as part of message copy during UoW.

2014-03-19 Thread davsclaus 
CAMEL-7311: camel-mail should not fetch attachments if mapMailMessage=false as 
part of message copy during UoW.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/524c13d1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/524c13d1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/524c13d1

Branch: refs/heads/camel-2.12.x
Commit: 524c13d1025d078fd0825df36e31844c4b8187ca
Parents: 11db66d
Author: Claus Ibsen 
Authored: Wed Mar 19 10:51:02 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 10:51:28 2014 +0100

--
 .../apache/camel/component/mail/MailEndpoint.java |  2 +-
 .../apache/camel/component/mail/MailMessage.java  | 18 ++
 2 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/524c13d1/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index bed5b3f..b4bd387 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -119,7 +119,7 @@ public class MailEndpoint extends ScheduledPollEndpoint {
 private Exchange createExchange(ExchangePattern pattern, Message message) {
 Exchange exchange = new DefaultExchange(this, pattern);
 exchange.setProperty(Exchange.BINDING, getBinding());
-exchange.setIn(new MailMessage(message));
+exchange.setIn(new MailMessage(message, 
getConfiguration().isMapMailMessage()));
 return exchange;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/524c13d1/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
index 365ca29..7416a46 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
@@ -35,12 +35,18 @@ public class MailMessage extends DefaultMessage {
 // mail content, see more in MailBinding
 private Message originalMailMessage;
 private Message mailMessage;
+private boolean mapMailMessage;
 
 public MailMessage() {
 }
 
 public MailMessage(Message message) {
+this(message, true);
+}
+
+public MailMessage(Message message, boolean mapMailMessage) {
 this.originalMailMessage = this.mailMessage = message;
+this.mapMailMessage = mapMailMessage;
 }
 
 @Override
@@ -56,10 +62,13 @@ public class MailMessage extends DefaultMessage {
 MailMessage answer = (MailMessage)super.copy();
 answer.originalMailMessage = originalMailMessage;
 answer.mailMessage = mailMessage;
-// force attachments to be created (by getting attachments) to ensure 
they are always available due Camel error handler
-// makes defensive copies, and we have optimized it to avoid 
populating initial attachments, when not needed,
-// as all other Camel components do not use attachments
-getAttachments();
+
+if (mapMailMessage) {
+// force attachments to be created (by getting attachments) to 
ensure they are always available due Camel error handler
+// makes defensive copies, and we have optimized it to avoid 
populating initial attachments, when not needed,
+// as all other Camel components do not use attachments
+getAttachments();
+}
 return answer;
 }
 
@@ -132,6 +141,7 @@ public class MailMessage extends DefaultMessage {
 MailMessage mailMessage = (MailMessage) that;
 this.originalMailMessage = mailMessage.originalMailMessage;
 this.mailMessage = mailMessage.mailMessage;
+this.mapMailMessage = mailMessage.mapMailMessage;
 }
 }

[3/3] git commit: CAMEL-7310: camel-restlet producer must run in sync mode due NPE bug in restlet which otherwise could cause Camel hanging as the callback is never invoked from restlet.

2014-03-19 Thread davsclaus 
CAMEL-7310: camel-restlet producer must run in sync mode due NPE bug in restlet 
which otherwise could cause Camel hanging as the callback is never invoked from 
restlet.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11db66d8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11db66d8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11db66d8

Branch: refs/heads/camel-2.12.x
Commit: 11db66d8586738e55911fe80ff0343231d9c67e0
Parents: db612f5
Author: Claus Ibsen 
Authored: Wed Mar 19 10:06:40 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 10:08:00 2014 +0100

--
 .../component/restlet/RestletProducer.java  | 31 ++--
 .../restlet/RestletProducerTimeoutTest.java | 13 
 2 files changed, 34 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/11db66d8/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 3e9f8ff..1d28cdb 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -43,13 +43,13 @@ public class RestletProducer extends DefaultAsyncProducer {
 private static final Pattern PATTERN = 
Pattern.compile("\\(([\\w\\.]*)\\)");
 private Client client;
 private boolean throwException;
+private boolean forceSync;
 
 public RestletProducer(RestletEndpoint endpoint) throws Exception {
 super(endpoint);
 this.throwException = endpoint.isThrowExceptionOnFailure();
 client = new Client(endpoint.getProtocol());
 client.setContext(new Context());
-client.setConnectTimeout(100);
 client.getContext().getParameters().add("socketTimeout", 
String.valueOf(endpoint.getSocketTimeout()));
 client.getContext().getParameters().add("socketConnectTimeoutMs", 
String.valueOf(endpoint.getSocketTimeout()));
 }
@@ -83,7 +83,30 @@ public class RestletProducer extends DefaultAsyncProducer {
 return true;
 }
 
+// TODO: due to 
https://github.com/restlet/restlet-framework-java/issues/871
+// we force sync behavior until that is fixed, then we can switch back 
to async support
+
+LOG.debug("Sending request: {} for exchangeId: {}", request, 
exchange.getExchangeId());
+Response response = client.handle(request);
+LOG.debug("Received response: {} for exchangeId: {}", response, 
exchange.getExchangeId());
+try {
+if (response != null) {
+Integer respCode = response.getStatus().getCode();
+if (respCode > 207 && throwException) {
+
exchange.setException(populateRestletProducerException(exchange, response, 
respCode));
+} else {
+binding.populateExchangeFromRestletResponse(exchange, 
response);
+}
+}
+} catch (Exception e) {
+exchange.setException(e);
+}
+
+callback.done(true);
+return true;
+
 // process the request asynchronously
+/*
 LOG.debug("Sending request: {} for exchangeId: {}", request, 
exchange.getExchangeId());
 client.handle(request, new Uniform() {
 @Override
@@ -100,12 +123,14 @@ public class RestletProducer extends DefaultAsyncProducer 
{
 }
 } catch (Exception e) {
 exchange.setException(e);
+} finally {
+callback.done(false);
 }
 }
 });
 
-callback.done(false);
-return false;
+// we continue routing async
+return false;*/
 }
 
 private static String buildUri(RestletEndpoint endpoint, Exchange 
exchange) throws CamelExchangeException {

http://git-wip-us.apache.org/repos/asf/camel/blob/11db66d8/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
index 68e3406..c670cf4 100644
--- 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
+++ 
b/

[2/3] git commit: CAMEL-7310: camel-restlet producer must run in sync mode due NPE bug in restlet which otherwise could cause Camel hanging as the callback is never invoked from restlet.

2014-03-19 Thread davsclaus 
CAMEL-7310: camel-restlet producer must run in sync mode due NPE bug in restlet 
which otherwise could cause Camel hanging as the callback is never invoked from 
restlet.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d5e6e1dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d5e6e1dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d5e6e1dc

Branch: refs/heads/camel-2.13.x
Commit: d5e6e1dc649fa18372827ddf39e6cc193003a261
Parents: c6b37c4
Author: Claus Ibsen 
Authored: Wed Mar 19 10:06:40 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 10:07:29 2014 +0100

--
 .../component/restlet/RestletProducer.java  | 31 ++--
 .../restlet/RestletProducerTimeoutTest.java | 13 
 2 files changed, 34 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d5e6e1dc/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 3e9f8ff..1d28cdb 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -43,13 +43,13 @@ public class RestletProducer extends DefaultAsyncProducer {
 private static final Pattern PATTERN = 
Pattern.compile("\\(([\\w\\.]*)\\)");
 private Client client;
 private boolean throwException;
+private boolean forceSync;
 
 public RestletProducer(RestletEndpoint endpoint) throws Exception {
 super(endpoint);
 this.throwException = endpoint.isThrowExceptionOnFailure();
 client = new Client(endpoint.getProtocol());
 client.setContext(new Context());
-client.setConnectTimeout(100);
 client.getContext().getParameters().add("socketTimeout", 
String.valueOf(endpoint.getSocketTimeout()));
 client.getContext().getParameters().add("socketConnectTimeoutMs", 
String.valueOf(endpoint.getSocketTimeout()));
 }
@@ -83,7 +83,30 @@ public class RestletProducer extends DefaultAsyncProducer {
 return true;
 }
 
+// TODO: due to 
https://github.com/restlet/restlet-framework-java/issues/871
+// we force sync behavior until that is fixed, then we can switch back 
to async support
+
+LOG.debug("Sending request: {} for exchangeId: {}", request, 
exchange.getExchangeId());
+Response response = client.handle(request);
+LOG.debug("Received response: {} for exchangeId: {}", response, 
exchange.getExchangeId());
+try {
+if (response != null) {
+Integer respCode = response.getStatus().getCode();
+if (respCode > 207 && throwException) {
+
exchange.setException(populateRestletProducerException(exchange, response, 
respCode));
+} else {
+binding.populateExchangeFromRestletResponse(exchange, 
response);
+}
+}
+} catch (Exception e) {
+exchange.setException(e);
+}
+
+callback.done(true);
+return true;
+
 // process the request asynchronously
+/*
 LOG.debug("Sending request: {} for exchangeId: {}", request, 
exchange.getExchangeId());
 client.handle(request, new Uniform() {
 @Override
@@ -100,12 +123,14 @@ public class RestletProducer extends DefaultAsyncProducer 
{
 }
 } catch (Exception e) {
 exchange.setException(e);
+} finally {
+callback.done(false);
 }
 }
 });
 
-callback.done(false);
-return false;
+// we continue routing async
+return false;*/
 }
 
 private static String buildUri(RestletEndpoint endpoint, Exchange 
exchange) throws CamelExchangeException {

http://git-wip-us.apache.org/repos/asf/camel/blob/d5e6e1dc/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
index 68e3406..c670cf4 100644
--- 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
+++ 
b/

[1/3] git commit: CAMEL-7310: camel-restlet producer must run in sync mode due NPE bug in restlet which otherwise could cause Camel hanging as the callback is never invoked from restlet.

2014-03-19 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x db612f54e -> 11db66d85
  refs/heads/camel-2.13.x c6b37c45d -> d5e6e1dc6
  refs/heads/master fcd2accf2 -> 6a635c0d3


CAMEL-7310: camel-restlet producer must run in sync mode due NPE bug in restlet 
which otherwise could cause Camel hanging as the callback is never invoked from 
restlet.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a635c0d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a635c0d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a635c0d

Branch: refs/heads/master
Commit: 6a635c0d334fccce5c26ce6a13e96f190f5d95b1
Parents: fcd2acc
Author: Claus Ibsen 
Authored: Wed Mar 19 10:06:40 2014 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 19 10:06:40 2014 +0100

--
 .../component/restlet/RestletProducer.java  | 31 ++--
 .../restlet/RestletProducerTimeoutTest.java | 13 
 2 files changed, 34 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6a635c0d/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 3e9f8ff..1d28cdb 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -43,13 +43,13 @@ public class RestletProducer extends DefaultAsyncProducer {
 private static final Pattern PATTERN = 
Pattern.compile("\\(([\\w\\.]*)\\)");
 private Client client;
 private boolean throwException;
+private boolean forceSync;
 
 public RestletProducer(RestletEndpoint endpoint) throws Exception {
 super(endpoint);
 this.throwException = endpoint.isThrowExceptionOnFailure();
 client = new Client(endpoint.getProtocol());
 client.setContext(new Context());
-client.setConnectTimeout(100);
 client.getContext().getParameters().add("socketTimeout", 
String.valueOf(endpoint.getSocketTimeout()));
 client.getContext().getParameters().add("socketConnectTimeoutMs", 
String.valueOf(endpoint.getSocketTimeout()));
 }
@@ -83,7 +83,30 @@ public class RestletProducer extends DefaultAsyncProducer {
 return true;
 }
 
+// TODO: due to 
https://github.com/restlet/restlet-framework-java/issues/871
+// we force sync behavior until that is fixed, then we can switch back 
to async support
+
+LOG.debug("Sending request: {} for exchangeId: {}", request, 
exchange.getExchangeId());
+Response response = client.handle(request);
+LOG.debug("Received response: {} for exchangeId: {}", response, 
exchange.getExchangeId());
+try {
+if (response != null) {
+Integer respCode = response.getStatus().getCode();
+if (respCode > 207 && throwException) {
+
exchange.setException(populateRestletProducerException(exchange, response, 
respCode));
+} else {
+binding.populateExchangeFromRestletResponse(exchange, 
response);
+}
+}
+} catch (Exception e) {
+exchange.setException(e);
+}
+
+callback.done(true);
+return true;
+
 // process the request asynchronously
+/*
 LOG.debug("Sending request: {} for exchangeId: {}", request, 
exchange.getExchangeId());
 client.handle(request, new Uniform() {
 @Override
@@ -100,12 +123,14 @@ public class RestletProducer extends DefaultAsyncProducer 
{
 }
 } catch (Exception e) {
 exchange.setException(e);
+} finally {
+callback.done(false);
 }
 }
 });
 
-callback.done(false);
-return false;
+// we continue routing async
+return false;*/
 }
 
 private static String buildUri(RestletEndpoint endpoint, Exchange 
exchange) throws CamelExchangeException {

http://git-wip-us.apache.org/repos/asf/camel/blob/6a635c0d/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPr