camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [10/13] camel git commit: CAMEL-9309: Make it easier to turn on|off java transport over http
Date Thu, 12 Nov 2015 19:43:25 GMT
CAMEL-9309: Make it easier to turn on|off java transport over http


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8538534
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8538534
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8538534

Branch: refs/heads/camel-2.16.x
Commit: d853853469292cd54fd9662c3605030ab5a9566b
Parents: 231a462
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Nov 12 20:36:03 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Nov 12 20:42:02 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/d8538534/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 59660ab..68e7b48 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/d8538534/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 5eb566f..97a4d5f 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
@@ -25,7 +25,6 @@ import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.http.common.HttpCommonComponent;
 import org.apache.camel.http.common.HttpConstants;
 import org.apache.camel.http.common.HttpOperationFailedException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -39,7 +38,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
     }
 
     @Test
-    @Ignore
     public void testHttpSendJavaBodyAndReceiveString() throws Exception {
         HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
         jetty.setAllowJavaSerializedObject(true);
@@ -77,7 +75,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
     }
 
     @Test
-    @Ignore
     public void testHttpSendJavaBodyAndReceiveJavaBody() throws Exception {
         HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
         jetty.setAllowJavaSerializedObject(true);
@@ -116,7 +113,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
     }
 
     @Test
-    @Ignore
     public void testHttpSendStringAndReceiveJavaBody() throws Exception {
         HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
         jetty.setAllowJavaSerializedObject(true);
@@ -187,7 +183,6 @@ public class HttpJavaBodyTest extends BaseJettyTest {
     }
 
     @Test
-    @Ignore
     public void testNotAllowed() throws Exception {
         HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
         jetty.setAllowJavaSerializedObject(false);


Mime
View raw message