camel git commit: Checkstyle fix
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
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=;");
+}
+});
+
+assertExchange(exchange);
+}
+
@Override
camel git commit: CAMEL-9442: Query string gets decoded when bridging netty-http to http4
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,
"http://host:8080/";);
+exchange.getIn().
camel git commit: CAMEL-9442: Query string gets decoded when bridging netty-http to http4
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,
"http://host:8080/";);
+exchange.getIn().setHeader(Ex
camel git commit: CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer
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
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClie
camel git commit: CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer
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
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClie
camel git commit: CAMEL-9366: skipFaultLogging attribute does not work on Spring rsClient/rsServer
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
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBea
camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter
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
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/Dyn
camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter
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
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/Dyn
camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter
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
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterCo
camel git commit: CAMEL-9269: NotifyBuilder.fromRoute() does not work for some endpoint types
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);
+}
+
+}
+
+private static final class ProxyEndpoint extends
camel git commit: CAMEL-9269: NotifyBuilder.fromRoute() does not work for some endpoint types
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);
+}
+
+}
+
+private static final class ProxyEndpo
svn commit: r1345135 - in /camel/branches/camel-2.8.x: ./ platforms/karaf/features/pom.xml
Author: gertv Date: Fri Jun 1 12:46:45 2012 New Revision: 1345135 URL: http://svn.apache.org/viewvc?rev=1345135&view=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=1345135&r1=1345134&r2=1345135&view=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 @@ 1.1.1 1.1 2.0_2 - 0.20.203.0_1 + 0.20.203.0_2 0.5.1_5 4.1.0.Final_2 4.0-alpha6_1
svn commit: r1345131 - /camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml
Author: gertv Date: Fri Jun 1 12:40:50 2012 New Revision: 1345131 URL: http://svn.apache.org/viewvc?rev=1345131&view=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=1345131&r1=1345130&r2=1345131&view=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 @@ 1.1.1 1.1 2.0_2 - 0.20.203.0_1 + 0.20.203.0_2 0.5.1_5 4.1.0.Final_3 2.3.4.726_4
svn commit: r1169620 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: gertv
Date: Mon Sep 12 07:05:04 2011
New Revision: 1169620
URL: http://svn.apache.org/viewvc?rev=1169620&view=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=1169620&r1=1169619&r2=1169620&view=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 @@
camel-core
+mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}
mvn:org.apache.camel/camel-restlet/${pom.version}
-
mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}
camel-core
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
Author: gertv
Date: Thu Aug 18 11:29:19 2011
New Revision: 1159171
URL: http://svn.apache.org/viewvc?rev=1159171&view=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=1159171&r1=1159170&r2=1159171&view=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=1159171&r1=1159170&r2=1159171&view=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=1159171&view=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 req
svn commit: r1068934 - in /camel/trunk/platforms/karaf: features/pom.xml features/src/main/resources/features.xml pom.xml
Author: gertv
Date: Wed Feb 9 15:21:19 2011
New Revision: 1068934
URL: http://svn.apache.org/viewvc?rev=1068934&view=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=1068934&r1=1068933&r2=1068934&view=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 @@
-
- org.osgi
- org.osgi.core
- 4.2.0
- provided
-
+
+org.osgi
+org.osgi.core
+4.2.0
+provided
+
org.ops4j.pax.logging
pax-logging-api
@@ -218,4 +218,39 @@
+
+
+ validate
+
+
+
+ org.apache.karaf.tooling
+ features-maven-plugin
+ ${karaf-version}
+
+
${project.build.directory}/classes/${features.file}
+
${project.build.directory}/classes/config.properties
+
+
+
+ validate
+ process-resources
+
+ validate
+
+
+
+
+
+ org.slf4j
+ slf4j-simple
+ 1.4.3
+
+
+
+
+
+
+
+
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=1068934&r1=1068933&r2=1068934&view=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 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}
-mvn:javax.mail/mail/${javax-mail-version}
+
mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}
@@ -330,7 +330,7 @@
mvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}
mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}
mvn:org.apache.camel/camel-hawtdb/${pom.version}
-
+
camel-spring
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
@@ -455,7 +455,7 @@
mvn:org.springframework/spring-context/${spring-version}
mvn:org.springframework/spring-context-support/${spring-version}
-mvn:javax.mail/mail/${javax-mail-version}
+
mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}
camel-core
mvn:org.apache.camel/camel-mail/${pom.version}
@@ -473,7 +473,7 @@
mvn:org.apache.camel/camel-mvel/${pom.version}
-camel-core
+camel-core
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-bundle-version}
mvn:org.apache.camel/camel-nagios/${pom.version}
@@ -481,7 +481,7 @@
camel-core
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-version}
mvn:org.apache.camel/camel-netty/${pom.version}
-
+
camel-core
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}
@@ -564,9 +564,9 @@
camel-core
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.shiro/${shiro-bundle-version}
- mvn:org.apache.cam
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/
Author: gertv
Date: Mon Oct 11 11:14:57 2010
New Revision: 1021306
URL: http://svn.apache.org/viewvc?rev=1021306&view=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=1021306&r1=1021305&r2=1021306&view=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=1021306&view=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=1021306&r1=1021305&r2=1021306&view=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, s
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
Author: gertv
Date: Mon Oct 11 11:14:30 2010
New Revision: 1021305
URL: http://svn.apache.org/viewvc?rev=1021305&view=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=1021305&r1=1021304&r2=1021305&view=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=1021305&r1=1021304&r2=1021305&view=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=1021305&r1=1021304&r2=1021305&view=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=1021305&r1=1021304&r2=1021305&view=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/d
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
Author: gertv
Date: Mon Oct 11 11:13:59 2010
New Revision: 1021302
URL: http://svn.apache.org/viewvc?rev=1021302&view=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=1021302&r1=1021301&r2=1021302&view=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.
*
* 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.
*
* 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.
*
* 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.
*
* 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.
*
* 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.
*
* The timeout controls which operation to use on {...@link
org.apache.camel.PollingConsumer}.
* If timeout is negative, we use receive. If timeout is 0 then
we use receiveNoWait
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=1021302&r1=1021301&r2=1021302&view=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=1021302&r1=1021301&r2=1021302&view=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)
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
Author: gertv Date: Tue Jun 22 20:19:58 2010 New Revision: 957013 URL: http://svn.apache.org/viewvc?rev=957013&view=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/s
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
Author: gertv
Date: Wed Mar 31 13:40:48 2010
New Revision: 929537
URL: http://svn.apache.org/viewvc?rev=929537&view=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=929537&r1=929536&r2=929537&view=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=929537&view=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:
svn commit: r907982 - /camel/scripts/check_camel_release.sh
Author: gertv
Date: Tue Feb 9 09:24:45 2010
New Revision: 907982
URL: http://svn.apache.org/viewvc?rev=907982&view=rev
Log:
Adding a script to validate signatures/hashes on a staged release
Added:
camel/scripts/check_camel_release.sh (with props)
Added: camel/scripts/check_camel_release.sh
URL:
http://svn.apache.org/viewvc/camel/scripts/check_camel_release.sh?rev=907982&view=auto
==
--- camel/scripts/check_camel_release.sh (added)
+++ camel/scripts/check_camel_release.sh Tue Feb 9 09:24:45 2010
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+STAGING=${1}
+DOWNLOAD=${2:-/tmp/camel-staging}
+mkdir ${DOWNLOAD} 2>/dev/null
+
+# The following code automatically imports the signing KEYS, but it may
actually be
+# better to download them from a key server and/or let the user choose what
keys
+# he wants to import.
+wget --no-check-certificate -P "${DOWNLOAD}"
http://www.apache.org/dist/camel/apache-camel/KEYS
+gpg --import "${DOWNLOAD}/KEYS"
+
+if [ -z "${STAGING}" -o ! -d "${DOWNLOAD}" ]
+then
+ echo "Usage: check_staged_release.sh [temp-directory]"
+ exit
+fi
+
+if [ ! -e "${DOWNLOAD}/${STAGING}" ]
+then
+ echo
""
+ echo " DOWNLOAD STAGED REPOSITORY
"
+ echo
""
+
+ wget \
+ -r -np "--reject=html,txt" "--follow-tags=" \
+ -P "${DOWNLOAD}/${STAGING}" -nH "--cut-dirs=3" --ignore-length
--no-check-certificate \
+
"http://repository.apache.org/content/repositories/orgapachecamel-${STAGING}/org/apache/camel/";
+
+else
+ echo
""
+ echo " USING EXISTING STAGED REPOSITORY
"
+ echo
""
+ echo "${DOWNLOAD}/${STAGING}"
+fi
+
+echo
""
+echo " CHECK SIGNATURES AND DIGESTS
"
+echo
""
+
+for i in `find "${DOWNLOAD}/${STAGING}" -type f | grep -v
'\.\(asc\|sha1\|md5\)$'`
+do
+ f=`echo $i | sed 's/\.asc$//'`
+ echo "$f"
+ gpg --verify $f.asc 2>/dev/null
+ if [ "$?" = "0" ]; then CHKSUM="GOOD"; else CHKSUM="BAD"; fi
+ if [ ! -f "$f.asc" ]; then CHKSUM=""; fi
+ echo "gpg: ${CHKSUM}"
+ if [ "`cat $f.md5 2>/dev/null`" = "`openssl md5 < $f 2>/dev/null`" ]; then
CHKSUM="GOOD"; else CHKSUM="BAD"; fi
+ if [ ! -f "$f.md5" ]; then CHKSUM=""; fi
+ echo "md5: ${CHKSUM}"
+ if [ "`cat $f.sha1 2>/dev/null`" = "`openssl sha1 < $f 2>/dev/null`" ]; then
CHKSUM="GOOD"; else CHKSUM="BAD"; fi
+ if [ ! -f "$f.sha1" ]; then CHKSUM=""; fi
+ echo "sha1: ${CHKSUM}"
+done
+
+if [ -z "${CHKSUM}" ]; then echo "WARNING: no files found!"; fi
+
+echo
""
+
Propchange: camel/scripts/check_camel_release.sh
--
svn:eol-style = native
Propchange: camel/scripts/check_camel_release.sh
--
svn:executable = *
svn commit: r907980 - /camel/scripts/
Author: gertv Date: Tue Feb 9 09:19:30 2010 New Revision: 907980 URL: http://svn.apache.org/viewvc?rev=907980&view=rev Log: Creating a directory for storing scripts used by the Camel team Added: camel/scripts/
svn commit: r904291 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/features.xml
Author: gertv
Date: Thu Jan 28 22:59:44 2010
New Revision: 904291
URL: http://svn.apache.org/viewvc?rev=904291&view=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=904291&r1=904290&r2=904291&view=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 @@
1.5.3
2.1.12_1
2.4.2_2
- 1.3.0
0.5.1_3
4.0-alpha6_1
1.10_2
@@ -108,7 +107,7 @@
1.6.2_3
2.7.1_2
2.9.1_3
- 2.4.0_2
+ 2.4.0_3
1.4.5
1.4.3_2
1.2_2
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=904291&r1=904290&r2=904291&view=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 @@
mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}
-
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${jsr311-api-1.0-spec-version}
+
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${servicemix-specs-version}
mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}
mvn:org.apache.cxf/cxf-bundle/${cxf-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}
svn commit: r885153 - /camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Author: gertv
Date: Sat Nov 28 21:47:46 2009
New Revision: 885153
URL: http://svn.apache.org/viewvc?rev=885153&view=rev
Log:
CAMEL-1567: Use JUEL ExpressionFactoryImpl instead of using the EL lookup
mechanism
Modified:
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Modified:
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=885153&r1=885152&r2=885153&view=diff
==
---
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
(original)
+++
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Sat Nov 28 21:47:46 2009
@@ -27,6 +27,7 @@
import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
import javax.el.ValueExpression;
+import de.odysseus.el.ExpressionFactoryImpl;
import de.odysseus.el.util.SimpleContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -65,7 +66,7 @@
public ExpressionFactory getExpressionFactory() {
if (expressionFactory == null) {
Properties properties = getExpressionFactoryProperties();
-expressionFactory = ExpressionFactory.newInstance(properties);
+expressionFactory = new ExpressionFactoryImpl(properties);
}
return expressionFactory;
}
svn commit: r885088 - /camel/trunk/platforms/karaf/features/pom.xml
Author: gertv Date: Sat Nov 28 12:24:12 2009 New Revision: 885088 URL: http://svn.apache.org/viewvc?rev=885088&view=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=885088&r1=885087&r2=885088&view=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 @@ 1.5_3 0.1.31_3 1.0.1 - 2.1.0_2 + 2.1.2_1-SNAPSHOT 4.7_1 2.0.8_3 1.1.7_3
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
Author: gertv Date: Tue Nov 24 16:58:26 2009 New Revision: 883781 URL: http://svn.apache.org/viewvc?rev=883781&view=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=883781&r1=883780&r2=883781&view=diff == --- camel/branches/camel-1.x/ca
svn commit: r883713 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/bean/MethodInfo.java test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
Author: gertv
Date: Tue Nov 24 14:54:55 2009
New Revision: 883713
URL: http://svn.apache.org/viewvc?rev=883713&view=rev
Log:
CAMEL-2221: Inconsistent out message when using dynamic recipient list
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=883713&r1=883712&r2=883713&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Tue Nov 24 14:54:55 2009
@@ -115,6 +115,8 @@
Object result = invoke(method, pojo, arguments, exchange);
if (recipientList != null) {
recipientList.sendToRecipientList(exchange, result);
+// we don't want to return the list of endpoints
+return null;
}
return result;
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java?rev=883713&view=auto
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
Tue Nov 24 14:54:55 2009
@@ -0,0 +1,90 @@
+/**
+ * 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 org.apache.camel.*;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.processor.interceptor.Tracer;
+
+/**
+ * Tests to ensure a consistent return value when using the different ways of
+ * configuring the RecipientList pattern
+ *
+ * @version $Revision: 809819 $
+ */
+public class RecipientListReturnValueTest extends ContextTestSupport {
+
+@Override
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry jndi = super.createRegistry();
+jndi.bind("myBean", new MyBean());
+return jndi;
+}
+
+public void testRecipientListWithRecipientList() throws Exception {
+doTestRecipientList("direct:recipientList");
+}
+
+public void testRecipientListWithBeanRef() throws Exception {
+doTestRecipientList("direct:beanRef");
+}
+
+private void doTestRecipientList(String uri) throws InterruptedException {
+MockEndpoint a = getMockEndpoint("mock:a");
+a.expectedBodiesReceived("Hello a");
+
+MockEndpoint b = getMockEndpoint("mock:b");
+b.expectedBodiesReceived("Hello b");
+
+String out = template.requestBody(uri, "Hello " + uri, String.class);
+
+assertEquals("Hello b", out);
+assertMockEndpointsSatisfied();
+}
+
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+public void configure() {
+getContext().addInterceptStrategy(new Tracer());
+
+from("direct:beanRef").beanRef("myBean", "route");
+from("direct:recipientList").recipientList(bean("myBean",
"recipientList"));
+
+from("direct:a").transform(constant("Hello a")).to("mock:a");
+from("direct:b").transform(constant("Hello b")).to("mock:b");
+
svn commit: r826977 - in /camel/trunk/platforms/karaf: features/pom.xml features/src/main/resources/features.xml pom.xml
Author: gertv
Date: Tue Oct 20 06:54:55 2009
New Revision: 826977
URL: http://svn.apache.org/viewvc?rev=826977&view=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=826977&r1=826976&r2=826977&view=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 @@
5.2_1-SNAPSHOT
1.6.1_1-SNAPSHOT
2.1_3_3-SNAPSHOT
-
1.7.0_2-SNAPSHOT
+
1.7.0_1
1.2.2_4-SNAPSHOT
1.0-r706899_2-SNAPSHOT
1.3_1-SNAPSHOT
@@ -95,7 +95,7 @@
1.4-SNAPSHOT
1.1.2
1.13.1_1-SNAPSHOT
- 1.8.1_2-SNAPSHOT
+ 1.8.1_1
3.0.4_1
2.5.6.SEC01
1.2.0
@@ -116,6 +116,36 @@
3.2.7_1
1.6.1_1
+
+
+
+
+servicemix
+Apache ServiceMix Repository
+http://svn.apache.org/repos/asf/servicemix/m2-repo
+
+ true
+
+
+ false
+
+
+
+
+
+
+ org.osgi
+ org.osgi.core
+ 4.2.0
+ provided
+
+
+ org.ops4j.pax.logging
+ pax-logging-api
+ 1.4
+ provided
+
+
@@ -139,6 +169,20 @@
+ org.apache.felix.karaf.tooling
+ features-maven-plugin
+ ${karaf-version}
+
+
+validate
+process-resources
+
+ validate
+
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
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=826977&r1=826976&r2=826977&view=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 @@
+
mvn:org.apache.felix.karaf/apache-felix-karaf/${karaf-version}/xml/features
+
+camel-core
+camel-spring
+camel-osgi
+
+spring
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}
@@ -10,26 +17,19 @@
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}
-mvn:org.springframework/spring-core/${spring-version}
-mvn:org.springframework/spring-beans/${spring-version}
-mvn:org.springframework/spring-context/${spring-version}
-mvn:org.springframework/spring-aop/${spring-version}
+spring
mvn:org.springframework/spring-tx/${spring-version}
camel-core
mvn:org.apache.camel/camel-spring/${pom.version}
camel-spring
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}
-
mvn:org.springframework.osgi/spring-osgi-io/${spring-osgi-version}
-
mvn:org.springframework.osgi/spring-osgi-core/${spring-osgi-version}
-
mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}
-
mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}
+spring-dm
mvn:org.apache.camel/camel-osgi/${pom.version}
camel-spring
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}
mvn:org.apache.camel/camel-test/${pom.version}
@@ -74,13 +74,13 @@
camel-core
-
mvn:net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-version}
+
mvn:http://repository.springsource.com/maven/bundles/external!net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}
mvn:org.apache.camel/camel-cache/${pom.version}
camel-core
-
mvn:org.codehaus.castor/com.springsource.org.castor/${spring-castor-bu
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
Author: gertv
Date: Wed Jul 15 19:37:31 2009
New Revision: 794375
URL: http://svn.apache.org/viewvc?rev=794375&view=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=794375&r1=794374&r2=794375&view=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
svn commit: r794368 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
Author: gertv
Date: Wed Jul 15 19:02:36 2009
New Revision: 794368
URL: http://svn.apache.org/viewvc?rev=794368&view=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=794368&view=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("");
+}
+
+public void testSendErrorXml() throws Exception {
+doTestXmlPayload("");
+}
+
+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());
+
+
svn commit: r781748 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ test/scala/org/apache/camel/scala/dsl/
Author: gertv
Date: Thu Jun 4 14:22:30 2009
New Revision: 781748
URL: http://svn.apache.org/viewvc?rev=781748&view=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=781748&r1=781747&r2=781748&view=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=781748&r1=781747&r2=781748&view=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=781748&r1=781747&r2=781748&view=diff
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/
Author: gertv
Date: Thu Jun 4 14:21:47 2009
New Revision: 781747
URL: http://svn.apache.org/viewvc?rev=781747&view=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.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala&r1=781745&r2=781747&rev=781747&view=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=781747&r1=781746&r2=781747&view=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]) :
SOnCompletionD
svn commit: r781745 - in /camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl: DSL.scala SAbstractDefinition.scala builder/RouteBuilder.scala
Author: gertv
Date: Thu Jun 4 14:15:24 2009
New Revision: 781745
URL: http://svn.apache.org/viewvc?rev=781745&view=rev
Log:
CAMEL-463: Add support for setting transaction policy
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=781745&r1=781744&r2=781745&view=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:15:24 2009
@@ -19,6 +19,8 @@
import org.apache.camel.model.dataformat.DataFormatDefinition
import org.apache.camel.processor.aggregate.AggregationStrategy
+import org.apache.camel.spi.Policy
+
/**
* Defines the 'keywords' in our Scala DSL
*/
@@ -39,6 +41,7 @@
def marshal(format : DataFormatDefinition) : DSL
def multicast : SMulticastDefinition
def otherwise : DSL
+ def policy(policy: Policy) : DSL
def process(function: Exchange => Unit) : DSL
def recipients(expression: Exchange => Any) : DSL
def resequence(expression: Exchange => Any) : SResequenceDefinition
@@ -55,5 +58,4 @@
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=781745&r1=781744&r2=781745&view=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
Thu Jun 4 14:15:24 2009
@@ -17,6 +17,7 @@
package org.apache.camel.scala.dsl;
import org.apache.camel.model._
+import org.apache.camel.spi.Policy
import org.apache.camel.model.dataformat.DataFormatDefinition
@@ -87,6 +88,8 @@
def loadbalance = SLoadBalanceDefinition(target.loadBalance)
def delay(period: Period) =
SDelayDefinition(target.delay(period.milliseconds))
+
+ def policy(policy: Policy) = wrap(target.policy(policy))
def recipients(expression: Exchange => Any) =
wrap(target.recipientList(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=781745&r1=781744&r2=781745&view=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
Thu Jun 4 14:15:24 2009
@@ -18,6 +18,7 @@
import org.apache.camel.model.{ChoiceDefinition, ProcessorDefinition}
import org.apache.camel.model.dataformat.DataFormatDefinition
+import org.apache.camel.spi.Policy
import org.apache.camel.processor.aggregate.AggregationStrategy
import org.apache.camel.Routes
@@ -86,6 +87,7 @@
def loadbalance = stack.top.loadbalance
def delay(delay: Period) = stack.top.delay(delay)
def enrich(uri: String, strategy: AggregationStrategy) =
stack.top.enrich(uri, strategy)
+ def policy(policy: Policy) = stack.top.policy(policy)
def resequence(expression: Exchange => Any) =
stack.top.resequence(expression)
def rollback = stack.top.rollback
def setbody(expression : Exchange => Any) = stack.top.setbody(expression)
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
Author: gertv Date: Mon May 25 07:46:54 2009 New Revision: 778336 URL: http://svn.apache.org/viewvc?rev=778336&view=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=778336&r1=778335&r2=778336&view=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 @@ compile testCompile - - -Xprint:namer - 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=778336&r1=778335&r2=778336&view=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=778336&r1=778335&r2=778336&view=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=778336&r1=778335&r2=778336&view=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=778336&r1=778335&r2=778336&view=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(&q
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/
Author: gertv
Date: Wed May 20 07:13:19 2009
New Revision: 776596
URL: http://svn.apache.org/viewvc?rev=776596&view=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=776596&r1=776595&r2=776596&view=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 @@
compile
testCompile
+
+ -Xprint:namer
+
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.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala&r1=776504&r2=776596&rev=776596&view=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/DSL.scala
URL:
http://svn.apache.org/viewvc
svn commit: r773078 - 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/
Author: gertv
Date: Fri May 8 20:18:37 2009
New Revision: 773078
URL: http://svn.apache.org/viewvc?rev=773078&view=rev
Log:
Merge branch 'scala'
Added:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.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=773078&r1=773077&r2=773078&view=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 May 8 20:18:37 2009
@@ -17,6 +17,7 @@
package org.apache.camel.scala.dsl
import org.apache.camel.model.dataformat.DataFormatDefinition
+import org.apache.camel.processor.aggregate.AggregationStrategy
/**
* Defines the 'keywords' in our Scala DSL
@@ -29,6 +30,7 @@
def bean(bean: Any) : DSL
def choice : SChoiceDefinition
def delay(delay: Period) : SDelayDefinition
+ def enrich(uri:String, strategy: AggregationStrategy) : DSL
def idempotentconsumer(expression: Exchange => Any):
SIdempotentConsumerDefinition
def inOnly(): SProcessorDefinition
def inOut(): SProcessorDefinition
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=773078&r1=773077&r2=773078&view=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 May 8 20:18:37 2009
@@ -18,11 +18,13 @@
import org.apache.camel.model.ProcessorDefinition
import org.apache.camel.model.FilterDefinition
-import org.apache.camel.model.ChoiceDefinition
+import org.apache.camel.model.{ChoiceDefinition, EnrichDefinition}
import org.apache.camel.model.IdempotentConsumerDefinition
import org.apache.camel.model.dataformat.DataFormatDefinition
+import org.apache.camel.processor.aggregate.AggregationStrategy
+
import org.apache.camel.scala.dsl.builder.RouteBuilder
abstract class SAbstractDefinition extends DSL {
@@ -73,6 +75,11 @@
}
def choice = new SChoiceDefinition(target.choice)
+
+ def enrich(uri: String, strategy: AggregationStrategy) = {
+target.enrich(uri, strategy)
+this
+ }
def otherwise : SChoiceDefinition =
throw new Exception("otherwise is only supported in a choice block or
after a when statement")
Added:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala?rev=773078&view=auto
==
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
(added)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
Fri May 8 20:18:37 2009
@@ -0,0 +1,29 @@
+/**
+ * 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.EnrichDefinition
+import org.apache.camel.scala.dsl.bui
svn commit: r771724 - in /camel/trunk/platforms/karaf: features/pom.xml pom.xml
Author: gertv
Date: Tue May 5 13:45:39 2009
New Revision: 771724
URL: http://svn.apache.org/viewvc?rev=771724&view=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=771724&r1=771723&r2=771724&view=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 @@
2.4
2.0
3.1.1_1
- 2.3.15_1-SNAPSHOT
+ 2.3.15_1
1.0.1
1.1.2
1.0.1
@@ -59,21 +59,21 @@
1.5.3
2.1.6_1
2.4.2_1
- 0.5.1_1-SNAPSHOT
+ 0.5.1_1
4.0-alpha6_1
1.10_1
20050913_1
1.0_1
1.1_1
1.0.1_1
-
6.1.11_1-SNAPSHOT
+ 6.1.11_1
20030619_1
1.5.2_1
1.5_1
0.1.31_1
2.1.0_1
4.4_1
- 2.0.8_1-SNAPSHOT
+ 2.0.8_1
2.0.4
2.7.3_1
2.4_1
@@ -84,10 +84,10 @@
3.0.4_1
1.0.0.BUILD-SNAPSHOT
3.2_1
- 1.2_1-SNAPSHOT
+ 1.2_1
1.5_1
- 2.7.1_1-SNAPSHOT
- 2.9.1_1-SNAPSHOT
+ 2.7.1_1
+ 2.9.1_1
2.4.0_2
1.4.4
1.3.0_1
Modified: camel/trunk/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=771724&r1=771723&r2=771724&view=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 @@
Camel :: Platforms :: Apache Karaf
-
1.2-SNAPSHOT
1.1.0
@@ -81,15 +80,4 @@
-
-
-
-
-org.apache.servicemix.tooling
-features-maven-plugin
-${features-maven-plugin-version}
-
-
-
-
svn commit: r769374 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml
Author: gertv
Date: Tue Apr 28 12:33:53 2009
New Revision: 769374
URL: http://svn.apache.org/viewvc?rev=769374&view=rev
Log:
Merged revisions 769368 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
r769368 | gertv | 2009-04-28 14:29:17 +0200 (Tue, 28 Apr 2009) | 1 line
CAMEL-1526: Adding a few Spring JARs to allow using the features.xml for
testing in other containers
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 12:33:53 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
+/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
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=769374&r1=769373&r2=769374&view=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
12:33:53 2009
@@ -37,6 +37,7 @@
0.4.0-incubating_1
1.7.0_1
3.0.1_1
+ 1.0_1
2.2.3_1
1.6_1
1.7.0_1
Modified:
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=769374&r1=769373&r2=769374&view=diff
==
---
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Tue Apr 28 12:33:53 2009
@@ -9,6 +9,11 @@
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}
+mvn:org.springframework/spring-aop/${spring-version}
+mvn:org.springframework/spring-beans/${spring-version}
+mvn:org.springframework/spring-core/${spring-version}
+mvn:org.springframework/spring-context/${spring-version}
mvn:org.springframework/spring-tx/${spring-version}
camel-core
mvn:org.apache.camel/camel-spring/${pom.version}
svn commit: r769368 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/features.xml
Author: gertv
Date: Tue Apr 28 12:29:17 2009
New Revision: 769368
URL: http://svn.apache.org/viewvc?rev=769368&view=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=769368&r1=769367&r2=769368&view=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 @@
0.4.0-incubating_1
1.7.0_1
3.0.1_1
+ 1.0_1
2.2.3_1
1.6_1
1.7.0_1
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=769368&r1=769367&r2=769368&view=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 @@
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}
+mvn:org.springframework/spring-aop/${spring-version}
+mvn:org.springframework/spring-beans/${spring-version}
+mvn:org.springframework/spring-core/${spring-version}
+mvn:org.springframework/spring-context/${spring-version}
mvn:org.springframework/spring-tx/${spring-version}
camel-core
mvn:org.apache.camel/camel-spring/${pom.version}
svn commit: r769354 - /camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Author: gertv
Date: Tue Apr 28 12:12:04 2009
New Revision: 769354
URL: http://svn.apache.org/viewvc?rev=769354&view=rev
Log:
CAMEL-1526: Remove components not available in Camel 1.x
Modified:
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=769354&r1=769353&r2=769354&view=diff
==
---
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Tue Apr 28 12:12:04 2009
@@ -113,20 +113,6 @@
camel-core
mvn:org.apache.camel/camel-bam/${pom.version}
-
-camel-core
-mvn:org.apache.camel/camel-bindy/${pom.version}
-
-
-mvn:org.mortbay.jetty/jetty-util/${jetty-version}
-mvn:org.mortbay.jetty/servlet-api-2.5/${jetty-version}
-
mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}
-
mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}
-mvn:org.mortbay.jetty/jetty/${jetty-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/${jetty-cometd-bundle-version}
-camel-core
-mvn:org.apache.camel/camel-cometd/${pom.version}
-
mvn:org.apache.commons/commons-csv/${commons-csv-version}
camel-core
@@ -376,28 +362,6 @@
camel-spring
mvn:org.apache.camel/camel-spring-integration/${pom.version}
-
-mvn:org.springframework/spring-web/${spring-version}
-
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}
-
mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version}
-
mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}
-mvn:org.mortbay.jetty/servlet-api-2.5/${jetty-version}
-
mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}
-
mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}
-mvn:org.springframework/spring-jdbc/${spring-version}
-mvn:org.apache.geronimo.specs/geronimo-jpa_3.0_spec/1.1.1
-mvn:commons-pool/commons-pool/${commons-pool-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
-
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}
-mvn:org.springframework/spring-orm/${spring-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}
-
mvn:org.springframework/org.springframework.test/${spring-version}
-
mvn:org.springframework.javaconfig/org.springframework.config.java/${spring-javaconfig-version}
-camel-spring
-
mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}
-
mvn:org.springframework/spring-tx/${spring-version}
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
@@ -438,11 +402,6 @@
camel-core
mvn:org.apache.camel/camel-xmlbeans/${pom.version}
-
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}
-camel-core
-mvn:org.apache.camel/camel-xmlsecurity/${pom.version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}
svn commit: r769351 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml pom.xml
Author: gertv Date: Tue Apr 28 11:59:24 2009 New Revision: 769351 URL: http://svn.apache.org/viewvc?rev=769351&view=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=769351&r1=769350&r2=769351&view=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 @@ 3.0.1_1 2.2.3_1 1.6_1 - 1.7.0_1 + 1.7.0_1 1.2.2_3 - 1.0-r706899_1 + 1.0-r706899_1 3.1_1 1.3.2_1 + 1.3 + 2.4 + 2.0 3.1.1_1 1.0.1 + 1.1.2 1.0.1 + 1.1.2 1.2-dev1_1 2.3.4.726_1 + 1.5.3 + 2.1.6_1 2.4.2_1 4.0-alpha6_1 1.10_1 @@ -62,6 +69,7 @@ 0.1.31_1 2.1.0_1 4.4_1 + 2.0.4 2.7.3_1 2.4_1 1.6.1_1 @@ -69,9 +77,11 @@ 9.1.0.1_1 1.3.0 3.0.4_1 + 1.0.0.BUILD-SNAPSHOT 3.2_1 1.5_1 2.4.0_2 + 1.4.4 1.3.0_1 1.2_1 1.1.4c_1 @@ -80,53 +90,6 @@ 1.6.1_1 - - - -com.springsource.repository.bundles.external -SpringSource Enterprise Bundle Repository - External Bundle Releases -http://repository.springsource.com/maven/bundles/external - - -uface.m2 -http://uface.googlecode.com/svn/maven/ -UFace Maven Repository - - -uface.m2 -http://uface.googlecode.com/svn/maven/ -UFace Maven Repository - - - - -open.iona.m2 -IONA Open Source Community Release Repository -http://repo.open.iona.com/maven2 - - true - - - true - - - - - - servicemix-m2-repo - Servicemix Maven2 Repository - http://svn.apache.org/repos/asf/servicemix/m2-repo/ - - true - - - false - - - - - - @@ -139,275 +102,38 @@ org.apache.maven.plugins
svn commit: r769346 - in /camel/trunk: platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml pom.xml
Author: gertv
Date: Tue Apr 28 11:50:52 2009
New Revision: 769346
URL: http://svn.apache.org/viewvc?rev=769346&view=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=769346&r1=769345&r2=769346&view=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 @@
3.0.1_1
2.2.3_1
1.6_1
- 1.7.0_1
+
1.7.0_1
1.2.2_3
- 1.0-r706899_1
+ 1.0-r706899_1
3.1_1
1.3.2_1
+ 1.3
+ 2.4
+ 2.0
3.1.1_1
2.3.15_1-SNAPSHOT
1.0.1
+ 1.1.2
1.0.1
+
1.1.2
1.2-dev1_1
2.3.4.726_1
+ 1.5.3
+ 2.1.6_1
2.4.2_1
0.5.1_1-SNAPSHOT
4.0-alpha6_1
@@ -66,6 +73,7 @@
2.1.0_1
4.4_1
2.0.8_1-SNAPSHOT
+ 2.0.4
2.7.3_1
2.4_1
1.6.1_1
@@ -73,12 +81,14 @@
9.1.0.1_1
1.3.0
3.0.4_1
+
1.0.0.BUILD-SNAPSHOT
3.2_1
1.2_1-SNAPSHOT
1.5_1
2.7.1_1-SNAPSHOT
2.9.1_1-SNAPSHOT
2.4.0_2
+ 1.4.4
1.3.0_1
1.2_1
1.1.4c_1
@@ -87,65 +97,6 @@
1.6.1_1
-
-
-
-com.springsource.repository.bundles.external
-SpringSource Enterprise Bundle Repository - External Bundle
Releases
-http://repository.springsource.com/maven/bundles/external
-
-
-
-com.springsource.repository.bundles.snapshot
-SpringSource Enterprise Bundle Repository - SpringSource
Snapshot Builds
-http://repository.springsource.com/maven/bundles/snapshot
-
-
-spring.maven.release
-Spring Release Maven Repo
-http://repository.springsource.com/maven/bundles/release
-
-
-
-uface.m2
-http://uface.googlecode.com/svn/maven/
-UFace Maven Repository
-
-
-uface.m2
-http://uface.googlecode.com/svn/maven/
-UFace Maven Repository
-
-
-
-
-open.iona.m2
-IONA Open Source Community Release Repository
-http://repo.open.iona.com/maven2
-
- true
-
-
- true
-
-
-
-
-
- servicemix-m2-repo
- Servicemix Maven2 Repository
- http://svn.apache.org/repos/asf/servicemix/m2-repo/
-
- true
-
-
- false
-
-
-
-
-
-
@@ -158,329 +109,38 @@
org.apache.maven.plugins
maven-resources-plugin
-
- process-resources
-
-resources
-
-
+
+filter
+generate-resources
+
+ resources
+
+
- org.apache.servicemix.tooling
- features-maven-plugin
-
-
- compile
-
-generate-features-xml
-
-
-target/classes/bundles.properties
-
-
-
-
+ org.codehaus.mojo
+build-helper-maven-plugin
+
+
+attach-artifacts
+package
+
+ attach-artifact
+
+
+
+
+ target/classes/features.xml
+ xml
+ features
+
+
+
+
+
+
-
-
-
- org.apache.servicemix.kernel
- apache-servicemix-kernel
- 1.1.0
- pom
- provided
-
-
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.asm
-
-
-
-
-
- org.apache.camel
- camel-core
- ${pom.version}
-
-
- org.apache.camel
- camel-spring
- ${pom.version}
-
-
- org.apache.camel
- camel-osgi
- ${pom.version}
-
-
- org.apache.camel
- camel-cxf
- ${pom.version}
-
-
- org.apache.camel
- camel-http
- ${pom.version}
-
-
- org.apache.camel
- camel-mina
- ${pom.version}
-
-
-
svn commit: r769271 - /camel/trunk/tests/camel-itest-osgi/
Author: gertv Date: Tue Apr 28 07:43:12 2009 New Revision: 769271 URL: http://svn.apache.org/viewvc?rev=769271&view=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: r768772 - /camel/trunk/platforms/karaf/features/pom.xml
Author: gertv Date: Sun Apr 26 20:39:49 2009 New Revision: 768772 URL: http://svn.apache.org/viewvc?rev=768772&view=rev Log: CAMEL-1526: Adding Spring repositories 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=768772&r1=768771&r2=768772&view=diff == --- camel/trunk/platforms/karaf/features/pom.xml (original) +++ camel/trunk/platforms/karaf/features/pom.xml Sun Apr 26 20:39:49 2009 @@ -94,6 +94,18 @@ SpringSource Enterprise Bundle Repository - External Bundle Releases http://repository.springsource.com/maven/bundles/external + + +com.springsource.repository.bundles.snapshot +SpringSource Enterprise Bundle Repository - SpringSource Snapshot Builds +http://repository.springsource.com/maven/bundles/snapshot + + +spring.maven.release +Spring Release Maven Repo +http://repository.springsource.com/maven/bundles/release + + uface.m2 http://uface.googlecode.com/svn/maven/
svn commit: r768315 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/bundles.properties
Author: gertv
Date: Fri Apr 24 14:05:23 2009
New Revision: 768315
URL: http://svn.apache.org/viewvc?rev=768315&view=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=768315&r1=768314&r2=768315&view=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 @@
3.1_1
1.3.2_1
3.1.1_1
+ 2.3.15_1-SNAPSHOT
1.0.1
1.0.1
1.2-dev1_1
2.3.4.726_1
2.4.2_1
+ 0.5.1_1-SNAPSHOT
4.0-alpha6_1
1.10_1
20050913_1
1.0_1
1.1_1
1.0.1_1
+
6.1.11_1-SNAPSHOT
20030619_1
1.5.2_1
1.5_1
0.1.31_1
2.1.0_1
4.4_1
+ 2.0.8_1-SNAPSHOT
2.7.3_1
2.4_1
1.6.1_1
@@ -70,7 +74,10 @@
1.3.0
3.0.4_1
3.2_1
+ 1.2_1-SNAPSHOT
1.5_1
+ 2.7.1_1-SNAPSHOT
+ 2.9.1_1-SNAPSHOT
2.4.0_2
1.3.0_1
1.2_1
@@ -239,6 +246,14 @@
org.apache.camel
+ camel-bindy
+
+
+ org.apache.camel
+ camel-cometd
+
+
+ org.apache.camel
camel-csv
${pom.version}
@@ -249,11 +264,21 @@
org.apache.camel
+ camel-freemarker
+ ${pom.version}
+
+
+ org.apache.camel
camel-ftp
${pom.version}
org.apache.camel
+ camel-guice
+ ${pom.version}
+
+
+ org.apache.camel
camel-groovy
${pom.version}
@@ -264,6 +289,11 @@
org.apache.camel
+ camel-hl7
+ ${pom.version}
+
+
+ org.apache.camel
camel-ibatis
${pom.version}
@@ -327,10 +357,9 @@
camel-jpa
${pom.version}
-
org.apache.camel
- camel-quartz
+ camel-ldap
${pom.version}
@@ -345,16 +374,34 @@
org.apache.camel
+ camel-mvel
+ ${pom.version}
+
+
+ org.apache.camel
camel-ognl
${pom.version}
org.apache.camel
+ camel-quartz
+ ${pom.version}
+
+
+org.apache.camel
+camel-restlet
+
+
+ org.apache.camel
camel-rmi
${pom.version}
org.apache.camel
+ camel-rss
+
+
+ org.apache.camel
camel-saxon
${pom.version}
@@ -375,6 +422,11 @@
org.apache.camel
+ camel-spring-javaconfig
+ ${pom.version}
+
+
+ org.apache.camel
camel-sql
${pom.version}
@@ -388,6 +440,11 @@
camel-stringtemplate
${pom.version}
+
+ org.apache.camel
+ camel-tagsoup
+ ${pom.version}
+
org.apache.camel
@@ -401,6 +458,10 @@
org.apache.camel
+ camel-xmlsecurity
+
+
+ org.apache.camel
camel-xmpp
${pom.version}
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties?rev=768315&r1=768314&r2=768315&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
Fri Apr 24 14:05:23 2009
@@ -44,7 +44,9 @@
org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.hamcrest/${hamcrest-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/jar
@@ -52,11 +54,13 @@
org.apache.servicemix.bundles/org.apache.se
svn commit: r767141 - in /camel/trunk/tests/camel-itest-osgi: pom.xml src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
Author: gertv
Date: Tue Apr 21 13:10:46 2009
New Revision: 767141
URL: http://svn.apache.org/viewvc?rev=767141&view=rev
Log:
CAMEL-1536: Allow OSGi Camel integration tests to be run on Hudson/TeamCity
Modified:
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=767141&r1=767140&r2=767141&view=diff
==
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Tue Apr 21 13:10:46 2009
@@ -55,37 +55,47 @@
+
+
+ ops4j.releases
+ http://repository.ops4j.org/maven2
+
+false
+
+
+
+
org.ops4j.pax.exam
pax-exam
${pax-exam-version}
-
+ test
org.ops4j.pax.exam
pax-exam-junit
${pax-exam-version}
-
+ test
org.ops4j.pax.exam
pax-exam-container-default
${pax-exam-version}
-
+ test
org.ops4j.pax.exam
pax-exam-junit-extender-impl
${pax-exam-version}
-
+ test
org.osgi
org.osgi.core
4.0.1
-
+ test
@@ -129,4 +139,37 @@
-
\ No newline at end of file
+
+
+ ci-build-profile
+
+
+ maven.repo.local
+
+
+
+
+
+
+org.ops4j.pax.exam
+maven-paxexam-plugin
+
+
+generate-paxexam-config
+
+ generate-paxexam-config
+
+
+
+
+
+${maven.repo.local}
+
+
+
+
+
+
+
+
+
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java?rev=767141&r1=767140&r2=767141&view=diff
==
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
Tue Apr 21 13:10:46 2009
@@ -18,6 +18,10 @@
package org.apache.camel.itest.osgi;
+import static org.ops4j.pax.exam.CoreOptions.*;
+import static org.ops4j.pax.exam.MavenUtils.*;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.*;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
@@ -25,17 +29,16 @@
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
-import static org.ops4j.pax.exam.CoreOptions.*;
import org.ops4j.pax.exam.Inject;
-import static org.ops4j.pax.exam.MavenUtils.asInProject;
import org.ops4j.pax.exam.Option;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.logProfile;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.options.MavenUrlProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+
/**
* @version $Revision: 1.1 $
*/
@@ -78,20 +81,26 @@
@Configuration
public static Option[] configure() {
-return options(
-// install log service using pax runners profile abstraction
(there are more profiles, like DS)
-logProfile(),
-
-// this is how you set the default log level when using pax
logging (logProfile)
-
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
-
-// lets deploy the bundles we need
-mavenBundleAsInProject("org.apache.camel", "camel-core"),
-wrappedBundle(mavenBundleAsInProject("commons-logging",
"commons-logging")),
-
-felix(), equinox());
+Option[] options = options(
+// install log service using pax runners profile abstraction
(there are more profiles, like DS)
+logProfile(),
+
+// this is how you set the default log level when using pax
logging (logProfile)
+
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+// lets deploy the bundles we need
+mavenBundleAsInProject
svn commit: r766683 - in /camel/branches/camel-1.x: ./ platforms/karaf/pom.xml
Author: gertv Date: Mon Apr 20 13:05:46 2009 New Revision: 766683 URL: http://svn.apache.org/viewvc?rev=766683&view=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=766683&r1=766682&r2=766683&view=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 @@ false + + + +spring-milestone +Spring Portfolio Milestone Repository +http://s3.amazonaws.com/maven.springframework.org/milestone + + true + + + false + +
svn commit: r766673 - /camel/trunk/platforms/karaf/pom.xml
Author: gertv Date: Mon Apr 20 12:48:13 2009 New Revision: 766673 URL: http://svn.apache.org/viewvc?rev=766673&view=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=766673&r1=766672&r2=766673&view=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 @@ false + + + +spring-milestone +Spring Portfolio Milestone Repository +http://s3.amazonaws.com/maven.springframework.org/milestone + + true + + + false + +
svn commit: r766593 - in /camel/branches/camel-1.x: ./ platforms/karaf/pom.xml
Author: gertv Date: Mon Apr 20 06:47:59 2009 New Revision: 766593 URL: http://svn.apache.org/viewvc?rev=766593&view=rev Log: Merged revisions 766590 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk r766590 | gertv | 2009-04-20 08:37:53 +0200 (Mon, 20 Apr 2009) | 1 line CAMEL-1526: Adding OPS4J 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 06:47:59 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 +/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 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=766593&r1=766592&r2=766593&view=diff == --- camel/branches/camel-1.x/platforms/karaf/pom.xml (original) +++ camel/branches/camel-1.x/platforms/karaf/pom.xml Mon Apr 20 06:47:59 2009 @@ -52,6 +52,21 @@ http://repository.apache.org/snapshots + + + + +ops4j +OPS4j Repository +http://repository.ops4j.org/maven2 + + true + + + false + + +
svn commit: r766590 - /camel/trunk/platforms/karaf/pom.xml
Author: gertv Date: Mon Apr 20 06:37:53 2009 New Revision: 766590 URL: http://svn.apache.org/viewvc?rev=766590&view=rev Log: CAMEL-1526: Adding OPS4J 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=766590&r1=766589&r2=766590&view=diff == --- camel/trunk/platforms/karaf/pom.xml (original) +++ camel/trunk/platforms/karaf/pom.xml Mon Apr 20 06:37:53 2009 @@ -52,6 +52,21 @@ http://repository.apache.org/snapshots + + + + +ops4j +OPS4j Repository +http://repository.ops4j.org/maven2 + + true + + + false + + +
svn commit: r766118 - in /camel/branches/camel-1.x: ./ components/camel-jcr/ platforms/ platforms/karaf/ platforms/karaf/features/ platforms/karaf/features/src/ platforms/karaf/features/src/main/ plat
Author: gertv Date: Fri Apr 17 19:00:47 2009 New Revision: 766118 URL: http://svn.apache.org/viewvc?rev=766118&view=rev Log: Merged revisions 766016 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk r766016 | gertv | 2009-04-17 16:03:15 +0200 (Fri, 17 Apr 2009) | 1 line CAMEL-1526: Add a ServiceMix Kernel features descriptor to Camel Added: camel/branches/camel-1.x/platforms/ (props changed) - copied from r766016, camel/trunk/platforms/ camel/branches/camel-1.x/platforms/karaf/ (props changed) - copied from r766016, camel/trunk/platforms/karaf/ camel/branches/camel-1.x/platforms/karaf/features/ (props changed) - copied from r766016, camel/trunk/platforms/karaf/features/ camel/branches/camel-1.x/platforms/karaf/features/pom.xml - copied, changed from r766016, camel/trunk/platforms/karaf/features/pom.xml camel/branches/camel-1.x/platforms/karaf/features/src/ - copied from r766016, camel/trunk/platforms/karaf/features/src/ camel/branches/camel-1.x/platforms/karaf/features/src/main/ - copied from r766016, camel/trunk/platforms/karaf/features/src/main/ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/ - copied from r766016, camel/trunk/platforms/karaf/features/src/main/resources/ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/bundles.properties - copied unchanged from r766016, camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties camel/branches/camel-1.x/platforms/karaf/pom.xml - copied, changed from r766016, camel/trunk/platforms/karaf/pom.xml camel/branches/camel-1.x/platforms/pom.xml - copied, changed from r766016, camel/trunk/platforms/pom.xml Modified: camel/branches/camel-1.x/ (props changed) camel/branches/camel-1.x/components/camel-jcr/pom.xml camel/branches/camel-1.x/pom.xml Propchange: camel/branches/camel-1.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 17 19:00:47 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 +/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 Propchange: camel/branches/camel-1.x/ -- Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-1.x/components/camel-jcr/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jcr/pom.xml?rev=766118&r1=766117&r2=766118&view=diff == --- camel/branches/camel-1.x/components/camel-jcr/pom.xml (original) +++ camel/branches/camel-1.x/components/camel-jcr/pom.xml Fri Apr 17 19:00:47 2009 @@ -42,7 +42,7 @@ org.apache.jackrabbit jackrabbit-core - 1.4.5 + 1.5.3 javax.jcr Propchange: camel/branches/camel-1.x/platforms/ -- --- svn:ignore (added) +++ svn:ignore Fri Apr 17 19:00:47 2009 @@ -0,0 +1 @@ +target Propchange: camel/branches/camel-1.x/platforms/karaf/ -- --- svn:ignore (added) +++ svn:ignore Fri Apr 17 19:00:47 2009 @@ -0,0 +1 @@ +target Propchange: camel/branches/camel-1.x/platforms/karaf/features/ -- --- svn:ignore (added) +++ svn:ignore Fri Apr 17 19:00:47
svn commit: r766098 - in /camel/trunk/platforms/karaf: features/pom.xml pom.xml
Author: gertv Date: Fri Apr 17 17:47:07 2009 New Revision: 766098 URL: http://svn.apache.org/viewvc?rev=766098&view=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=766098&r1=766097&r2=766098&view=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 @@ - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - uface.m2 - http://uface.googlecode.com/svn/maven/ - UFace Maven Repository - + +com.springsource.repository.bundles.external +SpringSource Enterprise Bundle Repository - External Bundle Releases +http://repository.springsource.com/maven/bundles/external + + +uface.m2 +http://uface.googlecode.com/svn/maven/ +UFace Maven Repository + + +uface.m2 +http://uface.googlecode.com/svn/maven/ +UFace Maven Repository + + + + +open.iona.m2 +IONA Open Source Community Release Repository +http://repo.open.iona.com/maven2 + + true + + + true + + + + + + servicemix-m2-repo + Servicemix Maven2 Repository + http://svn.apache.org/repos/asf/servicemix/m2-repo/ + + true + + + false + + - - - open.iona.m2 - IONA Open Source Community Release Repository - http://repo.open.iona.com/maven2 - -true - - -true - - Modified: camel/trunk/platforms/karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=766098&r1=766097&r2=766098&view=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 @@ features + + + + + true + +apache.snapshots +Apache Snapshot Repository +http://repository.apache.org/snapshots + +
svn commit: r766016 - in /camel/trunk: ./ components/camel-jcr/ platforms/ platforms/karaf/ platforms/karaf/features/ platforms/karaf/features/src/ platforms/karaf/features/src/main/ platforms/karaf/f
Author: gertv
Date: Fri Apr 17 14:03:15 2009
New Revision: 766016
URL: http://svn.apache.org/viewvc?rev=766016&view=rev
Log:
CAMEL-1526: Add a ServiceMix Kernel features descriptor to Camel
Added:
camel/trunk/platforms/
camel/trunk/platforms/karaf/
camel/trunk/platforms/karaf/features/ (with props)
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/
camel/trunk/platforms/karaf/features/src/main/
camel/trunk/platforms/karaf/features/src/main/resources/
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
camel/trunk/platforms/karaf/pom.xml
camel/trunk/platforms/pom.xml
Modified:
camel/trunk/components/camel-jcr/pom.xml
camel/trunk/pom.xml
camel/trunk/tests/camel-itest-osgi/ (props changed)
camel/trunk/tooling/archetypes/camel-archetype-war/ (props changed)
Modified: camel/trunk/components/camel-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/pom.xml?rev=766016&r1=766015&r2=766016&view=diff
==
--- camel/trunk/components/camel-jcr/pom.xml (original)
+++ camel/trunk/components/camel-jcr/pom.xml Fri Apr 17 14:03:15 2009
@@ -42,7 +42,7 @@
org.apache.jackrabbit
jackrabbit-core
- 1.4.5
+ 1.5.3
javax.jcr
Propchange: camel/trunk/platforms/karaf/features/
--
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 14:03:15 2009
@@ -0,0 +1 @@
+target
Added: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=766016&view=auto
==
--- camel/trunk/platforms/karaf/features/pom.xml (added)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Apr 17 14:03:15 2009
@@ -0,0 +1,394 @@
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+
+
+4.0.0
+
+
+org.apache.camel
+karaf
+2.0-SNAPSHOT
+
+
+org.apache.camel.karaf
+features
+pom
+2.0-SNAPSHOT
+Camel :: Platforms :: Apache Karaf :: Features
+
+
+ 0.4.0-incubating_1
+ 1.7.0_1
+ 3.0.1_1
+ 2.2.3_1
+ 1.6_1
+ 1.7.0_1
+ 1.2.2_3
+ 1.0-r706899_1
+
3.1_1
+ 1.3.2_1
+ 3.1.1_1
+ 1.0.1
+ 1.0.1
+ 1.2-dev1_1
+ 2.3.4.726_1
+ 2.4.2_1
+ 4.0-alpha6_1
+ 1.10_1
+ 20050913_1
+ 1.0_1
+ 1.1_1
+ 1.0.1_1
+ 20030619_1
+ 1.5.2_1
+ 1.5_1
+ 0.1.31_1
+ 2.1.0_1
+ 4.4_1
+ 2.7.3_1
+ 2.4_1
+ 1.6.1_1
+ 1.0-incubating-M2.1_1
+ 9.1.0.1_1
+ 1.3.0
+ 3.0.4_1
+ 3.2_1
+ 1.5_1
+ 2.4.0_2
+ 1.3.0_1
+ 1.2_1
+ 1.1.4c_1
+ 1.3_1
+ 0.9.4_1
+ 1.6.1_1
+
+
+
+
+
+ com.springsource.repository.bundles.external
+ SpringSource Enterprise Bundle Repository - External Bundle
Releases
+ http://repository.springsource.com/maven/bundles/external
+
+
+ uface.m2
+ http://uface.googlecode.com/svn/maven/
+ UFace Maven Repository
+
+
+
+
+ open.iona.m2
+ IONA Open Source Community Release Repository
+ http://repo.open.iona.com/maven2
+
+true
+
+
+true
+
+
+
+
+
+
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ process-resources
+
+resources
+
+
+
+
+
+ org.apache.servicemix.tooling
+ features-maven-plugin
+
+
+ compile
+
+generate-features-xml
+
+
+target/classes/bundles.properties
+
+
+
+
+
+
+
+
+
+
+ org.apache.servicemix.kernel
+ apache-servicemix-kernel
+ 1.1.0
+ pom
+ provided
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.asm
+
+
+
+
+
+ org.apache.camel
+ camel-core
+ ${pom.version}
+
+
+ org.apache.camel
+ camel-spring
+ ${pom.version}
+
+
+ org.apache.camel
+ camel-osgi
+ ${pom.version}
+
+
+ org.apache.camel
+ camel-cxf
+ ${pom.version}
+
+
+ org.apach
svn commit: r762949 - in /camel/branches/camel-1.x: ./ pom.xml
Author: gertv
Date: Tue Apr 7 20:41:53 2009
New Revision: 762949
URL: http://svn.apache.org/viewvc?rev=762949&view=rev
Log:
Merged revisions 762935 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
r762935 | gertv | 2009-04-07 22:16:59 +0200 (Tue, 07 Apr 2009) | 1 line
CAMEL-1523: Update POM for doing releases using Nexus
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/pom.xml
Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 7 20:41:53 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
+/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,762935
Propchange: camel/branches/camel-1.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=762949&r1=762948&r2=762949&view=diff
==
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Tue Apr 7 20:41:53 2009
@@ -22,7 +22,7 @@
org.apache
apache
-4
+5
4.0.0
@@ -82,9 +82,7 @@
scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository
-
scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
scpexe://people.apache.org/www/camel.apache.org/maven/
-
scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
!javax.xml.bind.annotation.adapters,*
@@ -135,17 +133,6 @@
-
- apache.releases
- Apache Release Distribution Repository
- ${release-repo-url}
-
-
- apache.snapshots
- Apache Development Snapshot Repository
- ${snapshot-repo-url}
- false
-
apache.website
${site-repo-url}
svn commit: r762935 - /camel/trunk/pom.xml
Author: gertv
Date: Tue Apr 7 20:16:59 2009
New Revision: 762935
URL: http://svn.apache.org/viewvc?rev=762935&view=rev
Log:
CAMEL-1523: Update POM for doing releases using Nexus
Modified:
camel/trunk/pom.xml
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=762935&r1=762934&r2=762935&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue Apr 7 20:16:59 2009
@@ -85,9 +85,7 @@
scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository
-
scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
scpexe://people.apache.org/www/activemq.apache.org/camel/maven/
-
scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
!javax.xml.bind.annotation.adapters,*
@@ -143,16 +141,6 @@
-
- apache.releases
- Apache Release Distribution Repository
- ${release-repo-url}
-
-
- apache.snapshots
- Apache Development Snapshot Repository
- ${snapshot-repo-url}
-
apache.website
${site-repo-url}
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/
Author: gertv
Date: Fri Mar 27 14:41:34 2009
New Revision: 759156
URL: http://svn.apache.org/viewvc?rev=759156&view=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=759156&r1=759155&r2=759156&view=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=759156&r1=759155&r2=759156&view=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=759156&view=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/
svn commit: r757766 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/resources/ test/scala/org/apache/camel/scal
Author: gertv
Date: Tue Mar 24 12:51:18 2009
New Revision: 757766
URL: http://svn.apache.org/viewvc?rev=757766&view=rev
Log:
CAMEL-463: Add support for rollback() to the Scala DSL
Added:
camel/trunk/components/camel-scala/src/test/resources/log4j.properties
(with props)
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.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=757766&r1=757765&r2=757766&view=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 Mar 24 12:51:18 2009
@@ -40,6 +40,7 @@
def process(function: Exchange => Unit) : DSL
def recipients(expression: Exchange => Any) : DSL
def resequence(expression: Exchange => Any) : SResequenceDefinition
+ def rollback : DSL
def setbody(expression: Exchange => Any) : DSL
def setheader(header: String, expression: Exchange => Any) : DSL
def split(expression: Exchange => Any) : SSplitDefinition
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=757766&r1=757765&r2=757766&view=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
Tue Mar 24 12:51:18 2009
@@ -104,6 +104,8 @@
def resequence(expression: Exchange => Any) = new
SResequenceDefinition(target.resequence(expression))
+ def rollback = new
SProcessorDefinition(target.rollback.asInstanceOf[RawProcessorDefinition])
+
def setbody(expression: Exchange => Any) = new
SProcessorDefinition(target.setBody(expression).asInstanceOf[ProcessorDefinition[P]
forSome {type P}])
def setheader(name: String, expression: Exchange => Any) = new
SProcessorDefinition(target.setHeader(name,
expression).asInstanceOf[ProcessorDefinition[P] forSome {type P}])
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=757766&r1=757765&r2=757766&view=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
Tue Mar 24 12:51:18 2009
@@ -80,6 +80,7 @@
def loadbalance = stack.top.loadbalance
def delay(delay: Period) = stack.top.delay(delay)
def resequence(expression: Exchange => Any) =
stack.top.resequence(expression)
+ def rollback = stack.top.rollback
def setbody(expression : Exchange => Any) = stack.top.setbody(expression)
def setheader(name: String, expression: Exchange => Any) =
stack.top.setheader(name, expression)
def thread(count: Int) = stack.top.thread(count)
Added: camel/trunk/components/camel-scala/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/resources/log4j.properties?rev=757766&view=auto
==
--- camel/trunk/components/camel-scala/src/test/resources/log4j.properties
(added)
+++ camel/trunk/components/camel-scala/src/test/resources/log4j.properties Tue
Mar 24 12:51:18 2009
@@ -0,0 +1,38 @@
+## ---
+## 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. Y
svn commit: r756373 - /camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
Author: gertv
Date: Fri Mar 20 08:45:05 2009
New Revision: 756373
URL: http://svn.apache.org/viewvc?rev=756373&view=rev
Log:
CAMEL-463: Fixing Wiretap test -- don't expect the tapped messages to arrive in
order
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
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=756373&r1=756372&r2=756373&view=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
Fri Mar 20 08:45:05 2009
@@ -30,7 +30,7 @@
def doTestWiretap(from: String, to: String) = {
to expect { _.received("Calling Elvis", "Calling Paul")}
-"mock:tap" expect { _.received("Elvis is alive!", "Stop singing, you're
not Elvis")}
+mock("mock:tap").expectedBodiesReceivedInAnyOrder("Elvis is alive!", "Stop
singing, you're not Elvis")
test {
from ! (Adult("Elvis"), Adult("Paul"))
}
svn commit: r755002 - 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/
Author: gertv Date: Mon Mar 16 20:56:42 2009 New Revision: 755002 URL: http://svn.apache.org/viewvc?rev=755002&view=rev Log: CAMEL-463: Adding wiretap to the Scala DSL Added: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.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=755002&r1=755001&r2=755002&view=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 Mar 16 20:56:42 2009 @@ -48,6 +48,7 @@ def to(uris: String*) : DSL def unmarshal(format: DataFormatDefinition) : DSL def when(filter: Exchange => Boolean) : SChoiceDefinition + def wiretap(uris: String) : 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=755002&r1=755001&r2=755002&view=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 Mar 16 20:56:42 2009 @@ -115,6 +115,8 @@ this } + def wiretap(uri: String) = new SProcessorDefinition(target.wireTap(uri).asInstanceOf[RawProcessorDefinition]) + def aggregate(expression: Exchange => Any) = new 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=755002&r1=755001&r2=755002&view=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 16 20:56:42 2009 @@ -84,6 +84,7 @@ def setheader(name: String, expression: Exchange => Any) = stack.top.setheader(name, expression) def thread(count: Int) = stack.top.thread(count) def unmarshal(format: DataFormatDefinition) = stack.top.unmarshal(format) + def wiretap(uri: String) = stack.top.wiretap(uri) def aggregate(expression: Exchange => Any) = stack.top.aggregate(expression) // implementing the Routes interface to allow RouteBuilder to be discovered by Spring Added: 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=755002&view=auto == --- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala (added) +++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala Mon Mar 16 20:56:42 2009 @@ -0,0 +1,59 @@ +/** + * 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.scala.test.Adult +import org.w3c.dom.Document +imp
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.
Author: gertv
Date: Sun Mar 15 12:23:32 2009
New Revision: 754660
URL: http://svn.apache.org/viewvc?rev=754660&view=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=754660&r1=754659&r2=754660&view=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=754660&r1=754659&r2=754660&view=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], )
svn commit: r753013 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
Author: gertv
Date: Thu Mar 12 20:53:55 2009
New Revision: 753013
URL: http://svn.apache.org/viewvc?rev=753013&view=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=753013&r1=753012&r2=753013&view=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: r753002 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
Author: gertv
Date: Thu Mar 12 20:32:48 2009
New Revision: 753002
URL: http://svn.apache.org/viewvc?rev=753002&view=rev
Log:
Adding SNIPPET comments to document stream caching feature
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=753002&r1=753001&r2=753002&view=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:32:48 2009
@@ -116,11 +116,15 @@
public void configure() {
//Stream caching for a single route...
+//START SNIPPET: route
from("direct:a").streamCaching().to("mock:a");
+//END SNIPPET
//... or for all the following routes in this builder
+//START SNIPPET: routebuilder
streamCaching();
from("direct:b").to("mock:b");
+//END SNIPPET
}
};
}
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/
Author: gertv
Date: Mon Mar 2 13:24:55 2009
New Revision: 749299
URL: http://svn.apache.org/viewvc?rev=749299&view=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=749299&r1=749298&r2=749299&view=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=749299&view=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)
+ }
+
+ //
svn commit: r746939 - in /camel/trunk/apache-camel: pom.xml src/main/descriptors/common-bin.xml
Author: gertv Date: Mon Feb 23 09:17:33 2009 New Revision: 746939 URL: http://svn.apache.org/viewvc?rev=746939&view=rev Log: Fixing assembly build in Hudson Modified: camel/trunk/apache-camel/pom.xml camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Modified: camel/trunk/apache-camel/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=746939&r1=746938&r2=746939&view=diff == --- camel/trunk/apache-camel/pom.xml (original) +++ camel/trunk/apache-camel/pom.xml Mon Feb 23 09:17:33 2009 @@ -417,7 +417,7 @@ org.apache.maven.plugins maven-assembly-plugin -2.1 +2.2-beta-3 unix-bin @@ -589,7 +589,7 @@ org.apache.maven.plugins maven-assembly-plugin -2.1 +2.2-beta-3 unix-src Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=746939&r1=746938&r2=746939&view=diff == --- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original) +++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Mon Feb 23 09:17:33 2009 @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + common-bin @@ -132,4 +132,4 @@ - +
svn commit: r745109 - in /camel/branches/camel-1.x: ./ components/camel-scala/pom.xml tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Author: gertv Date: Tue Feb 17 14:53:12 2009 New Revision: 745109 URL: http://svn.apache.org/viewvc?rev=745109&view=rev Log: Merged revisions 745105 via svnmerge from https://svn.eu.apache.org/repos/asf/camel/trunk r745105 | gertv | 2009-02-17 15:42:56 +0100 (Tue, 17 Feb 2009) | 1 line No need for the separate Scala repos, these artifacts are now in central repo as well Modified: camel/branches/camel-1.x/ (props changed) camel/branches/camel-1.x/components/camel-scala/pom.xml camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Propchange: camel/branches/camel-1.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 17 14:53:12 2009 @@ -1 +1 @@ -/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123 +/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105 Propchange: camel/branches/camel-1.x/ -- Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-1.x/components/camel-scala/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-scala/pom.xml?rev=745109&r1=745108&r2=745109&view=diff == --- camel/branches/camel-1.x/components/camel-scala/pom.xml (original) +++ camel/branches/camel-1.x/components/camel-scala/pom.xml Tue Feb 17 14:53:12 2009 @@ -15,21 +15,6 @@ org.apache.camel.scala.* - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - src/main/scala src/test/scala Modified: camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=745109&r1=745108&r2=745109&view=diff == --- camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml (original) +++ camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Tue Feb 17 14:53:12 2009 @@ -36,21 +36,6 @@ $SCALA_PLUGIN_VERSION_REPLACEME$ - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - src/main/scala src/test/scala
svn commit: r745105 - in /camel/trunk: components/camel-scala/pom.xml tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Author: gertv Date: Tue Feb 17 14:42:56 2009 New Revision: 745105 URL: http://svn.apache.org/viewvc?rev=745105&view=rev Log: No need for the separate Scala repos, these artifacts are now in central repo as well Modified: camel/trunk/components/camel-scala/pom.xml camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Modified: camel/trunk/components/camel-scala/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/pom.xml?rev=745105&r1=745104&r2=745105&view=diff == --- camel/trunk/components/camel-scala/pom.xml (original) +++ camel/trunk/components/camel-scala/pom.xml Tue Feb 17 14:42:56 2009 @@ -15,21 +15,6 @@ org.apache.camel.scala.* - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - src/main/scala src/test/scala Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=745105&r1=745104&r2=745105&view=diff == --- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml (original) +++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Tue Feb 17 14:42:56 2009 @@ -36,21 +36,6 @@ $SCALA_PLUGIN_VERSION_REPLACEME$ - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - - - scala-tools.org - Scala-tools Maven2 Repository - http://scala-tools.org/repo-releases - - - src/main/scala src/test/scala
svn commit: r744054 - 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/
Author: gertv
Date: Fri Feb 13 10:08:35 2009
New Revision: 744054
URL: http://svn.apache.org/viewvc?rev=744054&view=rev
Log:
CAMEL-463: Adding 'loop' to the Scala DSL
Added:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.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
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=744054&r1=744053&r2=744054&view=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 Feb 13 10:08:35 2009
@@ -33,6 +33,7 @@
def inOnly(): SProcessorType
def inOut(): SProcessorType
def loadbalance : SLoadBalanceType
+ def loop(expression: Exchange => Any) : SLoopType
def marshal(format : DataFormatType) : DSL
def multicast : SMulticastType
def otherwise : 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=744054&r1=744053&r2=744054&view=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
Fri Feb 13 10:08:35 2009
@@ -82,6 +82,8 @@
def inOnly = new SProcessorType(target.inOnly.asInstanceOf[RawProcessorType])
def inOut = new SProcessorType(target.inOut.asInstanceOf[RawProcessorType])
+ def loop(expression: Exchange => Any) = new
SLoopType(target.loop(expression))
+
def marshal(format: DataFormatType) = {
target.marshal(format)
this
Added:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala?rev=744054&view=auto
==
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
(added)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
Fri Feb 13 10:08:35 2009
@@ -0,0 +1,29 @@
+/**
+ * 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.LoopType
+import org.apache.camel.scala.dsl.builder.RouteBuilder
+
+/**
+ * Scala enrichment for Camel's LoopType
+ */
+class SLoopType(val target: LoopType)(implicit val builder: RouteBuilder)
extends SAbstractType with Wrapper[LoopType] {
+
+ val unwrap = target
+
+}
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=744054&r1=744053&r2=744054&view=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
Fri Feb 13 10:08:35 2009
@@ -68,6 +68,7 @@
def idempotentconsumer(expression: Exchange
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/
Author: gertv
Date: Tue Feb 10 21:40:37 2009
New Revision: 743113
URL: http://svn.apache.org/viewvc?rev=743113&view=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=743113&r1=743112&r2=743113&view=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=743113&r1=743112&r2=743113&view=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).
svn commit: r742719 - in /camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/processor/interceptor/ camel-core/src/test/java/org/apache/camel/builder/ camel-core/src/test/java/org/
Author: gertv
Date: Mon Feb 9 20:20:24 2009
New Revision: 742719
URL: http://svn.apache.org/viewvc?rev=742719&view=rev
Log:
Merged revisions 742705 via svnmerge from
https://svn.eu.apache.org/repos/asf/camel/trunk
r742705 | gertv | 2009-02-09 20:46:50 +0100 (Mon, 09 Feb 2009) | 1 line
SM-1271: StreamCachingInterceptor should support async exchange handling
Modified:
camel/branches/camel-1.x/ (props changed)
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/builder/RouteBuilderTest.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 Mon Feb 9 20:20:24 2009
@@ -1 +1 @@
-/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231
+/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231,742705
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/interceptor/StreamCachingInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java?rev=742719&r1=742718&r2=742719&view=diff
==
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
Mon Feb 9 20:20:24 2009
@@ -18,36 +18,25 @@
import java.util.List;
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.converter.stream.StreamCache;
import org.apache.camel.model.InterceptorRef;
import org.apache.camel.model.InterceptorType;
-import org.apache.camel.processor.Interceptor;
+import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.MessageHelper;
/**
- * {...@link Interceptor} that converts a message into a re-readable format
+ * {...@link DelegateProcessor} that converts a message into a re-readable
format
*/
-public class StreamCachingInterceptor extends Interceptor {
+public class StreamCachingInterceptor extends DelegateProcessor implements
AsyncProcessor {
public StreamCachingInterceptor() {
super();
-setInterceptorLogic(new Processor() {
-public void process(Exchange exchange) throws Exception {
-try {
-StreamCache newBody =
exchange.getIn().getBody(StreamCache.class);
-if (newBody != null) {
-exchange.getIn().setBody(newBody);
-}
-MessageHelper.resetStreamCache(exchange.getIn());
-} catch (NoTypeConversionAvailableException ex) {
-// ignore if in is not of StreamCache type
-}
-proceed(exchange);
-}
-});
}
public StreamCachingInterceptor(Processor processor) {
@@ -74,4 +63,37 @@
}
}
}
+
+@Override
+public void process(Exchange exchange) throws Exception {
+AsyncProcessorHelper.process(this, exchange);
+}
+
+public boolean process(Exchange exchange, AsyncCallback callback) {
+try {
+StreamCache newBody = exchange.getIn().getBody(StreamCache.class);
+if (newBody != null) {
+exchange.getIn().setBody(newBody);
+}
+MessageHelper.resetStreamCache(exchange.getIn());
+} catch (NoTypeConversionAvailableException ex) {
+// ignore if in is not of StreamCache type
+}
+return proceed(exchange, callback);
+}
+
+public boolean proceed(Exchange exchange, AsyncCallback callback) {
+if (getProcessor() instanceof AsyncProcessor) {
+return ((AsyncProcessor) getProcessor()).process(exchange,
callback);
+} else {
+try {
+processor.process(exchange);
+} catch (Throwable e) {
+exchange.setException(e);
+}
+// false means processing of the exchange asynchronously,
+callback.done(true);
+return true;
+}
+}
}
svn commit: r742705 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java test/java/org/apache/camel/builder/RouteBuilderTest.java test/java/
Author: gertv
Date: Mon Feb 9 19:46:50 2009
New Revision: 742705
URL: http://svn.apache.org/viewvc?rev=742705&view=rev
Log:
SM-1271: StreamCachingInterceptor should support async exchange handling
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.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/processor/interceptor/StreamCachingInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java?rev=742705&r1=742704&r2=742705&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
Mon Feb 9 19:46:50 2009
@@ -18,36 +18,25 @@
import java.util.List;
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.converter.stream.StreamCache;
import org.apache.camel.model.InterceptorRef;
import org.apache.camel.model.InterceptorType;
-import org.apache.camel.processor.Interceptor;
+import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.MessageHelper;
/**
- * {...@link Interceptor} that converts a message into a re-readable format
+ * {...@link DelegateProcessor} that converts a message into a re-readable
format
*/
-public class StreamCachingInterceptor extends Interceptor {
+public class StreamCachingInterceptor extends DelegateProcessor implements
AsyncProcessor {
public StreamCachingInterceptor() {
super();
-setInterceptorLogic(new Processor() {
-public void process(Exchange exchange) throws Exception {
-try {
-StreamCache newBody =
exchange.getIn().getBody(StreamCache.class);
-if (newBody != null) {
-exchange.getIn().setBody(newBody);
-}
-MessageHelper.resetStreamCache(exchange.getIn());
-} catch (NoTypeConversionAvailableException ex) {
-// ignore if in is not of StreamCache type
-}
-proceed(exchange);
-}
-});
}
public StreamCachingInterceptor(Processor processor) {
@@ -74,4 +63,37 @@
}
}
}
+
+@Override
+public void process(Exchange exchange) throws Exception {
+AsyncProcessorHelper.process(this, exchange);
+}
+
+public boolean process(Exchange exchange, AsyncCallback callback) {
+try {
+StreamCache newBody = exchange.getIn().getBody(StreamCache.class);
+if (newBody != null) {
+exchange.getIn().setBody(newBody);
+}
+MessageHelper.resetStreamCache(exchange.getIn());
+} catch (NoTypeConversionAvailableException ex) {
+// ignore if in is not of StreamCache type
+}
+return proceed(exchange, callback);
+}
+
+public boolean proceed(Exchange exchange, AsyncCallback callback) {
+if (getProcessor() instanceof AsyncProcessor) {
+return ((AsyncProcessor) getProcessor()).process(exchange,
callback);
+} else {
+try {
+processor.process(exchange);
+} catch (Throwable e) {
+exchange.setException(e);
+}
+// false means processing of the exchange asynchronously,
+callback.done(true);
+return true;
+}
+}
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?rev=742705&r1=742704&r2=742705&view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
Mon Feb 9 19:46:50 2009
@@ -250,7 +250,7 @@
// take off the InstrumentationProcessor
processor = unwrapDelegateProcessor(processor);
// take off the StreamCacheInterceptor
-processor = unwrapInterceptor(processor);
+processor = unwrapDelegateProcessor(processor);
svn commit: r740307 - /camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
Author: gertv
Date: Tue Feb 3 14:07:29 2009
New Revision: 740307
URL: http://svn.apache.org/viewvc?rev=740307&view=rev
Log:
CAMEL-1271: adding unit test to Claus' camel-jaxb fix
Modified:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
Modified:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java?rev=740307&r1=740306&r2=740307&view=diff
==
---
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
(original)
+++
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
Tue Feb 3 14:07:29 2009
@@ -23,8 +23,10 @@
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
+import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.TypeConverter;
+import org.apache.camel.converter.stream.StreamCache;
import org.apache.camel.impl.DefaultCamelContext;
/**
@@ -63,5 +65,14 @@
}
assertEquals(-1, is.read());
}
-
+
+public void testNoConversionForStreamCache() throws Exception {
+PurchaseOrder order = new PurchaseOrder();
+try {
+converter.convertTo(StreamCache.class, order);
+fail("We should not use the JAXB FallbackTypeConverter for stream
caching");
+} catch (NoTypeConversionAvailableException e) {
+//this is OK
+}
+}
}
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
Author: gertv
Date: Tue Feb 3 10:15:34 2009
New Revision: 740263
URL: http://svn.apache.org/viewvc?rev=740263&view=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=740263&r1=740262&r2=740263&view=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=740263&r1=740262&r2=740263&view=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.ap
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
Author: gertv
Date: Tue Feb 3 09:16:53 2009
New Revision: 740251
URL: http://svn.apache.org/viewvc?rev=740251&view=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=740251&r1=740250&r2=740251&view=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=740251&r1=740250&r2=740251&view=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=740251&view=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 informati
svn commit: r735862 - in /camel/branches/camel-1.x: ./ components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java components/camel-jetty/src/test/java/org/apache/cam
Author: gertv
Date: Mon Jan 19 14:46:57 2009
New Revision: 735862
URL: http://svn.apache.org/viewvc?rev=735862&view=rev
Log:
Merged revisions 735847 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
r735847 | gertv | 2009-01-19 23:16:30 +0100 (Mon, 19 Jan 2009) | 1 line
CAMEL-1274: Jetty HTTP SelectChannelConnector not closed when CamelContext
shuts down
Added:
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
- copied unchanged from r735847,
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Propchange: camel/branches/camel-1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 14:46:57 2009
@@ -1 +1,2 @@
/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427,735732
+/camel/trunk:735847
Propchange: camel/branches/camel-1.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=735862&r1=735861&r2=735862&view=diff
==
---
camel/branches/camel-1.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/branches/camel-1.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Mon Jan 19 14:46:57 2009
@@ -110,7 +110,7 @@
public void connect(HttpConsumer consumer) throws Exception {
// Make sure that there is a connector for the requested endpoint.
JettyHttpEndpoint endpoint = (JettyHttpEndpoint)consumer.getEndpoint();
-String connectorKey = endpoint.getProtocol() + ":" +
endpoint.getHttpUri().getHost() + ":" + endpoint.getPort();
+String connectorKey = getConnectorKey(endpoint);
synchronized (connectors) {
ConnectorRef connectorRef = connectors.get(connectorKey);
@@ -167,8 +167,8 @@
public void disconnect(HttpConsumer consumer) throws Exception {
// If the connector is not needed anymore then stop it
HttpEndpoint endpoint = consumer.getEndpoint();
-String connectorKey = endpoint.getProtocol() + ":" +
endpoint.getPort();
-
+String connectorKey = getConnectorKey(endpoint);
+
synchronized (connectors) {
ConnectorRef connectorRef = connectors.get(connectorKey);
if (connectorRef != null) {
@@ -181,6 +181,10 @@
}
}
}
+
+private String getConnectorKey(HttpEndpoint endpoint) {
+return endpoint.getProtocol() + ":" + endpoint.getHttpUri().getHost()
+ ":" + endpoint.getPort();
+}
// Properties
//
-
@@ -270,7 +274,7 @@
@Override
protected void doStop() throws Exception {
for (ConnectorRef connectorRef : connectors.values()) {
-connectorRef.connector.stop();
+connectorRef.connector.stop();
}
connectors.clear();
svn commit: r735859 - /camel/branches/camel-1.x/
Author: gertv Date: Mon Jan 19 14:41:59 2009 New Revision: 735859 URL: http://svn.apache.org/viewvc?rev=735859&view=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.
svn commit: r735847 - in /camel/trunk/components/camel-jetty/src: main/java/org/apache/camel/component/jetty/JettyHttpComponent.java test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconn
Author: gertv
Date: Mon Jan 19 14:16:30 2009
New Revision: 735847
URL: http://svn.apache.org/viewvc?rev=735847&view=rev
Log:
CAMEL-1274: Jetty HTTP SelectChannelConnector not closed when CamelContext
shuts down
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=735847&r1=735846&r2=735847&view=diff
==
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Mon Jan 19 14:16:30 2009
@@ -106,7 +106,7 @@
public void connect(HttpConsumer consumer) throws Exception {
// Make sure that there is a connector for the requested endpoint.
JettyHttpEndpoint endpoint = (JettyHttpEndpoint)consumer.getEndpoint();
-String connectorKey = endpoint.getProtocol() + ":" +
endpoint.getHttpUri().getHost() + ":" + endpoint.getPort();
+String connectorKey = getConnectorKey(endpoint);
synchronized (connectors) {
ConnectorRef connectorRef = connectors.get(connectorKey);
@@ -163,8 +163,8 @@
public void disconnect(HttpConsumer consumer) throws Exception {
// If the connector is not needed anymore then stop it
HttpEndpoint endpoint = consumer.getEndpoint();
-String connectorKey = endpoint.getProtocol() + ":" +
endpoint.getPort();
-
+String connectorKey = getConnectorKey(endpoint);
+
synchronized (connectors) {
ConnectorRef connectorRef = connectors.get(connectorKey);
if (connectorRef != null) {
@@ -177,6 +177,10 @@
}
}
}
+
+private String getConnectorKey(HttpEndpoint endpoint) {
+return endpoint.getProtocol() + ":" + endpoint.getHttpUri().getHost()
+ ":" + endpoint.getPort();
+}
// Properties
//
-
@@ -266,7 +270,7 @@
@Override
protected void doStop() throws Exception {
for (ConnectorRef connectorRef : connectors.values()) {
-connectorRef.connector.stop();
+connectorRef.connector.stop();
}
connectors.clear();
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java?rev=735847&view=auto
==
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
Mon Jan 19 14:16:30 2009
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test to verify that the Jetty HTTP connector is correctly disconnected
on shutdown
+ */
+public class JettyHttpEndpointDisconnectTest extends ContextTestSupport {
+
+private String serverUri = "http://localhost:5432/myservice";;
+
+public void testContextShutdownRemovesHttpConnector() throws Exception {
+context.stop();
+
+JettyHttpComponent component = (JettyHttpComponent)
context.getComponent("jetty");
+
