git commit: Reformat json test examples for better readability
Repository: camel
Updated Branches:
refs/heads/master c8ff55bdc - a94f95b61
Reformat json test examples for better readability
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a94f95b6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a94f95b6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a94f95b6
Branch: refs/heads/master
Commit: a94f95b6114cbcb3d825eb2c79175520553aef99
Parents: c8ff55b
Author: Charles Moulliard ch0...@gmail.com
Authored: Thu Aug 28 08:22:47 2014 +0200
Committer: Charles Moulliard ch0...@gmail.com
Committed: Thu Aug 28 08:22:47 2014 +0200
--
.../src/test/resources/average.json | 29 +++---
.../src/test/resources/books.json | 41 ++--
.../src/test/resources/cheap.json | 27 ++---
.../src/test/resources/expensive.json | 29 +++---
4 files changed, 65 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a94f95b6/components/camel-jsonpath/src/test/resources/average.json
--
diff --git a/components/camel-jsonpath/src/test/resources/average.json
b/components/camel-jsonpath/src/test/resources/average.json
index 51a45ba..bd888dc 100644
--- a/components/camel-jsonpath/src/test/resources/average.json
+++ b/components/camel-jsonpath/src/test/resources/average.json
@@ -1,16 +1,17 @@
-{ store: {
- book: [
-{
- category: fiction,
- author: Evelyn Waugh,
- title: Sword of Honour,
- price: 12.99,
- isbn: 0-553-21311-3
+{
+store: {
+book: [
+{
+category: fiction,
+author: Evelyn Waugh,
+title: Sword of Honour,
+price: 12.99,
+isbn: 0-553-21311-3
+}
+],
+bicycle: {
+color: red,
+price: 19.95
+}
}
- ],
- bicycle: {
-color: red,
-price: 19.95
- }
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a94f95b6/components/camel-jsonpath/src/test/resources/books.json
--
diff --git a/components/camel-jsonpath/src/test/resources/books.json
b/components/camel-jsonpath/src/test/resources/books.json
index c06af59..6d4594f 100644
--- a/components/camel-jsonpath/src/test/resources/books.json
+++ b/components/camel-jsonpath/src/test/resources/books.json
@@ -1,22 +1,23 @@
-{ store: {
- book: [
-{
- category: reference,
- author: Nigel Rees,
- title: Sayings of the Century,
- price: 8.95
-},
-{
- category: fiction,
- author: Evelyn Waugh,
- title: Sword of Honour,
- price: 12.99,
- isbn: 0-553-21311-3
+{
+store: {
+book: [
+{
+category: reference,
+author: Nigel Rees,
+title: Sayings of the Century,
+price: 8.95
+},
+{
+category: fiction,
+author: Evelyn Waugh,
+title: Sword of Honour,
+price: 12.99,
+isbn: 0-553-21311-3
+}
+],
+bicycle: {
+color: red,
+price: 19.95
+}
}
- ],
- bicycle: {
-color: red,
-price: 19.95
- }
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a94f95b6/components/camel-jsonpath/src/test/resources/cheap.json
--
diff --git a/components/camel-jsonpath/src/test/resources/cheap.json
b/components/camel-jsonpath/src/test/resources/cheap.json
index 9ffb356..02df81c 100644
--- a/components/camel-jsonpath/src/test/resources/cheap.json
+++ b/components/camel-jsonpath/src/test/resources/cheap.json
@@ -1,15 +1,16 @@
-{ store: {
- book: [
-{
- category: reference,
- author: Nigel Rees,
- title: Sayings of the Century,
- price: 8.95
+{
+store: {
+book: [
+{
+category: reference,
+author: Nigel Rees,
+title: Sayings of the Century,
+price: 8.95
+}
+],
+bicycle: {
+color: red,
+price: 19.95
+}
}
- ],
- bicycle: {
-color: red,
-price: 19.95
- }
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a94f95b6/components/camel-jsonpath/src/test/resources/expensive.json
--
diff --git a/components/camel-jsonpath/src/test/resources/expensive.json
git commit: CAMEL-7737 Fixed the test error of camel-fop
Repository: camel Updated Branches: refs/heads/camel-2.12.x b49717a9b - 986ebbdc1 CAMEL-7737 Fixed the test error of camel-fop Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/986ebbdc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/986ebbdc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/986ebbdc Branch: refs/heads/camel-2.12.x Commit: 986ebbdc17094655e6fd68a1e28fe89c3ab89958 Parents: b49717a Author: Willem Jiang willem.ji...@gmail.com Authored: Sun Aug 24 18:13:57 2014 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Thu Aug 28 14:22:22 2014 +0800 -- components/camel-fop/pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/986ebbdc/components/camel-fop/pom.xml -- diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml index c3f53bd..96f5b4b 100644 --- a/components/camel-fop/pom.xml +++ b/components/camel-fop/pom.xml @@ -53,6 +53,11 @@ groupIdorg.apache.avalon.framework/groupId artifactIdavalon-framework-impl/artifactId /exclusion +!-- exclude the dependency of xalan to fix CAMEL-7737 -- +exclusion +groupIdxalan/groupId +artifactIdxalan/artifactId +/exclusion /exclusions /dependency dependency
[2/3] git commit: Fixed a CS error in camel-netty4
Fixed a CS error in camel-netty4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f88e14a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f88e14a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f88e14a
Branch: refs/heads/master
Commit: 2f88e14ad2a321c96b302e1e9426e24c4003e891
Parents: a94f95b
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 14:29:47 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 28 14:49:53 2014 +0800
--
.../java/org/apache/camel/component/netty4/util/SubnetUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2f88e14a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
--
diff --git
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
index 9edba1a..7b29995 100644
---
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
+++
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
@@ -219,8 +219,10 @@ public class SubnetUtils {
if (ct == 0) {
return addresses;
}
-for (int add = low(), j = 0; add = high(); ++add, ++j) {
+int j = 0;
+for (int add = low(); add = high(); ++add) {
addresses[j] = format(toArray(add));
+++j;
}
return addresses;
}
[3/3] git commit: Using HttpClient 4.3 API in camel-restlet
Using HttpClient 4.3 API in camel-restlet
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8c2a930
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8c2a930
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8c2a930
Branch: refs/heads/master
Commit: c8c2a930ba44b65af853afcf788b32677e4aff68
Parents: 866a399
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 14:49:33 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 28 14:49:54 2014 +0800
--
.../component/restlet/RestletRedirectTest.java | 36
.../component/restlet/RestletTestSupport.java | 8 ++---
2 files changed, 25 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c8c2a930/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java
--
diff --git
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java
index a54c5c1..39f366b 100644
---
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java
+++
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java
@@ -20,10 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.params.ClientPNames;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.Test;
/**
@@ -37,19 +37,25 @@ public class RestletRedirectTest extends RestletTestSupport
{
HttpGet get = new HttpGet(http://localhost:; + portNum +
/users/homer);
// do not follow redirects
-HttpClient client = new DefaultHttpClient();
-client.getParams().setBooleanParameter(ClientPNames.HANDLE_REDIRECTS,
false);
-
-HttpResponse response = client.execute(get);
-
-for (Header header : response.getAllHeaders()) {
-log.info(Header {}, header);
+RequestConfig requestconfig =
RequestConfig.custom().setRedirectsEnabled(false).build();
+
+CloseableHttpClient client =
HttpClientBuilder.create().setDefaultRequestConfig(requestconfig).build();
+
+try {
+
+HttpResponse response = client.execute(get);
+
+for (Header header : response.getAllHeaders()) {
+log.info(Header {}, header);
+}
+
+assertEquals(302, response.getStatusLine().getStatusCode());
+assertTrue(Should have location header,
response.containsHeader(Location));
+assertEquals(http://somewhere.com;,
response.getFirstHeader(Location).getValue());
+assertEquals(bar, response.getFirstHeader(Foo).getValue());
+} finally {
+client.close();
}
-
-assertEquals(302, response.getStatusLine().getStatusCode());
-assertTrue(Should have location header,
response.containsHeader(Location));
-assertEquals(http://somewhere.com;,
response.getFirstHeader(Location).getValue());
-assertEquals(bar, response.getFirstHeader(Foo).getValue());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/c8c2a930/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
--
diff --git
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
index f1ddf06..389a1f5 100644
---
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
+++
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
@@ -22,10 +22,10 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.http.HttpResponse;
import org.apache.http.ParseException;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.BufferedHttpEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
[1/3] git commit: CAMEL-7757 Fix the EOFException in camel-restlet with thanks to Sandeep
Repository: camel
Updated Branches:
refs/heads/master a94f95b61 - c8c2a930b
CAMEL-7757 Fix the EOFException in camel-restlet with thanks to Sandeep
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/866a3995
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/866a3995
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/866a3995
Branch: refs/heads/master
Commit: 866a3995002d3033cca2413142e6725900fe7b5e
Parents: 2f88e14
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 14:31:15 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 28 14:49:53 2014 +0800
--
.../component/restlet/DefaultRestletBinding.java | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/866a3995/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index cd57867..98db3c7 100644
---
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -310,13 +310,17 @@ public class DefaultRestletBinding implements
RestletBinding, HeaderFilterStrate
// get content type
MediaType mediaType = response.getEntity().getMediaType();
if (mediaType != null) {
+LOG.debug(Setting the Content-Type to be {},
mediaType.toString());
exchange.getOut().setHeader(Exchange.CONTENT_TYPE,
mediaType.toString());
}
-
-// get content text
-String text = response.getEntity().getText();
-LOG.debug(Populate exchange from Restlet response: {}, text);
-exchange.getOut().setBody(text);
+if (mediaType != null
mediaType.equals(MediaType.APPLICATION_OCTET_STREAM)) {
+exchange.getOut().setBody(response.getEntity().getStream());
+} else {
+// get content text
+String text = response.getEntity().getText();
+LOG.debug(Populate exchange from Restlet response: {}, text);
+exchange.getOut().setBody(text);
+}
}
// preserve headers from in by copying any non existing headers
git commit: Upgrade rx
Repository: camel Updated Branches: refs/heads/master c8c2a930b - 3cb2de8a2 Upgrade rx Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cb2de8a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cb2de8a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cb2de8a Branch: refs/heads/master Commit: 3cb2de8a2561f6724e0d3a93fc4514762c6b0283 Parents: c8c2a93 Author: Claus Ibsen davscl...@apache.org Authored: Thu Aug 28 09:22:35 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Thu Aug 28 09:23:03 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3cb2de8a/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 1f40145..8ae3da2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -358,7 +358,7 @@ rhino-version1.7R2/rhino-version rome-bundle-version1.0_3/rome-bundle-version rome-version1.0/rome-version -rxjava-version0.20.0/rxjava-version +rxjava-version0.20.2/rxjava-version saaj-impl-version1.3.2_2/saaj-impl-version saxon-bundle-version9.5.1-5_1/saxon-bundle-version saxon-version9.5.1-5/saxon-version
git commit: CAMEL-7043: Fixed test. Thanks to Christian Ohr for the patch.
Repository: camel
Updated Branches:
refs/heads/master 3cb2de8a2 - 75bcfbc58
CAMEL-7043: Fixed test. Thanks to Christian Ohr for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75bcfbc5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75bcfbc5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75bcfbc5
Branch: refs/heads/master
Commit: 75bcfbc58eab1ffc75c799fbf134d9908c672363
Parents: 3cb2de8
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Aug 28 11:04:18 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Aug 28 11:04:18 2014 +0200
--
.../org/apache/camel/component/hl7/MessageValidatorTest.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/75bcfbc5/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
--
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
index 8219cd2..7a06682 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
@@ -46,6 +46,8 @@ public class MessageValidatorTest extends CamelTestSupport {
protected void doPreSetup() throws Exception {
defaultValidationContext =
ValidationContextFactory.defaultValidation();
defaultContext = new DefaultHapiContext(defaultValidationContext);
+// we validate separately, not during parsing or rendering
+defaultContext.getParserConfiguration().setValidating(false);
ValidationRuleBuilder builder = new ValidationRuleBuilder() {
@Override
@@ -57,6 +59,8 @@ public class MessageValidatorTest extends CamelTestSupport {
};
customValidationContext =
ValidationContextFactory.fromBuilder(builder);
customContext = new DefaultHapiContext(customValidationContext);
+// we validate separately, not during parsing or rendering
+customContext.getParserConfiguration().setValidating(false);
}
@Test
@@ -115,10 +119,9 @@ public class MessageValidatorTest extends CamelTestSupport
{
}
@Test(expected = CamelExecutionException.class)
-@Ignore
public void testDynamicCustomHapiContext() throws Exception {
MockEndpoint mock = getMockEndpoint(mock:test6);
-mock.expectedMessageCount(1);
+mock.expectedMessageCount(0);
Message msg = createADT01Message();
msg.setParser(customContext.getPipeParser());
template.sendBody(direct:test6, msg);
git commit: Extend unit test to include field search based on type/customer
Repository: camel
Updated Branches:
refs/heads/master 75bcfbc58 - 394c08712
Extend unit test to include field search based on type/customer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/394c0871
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/394c0871
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/394c0871
Branch: refs/heads/master
Commit: 394c087126c1e744d06f8ac8536ff41f31803855
Parents: 75bcfbc
Author: Charles Moulliard ch0...@gmail.com
Authored: Thu Aug 28 12:21:57 2014 +0200
Committer: Charles Moulliard ch0...@gmail.com
Committed: Thu Aug 28 12:21:57 2014 +0200
--
.../camel/jsonpath/JsonPathLanguageTest.java| 24
1 file changed, 20 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/394c0871/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
--
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
index 0773760..a0d8a28 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
@@ -35,14 +35,14 @@ public class JsonPathLanguageTest extends CamelTestSupport {
}
@Test
-public void testExpression() throws Exception {
+public void testExpressionArray() throws Exception {
Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody(new File(src/test/resources/books.json));
Language lan = context.resolveLanguage(jsonpath);
Expression exp = lan.createExpression($.store.book[*].author);
List? authors = exp.evaluate(exchange, List.class);
-log.info(Authors {}, authors);
+log.debug(Authors {}, authors);
assertNotNull(authors);
assertEquals(2, authors.size());
@@ -52,8 +52,24 @@ public class JsonPathLanguageTest extends CamelTestSupport {
exp = lan.createExpression($.store.bicycle.price);
String price = exp.evaluate(exchange, String.class);
assertEquals(Got a wrong result, 19.95, price);
-
-
+}
+
+@Test
+public void testExpressionField() throws Exception {
+Exchange exchange = new DefaultExchange(context);
+exchange.getIn().setBody(new File(src/test/resources/type.json));
+
+Language lan = context.resolveLanguage(jsonpath);
+Expression exp = lan.createExpression($.kind);
+String kind = exp.evaluate(exchange, String.class);
+
+assertNotNull(kind);
+assertEquals(full, kind);
+
+exp = lan.createExpression($.type);
+String type = exp.evaluate(exchange, String.class);
+assertNotNull(type);
+assertEquals(customer, type);
}
@Test
git commit: Extend unit test to include field search based on type/customer. Remove predicate as it fails
Repository: camel
Updated Branches:
refs/heads/master 394c08712 - d62717e51
Extend unit test to include field search based on type/customer. Remove
predicate as it fails
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d62717e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d62717e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d62717e5
Branch: refs/heads/master
Commit: d62717e51aab8e344454dd92a0f91f875521c288
Parents: 394c087
Author: Charles Moulliard ch0...@gmail.com
Authored: Thu Aug 28 14:32:21 2014 +0200
Committer: Charles Moulliard ch0...@gmail.com
Committed: Thu Aug 28 14:32:21 2014 +0200
--
.../java/org/apache/camel/jsonpath/JsonPathLanguageTest.java | 1 +
components/camel-jsonpath/src/test/resources/type.json | 4
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d62717e5/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
--
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
index a0d8a28..1522bc6 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
@@ -74,6 +74,7 @@ public class JsonPathLanguageTest extends CamelTestSupport {
@Test
public void testPredicate() throws Exception {
+// Test books.json file
Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody(new File(src/test/resources/books.json));
http://git-wip-us.apache.org/repos/asf/camel/blob/d62717e5/components/camel-jsonpath/src/test/resources/type.json
--
diff --git a/components/camel-jsonpath/src/test/resources/type.json
b/components/camel-jsonpath/src/test/resources/type.json
new file mode 100644
index 000..a2a75df
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/type.json
@@ -0,0 +1,4 @@
+{
+kind: full,
+type: customer
+}
\ No newline at end of file
[2/3] git commit: CAMEL-7761 Setup the application context classloader of OSGiDefaultCamelContext
CAMEL-7761 Setup the application context classloader of OSGiDefaultCamelContext
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2806bb16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2806bb16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2806bb16
Branch: refs/heads/master
Commit: 2806bb166f0884c50aa68cffacadde489cacfdda
Parents: 64f0420
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 20:28:25 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 28 20:42:42 2014 +0800
--
.../java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2806bb16/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
--
diff --git
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
index 7329a7b..a48b9d1 100644
---
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
+++
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
@@ -22,6 +22,7 @@ import java.util.Properties;
import org.apache.camel.TypeConverter;
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;
@@ -41,6 +42,8 @@ public class OsgiDefaultCamelContext extends
DefaultCamelContext {
this.bundleContext = bundleContext;
this.registry = registry;
OsgiCamelContextHelper.osgiUpdate(this, bundleContext);
+// setup the application context classloader with the bundle
classloader
+setApplicationContextClassLoader(new
BundleDelegatingClassLoader(bundleContext.getBundle()));
}
@Override
[3/3] git commit: camel-kafka should use scala-2.10.x
camel-kafka should use scala-2.10.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/baf84ebf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/baf84ebf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/baf84ebf
Branch: refs/heads/master
Commit: baf84ebff70f74387c1f4c803ee7d5d59afa5292
Parents: 2806bb1
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 20:33:16 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 28 20:42:42 2014 +0800
--
components/camel-kafka/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 8
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/baf84ebf/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index c0a8908..e550b93 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -56,7 +56,7 @@
dependency
groupIdorg.scala-lang/groupId
artifactIdscala-library/artifactId
- version${scala-version}/version
+ version${scala-2.10-version}/version
scopeprovided/scope
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/baf84ebf/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index e178f0f..2e6ca60 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -216,7 +216,7 @@
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-castor/${project.version}/bundle
/feature
-!-- TODO: Karaf does not yet support CDI seamless in the container
+!-- TODO: Karaf does not yet support CDI seamless in the container
feature name='camel-cdi' version='${project.version}' resolver='(obr)'
start-level='50'
feature version='${project.version}'camel-core/feature
bundle
dependency='true'mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0/bundle
@@ -608,7 +608,7 @@
bundle
dependency='true'mvn:commons-pool/commons-pool/${commons-pool-version}/bundle
feature version='${project.version}'camel-avro/feature
bundlemvn:org.apache.camel/camel-infinispan/${project.version}/bundle
- /feature
+ /feature
feature name='camel-irc' version='${project.version}' resolver='(obr)'
start-level='50'
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/bundle
feature version='${project.version}'camel-core/feature
@@ -635,7 +635,7 @@
feature version='${jclouds-version}'jclouds/feature
feature version='${jclouds-version}'jclouds-blobstore/feature
feature version='${jclouds-version}'jclouds-compute/feature
-feature version='${project.version}'camel-core/feature
+feature version='${project.version}'camel-core/feature
bundlemvn:javax.ws.rs/jsr311-api/${jsr311-api-version}/bundle
bundlemvn:org.apache.camel/camel-jclouds/${project.version}/bundle
/feature
@@ -748,7 +748,7 @@
bundlemvn:org.apache.camel/camel-jxpath/${project.version}/bundle
/feature
feature name='camel-kafka' version='${project.version}' resolver='(obr)'
start-level='50'
-bundle
dependency='true'mvn:org.scala-lang/scala-library/${scala-version}/bundle
+bundle
dependency='true'mvn:org.scala-lang/scala-library/${scala-2.10-version}/bundle
bundle
dependency='true'mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}/bundle
bundle
dependency='true'wrap:mvn:com.yammer.metrics/metrics-core/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}amp;Export-Package=*;-noimport:=true;version=${yammer-metrics-version}/bundle
bundle
dependency='true'wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}amp;Export-Package=*;-noimport:=true;version=${yammer-metrics-version}/bundle
[1/3] git commit: CAMEL-7759 Using the TCCL as the default value of ApplicationContextClassLoader in DefaultCamelContext
Repository: camel
Updated Branches:
refs/heads/master d62717e51 - baf84ebff
CAMEL-7759 Using the TCCL as the default value of ApplicationContextClassLoader
in DefaultCamelContext
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64f04205
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64f04205
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64f04205
Branch: refs/heads/master
Commit: 64f042054ac003d0a7a5bde6cb9fe90690f30f9d
Parents: d62717e
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 20:11:48 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 28 20:42:41 2014 +0800
--
.../java/org/apache/camel/impl/DefaultCamelContext.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/64f04205/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 666ee4a..2c36dc5 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -36,6 +36,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.naming.Context;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
@@ -1782,8 +1783,13 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
private void doStartCamel() throws Exception {
if (applicationContextClassLoader == null) {
-// use the classloader that loaded this class
-setApplicationContextClassLoader(this.getClass().getClassLoader());
+// Using the TCCL as the default value of ApplicationClassLoader
+ClassLoader cl = Thread.currentThread().getContextClassLoader();
+if (cl == null) {
+// use the classloader that loaded this class
+cl = this.getClass().getClassLoader();
+}
+setApplicationContextClassLoader(cl);
}
if (log.isDebugEnabled()) {
[2/2] git commit: Get many of the OSGi/Karaf tests passing with Karaf3 by making sure the JUnit bundle is loaded very very early.
Get many of the OSGi/Karaf tests passing with Karaf3 by making sure the JUnit
bundle is loaded very very early.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a522c92e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a522c92e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a522c92e
Branch: refs/heads/master
Commit: a522c92e4fb25ff4a36d693f1f7154f6d7b1f47f
Parents: 9fd3919
Author: Daniel Kulp dk...@apache.org
Authored: Thu Aug 28 12:40:54 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Aug 28 12:40:54 2014 -0400
--
parent/pom.xml | 6 +++
tests/camel-itest-karaf/pom.xml | 5 +++
.../camel/itest/karaf/AbstractFeatureTest.java | 34 +---
tests/camel-itest-osgi/pom.xml | 10 +
.../itest/osgi/OSGiIntegrationTestSupport.java | 42 +++-
5 files changed, 83 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a522c92e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ae3da2..f3ae665 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1970,6 +1970,12 @@
artifactIdpax-swissbox-tinybundles/artifactId
version${pax-tiny-bundle-version}/version
/dependency
+ dependency
+ groupIdorg.ops4j.pax.exam/groupId
+ artifactIdpax-exam-invoker-junit/artifactId
+ version${pax-exam-version}/version
+ /dependency
+
!-- optional Saxon support --
http://git-wip-us.apache.org/repos/asf/camel/blob/a522c92e/tests/camel-itest-karaf/pom.xml
--
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 9944170..5f5bc44 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -82,6 +82,11 @@
scopetest/scope
/dependency
dependency
+groupIdorg.apache.servicemix.bundles/groupId
+artifactIdorg.apache.servicemix.bundles.junit/artifactId
+version${junit-bundle-version}/version
+/dependency
+dependency
groupIdorg.osgi/groupId
artifactIdorg.osgi.core/artifactId
scopetest/scope
http://git-wip-us.apache.org/repos/asf/camel/blob/a522c92e/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 430273d..2ab693c 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -17,9 +17,11 @@
package org.apache.camel.itest.karaf;
import java.io.File;
-
+import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
+import java.util.Properties;
+
import javax.inject.Inject;
import org.apache.camel.CamelContext;
@@ -33,13 +35,14 @@ import org.junit.Before;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
import org.ops4j.pax.exam.karaf.options.LogLevelOption;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import static org.junit.Assert.assertNotNull;
+
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
@@ -177,15 +180,31 @@ public abstract class AbstractFeatureTest {
throw new RuntimeException(e);
}
}
-
+
private static String getKarafVersion() {
-String karafVersion = System.getProperty(karafVersion);
+InputStream ins =
AbstractFeatureTest.class.getResourceAsStream(/META-INF/maven/dependencies.properties);
+Properties p = new Properties();
+try {
+p.load(ins);
+} catch (Throwable t) {
+//
+}
+String karafVersion =
p.getProperty(org.apache.karaf/apache-karaf/version);
+if (karafVersion == null) {
+karafVersion = System.getProperty(karafVersion);
+}
if (karafVersion == null) {
// setup the default version of it
karafVersion = 2.3.6;
}
return karafVersion;
[1/2] git commit: Don't keep the runtime folders to avoid the target dirs from blowing up in sized.
Repository: camel
Updated Branches:
refs/heads/master baf84ebff - a522c92e4
Don't keep the runtime folders to avoid the target dirs from blowing up in
sized.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fd39197
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fd39197
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fd39197
Branch: refs/heads/master
Commit: 9fd39197d58d7c750e5ce80d5ce33cbc347d1681
Parents: baf84eb
Author: Daniel Kulp dk...@apache.org
Authored: Thu Aug 28 10:13:04 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Aug 28 10:13:04 2014 -0400
--
.../java/org/apache/camel/itest/karaf/AbstractFeatureTest.java | 2 +-
.../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9fd39197/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index cd9b1cb..430273d 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -201,7 +201,7 @@ public abstract class AbstractFeatureTest {
vmOption(-Dfile.encoding=UTF-8),
-KarafDistributionOption.keepRuntimeFolder(),
+//KarafDistributionOption.keepRuntimeFolder(),
// override the config.properties (to fix pax-exam bug)
//KarafDistributionOption.replaceConfigurationFile(etc/config.properties, new
File(src/test/resources/org/apache/camel/itest/karaf/config.properties)),
KarafDistributionOption.replaceConfigurationFile(etc/custom.properties, new
File(src/test/resources/org/apache/camel/itest/karaf/custom.properties)),
http://git-wip-us.apache.org/repos/asf/camel/blob/9fd39197/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index 52f7bbf..e9ee455 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -160,7 +160,7 @@ public class OSGiIntegrationTestSupport extends
CamelTestSupport {
.name(Apache Karaf)
.useDeployFolder(false).unpackDirectory(new
File(target/paxexam/unpack/)),
- KarafDistributionOption.keepRuntimeFolder(),
+ //KarafDistributionOption.keepRuntimeFolder(),
// override the config.properties (to fix pax-exam bug)
//
KarafDistributionOption.replaceConfigurationFile(etc/config.properties, new
File(src/test/resources/org/apache/camel/itest/karaf/config.properties)),
KarafDistributionOption.replaceConfigurationFile(etc/custom.properties, new
File(src/test/resources/org/apache/camel/itest/karaf/custom.properties)),
[1/2] git commit: CAMEL-7757 Fix the EOFException in camel-restlet with thanks to Sandeep
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 986ebbdc1 - ad9624787
refs/heads/camel-2.13.x 637aa4dfe - 4ce44057d
CAMEL-7757 Fix the EOFException in camel-restlet with thanks to Sandeep
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ce44057
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ce44057
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ce44057
Branch: refs/heads/camel-2.13.x
Commit: 4ce44057def813594228d6ffa27336d293fe248d
Parents: 637aa4d
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 14:31:15 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Aug 29 13:02:29 2014 +0800
--
.../component/restlet/DefaultRestletBinding.java | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4ce44057/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index ebef445..cd3d62d 100644
---
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -299,13 +299,17 @@ public class DefaultRestletBinding implements
RestletBinding, HeaderFilterStrate
// get content type
MediaType mediaType = response.getEntity().getMediaType();
if (mediaType != null) {
+LOG.debug(Setting the Content-Type to be {},
mediaType.toString());
exchange.getOut().setHeader(Exchange.CONTENT_TYPE,
mediaType.toString());
}
-
-// get content text
-String text = response.getEntity().getText();
-LOG.debug(Populate exchange from Restlet response: {}, text);
-exchange.getOut().setBody(text);
+if (mediaType != null
mediaType.equals(MediaType.APPLICATION_OCTET_STREAM)) {
+exchange.getOut().setBody(response.getEntity().getStream());
+} else {
+// get content text
+String text = response.getEntity().getText();
+LOG.debug(Populate exchange from Restlet response: {}, text);
+exchange.getOut().setBody(text);
+}
}
// preserve headers from in by copying any non existing headers
[2/2] git commit: CAMEL-7757 Fix the EOFException in camel-restlet with thanks to Sandeep
CAMEL-7757 Fix the EOFException in camel-restlet with thanks to Sandeep
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad962478
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad962478
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad962478
Branch: refs/heads/camel-2.12.x
Commit: ad9624787ccacd232c6edeeb158c1d0321a90e4b
Parents: 986ebbd
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 28 14:31:15 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Aug 29 13:04:22 2014 +0800
--
.../component/restlet/DefaultRestletBinding.java | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ad962478/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index ebef445..cd3d62d 100644
---
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -299,13 +299,17 @@ public class DefaultRestletBinding implements
RestletBinding, HeaderFilterStrate
// get content type
MediaType mediaType = response.getEntity().getMediaType();
if (mediaType != null) {
+LOG.debug(Setting the Content-Type to be {},
mediaType.toString());
exchange.getOut().setHeader(Exchange.CONTENT_TYPE,
mediaType.toString());
}
-
-// get content text
-String text = response.getEntity().getText();
-LOG.debug(Populate exchange from Restlet response: {}, text);
-exchange.getOut().setBody(text);
+if (mediaType != null
mediaType.equals(MediaType.APPLICATION_OCTET_STREAM)) {
+exchange.getOut().setBody(response.getEntity().getStream());
+} else {
+// get content text
+String text = response.getEntity().getText();
+LOG.debug(Populate exchange from Restlet response: {}, text);
+exchange.getOut().setBody(text);
+}
}
// preserve headers from in by copying any non existing headers
[CONF] Apache Camel MQTT
willem jiang edited the page: MQTT ... div class confluenceTableSmall Property Default Description host tcp://127.0.0.1:1883 The URI of the MQTT broker to connect too - this component also supports SSL - e.g. ssl://127.0.0.1:8883 localAddress The local InetAddress and port to use connectAttemptsMax -1 The maximum number of attempts to establish an initial connection - -1 in infinite.
