rename clients/android/uploader to clients/android

also change package from com.danga.camli to org.camlistore

build.pl

@@ -328,7 +328,7 @@ TARGET: lib/go/blobserver/localdisk
 
 TARGET: lib/go/httprange
 
-TARGET: clients/android/uploader
+TARGET: clients/android
     =not_in_all  # too slow
 
 TARGET: lib/go/mysqlindexer

clients/android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.danga.camli"
+      package="org.camlistore"
       android:versionCode="1"
       android:versionName="1.0">
 

clients/android/src/org/camlistore/CamliActivity.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.app.Activity;
 import android.content.ComponentName;

clients/android/src/org/camlistore/CamliFileObserver.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.File;
 
@@ -23,7 +23,7 @@ import android.os.FileObserver;
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.danga.camli.IUploadService.Stub;
+import org.camlistore.IUploadService.Stub;
 
 public class CamliFileObserver extends FileObserver {
     private static final String TAG = "CamliFileObserver";

clients/android/src/org/camlistore/DummyNullCallback.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.os.RemoteException;
 

clients/android/src/org/camlistore/HostPort.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 public class HostPort {
     private final boolean mValid;

clients/android/src/org/camlistore/IStatusCallback.aidl

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 oneway interface IStatusCallback {
     void logToClient(String stuff);

clients/android/src/org/camlistore/IUploadService.aidl

@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
-import com.danga.camli.IStatusCallback;
+import org.camlistore.IStatusCallback;
 import android.os.ParcelFileDescriptor;
 import android.net.Uri;
 import java.util.List;

clients/android/src/org/camlistore/OnAlarmReceiver.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

clients/android/src/org/camlistore/OnBootReceiver.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;

clients/android/src/org/camlistore/Preferences.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.SharedPreferences;
 

clients/android/src/org/camlistore/QueuedFile.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.net.Uri;
 

clients/android/src/org/camlistore/SettingsActivity.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.ComponentName;
 import android.content.Context;

clients/android/src/org/camlistore/UploadApplication.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.app.Application;
 import android.util.Config;
@@ -48,4 +48,4 @@ public class UploadApplication extends Application {
         }
     }
 
-}
+}

clients/android/src/org/camlistore/UploadService.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.File;
 import java.io.FileNotFoundException;

clients/android/src/org/camlistore/UploadThread.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.BufferedOutputStream;
 import java.io.FileInputStream;

clients/android/src/org/camlistore/Util.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import java.io.BufferedInputStream;
 import java.io.FileDescriptor;

clients/android/src/org/camlistore/WifiPowerReceiver.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

clients/android/test/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.danga.camli.test"
+      package="org.camlistore.test"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -8,5 +8,5 @@
     <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:targetPackage="com.danga.camli" android:name="android.test.InstrumentationTestRunner" />
-</manifest> 
+    <instrumentation android:targetPackage="org.camlistore" android:name="android.test.InstrumentationTestRunner" />
+</manifest> 

clients/android/test/src/org/camlistore/CamliActivityTest.java

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.danga.camli;
+package org.camlistore;
 
 import android.test.ActivityInstrumentationTestCase2;