camel-http-common - as a common module

components/camel-servlet/pom.xml

@@ -15,20 +15,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.16-SNAPSHOT</version>
+  </parent>
 
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>2.16-SNAPSHOT</version>
-    </parent>
-
   <artifactId>camel-servlet</artifactId>
   <packaging>bundle</packaging>
   <name>Camel :: Servlet</name>
   <description>Camel servlet transport support</description>
-  
+
   <properties>
     <camel.osgi.import.before.defaults>
       javax.servlet.*;version="${servlet-version-range}"
@@ -45,12 +46,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
+      <artifactId>camel-http-common</artifactId>
       <exclusions>
-         <exclusion>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-         </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -89,14 +90,14 @@
       <groupId>httpunit</groupId>
       <artifactId>httpunit</artifactId>
       <exclusions>
-         <exclusion>
-      	   <groupId>javax.servlet</groupId>
-           <artifactId>servlet-api</artifactId>
-         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>rhino</groupId>
       <artifactId>js</artifactId>
       <version>${rhino-version}</version>
@@ -119,17 +120,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkCount>1</forkCount>
-	  <reuseForks>false</reuseForks>
+          <reuseForks>false</reuseForks>
         </configuration>
       </plugin>
-     </plugins>
-   </build>
-    
+    </plugins>
+  </build>
+
 </project>

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;
 

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;
 

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 

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<? extends HttpEndpoint> endpointClass) {
+    public ServletComponent(Class<? extends ServletEndpoint> endpointClass) {
         super(endpointClass);
     }
 
-
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        HttpClientParams params = new HttpClientParams();
-        IntrospectionSupport.setProperties(params, parameters, "httpClient.");
-
-        // create the configurer to use for this endpoint
-        final Set<AuthMethod> authMethods = new LinkedHashSet<AuthMethod>();
-        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<String, Obje
         // restructure uri to be based on the parameters left as we dont want to include the Camel internal options
         URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encodeHttpURI(uri)), parameters);
 
-        ServletEndpoint endpoint = createServletEndpoint(uri, this, httpUri, params, getHttpConnectionManager(), configurer);
+        ServletEndpoint endpoint = createServletEndpoint(uri, this, httpUri);
         endpoint.setServletName(servletName);
         if (headerFilterStrategy != null) {
             endpoint.setHeaderFilterStrategy(headerFilterStrategy);
@@ -125,9 +109,8 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
     /**
      * Strategy to create the servlet endpoint.
      */
-    protected ServletEndpoint createServletEndpoint(String endpointUri, ServletComponent component, URI httpUri, HttpClientParams params,
-                                                    HttpConnectionManager httpConnectionManager, HttpClientConfigurer clientConfigurer) throws Exception {
-        return new ServletEndpoint(endpointUri, component, httpUri, params, httpConnectionManager, clientConfigurer);
+    protected ServletEndpoint createServletEndpoint(String endpointUri, ServletComponent component, URI httpUri) throws Exception {
+        return new ServletEndpoint(endpointUri, component, httpUri);
     }
 
     @Override

components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletConsumer.java

@@ -17,11 +17,8 @@
 package org.apache.camel.component.servlet;
 
 import org.apache.camel.Processor;
-import org.apache.camel.component.http.HttpConsumer;
+import org.apache.camel.http.common.HttpConsumer;
 
-/**
- *
- */
 public class ServletConsumer extends HttpConsumer {
 
     public ServletConsumer(ServletEndpoint endpoint, Processor processor) {

components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java

@@ -22,27 +22,23 @@
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.component.http.HttpClientConfigurer;
-import org.apache.camel.component.http.HttpEndpoint;
+import org.apache.camel.http.common.HttpCommonEndpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriPath;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.params.HttpClientParams;
 
 @UriEndpoint(scheme = "servlet", extendsScheme = "http", title = "Servlet",
         syntax = "servlet:servletName", consumerOnly = true, consumerClass = ServletConsumer.class, label = "http")
-public class ServletEndpoint extends HttpEndpoint {
+public class ServletEndpoint extends HttpCommonEndpoint {
 
     @UriPath(label = "consumer") @Metadata(required = "true")
     private String servletName;
 
     public ServletEndpoint() {
     }
 
-    public ServletEndpoint(String endPointURI, ServletComponent component, URI httpUri, HttpClientParams params, HttpConnectionManager httpConnectionManager,
-                           HttpClientConfigurer clientConfigurer) throws URISyntaxException {
-        super(endPointURI, component, httpUri, params, httpConnectionManager, clientConfigurer);
+    public ServletEndpoint(String endPointURI, ServletComponent component, URI httpUri) throws URISyntaxException {
+        super(endPointURI, component, httpUri);
     }
 
     /**

components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestHttpBinding.java

@@ -18,8 +18,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.camel.component.http.DefaultHttpBinding;
-import org.apache.camel.component.http.HttpMessage;
+import org.apache.camel.http.common.DefaultHttpBinding;
+import org.apache.camel.http.common.HttpMessage;
 
 public class ServletRestHttpBinding extends DefaultHttpBinding {
 

components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestServletResolveConsumerStrategy.java

@@ -23,11 +23,11 @@
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.camel.component.http.HttpConsumer;
-import org.apache.camel.component.http.HttpServletResolveConsumerStrategy;
+import org.apache.camel.http.common.HttpConsumer;
+import org.apache.camel.http.common.HttpServletResolveConsumerStrategy;
 
 /**
- * A {@link org.apache.camel.component.http.HttpServletResolveConsumerStrategy} that supports the Rest DSL.
+ * A {@link org.apache.camel.http.common.HttpServletResolveConsumerStrategy} that supports the Rest DSL.
  */
 public class ServletRestServletResolveConsumerStrategy extends HttpServletResolveConsumerStrategy {
 

components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java

@@ -23,8 +23,8 @@
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpConstants;
-import org.apache.camel.component.http.helper.HttpHelper;
+import org.apache.camel.http.common.HttpConstants;
+import org.apache.camel.http.common.HttpHelper;
 import org.junit.Test;
 
 /**

components/camel-urlrewrite/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -42,6 +43,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-http-common</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.tuckey</groupId>
       <artifactId>urlrewritefilter</artifactId>
@@ -53,22 +58,20 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- various Camel component that supports this url rewriter -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
-      <scope>provided</scope>
+      <artifactId>camel-test</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http4</artifactId>
-      <scope>provided</scope>
+      <artifactId>camel-http</artifactId>
+      <scope>test</scope>
     </dependency>
-
-    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
+      <artifactId>camel-http4</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,7 +98,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkCount>1</forkCount>
-	  <reuseForks>false</reuseForks>
+          <reuseForks>false</reuseForks>
           <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
         </configuration>
       </plugin>

components/camel-urlrewrite/src/main/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewrite.java → 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}.