From 617b1965e9f84db996e8a1ca2cc47d77e86a09ee Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Thu, 23 Jul 2015 10:01:38 +0200 Subject: [PATCH] camel-http-common - as a common module --- components/camel-servlet/pom.xml | 49 ++++++++++--------- .../servlet/CamelHttpTransportServlet.java | 4 +- .../servlet/DefaultHttpRegistry.java | 4 +- .../camel/component/servlet/HttpRegistry.java | 4 +- .../component/servlet/ServletComponent.java | 33 +++---------- .../component/servlet/ServletConsumer.java | 5 +- .../component/servlet/ServletEndpoint.java | 12 ++--- .../servlet/ServletRestHttpBinding.java | 4 +- ...letRestServletResolveConsumerStrategy.java | 6 +-- .../servlet/ServletTransferExceptionTest.java | 4 +- components/camel-urlrewrite/pom.xml | 23 +++++---- .../urlrewrite/{http => }/HttpUrlRewrite.java | 5 +- .../urlrewrite/http4/Http4UrlRewrite.java | 40 --------------- ...HttpUrlRewriteLoadBalanceFailoverTest.java | 1 + ...tpUrlRewriteLoadBalanceRoundRobinTest.java | 1 + .../http/HttpUrlRewriteModFileTest.java | 1 + .../http/HttpUrlRewriteModTest.java | 1 + .../http/HttpUrlRewritePingQueryTest.java | 1 + .../http/HttpUrlRewritePingTest.java | 1 + .../urlrewrite/http/HttpUrlRewriteTest.java | 1 + ...ettyUrlRewriteLoadBalanceFailoverTest.java | 2 +- ...tyUrlRewriteLoadBalanceRoundRobinTest.java | 2 +- .../jetty/JettyUrlRewriteModTest.java | 2 +- .../urlrewrite/jetty/JettyUrlRewriteTest.java | 2 +- 24 files changed, 77 insertions(+), 131 deletions(-) rename components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/{http => }/HttpUrlRewrite.java (88%) delete mode 100644 components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http4/Http4UrlRewrite.java diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index baaa194453534..680d36a026b33 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -15,20 +15,21 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 + + + org.apache.camel + components + 2.16-SNAPSHOT + - - org.apache.camel - components - 2.16-SNAPSHOT - - camel-servlet bundle Camel :: Servlet Camel servlet transport support - + javax.servlet.*;version="${servlet-version-range}" @@ -45,12 +46,12 @@ org.apache.camel - camel-http + camel-http-common - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + @@ -89,14 +90,14 @@ httpunit httpunit - - javax.servlet - servlet-api - + + javax.servlet + servlet-api + test - + rhino js ${rhino-version} @@ -119,17 +120,17 @@ test - + maven-surefire-plugin 1 - false + false - - - + + + diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java index 733ea7225d86c..67fcc89a19570 100644 --- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java +++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java @@ -19,9 +19,9 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import org.apache.camel.component.http.CamelServlet; -import org.apache.camel.component.http.HttpConsumer; import org.apache.camel.converter.ObjectConverter; +import org.apache.camel.http.common.CamelServlet; +import org.apache.camel.http.common.HttpConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java index b364710984928..8827730c0872f 100644 --- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java +++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java @@ -23,8 +23,8 @@ import java.util.Set; import javax.servlet.Servlet; -import org.apache.camel.component.http.CamelServlet; -import org.apache.camel.component.http.HttpConsumer; +import org.apache.camel.http.common.CamelServlet; +import org.apache.camel.http.common.HttpConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistry.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistry.java index 90eb3d618bb6e..980949bdd8b6b 100644 --- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistry.java +++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistry.java @@ -16,8 +16,8 @@ */ package org.apache.camel.component.servlet; -import org.apache.camel.component.http.CamelServlet; -import org.apache.camel.component.http.HttpConsumer; +import org.apache.camel.http.common.CamelServlet; +import org.apache.camel.http.common.HttpConsumer; /** * Keeps track of HttpConsumers and CamelServlets and diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java index e2eba068bb90b..2bbf00f45b155 100644 --- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java +++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java @@ -18,32 +18,24 @@ import java.net.URI; import java.util.HashMap; -import java.util.LinkedHashSet; import java.util.Locale; import java.util.Map; -import java.util.Set; import org.apache.camel.CamelContext; import org.apache.camel.Consumer; import org.apache.camel.Endpoint; import org.apache.camel.Processor; -import org.apache.camel.component.http.AuthMethod; -import org.apache.camel.component.http.HttpBinding; -import org.apache.camel.component.http.HttpClientConfigurer; -import org.apache.camel.component.http.HttpComponent; -import org.apache.camel.component.http.HttpConsumer; -import org.apache.camel.component.http.HttpEndpoint; +import org.apache.camel.http.common.HttpBinding; +import org.apache.camel.http.common.HttpCommonComponent; +import org.apache.camel.http.common.HttpConsumer; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestConsumerFactory; import org.apache.camel.util.FileUtil; -import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.URISupport; import org.apache.camel.util.UnsafeUriCharactersEncoder; -import org.apache.commons.httpclient.HttpConnectionManager; -import org.apache.commons.httpclient.params.HttpClientParams; -public class ServletComponent extends HttpComponent implements RestConsumerFactory { +public class ServletComponent extends HttpCommonComponent implements RestConsumerFactory { private String servletName = "CamelServlet"; private HttpRegistry httpRegistry; @@ -52,20 +44,12 @@ public ServletComponent() { super(ServletEndpoint.class); } - public ServletComponent(Class endpointClass) { + public ServletComponent(Class endpointClass) { super(endpointClass); } - @Override protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { - HttpClientParams params = new HttpClientParams(); - IntrospectionSupport.setProperties(params, parameters, "httpClient."); - - // create the configurer to use for this endpoint - final Set authMethods = new LinkedHashSet(); - HttpClientConfigurer configurer = createHttpClientConfigurer(parameters, authMethods); - // must extract well known parameters before we create the endpoint Boolean throwExceptionOnFailure = getAndRemoveParameter(parameters, "throwExceptionOnFailure", Boolean.class); Boolean transferException = getAndRemoveParameter(parameters, "transferException", Boolean.class); @@ -84,7 +68,7 @@ protected Endpoint createEndpoint(String uri, String remaining, Map - + 4.0.0 @@ -42,6 +43,10 @@ org.apache.camel camel-core + + org.apache.camel + camel-http-common + org.tuckey urlrewritefilter @@ -53,22 +58,20 @@ provided - + org.apache.camel - camel-http - provided + camel-test + test org.apache.camel - camel-http4 - provided + camel-http + test - - org.apache.camel - camel-test + camel-http4 test @@ -95,7 +98,7 @@ maven-surefire-plugin 1 - false + false 1800 diff --git a/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewrite.java b/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/HttpUrlRewrite.java similarity index 88% rename from components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewrite.java rename to components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/HttpUrlRewrite.java index 45869d13dd729..3724526e45a1a 100644 --- a/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewrite.java +++ b/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/HttpUrlRewrite.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.urlrewrite.http; +package org.apache.camel.component.urlrewrite; import javax.servlet.http.HttpServletRequest; import org.apache.camel.Producer; -import org.apache.camel.component.http.HttpServletUrlRewrite; -import org.apache.camel.component.urlrewrite.UrlRewriteFilter; +import org.apache.camel.http.common.HttpServletUrlRewrite; /** * The camel-http component implementation of the {@link HttpServletUrlRewrite}. diff --git a/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http4/Http4UrlRewrite.java b/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http4/Http4UrlRewrite.java deleted file mode 100644 index 6c33b06c8070e..0000000000000 --- a/components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http4/Http4UrlRewrite.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.urlrewrite.http4; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.camel.Producer; -import org.apache.camel.component.http4.HttpServletUrlRewrite; -import org.apache.camel.component.urlrewrite.UrlRewriteFilter; - -/** - * The camel-http4 component implementation of the {@link org.apache.camel.component.http.HttpServletUrlRewrite}. - */ -public class Http4UrlRewrite extends UrlRewriteFilter implements HttpServletUrlRewrite { - - @Override - public String rewrite(String url, String relativeUrl, Producer producer, HttpServletRequest request) throws Exception { - return rewrite(relativeUrl, request); - } - - @Override - public String rewrite(String url, String relativeUrl, Producer producer) throws Exception { - // not in use - return null; - } -} diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceFailoverTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceFailoverTest.java index c3969e09fc2d7..f96071ecbf7cf 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceFailoverTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceFailoverTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceRoundRobinTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceRoundRobinTest.java index eccfc0f82d93e..e7be2f1fce4f9 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceRoundRobinTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteLoadBalanceRoundRobinTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModFileTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModFileTest.java index 6838a6a4a13fb..13654187a2531 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModFileTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModFileTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java index b90e99cd8806f..011519713bdb8 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java index e162333980da9..cb65fc6d79868 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java index b113f59f8f89d..93e10c8d86a0e 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java index 9d799ba926d26..064c0496cb015 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java @@ -18,6 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceFailoverTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceFailoverTest.java index 55513bd891167..d2e3ba199ea1d 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceFailoverTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceFailoverTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; -import org.apache.camel.component.urlrewrite.http.HttpUrlRewrite; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceRoundRobinTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceRoundRobinTest.java index b21216d18f3e4..30959a2ac5332 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceRoundRobinTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteLoadBalanceRoundRobinTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; -import org.apache.camel.component.urlrewrite.http.HttpUrlRewrite; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java index 7e2a45e9f4454..b00208a841272 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; -import org.apache.camel.component.urlrewrite.http.HttpUrlRewrite; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java index e8c90da1fa9e3..efeafafdc2b6e 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.urlrewrite.BaseUrlRewriteTest; -import org.apache.camel.component.urlrewrite.http.HttpUrlRewrite; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; import org.apache.camel.impl.JndiRegistry; import org.junit.Test;