Skip to content
Browse files

upgraded to latest Couchbase Mobile developer preview

upgraded to Ektorp 1.2.2
  • Loading branch information...
1 parent ca70fe5 commit 6d9e8f2d854fc5881ca59d1fa04547a6920fad53 @mschoch mschoch committed Nov 10, 2011
Showing with 23 additions and 11 deletions.
  1. +7 −5 .classpath
  2. BIN Couchbase.zip
  3. +1 −1 assets/install/couchdb/etc/couchdb/default.ini
  4. BIN assets/install/erlang/bin/child_setup
  5. BIN assets/install/erlang/bin/inet_gethost
  6. +2 −2 assets/lib/couch/ebin/couch.app
  7. BIN assets/lib/couch/ebin/couch_api_wrap.beam
  8. BIN assets/lib/couch/ebin/couch_btree.beam
  9. BIN assets/lib/couch/ebin/couch_btree_copy.beam
  10. BIN assets/lib/couch/ebin/couch_changes.beam
  11. BIN assets/lib/couch/ebin/couch_db.beam
  12. BIN assets/lib/couch/ebin/couch_db_updater.beam
  13. BIN assets/lib/couch/ebin/couch_doc.beam
  14. BIN assets/lib/couch/ebin/couch_httpd_db.beam
  15. BIN assets/lib/couch/ebin/couch_httpd_view_merger.beam
  16. BIN assets/lib/couch/ebin/couch_key_tree.beam
  17. BIN assets/lib/couch/ebin/couch_replication_manager.beam
  18. BIN assets/lib/couch/ebin/couch_replicator.beam
  19. BIN assets/lib/couch/ebin/couch_replicator_utils.beam
  20. BIN assets/lib/couch/ebin/couch_task_status.beam
  21. BIN assets/lib/couch/ebin/couch_view_compactor.beam
  22. BIN assets/lib/couch/ebin/couch_view_merger.beam
  23. BIN assets/lib/couch/ebin/couch_view_updater.beam
  24. BIN assets/lib/couch/ebin/couch_work_queue.beam
  25. +9 −0 assets/lib/ejson-0.1.0/ejson.app
  26. BIN assets/lib/ejson-0.1.0/ejson.beam
  27. BIN assets/lib/ejson-0.1.0/mochijson2.beam
  28. BIN assets/lib/ejson-0.1.0/mochinum.beam
  29. BIN assets/lib/geocouch/couch_httpd_spatial.beam
  30. BIN assets/lib/geocouch/couch_httpd_spatial_list.beam
  31. BIN assets/lib/geocouch/couch_spatial.beam
  32. BIN assets/lib/geocouch/couch_spatial_compactor.beam
  33. BIN assets/lib/geocouch/couch_spatial_group.beam
  34. BIN assets/lib/geocouch/couch_spatial_updater.beam
  35. BIN assets/lib/geocouch/geocouch_duplicates.beam
  36. BIN assets/lib/geocouch/run_vtreestats.beam
  37. BIN assets/lib/geocouch/run_vtreeviz.beam
  38. BIN assets/lib/geocouch/vtree.beam
  39. BIN assets/lib/geocouch/vtree_bulk.beam
  40. BIN assets/lib/geocouch/vtree_insbench.beam
  41. BIN assets/lib/geocouch/vtreestats.beam
  42. BIN assets/lib/geocouch/vtreeviz.beam
  43. BIN assets/lib/public_key-0.12/ebin/OTP-PUB-KEY.beam
  44. BIN assets/lib/snappy-1.0.3/ebin/snappy.beam
  45. BIN libs/OtpErlang.jar
  46. BIN libs/armeabi/libbeam.so
  47. BIN libs/armeabi/libcom_couchbase_android_ErlangThread.so
  48. BIN libs/armeabi/libcrypto_nif.so
  49. BIN libs/armeabi/libsnappy_nif.so
  50. BIN libs/couchbase.jar
  51. BIN libs/{org.ektorp-1.2.2-SNAPSHOT.jar → org.ektorp-1.2.2.jar}
  52. BIN libs/{org.ektorp.android-1.2.2-SNAPSHOT.jar → org.ektorp.android-1.2.2.jar}
  53. +1 −1 default.properties → project.properties
  54. +3 −2 src/com/couchbase/grocerysync/AndroidGrocerySyncActivity.java
View
12 .classpath
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
@@ -9,7 +10,8 @@
<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
<classpathentry kind="lib" path="libs/slf4j-api-1.6.1.jar"/>
<classpathentry kind="lib" path="libs/slf4j-jdk14-1.6.1.jar"/>
- <classpathentry kind="lib" path="libs/org.ektorp-1.2.2-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="libs/org.ektorp.android-1.2.2-SNAPSHOT.jar"/>
- <classpathentry kind="output" path="bin"/>
-<classpathentry kind="lib" path="libs/OtpErlang.jar"/></classpath>
+ <classpathentry kind="lib" path="libs/OtpErlang.jar"/>
+ <classpathentry kind="lib" path="libs/org.ektorp-1.2.2.jar"/>
+ <classpathentry kind="lib" path="libs/org.ektorp.android-1.2.2.jar"/>
+ <classpathentry kind="output" path="bin/classes"/>
+</classpath>
View
BIN Couchbase.zip
Binary file not shown.
View
2 assets/install/couchdb/etc/couchdb/default.ini
@@ -5,7 +5,7 @@
[couchdb]
database_dir = /data/data/%app_name%/couchdb/var/lib/couchdb
view_index_dir = /data/data/%app_name%/couchdb/var/lib/couchdb
-util_driver_dir = /data/data/%app_name%/couchdb/lib/couchdb/erlang/lib/couch-1.2.0a-cf776f5-git/priv/lib
+util_driver_dir = /data/data/%app_name%/couchdb/lib/couchdb/erlang/lib/couch-1.2.0a-7b47329-git/priv/lib
max_document_size = 4294967296 ; 4 GB
os_process_timeout = 30000 ; 5 seconds. for view and external servers.
max_dbs_open = 100
View
BIN assets/install/erlang/bin/child_setup
Binary file not shown.
View
BIN assets/install/erlang/bin/inet_gethost
Binary file not shown.
View
4 assets/lib/couch/ebin/couch.app
@@ -1,7 +1,7 @@
{application, couch, [
{description, "Apache CouchDB"},
- {vsn, "1.2.0a-361a925-git"},
- {modules, [couch_db_update_notifier,couch_util,couch_skew,couch_task_status,couch_primary_sup,couch_stats_collector,couch_external_server,couch_config_writer,couch_log,couch_native_process,couch_httpd_view_merger,couch_replication_manager,couch_config,couch_event_sup,couch_file,couch_httpd_replicator,couch_replicator_worker,couch_stream,couch_db_updater,couch_view_updater,couch_httpd_show,couch_compress,couch_replicator,couch_internal_load_gen,couch_key_tree,couch_stats_aggregator,couch_httpc_pool,couch_doc,couch_os_process,couch_httpd_rewrite,couch_drv,couch_db,couch_api_wrap_httpc,couch_secondary_sup,couch_server,couch_changes,couch_work_queue,couch_os_daemons,couch_httpd_external,couch_view_merger,couch_ref_counter,couch_indexer_manager,couch,couch_view_merger_queue,couch_compaction_daemon,couch_btree,couch_httpd_auth,couch_rep_sup,couch_app,couch_httpd_db,couch_external_manager,couch_access_log,couch_uuids,couch_view_compactor,couch_replication_notifier,couch_query_servers,couch_view_group,couch_httpd_vhost,couch_httpd_oauth,couch_httpd_misc_handlers,couch_replicator_utils,couch_httpd_proxy,couch_httpd_stats_handlers,couch_auth_cache,couch_server_sup,couch_compress_types,jninif,couch_db_frontend,couch_httpd_view,couch_httpd,couch_api_wrap,json_stream_parse,couch_ejson_compare,couch_db_update_notifier_sup,couch_view]},
+ {vsn, "1.2.0a-7b47329-git"},
+ {modules, [couch_native_process,couch_os_daemons,couch_httpd_rewrite,couch,couch_httpd_stats_handlers,couch_ejson_compare,couch_httpd_oauth,json_stream_parse,couch_primary_sup,couch_httpd_proxy,couch_httpd_vhost,couch_changes,couch_compress,couch_httpd_view_merger,couch_api_wrap,couch_view_compactor,couch_config,couch_stats_collector,couch_httpd_view,couch_httpd_external,couch_server_sup,couch_drv,couch_replication_notifier,couch_view_updater,couch_uuids,couch_auth_cache,couch_secondary_sup,couch_httpd_misc_handlers,couch_util,couch_config_writer,couch_httpc_pool,couch_replicator_utils,couch_api_wrap_httpc,couch_app,couch_access_log,couch_external_manager,jninif,couch_log,couch_db,couch_os_process,couch_query_servers,couch_btree,couch_work_queue,couch_httpd,couch_task_status,couch_skew,couch_db_update_notifier_sup,couch_replication_manager,couch_db_updater,couch_compaction_daemon,couch_server,couch_rep_sup,couch_httpd_db,couch_view_group,couch_compress_types,couch_view_merger_queue,couch_key_tree,couch_view_merger,couch_replicator,couch_db_frontend,couch_internal_load_gen,couch_replicator_worker,couch_db_update_notifier,couch_stream,couch_httpd_auth,couch_httpd_show,couch_indexer_manager,couch_doc,couch_view,couch_btree_copy,couch_event_sup,couch_file,couch_httpd_replicator,couch_ref_counter,couch_external_server,couch_stats_aggregator]},
{registered, [
couch_config,
couch_db_update,
View
BIN assets/lib/couch/ebin/couch_api_wrap.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_btree.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_btree_copy.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_changes.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_db.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_db_updater.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_doc.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_httpd_db.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_httpd_view_merger.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_key_tree.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_replication_manager.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_replicator.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_replicator_utils.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_task_status.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_view_compactor.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_view_merger.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_view_updater.beam
Binary file not shown.
View
BIN assets/lib/couch/ebin/couch_work_queue.beam
Binary file not shown.
View
9 assets/lib/ejson-0.1.0/ejson.app
@@ -0,0 +1,9 @@
+{application, ejson, [
+ {description, "EJSON - decode and encode JSON into/from Erlang terms"},
+ {vsn, "0.1.0"},
+ {modules, [ejson]},
+ {registered, []},
+ {applications, [kernel, stdlib]},
+ {env, []}
+]}.
+
View
BIN assets/lib/ejson-0.1.0/ejson.beam
Binary file not shown.
View
BIN assets/lib/ejson-0.1.0/mochijson2.beam
Binary file not shown.
View
BIN assets/lib/ejson-0.1.0/mochinum.beam
Binary file not shown.
View
BIN assets/lib/geocouch/couch_httpd_spatial.beam
Binary file not shown.
View
BIN assets/lib/geocouch/couch_httpd_spatial_list.beam
Binary file not shown.
View
BIN assets/lib/geocouch/couch_spatial.beam
Binary file not shown.
View
BIN assets/lib/geocouch/couch_spatial_compactor.beam
Binary file not shown.
View
BIN assets/lib/geocouch/couch_spatial_group.beam
Binary file not shown.
View
BIN assets/lib/geocouch/couch_spatial_updater.beam
Binary file not shown.
View
BIN assets/lib/geocouch/geocouch_duplicates.beam
Binary file not shown.
View
BIN assets/lib/geocouch/run_vtreestats.beam
Binary file not shown.
View
BIN assets/lib/geocouch/run_vtreeviz.beam
Binary file not shown.
View
BIN assets/lib/geocouch/vtree.beam
Binary file not shown.
View
BIN assets/lib/geocouch/vtree_bulk.beam
Binary file not shown.
View
BIN assets/lib/geocouch/vtree_insbench.beam
Binary file not shown.
View
BIN assets/lib/geocouch/vtreestats.beam
Binary file not shown.
View
BIN assets/lib/geocouch/vtreeviz.beam
Binary file not shown.
View
BIN assets/lib/public_key-0.12/ebin/OTP-PUB-KEY.beam
Binary file not shown.
View
BIN assets/lib/snappy-1.0.3/ebin/snappy.beam
Binary file not shown.
View
BIN libs/OtpErlang.jar
Binary file not shown.
View
BIN libs/armeabi/libbeam.so
Binary file not shown.
View
BIN libs/armeabi/libcom_couchbase_android_ErlangThread.so
Binary file not shown.
View
BIN libs/armeabi/libcrypto_nif.so
Binary file not shown.
View
BIN libs/armeabi/libsnappy_nif.so
Binary file not shown.
View
BIN libs/couchbase.jar
Binary file not shown.
View
BIN libs/org.ektorp-1.2.2-SNAPSHOT.jar → libs/org.ektorp-1.2.2.jar
Binary file not shown.
View
BIN libs/org.ektorp.android-1.2.2-SNAPSHOT.jar → libs/org.ektorp.android-1.2.2.jar
Binary file not shown.
View
2 default.properties → project.properties
@@ -4,7 +4,7 @@
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.
View
5 src/com/couchbase/grocerysync/AndroidGrocerySyncActivity.java
@@ -9,6 +9,7 @@
import org.ektorp.ViewQuery;
import org.ektorp.ViewResult.Row;
import org.ektorp.android.http.AndroidHttpClient;
+import org.ektorp.http.HttpClient;
import org.ektorp.impl.StdCouchDbInstance;
import org.ektorp.support.DesignDocument;
@@ -55,7 +56,7 @@
//couch internals
protected static ServiceConnection couchServiceConnection;
- protected static AndroidHttpClient httpClient;
+ protected static HttpClient httpClient;
//ektorp impl
protected CouchDbInstance dbInstance;
@@ -132,7 +133,7 @@ protected void startEktorp(String host, int port) {
httpClient.shutdown();
}
- httpClient = (AndroidHttpClient) new AndroidHttpClient.Builder().host(host).port(port).maxConnections(100).build();
+ httpClient = new AndroidHttpClient.Builder().host(host).port(port).maxConnections(100).build();
dbInstance = new StdCouchDbInstance(httpClient);
GrocerySyncEktorpAsyncTask startupTask = new GrocerySyncEktorpAsyncTask() {

0 comments on commit 6d9e8f2

Please sign in to comment.
Something went wrong with that request. Please try again.