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
apache · Nov 12, 2015 · 1b1ccbc · 1b1ccbc
1 parent ec4a48d
commit 1b1ccbc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/...jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java b/...jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -90,7 +90,6 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
         // 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;
         }

diff --git a/...amel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java b/...amel-jetty9/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
@@ -26,7 +26,6 @@
 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 boolean isUseRouteBuilder() {
     }
 
     @Test
-    @Ignore
     public void testHttpSendJavaBodyAndReceiveString() throws Exception {
         JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
         jetty.setAllowJavaSerializedObject(true);
@@ -78,7 +76,6 @@ public void process(Exchange exchange) throws Exception {
     }
 
     @Test
-    @Ignore
     public void testHttpSendJavaBodyAndReceiveJavaBody() throws Exception {
         JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
         jetty.setAllowJavaSerializedObject(true);
@@ -117,7 +114,6 @@ public void process(Exchange exchange) throws Exception {
     }
 
     @Test
-    @Ignore
     public void testHttpSendStringAndReceiveJavaBody() throws Exception {
         JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
         jetty.setAllowJavaSerializedObject(true);
@@ -188,7 +184,6 @@ public void process(Exchange exchange) throws Exception {
     }
 
     @Test
-    @Ignore
     public void testNotAllowed() throws Exception {
         JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
         jetty.setAllowJavaSerializedObject(false);