You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/11/19 08:13:10 UTC
[01/12] camel git commit: Fixed test with problems with upper lower
case name on path
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x a0d9c0887 -> 9d7e25052
refs/heads/master ba5672ca3 -> 76f6bc4ca
Fixed test with problems with upper lower case name on path
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6cd62313
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cd62313
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cd62313
Branch: refs/heads/master
Commit: 6cd623130c235acaa3ab73f2a0c633c26cbfaf98
Parents: ba5672c
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:20:21 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 07:20:21 2015 +0100
----------------------------------------------------------------------
.../dataformat/base64/SpringBase64DataFormatDefaultsTest.java | 2 +-
.../dataformat/base64/SpringBase64DataFormatLineEndingsTest.java | 2 +-
.../dataformat/base64/SpringBase64DataFormatLineLengthTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6cd62313/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
index 04a6a47..d1ba4ac 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
@@ -50,7 +50,7 @@ public class SpringBase64DataFormatDefaultsTest extends SpringBase64DataFormatTe
@Override
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
- "org/apache/camel/dataFormat/base64/SpringBase64DataFormatDefaultsTest.xml");
+ "org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.xml");
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/6cd62313/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
index b68af84..185d6e8 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
@@ -48,7 +48,7 @@ public class SpringBase64DataFormatLineEndingsTest extends SpringBase64DataForma
@Override
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
- "org/apache/camel/dataFormat/base64/SpringBase64DataFormatLineEndingsTest.xml");
+ "org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.xml");
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/6cd62313/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
----------------------------------------------------------------------
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
index 62ff007..78d172c 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
@@ -60,7 +60,7 @@ public class SpringBase64DataFormatLineLengthTest extends SpringBase64DataFormat
@Override
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
- "org/apache/camel/dataFormat/base64/SpringBase64DataFormatLineLengthTest.xml");
+ "org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.xml");
}
}
[12/12] camel git commit: CAMEL-9263: camel-servlet - Allow to
configure the context path without leading slash. Fixed issue with camel-gae
extending servlet and works a bit differently than a plain servlet.
Posted by da...@apache.org.
CAMEL-9263: camel-servlet - Allow to configure the context path without leading slash. Fixed issue with camel-gae extending servlet and works a bit differently than a plain servlet.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d7e2505
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d7e2505
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d7e2505
Branch: refs/heads/camel-2.16.x
Commit: 9d7e250523dd4bc789917389a8da54d4591ce3d8
Parents: 46092b1
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 08:11:16 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 08:12:44 2015 +0100
----------------------------------------------------------------------
.../component/gae/http/GHttpComponent.java | 6 +++++
.../component/servlet/ServletComponent.java | 27 +++++++++++++-------
2 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7e2505/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
index c5bb708..2fecd4d 100644
--- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
+++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
@@ -63,4 +63,10 @@ public class GHttpComponent extends ServletComponent {
protected ServletEndpoint createServletEndpoint(String endpointUri, ServletComponent component, URI httpUri) throws Exception {
return new GHttpEndpoint(endpointUri, component, httpUri);
}
+
+ @Override
+ protected boolean lenientContextPath() {
+ // must use the path as-is
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7e2505/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index 7da4497..25a1b1b 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -67,16 +67,18 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
String httpMethodRestrict = getAndRemoveParameter(parameters, "httpMethodRestrict", String.class);
HeaderFilterStrategy headerFilterStrategy = resolveAndRemoveReferenceParameter(parameters, "headerFilterStrategy", HeaderFilterStrategy.class);
- // the uri must have a leading slash for the context-path matching to work with servlet, and it can be something people
- // forget to add and then the servlet consumer cannot match the context-path as would have been expected
- String scheme = ObjectHelper.before(uri, ":");
- String after = ObjectHelper.after(uri, ":");
- // rebuild uri to have exactly one leading slash
- while (after.startsWith("/")) {
- after = after.substring(1);
+ if (lenientContextPath()) {
+ // the uri must have a leading slash for the context-path matching to work with servlet, and it can be something people
+ // forget to add and then the servlet consumer cannot match the context-path as would have been expected
+ String scheme = ObjectHelper.before(uri, ":");
+ String after = ObjectHelper.after(uri, ":");
+ // rebuild uri to have exactly one leading slash
+ while (after.startsWith("/")) {
+ after = after.substring(1);
+ }
+ after = "/" + after;
+ uri = scheme + ":" + after;
}
- after = "/" + after;
- uri = scheme + ":" + after;
// restructure uri to be based on the parameters left as we dont want to include the Camel internal options
URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encodeHttpURI(uri)), parameters);
@@ -120,6 +122,13 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
}
/**
+ * Whether defining the context-path is lenient and do not require an exact leading slash.
+ */
+ protected boolean lenientContextPath() {
+ return true;
+ }
+
+ /**
* Strategy to create the servlet endpoint.
*/
protected ServletEndpoint createServletEndpoint(String endpointUri, ServletComponent component, URI httpUri) throws Exception {
[04/12] camel git commit: spring-integration not yet updated to
latest so must use older spring version
Posted by da...@apache.org.
spring-integration not yet updated to latest so must use older spring version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c938bc1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c938bc1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c938bc1
Branch: refs/heads/master
Commit: 8c938bc1e0f3eab2425effd94b274effa1b8c431
Parents: 405d3d2
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:45:55 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 07:45:55 2015 +0100
----------------------------------------------------------------------
components/camel-spring-integration/pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8c938bc1/components/camel-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index 02bf4ba..45a230e 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -33,6 +33,9 @@
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
<camel.osgi.import.before.defaults>org.springframework.integration.*;version="[2,3)"</camel.osgi.import.before.defaults>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-integration</camel.osgi.export.service>
+
+ <!-- must use older spring version -->
+ <spring-version>${spring41-version}</spring-version>
</properties>
<dependencies>
[08/12] camel git commit: Component docs fixed test
Posted by da...@apache.org.
Component docs fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a56e2d81
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a56e2d81
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a56e2d81
Branch: refs/heads/camel-2.16.x
Commit: a56e2d81cbd8c114b98ca9801f3089e7f1f1b7cf
Parents: a0d9c08
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:23:39 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 08:12:10 2015 +0100
----------------------------------------------------------------------
.../apache/camel/component/beanstalk/UriConfigurationTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a56e2d81/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
index 998c112..3f5d464 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
@@ -38,9 +38,9 @@ public class UriConfigurationTest extends Assert {
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
- assertTrue(json.contains("\"awaitJob\": { \"kind\": \"parameter\", \"label\": \"consumer\", \"type\": \"boolean\""));
- assertTrue(json.contains("\"command\": { \"kind\": \"parameter\", \"type\": \"string\""));
- assertTrue(json.contains("\"jobTimeToRun\": { \"kind\": \"parameter\", \"type\": \"integer\""));
+ assertTrue(json.contains("\"command\": { \"kind\": \"parameter\", \"group\": \"common\", \"type\": \"string\""));
+ assertTrue(json.contains("\"jobTimeToRun\": { \"kind\": \"parameter\", \"group\": \"common\", \"type\": \"integer\""));
+ assertTrue(json.contains("\"awaitJob\": { \"kind\": \"parameter\", \"group\": \"consumer\", \"label\": \"consumer\", \"type\": \"boolean\""));
}
@Test
[10/12] camel git commit: Fixed potential NPE
Posted by da...@apache.org.
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7faf4dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7faf4dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7faf4dd
Branch: refs/heads/camel-2.16.x
Commit: d7faf4ddb71789afe0f2551958deb2c35c1fc242
Parents: 009b90d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:48:30 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 08:12:27 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/http4/HttpEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d7faf4dd/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index c5c82bc..b589e65 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@ -132,7 +132,7 @@ public class HttpEndpoint extends HttpCommonEndpoint {
clientBuilder.setDefaultCookieStore(cookieStore);
// setup the httpConnectionManager
clientBuilder.setConnectionManager(clientConnectionManager);
- if (getClientConnectionManager() == getComponent().getClientConnectionManager()) {
+ if (getComponent() != null && getComponent().getClientConnectionManager() == getClientConnectionManager()) {
clientBuilder.setConnectionManagerShared(true);
}
[06/12] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17724edc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17724edc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17724edc
Branch: refs/heads/master
Commit: 17724edc01c50c283ca0e937bc3abe818e33cf8a
Parents: 5b1012e
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:55:26 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 07:55:26 2015 +0100
----------------------------------------------------------------------
.../src/test/scala/org/apache/camel/scala/UsingModelTest.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/17724edc/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
index 7cbc5d7..0dc2653 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
@@ -36,7 +36,7 @@ class UsingModelTest extends TestCase {
val bean = new BeanDefinition("myBean", "someMethod")
route.addOutput(bean)
- assertEquals("Route[[From[seda:foo]] -> [Bean[ref:myBean method: someMethod]]]", route.toString)
+ assertEquals("Route[[From[seda:foo]] -> [Bean[ref:myBean method:someMethod]]]", route.toString)
}
}
[07/12] camel git commit: CAMEL-9263: camel-servlet - Allow to
configure the context path without leading slash. Fixed issue with camel-gae
extending servlet and works a bit differently than a plain servlet.
Posted by da...@apache.org.
CAMEL-9263: camel-servlet - Allow to configure the context path without leading slash. Fixed issue with camel-gae extending servlet and works a bit differently than a plain servlet.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76f6bc4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76f6bc4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76f6bc4c
Branch: refs/heads/master
Commit: 76f6bc4ca93f4cd07623f77047a2b784bff1e982
Parents: 17724ed
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 08:11:16 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 08:11:16 2015 +0100
----------------------------------------------------------------------
.../component/gae/http/GHttpComponent.java | 6 +++++
.../component/servlet/ServletComponent.java | 27 +++++++++++++-------
2 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/76f6bc4c/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
index c5bb708..2fecd4d 100644
--- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
+++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpComponent.java
@@ -63,4 +63,10 @@ public class GHttpComponent extends ServletComponent {
protected ServletEndpoint createServletEndpoint(String endpointUri, ServletComponent component, URI httpUri) throws Exception {
return new GHttpEndpoint(endpointUri, component, httpUri);
}
+
+ @Override
+ protected boolean lenientContextPath() {
+ // must use the path as-is
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/76f6bc4c/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index 7da4497..25a1b1b 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -67,16 +67,18 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
String httpMethodRestrict = getAndRemoveParameter(parameters, "httpMethodRestrict", String.class);
HeaderFilterStrategy headerFilterStrategy = resolveAndRemoveReferenceParameter(parameters, "headerFilterStrategy", HeaderFilterStrategy.class);
- // the uri must have a leading slash for the context-path matching to work with servlet, and it can be something people
- // forget to add and then the servlet consumer cannot match the context-path as would have been expected
- String scheme = ObjectHelper.before(uri, ":");
- String after = ObjectHelper.after(uri, ":");
- // rebuild uri to have exactly one leading slash
- while (after.startsWith("/")) {
- after = after.substring(1);
+ if (lenientContextPath()) {
+ // the uri must have a leading slash for the context-path matching to work with servlet, and it can be something people
+ // forget to add and then the servlet consumer cannot match the context-path as would have been expected
+ String scheme = ObjectHelper.before(uri, ":");
+ String after = ObjectHelper.after(uri, ":");
+ // rebuild uri to have exactly one leading slash
+ while (after.startsWith("/")) {
+ after = after.substring(1);
+ }
+ after = "/" + after;
+ uri = scheme + ":" + after;
}
- after = "/" + after;
- uri = scheme + ":" + after;
// restructure uri to be based on the parameters left as we dont want to include the Camel internal options
URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encodeHttpURI(uri)), parameters);
@@ -120,6 +122,13 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
}
/**
+ * Whether defining the context-path is lenient and do not require an exact leading slash.
+ */
+ protected boolean lenientContextPath() {
+ return true;
+ }
+
+ /**
* Strategy to create the servlet endpoint.
*/
protected ServletEndpoint createServletEndpoint(String endpointUri, ServletComponent component, URI httpUri) throws Exception {
[02/12] camel git commit: Component docs fixed test
Posted by da...@apache.org.
Component docs fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93af7706
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93af7706
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93af7706
Branch: refs/heads/master
Commit: 93af770609f46be0f8eb064020424c0f14fb012d
Parents: 6cd6231
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:23:39 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 07:23:39 2015 +0100
----------------------------------------------------------------------
.../apache/camel/component/beanstalk/UriConfigurationTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/93af7706/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
index 998c112..3f5d464 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
@@ -38,9 +38,9 @@ public class UriConfigurationTest extends Assert {
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
- assertTrue(json.contains("\"awaitJob\": { \"kind\": \"parameter\", \"label\": \"consumer\", \"type\": \"boolean\""));
- assertTrue(json.contains("\"command\": { \"kind\": \"parameter\", \"type\": \"string\""));
- assertTrue(json.contains("\"jobTimeToRun\": { \"kind\": \"parameter\", \"type\": \"integer\""));
+ assertTrue(json.contains("\"command\": { \"kind\": \"parameter\", \"group\": \"common\", \"type\": \"string\""));
+ assertTrue(json.contains("\"jobTimeToRun\": { \"kind\": \"parameter\", \"group\": \"common\", \"type\": \"integer\""));
+ assertTrue(json.contains("\"awaitJob\": { \"kind\": \"parameter\", \"group\": \"consumer\", \"label\": \"consumer\", \"type\": \"boolean\""));
}
@Test
[11/12] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/46092b1e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/46092b1e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/46092b1e
Branch: refs/heads/camel-2.16.x
Commit: 46092b1eec99c914cde4278f97cd10de02b59581
Parents: d7faf4d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:55:26 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 08:12:35 2015 +0100
----------------------------------------------------------------------
.../src/test/scala/org/apache/camel/scala/UsingModelTest.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/46092b1e/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
index 7cbc5d7..0dc2653 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
@@ -36,7 +36,7 @@ class UsingModelTest extends TestCase {
val bean = new BeanDefinition("myBean", "someMethod")
route.addOutput(bean)
- assertEquals("Route[[From[seda:foo]] -> [Bean[ref:myBean method: someMethod]]]", route.toString)
+ assertEquals("Route[[From[seda:foo]] -> [Bean[ref:myBean method:someMethod]]]", route.toString)
}
}
[05/12] camel git commit: Fixed potential NPE
Posted by da...@apache.org.
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b1012ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b1012ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b1012ef
Branch: refs/heads/master
Commit: 5b1012ef4132bcdc3092287d7fcfcb3af206cefd
Parents: 8c938bc
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:48:30 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 07:48:30 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/http4/HttpEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5b1012ef/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index c5c82bc..b589e65 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@ -132,7 +132,7 @@ public class HttpEndpoint extends HttpCommonEndpoint {
clientBuilder.setDefaultCookieStore(cookieStore);
// setup the httpConnectionManager
clientBuilder.setConnectionManager(clientConnectionManager);
- if (getClientConnectionManager() == getComponent().getClientConnectionManager()) {
+ if (getComponent() != null && getComponent().getClientConnectionManager() == getClientConnectionManager()) {
clientBuilder.setConnectionManagerShared(true);
}
[09/12] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/009b90d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/009b90d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/009b90d0
Branch: refs/heads/camel-2.16.x
Commit: 009b90d074ae44be011754b4a31e52fdede1fda4
Parents: a56e2d8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:42:59 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 08:12:18 2015 +0100
----------------------------------------------------------------------
.../camel/coap/CoAPRestComponentTest.java | 28 +++-----------------
1 file changed, 4 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/009b90d0/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
index d201578..a104804 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
@@ -16,15 +16,9 @@
*/
package org.apache.camel.coap;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.eclipse.californium.core.CoapClient;
@@ -35,28 +29,13 @@ import org.junit.Test;
public class CoAPRestComponentTest extends CamelTestSupport {
static int coapport = AvailablePortFinder.getNextAvailable();
- static int jettyport = AvailablePortFinder.getNextAvailable();
-
-
- /*
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
- */
-
+
@Test
public void testCoAP() throws Exception {
NetworkConfig.createStandardWithoutFile();
CoapClient client;
CoapResponse rsp;
-
-
- URL url = new URL("http://localhost:" + jettyport + "/TestResource/Ducky");
- URLConnection connect = url.openConnection();
- InputStream ins = connect.getInputStream();
- assertEquals("Hello Ducky", IOConverter.toString(new InputStreamReader(ins)));
-
client = new CoapClient("coap://localhost:" + coapport + "/TestResource/Ducky");
client.setTimeout(1000000);
rsp = client.get();
@@ -71,7 +50,6 @@ public class CoAPRestComponentTest extends CamelTestSupport {
rsp = client.post("data", MediaTypeRegistry.TEXT_PLAIN);
assertEquals("Hello Ducky: data", rsp.getResponseText());
assertEquals(MediaTypeRegistry.TEXT_PLAIN, rsp.getOptions().getContentFormat());
-
}
@Override
@@ -80,10 +58,11 @@ public class CoAPRestComponentTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
restConfiguration("coap").host("localhost").port(coapport);
- restConfiguration("jetty").host("localhost").port(jettyport);
+
rest("/TestParms")
.get().to("direct:get1")
.post().to("direct:post1");
+
rest("/TestResource")
.get("/{id}").to("direct:get1")
.post("/{id}").to("direct:post1");
@@ -94,6 +73,7 @@ public class CoAPRestComponentTest extends CamelTestSupport {
exchange.getOut().setBody("Hello " + id);
}
});
+
from("direct:post1").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String id = exchange.getIn().getHeader("id", String.class);
[03/12] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/405d3d2d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/405d3d2d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/405d3d2d
Branch: refs/heads/master
Commit: 405d3d2d12c407ce93ac92704b61e6591444a67f
Parents: 93af770
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 19 07:42:59 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 19 07:42:59 2015 +0100
----------------------------------------------------------------------
.../camel/coap/CoAPRestComponentTest.java | 28 +++-----------------
1 file changed, 4 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/405d3d2d/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
index d201578..a104804 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
@@ -16,15 +16,9 @@
*/
package org.apache.camel.coap;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.eclipse.californium.core.CoapClient;
@@ -35,28 +29,13 @@ import org.junit.Test;
public class CoAPRestComponentTest extends CamelTestSupport {
static int coapport = AvailablePortFinder.getNextAvailable();
- static int jettyport = AvailablePortFinder.getNextAvailable();
-
-
- /*
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
- */
-
+
@Test
public void testCoAP() throws Exception {
NetworkConfig.createStandardWithoutFile();
CoapClient client;
CoapResponse rsp;
-
-
- URL url = new URL("http://localhost:" + jettyport + "/TestResource/Ducky");
- URLConnection connect = url.openConnection();
- InputStream ins = connect.getInputStream();
- assertEquals("Hello Ducky", IOConverter.toString(new InputStreamReader(ins)));
-
client = new CoapClient("coap://localhost:" + coapport + "/TestResource/Ducky");
client.setTimeout(1000000);
rsp = client.get();
@@ -71,7 +50,6 @@ public class CoAPRestComponentTest extends CamelTestSupport {
rsp = client.post("data", MediaTypeRegistry.TEXT_PLAIN);
assertEquals("Hello Ducky: data", rsp.getResponseText());
assertEquals(MediaTypeRegistry.TEXT_PLAIN, rsp.getOptions().getContentFormat());
-
}
@Override
@@ -80,10 +58,11 @@ public class CoAPRestComponentTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
restConfiguration("coap").host("localhost").port(coapport);
- restConfiguration("jetty").host("localhost").port(jettyport);
+
rest("/TestParms")
.get().to("direct:get1")
.post().to("direct:post1");
+
rest("/TestResource")
.get("/{id}").to("direct:get1")
.post("/{id}").to("direct:post1");
@@ -94,6 +73,7 @@ public class CoAPRestComponentTest extends CamelTestSupport {
exchange.getOut().setBody("Hello " + id);
}
});
+
from("direct:post1").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String id = exchange.getIn().getHeader("id", String.class);