Merge pull request ReactiveX#89 from novoda/updating_framework_to_conventions

Updating packages and headers to match new convention

Author: JakeWharton

rxandroid-framework/src/main/java/rx/android/observables/ReactiveDialog.java renamed to rxandroid-framework/src/main/java/rx/android/app/ReactiveDialog.java

@@ -1,19 +1,17 @@
 /**
- * Copyright 2014 Novoda, Inc.
- *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.observables;
+package rx.android.app;
 
 import android.app.DialogFragment;
 import android.app.FragmentManager;

rxandroid-framework/src/main/java/rx/android/observables/SubscriberVault.java renamed to rxandroid-framework/src/main/java/rx/android/app/SubscriberVault.java

@@ -1,19 +1,17 @@
 /**
- * Copyright 2014 Novoda, Inc.
- *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.observables;
+package rx.android.app;
 
 import java.util.HashMap;
 import java.util.Map;

rxandroid-framework/src/test/java/rx/android/observables/ReactiveDialogTest.java renamed to rxandroid-framework/src/test/java/rx/android/app/ReactiveDialogTest.java

@@ -1,19 +1,17 @@
 /**
- * Copyright 2014 Novoda, Inc.
- *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.observables;
+package rx.android.app;
 
 import android.app.Activity;
 import android.app.FragmentManager;
@@ -38,7 +36,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
-import static rx.android.observables.ReactiveDialog.Result;
+import static rx.android.app.ReactiveDialog.Result;
 
 @RunWith(RobolectricTestRunner.class)
 public class ReactiveDialogTest {

rxandroid-framework/src/test/java/rx/android/observables/SubscriberVaultTest.java renamed to rxandroid-framework/src/test/java/rx/android/app/SubscriberVaultTest.java

@@ -1,19 +1,17 @@
 /**
- * Copyright 2014 Novoda, Inc.
- *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.observables;
+package rx.android.app;
 
 import org.junit.Before;
 import org.junit.Test;