camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject git commit: CAMEL-6831 Upgrade Apache HTTP Client 4.2.5 to 4.3 (camel-http4)
Date Sun, 06 Oct 2013 21:40:57 GMT
Updated Branches:
  refs/heads/master 8240c0076 -> c0e4330c0


CAMEL-6831 Upgrade Apache HTTP Client 4.2.5 to 4.3 (camel-http4)


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0e4330c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0e4330c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0e4330c

Branch: refs/heads/master
Commit: c0e4330c0ef395a8bca6f01b0f8dfaf5b2f45872
Parents: 8240c00
Author: Raúl Kripalani <raulk@apache.org>
Authored: Sun Oct 6 22:38:35 2013 +0100
Committer: Raúl Kripalani <raulk@apache.org>
Committed: Sun Oct 6 22:39:27 2013 +0100

----------------------------------------------------------------------
 .../http4/HttpNoConnectionRedeliveryTest.java   |  7 +++----
 .../component/http4/HttpNoConnectionTest.java   |  7 +++----
 .../component/http4/HttpServerTestSupport.java  | 21 +++++---------------
 parent/pom.xml                                  |  4 ++--
 4 files changed, 13 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
index c745570..b34ccb3 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
@@ -21,12 +21,11 @@ import java.net.ConnectException;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
-import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.localserver.LocalTestServer;
 import org.junit.Test;
 
 /**
- * @version 
+ * @version
  */
 public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
 
@@ -47,8 +46,8 @@ public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
         Exchange exchange = template.request("direct:start", null);
         assertTrue(exchange.isFailed());
 
-        HttpHostConnectException cause = assertIsInstanceOf(HttpHostConnectException.class,
exchange.getException());
-        assertIsInstanceOf(ConnectException.class, cause.getCause());
+        ConnectException cause = assertIsInstanceOf(ConnectException.class, exchange.getException());
+        assertTrue(cause.getMessage().contains("refused"));
 
         assertEquals(true, exchange.getIn().getHeader(Exchange.REDELIVERED));
         assertEquals(4, exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER));

http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
index fec4f17..f334d2f 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
@@ -21,12 +21,11 @@ import java.net.ConnectException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
-import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.localserver.LocalTestServer;
 import org.junit.Test;
 
 /**
- * @version 
+ * @version
  */
 public class HttpNoConnectionTest extends BaseHttpTest {
 
@@ -50,8 +49,8 @@ public class HttpNoConnectionTest extends BaseHttpTest {
         Exchange reply = template.request(url, null);
         Exception e = reply.getException();
         assertNotNull("Should have thrown an exception", e);
-        HttpHostConnectException cause = assertIsInstanceOf(HttpHostConnectException.class,
e);
-        assertIsInstanceOf(ConnectException.class, cause.getCause());
+        ConnectException cause = assertIsInstanceOf(ConnectException.class, e);
+        assertTrue(cause.getMessage().contains("refused"));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
index f240368..aaf08df 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
@@ -22,7 +22,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.localserver.LocalTestServer;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpExpectationVerifier;
 import org.junit.After;
@@ -33,7 +32,7 @@ import org.junit.Before;
  * The setUp method starts the server before the camel context is started and
  * the tearDown method stops the server after the camel context is stopped.
  *
- * @version 
+ * @version
  */
 public abstract class HttpServerTestSupport extends CamelTestSupport {
 
@@ -47,8 +46,8 @@ public abstract class HttpServerTestSupport extends CamelTestSupport {
                 getConnectionReuseStrategy(),
                 getHttpResponseFactory(),
                 getHttpExpectationVerifier(),
-                getHttpParams(),
-                getSSLContext());
+                getSSLContext(),
+                false);
         registerHandler(localServer);
         localServer.start();
 
@@ -84,7 +83,7 @@ public abstract class HttpServerTestSupport extends CamelTestSupport {
     protected ConnectionReuseStrategy getConnectionReuseStrategy() {
         return null;
     }
-    
+
     /**
      * Returns the org.apache.http.HttpResponseFactory which should be used
      * by the server.
@@ -94,7 +93,7 @@ public abstract class HttpServerTestSupport extends CamelTestSupport {
     protected HttpResponseFactory getHttpResponseFactory() {
         return null;
     }
-    
+
     /**
      * Returns the org.apache.http.protocol.HttpExpectationVerifier which should be used
      * by the server.
@@ -106,16 +105,6 @@ public abstract class HttpServerTestSupport extends CamelTestSupport
{
     }
 
     /**
-     * Returns the org.apache.http.params.HttpParams which should be used by
-     * the server.
-     *
-     * @return httpParams
-     */
-    protected HttpParams getHttpParams() {
-        return null;
-    }
-
-    /**
      * Returns the javax.net.ssl.SSLContext which should be used by the server.
      *
      * @return sslContext

http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d9079b5..1f0171f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,8 +178,8 @@
     <hibernate-validator-version>5.0.1.Final</hibernate-validator-version>
     <hibernate-version>4.2.6.Final</hibernate-version>
     <httpunit-version>1.7</httpunit-version>
-    <httpcore4-version>4.2.4</httpcore4-version>
-    <httpclient4-version>4.2.5</httpclient4-version>
+    <httpcore4-version>4.3</httpcore4-version>
+    <httpclient4-version>4.3</httpclient4-version>
     <httpclient-version>3.1</httpclient-version> 
     <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
     <ibatis-version>2.3.4.726</ibatis-version>


Mime
View raw message