You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/04/28 05:10:53 UTC
[1/3] git commit: Fixed the CS errors of camel-core
Repository: camel
Updated Branches:
refs/heads/master f64757d2d -> e801ea44f
Fixed the CS errors of camel-core
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e36dd24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e36dd24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e36dd24
Branch: refs/heads/master
Commit: 4e36dd240b5fb1178106cd859e980056d81f148a
Parents: f64757d
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 28 10:46:47 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 28 10:46:47 2014 +0800
----------------------------------------------------------------------
.../camel/language/tokenizer/TokenizeLanguageTest.java | 3 ++-
.../camel/language/tokenizer/TokenizeWrapLanguageTest.java | 9 ++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4e36dd24/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
index 79e3547..eff0f06 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
@@ -101,7 +101,8 @@ public class TokenizeLanguageTest extends ContextTestSupport {
"<c:child some_attr='a' anotherAttr='a' xmlns:c='urn:c' xmlns:d=\"urn:d\"></c:child>", "<c:child some_attr='b' anotherAttr='b' xmlns:c='urn:c' xmlns:d=\"urn:d\"/>");
template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
assertMockEndpointsSatisfied();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e36dd24/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
index d2523e8..8ffd5a9 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
@@ -105,11 +105,14 @@ public class TokenizeWrapLanguageTest extends ContextTestSupport {
public void testSendMoreParentsMessageToTokenize() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived(
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child></c:parent></grandparent></g:greatgrandparent>",
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child></c:parent></grandparent></g:greatgrandparent>",
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
assertMockEndpointsSatisfied();
}
[3/3] git commit: CAMEL-7397 Support to deploy the
camel-example-spring-javaconfig into Karaf
Posted by ni...@apache.org.
CAMEL-7397 Support to deploy the camel-example-spring-javaconfig into Karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e801ea44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e801ea44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e801ea44
Branch: refs/heads/master
Commit: e801ea44f27e6d21b8cb133670968528754d30d2
Parents: 9207ab7
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 28 11:09:32 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 28 11:09:32 2014 +0800
----------------------------------------------------------------------
examples/camel-example-spring-javaconfig/pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e801ea44/examples/camel-example-spring-javaconfig/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml
index bf8b513..ff8684d 100644
--- a/examples/camel-example-spring-javaconfig/pom.xml
+++ b/examples/camel-example-spring-javaconfig/pom.xml
@@ -25,12 +25,21 @@
</parent>
<artifactId>camel-example-spring-javaconfig</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Camel :: Example :: Spring :: JavaConfig</name>
<description>An example showing how to work with Camel and Spring Java Config</description>
<properties>
<junit-version>4.8.1</junit-version>
+ <camel.osgi.export.pkg>org.apache.camel.example.spring.javaconfig</camel.osgi.export.pkg>
+ <!--We need to import the cglib packages here, and spring-core 3.2.x includes cglib -->
+ <!--If the spring version is below 3.2.x, the import package should be changed to start with org.sf -->
+ <camel.osgi.import>
+ org.springframework.cglib.core,
+ org.springframework.cglib.proxy,
+ org.springframework.cglib.reflect,
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
[2/3] git commit: CAMEL-7396 Added defaultMethodName option to
camel-xmlrpc
Posted by ni...@apache.org.
CAMEL-7396 Added defaultMethodName option to camel-xmlrpc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9207ab7a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9207ab7a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9207ab7a
Branch: refs/heads/master
Commit: 9207ab7acaaa972aa007b261d1e59c79368add54
Parents: 4e36dd2
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 28 10:51:15 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 28 10:54:54 2014 +0800
----------------------------------------------------------------------
.../camel/component/xmlrpc/XmlRpcEndpoint.java | 9 +++++++++
.../camel/component/xmlrpc/XmlRpcProducer.java | 21 ++++++++++++++++----
.../component/xmlrpc/XmlRpcEndpointTest.java | 3 ++-
3 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9207ab7a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
index 8806c10..2cbe7d3 100644
--- a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
+++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
@@ -32,6 +32,7 @@ import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
*/
public class XmlRpcEndpoint extends DefaultEndpoint {
private String address;
+ private String defaultMethodName;
private XmlRpcClientConfigurer clientConfigurer;
private XmlRpcClientConfigImpl clientConfig = new XmlRpcClientConfigImpl();
@@ -97,6 +98,14 @@ public class XmlRpcEndpoint extends DefaultEndpoint {
public XmlRpcClientConfigImpl getClientConfig() {
return clientConfig;
}
+
+ public String getDefaultMethodName() {
+ return defaultMethodName;
+ }
+
+ public void setDefaultMethodName(String defaultMethodName) {
+ this.defaultMethodName = defaultMethodName;
+ }
http://git-wip-us.apache.org/repos/asf/camel/blob/9207ab7a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
index 1dd2c8b..0ae31a9 100644
--- a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
+++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,10 +44,16 @@ public class XmlRpcProducer extends DefaultProducer implements AsyncProcessor {
public void process(Exchange exchange) throws Exception {
LOG.trace("Process exchange: {} in the sync way.", exchange);
Message in = exchange.getIn();
- String operationName = in.getHeader(XmlRpcConstants.METHOD_NAME, String.class);
+ String methodName = in.getHeader(XmlRpcConstants.METHOD_NAME, String.class);
+ if (ObjectHelper.isEmpty(methodName)) {
+ methodName = endpoint.getDefaultMethodName();
+ }
+ if (ObjectHelper.isEmpty(methodName)) {
+ throw new IllegalArgumentException("CamelXmlRpcMethodName header is empty, please set the message header or defaultMethodName option on the endpoint.");
+ }
try {
//TODO need to use the binding to handle the requests
- Object result = client.execute(operationName, in.getBody(List.class));
+ Object result = client.execute(methodName, in.getBody(List.class));
//TODO what if the request is one way operation
// copy the in message header to the out message
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
@@ -60,11 +67,17 @@ public class XmlRpcProducer extends DefaultProducer implements AsyncProcessor {
public boolean process(Exchange exchange, AsyncCallback callback) {
LOG.trace("Process exchange: {} in the async way.", exchange);
Message in = exchange.getIn();
- String operationName = in.getHeader(XmlRpcConstants.METHOD_NAME, String.class);
+ String methodName = in.getHeader(XmlRpcConstants.METHOD_NAME, String.class);
+ if (ObjectHelper.isEmpty(methodName)) {
+ methodName = endpoint.getDefaultMethodName();
+ }
+ if (ObjectHelper.isEmpty(methodName)) {
+ throw new IllegalArgumentException("CamelXmlRpcMethodName header is empty, please set the message header or defaultMethodName option on the endpoint.");
+ }
XmlRpcAsyncCallback xmlRpcAsyncCallback = new XmlRpcAsyncCallback(exchange, callback);
//TODO need to use the binding to handle the requests
try {
- client.executeAsync(operationName, in.getBody(List.class), xmlRpcAsyncCallback);
+ client.executeAsync(methodName, in.getBody(List.class), xmlRpcAsyncCallback);
return false;
} catch (Exception ex) {
exchange.setException(ex);
http://git-wip-us.apache.org/repos/asf/camel/blob/9207ab7a/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcEndpointTest.java b/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcEndpointTest.java
index 5833dca..efee676 100644
--- a/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcEndpointTest.java
+++ b/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcEndpointTest.java
@@ -39,12 +39,13 @@ public class XmlRpcEndpointTest extends Assert {
// create the endpoint with parameters
@Test
public void testEndpointSetting() throws Exception {
- XmlRpcEndpoint endpoint = (XmlRpcEndpoint)camelContext.getEndpoint("xmlrpc:http://www.example.com?userAgent=myAgent&gzipCompressing=true&connectionTimeout=30");
+ XmlRpcEndpoint endpoint = (XmlRpcEndpoint)camelContext.getEndpoint("xmlrpc:http://www.example.com?userAgent=myAgent&gzipCompressing=true&connectionTimeout=30&defaultMethodName=echo");
XmlRpcClientConfigImpl clientConfig = endpoint.getClientConfig();
assertEquals("Get a wrong userAgent", "myAgent", clientConfig.getUserAgent());
assertEquals("Get a wrong gzipCompressing", true, clientConfig.isGzipCompressing());
assertEquals("Get a wrong connectionTimeout", 30, clientConfig.getConnectionTimeout());
assertEquals("Get a wrong endpoint address", "http://www.example.com", endpoint.getAddress());
+ assertEquals("Get a worng default method name", "echo", endpoint.getDefaultMethodName());
}
@Test