[CXF-6833] Moving Observable providers to rt/rs/extension/providers

apache · May 4, 2016 · 447f2da · 447f2da
1 parent 8f9ae27
commit 447f2da
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -97,6 +97,7 @@
         <cxf.log4j.version>1.2.17</cxf.log4j.version>
         <cxf.lucene.version>4.9.0</cxf.lucene.version>
         <cxf.mina.version>2.0.13</cxf.mina.version>
+        <cxf.rx.java.version>1.1.3</cxf.rx.java.version>
         <cxf.javax.annotation-api.version>1.2</cxf.javax.annotation-api.version>
         <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
         <cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>

diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml
@@ -119,6 +119,13 @@
             <artifactId>javax.json</artifactId>
             <optional>true</optional>
         </dependency>     
+        <dependency>
+          <groupId>io.reactivex</groupId>
+          <artifactId>rxjava</artifactId>
+          <version>${cxf.rx.java.version}</version>
+          <scope>provided</scope>
+          <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>

diff --git a/...test/jaxrs/reactive/ObservableReader.java → ...f/jaxrs/provider/rx/ObservableReader.java b/...test/jaxrs/reactive/ObservableReader.java → ...f/jaxrs/provider/rx/ObservableReader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.jaxrs.reactive;
+package org.apache.cxf.jaxrs.provider.rx;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...test/jaxrs/reactive/ObservableWriter.java → ...f/jaxrs/provider/rx/ObservableWriter.java b/...test/jaxrs/reactive/ObservableWriter.java → ...f/jaxrs/provider/rx/ObservableWriter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.jaxrs.reactive;
+package org.apache.cxf.jaxrs.provider.rx;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
           <groupId>io.reactivex</groupId>
           <artifactId>rxjava</artifactId>
-          <version>1.1.3</version>
+          <version>${cxf.rx.java.version}</version>
         </dependency>
         <!--
           <dependency>

diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java
@@ -19,18 +19,19 @@
 
 package org.apache.cxf.systest.jaxrs.reactive;
 
+import java.util.Collections;
 import java.util.concurrent.Future;
 
 import javax.ws.rs.core.GenericType;
 
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.jaxrs.provider.rx.ObservableReader;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import rx.Observable;
 
 public class JAXRSReactiveTest extends AbstractBusClientServerTestBase {

diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/ReactiveServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/ReactiveServer.java
@@ -25,6 +25,7 @@
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.apache.cxf.jaxrs.provider.rx.ObservableWriter;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 
 public class ReactiveServer extends AbstractBusTestServerBase {