camel-http-common - as a common module
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54804493 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54804493 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54804493 Branch: refs/heads/master Commit: 5480449308fb3effec52469c2fc43dd42671fd5e Parents: 4ed9b0d Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 23 11:17:32 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 23 15:04:33 2015 +0200 ---------------------------------------------------------------------- components/camel-jetty8/pom.xml | 305 ++++++++++--------- .../component/jetty8/JettyHttpEndpoint8.java | 2 +- components/camel-jetty9/pom.xml | 262 ++++++++-------- .../component/jetty9/AttachmentHttpBinding.java | 4 +- .../component/jetty9/JettyHttpEndpoint9.java | 4 +- .../camel/component/jetty/BaseJettyTest.java | 4 +- .../component/jetty/CustomFiltersTest.java | 1 - .../camel/component/jetty/HandlerTest.java | 2 - .../jetty/HttpAuthMethodPriorityTest.java | 2 +- .../HttpBasicAuthComponentConfiguredTest.java | 5 +- .../component/jetty/HttpBasicAuthTest.java | 3 +- .../component/jetty/HttpBindingRefTest.java | 12 +- .../component/jetty/HttpConverterTest.java | 4 +- .../HttpOperationsFailedExceptionUriTest.java | 2 +- .../jetty/HttpRedirectNoLocationTest.java | 2 +- .../camel/component/jetty/HttpRedirectTest.java | 2 +- .../jetty/HttpRequestResponseTest.java | 2 +- .../component/jetty/HttpReturnFaultTest.java | 2 +- .../jetty/HttpRoundtripHeaderTest.java | 1 - .../camel/component/jetty/HttpRouteTest.java | 2 +- .../jetty/HttpStreamCacheFileTest.java | 2 +- ...ttpsRouteWithSslConnectorPropertiesTest.java | 2 - .../component/jetty/JettyHandle404Test.java | 3 +- .../jetty/JettyHttpBindingRefTest.java | 2 +- .../jetty/JettyHttpClientOptionsTest.java | 8 +- .../jetty/JettyHttpContentTypeTest.java | 1 - .../jetty/JettyHttpGetWithParamTest.java | 2 +- .../jetty/JettyResponseBodyWhenErrorTest.java | 2 +- .../JettyRouteWithSocketPropertiesTest.java | 1 - .../component/jetty/JettySuspendResumeTest.java | 4 +- .../camel/component/jetty/JettySuspendTest.java | 4 +- .../jetty/JettySuspendWhileInProgressTest.java | 2 +- .../component/jetty/MultiPartFormTest.java | 1 - .../MultiPartFormWithCustomFilterTest.java | 1 - .../camel/component/jetty/MyErrorHandler.java | 1 - .../camel/component/jetty/MyUrlRewrite.java | 2 +- .../JettyAsyncContinuationTimeoutTest.java | 2 +- ...ettyAsyncDefaultContinuationTimeoutTest.java | 2 +- .../jetty/javabody/HttpJavaBodyTest.java | 2 +- .../JettyHttpProderReturnFaultTest.java | 2 +- .../JettyHttpProducerGetWithParamTest.java | 2 +- .../JettyHttpProducerJavaBodyTest.java | 2 +- .../JettyHttpProducerRedirectTest.java | 2 +- .../JettyHttpProducerSimulate404ErrorTest.java | 2 +- .../JettyHttpProducerSuspendResumeTest.java | 4 +- .../JettyHttpProducerSuspendTest.java | 4 +- ...yHttpProducerSuspendWhileInProgressTest.java | 2 +- .../jetty/proxy/HttpClientProxyTest.java | 2 +- 48 files changed, 342 insertions(+), 347 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty8/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml index e6e04ef..7128f65 100644 --- a/components/camel-jetty8/pom.xml +++ b/components/camel-jetty8/pom.xml @@ -15,161 +15,168 @@ 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-jetty8</artifactId> - <packaging>bundle</packaging> - <name>Camel :: Jetty8</name> - <description>Camel Jetty8 support</description> + <artifactId>camel-jetty8</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Jetty8</name> + <description>Camel Jetty8 support</description> - <properties> - <camel.osgi.import.before.defaults> - javax.servlet.*;version="${servlet-version-range}" - </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.jetty8</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> - </properties> + <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> + <camel.osgi.export.pkg>org.apache.camel.component.jetty8</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty8-version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty8-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty8-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty8-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - <version>${jetty8-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - <version>${jetty8-version}</version> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <optional>true</optional> - <scope>test</scope> - </dependency> - <!-- for testing rest-dsl --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jackson</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jaxb</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <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.apache.camel</groupId> + <artifactId>camel-jetty-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty8-version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty8-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty8-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty8-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + <version>${jetty8-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty8-version}</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <!-- test dependencies --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <optional>true</optional> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-http</artifactId> + <scope>test</scope> + </dependency> + <!-- for testing rest-dsl --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jackson</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jaxb</artifactId> + <scope>test</scope> + </dependency> - <build> - <testSourceDirectory>target/generated/src/test/java</testSourceDirectory> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <configuration> - <target> - <copy todir="target/generated/src/test/java"> - <fileset dir="../camel-jetty9/src/test/java" /> - </copy> </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- use per test fork mode to avoid side effects --> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> - </configuration> - </plugin> - </plugins> - </build> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <testSourceDirectory>target/generated/src/test/java</testSourceDirectory> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <configuration> + <target> + <copy todir="target/generated/src/test/java"> + <fileset dir="../camel-jetty9/src/test/java"/> + </copy> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- use per test fork mode to avoid side effects --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java b/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java index 2efd975..59f8637 100644 --- a/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java +++ b/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java @@ -19,10 +19,10 @@ package org.apache.camel.component.jetty8; import java.net.URI; import java.net.URISyntaxException; -import org.apache.camel.component.http.HttpConsumer; import org.apache.camel.component.jetty.JettyContentExchange; import org.apache.camel.component.jetty.JettyHttpComponent; import org.apache.camel.component.jetty.JettyHttpEndpoint; +import org.apache.camel.http.common.HttpConsumer; import org.apache.camel.spi.UriEndpoint; @UriEndpoint(scheme = "jetty", extendsScheme = "http", title = "Jetty", http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index 6985708..426b8e5 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -15,141 +15,147 @@ 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-jetty9</artifactId> - <packaging>bundle</packaging> - <name>Camel :: Jetty</name> - <description>Camel Jetty support</description> + <artifactId>camel-jetty9</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Jetty</name> + <description>Camel Jetty support</description> - <properties> - <camel.osgi.import.before.defaults> - javax.servlet.*;version="${servlet-version-range}" - </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> - <jetty-version>${jetty9-version}</jetty-version> - </properties> + <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> + <camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> + <jetty-version>${jetty9-version}</jetty-version> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty9-version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty9-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty9-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - <version>${jetty9-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - <version>${jetty9-version}</version> - </dependency> + <dependency> + <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.apache.camel</groupId> + <artifactId>camel-jetty-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty9-version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty9-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty9-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty9-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + <version>${jetty9-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty9-version}</version> + </dependency> - <!-- test dependencies --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <optional>true</optional> - <scope>test</scope> - </dependency> - <!-- for testing rest-dsl --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jackson</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jaxb</artifactId> - <scope>test</scope> - </dependency> + <!-- test dependencies --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <optional>true</optional> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-http</artifactId> + <scope>test</scope> + </dependency> + <!-- for testing rest-dsl --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jackson</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jaxb</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <plugins> - <!-- use per test fork mode to avoid side effects --> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <!-- use per test fork mode to avoid side effects --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java index a7d8167..f798714 100644 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java +++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.Part; import org.apache.camel.RuntimeCamelException; -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; import org.eclipse.jetty.util.MultiPartInputStreamParser; final class AttachmentHttpBinding extends DefaultHttpBinding { http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java index 342353e..724a736 100644 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java +++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java @@ -19,11 +19,11 @@ package org.apache.camel.component.jetty9; import java.net.URI; import java.net.URISyntaxException; -import org.apache.camel.component.http.HttpBinding; -import org.apache.camel.component.http.HttpConsumer; import org.apache.camel.component.jetty.JettyContentExchange; import org.apache.camel.component.jetty.JettyHttpComponent; import org.apache.camel.component.jetty.JettyHttpEndpoint; +import org.apache.camel.http.common.HttpBinding; +import org.apache.camel.http.common.HttpConsumer; import org.apache.camel.spi.UriEndpoint; @UriEndpoint(scheme = "jetty", extendsScheme = "http", title = "Jetty 9", http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/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 aeb196f..b4ea46b 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 @@ -20,9 +20,9 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; import org.apache.camel.CamelContext; -import org.apache.camel.component.http.DefaultHttpBinding; -import org.apache.camel.component.http.HttpHeaderFilterStrategy; 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; import org.apache.camel.test.junit4.CamelTestSupport; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java index 463151b..c60eaa9 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.jetty; import java.io.IOException; import java.util.ArrayList; import java.util.List; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java index 7ff661f..48d5198 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java @@ -25,9 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.util.IOHelper; - import org.eclipse.jetty.server.handler.StatisticsHandler; - import org.junit.Test; public class HandlerTest extends BaseJettyTest { http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java index ec1a616..713e786 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java @@ -26,7 +26,7 @@ import org.apache.camel.FailedToCreateProducerException; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.impl.JndiRegistry; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java index 18fccfc..524d82e 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java @@ -24,9 +24,8 @@ import javax.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.AuthMethod; import org.apache.camel.component.http.HttpComponent; -import org.apache.camel.component.http.HttpConfiguration; +import org.apache.camel.http.common.HttpConfiguration; import org.apache.camel.impl.JndiRegistry; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; @@ -82,7 +81,7 @@ public class HttpBasicAuthComponentConfiguredTest extends BaseJettyTest { @Override public void configure() throws Exception { HttpConfiguration config = new HttpConfiguration(); - config.setAuthMethod(AuthMethod.Basic); + config.setAuthMethod("Basic"); config.setAuthUsername("donald"); config.setAuthPassword("duck"); http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java index 2aebd95..c51cc97 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java @@ -19,14 +19,13 @@ package org.apache.camel.component.jetty; import java.io.IOException; import java.security.Principal; import java.util.Arrays; - import javax.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.impl.JndiRegistry; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java index 22aa8ea..d44d8f8 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java @@ -22,8 +22,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.DefaultHttpBinding; -import org.apache.camel.component.http.HttpEndpoint; +import org.apache.camel.http.common.DefaultHttpBinding; import org.apache.camel.impl.JndiRegistry; import org.junit.Test; @@ -47,9 +46,8 @@ public class HttpBindingRefTest extends BaseJettyTest { @Override protected JndiRegistry createRegistry() throws Exception { JndiRegistry jndi = super.createRegistry(); - HttpEndpoint ep = new HttpEndpoint(); - jndi.bind("default", new DefaultHttpBinding(ep)); - jndi.bind("myownbinder", new MyHttpBinding(ep)); + jndi.bind("default", new DefaultHttpBinding()); + jndi.bind("myownbinder", new MyHttpBinding()); return jndi; } @@ -73,9 +71,7 @@ public class HttpBindingRefTest extends BaseJettyTest { // START SNIPPET: e1 public class MyHttpBinding extends DefaultHttpBinding { - public MyHttpBinding(HttpEndpoint ep) { - super(ep); - } + @Override public void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException { // we override the doWriteExceptionResponse as we only want to alter the binding how exceptions is http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java index eef0641..e62433b 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java @@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConverter; -import org.apache.camel.component.http.HttpMessage; +import org.apache.camel.http.common.HttpConverter; +import org.apache.camel.http.common.HttpMessage; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java index cc48438..c74aa9c 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java index b37b448..c556e8c 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java index cd26dae..c0f206c 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java @@ -20,8 +20,8 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java index 7c962c2..1d79f76 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpMessage; +import org.apache.camel.http.common.HttpMessage; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java index 86f2e85..cb53690 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.jetty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java index 16a9201..c125bc6 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java @@ -30,7 +30,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultHeaderFilterStrategy; import org.apache.camel.util.IOHelper; - import org.junit.Test; public class HttpRoundtripHeaderTest extends BaseJettyTest { http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java index b21455d..e28989c 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java @@ -29,9 +29,9 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpMessage; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.stream.InputStreamCache; +import org.apache.camel.http.common.HttpMessage; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.GetMethod; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java index 3c63f6a..76c9de5 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java @@ -22,8 +22,8 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.converter.stream.CachedOutputStream; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.util.ObjectHelper; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java index b85bd61..6c11866 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java @@ -18,8 +18,6 @@ package org.apache.camel.component.jetty; import java.net.URISyntaxException; import java.net.URL; -import java.util.HashMap; -import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Processor; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java index 12282de..7c5740c 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java @@ -16,12 +16,11 @@ */ package org.apache.camel.component.jetty; -import org.apache.camel.Component; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java index 54e6989..5d6151b 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.spi.HeaderFilterStrategy; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java index 387cdeb..5fc2d6f 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.jetty; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpEndpoint; import org.apache.camel.component.http.HttpProducer; +import org.apache.camel.http.common.HttpCommonEndpoint; import org.eclipse.jetty.client.HttpClient; import org.junit.Test; @@ -30,7 +30,7 @@ public class JettyHttpClientOptionsTest extends BaseJettyTest { @Test public void testCustomHttpBinding() throws Exception { // assert jetty was configured with our timeout - HttpEndpoint jettyEndpoint = context.getEndpoint("http://localhost:{{port}}/myapp/myservice?httpClient.soTimeout=5555";, HttpEndpoint.class); + HttpCommonEndpoint jettyEndpoint = context.getEndpoint("http://localhost:{{port}}/myapp/myservice?httpClient.soTimeout=5555";, HttpCommonEndpoint.class); assertNotNull("Jetty endpoint should not be null ", jettyEndpoint); HttpProducer producer = (HttpProducer)jettyEndpoint.createProducer(); assertEquals("Get the wrong http client parameter", 5555, producer.getHttpClient().getParams().getSoTimeout()); @@ -43,7 +43,7 @@ public class JettyHttpClientOptionsTest extends BaseJettyTest { @Test public void testProxySettingOfJettyHttpClient() throws Exception { // setup the Proxy setting through the URI - HttpEndpoint jettyEndpoint = context.getEndpoint("jetty://http://localhost:{{port}}/proxy/setting?proxyHost=192.168.0.1&proxyPort=9090";, HttpEndpoint.class); + HttpCommonEndpoint jettyEndpoint = context.getEndpoint("jetty://http://localhost:{{port}}/proxy/setting?proxyHost=192.168.0.1&proxyPort=9090";, HttpCommonEndpoint.class); assertNotNull("Jetty endpoint should not be null ", jettyEndpoint); JettyHttpProducer producer = (JettyHttpProducer)jettyEndpoint.createProducer(); assertProxyAddress(producer.getClient(), "192.168.0.1", 9090); @@ -51,7 +51,7 @@ public class JettyHttpClientOptionsTest extends BaseJettyTest { // setup the context properties context.getProperties().put("http.proxyHost", "192.168.0.2"); context.getProperties().put("http.proxyPort", "8080"); - jettyEndpoint = context.getEndpoint("jetty://http://localhost:{{port}}/proxy2/setting";, HttpEndpoint.class); + jettyEndpoint = context.getEndpoint("jetty://http://localhost:{{port}}/proxy2/setting";, HttpCommonEndpoint.class); producer = (JettyHttpProducer)jettyEndpoint.createProducer(); assertProxyAddress(producer.getClient(), "192.168.0.2", 8080); context.getProperties().clear(); http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java index f03afac..45fe7e5 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.jetty; import java.nio.charset.Charset; import org.apache.camel.Exchange; -import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java index c2aeecb..eb9d9c1 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.jetty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpMessage; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.http.common.HttpMessage; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java index 1fec3a6..97be71a 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java index 86ef152..67d5212 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java @@ -18,7 +18,6 @@ package org.apache.camel.component.jetty; import java.util.HashMap; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java index 31e05cc..5a2015d 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.jetty; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConsumer; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpConsumer; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java index 3935c71..df74096 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.jetty; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConsumer; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpConsumer; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java index cacbe95..3170962 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java index 7c81101..6b3e87f 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.jetty; import java.io.File; - import javax.activation.DataHandler; import org.apache.camel.Exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java index 846f8df..eef3b20 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java @@ -18,7 +18,6 @@ package org.apache.camel.component.jetty; import java.io.File; import java.io.IOException; - import javax.activation.DataHandler; import javax.servlet.FilterChain; import javax.servlet.ServletException; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java index 917ae35..a85936e 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java @@ -18,7 +18,6 @@ package org.apache.camel.component.jetty; import java.io.IOException; import java.io.Writer; - import javax.servlet.http.HttpServletRequest; import org.eclipse.jetty.server.handler.ErrorHandler; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyUrlRewrite.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyUrlRewrite.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyUrlRewrite.java index 8ca31d4..4fe26b4 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyUrlRewrite.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/MyUrlRewrite.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jetty; import org.apache.camel.Producer; -import org.apache.camel.component.http.UrlRewrite; +import org.apache.camel.http.common.UrlRewrite; /** * http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java index 91c7535..3ae3aff 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java @@ -18,8 +18,8 @@ package org.apache.camel.component.jetty.async; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.util.StopWatch; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java index c85d716..d608ce5 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java @@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.util.StopWatch; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/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 b55d938..9d9ca1b 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 @@ -19,8 +19,8 @@ package org.apache.camel.component.jetty.javabody; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConstants; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpConstants; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java index 628cd5b..21d83bb 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.jetty.jettyproducer; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java index cc421c9..712ea29 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java @@ -19,9 +19,9 @@ package org.apache.camel.component.jetty.jettyproducer; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpMessage; import org.apache.camel.component.jetty.BaseJettyTest; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.http.common.HttpMessage; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java index 9f17c31..6fa1c39 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.jetty.jettyproducer; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConstants; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpConstants; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java index 0c8379b..f70a927 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java @@ -20,8 +20,8 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java index bdda6df..9ce8b65 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.jetty.jettyproducer; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java index 0aa9e44..6be606d 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java @@ -17,9 +17,9 @@ package org.apache.camel.component.jetty.jettyproducer; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConsumer; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpConsumer; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java index dc67337..3ae9dda 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java @@ -17,9 +17,9 @@ package org.apache.camel.component.jetty.jettyproducer; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpConsumer; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpConsumer; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java index 3edec66..41e0e04 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java @@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/54804493/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java index e2e245f..283f865 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java @@ -21,8 +21,8 @@ import java.lang.reflect.UndeclaredThrowableException; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.ProxyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpOperationFailedException; import org.apache.camel.component.jetty.BaseJettyTest; +import org.apache.camel.http.common.HttpOperationFailedException; import org.junit.Test; /**
