[CONF] Apache Camel > Restlet

2014-01-05 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


Restlet   




 Comment: CAMEL-7014 


...



 Wiki Markup




 || Name || Default Value || Description ||
| {{headerFilterStrategy=#}}{_}refName_ | An instance of {{RestletHeaderFilterStrategy}} | Use the {{\#}} notation ({{headerFilterStrategy=#}}{_}refName_) to reference a header filter strategy in the Camel Registry.  The strategy will be plugged into the restlet binding if it is {{HeaderFilterStrategyAware}}. |
| {{restletBinding=#}}{_}refName_ | An instance of {{DefaultRestletBinding}} | The bean ID of a {{RestletBinding}} object in the Camel Registry. |
| {{restletMethod}} | {{GET}} | On a producer endpoint, specifies the request method to use.  On a consumer endpoint, specifies that the endpoint consumes only {{restletMethod}} requests.  The string value is converted to [org.restlet.data.Method|http://www.restlet.org/documentation/1.1/api/org/restlet/data/Method.html] by the {{Method.valueOf(String)}} method. |
| {{restletMethods}} | _None_ | *Consumer only* Specify one or more methods separated by commas (e.g. {{restletMethods=post,put}}) to be serviced by a restlet consumer endpoint.  If both {{restletMethod}} and {{restletMethods}} options are specified, the {{restletMethod}} setting is ignored. |
| {{restletRealm=#}}{_}refName_ | {{null}} | The bean ID of the Realm Map in the Camel Registry. |
| {{restletUriPatterns=#}}{_}refName_ | _None_ | *Consumer only* Specify one ore more URI templates to be serviced by a restlet consumer endpoint, using the {{\#}} notation to reference a {{List}} in the Camel Registry.  If a URI pattern has been defined in the endpoint URI, both the URI pattern defined in the endpoint and the {{restletUriPatterns}} option will be honored. |
| {{throwExceptionOnFailure}} (*2.6 or later*)| true | *Producer only * Throws exception on a producer failure. |
| {{connectionTimeout}}| 30 | *Since Camel 2.12.3* *Producer only* The Client will give up connection if the connection is timeout, 0 for unlimited wait.|
| {{socketTimeout}} | 30 | *Since Camel 2.12.3* *Producer only* The Client socket receive timeout, 0 for unlimited wait.|
 



Component Options
The Restlet component can be configured with the following options. Notice these are component options and cannot be configured on the endpoint, see further below for an example.
...






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


 


  

[2/3] git commit: CAMEL-7014 setup the client timeout of camel-restlet with thanks of Benjamin

2014-01-05 Thread ningjiang
CAMEL-7014 setup the client timeout of camel-restlet with thanks of Benjamin


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

Branch: refs/heads/camel-2.12.x
Commit: 1e269c864b3d128971f67dd548858da961c7d9a2
Parents: fa1d427
Author: Willem Jiang 
Authored: Mon Jan 6 14:23:32 2014 +0800
Committer: Willem Jiang 
Committed: Mon Jan 6 15:43:12 2014 +0800

--
 .../apache/camel/component/restlet/RestletEndpoint.java   | 10 ++
 .../apache/camel/component/restlet/RestletProducer.java   |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e269c86/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
index f27787b..2caccd1 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
@@ -39,6 +39,7 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private static final int DEFAULT_PORT = 80;
 private static final String DEFAULT_PROTOCOL = "http";
 private static final String DEFAULT_HOST = "localhost";
+private static final int DEFAULT_SOCKETTIMEOUT = 3;
 
 private Method restletMethod = Method.GET;
 
@@ -49,6 +50,7 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private String protocol = DEFAULT_PROTOCOL;
 private String host = DEFAULT_HOST;
 private int port = DEFAULT_PORT;
+private int socketTimeout = DEFAULT_SOCKETTIMEOUT;
 private String uriPattern;
 
 // Optional and for consumer only. This allows a single route to service 
multiple URI patterns.
@@ -124,6 +126,14 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 this.port = port;
 }
 
+public int getSocketTimeout() {
+return socketTimeout;
+}
+
+public void setSocketTimeout(int socketTimeout) {
+this.socketTimeout = socketTimeout;
+}
+
 public String getUriPattern() {
 return uriPattern;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/1e269c86/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 b8d84c4..2cad21f 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
@@ -49,6 +49,7 @@ public class RestletProducer extends DefaultAsyncProducer {
 this.throwException = endpoint.isThrowExceptionOnFailure();
 client = new Client(endpoint.getProtocol());
 client.setContext(new Context());
+client.getContext().getParameters().add("socketTimeout", 
String.valueOf(endpoint.getSocketTimeout()));
 }
 
 @Override
@@ -98,10 +99,10 @@ public class RestletProducer extends DefaultAsyncProducer {
 } catch (Exception e) {
 exchange.setException(e);
 }
-callback.done(false);
 }
 });
 
+callback.done(false);
 return false;
 }
 



[1/3] git commit: CAMEL-7014 Added connectionTimeout option for camel-restlet producer

2014-01-05 Thread ningjiang
Updated Branches:
  refs/heads/camel-2.12.x fa1d42704 -> 4293f0631


CAMEL-7014 Added connectionTimeout option for camel-restlet producer


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

Branch: refs/heads/camel-2.12.x
Commit: fd7d0dd19f7a3c788cf660273dedcbc93f8f9bbe
Parents: 1e269c8
Author: Willem Jiang 
Authored: Mon Jan 6 14:37:01 2014 +0800
Committer: Willem Jiang 
Committed: Mon Jan 6 15:43:12 2014 +0800

--
 .../camel/component/restlet/RestletEndpoint.java  | 14 --
 .../camel/component/restlet/RestletProducer.java  |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fd7d0dd1/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
index 2caccd1..24ca7f9 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
@@ -39,7 +39,8 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private static final int DEFAULT_PORT = 80;
 private static final String DEFAULT_PROTOCOL = "http";
 private static final String DEFAULT_HOST = "localhost";
-private static final int DEFAULT_SOCKETTIMEOUT = 3;
+private static final int DEFAULT_SOCKET_TIMEOUT = 3;
+private static final int DEFAULT_CONNECT_TIMEOUT = 3;
 
 private Method restletMethod = Method.GET;
 
@@ -50,7 +51,8 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private String protocol = DEFAULT_PROTOCOL;
 private String host = DEFAULT_HOST;
 private int port = DEFAULT_PORT;
-private int socketTimeout = DEFAULT_SOCKETTIMEOUT;
+private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
+private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
 private String uriPattern;
 
 // Optional and for consumer only. This allows a single route to service 
multiple URI patterns.
@@ -133,6 +135,14 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 public void setSocketTimeout(int socketTimeout) {
 this.socketTimeout = socketTimeout;
 }
+
+public int getConnectTimeout() {
+return connectTimeout;
+}
+
+public void setConnectTimeout(int connectTimeout) {
+this.connectTimeout = connectTimeout;
+}
 
 public String getUriPattern() {
 return uriPattern;

http://git-wip-us.apache.org/repos/asf/camel/blob/fd7d0dd1/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 2cad21f..3e9f8ff 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
@@ -49,7 +49,9 @@ public class RestletProducer extends DefaultAsyncProducer {
 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()));
 }
 
 @Override



[3/3] git commit: CAMEL-7014 Added the missing test file with some changes

2014-01-05 Thread ningjiang
CAMEL-7014 Added the missing test file with some changes


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

Branch: refs/heads/camel-2.12.x
Commit: 4293f06316c730431f1df51160200e904ac6e9da
Parents: fd7d0dd
Author: Willem Jiang 
Authored: Mon Jan 6 14:37:50 2014 +0800
Committer: Willem Jiang 
Committed: Mon Jan 6 15:43:13 2014 +0800

--
 .../restlet/RestletProducerTimeoutTest.java | 54 
 1 file changed, 54 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4293f063/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
new file mode 100644
index 000..68e3406
--- /dev/null
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
@@ -0,0 +1,54 @@
+/**
+ * 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.component.restlet;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class RestletProducerTimeoutTest extends RestletTestSupport {
+
+@Test
+public void testRestletProducerGet() throws Exception {
+try {
+String out = 
template.requestBodyAndHeader("restlet:http://localhost:"; + portNum + 
"/users/123/basic?socketTimeout=100", null, "id", 123, String.class);
+assertEquals("", null, out);
+} catch (Exception ex) {
+System.out.println("get the exception");
+}
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:start").to("restlet:http://localhost:"; + portNum 
+ "/users/123/basic?socketTimeout=100").to("log:reply");
+
+from("restlet:http://localhost:"; + portNum + 
"/users/{id}/basic")
+.process(new Processor() {
+@Override
+public void process(Exchange exchange) throws 
Exception {
+Thread.sleep(1000);
+exchange.getOut().setBody("Here is the 
response");
+}
+});
+}
+};
+}
+}



[2/3] git commit: CAMEL-7014 Added connectionTimeout option for camel-restlet producer

2014-01-05 Thread ningjiang
CAMEL-7014 Added connectionTimeout option for camel-restlet producer


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

Branch: refs/heads/master
Commit: 597e108019b5032b4de79462a0ba0c00672ca5ad
Parents: ad2e73b
Author: Willem Jiang 
Authored: Mon Jan 6 14:37:01 2014 +0800
Committer: Willem Jiang 
Committed: Mon Jan 6 14:37:01 2014 +0800

--
 .../camel/component/restlet/RestletEndpoint.java  | 14 --
 .../camel/component/restlet/RestletProducer.java  |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/597e1080/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
index 2caccd1..24ca7f9 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
@@ -39,7 +39,8 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private static final int DEFAULT_PORT = 80;
 private static final String DEFAULT_PROTOCOL = "http";
 private static final String DEFAULT_HOST = "localhost";
-private static final int DEFAULT_SOCKETTIMEOUT = 3;
+private static final int DEFAULT_SOCKET_TIMEOUT = 3;
+private static final int DEFAULT_CONNECT_TIMEOUT = 3;
 
 private Method restletMethod = Method.GET;
 
@@ -50,7 +51,8 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private String protocol = DEFAULT_PROTOCOL;
 private String host = DEFAULT_HOST;
 private int port = DEFAULT_PORT;
-private int socketTimeout = DEFAULT_SOCKETTIMEOUT;
+private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
+private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
 private String uriPattern;
 
 // Optional and for consumer only. This allows a single route to service 
multiple URI patterns.
@@ -133,6 +135,14 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 public void setSocketTimeout(int socketTimeout) {
 this.socketTimeout = socketTimeout;
 }
+
+public int getConnectTimeout() {
+return connectTimeout;
+}
+
+public void setConnectTimeout(int connectTimeout) {
+this.connectTimeout = connectTimeout;
+}
 
 public String getUriPattern() {
 return uriPattern;

http://git-wip-us.apache.org/repos/asf/camel/blob/597e1080/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 2cad21f..3e9f8ff 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
@@ -49,7 +49,9 @@ public class RestletProducer extends DefaultAsyncProducer {
 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()));
 }
 
 @Override



[1/3] git commit: CAMEL-7014 setup the client timeout of camel-restlet with thanks of Benjamin

2014-01-05 Thread ningjiang
Updated Branches:
  refs/heads/master 00a4c52ae -> e60335d48


CAMEL-7014 setup the client timeout of camel-restlet with thanks of Benjamin


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

Branch: refs/heads/master
Commit: ad2e73bc9c4608d94802648e0dc3372984058796
Parents: 00a4c52
Author: Willem Jiang 
Authored: Mon Jan 6 14:23:32 2014 +0800
Committer: Willem Jiang 
Committed: Mon Jan 6 14:24:08 2014 +0800

--
 .../apache/camel/component/restlet/RestletEndpoint.java   | 10 ++
 .../apache/camel/component/restlet/RestletProducer.java   |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ad2e73bc/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
index f27787b..2caccd1 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
@@ -39,6 +39,7 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private static final int DEFAULT_PORT = 80;
 private static final String DEFAULT_PROTOCOL = "http";
 private static final String DEFAULT_HOST = "localhost";
+private static final int DEFAULT_SOCKETTIMEOUT = 3;
 
 private Method restletMethod = Method.GET;
 
@@ -49,6 +50,7 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 private String protocol = DEFAULT_PROTOCOL;
 private String host = DEFAULT_HOST;
 private int port = DEFAULT_PORT;
+private int socketTimeout = DEFAULT_SOCKETTIMEOUT;
 private String uriPattern;
 
 // Optional and for consumer only. This allows a single route to service 
multiple URI patterns.
@@ -124,6 +126,14 @@ public class RestletEndpoint extends DefaultEndpoint 
implements HeaderFilterStra
 this.port = port;
 }
 
+public int getSocketTimeout() {
+return socketTimeout;
+}
+
+public void setSocketTimeout(int socketTimeout) {
+this.socketTimeout = socketTimeout;
+}
+
 public String getUriPattern() {
 return uriPattern;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ad2e73bc/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 b8d84c4..2cad21f 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
@@ -49,6 +49,7 @@ public class RestletProducer extends DefaultAsyncProducer {
 this.throwException = endpoint.isThrowExceptionOnFailure();
 client = new Client(endpoint.getProtocol());
 client.setContext(new Context());
+client.getContext().getParameters().add("socketTimeout", 
String.valueOf(endpoint.getSocketTimeout()));
 }
 
 @Override
@@ -98,10 +99,10 @@ public class RestletProducer extends DefaultAsyncProducer {
 } catch (Exception e) {
 exchange.setException(e);
 }
-callback.done(false);
 }
 });
 
+callback.done(false);
 return false;
 }
 



[3/3] git commit: CAMEL-7014 Added the missing test file with some changes

2014-01-05 Thread ningjiang
CAMEL-7014 Added the missing test file with some changes


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

Branch: refs/heads/master
Commit: e60335d48ace847584870f3eacd15600a7edae85
Parents: 597e108
Author: Willem Jiang 
Authored: Mon Jan 6 14:37:50 2014 +0800
Committer: Willem Jiang 
Committed: Mon Jan 6 15:29:38 2014 +0800

--
 .../restlet/RestletProducerTimeoutTest.java | 54 
 1 file changed, 54 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e60335d4/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
new file mode 100644
index 000..68e3406
--- /dev/null
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTimeoutTest.java
@@ -0,0 +1,54 @@
+/**
+ * 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.component.restlet;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class RestletProducerTimeoutTest extends RestletTestSupport {
+
+@Test
+public void testRestletProducerGet() throws Exception {
+try {
+String out = 
template.requestBodyAndHeader("restlet:http://localhost:"; + portNum + 
"/users/123/basic?socketTimeout=100", null, "id", 123, String.class);
+assertEquals("", null, out);
+} catch (Exception ex) {
+System.out.println("get the exception");
+}
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:start").to("restlet:http://localhost:"; + portNum 
+ "/users/123/basic?socketTimeout=100").to("log:reply");
+
+from("restlet:http://localhost:"; + portNum + 
"/users/{id}/basic")
+.process(new Processor() {
+@Override
+public void process(Exchange exchange) throws 
Exception {
+Thread.sleep(1000);
+exchange.getOut().setBody("Here is the 
response");
+}
+});
+}
+};
+}
+}



svn commit: r892946 [15/15] - in /websites/production/camel/content: ./ 2007/08/17/ 2007/08/20/ 2007/10/01/ 2007/10/28/ 2008/04/08/ 2008/04/22/ 2008/04/28/ 2008/07/22/ 2008/10/31/ 2009/01/19/ 2009/02/

2014-01-05 Thread buildbot
Modified: websites/production/camel/content/tutorial-axis-camel.html
==
--- websites/production/camel/content/tutorial-axis-camel.html (original)
+++ websites/production/camel/content/tutorial-axis-camel.html Mon Jan  6 
06:22:14 2014
@@ -98,11 +98,11 @@
 
 
 /**/
+/*]]>*/
 Tutorial using 
Axis 1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting 
up the project to run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example

Modified: websites/production/camel/content/tutorial-jmsremoting.html
==
--- websites/production/camel/content/tutorial-jmsremoting.html (original)
+++ websites/production/camel/content/tutorial-jmsremoting.html Mon Jan  6 
06:22:14 2014
@@ -103,11 +103,11 @@
 
 This tutorial aims to guide the reader through the stages of creating a 
project which uses Camel to facilitate the routing of messages from a JMS queue 
to a http://www.springramework.org"; 
rel="nofollow">Spring service.  The route works in a synchronous fashion 
returning a response to the client.
 /**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the 
Camel Project
 Update the POM with 
Dependencies
 Writing 
the Server

Modified: websites/production/camel/content/user-guide.html
==
--- websites/production/camel/content/user-guide.html (original)
+++ websites/production/camel/content/user-guide.html Mon Jan  6 06:22:14 2014
@@ -79,11 +79,11 @@
 
 If you want to get more familiar with what Apache Camel has to offer, 
please try the following resources:
 /**/
+/*]]>*/
 Wiki pagesPDFOther Resources.
 
 




buildbot success in ASF Buildbot on camel-site-production

2014-01-05 Thread buildbot
The Buildbot has detected a restored build on builder camel-site-production 
while building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/camel-site-production/builds/15758

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

sincerely,
 -The Buildbot





[CONF] Apache Camel > Index

2014-01-05 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


Index   









 Section








 Column








 Wiki Markup




 
{div:style=margin-left:-20px; text-align:center; padding-right:20px;}
*[Download it Today\!|Download]*
!http://camel.apache.org/images/camel-box-small.png|alt=Camel Box!
{div}
 


 






 Column








 Include Page

 

buildbot failure in ASF Buildbot on camel-site-production

2014-01-05 Thread buildbot
The Buildbot has detected a new failure on builder camel-site-production while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/camel-site-production/builds/15757

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

sincerely,
 -The Buildbot





svn commit: r892938 - /websites/production/camel/content/cache/main.pageCache

2014-01-05 Thread ningjiang
Author: ningjiang
Date: Mon Jan  6 04:33:17 2014
New Revision: 892938

Log:
reexport the site

Removed:
websites/production/camel/content/cache/main.pageCache



[CONF] Apache Camel > Building

2014-01-05 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


Building   






...
Building with Spring 4.0
From Camel 2.1113.0 onwards, if you want Camel to be build against Spring 3.2 4.0 to work around the back compatible issue CAMEL-7074, you have to build with the maven profile spring3spring4.2. 



 Code Block








language
text


 




 mvn clean install -Pspring4
 



...






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


 


 


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






buildbot success in ASF Buildbot on camel-site-production

2014-01-05 Thread buildbot
The Buildbot has detected a restored build on builder camel-site-production 
while building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/camel-site-production/builds/15756

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

sincerely,
 -The Buildbot





buildbot failure in ASF Buildbot on camel-site-production

2014-01-05 Thread buildbot
The Buildbot has detected a new failure on builder camel-site-production while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/camel-site-production/builds/15755

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

sincerely,
 -The Buildbot





[CONF] Apache Camel > CXFRS

2014-01-05 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


CXFRS   






...
Maven users will need to add the following dependency to their pom.xml for this component:



 Code Block









xml


 




 


   org.apache.camel
   camel-cxf
   x.x.x  

 



URI format
 



 Code Block








language
java


 




 cxfrs://address?options
 



Where address represents the CXF endpoint's address