camel git commit: CAMEL-9442: Query string gets decoded when bridging netty-http to http4

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x ee9071a6b -> 1a20c1ce5


CAMEL-9442: Query string gets decoded when bridging netty-http to http4


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

Branch: refs/heads/camel-2.15.x
Commit: 1a20c1ce542e487943c90617d1af9fab0818106e
Parents: ee9071a
Author: Gert Vanthienen 
Authored: Tue Dec 22 14:09:36 2015 +0100
Committer: Gert Vanthienen 
Committed: Tue Dec 22 15:01:38 2015 +0100

--
 .../component/http4/helper/HttpHelper.java  |  8 +++-
 .../component/http4/HttpBridgeEndpointTest.java | 27 
 .../handler/BasicRawQueryValidationHandler.java | 45 
 .../http4/handler/BasicValidationHandler.java   | 22 ++
 4 files changed, 92 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a20c1ce/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
--
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
index 81b7161..6ed1705 100644
--- 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
@@ -240,8 +240,12 @@ public final class HttpHelper {
  */
 public static URI createURI(Exchange exchange, String url, HttpEndpoint 
endpoint) throws URISyntaxException {
 URI uri = new URI(url);
-// is a query string provided in the endpoint URI or in a header 
(header overrules endpoint)
-String queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, 
String.class);
+// is a query string provided in the endpoint URI or in a header
+// (header overrules endpoint, raw query header overrules query header)
+String queryString = 
exchange.getIn().getHeader(Exchange.HTTP_RAW_QUERY, String.class);
+if (queryString == null) {
+queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, 
String.class);
+}
 if (queryString == null) {
 queryString = endpoint.getHttpUri().getRawQuery();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/1a20c1ce/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
index 3bbfd29..2755f18 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.http4;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.http4.handler.BasicRawQueryValidationHandler;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
 import org.apache.http.localserver.LocalTestServer;
 import org.junit.Test;
@@ -50,8 +51,34 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 assertExchange(exchange);
 }
 
+@Test
+public void bridgeEndpointWithQuery() throws Exception {
+Exchange exchange = template.request("http4://" + getHostName() + ":" 
+ getPort() + "/query?bridgeEndpoint=true", new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(Exchange.HTTP_URI, 
"http://host:8080/;);
+exchange.getIn().setHeader(Exchange.HTTP_QUERY, "x=%3B");
+}
+});
+
+assertExchange(exchange);
+}
+
+@Test
+public void bridgeEndpointWithRawQueryAndQuery() throws Exception {
+Exchange exchange = template.request("http4://" + getHostName() + ":" 
+ getPort() + "/query?bridgeEndpoint=true", new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(Exchange.HTTP_URI, 
"http://host:8080/;);
+exchange.getIn().setHeader(Exchange.HTTP_RAW_QUERY, "x=%3B");
+exchange.getIn().setHeader(Exchange.HTTP_QUERY, "x=;");
+}
+});
+
+ 

camel git commit: Checkstyle fix

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 1a20c1ce5 -> ef9f94255


Checkstyle fix


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

Branch: refs/heads/camel-2.15.x
Commit: ef9f94255045257f6fe70f02e2b80ca88763dea1
Parents: 1a20c1c
Author: Gert Vanthienen 
Authored: Tue Dec 22 15:50:11 2015 +0100
Committer: Gert Vanthienen 
Committed: Tue Dec 22 15:50:11 2015 +0100

--
 .../component/http4/handler/BasicRawQueryValidationHandler.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ef9f9425/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
index 2b2aae0..e482188 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
@@ -42,4 +42,4 @@ public class BasicRawQueryValidationHandler extends 
BasicValidationHandler {
 }
 return true;
 }
-}
+}

camel git commit: CAMEL-9442: Query string gets decoded when bridging netty-http to http4

[gertv]

Repository: camel
Updated Branches:
  refs/heads/master 1eec4f75e -> 9827197a7


CAMEL-9442: Query string gets decoded when bridging netty-http to http4


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

Branch: refs/heads/master
Commit: 9827197a7874e2f331da25b3bfe9a028daae88b1
Parents: 1eec4f7
Author: Gert Vanthienen 
Authored: Tue Dec 22 14:09:36 2015 +0100
Committer: Gert Vanthienen 
Committed: Tue Dec 22 14:50:34 2015 +0100

--
 .../apache/camel/http/common/HttpHelper.java|  8 +++-
 .../component/http4/HttpBridgeEndpointTest.java | 29 -
 .../handler/BasicRawQueryValidationHandler.java | 45 
 .../http4/handler/BasicValidationHandler.java   | 22 ++
 4 files changed, 93 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9827197a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index c9b8d7b..e18198a 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -311,8 +311,12 @@ public final class HttpHelper {
  */
 public static URI createURI(Exchange exchange, String url, 
HttpCommonEndpoint endpoint) throws URISyntaxException {
 URI uri = new URI(url);
-// is a query string provided in the endpoint URI or in a header 
(header overrules endpoint)
-String queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, 
String.class);
+// is a query string provided in the endpoint URI or in a header
+// (header overrules endpoint, raw query header overrules query header)
+String queryString = 
exchange.getIn().getHeader(Exchange.HTTP_RAW_QUERY, String.class);
+if (queryString == null) {
+queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, 
String.class);
+}
 if (queryString == null) {
 queryString = endpoint.getHttpUri().getRawQuery();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/9827197a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
index 862091b..5ecb67f 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.http4;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.http4.handler.BasicRawQueryValidationHandler;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
 import org.apache.http.impl.bootstrap.HttpServer;
 import org.apache.http.impl.bootstrap.ServerBootstrap;
@@ -42,7 +43,8 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 setResponseFactory(getHttpResponseFactory()).
 setExpectationVerifier(getHttpExpectationVerifier()).
 setSslContext(getSSLContext()).
-registerHandler("/", new BasicValidationHandler("GET", null, 
null, getExpectedContent())).create();
+registerHandler("/", new BasicValidationHandler("GET", null, 
null, getExpectedContent())).
+registerHandler("/query", new 
BasicRawQueryValidationHandler("GET", "x=%3B", null, 
getExpectedContent())).create();
 localServer.start();
 
 super.setUp();
@@ -79,4 +81,29 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 
 assertExchange(exchange);
 }
+
+@Test
+public void bridgeEndpointWithQuery() throws Exception {
+Exchange exchange = template.request("http4://" + 
localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + 
"/query?bridgeEndpoint=true", new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(Exchange.HTTP_URI, 

camel git commit: CAMEL-9442: Query string gets decoded when bridging netty-http to http4

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 1d48df6f8 -> 10d50677e


CAMEL-9442: Query string gets decoded when bridging netty-http to http4


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

Branch: refs/heads/camel-2.16.x
Commit: 10d50677e6dbe6f8fbbb98cc1a8b473a97eaa43d
Parents: 1d48df6
Author: Gert Vanthienen 
Authored: Tue Dec 22 14:09:36 2015 +0100
Committer: Gert Vanthienen 
Committed: Tue Dec 22 14:56:53 2015 +0100

--
 .../apache/camel/http/common/HttpHelper.java|  8 +++-
 .../component/http4/HttpBridgeEndpointTest.java | 29 -
 .../handler/BasicRawQueryValidationHandler.java | 45 
 .../http4/handler/BasicValidationHandler.java   | 22 ++
 4 files changed, 93 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/10d50677/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index c9b8d7b..e18198a 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -311,8 +311,12 @@ public final class HttpHelper {
  */
 public static URI createURI(Exchange exchange, String url, 
HttpCommonEndpoint endpoint) throws URISyntaxException {
 URI uri = new URI(url);
-// is a query string provided in the endpoint URI or in a header 
(header overrules endpoint)
-String queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, 
String.class);
+// is a query string provided in the endpoint URI or in a header
+// (header overrules endpoint, raw query header overrules query header)
+String queryString = 
exchange.getIn().getHeader(Exchange.HTTP_RAW_QUERY, String.class);
+if (queryString == null) {
+queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, 
String.class);
+}
 if (queryString == null) {
 queryString = endpoint.getHttpUri().getRawQuery();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/10d50677/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
index 862091b..5ecb67f 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.http4;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.http4.handler.BasicRawQueryValidationHandler;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
 import org.apache.http.impl.bootstrap.HttpServer;
 import org.apache.http.impl.bootstrap.ServerBootstrap;
@@ -42,7 +43,8 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 setResponseFactory(getHttpResponseFactory()).
 setExpectationVerifier(getHttpExpectationVerifier()).
 setSslContext(getSSLContext()).
-registerHandler("/", new BasicValidationHandler("GET", null, 
null, getExpectedContent())).create();
+registerHandler("/", new BasicValidationHandler("GET", null, 
null, getExpectedContent())).
+registerHandler("/query", new 
BasicRawQueryValidationHandler("GET", "x=%3B", null, 
getExpectedContent())).create();
 localServer.start();
 
 super.setUp();
@@ -79,4 +81,29 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 
 assertExchange(exchange);
 }
+
+@Test
+public void bridgeEndpointWithQuery() throws Exception {
+Exchange exchange = template.request("http4://" + 
localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + 
"/query?bridgeEndpoint=true", new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(Exchange.HTTP_URI, 

camel git commit: CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer

[gertv]

Repository: camel
Updated Branches:
  refs/heads/master 36297987b -> cfa51caf2


CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer


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

Branch: refs/heads/master
Commit: cfa51caf21c7022a62f1bff0142eada38fa3dbdc
Parents: 3629798
Author: Gert Vanthienen 
Authored: Thu Nov 26 12:42:20 2015 +0100
Committer: Gert Vanthienen 
Committed: Thu Nov 26 12:42:20 2015 +0100

--
 .../component/cxf/spring/SpringJAXRSClientFactoryBean.java  | 9 +
 .../component/cxf/spring/CxfRsClientFactoryBeanTest.java| 5 +
 .../camel/component/cxf/spring/CxfRsClientFactoryBeans.xml  | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cfa51caf/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
index 7ed503e..3335cc5 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.spring;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.component.cxf.NullFaultListener;
 import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
@@ -105,4 +106,12 @@ public class SpringJAXRSClientFactoryBean extends 
JAXRSClientFactoryBean
 this.getProperties().put(FaultListener.class.getName(), new 
NullFaultListener());
 }
 }
+
+public void setProperties(Map properties) {
+if (this.getProperties() != null && properties != null) {
+this.getProperties().putAll(properties);
+} else {
+super.setProperties(properties);
+}
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/cfa51caf/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
index 9d543e2..b5f9240 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
@@ -17,7 +17,9 @@
 package org.apache.camel.component.cxf.spring;
 
 import org.apache.camel.component.cxf.CXFTestSupport;
+import org.apache.camel.component.cxf.NullFaultListener;
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
+import org.apache.cxf.logging.FaultListener;
 import org.junit.Test;
 
 public class CxfRsClientFactoryBeanTest extends AbstractSpringBeanTestSupport {
@@ -41,6 +43,9 @@ public class CxfRsClientFactoryBeanTest extends 
AbstractSpringBeanTestSupport {
 assertEquals("Got the wrong schemalocation", 
"classpath:wsdl/Message.xsd", cfb.getSchemaLocations().get(0));
 assertEquals("Got the wrong loggingFeatureEnabled", true, 
cfb.isLoggingFeatureEnabled());
 assertEquals("Got the wrong loggingSizeLimit", 200, 
cfb.getLoggingSizeLimit());
+Object listener = 
cfb.getProperties().get(FaultListener.class.getName());
+assertTrue("NullFaultListener was not added to the properties", 
listener instanceof NullFaultListener);
 }
 
 }
+

http://git-wip-us.apache.org/repos/asf/camel/blob/cfa51caf/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
--
diff --git 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
 
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
index c9929ae..156bf88 100644
--- 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
+++ 

camel git commit: CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 9d4f7abb6 -> 083b89bfa


CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer


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

Branch: refs/heads/camel-2.16.x
Commit: 083b89bfadfb7c9436347d43199fc92516abaaa5
Parents: 9d4f7ab
Author: Gert Vanthienen 
Authored: Thu Nov 26 12:42:20 2015 +0100
Committer: Gert Vanthienen 
Committed: Thu Nov 26 13:32:14 2015 +0100

--
 .../component/cxf/spring/SpringJAXRSClientFactoryBean.java  | 9 +
 .../component/cxf/spring/CxfRsClientFactoryBeanTest.java| 5 +
 .../camel/component/cxf/spring/CxfRsClientFactoryBeans.xml  | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/083b89bf/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
index 7ed503e..3335cc5 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.spring;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.component.cxf.NullFaultListener;
 import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
@@ -105,4 +106,12 @@ public class SpringJAXRSClientFactoryBean extends 
JAXRSClientFactoryBean
 this.getProperties().put(FaultListener.class.getName(), new 
NullFaultListener());
 }
 }
+
+public void setProperties(Map properties) {
+if (this.getProperties() != null && properties != null) {
+this.getProperties().putAll(properties);
+} else {
+super.setProperties(properties);
+}
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/083b89bf/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
index 9d543e2..b5f9240 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
@@ -17,7 +17,9 @@
 package org.apache.camel.component.cxf.spring;
 
 import org.apache.camel.component.cxf.CXFTestSupport;
+import org.apache.camel.component.cxf.NullFaultListener;
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
+import org.apache.cxf.logging.FaultListener;
 import org.junit.Test;
 
 public class CxfRsClientFactoryBeanTest extends AbstractSpringBeanTestSupport {
@@ -41,6 +43,9 @@ public class CxfRsClientFactoryBeanTest extends 
AbstractSpringBeanTestSupport {
 assertEquals("Got the wrong schemalocation", 
"classpath:wsdl/Message.xsd", cfb.getSchemaLocations().get(0));
 assertEquals("Got the wrong loggingFeatureEnabled", true, 
cfb.isLoggingFeatureEnabled());
 assertEquals("Got the wrong loggingSizeLimit", 200, 
cfb.getLoggingSizeLimit());
+Object listener = 
cfb.getProperties().get(FaultListener.class.getName());
+assertTrue("NullFaultListener was not added to the properties", 
listener instanceof NullFaultListener);
 }
 
 }
+

http://git-wip-us.apache.org/repos/asf/camel/blob/083b89bf/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
--
diff --git 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
 
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
index c9929ae..156bf88 100644
--- 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
+++ 

camel git commit: CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 2d5878d21 -> 5347e630a


CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer


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

Branch: refs/heads/camel-2.15.x
Commit: 5347e630a08cb71ee8ef329072641b7d8fc4895d
Parents: 2d5878d
Author: Gert Vanthienen 
Authored: Thu Nov 26 12:42:20 2015 +0100
Committer: Gert Vanthienen 
Committed: Thu Nov 26 13:40:22 2015 +0100

--
 .../component/cxf/spring/SpringJAXRSClientFactoryBean.java  | 9 +
 .../component/cxf/spring/CxfRsClientFactoryBeanTest.java| 5 +
 .../camel/component/cxf/spring/CxfRsClientFactoryBeans.xml  | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5347e630/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
index 7ed503e..3335cc5 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.spring;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.component.cxf.NullFaultListener;
 import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
@@ -105,4 +106,12 @@ public class SpringJAXRSClientFactoryBean extends 
JAXRSClientFactoryBean
 this.getProperties().put(FaultListener.class.getName(), new 
NullFaultListener());
 }
 }
+
+public void setProperties(Map properties) {
+if (this.getProperties() != null && properties != null) {
+this.getProperties().putAll(properties);
+} else {
+super.setProperties(properties);
+}
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/5347e630/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
index 9d543e2..b5f9240 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
@@ -17,7 +17,9 @@
 package org.apache.camel.component.cxf.spring;
 
 import org.apache.camel.component.cxf.CXFTestSupport;
+import org.apache.camel.component.cxf.NullFaultListener;
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
+import org.apache.cxf.logging.FaultListener;
 import org.junit.Test;
 
 public class CxfRsClientFactoryBeanTest extends AbstractSpringBeanTestSupport {
@@ -41,6 +43,9 @@ public class CxfRsClientFactoryBeanTest extends 
AbstractSpringBeanTestSupport {
 assertEquals("Got the wrong schemalocation", 
"classpath:wsdl/Message.xsd", cfb.getSchemaLocations().get(0));
 assertEquals("Got the wrong loggingFeatureEnabled", true, 
cfb.isLoggingFeatureEnabled());
 assertEquals("Got the wrong loggingSizeLimit", 200, 
cfb.getLoggingSizeLimit());
+Object listener = 
cfb.getProperties().get(FaultListener.class.getName());
+assertTrue("NullFaultListener was not added to the properties", 
listener instanceof NullFaultListener);
 }
 
 }
+

http://git-wip-us.apache.org/repos/asf/camel/blob/5347e630/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
--
diff --git 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
 
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
index c9929ae..156bf88 100644
--- 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
+++ 

camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 324c2370d -> 59b54c679


CAMEL-9311: Fix concurrency when using @DynamicRouter


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

Branch: refs/heads/camel-2.16.x
Commit: 59b54c67909f215fd41bb0ee3ba66a8968195563
Parents: 324c237
Author: Gert Vanthienen 
Authored: Fri Nov 13 15:41:08 2015 +0100
Committer: Gert Vanthienen 
Committed: Fri Nov 13 17:22:56 2015 +0100

--
 .../apache/camel/processor/DynamicRouter.java   |  2 +-
 .../org/apache/camel/processor/RoutingSlip.java | 14 ++--
 .../DynamicRouterConcurrentPOJOTest.java| 77 
 3 files changed, 85 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/59b54c67/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java 
b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
index 0e1c117..565c64e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
@@ -43,7 +43,7 @@ public class DynamicRouter extends RoutingSlip {
 }
 
 @Override
-protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange) 
throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, 
Expression expression) throws Exception {
 return new DynamicRoutingSlipIterator(expression);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/59b54c67/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java 
b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index c20742c..c684593 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -183,25 +183,25 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 return true;
 }
 
-return doRoutingSlip(exchange, callback);
+return doRoutingSlipWithExpression(exchange, this.expression, 
callback);
 }
 
 public boolean doRoutingSlip(Exchange exchange, Object routingSlip, 
AsyncCallback callback) {
 if (routingSlip instanceof Expression) {
-this.expression = (Expression) routingSlip;
+return doRoutingSlipWithExpression(exchange, (Expression) 
routingSlip, callback);
 } else {
-this.expression = 
ExpressionBuilder.constantExpression(routingSlip);
+return doRoutingSlipWithExpression(exchange, 
ExpressionBuilder.constantExpression(routingSlip), callback);
 }
-return doRoutingSlip(exchange, callback);
 }
 
 /**
  * Creates the route slip iterator to be used.
  *
  * @param exchange the exchange
+ * @param expression the expression
  * @return the iterator, should never be null
  */
-protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange) throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange, final Expression expression) throws Exception {
 Object slip = expression.evaluate(exchange, Object.class);
 if (exchange.getException() != null) {
 // force any exceptions occurred during evaluation to be thrown
@@ -221,11 +221,11 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 };
 }
 
-private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback 
callback) {
+private boolean doRoutingSlipWithExpression(final Exchange exchange, final 
Expression expression, final AsyncCallback callback) {
 Exchange current = exchange;
 RoutingSlipIterator iter;
 try {
-iter = createRoutingSlipIterator(exchange);
+iter = createRoutingSlipIterator(exchange, expression);
 } catch (Exception e) {
 exchange.setException(e);
 callback.done(true);

http://git-wip-us.apache.org/repos/asf/camel/blob/59b54c67/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 

camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x f07a33c46 -> 61ad899b6


CAMEL-9311: Fix concurrency when using @DynamicRouter


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

Branch: refs/heads/camel-2.15.x
Commit: 61ad899b648918734014d52054915bbdf8a0b0ec
Parents: f07a33c
Author: Gert Vanthienen 
Authored: Fri Nov 13 15:41:08 2015 +0100
Committer: Gert Vanthienen 
Committed: Fri Nov 13 19:30:56 2015 +0100

--
 .../apache/camel/processor/DynamicRouter.java   |  2 +-
 .../org/apache/camel/processor/RoutingSlip.java | 14 ++--
 .../DynamicRouterConcurrentPOJOTest.java| 77 
 3 files changed, 85 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/61ad899b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java 
b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
index 0e1c117..565c64e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
@@ -43,7 +43,7 @@ public class DynamicRouter extends RoutingSlip {
 }
 
 @Override
-protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange) 
throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, 
Expression expression) throws Exception {
 return new DynamicRoutingSlipIterator(expression);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/61ad899b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java 
b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 00625d6..483e1f7 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -143,25 +143,25 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 return true;
 }
 
-return doRoutingSlip(exchange, callback);
+return doRoutingSlipWithExpression(exchange, this.expression, 
callback);
 }
 
 public boolean doRoutingSlip(Exchange exchange, Object routingSlip, 
AsyncCallback callback) {
 if (routingSlip instanceof Expression) {
-this.expression = (Expression) routingSlip;
+return doRoutingSlipWithExpression(exchange, (Expression) 
routingSlip, callback);
 } else {
-this.expression = 
ExpressionBuilder.constantExpression(routingSlip);
+return doRoutingSlipWithExpression(exchange, 
ExpressionBuilder.constantExpression(routingSlip), callback);
 }
-return doRoutingSlip(exchange, callback);
 }
 
 /**
  * Creates the route slip iterator to be used.
  *
  * @param exchange the exchange
+ * @param expression the expression
  * @return the iterator, should never be null
  */
-protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange) throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange, final Expression expression) throws Exception {
 Object slip = expression.evaluate(exchange, Object.class);
 if (exchange.getException() != null) {
 // force any exceptions occurred during evaluation to be thrown
@@ -181,11 +181,11 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 };
 }
 
-private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback 
callback) {
+private boolean doRoutingSlipWithExpression(final Exchange exchange, final 
Expression expression, final AsyncCallback callback) {
 Exchange current = exchange;
 RoutingSlipIterator iter;
 try {
-iter = createRoutingSlipIterator(exchange);
+iter = createRoutingSlipIterator(exchange, expression);
 } catch (Exception e) {
 exchange.setException(e);
 callback.done(true);

http://git-wip-us.apache.org/repos/asf/camel/blob/61ad899b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 

camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter

[gertv]

Repository: camel
Updated Branches:
  refs/heads/master 9c6bf4689 -> 8a770bfee


CAMEL-9311: Fix concurrency when using @DynamicRouter


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

Branch: refs/heads/master
Commit: 8a770bfeec6e2134eec12be6ef49a3458e99f7cc
Parents: 9c6bf46
Author: Gert Vanthienen 
Authored: Fri Nov 13 15:41:08 2015 +0100
Committer: Gert Vanthienen 
Committed: Fri Nov 13 15:41:19 2015 +0100

--
 .../apache/camel/processor/DynamicRouter.java   |  2 +-
 .../org/apache/camel/processor/RoutingSlip.java | 14 ++--
 .../DynamicRouterConcurrentPOJOTest.java| 77 
 3 files changed, 85 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8a770bfe/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java 
b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
index 0e1c117..565c64e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
@@ -43,7 +43,7 @@ public class DynamicRouter extends RoutingSlip {
 }
 
 @Override
-protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange) 
throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, 
Expression expression) throws Exception {
 return new DynamicRoutingSlipIterator(expression);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/8a770bfe/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java 
b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index c20742c..c684593 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -183,25 +183,25 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 return true;
 }
 
-return doRoutingSlip(exchange, callback);
+return doRoutingSlipWithExpression(exchange, this.expression, 
callback);
 }
 
 public boolean doRoutingSlip(Exchange exchange, Object routingSlip, 
AsyncCallback callback) {
 if (routingSlip instanceof Expression) {
-this.expression = (Expression) routingSlip;
+return doRoutingSlipWithExpression(exchange, (Expression) 
routingSlip, callback);
 } else {
-this.expression = 
ExpressionBuilder.constantExpression(routingSlip);
+return doRoutingSlipWithExpression(exchange, 
ExpressionBuilder.constantExpression(routingSlip), callback);
 }
-return doRoutingSlip(exchange, callback);
 }
 
 /**
  * Creates the route slip iterator to be used.
  *
  * @param exchange the exchange
+ * @param expression the expression
  * @return the iterator, should never be null
  */
-protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange) throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange, final Expression expression) throws Exception {
 Object slip = expression.evaluate(exchange, Object.class);
 if (exchange.getException() != null) {
 // force any exceptions occurred during evaluation to be thrown
@@ -221,11 +221,11 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 };
 }
 
-private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback 
callback) {
+private boolean doRoutingSlipWithExpression(final Exchange exchange, final 
Expression expression, final AsyncCallback callback) {
 Exchange current = exchange;
 RoutingSlipIterator iter;
 try {
-iter = createRoutingSlipIterator(exchange);
+iter = createRoutingSlipIterator(exchange, expression);
 } catch (Exception e) {
 exchange.setException(e);
 callback.done(true);

http://git-wip-us.apache.org/repos/asf/camel/blob/8a770bfe/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 

camel git commit: CAMEL-9269: NotifyBuilder.fromRoute() does not work for some endpoint types

[gertv]

Repository: camel
Updated Branches:
  refs/heads/master 99056a1d5 -> 62b2042b2


CAMEL-9269: NotifyBuilder.fromRoute() does not work for some endpoint types


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

Branch: refs/heads/master
Commit: 62b2042b2fa9388aab16d5cee1385000a81a6a6b
Parents: 99056a1
Author: Gert Vanthienen 
Authored: Thu Oct 29 09:44:10 2015 +0100
Committer: Gert Vanthienen 
Committed: Thu Oct 29 09:44:10 2015 +0100

--
 .../org/apache/camel/builder/NotifyBuilder.java |  5 +
 .../builder/NotifyBuilderFromRouteTest.java | 96 
 2 files changed, 101 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/62b2042b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index 1c42ad9..e5933494 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -154,6 +154,11 @@ public class NotifyBuilder {
 @Override
 public boolean onExchange(Exchange exchange) {
 String id = 
EndpointHelper.getRouteIdFromEndpoint(exchange.getFromEndpoint());
+
+if (id == null) {
+id = exchange.getFromRouteId();
+}
+
 // filter non matching exchanges
 return EndpointHelper.matchPattern(id, routeId);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/62b2042b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
 
b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
new file mode 100644
index 000..bf94389
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
@@ -0,0 +1,96 @@
+/**
+ * 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.builder;
+
+import org.apache.camel.*;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @version 
+ */
+public class NotifyBuilderFromRouteTest extends ContextTestSupport {
+
+public void testDoneFromRoute() throws Exception {
+// notify when exchange is done
+NotifyBuilder builder =
+new NotifyBuilder(context).fromRoute("foo").whenDone(1);
+builder.create();
+
+template.sendBody("seda:foo", "Hello world!");
+
+assertTrue(builder.matchesMockWaitTime());
+}
+
+
+@Override
+protected JndiRegistry createRegistry() throws Exception {
+final JndiRegistry registry = super.createRegistry();
+registry.bind("proxy", new ProxyComponent());
+return registry;
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("proxy:seda:foo")
+.routeId("foo")
+.to("mock:foo");
+}
+};
+}
+
+private static final class ProxyComponent extends DefaultComponent {
+
+@Override
+protected Endpoint createEndpoint(String uri, String remaining, 
Map parameters) throws Exception {
+return new ProxyEndpoint(this, uri, remaining);
+}
+
+}
+
+ 

camel git commit: CAMEL-9269: NotifyBuilder.fromRoute() does not work for some endpoint types

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x f5b926d10 -> 2d83364ac


CAMEL-9269: NotifyBuilder.fromRoute() does not work for some endpoint types


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

Branch: refs/heads/camel-2.16.x
Commit: 2d83364ac60d3cd5c1d30ae0b6c95dc0a73bdd5e
Parents: f5b926d
Author: Gert Vanthienen 
Authored: Thu Oct 29 09:44:10 2015 +0100
Committer: Gert Vanthienen 
Committed: Thu Oct 29 09:46:10 2015 +0100

--
 .../org/apache/camel/builder/NotifyBuilder.java |  5 +
 .../builder/NotifyBuilderFromRouteTest.java | 96 
 2 files changed, 101 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2d83364a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index 1c42ad9..e5933494 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -154,6 +154,11 @@ public class NotifyBuilder {
 @Override
 public boolean onExchange(Exchange exchange) {
 String id = 
EndpointHelper.getRouteIdFromEndpoint(exchange.getFromEndpoint());
+
+if (id == null) {
+id = exchange.getFromRouteId();
+}
+
 // filter non matching exchanges
 return EndpointHelper.matchPattern(id, routeId);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2d83364a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
 
b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
new file mode 100644
index 000..bf94389
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
@@ -0,0 +1,96 @@
+/**
+ * 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.builder;
+
+import org.apache.camel.*;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @version 
+ */
+public class NotifyBuilderFromRouteTest extends ContextTestSupport {
+
+public void testDoneFromRoute() throws Exception {
+// notify when exchange is done
+NotifyBuilder builder =
+new NotifyBuilder(context).fromRoute("foo").whenDone(1);
+builder.create();
+
+template.sendBody("seda:foo", "Hello world!");
+
+assertTrue(builder.matchesMockWaitTime());
+}
+
+
+@Override
+protected JndiRegistry createRegistry() throws Exception {
+final JndiRegistry registry = super.createRegistry();
+registry.bind("proxy", new ProxyComponent());
+return registry;
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("proxy:seda:foo")
+.routeId("foo")
+.to("mock:foo");
+}
+};
+}
+
+private static final class ProxyComponent extends DefaultComponent {
+
+@Override
+protected Endpoint createEndpoint(String uri, String remaining, 
Map parameters) throws Exception {
+return new ProxyEndpoint(this, uri, remaining);
+}

svn commit: r1345131 - /camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml

[gertv]

Author: gertv
Date: Fri Jun  1 12:40:50 2012
New Revision: 1345131

URL: http://svn.apache.org/viewvc?rev=1345131view=rev
Log:
CAMEL-5322: Upgrade to Hadoop bundle version 0.20.203.0_2

Modified:
camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml

Modified: camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml?rev=1345131r1=1345130r2=1345131view=diff
==
--- camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml Fri Jun  1 
12:40:50 2012
@@ -67,7 +67,7 @@
   gernimo-annotation-spec-version1.1.1/gernimo-annotation-spec-version
   gernimo-jaxws22-spec-version1.1/gernimo-jaxws22-spec-version
   guice-bundle-version2.0_2/guice-bundle-version
-  hadoop-bundle-version0.20.203.0_1/hadoop-bundle-version
+  hadoop-bundle-version0.20.203.0_2/hadoop-bundle-version
   hapi-bundle-version0.5.1_5/hapi-bundle-version
   
hibernate-validator-bundle-version4.1.0.Final_3/hibernate-validator-bundle-version
   ibatis-bundle-version2.3.4.726_4/ibatis-bundle-version

svn commit: r1345135 - in /camel/branches/camel-2.8.x: ./ platforms/karaf/features/pom.xml

[gertv]

Author: gertv
Date: Fri Jun  1 12:46:45 2012
New Revision: 1345135

URL: http://svn.apache.org/viewvc?rev=1345135view=rev
Log:
Merged revisions 1345131 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x


  r1345131 | gertv | 2012-06-01 14:40:50 +0200 (Fri, 01 Jun 2012) | 1 line
  
  CAMEL-5322: Upgrade to Hadoop bundle version 0.20.203.0_2


Modified:
camel/branches/camel-2.8.x/   (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml

Propchange: camel/branches/camel-2.8.x/
--
  Merged /camel/branches/camel-2.9.x:r1345131

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

Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1345135r1=1345134r2=1345135view=diff
==
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Fri Jun  1 
12:46:45 2012
@@ -70,7 +70,7 @@
   gernimo-annotation-spec-version1.1.1/gernimo-annotation-spec-version
   gernimo-jaxws22-spec-version1.1/gernimo-jaxws22-spec-version
   guice-bundle-version2.0_2/guice-bundle-version
-  hadoop-bundle-version0.20.203.0_1/hadoop-bundle-version
+  hadoop-bundle-version0.20.203.0_2/hadoop-bundle-version
   hapi-bundle-version0.5.1_5/hapi-bundle-version
   
hibernate-validator-bundle-version4.1.0.Final_2/hibernate-validator-bundle-version
   httpcore-bundle-version4.0-alpha6_1/httpcore-bundle-version

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

[gertv]

Author: gertv
Date: Mon Sep 12 07:05:04 2011
New Revision: 1169620

URL: http://svn.apache.org/viewvc?rev=1169620view=rev
Log:
CAMEL-4439: Error in camel-restlet feature

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=1169620r1=1169619r2=1169620view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon 
Sep 12 07:05:04 2011
@@ -494,8 +494,8 @@
   /feature
   feature name='camel-restlet' version='${pom.version}' resolver='(obr)' 
start-level='50'
 feature version='${pom.version}'camel-core/feature
+bundle 
dependency=truemvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}/bundle

 bundlemvn:org.apache.camel/camel-restlet/${pom.version}/bundle
-
bundlemvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}/bundle
   /feature
   feature name='camel-rmi' version='${pom.version}' resolver='(obr)' 
start-level='50'
 feature version='${pom.version}'camel-core/feature

svn commit: r1159171 - in /camel/trunk: components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/ tests/camel-ites

[gertv]

Author: gertv
Date: Thu Aug 18 11:29:19 2011
New Revision: 1159171

URL: http://svn.apache.org/viewvc?rev=1159171view=rev
Log:
CAMEL-4347: Set TCCL when starting camel-blueprint routes

Added:

camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java

camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-tccl.xml
Modified:

camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java

camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java

Modified: 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java?rev=1159171r1=1159170r2=1159171view=diff
==
--- 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
 (original)
+++ 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
 Thu Aug 18 11:29:19 2011
@@ -24,6 +24,7 @@ import org.apache.camel.core.osgi.OsgiFa
 import org.apache.camel.core.osgi.OsgiPackageScanClassResolver;
 import org.apache.camel.core.osgi.OsgiTypeConverter;
 import org.apache.camel.core.osgi.utils.BundleContextUtils;
+import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.Registry;
@@ -52,6 +53,7 @@ public class BlueprintCamelContext exten
 setComponentResolver(new BlueprintComponentResolver(bundleContext));
 setLanguageResolver(new BlueprintLanguageResolver(bundleContext));
 setDataFormatResolver(new BlueprintDataFormatResolver(bundleContext));
+setApplicationContextClassLoader(new 
BundleDelegatingClassLoader(bundleContext.getBundle()));
 }
 
 public BundleContext getBundleContext() {
@@ -71,7 +73,14 @@ public class BlueprintCamelContext exten
 }
 
 public void init() throws Exception {
-maybeStart();
+final ClassLoader original = 
Thread.currentThread().getContextClassLoader();
+try {
+// let's set a more suitable TCCL while starting the context
+
Thread.currentThread().setContextClassLoader(getApplicationContextClassLoader());
+maybeStart();
+} finally {
+Thread.currentThread().setContextClassLoader(original);
+}
 }
 
 private void maybeStart() throws Exception {

Modified: 
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java?rev=1159171r1=1159170r2=1159171view=diff
==
--- 
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
 (original)
+++ 
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
 Thu Aug 18 11:29:19 2011
@@ -87,4 +87,9 @@ public class BundleDelegatingClassLoader
 public Bundle getBundle() {
 return bundle;
 }
+
+@Override
+public String toString() {
+return String.format(BundleDelegatingClassLoader(%s), bundle);
+}
 }

Added: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java?rev=1159171view=auto
==
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
 (added)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
 Thu Aug 18 11:29:19 2011
@@ -0,0 +1,126 @@
+/**
+ * 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

svn commit: r1068934 - in /camel/trunk/platforms/karaf: features/pom.xml features/src/main/resources/features.xml pom.xml

[gertv]

Author: gertv
Date: Wed Feb  9 15:21:19 2011
New Revision: 1068934

URL: http://svn.apache.org/viewvc?rev=1068934view=rev
Log:
CAMEL-3268: Fix features-maven-plugin validate goal, remove tabs and fix a few 
minor issues in the features.xml

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

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1068934r1=1068933r2=1068934view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Feb  9 15:21:19 2011
@@ -140,12 +140,12 @@
 
 !-- The validate plugin will export these provided dependencies bundles' 
export packages first --  
 dependencies
-   dependency
-   groupIdorg.osgi/groupId
-   artifactIdorg.osgi.core/artifactId
-   version4.2.0/version
-   scopeprovided/scope
-   /dependency
+dependency
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.core/artifactId
+version4.2.0/version
+scopeprovided/scope
+/dependency
 dependency
 groupIdorg.ops4j.pax.logging/groupId
 artifactIdpax-logging-api/artifactId
@@ -218,4 +218,39 @@
   /plugins
 /build
 
+profiles
+   profile
+  idvalidate/id
+  build
+ plugins
+plugin
+   groupIdorg.apache.karaf.tooling/groupId
+   artifactIdfeatures-maven-plugin/artifactId
+   version${karaf-version}/version
+   configuration
+   
file${project.build.directory}/classes/${features.file}/file
+   
karafConfig${project.build.directory}/classes/config.properties/karafConfig
+   /configuration
+   executions
+ execution
+   idvalidate/id
+   phaseprocess-resources/phase
+   goals
+ goalvalidate/goal
+   /goals
+ /execution
+   /executions
+   dependencies
+dependency
+ groupIdorg.slf4j/groupId
+ artifactIdslf4j-simple/artifactId
+ version1.4.3/version
+/dependency
+ /dependencies
+   /plugin
+  /plugins
+   /build
+/profile
+ /profiles
+
 /project

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=1068934r1=1068933r2=1068934view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
Feb  9 15:21:19 2011
@@ -107,7 +107,7 @@
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}/bundle
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}/bundle
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}/bundle
-bundlemvn:javax.mail/mail/${javax-mail-version}/bundle
+
bundlemvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}/bundle
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}/bundle
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/bundle
 
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}/bundle
@@ -330,7 +330,7 @@
 bundlemvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}/bundle
 bundlemvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}/bundle
 bundlemvn:org.apache.camel/camel-hawtdb/${pom.version}/bundle
-  /feature 
+  /feature  
   feature name='camel-ibatis' version='${pom.version}'
 feature version='${pom.version}'camel-spring/feature
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}/bundle
@@ -455,7 +455,7 @@
   feature name='camel-mail' version='${pom.version}'
 bundlemvn:org.springframework/spring-context/${spring-version}/bundle
 
bundlemvn:org.springframework/spring-context-support/${spring-version}/bundle
-bundlemvn:javax.mail/mail/${javax-mail-version}/bundle
+
bundlemvn:http://download.java.net/maven/2!javax.mail/mail

svn commit: r1021302 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ components/camel-scala/src/main/scala/org/apa

[gertv]

Author: gertv
Date: Mon Oct 11 11:13:59 2010
New Revision: 1021302

URL: http://svn.apache.org/viewvc?rev=1021302view=rev
Log:
CAMEL-463: Adding support for pollEnrich() DSL method

Added:

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SPollEnricherTest.scala
Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1021302r1=1021301r2=1021302view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
 Mon Oct 11 11:13:59 2010
@@ -2515,7 +2515,7 @@ public abstract class ProcessorDefinitio
  * using a {...@link org.apache.camel.PollingConsumer} to poll the 
endpoint.
  * p/
  * The difference between this and {...@link #enrich(String)} is that this 
uses a consumer
- * to obatin the additional data, where as enrich uses a producer.
+ * to obtain the additional data, where as enrich uses a producer.
  * p/
  * This method will block until data is avialable, use the method with 
timeout if you do not
  * want to risk waiting a long time before data is available from the 
resourceUri.
@@ -2536,7 +2536,7 @@ public abstract class ProcessorDefinitio
  * using a {...@link org.apache.camel.PollingConsumer} to poll the 
endpoint.
  * p/
  * The difference between this and {...@link #enrich(String)} is that this 
uses a consumer
- * to obatin the additional data, where as enrich uses a producer.
+ * to obtain the additional data, where as enrich uses a producer.
  * p/
  * This method will block until data is avialable, use the method with 
timeout if you do not
  * want to risk waiting a long time before data is available from the 
resourceUri.
@@ -2558,7 +2558,7 @@ public abstract class ProcessorDefinitio
  * using a {...@link org.apache.camel.PollingConsumer} to poll the 
endpoint.
  * p/
  * The difference between this and {...@link #enrich(String)} is that this 
uses a consumer
- * to obatin the additional data, where as enrich uses a producer.
+ * to obtain the additional data, where as enrich uses a producer.
  * p/
  * The timeout controls which operation to use on {...@link 
org.apache.camel.PollingConsumer}.
  * If timeout is negative, we use ttreceive/tt. If timeout is 0 then 
we use ttreceiveNoWait/tt

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=1021302r1=1021301r2=1021302view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Mon Oct 11 11:13:59 2010
@@ -56,6 +56,9 @@ trait DSL {
   def onCompletion(config: Config[SOnCompletionDefinition]) : 
SOnCompletionDefinition
   def pipeline : SPipelineDefinition
   def policy(policy: Policy) : DSL
+
+  def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: 
Long = 0) : DSL
+
   def process(function: Exchange = Unit) : DSL
   def process(processor: Processor) : DSL
   def recipients(expression: Exchange = Any) : DSL

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=1021302r1=1021301r2=1021302view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 Mon Oct 11 11:13:59 2010
@@ -123,6 +123,9 @@ abstract class SAbstractDefinition[P : 
   
   def policy(policy: Policy) = wrap(target.policy(policy))
 
+  def pollEnrich(uri: String, strategy: AggregationStrategy = null, timeout: 
Long = 0) = 
+wrap(target.pollEnrich(uri, timeout, strategy))
+
   def recipients(expression

svn commit: r1021305 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/ components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ components/camel-scala/src/main/scala/org

[gertv]

Author: gertv
Date: Mon Oct 11 11:14:30 2010
New Revision: 1021305

URL: http://svn.apache.org/viewvc?rev=1021305view=rev
Log:
CAMEL-463: Adding support for validate() DSL method

Added:

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala
Modified:

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java?rev=1021305r1=1021304r2=1021305view=diff
==
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
 Mon Oct 11 11:14:30 2010
@@ -28,8 +28,8 @@ import org.apache.camel.processor.valida
  */
 public class ValidateRegExpTest extends ContextTestSupport {
 
-private Endpoint startEndpoint;
-private MockEndpoint resultEndpoint;
+protected Endpoint startEndpoint;
+protected MockEndpoint resultEndpoint;
 
 @Override
 protected void setUp() throws Exception {

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java?rev=1021305r1=1021304r2=1021305view=diff
==
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
 Mon Oct 11 11:14:30 2010
@@ -28,8 +28,8 @@ import org.apache.camel.processor.valida
  */
 public class ValidateSimpleTest extends ContextTestSupport {
 
-private Endpoint startEndpoint;
-private MockEndpoint resultEndpoint;
+protected Endpoint startEndpoint;
+protected MockEndpoint resultEndpoint;
 
 @Override
 protected void setUp() throws Exception {

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=1021305r1=1021304r2=1021305view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Mon Oct 11 11:14:30 2010
@@ -92,6 +92,9 @@ trait DSL {
   def transform(expression: Exchange = Any) : DSL
 
   def unmarshal(format: DataFormatDefinition) : DSL
+
+  def validate(expression: Exchange = Any) : DSL
+
   def when(filter: Exchange = Any) : DSL with Block
   
   def wiretap(uri: String) : DSL

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=1021305r1=1021304r2=1021305view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 Mon Oct 11 11:14:30 2010
@@ -156,7 +156,9 @@ abstract class SAbstractDefinition[P : 
   def transform(expression: Exchange = Any) = 
wrap(target.transform(expression))
   
   def unmarshal(format: DataFormatDefinition) = wrap(target.unmarshal(format))
-  
+
+  def validate(expression: Exchange = Any) = 
wrap(target.validate(predicateBuilder(expression)))
+
   def wiretap(uri: String) = wrap(target.wireTap(uri))
   def wiretap(uri: String, expression: Exchange = Any) = 
wrap(target.wireTap(uri, expression))
   

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=1021305r1=1021304r2=1021305view=diff
==
--- 
camel/trunk

svn commit: r1021306 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Mon Oct 11 11:14:57 2010
New Revision: 1021306

URL: http://svn.apache.org/viewvc?rev=1021306view=rev
Log:
CAMEL-463: Adding support for sort() DSL method (incl. sortBody())

Added:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Functions.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SSortTest.scala
Modified:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=1021306r1=1021305r2=1021306view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Mon Oct 11 11:14:57 2010
@@ -19,7 +19,8 @@ package scala
 package dsl 
 
 import org.apache.camel.model.DataFormatDefinition
-import reflect.Manifest;
+import reflect.Manifest
+import java.util.Comparator;
 import org.apache.camel.processor.aggregate.AggregationStrategy
 
 import org.apache.camel.spi.Policy
@@ -75,6 +76,7 @@ trait DSL {
   def setfaultbody(expression: Exchange = Any) : DSL
   def setheader(header: String, expression: Exchange = Any) : DSL
 
+  def sort[T](expression: Exchange = Any, comparator: Comparator[T] = null) : 
DSL
   def split(expression: Exchange = Any) : SSplitDefinition
 
   def stop : DSL

Added: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Functions.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Functions.scala?rev=1021306view=auto
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Functions.scala
 (added)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Functions.scala
 Mon Oct 11 11:14:57 2010
@@ -0,0 +1,33 @@
+/**
+ * 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.scala.dsl
+
+import org.apache.camel.Exchange
+
+/**
+ * A set of convenience functions for use in RouteBuilders and other Scala 
code interacting with Camel
+ */
+trait Functions {
+
+  /**
+   * Convenience function for extracting the 'in' message body from a Camel 
org.apache.camel.Exchange
+   *
+   * Can also be used as a partially applied function where the DSL requires 
Exchange = Any
+   */
+  def body(exchange: Exchange) = exchange.getIn.getBody
+
+}
\ No newline at end of file

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=1021306r1=1021305r2=1021306view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 Mon Oct 11 11:14:57 2010
@@ -31,6 +31,7 @@ import org.apache.camel.processor.aggreg
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 import reflect.Manifest
 import java.lang.String
+import java.util.Comparator
 
 abstract class SAbstractDefinition[P : ProcessorDefinition[_]] extends DSL 
with Wrapper[P] with Block {
 
@@ -135,7 +136,9 @@ abstract class SAbstractDefinition[P : 
   def routingSlip(header: String) = wrap(target.routingSlip(header))
   def routingSlip(header: String, separator: String) = 
wrap(target.routingSlip(header, separator))
   def routingSlip(expression: Exchange

svn commit: r957013 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ components/camel-scala/src/main/scala/org/apache/camel/scala/ components/camel-scala/src/main/scala/org/apache/c

[gertv]

Author: gertv
Date: Tue Jun 22 20:19:58 2010
New Revision: 957013

URL: http://svn.apache.org/viewvc?rev=957013view=rev
Log:
CAMEL-2167: Upgrade to Scala 2.8.0.RC6

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaPredicate.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl

svn commit: r929537 - in /camel/branches/camel-1.x/camel-core/src: main/java/org/apache/camel/processor/DeadLetterChannel.java test/java/org/apache/camel/processor/DeadLetterChannelAsyncTest.java

[gertv]

Author: gertv
Date: Wed Mar 31 13:40:48 2010
New Revision: 929537

URL: http://svn.apache.org/viewvc?rev=929537view=rev
Log:
CAMEL-2605: Asynchronous processing in DLC endpoint breaks message handling

Added:

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAsyncTest.java
Modified:

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=929537r1=929536r2=929537view=diff
==
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 Wed Mar 31 13:40:48 2010
@@ -326,6 +326,10 @@ public class DeadLetterChannel extends E
 boolean sync = afp.process(exchange, new AsyncCallback() {
 public void done(boolean sync) {
 restoreExceptionOnExchange(exchange, data.handledPredicate);
+
+// if the fault was handled asynchronously, this should be 
reflected in the callback as well
+data.sync = sync;
+
 callback.done(data.sync);
 }
 });

Added: 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAsyncTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAsyncTest.java?rev=929537view=auto
==
--- 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAsyncTest.java
 (added)
+++ 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAsyncTest.java
 Wed Mar 31 13:40:48 2010
@@ -0,0 +1,102 @@
+/**
+ * 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.processor;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.model.LoggingLevel;
+import org.apache.camel.util.AsyncProcessorHelper;
+
+/**
+ * Test to ensure that async processing inside the DLC endpoint does not break 
message handling
+ * - https://issues.apache.org/activemq/browse/CAMEL-2605
+ *
+ * @version $Revision: 761633 $
+ */
+public class DeadLetterChannelAsyncTest extends ContextTestSupport {
+
+private static final int COUNT = 1;
+
+private final CountDownLatch sent = new CountDownLatch(COUNT);
+private final CountDownLatch handled = new CountDownLatch(COUNT);
+
+private final Executor executor = Executors.newFixedThreadPool(2);
+
+public void testAsyncDlcHandling() throws Exception {
+executor.execute(new Runnable() {
+public void run() {
+sendBody(direct:start, Desperately need processing...);
+sent.countDown();
+}
+});
+
+assertTrue(Call to sendBody should have ended successfully,
+   sent.await(2, TimeUnit.SECONDS));
+assertTrue(Error should have been handled asynchronously,
+   handled.await(2, TimeUnit.SECONDS));
+}
+
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+public void configure() {
+
errorHandler(deadLetterChannel(direct:dlc).maximumRedeliveries(0));
+
+from(direct:start).process(new Processor() {
+public void

svn commit: r904291 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/features.xml

[gertv]

Author: gertv
Date: Thu Jan 28 22:59:44 2010
New Revision: 904291

URL: http://svn.apache.org/viewvc?rev=904291view=rev
Log:
Upgrade to latest specs/xmlbeans bundle version

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

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=904291r1=904290r2=904291view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Jan 28 22:59:44 2010
@@ -65,7 +65,6 @@
   jackrabbit-version1.5.3/jackrabbit-version
   jaxb-bundle-version2.1.12_1/jaxb-bundle-version
   jexcelapi-bundle-version2.4.2_2/jexcelapi-bundle-version
-  jsr311-api-1.0-spec-version1.3.0/jsr311-api-1.0-spec-version 
   hapi-bundle-version0.5.1_3/hapi-bundle-version
   httpcore-bundle-version4.0-alpha6_1/httpcore-bundle-version
   irclib-bundle-version1.10_2/irclib-bundle-version
@@ -108,7 +107,7 @@
   velocity-bundle-version1.6.2_3/velocity-bundle-version
   xalan-bundle-version2.7.1_2/xalan-bundle-version
   xerces-bundle-version2.9.1_3/xerces-bundle-version
-  xmlbeans-bundle-version2.4.0_2/xmlbeans-bundle-version
+  xmlbeans-bundle-version2.4.0_3/xmlbeans-bundle-version
   xmlschema-version1.4.5/xmlschema-version
   xmlsec-bundle-version1.4.3_2/xmlsec-bundle-version
   xmlresolver-bundle-version1.2_2/xmlresolver-bundle-version

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=904291r1=904290r2=904291view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu 
Jan 28 22:59:44 2010
@@ -74,7 +74,7 @@
 
bundlemvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}/bundle
 
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}/bundle
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}/bundle
-
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${jsr311-api-1.0-spec-version}/bundle
+
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${servicemix-specs-version}/bundle
 
bundlemvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}/bundle
 bundlemvn:org.apache.cxf/cxf-bundle/${cxf-version}/bundle
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}/bundle

svn commit: r885088 - /camel/trunk/platforms/karaf/features/pom.xml

[gertv]

Author: gertv
Date: Sat Nov 28 12:24:12 2009
New Revision: 885088

URL: http://svn.apache.org/viewvc?rev=885088view=rev
Log:
CAMEL-1567: Upgrade to juel bundle 2.1.2_1-SNAPSHOT

Modified:
camel/trunk/platforms/karaf/features/pom.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=885088r1=885087r2=885088view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sat Nov 28 12:24:12 2009
@@ -80,7 +80,7 @@
   josql-bundle-version1.5_3/josql-bundle-version
   jsch-bundle-version0.1.31_3/jsch-bundle-version
   jsp-api-2.1-version1.0.1/jsp-api-2.1-version
-  juel-bundle-version2.1.0_2/juel-bundle-version
+  juel-bundle-version2.1.2_1-SNAPSHOT/juel-bundle-version
   junit-bundle-version4.7_1/junit-bundle-version
   mvel-bundle-version2.0.8_3/mvel-bundle-version
   mina-bundle-version1.1.7_3/mina-bundle-version

svn commit: r883781 - in /camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnV

[gertv]

Author: gertv
Date: Tue Nov 24 16:58:26 2009
New Revision: 883781

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


  r883713 | gertv | 2009-11-24 15:54:55 +0100 (Tue, 24 Nov 2009) | 1 line
  
  CAMEL-2221: Inconsistent out message when using dynamic recipient list


Added:

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
  - copied, changed from r883713, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
Modified:
camel/branches/camel-1.x/   (props changed)

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java

Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 24 16:58:26 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713

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

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=883781r1=883780r2=883781view=diff
==
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache

svn commit: r826977 - in /camel/trunk/platforms/karaf: features/pom.xml features/src/main/resources/features.xml pom.xml

[gertv]

Author: gertv
Date: Tue Oct 20 06:54:55 2009
New Revision: 826977

URL: http://svn.apache.org/viewvc?rev=826977view=rev
Log:
CAMEL-2080: Enable features-maven-plugin validate goal for karaf features build

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

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=826977r1=826976r2=826977view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Oct 20 06:54:55 2009
@@ -42,7 +42,7 @@
   bcel-bundle-version5.2_1-SNAPSHOT/bcel-bundle-version
   dom4j-bundle-version1.6.1_1-SNAPSHOT/dom4j-bundle-version
   cglib-version2.1_3_3-SNAPSHOT/cglib-version
-  
commons-beanutils-bundle-version1.7.0_2-SNAPSHOT/commons-beanutils-bundle-version
+  
commons-beanutils-bundle-version1.7.0_1/commons-beanutils-bundle-version
   
commons-dbcp-bundle-version1.2.2_4-SNAPSHOT/commons-dbcp-bundle-version
   commons-csv-version1.0-r706899_2-SNAPSHOT/commons-csv-version
   
commons-codec-bundle-version1.3_1-SNAPSHOT/commons-codec-bundle-version
@@ -95,7 +95,7 @@
   servicemix-specs-version1.4-SNAPSHOT/servicemix-specs-version
   servlet-api-2.5-version1.1.2/servlet-api-2.5-version
   serp-bundle-version1.13.1_1-SNAPSHOT/serp-bundle-version
-  snmp4j-bundle-version1.8.1_2-SNAPSHOT/snmp4j-bundle-version
+  snmp4j-bundle-version1.8.1_1/snmp4j-bundle-version
   smack-bundle-version3.0.4_1/smack-bundle-version  
   spring-version2.5.6.SEC01/spring-version
   spring-osgi-version1.2.0/spring-osgi-version
@@ -116,6 +116,36 @@
   woodstox-bundle-version3.2.7_1/woodstox-bundle-version
   wsdl4j-bundle-version1.6.1_1/wsdl4j-bundle-version
 /properties
+
+repositories
+  !-- ServiceMix repo (for org.osgi:org.osgi.impl.bundle.jmx) --
+  repository
+idservicemix/id
+nameApache ServiceMix Repository/name
+urlhttp://svn.apache.org/repos/asf/servicemix/m2-repo/url
+releases
+  enabledtrue/enabled
+/releases
+snapshots
+  enabledfalse/enabled
+/snapshots
+  /repository   
+/repositories
+
+dependencies
+   dependency
+   groupIdorg.osgi/groupId
+   artifactIdorg.osgi.core/artifactId
+   version4.2.0/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.ops4j.pax.logging/groupId
+   artifactIdpax-logging-api/artifactId
+   version1.4/version
+   scopeprovided/scope
+   /dependency
+/dependencies
 
 build
   resources
@@ -139,6 +169,20 @@
   /executions
 /plugin
 plugin
+  groupIdorg.apache.felix.karaf.tooling/groupId
+  artifactIdfeatures-maven-plugin/artifactId
+  version${karaf-version}/version
+  executions
+ execution
+idvalidate/id
+phaseprocess-resources/phase
+goals
+  goalvalidate/goal
+/goals
+ /execution
+  /executions
+/plugin
+plugin
   groupIdorg.codehaus.mojo/groupId
 artifactIdbuild-helper-maven-plugin/artifactId
 executions

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=826977r1=826976r2=826977view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue 
Oct 20 06:54:55 2009
@@ -1,6 +1,13 @@
 ?xml version=1.0 encoding=UTF-8?
 features
+  
repositorymvn:org.apache.felix.karaf/apache-felix-karaf/${karaf-version}/xml/features/repository
+  feature name='camel' version='${pom.version}'
+feature version='${pom.version}'camel-core/feature
+feature version='${pom.version}'camel-spring/feature
+feature version='${pom.version}'camel-osgi/feature
+  /feature
   feature name='camel-core' version='${pom.version}'
+feature version=${spring-version}spring/feature
 
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/bundle
 
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}/bundle
 
bundlemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}/bundle
@@ -10,26 +17,19 @@
   /feature
   feature name='camel-spring' version

svn commit: r794368 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java

[gertv]

Author: gertv
Date: Wed Jul 15 19:02:36 2009
New Revision: 794368

URL: http://svn.apache.org/viewvc?rev=794368view=rev
Log:
CAMEL-1834: Message content sent to exception handler should be re-readable

Added:

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
   (with props)

Added: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java?rev=794368view=auto
==
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
 (added)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
 Wed Jul 15 19:02:36 2009
@@ -0,0 +1,121 @@
+/**
+ * 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.processor;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.IOConverter;
+import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.processor.interceptor.HandleFault;
+
+/**
+ * Test cases for dealing with stream types in an exception handler
+ * 
+ * @version $Revision: 791456 $
+ */
+public class ExceptionHandlerStreamCacheTest extends ContextTestSupport {
+
+private MockEndpoint successEndpoint;
+private MockEndpoint exceptionEndpoint;
+
+public void testSendFault() throws Exception {
+doTestInputStreamPayload(fault);
+}
+
+public void testSendError() throws Exception {
+doTestInputStreamPayload(error);
+}
+
+private void doTestInputStreamPayload(String message) throws 
InterruptedException, IOException {
+successEndpoint.expectedMessageCount(0);
+exceptionEndpoint.expectedMessageCount(1);
+
+template.sendBody(direct:start, new 
ByteArrayInputStream(message.getBytes()));
+
+successEndpoint.assertIsSatisfied();
+exceptionEndpoint.assertIsSatisfied();
+
+InputStream body = (InputStream) 
exceptionEndpoint.getExchanges().get(0).getIn().getBody();
+assertEquals(Ensure message re-readability in the exception handler, 
message, new String(IOConverter.toBytes(body)));
+}
+
+public void testSendFaultXml() throws Exception {
+doTestXmlPayload(fault/);
+}
+
+public void testSendErrorXml() throws Exception {
+doTestXmlPayload(error/);
+}
+
+private void doTestXmlPayload(String xml) throws InterruptedException, 
TransformerException {
+successEndpoint.expectedMessageCount(0);
+exceptionEndpoint.expectedMessageCount(1);
+
+template.sendBody(direct:start, new StreamSource(new 
ByteArrayInputStream(xml.getBytes(;
+
+successEndpoint.assertIsSatisfied();
+exceptionEndpoint.assertIsSatisfied();
+
+StreamSource body = (StreamSource) 
exceptionEndpoint.getExchanges().get(0).getIn().getBody();
+assertEquals(Ensure message re-readability in the exception handler, 
xml, new XmlConverter().toString(body));
+}
+
+@Override
+protected void setUp() throws Exception {
+super.setUp();
+
+exceptionEndpoint = getMockEndpoint(mock:exception);
+successEndpoint = getMockEndpoint(mock:success);
+}
+
+protected RouteBuilder createRouteBuilder() {
+
+return new RouteBuilder() {
+public void configure() {
+
onException(Exception.class).handled(true).to(mock:exception);
+intercept().addInterceptStrategy(new HandleFault());
+
+from(direct:start).process(new Processor() {
+
+public void process(Exchange exchange) throws Exception

svn commit: r794375 - in /camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerSt

[gertv]

Author: gertv
Date: Wed Jul 15 19:37:31 2009
New Revision: 794375

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


  r794368 | gertv | 2009-07-15 21:02:36 +0200 (Wed, 15 Jul 2009) | 1 line
  
  CAMEL-1834: Message content sent to exception handler should be re-readable


Added:

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
  - copied, changed from r794368, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
Modified:
camel/branches/camel-1.x/   (props changed)

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java

Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 15 19:37:31 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368

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

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=794375r1=794374r2=794375view=diff
==
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 Wed Jul 15 19:37:31 2009
@@ -318,6 +318,9 @@
 // must decrement the redelivery counter as we didn't process the 
redelivery but is
 // handling by the failure handler. So we must -1 to not let the 
counter be out-of-sync
 decrementRedeliveryCounter(exchange);
+
+// reset cached streams so they can be read again
+MessageHelper.resetStreamCache(exchange.getIn());
 
 AsyncProcessor afp = 
AsyncProcessorTypeConverter.convert(data.failureProcessor);
 boolean sync = afp.process(exchange, new AsyncCallback() {

Copied: 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel

svn commit: r781747 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Thu Jun  4 14:21:47 2009
New Revision: 781747

URL: http://svn.apache.org/viewvc?rev=781747view=rev
Log:
CAMEL-463: Adding support for onCompletion clause

Added:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Config.scala
  - copied, changed from r781745, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
  - copied, changed from r781745, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
  - copied, changed from r781745, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
  - copied, changed from r781745, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
  - copied, changed from r781745, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
Modified:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala

Copied: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Config.scala
 (from r781745, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Config.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Config.scalap1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scalar1=781745r2=781747rev=781747view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Config.scala
 Thu Jun  4 14:21:47 2009
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
 
-import org.apache.camel.model.RouteDefinition
-import org.apache.camel.scala.dsl.builder.RouteBuilder
+/**
+ * Generic trait to represent a configuration that can be applied to a target
+ */
+trait Config[T] {
 
-case class SRouteDefinition(override val target: RouteDefinition, val builder: 
RouteBuilder) extends SAbstractDefinition[RouteDefinition] {
- 
-  def == : SRouteDefinition = this
+  def configure(target: T)
 
-}
+}
\ No newline at end of file

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=781747r1=781746r2=781747view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Thu Jun  4 14:21:47 2009
@@ -40,9 +40,13 @@
   def loop(expression: Exchange = Any) : SLoopDefinition
   def marshal(format : DataFormatDefinition) : DSL
   def multicast : SMulticastDefinition
-  def otherwise : DSL
+  def otherwise : DSL with Block
+  def onCompletion : SOnCompletionDefinition
+  def onCompletion(predicate: Exchange = Boolean) : SOnCompletionDefinition
+  def onCompletion(config: Config[SOnCompletionDefinition]) : 
SOnCompletionDefinition
   def policy(policy: Policy) : DSL
   def

svn commit: r781748 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Thu Jun  4 14:22:30 2009
New Revision: 781748

URL: http://svn.apache.org/viewvc?rev=781748view=rev
Log:
CAMEL-463: We no longer need the Strategy class in SOnCompletionDefinition

Modified:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala?rev=781748r1=781747r2=781748view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
 Thu Jun  4 14:22:30 2009
@@ -40,7 +40,8 @@
 this
   }
   def minutes = min
-  
-  def valueInMs : Long = target.getExpression().asInstanceOf[Long]
-  def valueInMs_=(period: Long) = target.setExpression(new 
ExpressionDefinition(ExpressionBuilder.constantExpression(period)))
+
+  // we need this to match the valueInMs_= for now, can be removed once Scala 
2.8.0 is out
+  def valueInMs : Long = 0
+  def valueInMs_=(period: Long) = target.delay(period)
 }

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala?rev=781748r1=781747r2=781748view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
 Thu Jun  4 14:22:30 2009
@@ -1,37 +1,35 @@
+/**
+ * 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.scala.dsl
 
 import model.{WhenDefinition,OnCompletionDefinition}
 import org.apache.camel.scala.dsl.builder.RouteBuilder;
 
+/**
+ * Scala enrichment for the Camel OnCompletionDefinition 
+ */
 case class SOnCompletionDefinition(override val target : 
OnCompletionDefinition)(implicit val builder : RouteBuilder) extends 
SAbstractDefinition[OnCompletionDefinition] {
 
-  import 
org.apache.camel.scala.dsl.SOnCompletionDefinition.{Strategy,FailureOnly}
-
   override def when(predicate : Exchange = Boolean) : SOnCompletionDefinition 
= 
 wrap(target.setOnWhen(new WhenDefinition(new ScalaPredicate(predicate
 
-  def strategy(strategy : Strategy) : SOnCompletionDefinition = {
-strategy.applyTo(target)
-this
-  }
-
   def onFailureOnly = wrap(target.onFailureOnly)
   def onCompleteOnly = wrap(target.onCompleteOnly)
 
   override def wrap(block: = Unit) = 
super.wrap(block).asInstanceOf[SOnCompletionDefinition]
 
 }
-
-object SOnCompletionDefinition {
-  
-  abstract class Strategy {
-def applyTo(target: OnCompletionDefinition)
-  }
-  case class FailureOnly extends Strategy {
-def applyTo(target: OnCompletionDefinition) : Unit = target.onFailureOnly
-  }
-  case class CompleteOnly extends Strategy {
-def applyTo(target: OnCompletionDefinition) : Unit = target.onCompleteOnly
-  }
-
-}

Modified: 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala?rev=781748r1=781747r2=781748view=diff
==
--- 
camel/trunk/components/camel-scala/src/test/scala/org

svn commit: r778336 - in /camel/trunk/components/camel-scala: ./ src/main/scala/org/apache/camel/scala/dsl/ src/main/scala/org/apache/camel/scala/dsl/builder/ src/test/scala/org/apache/camel/scala/dsl

[gertv]

Author: gertv
Date: Mon May 25 07:46:54 2009
New Revision: 778336

URL: http://svn.apache.org/viewvc?rev=778336view=rev
Log:
CAMEL-463: Adding a wiretap with body expression to the DSL

Modified:
camel/trunk/components/camel-scala/pom.xml

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala

Modified: camel/trunk/components/camel-scala/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/pom.xml?rev=778336r1=778335r2=778336view=diff
==
--- camel/trunk/components/camel-scala/pom.xml (original)
+++ camel/trunk/components/camel-scala/pom.xml Mon May 25 07:46:54 2009
@@ -29,9 +29,6 @@
   goalcompile/goal
   goaltestCompile/goal
 /goals
-configuration
-  argsarg-Xprint:namer/arg/args
-/configuration
   /execution
 /executions
   /plugin

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=778336r1=778335r2=778336view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Mon May 25 07:46:54 2009
@@ -50,7 +50,10 @@
   def to(uris: String*) : DSL
   def unmarshal(format: DataFormatDefinition) : DSL
   def when(filter: Exchange = Boolean) : SChoiceDefinition
-  def wiretap(uris: String) : DSL
+  
+  def wiretap(uri: String) : DSL
+  def wiretap(uri: String, expression: Exchange = Any) : DSL
+  
   def --(uris: String*) : DSL
 
 }

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=778336r1=778335r2=778336view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 Mon May 25 07:46:54 2009
@@ -101,6 +101,7 @@
   def unmarshal(format: DataFormatDefinition) = wrap(target.unmarshal(format))
   
   def wiretap(uri: String) = wrap(target.wireTap(uri))
+  def wiretap(uri: String, expression: Exchange = Any) = 
wrap(target.wireTap(uri, expression))
   
   def aggregate(expression: Exchange = Any) = 
SAggregateDefinition(target.aggregate(expression))
 

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=778336r1=778335r2=778336view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
 Mon May 25 07:46:54 2009
@@ -92,6 +92,7 @@
   def setheader(name: String, expression: Exchange = Any) = 
stack.top.setheader(name, expression)
   def unmarshal(format: DataFormatDefinition) = stack.top.unmarshal(format)
   def wiretap(uri: String) = stack.top.wiretap(uri)
+  def wiretap(uri: String, expression: Exchange = Any) = 
stack.top.wiretap(uri, expression)
   def aggregate(expression: Exchange = Any) = stack.top.aggregate(expression)
 
   // implementing the Routes interface to allow RouteBuilder to be discovered 
by Spring

Modified: 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala?rev=778336r1=778335r2=778336view=diff
==
--- 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
 Mon May 25 07:46:54 2009
@@ -28,6 +28,9 @@
   def testSimpleTap = doTestWiretap(direct:a, mock:a)
   def

svn commit: r776596 - in /camel/trunk/components/camel-scala: ./ src/main/scala/org/apache/camel/scala/dsl/ src/test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Wed May 20 07:13:19 2009
New Revision: 776596

URL: http://svn.apache.org/viewvc?rev=776596view=rev
Log:
CAMEL-463: Refactoring some classes in the Scala DSL

Added:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Block.scala
  - copied, changed from r776504, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala
Removed:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorDefinition.scala
Modified:
camel/trunk/components/camel-scala/pom.xml

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptFromDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala

Modified: camel/trunk/components/camel-scala/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/pom.xml?rev=776596r1=776595r2=776596view=diff
==
--- camel/trunk/components/camel-scala/pom.xml (original)
+++ camel/trunk/components/camel-scala/pom.xml Wed May 20 07:13:19 2009
@@ -29,6 +29,9 @@
   goalcompile/goal
   goaltestCompile/goal
 /goals
+configuration
+  argsarg-Xprint:namer/arg/args
+/configuration
   /execution
 /executions
   /plugin

Copied: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Block.scala
 (from r776504, 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Block.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Block.scalap1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scalar1=776504r2=776596rev=776596view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Block.scala
 Wed May 20 07:13:19 2009
@@ -14,13 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
 
-import org.apache.camel.model.SplitDefinition
-import org.apache.camel.scala.dsl.builder.RouteBuilder
-
-class SSplitDefinition(val target: SplitDefinition)(implicit val builder: 
RouteBuilder) extends SAbstractDefinition with Wrapper[SplitDefinition] {
+/**
+ * Helper trait to pass a block of code into a DSL instance
+ */
+trait Block {
   
-  val unwrap = target
+  /**
+   * Execute the block of code within the context of the current DSL node
+   * and return the DSL node itself
+   */
+  def apply(block: = Unit) : DSL with Block
 
 }

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl

svn commit: r771724 - in /camel/trunk/platforms/karaf: features/pom.xml pom.xml

[gertv]

Author: gertv
Date: Tue May  5 13:45:39 2009
New Revision: 771724

URL: http://svn.apache.org/viewvc?rev=771724view=rev
Log:
Upgrading to releases bundle versions

Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/pom.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=771724r1=771723r2=771724view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue May  5 13:45:39 2009
@@ -49,7 +49,7 @@
   commons-lang-version2.4/commons-lang-version
   commons-net-version2.0/commons-net-version
   flatpack-bundle-version3.1.1_1/flatpack-bundle-version
-  freemarker-bundle-version2.3.15_1-SNAPSHOT/freemarker-bundle-version
+  freemarker-bundle-version2.3.15_1/freemarker-bundle-version
   geronimo-el-version1.0.1/geronimo-el-version
   geronimo-jaxws-spec-version1.1.2/geronimo-jaxws-spec-version
   geronimo-jsp-version1.0.1/geronimo-jsp-version
@@ -59,21 +59,21 @@
   jackrabbit-version1.5.3/jackrabbit-version
   jaxb-bundle-version2.1.6_1/jaxb-bundle-version
   jexcelapi-bundle-version2.4.2_1/jexcelapi-bundle-version
-  hapi-bundle-version0.5.1_1-SNAPSHOT/hapi-bundle-version
+  hapi-bundle-version0.5.1_1/hapi-bundle-version
   httpcore-bundle-version4.0-alpha6_1/httpcore-bundle-version
   irclib-bundle-version1.10_1/irclib-bundle-version
   isorelax-bundle-version20050913_1/isorelax-bundle-version
   jcr-bundle-version1.0_1/jcr-bundle-version
   jdom-bundle-version1.1_1/jdom-bundle-version
   jettison-bundle-version1.0.1_1/jettison-bundle-version
-  
jetty-cometd-bundle-version6.1.11_1-SNAPSHOT/jetty-cometd-bundle-version
+  jetty-cometd-bundle-version6.1.11_1/jetty-cometd-bundle-version
   jing-bundle-version20030619_1/jing-bundle-version
   jodatime-bundle-version1.5.2_1/jodatime-bundle-version
   josql-bundle-version1.5_1/josql-bundle-version
   jsch-bundle-version0.1.31_1/jsch-bundle-version
   juel-bundle-version2.1.0_1/juel-bundle-version
   junit-bundle-version4.4_1/junit-bundle-version
-  mvel-bundle-version2.0.8_1-SNAPSHOT/mvel-bundle-version
+  mvel-bundle-version2.0.8_1/mvel-bundle-version
   neethi-version2.0.4/neethi-version
   ognl-bundle-version2.7.3_1/ognl-bundle-version
   oscache-bundle-version2.4_1/oscache-bundle-version
@@ -84,10 +84,10 @@
   smack-bundle-version3.0.4_1/smack-bundle-version
   
spring-javaconfig-version1.0.0.BUILD-SNAPSHOT/spring-javaconfig-version
   stringtemplate-bundle-version3.2_1/stringtemplate-bundle-version
-  tagsoup-bundle-version1.2_1-SNAPSHOT/tagsoup-bundle-version
+  tagsoup-bundle-version1.2_1/tagsoup-bundle-version
   velocity-bundle-version1.5_1/velocity-bundle-version
-  xalan-bundle-version2.7.1_1-SNAPSHOT/xalan-bundle-version
-  xerces-bundle-version2.9.1_1-SNAPSHOT/xerces-bundle-version
+  xalan-bundle-version2.7.1_1/xalan-bundle-version
+  xerces-bundle-version2.9.1_1/xerces-bundle-version
   xmlbeans-bundle-version2.4.0_2/xmlbeans-bundle-version
   xmlschema-version1.4.4/xmlschema-version
   xmlsec-bundle-version1.3.0_1/xmlsec-bundle-version

Modified: camel/trunk/platforms/karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=771724r1=771723r2=771724view=diff
==
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Tue May  5 13:45:39 2009
@@ -34,7 +34,6 @@
 nameCamel :: Platforms :: Apache Karaf/name
 
 properties
-  
features-maven-plugin-version1.2-SNAPSHOT/features-maven-plugin-version
   servicemix-kernel-version1.1.0/servicemix-kernel-version
 /properties
 
@@ -81,15 +80,4 @@
   /repository
 /repositories
  
-build
-  pluginManagement 
-plugins
-  plugin
-groupIdorg.apache.servicemix.tooling/groupId
-artifactIdfeatures-maven-plugin/artifactId
-version${features-maven-plugin-version}/version
-  /plugin
-/plugins
-  /pluginManagement
-/build
 /project

svn commit: r769271 - /camel/trunk/tests/camel-itest-osgi/

[gertv]

Author: gertv
Date: Tue Apr 28 07:43:12 2009
New Revision: 769271

URL: http://svn.apache.org/viewvc?rev=769271view=rev
Log:
Adding svn:ignore for tests/camel-itest-osgi

Modified:
camel/trunk/tests/camel-itest-osgi/   (props changed)

Propchange: camel/trunk/tests/camel-itest-osgi/
--
--- svn:ignore (original)
+++ svn:ignore Tue Apr 28 07:43:12 2009
@@ -1 +1,5 @@
 target
+eclipse-classes
+.classpath
+.project
+.settings

svn commit: r769346 - in /camel/trunk: platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml pom.xml

[gertv]

Author: gertv
Date: Tue Apr 28 11:50:52 2009
New Revision: 769346

URL: http://svn.apache.org/viewvc?rev=769346view=rev
Log:
CAMEL-1526: Using resource filtering instead of the generator

Added:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml   
(with props)
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/pom.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=769346r1=769345r2=769346view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Apr 28 11:50:52 2009
@@ -39,17 +39,24 @@
   antlr-bundle-version3.0.1_1/antlr-bundle-version
   asm-bundle-version2.2.3_1/asm-bundle-version
   dom4j-bundle-version1.6_1/dom4j-bundle-version
-  commons-beanutils-version1.7.0_1/commons-beanutils-version
+  
commons-beanutils-bundle-version1.7.0_1/commons-beanutils-bundle-version
   commons-dbcp-bundle-version1.2.2_3/commons-dbcp-bundle-version
-  commons-csv-bundle-version1.0-r706899_1/commons-csv-bundle-version
+  commons-csv-version1.0-r706899_1/commons-csv-version
   
commons-httpclient-bundle-version3.1_1/commons-httpclient-bundle-version
   commons-io-bundle-version1.3.2_1/commons-io-bundle-version
+  commons-jxpath-version1.3/commons-jxpath-version
+  commons-lang-version2.4/commons-lang-version
+  commons-net-version2.0/commons-net-version
   flatpack-bundle-version3.1.1_1/flatpack-bundle-version
   freemarker-bundle-version2.3.15_1-SNAPSHOT/freemarker-bundle-version
   geronimo-el-version1.0.1/geronimo-el-version
+  geronimo-jaxws-spec-version1.1.2/geronimo-jaxws-spec-version
   geronimo-jsp-version1.0.1/geronimo-jsp-version
+  
geronimo-ws-metadata-spec-version1.1.2/geronimo-ws-metadata-spec-version
   hamcrest-bundle-version1.2-dev1_1/hamcrest-bundle-version
   ibatis-bundle-version2.3.4.726_1/ibatis-bundle-version
+  jackrabbit-version1.5.3/jackrabbit-version
+  jaxb-bundle-version2.1.6_1/jaxb-bundle-version
   jexcelapi-bundle-version2.4.2_1/jexcelapi-bundle-version
   hapi-bundle-version0.5.1_1-SNAPSHOT/hapi-bundle-version
   httpcore-bundle-version4.0-alpha6_1/httpcore-bundle-version
@@ -66,6 +73,7 @@
   juel-bundle-version2.1.0_1/juel-bundle-version
   junit-bundle-version4.4_1/junit-bundle-version
   mvel-bundle-version2.0.8_1-SNAPSHOT/mvel-bundle-version
+  neethi-version2.0.4/neethi-version
   ognl-bundle-version2.7.3_1/ognl-bundle-version
   oscache-bundle-version2.4_1/oscache-bundle-version
   quartz-bundle-version1.6.1_1/quartz-bundle-version
@@ -73,12 +81,14 @@
   saxon-bundle-version9.1.0.1_1/saxon-bundle-version
   servicemix-specs-version1.3.0/servicemix-specs-version
   smack-bundle-version3.0.4_1/smack-bundle-version
+  
spring-javaconfig-version1.0.0.BUILD-SNAPSHOT/spring-javaconfig-version
   stringtemplate-bundle-version3.2_1/stringtemplate-bundle-version
   tagsoup-bundle-version1.2_1-SNAPSHOT/tagsoup-bundle-version
   velocity-bundle-version1.5_1/velocity-bundle-version
   xalan-bundle-version2.7.1_1-SNAPSHOT/xalan-bundle-version
   xerces-bundle-version2.9.1_1-SNAPSHOT/xerces-bundle-version
   xmlbeans-bundle-version2.4.0_2/xmlbeans-bundle-version
+  xmlschema-version1.4.4/xmlschema-version
   xmlsec-bundle-version1.3.0_1/xmlsec-bundle-version
   xmlresolver-bundle-version1.2_1/xmlresolver-bundle-version
   xpp3-bundle-version1.1.4c_1/xpp3-bundle-version
@@ -87,65 +97,6 @@
   wsdl4j-bundle-version1.6.1_1/wsdl4j-bundle-version
 /properties
 
-repositories
-  !-- repo for the spring integration jars --
-  repository
-idcom.springsource.repository.bundles.external/id
-nameSpringSource Enterprise Bundle Repository - External Bundle 
Releases/name
-urlhttp://repository.springsource.com/maven/bundles/external/url
-  /repository
-  !-- Spring Java-Config JARs are here --
-  repository
-idcom.springsource.repository.bundles.snapshot/id
-nameSpringSource Enterprise Bundle Repository - SpringSource 
Snapshot Builds/name
-urlhttp://repository.springsource.com/maven/bundles/snapshot/url
-  /repository
-  repository
-idspring.maven.release/id
-nameSpring Release Maven Repo/name
-urlhttp://repository.springsource.com/maven/bundles/release/url
-  /repository
-
-  repository
-iduface.m2/id
-urlhttp://uface.googlecode.com/svn/maven//url
-nameUFace Maven Repository/name
-  /repository
-  repository
-iduface.m2/id
-urlhttp://uface.googlecode.com/svn/maven//url
-nameUFace Maven Repository/name
-  /repository
-
-  !-- TODO we can remove this when the commons

svn commit: r769351 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml pom.xml

[gertv]

Author: gertv
Date: Tue Apr 28 11:59:24 2009
New Revision: 769351

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


  r769346 | gertv | 2009-04-28 13:50:52 +0200 (Tue, 28 Apr 2009) | 1 line
  
  CAMEL-1526: Using resource filtering instead of the generator


Added:

camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
  - copied unchanged from r769346, 
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-1.x/   (props changed)
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
camel/branches/camel-1.x/pom.xml

Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:59:24 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346

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

Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=769351r1=769350r2=769351view=diff
==
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Apr 28 
11:59:24 2009
@@ -39,16 +39,23 @@
   antlr-bundle-version3.0.1_1/antlr-bundle-version
   asm-bundle-version2.2.3_1/asm-bundle-version
   dom4j-bundle-version1.6_1/dom4j-bundle-version
-  commons-beanutils-version1.7.0_1/commons-beanutils-version
+  
commons-beanutils-bundle-version1.7.0_1/commons-beanutils-bundle-version
   commons-dbcp-bundle-version1.2.2_3/commons-dbcp-bundle-version
-  commons-csv-bundle-version1.0-r706899_1/commons-csv-bundle-version
+  commons-csv-version1.0-r706899_1/commons-csv-version
   
commons-httpclient-bundle-version3.1_1/commons-httpclient-bundle-version
   commons-io-bundle-version1.3.2_1/commons-io-bundle-version
+  commons-jxpath-version1.3/commons-jxpath-version
+  commons-lang-version2.4/commons-lang-version
+  commons-net-version2.0/commons-net-version
   flatpack-bundle-version3.1.1_1/flatpack-bundle-version
   geronimo-el-version1.0.1/geronimo-el-version
+  geronimo-jaxws-spec-version1.1.2/geronimo-jaxws-spec-version
   geronimo-jsp-version1.0.1/geronimo-jsp-version
+  
geronimo-ws-metadata-spec-version1.1.2/geronimo-ws-metadata-spec-version
   hamcrest-bundle-version1.2-dev1_1/hamcrest-bundle-version
   ibatis-bundle-version2.3.4.726_1/ibatis-bundle-version
+  jackrabbit-version1.5.3/jackrabbit-version
+  jaxb-bundle-version2.1.6_1/jaxb-bundle-version
   jexcelapi-bundle-version2.4.2_1/jexcelapi-bundle-version
   httpcore-bundle-version4.0-alpha6_1/httpcore-bundle-version
   irclib-bundle-version1.10_1/irclib-bundle-version
@@ -62,6 +69,7 @@
   jsch-bundle-version0.1.31_1/jsch-bundle-version
   juel-bundle-version2.1.0_1/juel-bundle-version
   junit-bundle-version4.4_1/junit-bundle-version
+  neethi-version2.0.4/neethi-version
   ognl-bundle

svn commit: r769368 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/features.xml

[gertv]

Author: gertv
Date: Tue Apr 28 12:29:17 2009
New Revision: 769368

URL: http://svn.apache.org/viewvc?rev=769368view=rev
Log:
CAMEL-1526: Adding a few Spring JARs to allow using the features.xml for 
testing in other containers

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

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=769368r1=769367r2=769368view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Apr 28 12:29:17 2009
@@ -37,6 +37,7 @@
   abdera-bundle-version0.4.0-incubating_1/abdera-bundle-version
   ant-bundle-version1.7.0_1/ant-bundle-version
   antlr-bundle-version3.0.1_1/antlr-bundle-version
+  aopalliance-bundle-version1.0_1/aopalliance-bundle-version
   asm-bundle-version2.2.3_1/asm-bundle-version
   dom4j-bundle-version1.6_1/dom4j-bundle-version
   
commons-beanutils-bundle-version1.7.0_1/commons-beanutils-bundle-version

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=769368r1=769367r2=769368view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue 
Apr 28 12:29:17 2009
@@ -9,6 +9,11 @@
   /feature
   feature name='camel-spring' version='${pom.version}'
 
bundlemvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}/bundle
+
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}/bundle
+bundlemvn:org.springframework/spring-aop/${spring-version}/bundle
+bundlemvn:org.springframework/spring-beans/${spring-version}/bundle
+bundlemvn:org.springframework/spring-core/${spring-version}/bundle
+bundlemvn:org.springframework/spring-context/${spring-version}/bundle
 bundlemvn:org.springframework/spring-tx/${spring-version}/bundle
 feature version='${pom.version}'camel-core/feature
 bundlemvn:org.apache.camel/camel-spring/${pom.version}/bundle

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

[gertv]

Author: gertv
Date: Fri Apr 24 14:05:23 2009
New Revision: 768315

URL: http://svn.apache.org/viewvc?rev=768315view=rev
Log:
CAMEL-1526: Adding features for a few more components

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

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=768315r1=768314r2=768315view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Apr 24 14:05:23 2009
@@ -45,23 +45,27 @@
   
commons-httpclient-bundle-version3.1_1/commons-httpclient-bundle-version
   commons-io-bundle-version1.3.2_1/commons-io-bundle-version
   flatpack-bundle-version3.1.1_1/flatpack-bundle-version
+  freemarker-bundle-version2.3.15_1-SNAPSHOT/freemarker-bundle-version
   geronimo-el-version1.0.1/geronimo-el-version
   geronimo-jsp-version1.0.1/geronimo-jsp-version
   hamcrest-bundle-version1.2-dev1_1/hamcrest-bundle-version
   ibatis-bundle-version2.3.4.726_1/ibatis-bundle-version
   jexcelapi-bundle-version2.4.2_1/jexcelapi-bundle-version
+  hapi-bundle-version0.5.1_1-SNAPSHOT/hapi-bundle-version
   httpcore-bundle-version4.0-alpha6_1/httpcore-bundle-version
   irclib-bundle-version1.10_1/irclib-bundle-version
   isorelax-bundle-version20050913_1/isorelax-bundle-version
   jcr-bundle-version1.0_1/jcr-bundle-version
   jdom-bundle-version1.1_1/jdom-bundle-version
   jettison-bundle-version1.0.1_1/jettison-bundle-version
+  
jetty-cometd-bundle-version6.1.11_1-SNAPSHOT/jetty-cometd-bundle-version
   jing-bundle-version20030619_1/jing-bundle-version
   jodatime-bundle-version1.5.2_1/jodatime-bundle-version
   josql-bundle-version1.5_1/josql-bundle-version
   jsch-bundle-version0.1.31_1/jsch-bundle-version
   juel-bundle-version2.1.0_1/juel-bundle-version
   junit-bundle-version4.4_1/junit-bundle-version
+  mvel-bundle-version2.0.8_1-SNAPSHOT/mvel-bundle-version
   ognl-bundle-version2.7.3_1/ognl-bundle-version
   oscache-bundle-version2.4_1/oscache-bundle-version
   quartz-bundle-version1.6.1_1/quartz-bundle-version
@@ -70,7 +74,10 @@
   servicemix-specs-version1.3.0/servicemix-specs-version
   smack-bundle-version3.0.4_1/smack-bundle-version
   stringtemplate-bundle-version3.2_1/stringtemplate-bundle-version
+  tagsoup-bundle-version1.2_1-SNAPSHOT/tagsoup-bundle-version
   velocity-bundle-version1.5_1/velocity-bundle-version
+  xalan-bundle-version2.7.1_1-SNAPSHOT/xalan-bundle-version
+  xerces-bundle-version2.9.1_1-SNAPSHOT/xerces-bundle-version
   xmlbeans-bundle-version2.4.0_2/xmlbeans-bundle-version
   xmlsec-bundle-version1.3.0_1/xmlsec-bundle-version
   xmlresolver-bundle-version1.2_1/xmlresolver-bundle-version
@@ -239,6 +246,14 @@
  /dependency
  dependency
groupIdorg.apache.camel/groupId
+   artifactIdcamel-bindy/artifactId
+ /dependency
+ dependency
+   groupIdorg.apache.camel/groupId
+   artifactIdcamel-cometd/artifactId
+ /dependency
+ dependency
+   groupIdorg.apache.camel/groupId
artifactIdcamel-csv/artifactId
version${pom.version}/version
  /dependency
@@ -249,11 +264,21 @@
  /dependency
  dependency
groupIdorg.apache.camel/groupId
+   artifactIdcamel-freemarker/artifactId
+   version${pom.version}/version
+ /dependency
+ dependency
+   groupIdorg.apache.camel/groupId
artifactIdcamel-ftp/artifactId
version${pom.version}/version
  /dependency
  dependency
groupIdorg.apache.camel/groupId
+   artifactIdcamel-guice/artifactId
+   version${pom.version}/version
+ /dependency
+ dependency
+   groupIdorg.apache.camel/groupId
artifactIdcamel-groovy/artifactId
version${pom.version}/version
  /dependency
@@ -264,6 +289,11 @@
  /dependency
  dependency
groupIdorg.apache.camel/groupId
+   artifactIdcamel-hl7/artifactId
+   version${pom.version}/version
+ /dependency
+ dependency
+   groupIdorg.apache.camel/groupId
artifactIdcamel-ibatis/artifactId
version${pom.version}/version
  /dependency
@@ -327,10 +357,9 @@
artifactIdcamel-jpa/artifactId
version${pom.version}/version
  /dependency
- !-- Moved quartz before mail to have commons-collections 
auto-discovered, cfr. SMX4KNL-260 --
  dependency
groupIdorg.apache.camel/groupId
-   artifactIdcamel-quartz/artifactId
+   artifactIdcamel-ldap/artifactId
version${pom.version}/version
  /dependency
  dependency
@@ -345,16 +374,34 @@
  /dependency
  dependency
groupIdorg.apache.camel/groupId

svn commit: r766673 - /camel/trunk/platforms/karaf/pom.xml

[gertv]

Author: gertv
Date: Mon Apr 20 12:48:13 2009
New Revision: 766673

URL: http://svn.apache.org/viewvc?rev=766673view=rev
Log:
CAMEL-1526: Adding Spring milestone repo

Modified:
camel/trunk/platforms/karaf/pom.xml

Modified: camel/trunk/platforms/karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=766673r1=766672r2=766673view=diff
==
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Mon Apr 20 12:48:13 2009
@@ -66,6 +66,19 @@
   enabledfalse/enabled
 /snapshots
   /repository
+
+  !-- Spring milestone repo --
+  repository
+idspring-milestone/id
+nameSpring Portfolio Milestone Repository/name
+urlhttp://s3.amazonaws.com/maven.springframework.org/milestone/url
+releases
+  enabledtrue/enabled
+/releases
+snapshots
+  enabledfalse/enabled
+/snapshots
+  /repository
 /repositories
  
 build

svn commit: r766683 - in /camel/branches/camel-1.x: ./ platforms/karaf/pom.xml

[gertv]

Author: gertv
Date: Mon Apr 20 13:05:46 2009
New Revision: 766683

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


  r766673 | gertv | 2009-04-20 14:48:13 +0200 (Mon, 20 Apr 2009) | 1 line
  
  CAMEL-1526: Adding Spring milestone repo


Modified:
camel/branches/camel-1.x/   (props changed)
camel/branches/camel-1.x/platforms/karaf/pom.xml

Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 20 13:05:46 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673

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

Modified: camel/branches/camel-1.x/platforms/karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/pom.xml?rev=766683r1=766682r2=766683view=diff
==
--- camel/branches/camel-1.x/platforms/karaf/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/pom.xml Mon Apr 20 13:05:46 2009
@@ -66,6 +66,19 @@
   enabledfalse/enabled
 /snapshots
   /repository
+
+  !-- Spring milestone repo --
+  repository
+idspring-milestone/id
+nameSpring Portfolio Milestone Repository/name
+urlhttp://s3.amazonaws.com/maven.springframework.org/milestone/url
+releases
+  enabledtrue/enabled
+/releases
+snapshots
+  enabledfalse/enabled
+/snapshots
+  /repository
 /repositories
  
 build

svn commit: r766098 - in /camel/trunk/platforms/karaf: features/pom.xml pom.xml

[gertv]

Author: gertv
Date: Fri Apr 17 17:47:07 2009
New Revision: 766098

URL: http://svn.apache.org/viewvc?rev=766098view=rev
Log:
CAMEL-1526: Adding snapshot plugin repo and the servicemix repo

Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/pom.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=766098r1=766097r2=766098view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Apr 17 17:47:07 2009
@@ -82,29 +82,48 @@
 
 repositories
   !-- repo for the spring integration jars --
-repository
-  idcom.springsource.repository.bundles.external/id
-  nameSpringSource Enterprise Bundle Repository - External Bundle 
Releases/name
-  urlhttp://repository.springsource.com/maven/bundles/external/url
-/repository
-repository
-  iduface.m2/id
-  urlhttp://uface.googlecode.com/svn/maven//url
-  nameUFace Maven Repository/name
-/repository
+  repository
+idcom.springsource.repository.bundles.external/id
+nameSpringSource Enterprise Bundle Repository - External Bundle 
Releases/name
+urlhttp://repository.springsource.com/maven/bundles/external/url
+  /repository
+  repository
+iduface.m2/id
+urlhttp://uface.googlecode.com/svn/maven//url
+nameUFace Maven Repository/name
+  /repository
+  repository
+iduface.m2/id
+urlhttp://uface.googlecode.com/svn/maven//url
+nameUFace Maven Repository/name
+  /repository
+
+  !-- TODO we can remove this when the commons-csv release syncs to the 
main repo --
+  repository
+idopen.iona.m2/id
+nameIONA Open Source Community Release Repository/name
+urlhttp://repo.open.iona.com/maven2/url
+snapshots
+  enabledtrue/enabled
+/snapshots
+releases
+  enabledtrue/enabled
+/releases
+  /repository
+
+  !-- holds the Scala bundle --
+  repository
+  idservicemix-m2-repo/id
+  nameServicemix Maven2 Repository/name
+  urlhttp://svn.apache.org/repos/asf/servicemix/m2-repo//url
+  releases
+  enabledtrue/enabled
+  /releases
+  snapshots
+  enabledfalse/enabled
+  /snapshots
+  /repository
 
-!-- TODO we can remove this when the commons-csv release syncs to the 
main repo --
-repository
-  idopen.iona.m2/id
-  nameIONA Open Source Community Release Repository/name
-  urlhttp://repo.open.iona.com/maven2/url
-  snapshots
-enabledtrue/enabled
-  /snapshots
-  releases
-enabledtrue/enabled
-  /releases
-/repository
 
 /repositories
 

Modified: camel/trunk/platforms/karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=766098r1=766097r2=766098view=diff
==
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Fri Apr 17 17:47:07 2009
@@ -41,6 +41,17 @@
 modules
   modulefeatures/module
 /modules
+
+pluginRepositories
+  pluginRepository
+snapshots
+  enabledtrue/enabled
+/snapshots
+idapache.snapshots/id
+nameApache Snapshot Repository/name
+urlhttp://repository.apache.org/snapshots/url
+  /pluginRepository
+/pluginRepositories
  
 build
   pluginManagement 

svn commit: r759156 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Fri Mar 27 14:41:34 2009
New Revision: 759156

URL: http://svn.apache.org/viewvc?rev=759156view=rev
Log:
CAMEL-463: Add support for intercept() to the Scala DSL

Added:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptorTest.scala
Modified:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=759156r1=759155r2=759156view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Fri Mar 27 14:41:34 2009
@@ -32,6 +32,7 @@
   def idempotentconsumer(expression: Exchange = Any): 
SIdempotentConsumerDefinition
   def inOnly(): SProcessorDefinition
   def inOut(): SProcessorDefinition
+  def intercept(expression: Exchange = Boolean) : SInterceptDefinition
   def loadbalance : SLoadBalanceDefinition
   def loop(expression: Exchange = Any) : SLoopDefinition
   def marshal(format : DataFormatDefinition) : DSL

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=759156r1=759155r2=759156view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 Fri Mar 27 14:41:34 2009
@@ -81,6 +81,12 @@
   
   def inOnly = new 
SProcessorDefinition(target.inOnly.asInstanceOf[RawProcessorDefinition])
   def inOut = new 
SProcessorDefinition(target.inOut.asInstanceOf[RawProcessorDefinition])
+  
+  def intercept(expression: Exchange = Boolean) = {
+  val intercept = target.intercept
+  intercept.when(new ScalaPredicate(expression))
+  new SInterceptDefinition(intercept)
+  }
  
   def loop(expression: Exchange = Any) = new 
SLoopDefinition(target.loop(expression))
   

Added: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala?rev=759156view=auto
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala
 (added)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SInterceptDefinition.scala
 Fri Mar 27 14:41:34 2009
@@ -0,0 +1,37 @@
+/**
+ * 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.scala.dsl;
+
+import org.apache.camel.model.InterceptDefinition
+import org.apache.camel.scala.dsl.builder.RouteBuilder
+
+/**
+ * Scala enrichment for Camel's IdempotentConsumerDefinition
+ */
+class SInterceptDefinition(val target: InterceptDefinition)(implicit val 
builder: RouteBuilder) extends SAbstractDefinition with 
Wrapper[InterceptDefinition] {
+  
+  val unwrap = target
+  
+  override def apply(block: = Unit) : SInterceptDefinition = {
+builder.build(this, block)
+this
+  }
+  
+  def stop =  {
+target.setStopIntercept(true)
+  }   
+}

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: 
http://svn.apache.org/viewvc/camel

svn commit: r754660 - in /camel/trunk/components: camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.

[gertv]

Author: gertv
Date: Sun Mar 15 12:23:32 2009
New Revision: 754660

URL: http://svn.apache.org/viewvc?rev=754660view=rev
Log:
CAMEL-1458: Fix camel-jcr and camel-scala unit tests

Modified:

camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala

Modified: 
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java?rev=754660r1=754659r2=754660view=diff
==
--- 
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
 (original)
+++ 
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
 Sun Mar 15 12:23:32 2009
@@ -22,7 +22,8 @@
 
 import junit.framework.TestCase;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.DefaultFactoryFinder;
+import org.apache.camel.impl.DefaultClassResolver;
+import org.apache.camel.impl.DefaultFactoryFinderResolver;
 import org.apache.camel.impl.DefaultPackageScanClassResolver;
 import org.apache.camel.impl.converter.DefaultTypeConverter;
 import org.apache.camel.util.ReflectionInjector;
@@ -37,7 +38,7 @@
 public class JcrConverterTest extends TestCase {
 
 protected TypeConverter converter = new DefaultTypeConverter(new 
DefaultPackageScanClassResolver(),
-new ReflectionInjector(), new DefaultFactoryFinder());
+new ReflectionInjector(), new 
DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new 
DefaultClassResolver()));
 
 public void testBooleanValueConverter() throws Exception {
 assertJcrConverterAvailable(BooleanValue.class, Boolean.TRUE);

Modified: 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala?rev=754660r1=754659r2=754660view=diff
==
--- 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
 Sun Mar 15 12:23:32 2009
@@ -19,7 +19,8 @@
 import junit.framework.TestCase
 import junit.framework.Assert._
 
-import org.apache.camel.impl.DefaultFactoryFinder
+import org.apache.camel.impl.DefaultClassResolver
+import org.apache.camel.impl.DefaultFactoryFinderResolver
 import org.apache.camel.impl.DefaultPackageScanClassResolver
 import org.apache.camel.impl.converter.DefaultTypeConverter
 import org.apache.camel.util.ReflectionInjector
@@ -32,7 +33,7 @@
 class ScalaTypeConverterTest extends TestCase {
   
   val converter = new DefaultTypeConverter(new 
DefaultPackageScanClassResolver(),
-  new ReflectionInjector(), new DefaultFactoryFinder())
+  new ReflectionInjector(), new 
DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new 
DefaultClassResolver()))
   
   def testDocumentConverter = {
 val result = converter.convertTo(classOf[Document], persons/)

svn commit: r753013 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java

[gertv]

Author: gertv
Date: Thu Mar 12 20:53:55 2009
New Revision: 753013

URL: http://svn.apache.org/viewvc?rev=753013view=rev
Log:
Fixing SNIPPET comment (how did I manage to mess up a 4-line, comment-only 
commit?)

Modified:

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java?rev=753013r1=753012r2=753013view=diff
==
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
 Thu Mar 12 20:53:55 2009
@@ -118,13 +118,13 @@
 //Stream caching for a single route...
 //START SNIPPET: route
 from(direct:a).streamCaching().to(mock:a);
-//END SNIPPET
+//END SNIPPET: route
 
 //... or for all the following routes in this builder
 //START SNIPPET: routebuilder
 streamCaching();
 from(direct:b).to(mock:b);
-//END SNIPPET
+//END SNIPPET: routebuilder
 }
 };
 }

svn commit: r749299 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/builder/ main/scala/org/apache/camel/scala/dsl/languages/ test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Mon Mar  2 13:24:55 2009
New Revision: 749299

URL: http://svn.apache.org/viewvc?rev=749299view=rev
Log:
CAMEL-463: Adding support for the other languages in a single trait

Added:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
Removed:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/El.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
Modified:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=749299r1=749298r2=749299view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
 Mon Mar  2 13:24:55 2009
@@ -25,10 +25,12 @@
 
 import org.apache.camel.scala.dsl._
 
+import org.apache.camel.scala.dsl.languages.Languages
+
 /**
  * Scala RouteBuilder implementation
  */
-class RouteBuilder extends Preamble with DSL with Routes {
+class RouteBuilder extends Preamble with DSL with Routes with Languages {
 
   val builder = new org.apache.camel.builder.RouteBuilder {
 override def configure() =  {}

Added: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala?rev=749299view=auto
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
 (added)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
 Mon Mar  2 13:24:55 2009
@@ -0,0 +1,68 @@
+/**
+ * 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.scala.dsl.languages
+
+/**
+ * Trait to support the different expression languages available in Camel 
+ */
+trait Languages {
+  
+  /**
+   * Implicitly make a method for every language available on the Camel 
Exchange
+   */
+  implicit def addLanguageMethodsToExchange(exchange: Exchange) = new {
+def el(expression: String) = Languages.this.el(expression)(exchange)
+def groovy(expression: String) = 
Languages.this.groovy(expression)(exchange)
+def jxpath(expression: String) = 
Languages.this.jxpath(expression)(exchange)
+def mvel(expression: String) =   Languages.this.mvel(expression)(exchange)
+def ognl(expression: String) =   Languages.this.ognl(expression)(exchange) 
+def php(expression: String) =Languages.this.php(expression)(exchange)
+def python(expression: String) = 
Languages.this.python(expression)(exchange)
+def ruby(expression: String) =   Languages.this.ruby(expression)(exchange)
+def simple(expression: String) = 
Languages.this.simple(expression)(exchange)
+def sql(expression: String) =Languages.this.sql(expression)(exchange)
+def xpath(expression: String) =  Languages.this.xpath(expression)(exchange)
+def xquery(expression: String) = 
Languages.this.xquery(expression)(exchange)
+  }
+  
+  // a set of methods to allow direct use

svn commit: r743113 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/scala/org/apache/camel/scala/dsl/

[gertv]

Author: gertv
Date: Tue Feb 10 21:40:37 2009
New Revision: 743113

URL: http://svn.apache.org/viewvc?rev=743113view=rev
Log:
CAMEL-463: Adding support for setting the MEP from the DSL

Added:

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala
Modified:

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala

camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala

camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=743113r1=743112r2=743113view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Tue Feb 10 21:40:37 2009
@@ -23,28 +23,30 @@
  */
 trait DSL {
   
+  def aggregate(expression: Exchange = Any) : SAggregatorType
+  def as[Target](toType: Class[Target]) : DSL
   def attempt : STryType
   def bean(bean: Any) : DSL
   def choice : SChoiceType
-  def --(uris: String*) : DSL
-  def to(uris: String*) : DSL
-  def when(filter: Exchange = Boolean) : SChoiceType
-  def as[Target](toType: Class[Target]) : DSL
-  def recipients(expression: Exchange = Any) : DSL
-  def splitter(expression: Exchange = Any) : SSplitterType
-  def otherwise : DSL
+  def delay(delay: Period) : SDelayerType
+  def idempotentconsumer(expression: Exchange = Any): SIdempotentConsumerType
+  def inOnly(): SProcessorType
+  def inOut(): SProcessorType
+  def loadbalance : SLoadBalanceType
   def marshal(format : DataFormatType) : DSL
   def multicast : SMulticastType
+  def otherwise : DSL
   def process(function: Exchange = Unit) : DSL
-  def throttle(frequency: Frequency) : SThrottlerType
-  def loadbalance : SLoadBalanceType
-  def delay(delay: Period) : SDelayerType
+  def recipients(expression: Exchange = Any) : DSL
   def resequence(expression: Exchange = Any) : SResequencerType
   def setbody(expression: Exchange = Any) : DSL
   def setheader(header: String, expression: Exchange = Any) : DSL
+  def splitter(expression: Exchange = Any) : SSplitterType
   def thread(number: Int) : SThreadType
+  def throttle(frequency: Frequency) : SThrottlerType
+  def to(uris: String*) : DSL
   def unmarshal(format: DataFormatType) : DSL
-  def aggregate(expression: Exchange = Any) : SAggregatorType
-  def idempotentconsumer(expression: Exchange = Any): SIdempotentConsumerType
+  def when(filter: Exchange = Boolean) : SChoiceType
+  def --(uris: String*) : DSL
 
 }

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala?rev=743113r1=743112r2=743113view=diff
==
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
 Tue Feb 10 21:40:37 2009
@@ -27,6 +27,8 @@
 
 abstract class SAbstractType extends DSL {
   
+  type RawProcessorType = ProcessorType[P] forSome {type P}
+  
   val target : ProcessorType[T] forSome {type T}
   implicit val builder: RouteBuilder
   implicit def expressionBuilder(expression: Exchange = Any) = new 
ScalaExpression(expression)
@@ -48,7 +50,7 @@
 
   def as[Target](toType: Class[Target]) = {
 target.convertBodyTo(toType)
-new SProcessorType(target.asInstanceOf[ProcessorType[P] forSome {type P}])
+new SProcessorType(target.asInstanceOf[RawProcessorType])
   }
   
   def attempt : STryType = new STryType(target.tryBlock)
@@ -57,7 +59,7 @@
 new SSplitterType(target.split(expression))
 
   def recipients(expression: Exchange = Any) = 
-new 
SProcessorType(target.recipientList(expression).asInstanceOf[ProcessorType[P] 
forSome {type P}])
+new 
SProcessorType(target.recipientList(expression).asInstanceOf[RawProcessorType])
 
   def apply(block: = Unit) = {
 builder.build(this, block)
@@ -65,9 +67,9 @@
   }
 
   def bean(bean: Any) = bean match {
-case cls: Class[_] = new 
SProcessorType(target.bean(cls).asInstanceOf[ProcessorType[P] forSome {type P}])
-case ref: String = new 
SProcessorType(target.beanRef(ref).asInstanceOf[ProcessorType[P] forSome {type 
P}])
-case obj: Any = new 
SProcessorType(target.bean(obj).asInstanceOf

svn commit: r740251 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/builder/ main/java/org/apache/camel/processor/ main/java/org/apache/camel/processor/interceptor/ main/java/org/apache/c

[gertv]

Author: gertv
Date: Tue Feb  3 09:16:53 2009
New Revision: 740251

URL: http://svn.apache.org/viewvc?rev=740251view=rev
Log:
CAMEL-1271/CAMEL-520: Enable stream caching as an InterceptStrategy

Added:

camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
   (with props)

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingTest.java
   (with props)

camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
   (with props)
Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java

camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java

camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java

camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java

camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java

camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamSourceContentBasedRouterTest.java

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThreadTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=740251r1=740250r2=740251view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
 Tue Feb  3 09:16:53 2009
@@ -25,6 +25,7 @@
 import org.apache.camel.processor.RecipientList;
 import org.apache.camel.processor.RedeliveryPolicy;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.processor.interceptor.StreamCaching;
 import org.apache.camel.spi.RouteContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -66,6 +67,7 @@
 public Processor createErrorHandler(RouteContext routeContext, Processor 
processor) throws Exception {
 Processor deadLetter = getDeadLetterFactory().createProcessor();
 DeadLetterChannel answer = new DeadLetterChannel(processor, 
deadLetter, onRedelivery, getRedeliveryPolicy(), getLogger(), 
getExceptionPolicyStrategy());
+StreamCaching.enable(routeContext);
 configure(answer);
 return answer;
 }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=740251r1=740250r2=740251view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 Tue Feb  3 09:16:53 2009
@@ -31,6 +31,7 @@
 import org.apache.camel.model.LoggingLevel;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
 import org.apache.camel.util.AsyncProcessorHelper;
+import org.apache.camel.util.MessageHelper;
 import org.apache.camel.util.ServiceHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -175,6 +176,9 @@
 exchange.setException(null);
 }
 
+// reset cached streams so they can be read again
+MessageHelper.resetStreamCache(exchange.getIn());
+
 // wait until we should redeliver
 data.redeliveryDelay = 
data.currentRedeliveryPolicy.sleep(data.redeliveryDelay);
 

Added: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java?rev=740251view=auto
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
 (added)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
 Tue Feb  3 09:16:53 2009
@@ -0,0 +1,57 @@
+/**
+ * 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

svn commit: r740263 - in /camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/main/java/org/apache/camel

[gertv]

Author: gertv
Date: Tue Feb  3 10:15:34 2009
New Revision: 740263

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


  r740251 | gertv | 2009-02-03 10:16:53 +0100 (Tue, 03 Feb 2009) | 1 line
  
  CAMEL-1271/CAMEL-520: Enable stream caching as an InterceptStrategy


Added:

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
  - copied, changed from r740251, 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
   (with props)

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingTest.java
  - copied unchanged from r740251, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingTest.java

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
  - copied unchanged from r740251, 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
Modified:
camel/branches/camel-1.x/   (props changed)

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java

camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/StreamSourceContentBasedRouterTest.java

camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThreadTest.java

Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  3 10:15:34 2009
@@ -1 +1 @@
-/camel/trunk:739733,739904
+/camel/trunk:739733,739904,740251

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

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=740263r1=740262r2=740263view=diff
==
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
 Tue Feb  3 10:15:34 2009
@@ -25,6 +25,7 @@
 import org.apache.camel.processor.RecipientList;
 import org.apache.camel.processor.RedeliveryPolicy;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.processor.interceptor.StreamCaching;
 import org.apache.camel.spi.RouteContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -66,6 +67,7 @@
 public Processor createErrorHandler(RouteContext routeContext, Processor 
processor) throws Exception {
 Processor deadLetter = getDeadLetterFactory().createProcessor();
 DeadLetterChannel answer = new DeadLetterChannel(processor, 
deadLetter, onRedelivery, getRedeliveryPolicy(), getLogger(), 
getExceptionPolicyStrategy());
+StreamCaching.enable(routeContext);
 configure(answer);
 return answer;
 }

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=740263r1=740262r2=740263view=diff
==
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
 Tue Feb  3 10:15:34 2009
@@ -31,6 +31,7 @@
 import org.apache.camel.model.LoggingLevel;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
 import org.apache.camel.util.AsyncProcessorHelper;
+import org.apache.camel.util.MessageHelper;
 import

svn commit: r735859 - /camel/branches/camel-1.x/

[gertv]

Author: gertv
Date: Mon Jan 19 14:41:59 2009
New Revision: 735859

URL: http://svn.apache.org/viewvc?rev=735859view=rev
Log:
Changing svnmerge URL after repo move

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

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