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/10/28 04:22:35 UTC
[4/5] git commit: CAMEL-7971 Merged the patch into camel-jetty
CAMEL-7971 Merged the patch into camel-jetty
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/617a898e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/617a898e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/617a898e
Branch: refs/heads/master
Commit: 617a898ecb22dd15ac0dc5dd35f142ba0ade1b6c
Parents: b6e2faf
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Oct 28 11:21:41 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Oct 28 11:21:41 2014 +0800
----------------------------------------------------------------------
.../camel/component/jetty/JettyHttpComponent.java | 10 +++++-----
.../camel/component/jetty/rest/RestJettyGetTest.java | 12 +++++++++++-
2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/617a898e/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 750be5d..8d18d1f 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -997,15 +997,15 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac
String query = URISupport.createQueryString(map);
String url = "jetty:%s://%s:%s/%s?httpMethodRestrict=%s";
- if (!query.isEmpty()) {
- url = url + "&" + query;
- }
-
// must use upper case for restrict
String restrict = verb.toUpperCase(Locale.US);
-
// get the endpoint
url = String.format(url, scheme, host, port, path, restrict);
+
+ if (!query.isEmpty()) {
+ url = url + "&" + query;
+ }
+
JettyHttpEndpoint endpoint = camelContext.getEndpoint(url, JettyHttpEndpoint.class);
setProperties(endpoint, parameters);
http://git-wip-us.apache.org/repos/asf/camel/blob/617a898e/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java
index 04863d1..5022681 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java
@@ -20,9 +20,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
+import org.apache.camel.component.jetty.JettyRestHttpBinding;
+import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class RestJettyGetTest extends BaseJettyTest {
+
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("mybinding", new JettyRestHttpBinding());
+ return jndi;
+ }
@Test
public void testJettyProducerGet() throws Exception {
@@ -36,7 +46,7 @@ public class RestJettyGetTest extends BaseJettyTest {
@Override
public void configure() throws Exception {
// configure to use jetty on localhost with the given port
- restConfiguration().component("jetty").host("localhost").port(getPort());
+ restConfiguration().component("jetty").host("localhost").port(getPort()).endpointProperty("httpBindingRef", "#mybinding");
// use the rest DSL to define the rest services
rest("/users/")