Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java Sat Apr 10 10:25:11 2010 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.http.handler.BasicValidationHandler; +import org.apache.camel.component.http4.handler.BasicValidationHandler; import org.apache.http.localserver.LocalTestServer; import org.junit.Test; @@ -31,7 +31,7 @@ public class HttpQueryTest extends BaseH @Test public void httpQuery() throws Exception { - Exchange exchange = template.request("http://" + getHostName() + ":" + getPort() + "/?hl=en&q=camel", new Processor() { + Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/?hl=en&q=camel", new Processor() { public void process(Exchange exchange) throws Exception { } }); @@ -41,7 +41,7 @@ public class HttpQueryTest extends BaseH @Test public void httpQueryHeader() throws Exception { - Exchange exchange = template.request("http://" + getHostName() + ":" + getPort() + "/", new Processor() { + Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/", new Processor() { public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader(Exchange.HTTP_QUERY, "hl=en&q=camel"); }
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; @@ -29,8 +29,8 @@ import org.junit.Test; */ public class HttpReferenceParameterTest extends CamelTestSupport { - private static final String TEST_URI_1 = "http://localhost:8080?httpBindingRef=#customBinding&httpClientConfigurerRef=#customConfigurer"; - private static final String TEST_URI_2 = "http://localhost:8081?httpBindingRef=customBinding&httpClientConfigurerRef=customConfigurer"; + private static final String TEST_URI_1 = "http4://localhost:8080?httpBindingRef=#customBinding&httpClientConfigurerRef=#customConfigurer"; + private static final String TEST_URI_2 = "http4://localhost:8081?httpBindingRef=customBinding&httpClientConfigurerRef=customConfigurer"; private HttpEndpoint endpoint1; private HttpEndpoint endpoint2; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java Sat Apr 10 10:25:11 2010 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.component.http.handler.DelayValidationHandler; +import org.apache.camel.component.http4.handler.DelayValidationHandler; import org.apache.http.localserver.LocalTestServer; import org.junit.Test; @@ -31,7 +31,7 @@ public class HttpSOTimeoutTest extends B @Test public void httpGet() throws Exception { - Exchange exchange = template.request("http://" + getHostName() + ":" + getPort() + "?httpClient.soTimeout=5000", new Processor() { + Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "?httpClient.soTimeout=5000", new Processor() { public void process(Exchange exchange) throws Exception { } }); @@ -42,7 +42,7 @@ public class HttpSOTimeoutTest extends B @Test public void httpGetShouldThrowASocketTimeoutException() throws Exception { try { - template.request("http://" + getHostName() + ":" + getPort() + "?httpClient.soTimeout=1000", new Processor() { + template.request("http4://" + getHostName() + ":" + getPort() + "?httpClient.soTimeout=1000", new Processor() { public void process(Exchange exchange) throws Exception { } }); Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import javax.net.ssl.SSLContext; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import java.util.Map; @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.component.http.handler.BasicValidationHandler; +import org.apache.camel.component.http4.handler.BasicValidationHandler; import org.apache.http.HttpStatus; import org.apache.http.localserver.LocalTestServer; import org.junit.Test; @@ -35,7 +35,7 @@ public class HttpThrowExceptionOnFailure @Test public void httpGetWhichReturnsHttp501() throws Exception { - Exchange exchange = template.request("http://" + getHostName() + ":" + getPort() + "/XXX?throwExceptionOnFailure=false", new Processor() { + Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/XXX?throwExceptionOnFailure=false", new Processor() { public void process(Exchange exchange) throws Exception { } }); @@ -53,7 +53,7 @@ public class HttpThrowExceptionOnFailure @Test public void httpGetWhichReturnsHttp501ShouldThrowAnException() throws Exception { try { - template.request("http://" + getHostName() + ":" + getPort() + "/XXX?throwExceptionOnFailure=true", new Processor() { + template.request("http4://" + getHostName() + ":" + getPort() + "/XXX?throwExceptionOnFailure=true", new Processor() { public void process(Exchange exchange) throws Exception { } }); Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java Sat Apr 10 10:25:11 2010 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.http.handler.BasicValidationHandler; +import org.apache.camel.component.http4.handler.BasicValidationHandler; import org.junit.Test; /** @@ -31,9 +31,9 @@ public class HttpWithHttpUriHeaderTest e public void notBridgeEndpointWithDefault() throws Exception { localServer.register("/", new BasicValidationHandler("GET", null, null, getExpectedContent())); - Exchange exchange = template.request("http://host/", new Processor() { + Exchange exchange = template.request("http4://host/", new Processor() { public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader(Exchange.HTTP_URI, "http://" + getHostName() + ":" + getPort() + "/"); + exchange.getIn().setHeader(Exchange.HTTP_URI, "http4://" + getHostName() + ":" + getPort() + "/"); } }); Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java Sat Apr 10 10:25:11 2010 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.http.handler.AuthenticationValidationHandler; +import org.apache.camel.component.http4.handler.AuthenticationValidationHandler; import org.apache.http.localserver.RequestBasicAuth; import org.apache.http.localserver.ResponseBasicUnauthorized; import org.apache.http.protocol.BasicHttpProcessor; @@ -38,7 +38,7 @@ public class HttpsAuthenticationTest ext public void httpsGetWithAuthentication() throws Exception { localServer.register("/", new AuthenticationValidationHandler("GET", null, null, getExpectedContent(), user, password)); - Exchange exchange = template.request("https://127.0.0.1:" + getPort() + "/?username=camel&password=password", new Processor() { + Exchange exchange = template.request("https4://127.0.0.1:" + getPort() + "/?username=camel&password=password", new Processor() { public void process(Exchange exchange) throws Exception { } }); Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java Sat Apr 10 10:25:11 2010 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.http.handler.BasicValidationHandler; +import org.apache.camel.component.http4.handler.BasicValidationHandler; import org.junit.Test; /** @@ -31,7 +31,7 @@ public class HttpsGetTest extends BaseHt public void httpsGet() throws Exception { localServer.register("/mail/", new BasicValidationHandler("GET", null, null, getExpectedContent())); - Exchange exchange = template.request("https://127.0.0.1:" + getPort() + "/mail/", new Processor() { + Exchange exchange = template.request("https4://127.0.0.1:" + getPort() + "/mail/", new Processor() { public void process(Exchange exchange) throws Exception { } }); Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http; +package org.apache.camel.component.http4; import java.io.File; import java.io.FileInputStream; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.handler; +package org.apache.camel.component.http4.handler; import java.io.IOException; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.handler; +package org.apache.camel.component.http4.handler; import java.io.IOException; import java.net.URI; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.handler; +package org.apache.camel.component.http4.handler; import java.io.IOException; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.handler; +package org.apache.camel.component.http4.handler; import java.io.IOException; import java.util.Map; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.handler; +package org.apache.camel.component.http4.handler; import java.io.IOException; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.helper; +package org.apache.camel.component.http4.helper; import java.io.ByteArrayInputStream; import java.io.IOException; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpProducerHelperTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpProducerHelperTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpProducerHelperTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpProducerHelperTest.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.helper; +package org.apache.camel.component.http4.helper; import java.net.URI; import java.net.URISyntaxException; @@ -22,8 +22,8 @@ import java.net.URISyntaxException; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.component.http.HttpEndpoint; -import org.apache.camel.component.http.HttpMethods; +import org.apache.camel.component.http4.HttpEndpoint; +import org.apache.camel.component.http4.HttpMethods; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Test; Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/LoadingByteArrayOutputStreamTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/LoadingByteArrayOutputStreamTest.java?rev=932686&r1=932673&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/LoadingByteArrayOutputStreamTest.java (original) +++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/LoadingByteArrayOutputStreamTest.java Sat Apr 10 10:25:11 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http.helper; +package org.apache.camel.component.http4.helper; import java.io.ByteArrayInputStream; import java.io.IOException; Modified: camel/trunk/components/camel-http/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/resources/log4j.properties?rev=932686&r1=932685&r2=932686&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/test/resources/log4j.properties (original) +++ camel/trunk/components/camel-http/src/test/resources/log4j.properties Sat Apr 10 10:25:11 2010 @@ -33,4 +33,4 @@ log4j.appender.out.layout.ConversionPatt log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-http-test.log \ No newline at end of file +log4j.appender.file.file=target/camel-http4-test.log \ No newline at end of file
