Merge pull request #1613 from daschl/more-namespace-changes

Moving Netflix to ReactiveX

Author: benjchristensen

CHANGES.md

@@ -6,7 +6,7 @@ When submitting code, please make every effort to follow existing conventions an
 
 ## License
 
-By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/Netflix/RxJava/blob/master/LICENSE
+By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/ReactiveX/RxJava/blob/master/LICENSE
 
 All files are released with the Apache 2.0 license.
 

CONTRIBUTING.md

@@ -7,13 +7,13 @@ Some of the goals of RxJava are:
 - Stay close to the original Rx.Net implementation while adjusting naming conventions and idioms to Java
 - All contracts of Rx should be the same
 - Target the JVM not a language. The first languages supported (beyond Java itself) are 
-<a href="https://github.com/Netflix/RxJava/tree/master/language-adaptors/rxjava-groovy">Groovy</a>, 
-<a href="https://github.com/Netflix/RxJava/tree/master/language-adaptors/rxjava-clojure">Clojure</a>, 
-and <a href="https://github.com/Netflix/RxJava/tree/master/language-adaptors/rxjava-scala">Scala</a>. 
-New language adapters can be <a href="https://github.com/Netflix/RxJava/wiki/How-to-Contribute">contributed</a>.
+<a href="https://github.com/ReactiveX/RxGroovy">Groovy</a>, 
+<a href="https://github.com/ReactiveX/RxClojure">Clojure</a>, 
+and <a href="https://github.com/ReactiveX/RxScala">Scala</a>. 
+New language adapters can be <a href="https://github.com/ReactiveX/RxJava/wiki/How-to-Contribute">contributed</a>.
 - Support Java 6+ (to include Android support) 
 
-Learn more about Rx on the <a href="https://github.com/Netflix/RxJava/wiki">Wiki Home</a> and the <a href="http://techblog.netflix.com/2013/02/rxjava-netflix-api.html">Netflix TechBlog post</a> where RxJava was introduced.
+Learn more about RxJava on the <a href="https://github.com/ReactiveX/RxJava/wiki">Wiki Home</a> and the <a href="http://techblog.netflix.com/2013/02/rxjava-netflix-api.html">Netflix TechBlog post</a> where RxJava was introduced.
 
 ## Master Build Status
 
@@ -27,11 +27,11 @@ Learn more about Rx on the <a href="https://github.com/Netflix/RxJava/wiki">Wiki
 
 - Google Group: [RxJava](http://groups.google.com/d/forum/rxjava)
 - Twitter: [@RxJava](http://twitter.com/RxJava)
-- [GitHub Issues](https://github.com/Netflix/RxJava/issues)
+- [GitHub Issues](https://github.com/ReactiveX/RxJava/issues)
 
 ## Versioning
 
-RxJava is working towards a 1.0 release which will be reached once it "more or less" becomes feature complete with the [Rx.Net version](https://rx.codeplex.com). The backlog of features needed to accomplish this are documented in the [project issues](https://github.com/Netflix/RxJava/issues).
+RxJava is working towards a 1.0 release which will be reached once it "more or less" becomes feature complete with the [Rx.Net version](https://rx.codeplex.com). The backlog of features needed to accomplish this are documented in the [project issues](https://github.com/ReactiveX/RxJava/issues).
 
 In short, once the current issue list hits 0 open we will bump to version 1.0.
 
@@ -41,35 +41,26 @@ Once we hit 1.0 it will follow the normal major.minor.patch semantic versioning
 
 ## Full Documentation
 
-- [Wiki](https://github.com/Netflix/RxJava/wiki)
+- [Wiki](https://github.com/ReactiveX/RxJava/wiki)
 - <a href="http://netflix.github.com/RxJava/javadoc/">Javadoc</a>
 
-## Code
-
-- <a href="https://github.com/Netflix/RxJava/tree/master/rxjava-core">Java Core</a>   
-  - <a href="https://github.com/Netflix/RxJava/tree/master/rxjava-core/src/main/java/rx/Observable.java">Observable</a>
-  - <a href="https://github.com/Netflix/RxJava/tree/master/rxjava-core/src/main/java/rx/Observer.java">Observer</a>
-- <a href="https://github.com/Netflix/RxJava/tree/master/language-adaptors/rxjava-groovy">Groovy Adaptor</a> 
-- <a href="https://github.com/Netflix/RxJava/tree/master/language-adaptors/rxjava-clojure">Clojure Adaptor</a> 
-- <a href="https://github.com/Netflix/RxJava/tree/master/language-adaptors/rxjava-scala">Scala Adaptor</a> 
-
 ## Binaries
 
-Binaries and dependency information for Maven, Ivy, Gradle and others can be found at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.netflix.rxjava%22).
+Binaries and dependency information for Maven, Ivy, Gradle and others can be found at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cio.reactivex.rxjava).
 
 Example for Maven:
 
 ```xml
 <dependency>
-    <groupId>com.netflix.rxjava</groupId>
-    <artifactId>rxjava-core</artifactId>
+    <groupId>io.reactivex.rxjava</groupId>
+    <artifactId>rxjava</artifactId>
     <version>x.y.z</version>
 </dependency>
 ```
 and for Ivy:
 
 ```xml
-<dependency org="com.netflix.rxjava" name="rxjava-core" rev="x.y.z" />
+<dependency org="io.reactivex.rxjava" name="rxjava" rev="x.y.z" />
 ```
 
 If you need to download the jars instead of using a build system, create a Maven pom file like this with the desired version:
@@ -78,15 +69,15 @@ If you need to download the jars instead of using a build system, create a Maven
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-	<groupId>com.netflix.rxjava.download</groupId>
+	<groupId>io.reactivex.rxjava.download</groupId>
 	<artifactId>rxjava-download</artifactId>
 	<version>1.0-SNAPSHOT</version>
-	<name>Simple POM to download rxjava-core and dependencies</name>
-	<url>http://github.com/Netflix/RxJava</url>
+	<name>Simple POM to download rxjava</name>
+	<url>http://github.com/ReactiveX/RxJava</url>
 	<dependencies>
 		<dependency>
-			<groupId>com.netflix.rxjava</groupId>
-			<artifactId>rxjava-core</artifactId>
+			<groupId>io.reactivex.rxjava</groupId>
+			<artifactId>rxjava</artifactId>
 			<version>x.y.z</version>
 			<scope/>
 		</dependency>
@@ -100,7 +91,7 @@ Then execute:
 mvn -f download-rxjava-pom.xml dependency:copy-dependencies
 ```
 
-It will download rxjava-core-*.jar and its dependencies into ./target/dependency/.
+It will download rxjava-*.jar and its dependencies into ./target/dependency/.
 
 You need Java 6 or later.
 
@@ -109,16 +100,16 @@ You need Java 6 or later.
 To build:
 
 ```
-$ git clone [email protected]:Netflix/RxJava.git
+$ git clone [email protected]:ReactivrX/RxJava.git
 $ cd RxJava/
 $ ./gradlew build
 ```
 
-Futher details on building can be found on the [Getting Started](https://github.com/Netflix/RxJava/wiki/Getting-Started) page of the wiki.
+Futher details on building can be found on the [Getting Started](https://github.com/ReactiveX/RxJava/wiki/Getting-Started) page of the wiki.
 
 ## Bugs and Feedback
 
-For bugs, questions and discussions please use the [Github Issues](https://github.com/Netflix/RxJava/issues).
+For bugs, questions and discussions please use the [Github Issues](https://github.com/ReactiveX/RxJava/issues).
 
 
 ## LICENSE