You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/18 11:51:09 UTC

[1/5] git commit: CAMEL-6730: Fixed requestTimeout on camel-netty.

Updated Branches:
  refs/heads/camel-2.11.x 79be93274 -> ac50c8c5d
  refs/heads/camel-2.12.x f63a7698a -> 74e9ff92b
  refs/heads/master f10041566 -> 746933059


CAMEL-6730: Fixed requestTimeout on camel-netty.


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

Branch: refs/heads/master
Commit: d66905d38cabab3f70d1adca1cac14fa24840eec
Parents: f100415
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:26:00 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:26:00 2013 +0200

----------------------------------------------------------------------
 .../camel/component/netty/handlers/ClientChannelHandler.java      | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d66905d3/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index b830c95..ef05486 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.handlers;
 
-import java.util.List;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
@@ -34,7 +32,6 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


[5/5] git commit: Upgraded rx

Posted by da...@apache.org.
Upgraded rx


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

Branch: refs/heads/camel-2.12.x
Commit: 74e9ff92ba7c962931ea3cac68ab1da5ad6659d6
Parents: 8b2e8a0
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:50:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:50:56 2013 +0200

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/74e9ff92/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e3537c2..d5840cf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,7 +333,7 @@
     <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
     <rome-version>1.0</rome-version>
-    <rxjava-version>0.13.1</rxjava-version>
+    <rxjava-version>0.13.2</rxjava-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>
     <saxon-bundle-version>9.5.0.2_1</saxon-bundle-version>
     <saxon-version>9.5.0.2</saxon-version>


[4/5] git commit: Upgraded rx

Posted by da...@apache.org.
Upgraded rx


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

Branch: refs/heads/master
Commit: 746933059eecee99f353f2bf6678bb7460c5b66a
Parents: d66905d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:50:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:50:39 2013 +0200

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/74693305/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f1627b7..ddbc36d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -335,7 +335,7 @@
     <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
     <rome-version>1.0</rome-version>
-    <rxjava-version>0.13.1</rxjava-version>
+    <rxjava-version>0.13.2</rxjava-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>
     <saxon-bundle-version>9.5.0.2_1</saxon-bundle-version>
     <saxon-version>9.5.0.2</saxon-version>


[3/5] git commit: CAMEL-6730: Fixed requestTimeout on camel-netty.

Posted by da...@apache.org.
CAMEL-6730: Fixed requestTimeout on camel-netty.


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

Branch: refs/heads/camel-2.11.x
Commit: ac50c8c5dc2530e5f3065b6b4a20f1cc23e817a0
Parents: 79be932
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:26:00 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:26:29 2013 +0200

----------------------------------------------------------------------
 .../camel/component/netty/handlers/ClientChannelHandler.java      | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ac50c8c5/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index c58075b..449fb22 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.handlers;
 
-import java.util.List;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
@@ -34,7 +32,6 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


[2/5] git commit: CAMEL-6730: Fixed requestTimeout on camel-netty.

Posted by da...@apache.org.
CAMEL-6730: Fixed requestTimeout on camel-netty.


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

Branch: refs/heads/camel-2.12.x
Commit: 8b2e8a00f755245696c643f3ac803176bacb001c
Parents: f63a769
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:26:00 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:26:17 2013 +0200

----------------------------------------------------------------------
 .../camel/component/netty/handlers/ClientChannelHandler.java      | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8b2e8a00/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index b830c95..ef05486 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.handlers;
 
-import java.util.List;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
@@ -34,7 +32,6 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;