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/07/26 18:43:28 UTC
[1/2] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master 5a2a02917 -> a87299217
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0907ada9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0907ada9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0907ada9
Branch: refs/heads/master
Commit: 0907ada9ed5cc447ebc82fa2bad420f2ee8c8e46
Parents: 5a2a029
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jul 26 18:22:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 26 18:22:56 2015 +0200
----------------------------------------------------------------------
.../component/jetty/JettyHttpComponent.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0907ada9/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index f5ec313..94b58d7 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -44,6 +44,7 @@ import org.apache.camel.http.common.CamelServlet;
import org.apache.camel.http.common.HttpBinding;
import org.apache.camel.http.common.HttpCommonComponent;
import org.apache.camel.http.common.HttpCommonEndpoint;
+import org.apache.camel.http.common.HttpConfiguration;
import org.apache.camel.http.common.HttpConsumer;
import org.apache.camel.http.common.UrlRewrite;
import org.apache.camel.spi.HeaderFilterStrategy;
@@ -792,6 +793,24 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
this.jettyHttpBinding = jettyHttpBinding;
}
+ /**
+ * Not to be used - use JettyHttpBinding instead.
+ */
+ @Override
+ @Metadata(description = "Not to be used - use JettyHttpBinding instead.")
+ public void setHttpBinding(HttpBinding httpBinding) {
+ throw new IllegalArgumentException("Not to be used - use JettyHttpBinding instead.");
+ }
+
+ /**
+ * Jetty component does not use HttpConfiguration.
+ */
+ @Override
+ @Metadata(description = "Jetty component does not use HttpConfiguration.")
+ public void setHttpConfiguration(HttpConfiguration httpConfiguration) {
+ throw new IllegalArgumentException("Jetty component does not use HttpConfiguration.");
+ }
+
public synchronized MBeanContainer getMbContainer() {
// If null, provide the default implementation.
if (mbContainer == null) {
[2/2] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8729921
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8729921
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8729921
Branch: refs/heads/master
Commit: a872992176f4c5a8042cfeefd585b01312125aba
Parents: 0907ada
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jul 26 18:42:02 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 26 18:42:02 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/jetty/BaseJettyTest.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a8729921/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
index b4ea46b..c9c8f4d 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.http.common.DefaultHttpBinding;
import org.apache.camel.http.common.HttpHeaderFilterStrategy;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
@@ -106,9 +105,7 @@ public abstract class BaseJettyTest extends CamelTestSupport {
JettyHttpComponent jetty = (JettyHttpComponent)context.getComponent("jetty");
HttpHeaderFilterStrategy filterStrat = new HttpHeaderFilterStrategy();
filterStrat.setAllowNullValues(true);
- @SuppressWarnings("deprecation")
- DefaultHttpBinding httpBinding = new DefaultHttpBinding(filterStrat);
- jetty.setHttpBinding(httpBinding);
+ jetty.setHeaderFilterStrategy(filterStrat);
}
protected boolean isJetty8() {