update language adaptors to rx.* package

benjchristensen · benjchristensen · commit e9d98fc0b6cb · 2013-01-16T12:30:35.000-08:00
diff --git a/language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/ClojureAdaptor.java b/language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/ClojureAdaptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rx.lang.clojure;
+package rx.lang.clojure;
 
 import java.util.Arrays;
 
@@ -100,7 +100,7 @@ public void before() {
 
         @Test
         public void testTake() {
-            runClojureScript("(-> (org.rx.reactive.Observable/toObservable [\"one\" \"two\" \"three\"]) (.take 2) (.subscribe (fn [arg] (println arg))))");
+            runClojureScript("(-> (rx.observables.Observable/toObservable [\"one\" \"two\" \"three\"]) (.take 2) (.subscribe (fn [arg] (println arg))))");
         }
 
         // commented out for now as I can't figure out how to set the var 'a' with the 'assertion' instance when running the code from java 
diff --git a/language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyAdaptor.java b/language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyAdaptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rx.lang.groovy;
+package rx.lang.groovy;
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
diff --git a/language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyAdaptor.java b/language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyAdaptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rx.lang.jruby;
+package rx.lang.jruby;
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
@@ -163,7 +163,7 @@ private void runGroovyScript(String script) {
 
             StringBuilder b = new StringBuilder();
             // force JRuby to always use subscribe(Object)
-            b.append("import org.rx.reactive.Observable").append("\n");
+            b.append("import \"rx.observables.Observable\"").append("\n");
             b.append("class Observable").append("\n");
             b.append("  java_alias :subscribe, :subscribe, [java.lang.Object]").append("\n");
             b.append("end").append("\n");
diff --git a/rxjava-core/src/main/java/rx/util/Functions.java b/rxjava-core/src/main/java/rx/util/Functions.java
@@ -44,7 +44,7 @@ public class Functions {
     }
 
     private static void loadLanguageAdaptor(String name) {
-        String className = "org.rx.lang." + name.toLowerCase() + "." + name + "Adaptor";
+        String className = "rx.lang." + name.toLowerCase() + "." + name + "Adaptor";
         try {
             Class<?> c = Class.forName(className);
             FunctionLanguageAdaptor a = (FunctionLanguageAdaptor) c.newInstance();

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class Functions {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private static void loadLanguageAdaptor(String name) {`
`47`		`- String className = "org.rx.lang." + name.toLowerCase() + "." + name + "Adaptor";`
	`47`	`+ String className = "rx.lang." + name.toLowerCase() + "." + name + "Adaptor";`
`48`	`48`	`try {`
`49`	`49`	`Class<?> c = Class.forName(className);`
`50`	`50`	`FunctionLanguageAdaptor a = (FunctionLanguageAdaptor) c.newInstance();`