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:26 UTC
[11/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
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c703479f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c703479f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c703479f
Branch: refs/heads/camel-2.16.x
Commit: c703479f5880a099c38f2fd5e63c7d9f0567e5ff
Parents: d853853
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 12 20:41:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 12 20:42:08 2015 +0100
----------------------------------------------------------------------
components/camel-ahc/pom.xml | 2 +-
.../apache/camel/component/ahc/BaseAhcTest.java | 1 -
.../ahc/javabody/AhcProduceJavaBodyTest.java | 20 ++++++++++++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c703479f/components/camel-ahc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index be04e3a..efc23b4 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty</artifactId>
+ <artifactId>camel-jetty9</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c703479f/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
index 5a68715..6481b05 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
@@ -131,7 +131,6 @@ public abstract class BaseAhcTest extends CamelTestSupport {
}
protected String getTestServerEndpointTwoUri() {
-
return "jetty:" + getTestServerEndpointTwoUrl();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c703479f/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
index 8b3f395..033976e 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
@@ -22,6 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.ahc.AhcComponent;
import org.apache.camel.component.ahc.AhcConstants;
import org.apache.camel.component.ahc.BaseAhcTest;
+import org.apache.camel.component.jetty.JettyHttpComponent;
+import org.apache.camel.http.common.HttpCommonComponent;
import org.junit.Test;
/**
@@ -36,6 +38,9 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
@Test
public void testHttpSendJavaBodyAndReceiveString() throws Exception {
+ HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+ jetty.setAllowJavaSerializedObject(true);
+
AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
ahc.setAllowJavaSerializedObject(true);
@@ -70,6 +75,9 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
@Test
public void testHttpSendJavaBodyAndReceiveJavaBody() throws Exception {
+ HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+ jetty.setAllowJavaSerializedObject(true);
+
AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
ahc.setAllowJavaSerializedObject(true);
@@ -105,6 +113,9 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
@Test
public void testHttpSendStringAndReceiveJavaBody() throws Exception {
+ HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+ jetty.setAllowJavaSerializedObject(true);
+
AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
ahc.setAllowJavaSerializedObject(true);
@@ -135,6 +146,9 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
@Test
public void testNotAllowedReceive() throws Exception {
+ HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+ jetty.setAllowJavaSerializedObject(true);
+
AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
ahc.setAllowJavaSerializedObject(false);
@@ -163,6 +177,12 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
@Test
public void testNotAllowed() throws Exception {
+ JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
+ jetty.setAllowJavaSerializedObject(false);
+
+ AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
+ ahc.setAllowJavaSerializedObject(false);
+
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {