camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/4] git commit: Upgraded RX and SI
Date Sun, 15 Sep 2013 08:28:26 GMT
Updated Branches:
  refs/heads/camel-2.12.x 56d617276 -> 56170b658
  refs/heads/master 5209d862b -> bfb4ec2b3


Upgraded RX and SI


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

Branch: refs/heads/master
Commit: 3ad6c9ea26656b09e6f41f0be775c9d6d506454f
Parents: 5209d86
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Sep 15 09:34:42 2013 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Sep 15 09:34:42 2013 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/rx/ReactiveCamel.java        | 4 ++--
 .../java/org/apache/camel/rx/support/EndpointObservable.java    | 5 +----
 parent/pom.xml                                                  | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3ad6c9ea/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
index d17e7a1..769c39e 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
@@ -111,9 +111,9 @@ public class ReactiveCamel {
     @SuppressWarnings("unchecked")
     protected <T> Observable<T> createEndpointObservable(final Endpoint endpoint,
                                                          final Func1<Exchange, T> converter)
{
-        Func1<Observer<Message>, Subscription> func = new Func1<Observer<Message>,
Subscription>() {
+        Observable.OnSubscribeFunc<Message> func = new Observable.OnSubscribeFunc<Message>()
{
             @Override
-            public Subscription call(Observer<Message> observer) {
+            public Subscription onSubscribe(Observer<? super Message> observer) {
                 return new EndpointSubscription(endpoint, observer, converter);
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/3ad6c9ea/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
index 1cd89c8..da74d09 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
@@ -19,9 +19,6 @@ package org.apache.camel.rx.support;
 import org.apache.camel.Endpoint;
 
 import rx.Observable;
-import rx.Observer;
-import rx.Subscription;
-import rx.util.functions.Func1;
 
 /**
  * An {@link Observable} Camel {@link Endpoint}
@@ -29,7 +26,7 @@ import rx.util.functions.Func1;
 public class EndpointObservable<T> extends Observable<T> {
     private final Endpoint endpoint;
 
-    public EndpointObservable(Endpoint endpoint, Func1<Observer<T>, Subscription>
func) {
+    public EndpointObservable(Endpoint endpoint, OnSubscribeFunc<T> func) {
         super(func);
         this.endpoint = endpoint;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/3ad6c9ea/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 52c75d6..1592911 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -334,7 +334,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.11.3</rxjava-version>
+    <rxjava-version>0.13.1</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>
@@ -360,7 +360,7 @@
     <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
     <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
     <spring-data-redis-version>1.0.4.RELEASE</spring-data-redis-version>
-    <spring-integration-version>2.2.4.RELEASE</spring-integration-version>
+    <spring-integration-version>2.2.5.RELEASE</spring-integration-version>
     <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
     <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
     <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>


Mime
View raw message