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 2016/04/27 08:36:48 UTC
[1/2] camel git commit: CAMEL-9908: Removing jetty 8
Repository: camel
Updated Branches:
refs/heads/master eb7439438 -> bc77989c9
CAMEL-9908: Removing jetty 8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc77989c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc77989c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc77989c
Branch: refs/heads/master
Commit: bc77989c90e396a06ea81d71f7d06a3156a0d42a
Parents: bb52dd5
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 27 08:36:14 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 27 08:36:42 2016 +0200
----------------------------------------------------------------------
components/camel-atmosphere-websocket/pom.xml | 14 +++++++-------
.../websocket/WebsocketCamelRouterTestSupport.java | 10 ++--------
.../WebsocketCamelRouterWithInitParamTestSupport.java | 10 ++--------
3 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bc77989c/components/camel-atmosphere-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index f74778f..6bb3f8d 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -40,9 +40,9 @@
org.atmosphere.*;version="${atmosphere-version-range}",
org.apache.catalina;resolution:=optional,
org.apache.catalina.comet;resolution:=optional,
- org.eclipse.jetty.continuation;version="[8,10)";resolution:=optional,
- org.eclipse.jetty.server;version="[8,10)";resolution:=optional,
- org.eclipse.jetty.util.ssl;version="[8,10)";resolution:=optional,
+ org.eclipse.jetty.continuation;version="[9,10)";resolution:=optional,
+ org.eclipse.jetty.server;version="[9,10)";resolution:=optional,
+ org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional,
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
@@ -99,15 +99,15 @@
<!-- Jetty 8 for testing-->
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${jetty8-version}</version>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty8-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/bc77989c/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
index 95a23bc..bf98802 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.atmosphere.websocket;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.After;
@@ -38,12 +36,8 @@ public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
@Before
public void setUp() throws Exception {
- server = new Server();
- Connector connector = new SelectChannelConnector();
- connector.setHost("localhost");
- connector.setPort(PORT);
- server.addConnector(connector);
-
+ server = new Server(PORT);
+
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/camel/blob/bc77989c/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
index 8acf18c..b8c5768 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.atmosphere.websocket;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.After;
@@ -38,12 +36,8 @@ public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSuppo
@Before
public void setUp() throws Exception {
- server = new Server();
- Connector connector = new SelectChannelConnector();
- connector.setHost("localhost");
- connector.setPort(PORT);
- server.addConnector(connector);
-
+ server = new Server(PORT);
+
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
server.setHandler(context);
[2/2] camel git commit: CAMEL-9911: rest-dsl biding mode is off by
default.
Posted by da...@apache.org.
CAMEL-9911: rest-dsl biding mode is off by default.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb52dd52
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb52dd52
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb52dd52
Branch: refs/heads/master
Commit: bb52dd52a2b7d8d1898f22512fc703e4f4cf861d
Parents: eb74394
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 27 08:26:10 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 27 08:36:42 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/rest/RestBindingDefinition.java | 4 ++--
.../org/apache/camel/model/rest/RestConfigurationDefinition.java | 4 ++--
.../org/apache/camel/processor/binding/RestBindingProcessor.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bb52dd52/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
index b46aba5..a835a35 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
@@ -54,7 +54,7 @@ public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinit
private String produces;
@XmlAttribute
- @Metadata(defaultValue = "auto")
+ @Metadata(defaultValue = "off")
private RestBindingMode bindingMode;
@XmlAttribute
@@ -299,7 +299,7 @@ public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinit
/**
* Sets the binding mode to use.
* <p/>
- * The default value is auto
+ * The default value is off
*/
public void setBindingMode(RestBindingMode bindingMode) {
this.bindingMode = bindingMode;
http://git-wip-us.apache.org/repos/asf/camel/blob/bb52dd52/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index fb03ef5..89ad625 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -72,7 +72,7 @@ public class RestConfigurationDefinition {
@XmlAttribute
private RestHostNameResolver hostNameResolver;
- @XmlAttribute @Metadata(defaultValue = "auto")
+ @XmlAttribute @Metadata(defaultValue = "off")
private RestBindingMode bindingMode;
@XmlAttribute
@@ -263,7 +263,7 @@ public class RestConfigurationDefinition {
/**
* Sets the binding mode to use.
* <p/>
- * The default value is auto
+ * The default value is off
*/
public void setBindingMode(RestBindingMode bindingMode) {
this.bindingMode = bindingMode;
http://git-wip-us.apache.org/repos/asf/camel/blob/bb52dd52/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
index d79b099..5614797 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
@@ -156,7 +156,7 @@ public class RestBindingProcessor extends ServiceSupport implements AsyncProcess
// okay we have a binding mode, so need to check for empty body as that can cause the marshaller to fail
// as they assume a non-empty body
if (isXml || isJson) {
- // we have binding enabled, so we need to know if there body is empty or not\
+ // we have binding enabled, so we need to know if there body is empty or not
// so force reading the body as a String which we can work with
body = MessageHelper.extractBodyAsString(exchange.getIn());
if (body != null) {