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/12 20:43:27 UTC
[12/13] camel git commit: CAMEL-9309: Make it easier to turn on|off
java transport over http
CAMEL-9309: Make it easier to turn on|off java transport over http
Conflicts:
components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b1ccbcd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b1ccbcd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b1ccbcd
Branch: refs/heads/camel-2.15.x
Commit: 1b1ccbcd94860f6f1d8caf98fb59e6ab7b3940b4
Parents: ec4a48d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 12 20:36:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 12 20:43:45 2015 +0100
----------------------------------------------------------------------
.../apache/camel/component/jetty/CamelContinuationServlet.java | 1 -
.../apache/camel/component/jetty/javabody/HttpJavaBodyTest.java | 5 -----
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1b1ccbcd/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index 2bc44da..d0266c7 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -90,7 +90,6 @@ public class CamelContinuationServlet extends CamelServlet {
// we do not support java serialized objects unless explicit enabled
String contentType = request.getContentType();
if (HttpConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT.equals(contentType) && !consumer.getEndpoint().getComponent().isAllowJavaSerializedObject()) {
- System.out.println("415 miser !!!");
response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
return;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b1ccbcd/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
index 01428f7..8c0be57 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.component.jetty.JettyHttpComponent;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -40,7 +39,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
}
@Test
- @Ignore
public void testHttpSendJavaBodyAndReceiveString() throws Exception {
JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
jetty.setAllowJavaSerializedObject(true);
@@ -78,7 +76,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
}
@Test
- @Ignore
public void testHttpSendJavaBodyAndReceiveJavaBody() throws Exception {
JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
jetty.setAllowJavaSerializedObject(true);
@@ -117,7 +114,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
}
@Test
- @Ignore
public void testHttpSendStringAndReceiveJavaBody() throws Exception {
JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
jetty.setAllowJavaSerializedObject(true);
@@ -188,7 +184,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
}
@Test
- @Ignore
public void testNotAllowed() throws Exception {
JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
jetty.setAllowJavaSerializedObject(false);