rhodes 2.3.2 → 2.4.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +18 -0
- data/CREDITS +38 -0
- data/README.md +2 -2
- data/Rakefile +60 -2
- data/bin/set-rhodes-sdk.bat +1 -0
- data/doc/application.txt +11 -0
- data/doc/build.txt +156 -39
- data/doc/configuration.txt +1 -10
- data/doc/connect-to-web-services.txt +6 -6
- data/doc/device-caps.txt +48 -5
- data/doc/extensions.txt +8 -1
- data/doc/rhom.txt +16 -0
- data/doc/synchronization.txt +56 -14
- data/doc/ui.txt +23 -2
- data/installer/instant-rhodes.nsi +6 -6
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +4 -2
- data/lib/extensions/barcode/ext/barcode/platform/wm/Rakefile +1 -1
- data/lib/extensions/digest-md5/ext/Rakefile +3 -3
- data/lib/extensions/digest-md5/ext/build +0 -1
- data/lib/extensions/digest-sha1/ext/Rakefile +1 -1
- data/lib/extensions/digest-sha1/ext/build +0 -1
- data/lib/extensions/digest/ext/Rakefile +3 -3
- data/lib/extensions/digest/ext/build +0 -1
- data/lib/extensions/fcntl/ext/Rakefile +1 -1
- data/lib/extensions/mspec/mspec/guards/guard.rb +4 -0
- data/lib/extensions/mspec/mspec/helpers/environment.rb +4 -0
- data/lib/extensions/nfc/ext.yml +2 -0
- data/lib/extensions/nfc/ext/build +12 -0
- data/lib/extensions/nfc/ext/build.bat +8 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/AndroidManifest.xml +25 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/Rakefile +94 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/ext_build.files +4 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp +404 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/Nfc.java +138 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/NfcMessage.java +34 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/NfcMessagePack.java +33 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/NfcRecord.java +149 -0
- data/lib/extensions/nfc/ext/nfc/shared/ruby/nfc.i +22 -0
- data/lib/extensions/nfc/ext/nfc/shared/ruby/nfc_wrap.c +2034 -0
- data/lib/extensions/nfc/nfc.rb +120 -0
- data/lib/extensions/rholang/{lang_ca.rb → rholang/lang_ca.rb} +0 -0
- data/lib/extensions/rholang/{lang_cf.rb → rholang/lang_cf.rb} +0 -0
- data/lib/extensions/rholang/{lang_chef.rb → rholang/lang_chef.rb} +0 -0
- data/lib/extensions/rholang/{lang_cs.rb → rholang/lang_cs.rb} +0 -0
- data/lib/extensions/rholang/{lang_da.rb → rholang/lang_da.rb} +0 -0
- data/lib/extensions/rholang/{lang_de.rb → rholang/lang_de.rb} +0 -0
- data/lib/extensions/rholang/{lang_es.rb → rholang/lang_es.rb} +0 -0
- data/lib/extensions/rholang/{lang_es_ar.rb → rholang/lang_es_ar.rb} +0 -0
- data/lib/extensions/rholang/{lang_fi.rb → rholang/lang_fi.rb} +0 -0
- data/lib/extensions/rholang/{lang_fr.rb → rholang/lang_fr.rb} +0 -0
- data/lib/extensions/rholang/{lang_it.rb → rholang/lang_it.rb} +0 -0
- data/lib/extensions/rholang/{lang_ko.rb → rholang/lang_ko.rb} +0 -0
- data/lib/extensions/rholang/{lang_nl.rb → rholang/lang_nl.rb} +0 -0
- data/lib/extensions/rholang/{lang_no.rb → rholang/lang_no.rb} +0 -0
- data/lib/extensions/rholang/{lang_pt.rb → rholang/lang_pt.rb} +0 -0
- data/lib/extensions/rholang/{lang_pt_br.rb → rholang/lang_pt_br.rb} +0 -0
- data/lib/extensions/rholang/{lang_ru.rb → rholang/lang_ru.rb} +0 -0
- data/lib/extensions/rholang/{lang_se.rb → rholang/lang_se.rb} +0 -0
- data/lib/extensions/rholang/{lang_sr.rb → rholang/lang_sr.rb} +0 -0
- data/lib/extensions/rholang/{rhoerror_ru.rb → rholang/rhoerror_ru.rb} +0 -0
- data/lib/extensions/rholang/{rhomsg_ru.rb → rholang/rhomsg_ru.rb} +0 -0
- data/lib/framework/date/format.rb +2 -0
- data/lib/framework/dateOrig.rb +17 -8
- data/lib/framework/rational18.rb +532 -0
- data/lib/framework/res/back_btn.wp7.png +0 -0
- data/lib/framework/res/blue_pushpin.wp7.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wp7.png +0 -0
- data/lib/framework/res/callout.wp7.png +0 -0
- data/lib/framework/res/callout_link.wp7.png +0 -0
- data/lib/framework/res/esri.wp7.png +0 -0
- data/lib/framework/res/forward_btn.wp7.png +0 -0
- data/lib/framework/res/home_btn.wp7.png +0 -0
- data/lib/framework/res/options_btn.wp7.png +0 -0
- data/lib/framework/res/refresh_btn.wp7.png +0 -0
- data/lib/framework/rho/render.rb +8 -1
- data/lib/framework/rho/rho.rb +30 -7
- data/lib/framework/rho/rhoapplication.rb +9 -4
- data/lib/framework/rho/rhofsconnector.rb +5 -1
- data/lib/framework/rho/rhotabbar.rb +8 -0
- data/lib/framework/rho/rhotoolbar.rb +1 -1
- data/lib/framework/rho/rhoviewhelpers.rb +18 -1
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rhoframework.rb +46 -1
- data/lib/framework/rholang/localization_simplified.rb +17 -16
- data/lib/framework/rhom/rhom_db_adapter.rb +2 -2
- data/lib/framework/rhom/rhom_object_factory.rb +115 -12
- data/lib/framework/rhosystem.rb +135 -0
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/lib/test/apps/rhoconfig.txt +23 -23
- data/platform/android/Rhodes/AndroidManifest.full.xml +101 -0
- data/platform/android/Rhodes/AndroidManifest.xml +10 -15
- data/platform/android/Rhodes/default.properties +11 -0
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +59 -53
- data/platform/android/Rhodes/jni/include/rhodes.h +1 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesApplication.h +21 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_alert_PopupActivity.h +21 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h +10 -2
- data/platform/android/Rhodes/jni/src/alert.cpp +2 -1
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +2 -0
- data/platform/android/Rhodes/jni/src/fileapi.cpp +671 -84
- data/platform/android/Rhodes/jni/src/nativebar.cpp +18 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +92 -1
- data/platform/android/Rhodes/res/values/styles.xml +7 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +35 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +12 -13
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java +130 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +6 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +7 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +43 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +2 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +63 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +6 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +19 -282
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java +354 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +4 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +71 -5
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +107 -37
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +10 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +156 -56
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +40 -32
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/ExternalHttpHandler.java +14 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +46 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java +4 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java +3 -1
- data/platform/android/build/RhodesSRC_build.files +28 -25
- data/platform/android/build/android.rake +230 -54
- data/platform/android/build/androidcommon.rb +1 -1
- data/platform/android/build/librhocommon_build.files +1 -0
- data/platform/bb/Hsqldb/BlackBerry_App_Descriptor.xml +20 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +1 -5
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +6 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBase.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBinary.java +1 -1
- data/platform/bb/RubyVM/BlackBerry_App_Descriptor.xml +20 -0
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogOutputSink.java +0 -1
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +12 -10
- data/platform/bb/RubyVM/src/com/rho/RhoThread.java +16 -0
- data/platform/bb/RubyVM/src/com/rho/RhoTimer.java +89 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +20 -13
- data/platform/bb/RubyVM/src/com/rho/SplashScreen.java +1 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/TimeInterval.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +54 -48
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +0 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +1 -0
- data/platform/bb/RubyVM/src/com/rho/net/AsyncHttp.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/JSONStructIterator.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +16 -8
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +52 -29
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +1 -3
- data/platform/bb/build/RubyVM_build.files +1 -0
- data/platform/bb/build/bb.rake +29 -9
- data/platform/bb/rhodes/BlackBerry_App_Descriptor.xml +23 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +1 -1
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +0 -4
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +13 -20
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +183 -157
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +22 -0
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +1 -1
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +0 -4
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +13 -20
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +183 -157
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +46 -1
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +8 -1
- data/platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java +13 -3
- data/platform/iphone/Classes/AppManager/AppManager.h +5 -1
- data/platform/iphone/Classes/AppManager/AppManager.m +170 -7
- data/platform/iphone/Classes/DateTimePicker.m +14 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.h +2 -0
- data/platform/iphone/Classes/DateTimePickerDelegate.m +36 -2
- data/platform/iphone/Classes/NativeBar.h +1 -0
- data/platform/iphone/Classes/NativeBar.m +15 -3
- data/platform/iphone/Classes/Phonebook/phonebook.m +8 -9
- data/platform/iphone/Classes/Rhodes.m +50 -6
- data/platform/iphone/Classes/SimpleMainView.m +7 -6
- data/platform/iphone/Classes/SplitView/RightViewController.h +3 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +14 -1
- data/platform/iphone/Classes/TabbedMainView.h +4 -0
- data/platform/iphone/Classes/TabbedMainView.m +43 -26
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +4 -0
- data/platform/iphone/curl/curl.xcodeproj/project.pbxproj +3 -3
- data/platform/iphone/rbuild/iphone.rake +168 -119
- data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj +4 -2
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +3 -3
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +2 -2
- data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj +3 -3
- data/platform/shared/SyncClient/SyncClient.cpp +20 -8
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/RhoDefs.h +4 -0
- data/platform/shared/common/RhoPort.h +22 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoTime.cpp +73 -0
- data/platform/shared/common/RhoTime.h +26 -53
- data/platform/shared/common/RhodesApp.cpp +29 -28
- data/platform/shared/common/RhodesApp.h +4 -1
- data/platform/shared/common/StringConverter.h +37 -10
- data/platform/shared/common/app_build_capabilities.h +2 -0
- data/platform/shared/common/rhoparams.cpp +25 -12
- data/platform/shared/common/rhoparams.h +10 -8
- data/platform/shared/db/DBAdapter.cpp +0 -22
- data/platform/shared/json/RJSONTokener.c +15 -23
- data/platform/shared/net/AsyncHttp.cpp +9 -8
- data/platform/shared/net/HttpServer.cpp +61 -19
- data/platform/shared/net/HttpServer.h +2 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +3 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +151 -402
- data/platform/shared/ruby/ext/nativebar/nativebar.i +3 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +154 -403
- data/platform/shared/ruby/ext/rho/rhoruby.c +4 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +2 -0
- data/platform/shared/ruby/ext/system/system.i +8 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +80 -5
- data/platform/shared/ruby/file.c +6 -4
- data/platform/shared/ruby/gc.c +1 -1
- data/platform/shared/ruby/linux/ruby/config.h +7 -2
- data/platform/shared/ruby/missing/acosh.c +3 -3
- data/platform/shared/ruby/wince/_time.h +1 -1
- data/platform/shared/ruby/wince/stdlib.c +1 -1
- data/platform/shared/ruby/wince/string_wce.c +2 -2
- data/platform/shared/ruby/wince/sys/timeb.c +1 -0
- data/platform/shared/ruby/wince/time_wce.c +8 -0
- data/platform/shared/ruby/wince/wince.c +7 -7
- data/platform/shared/ruby/wince/wince.h +22 -0
- data/platform/shared/rubyext/System.cpp +19 -1
- data/platform/shared/sqlite/sqlite3.c +18993 -8129
- data/platform/shared/sqlite/sqlite3.h +953 -358
- data/platform/shared/sqlite/sqlite3ext.h +42 -0
- data/platform/shared/sync/SyncEngine.cpp +10 -0
- data/platform/shared/sync/SyncSource.cpp +41 -19
- data/platform/shared/sync/SyncSource.h +1 -1
- data/platform/shared/tcmalloc/rhomem.h +7 -2
- data/platform/shared/tcmalloc/windows/port.h +2 -0
- data/platform/shared/unzip/unzip.cpp +1 -0
- data/platform/shared/xruby/src/com/xruby/compiler/parser/RubyParser.java +11 -1
- data/platform/wm/RhoLib/RhoLib.vcproj +182 -24
- data/platform/wm/build/wm.rake +16 -3
- data/platform/wm/rhodes.sln +106 -113
- data/platform/wm/rhodes/Alert.cpp +6 -7
- data/platform/wm/rhodes/AppManager.cpp +8 -17
- data/platform/wm/rhodes/DateTimePicker.cpp +3 -0
- data/platform/wm/rhodes/DateTimePicker.h +2 -0
- data/platform/wm/rhodes/MainWindow.cpp +36 -16
- data/platform/wm/rhodes/MainWindow.h +6 -3
- data/platform/wm/rhodes/OutlookApp.cpp +3 -3
- data/platform/wm/rhodes/Rhodes.cpp +46 -27
- data/platform/wm/rhodes/Rhodes.rc +16 -3
- data/platform/wm/rhodes/RingtoneManager.cpp +7 -7
- data/platform/wm/rhodes/RingtoneManager.h +1 -1
- data/platform/wm/rhodes/Utils.cpp +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +1 -13
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +1 -2
- data/platform/wm/rhodes/camera/Camera.cpp +6 -12
- data/platform/wm/rhodes/phonebook/phonebook.cpp +11 -11
- data/platform/wm/rhodes/phonebook/phonebook.h +1 -1
- data/platform/wm/rhodes/resource.h +3 -1
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +7 -5
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +6 -6
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h +1 -1
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +6 -1
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +84 -19
- data/platform/wm/rhodes/rho/rubyext/calendar.cpp +2 -2
- data/platform/wm/rhodes/rhodes.vcproj +316 -73
- data/platform/wm/rhodes/signature/Signature.cpp +336 -6
- data/platform/wm/rhodes/signature/Signature.h +55 -0
- data/platform/wm/rhodes/stdafx.h +7 -4
- data/platform/wm/rubylib/rubylib.vcproj +261 -91
- data/platform/wm/sqlite3/sqlite3.vcproj +223 -69
- data/platform/wm/syncengine/syncengine.vcproj +220 -66
- data/platform/wm/tcmalloc/tcmalloc.vcproj +197 -43
- data/platform/wp7/IronRuby/Languages/Ruby/Ruby/Builtins/ConsoleStream.cs +107 -0
- data/platform/wp7/IronRuby/Languages/Ruby/Ruby/Runtime/Loader.cs +1037 -0
- data/platform/wp7/IronRuby/Languages/Ruby/Ruby/Runtime/RubyUtils.cs +1476 -0
- data/platform/wp7/RhoAppRunner/Program.cs +55 -0
- data/platform/wp7/RhoAppRunner/Properties/AssemblyInfo.cs +36 -0
- data/platform/wp7/RhoAppRunner/RhoAppRunner.csproj +69 -0
- data/platform/wp7/RhoRubyExtGen/GenerateInitializers.cmd +7 -0
- data/platform/wp7/RhoRubyExtGen/Properties/AssemblyInfo.cs +36 -0
- data/platform/wp7/RhoRubyExtGen/RhoAsyncHttp.cs +38 -0
- data/platform/wp7/RhoRubyExtGen/RhoDatabase.cs +93 -0
- data/platform/wp7/RhoRubyExtGen/RhoJSON.cs +37 -0
- data/platform/wp7/RhoRubyExtGen/RhoNativeBar.cs +106 -0
- data/platform/wp7/RhoRubyExtGen/RhoRubyExtGen.csproj +75 -0
- data/platform/wp7/RhoRubyExtGen/RhoSyncEngine.cs +123 -0
- data/platform/wp7/RhoRubyExtGen/RhoWebView.cs +42 -0
- data/platform/wp7/RhoRubyLib/Initializers.Generated.cs +309 -0
- data/platform/wp7/RhoRubyLib/Properties/AssemblyInfo.cs +36 -0
- data/platform/wp7/RhoRubyLib/RhoAppAdapter.cs +96 -0
- data/platform/wp7/RhoRubyLib/RhoRuby.cs +296 -0
- data/platform/wp7/RhoRubyLib/RhoRubyLib.csproj +155 -0
- data/platform/wp7/RhoRubyLib/WP_PlatformAdaptationLayer.cs +107 -0
- data/platform/wp7/RhoRubyLib/common/IInputStream.cs +21 -0
- data/platform/wp7/RhoRubyLib/common/Mutex.cs +30 -0
- data/platform/wp7/RhoRubyLib/common/RhoConf.cs +389 -0
- data/platform/wp7/RhoRubyLib/common/RhoEmptyProfiler.cs +27 -0
- data/platform/wp7/RhoRubyLib/common/RhoFile.cs +332 -0
- data/platform/wp7/RhoRubyLib/common/RhoFilePath.cs +89 -0
- data/platform/wp7/RhoRubyLib/common/RhoParamArray.cs +33 -0
- data/platform/wp7/RhoRubyLib/common/RhoParams.cs +66 -0
- data/platform/wp7/RhoRubyLib/common/RhoProfiler.cs +145 -0
- data/platform/wp7/RhoRubyLib/common/RhoResourceMap.cs +68 -0
- data/platform/wp7/RhoRubyLib/common/RhoStd.cs +205 -0
- data/platform/wp7/RhoRubyLib/common/RhoThread.cs +114 -0
- data/platform/wp7/RhoRubyLib/common/RhodesApp.cs +504 -0
- data/platform/wp7/RhoRubyLib/common/ThreadQueue.cs +199 -0
- data/platform/wp7/RhoRubyLib/common/TimeInterval.cs +56 -0
- data/platform/wp7/RhoRubyLib/common/Tokenizer.cs +52 -0
- data/platform/wp7/RhoRubyLib/db/DBAdapter.cs +1129 -0
- data/platform/wp7/RhoRubyLib/db/DBAttrManager.cs +92 -0
- data/platform/wp7/RhoRubyLib/db/DBException.cs +35 -0
- data/platform/wp7/RhoRubyLib/db/IDBCallback.cs +10 -0
- data/platform/wp7/RhoRubyLib/db/IDBResult.cs +33 -0
- data/platform/wp7/RhoRubyLib/db/IDBStorage.cs +32 -0
- data/platform/wp7/RhoRubyLib/db/SqliteCopyResult.cs +79 -0
- data/platform/wp7/RhoRubyLib/db/SqliteResult.cs +267 -0
- data/platform/wp7/RhoRubyLib/db/SqliteStorage.cs +319 -0
- data/platform/wp7/RhoRubyLib/json/JSONArrayIterator.cs +63 -0
- data/platform/wp7/RhoRubyLib/json/JSONEntry.cs +96 -0
- data/platform/wp7/RhoRubyLib/json/JSONStructIterator.cs +77 -0
- data/platform/wp7/RhoRubyLib/json/JsonParser.cs +483 -0
- data/platform/wp7/RhoRubyLib/json/RJSONTokener.cs +406 -0
- data/platform/wp7/RhoRubyLib/logging/IRhoLogSink.cs +12 -0
- data/platform/wp7/RhoRubyLib/logging/RhoLogConf.cs +161 -0
- data/platform/wp7/RhoRubyLib/logging/RhoLogFileSink.cs +174 -0
- data/platform/wp7/RhoRubyLib/logging/RhoLogger.cs +320 -0
- data/platform/wp7/RhoRubyLib/net/AsyncHttp.cs +362 -0
- data/platform/wp7/RhoRubyLib/net/HttpServer.cs +466 -0
- data/platform/wp7/RhoRubyLib/net/NetRequest.cs +717 -0
- data/platform/wp7/RhoRubyLib/net/NetResponse.cs +64 -0
- data/platform/wp7/RhoRubyLib/net/URI.cs +187 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoAsyncHttp.cs +43 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoDatabase.cs +177 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoJSON.cs +39 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoKernelOps.cs +19 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoNativeBar.cs +117 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoSyncEngine.cs +199 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoWebView.cs +49 -0
- data/platform/wp7/RhoRubyLib/sync/ClientRegister.cs +142 -0
- data/platform/wp7/RhoRubyLib/sync/ISyncProtocol.cs +23 -0
- data/platform/wp7/RhoRubyLib/sync/ISyncStatusListener.cs +10 -0
- data/platform/wp7/RhoRubyLib/sync/SyncEngine.cs +1051 -0
- data/platform/wp7/RhoRubyLib/sync/SyncNotify.cs +651 -0
- data/platform/wp7/RhoRubyLib/sync/SyncProtocol_3.cs +79 -0
- data/platform/wp7/RhoRubyLib/sync/SyncSource.cs +1105 -0
- data/platform/wp7/RhoRubyLib/sync/SyncThread.cs +301 -0
- data/platform/wp7/WPApplication.sln +50 -0
- data/platform/wp7/WPApplication/App.xaml +19 -0
- data/platform/wp7/WPApplication/App.xaml.cs +211 -0
- data/platform/wp7/WPApplication/ApplicationIcon.png +0 -0
- data/platform/wp7/WPApplication/Background.png +0 -0
- data/platform/wp7/WPApplication/MainPage.xaml +44 -0
- data/platform/wp7/WPApplication/MainPage.xaml.cs +132 -0
- data/platform/wp7/WPApplication/Properties/AppManifest.xml +6 -0
- data/platform/wp7/WPApplication/Properties/AssemblyInfo.cs +35 -0
- data/platform/wp7/WPApplication/Properties/WMAppManifest.xml +32 -0
- data/platform/wp7/WPApplication/SplashScreenImage.jpg +0 -0
- data/platform/wp7/WPApplication/WPApplication.csproj +201 -0
- data/platform/wp7/WPApplication/WP_PlatformAdaptationLayer.cs +88 -0
- data/platform/wp7/WPApplication/app_manifest.txt +1 -0
- data/platform/wp7/WPApplication/readme.htm +40 -0
- data/platform/wp7/WPApplication/readme2.htm +37 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/edit.bb.erb +29 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/edit.erb +32 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/index.bb.erb +21 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/index.erb +26 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/model1.rb +10 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/model1_controller.rb +58 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/new.bb.erb +29 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/new.erb +31 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/show.bb.erb +26 -0
- data/platform/wp7/WPApplication/rho/apps/app/Model1/show.erb +28 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/controller.rb +75 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/home.bb.erb +17 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/home.erb +20 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/index.bb.erb +32 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/index.erb +30 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/login.bb.erb +35 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/login.erb +27 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/reset.bb.erb +15 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/reset.erb +17 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/wait.bb.erb +3 -0
- data/platform/wp7/WPApplication/rho/apps/app/Settings/wait.erb +5 -0
- data/platform/wp7/WPApplication/rho/apps/app/application.rb +16 -0
- data/platform/wp7/WPApplication/rho/apps/app/helpers/application_helper.rb +126 -0
- data/platform/wp7/WPApplication/rho/apps/app/helpers/browser_helper.rb +18 -0
- data/platform/wp7/WPApplication/rho/apps/app/index.bb.erb +26 -0
- data/platform/wp7/WPApplication/rho/apps/app/index.erb +26 -0
- data/platform/wp7/WPApplication/rho/apps/app/layout.erb +45 -0
- data/platform/wp7/WPApplication/rho/apps/app/loading.html +11 -0
- data/platform/wp7/WPApplication/rho/apps/app_manifest.txt +1 -0
- data/platform/wp7/WPApplication/rho/apps/public/css/android.css +330 -0
- data/platform/wp7/WPApplication/rho/apps/public/css/blackberry.css +115 -0
- data/platform/wp7/WPApplication/rho/apps/public/css/iphone.css +410 -0
- data/platform/wp7/WPApplication/rho/apps/public/css/windows_mobile.css +222 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/IUI_LICENSE.txt +21 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/android/btn_check_off.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/android/btn_check_on.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/android/btn_radio_off.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/android/btn_radio_on.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/android/disclosure.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/android/ic_menu_more.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/backButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/blueButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/cancel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/grayButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/disclosure.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/disclosure_detail.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/backButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/blueButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/cancel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/chevron.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/grayButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/listArrowSel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/listGroup.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/loading.gif +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/on_off.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/pinstripes.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/selection.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/thumb.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toggle.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toggleOn.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toolButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toolbar.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/whiteButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/radiobutton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/select.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/switch.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iui-logo-touch-icon.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrow.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrowDown.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrowSel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listGroup.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/loading.gif +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/pinstripes.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/right_button.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/selection.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/thumb.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toggle.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toggleOn.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolButton_new.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolbar.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/whiteButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch-iphone.css +9 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.css +374 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.js +742 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.transitions.js +60 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jquery.1.3.2.min.js +19 -0
- data/platform/wp7/WPApplication/rho/apps/public/js/application.js +1 -0
- data/platform/wp7/WPApplication/rho/apps/public/js/rho.js +4 -0
- data/platform/wp7/WPApplication/rho/apps/public/js/rhogeolocation-wm.js +59 -0
- data/platform/wp7/WPApplication/rho/apps/public/js/rhogeolocation.js +11 -0
- data/platform/wp7/WPApplication/rho/apps/rhoconfig.txt +32 -0
- data/platform/wp7/WPApplication/rhoconfig.txt +32 -0
- data/platform/wp7/WPApplication/windows_mobile.css +222 -0
- data/platform/wp7/build/wp.rake +261 -0
- data/platform/wp7/rhodes.sln +79 -0
- data/platform/wp7/rhodes/App.xaml +19 -0
- data/platform/wp7/rhodes/App.xaml.cs +144 -0
- data/platform/wp7/rhodes/Background.png +0 -0
- data/platform/wp7/rhodes/MainPage.xaml +44 -0
- data/platform/wp7/rhodes/MainPage.xaml.cs +98 -0
- data/platform/wp7/rhodes/Properties/AppManifest.xml +6 -0
- data/platform/wp7/rhodes/Properties/AssemblyInfo.cs +35 -0
- data/platform/wp7/rhodes/Properties/WMAppManifest.xml +31 -0
- data/platform/wp7/rhodes/Rhodes.csproj +127 -0
- data/platform/wp7/rhodes/SplashScreenImage.jpg +0 -0
- data/platform/wp7/rhodes/icon.png +0 -0
- data/platform/wp7/sqlite3/Properties/AssemblyInfo.cs +35 -0
- data/platform/wp7/sqlite3/SQLiteClient.cs +550 -0
- data/platform/wp7/sqlite3/SqliteWrapper/BtreeInt_h.cs +774 -0
- data/platform/wp7/sqlite3/SqliteWrapper/Btree_h.cs +280 -0
- data/platform/wp7/sqlite3/SqliteWrapper/ClassDiagram1.cd +1306 -0
- data/platform/wp7/sqlite3/SqliteWrapper/Delagates.cs +365 -0
- data/platform/wp7/sqlite3/SqliteWrapper/Hash_h.cs +133 -0
- data/platform/wp7/sqlite3/SqliteWrapper/VdbeInt_h.cs +620 -0
- data/platform/wp7/sqlite3/SqliteWrapper/Vdbe_h.cs +302 -0
- data/platform/wp7/sqlite3/SqliteWrapper/_Custom.cs +449 -0
- data/platform/wp7/sqlite3/SqliteWrapper/alter_c.cs +872 -0
- data/platform/wp7/sqlite3/SqliteWrapper/analyze_c.cs +757 -0
- data/platform/wp7/sqlite3/SqliteWrapper/attach_c.cs +628 -0
- data/platform/wp7/sqlite3/SqliteWrapper/auth_c.cs +268 -0
- data/platform/wp7/sqlite3/SqliteWrapper/backup_c.cs +737 -0
- data/platform/wp7/sqlite3/SqliteWrapper/bitvec_c.cs +509 -0
- data/platform/wp7/sqlite3/SqliteWrapper/btmutex_c.cs +379 -0
- data/platform/wp7/sqlite3/SqliteWrapper/btree_c.cs +9138 -0
- data/platform/wp7/sqlite3/SqliteWrapper/build_c.cs +4189 -0
- data/platform/wp7/sqlite3/SqliteWrapper/callback_c.cs +548 -0
- data/platform/wp7/sqlite3/SqliteWrapper/complete_c.cs +342 -0
- data/platform/wp7/sqlite3/SqliteWrapper/ctime_cs.cs +408 -0
- data/platform/wp7/sqlite3/SqliteWrapper/date_c.cs +1317 -0
- data/platform/wp7/sqlite3/SqliteWrapper/delete_c.cs +726 -0
- data/platform/wp7/sqlite3/SqliteWrapper/expr_c.cs +4406 -0
- data/platform/wp7/sqlite3/SqliteWrapper/fault_c.cs +115 -0
- data/platform/wp7/sqlite3/SqliteWrapper/fkey_c.cs +1330 -0
- data/platform/wp7/sqlite3/SqliteWrapper/func_c.cs +2025 -0
- data/platform/wp7/sqlite3/SqliteWrapper/global_c.cs +228 -0
- data/platform/wp7/sqlite3/SqliteWrapper/hash_c.cs +351 -0
- data/platform/wp7/sqlite3/SqliteWrapper/hwtime_c.cs +101 -0
- data/platform/wp7/sqlite3/SqliteWrapper/insert_c.cs +2122 -0
- data/platform/wp7/sqlite3/SqliteWrapper/journal_c.cs +247 -0
- data/platform/wp7/sqlite3/SqliteWrapper/keywordhash_h.cs +302 -0
- data/platform/wp7/sqlite3/SqliteWrapper/legacy_c.cs +223 -0
- data/platform/wp7/sqlite3/SqliteWrapper/loadext_c.cs +683 -0
- data/platform/wp7/sqlite3/SqliteWrapper/main_c.cs +2716 -0
- data/platform/wp7/sqlite3/SqliteWrapper/malloc_c.cs +977 -0
- data/platform/wp7/sqlite3/SqliteWrapper/mem_Pool.cs +394 -0
- data/platform/wp7/sqlite3/SqliteWrapper/memjournal_c.cs +315 -0
- data/platform/wp7/sqlite3/SqliteWrapper/mutex_c.cs +182 -0
- data/platform/wp7/sqlite3/SqliteWrapper/mutex_h.cs +91 -0
- data/platform/wp7/sqlite3/SqliteWrapper/mutex_noop_c.cs +202 -0
- data/platform/wp7/sqlite3/SqliteWrapper/mutex_w32.cs +344 -0
- data/platform/wp7/sqlite3/SqliteWrapper/notify_c.cs +347 -0
- data/platform/wp7/sqlite3/SqliteWrapper/opcodes_c.cs +171 -0
- data/platform/wp7/sqlite3/SqliteWrapper/opcodes_h.cs +346 -0
- data/platform/wp7/sqlite3/SqliteWrapper/os_c.cs +367 -0
- data/platform/wp7/sqlite3/SqliteWrapper/os_common_h.cs +174 -0
- data/platform/wp7/sqlite3/SqliteWrapper/os_h.cs +295 -0
- data/platform/wp7/sqlite3/SqliteWrapper/os_win_c.cs +1255 -0
- data/platform/wp7/sqlite3/SqliteWrapper/pager_c.cs +6078 -0
- data/platform/wp7/sqlite3/SqliteWrapper/pager_h.cs +188 -0
- data/platform/wp7/sqlite3/SqliteWrapper/parse_c.cs +4045 -0
- data/platform/wp7/sqlite3/SqliteWrapper/parse_h.cs +331 -0
- data/platform/wp7/sqlite3/SqliteWrapper/pcache1_c.cs +969 -0
- data/platform/wp7/sqlite3/SqliteWrapper/pcache_c.cs +712 -0
- data/platform/wp7/sqlite3/SqliteWrapper/pcache_h.cs +213 -0
- data/platform/wp7/sqlite3/SqliteWrapper/pragma_c.cs +1767 -0
- data/platform/wp7/sqlite3/SqliteWrapper/prepare_c.cs +1015 -0
- data/platform/wp7/sqlite3/SqliteWrapper/printf_c.cs +1300 -0
- data/platform/wp7/sqlite3/SqliteWrapper/random_c.cs +201 -0
- data/platform/wp7/sqlite3/SqliteWrapper/resolve_c.cs +1396 -0
- data/platform/wp7/sqlite3/SqliteWrapper/rowset_c.cs +519 -0
- data/platform/wp7/sqlite3/SqliteWrapper/select_c.cs +4878 -0
- data/platform/wp7/sqlite3/SqliteWrapper/sqlite3_h.cs +6253 -0
- data/platform/wp7/sqlite3/SqliteWrapper/sqlite3ext_h.cs +397 -0
- data/platform/wp7/sqlite3/SqliteWrapper/sqliteInt_h.cs +4075 -0
- data/platform/wp7/sqlite3/SqliteWrapper/sqliteLimit_h.cs +214 -0
- data/platform/wp7/sqlite3/SqliteWrapper/sqliteicu_h.cs +39 -0
- data/platform/wp7/sqlite3/SqliteWrapper/status_c.cs +155 -0
- data/platform/wp7/sqlite3/SqliteWrapper/table_c.cs +222 -0
- data/platform/wp7/sqlite3/SqliteWrapper/tokenize_c.cs +673 -0
- data/platform/wp7/sqlite3/SqliteWrapper/trigger_c.cs +1219 -0
- data/platform/wp7/sqlite3/SqliteWrapper/update_c.cs +766 -0
- data/platform/wp7/sqlite3/SqliteWrapper/utf_c.cs +612 -0
- data/platform/wp7/sqlite3/SqliteWrapper/util_c.cs +1476 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vacuum_c.cs +382 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vdbe_c.cs +6566 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vdbeapi_c.cs +1557 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vdbeaux_c.cs +4019 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vdbeblob_c.cs +396 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vdbemem_c.cs +1480 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vdbetrace_c.cs +181 -0
- data/platform/wp7/sqlite3/SqliteWrapper/vtab_c.cs +957 -0
- data/platform/wp7/sqlite3/SqliteWrapper/walker_c.cs +174 -0
- data/platform/wp7/sqlite3/SqliteWrapper/where_c.cs +4651 -0
- data/platform/wp7/sqlite3/sqlite3.csproj +155 -0
- data/rakefile.rb +60 -2
- data/res/build-tools/7za.exe +0 -0
- data/res/build-tools/RhoAppRunner.exe +0 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/rhogen.rb +9 -1
- data/res/generators/templates/application/app/Settings/reset.erb +1 -1
- data/res/generators/templates/application/app/layout.erb +17 -10
- data/res/generators/templates/application/build.yml +5 -3
- data/res/generators/templates/application/public/jqtouch/changes.txt +20 -0
- data/res/generators/templates/application/public/jqtouch/jqtouch.js +12 -4
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/public/js/wp7.js +7 -0
- data/res/generators/templates/model/controller.rb +5 -6
- data/rhobuild.yml.example +1 -0
- data/rhodes.gemspec +2 -1
- data/spec/framework_spec/app/spec/core/dir/close_spec.rb +1 -1
- data/spec/framework_spec/app/spec/core/dir/shared/pwd.rb +13 -11
- data/spec/framework_spec/app/spec/core/env/shared/store.rb +12 -10
- data/spec/framework_spec/app/spec/core/env/update_spec.rb +1 -0
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +3 -2
- data/spec/framework_spec/app/spec/core/file/fixtures/file_types.rb +7 -1
- data/spec/framework_spec/app/spec/core/file/flock_spec.rb +8 -1
- data/spec/framework_spec/app/spec/core/file/ftype_spec.rb +5 -3
- data/spec/framework_spec/app/spec/core/file/lchmod_spec.rb +1 -1
- data/spec/framework_spec/app/spec/core/file/setgid_spec.rb +1 -1
- data/spec/framework_spec/app/spec/core/file/setuid_spec.rb +1 -1
- data/spec/framework_spec/app/spec/core/file/stat/ftype_spec.rb +6 -4
- data/spec/framework_spec/app/spec/core/file/truncate_spec.rb +5 -1
- data/spec/framework_spec/app/spec/core/float/to_s_spec.rb +1 -1
- data/spec/framework_spec/app/spec/core/process/gid_spec.rb +5 -3
- data/spec/framework_spec/app/spec/core/process/groups_spec.rb +11 -9
- data/spec/framework_spec/app/spec/core/process/uid_spec.rb +5 -3
- data/spec/framework_spec/app/spec/language/execution_spec.rb +10 -6
- data/spec/framework_spec/app/spec/shared/file/directory.rb +6 -1
- data/spec/framework_spec/app/spec/shared/file/executable.rb +7 -1
- data/spec/framework_spec/app/spec/shared/file/file.rb +6 -1
- data/spec/framework_spec/app/spec/shared/file/readable.rb +13 -4
- data/spec/framework_spec/app/spec/shared/file/writable.rb +6 -1
- data/spec/phone_spec/app/spec/rho_controller_spec.rb +11 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +11 -0
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +102 -6
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +4 -1
- data/spec/phone_spec/app/spec/string/slice_spec.rb +5 -1
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +4 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +73 -6
- data/spec/phone_spec/app/spec_runner.rb +7 -3
- metadata +380 -41
- data/Manifest.txt +0 -5819
- data/platform/bb/Hsqldb/Hsqldb.cso +0 -5
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -197
- data/platform/bb/RhoBundle/RhoBundle.cso +0 -5
- data/platform/bb/RhoBundle/RhoBundle.jdp +0 -42
- data/platform/bb/RubyVM/RubyVM.cso +0 -5
- data/platform/bb/RubyVM/RubyVM.jdp +0 -467
- data/platform/bb/rhodes/rhodes.csl +0 -3
- data/platform/bb/rhodes/rhodes.cso +0 -5
- data/platform/bb/rhodes/rhodes.jdp +0 -104
@@ -0,0 +1,199 @@
|
|
1
|
+
using System;
|
2
|
+
|
3
|
+
namespace rho.common
|
4
|
+
{
|
5
|
+
public abstract class CThreadQueue : CRhoThread
|
6
|
+
{
|
7
|
+
private RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() :
|
8
|
+
new RhoLogger("ThreadQueue");
|
9
|
+
|
10
|
+
public void setLogCategory(String category)
|
11
|
+
{
|
12
|
+
LOG.setLogCategory(category);
|
13
|
+
}
|
14
|
+
|
15
|
+
public static int QUEUE_POLL_INTERVAL_SECONDS = 300;
|
16
|
+
public static int QUEUE_POLL_INTERVAL_INFINITE = int.MaxValue/1000;
|
17
|
+
public static int QUEUE_STARTUP_INTERVAL_SECONDS = 10;
|
18
|
+
|
19
|
+
public interface IQueueCommand
|
20
|
+
{
|
21
|
+
boolean equals(IQueueCommand cmd);
|
22
|
+
String toString();
|
23
|
+
|
24
|
+
void cancel();
|
25
|
+
};
|
26
|
+
|
27
|
+
private int m_nPollInterval;
|
28
|
+
private Object m_mxStackCommands;// = new Mutex();
|
29
|
+
private LinkedList<IQueueCommand> m_stackCommands = new LinkedList<IQueueCommand>();
|
30
|
+
private IQueueCommand m_pCurCmd;
|
31
|
+
|
32
|
+
boolean m_bNoThreaded;
|
33
|
+
|
34
|
+
public abstract void processCommand(IQueueCommand pCmd);
|
35
|
+
public virtual void onTimeout(){}
|
36
|
+
|
37
|
+
public int getPollInterval(){ return m_nPollInterval;}
|
38
|
+
|
39
|
+
public boolean isNoThreadedMode(){ return m_bNoThreaded; }
|
40
|
+
public void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
|
41
|
+
|
42
|
+
public virtual int getLastPollInterval(){ return 0;}
|
43
|
+
public virtual boolean isSkipDuplicateCmd() { return false; }
|
44
|
+
|
45
|
+
protected Object getCommandLock(){ return m_mxStackCommands; }
|
46
|
+
protected IQueueCommand getCurCommand(){ return m_pCurCmd; }
|
47
|
+
protected LinkedList<IQueueCommand> getCommands(){ return m_stackCommands; }
|
48
|
+
|
49
|
+
public CThreadQueue()
|
50
|
+
{
|
51
|
+
m_nPollInterval = QUEUE_POLL_INTERVAL_SECONDS;
|
52
|
+
m_bNoThreaded = false;
|
53
|
+
|
54
|
+
m_mxStackCommands = getSyncObject();
|
55
|
+
}
|
56
|
+
|
57
|
+
protected void addQueueCommandInt(IQueueCommand pCmd)
|
58
|
+
{
|
59
|
+
LOG.INFO("addCommand: " + pCmd.toString());
|
60
|
+
|
61
|
+
lock(m_mxStackCommands)
|
62
|
+
{
|
63
|
+
boolean bExist = false;
|
64
|
+
if ( isSkipDuplicateCmd() )
|
65
|
+
{
|
66
|
+
for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
|
67
|
+
{
|
68
|
+
if ( m_stackCommands.get(i).equals(pCmd) )
|
69
|
+
{
|
70
|
+
LOG.INFO("Command already exists in queue. Skip it.");
|
71
|
+
bExist = true;
|
72
|
+
break;
|
73
|
+
}
|
74
|
+
}
|
75
|
+
}
|
76
|
+
|
77
|
+
if ( !bExist )
|
78
|
+
m_stackCommands.add(pCmd);
|
79
|
+
}
|
80
|
+
}
|
81
|
+
|
82
|
+
public void addQueueCommand(IQueueCommand pCmd)
|
83
|
+
{
|
84
|
+
addQueueCommandInt(pCmd);
|
85
|
+
|
86
|
+
if ( isNoThreadedMode() )
|
87
|
+
processCommands();
|
88
|
+
else if ( isAlive() )
|
89
|
+
stopWait();
|
90
|
+
}
|
91
|
+
|
92
|
+
public override void stop(int nTimeoutToKill)
|
93
|
+
{
|
94
|
+
cancelCurrentCommand();
|
95
|
+
base.stop(nTimeoutToKill);
|
96
|
+
}
|
97
|
+
|
98
|
+
void cancelCurrentCommand()
|
99
|
+
{
|
100
|
+
lock(m_mxStackCommands)
|
101
|
+
{
|
102
|
+
if ( m_pCurCmd != null )
|
103
|
+
m_pCurCmd.cancel();
|
104
|
+
}
|
105
|
+
}
|
106
|
+
|
107
|
+
protected void processCommandBase(IQueueCommand pCmd)
|
108
|
+
{
|
109
|
+
lock(m_mxStackCommands)
|
110
|
+
{
|
111
|
+
m_pCurCmd = pCmd;
|
112
|
+
}
|
113
|
+
|
114
|
+
processCommand(pCmd);
|
115
|
+
|
116
|
+
lock(m_mxStackCommands)
|
117
|
+
{
|
118
|
+
m_pCurCmd = null;
|
119
|
+
}
|
120
|
+
}
|
121
|
+
|
122
|
+
public override void run()
|
123
|
+
{
|
124
|
+
LOG.INFO("Starting main routine...");
|
125
|
+
|
126
|
+
int nLastPollInterval = getLastPollInterval();
|
127
|
+
while( !isStopping() )
|
128
|
+
{
|
129
|
+
int nWait = m_nPollInterval > 0 ? m_nPollInterval : QUEUE_POLL_INTERVAL_INFINITE;
|
130
|
+
|
131
|
+
if ( m_nPollInterval > 0 && nLastPollInterval > 0 )
|
132
|
+
{
|
133
|
+
int nWait2 = m_nPollInterval - nLastPollInterval;
|
134
|
+
if ( nWait2 <= 0 )
|
135
|
+
nWait = QUEUE_STARTUP_INTERVAL_SECONDS;
|
136
|
+
else
|
137
|
+
nWait = nWait2;
|
138
|
+
}
|
139
|
+
|
140
|
+
lock(m_mxStackCommands)
|
141
|
+
{
|
142
|
+
if ( nWait >= 0 && !isStopping() && isNoCommands() )
|
143
|
+
{
|
144
|
+
LOG.INFO("ThreadQueue blocked for " + nWait + " seconds...");
|
145
|
+
wait(nWait);
|
146
|
+
|
147
|
+
if ( isNoCommands() )
|
148
|
+
onTimeout();
|
149
|
+
}
|
150
|
+
}
|
151
|
+
nLastPollInterval = 0;
|
152
|
+
|
153
|
+
if ( !isStopping() )
|
154
|
+
{
|
155
|
+
try{
|
156
|
+
processCommands();
|
157
|
+
}catch(Exception e)
|
158
|
+
{
|
159
|
+
LOG.ERROR("processCommand failed", e);
|
160
|
+
}
|
161
|
+
}
|
162
|
+
}
|
163
|
+
|
164
|
+
LOG.INFO("Thread shutdown");
|
165
|
+
}
|
166
|
+
|
167
|
+
public boolean isNoCommands()
|
168
|
+
{
|
169
|
+
boolean bEmpty = false;
|
170
|
+
lock(m_mxStackCommands)
|
171
|
+
{
|
172
|
+
bEmpty = m_stackCommands.isEmpty();
|
173
|
+
}
|
174
|
+
|
175
|
+
return bEmpty;
|
176
|
+
}
|
177
|
+
|
178
|
+
void processCommands()//throws Exception
|
179
|
+
{
|
180
|
+
while(!isStopping() && !isNoCommands())
|
181
|
+
{
|
182
|
+
IQueueCommand pCmd = null;
|
183
|
+
lock(m_mxStackCommands)
|
184
|
+
{
|
185
|
+
pCmd = (IQueueCommand)m_stackCommands.removeFirst();
|
186
|
+
}
|
187
|
+
|
188
|
+
processCommandBase(pCmd);
|
189
|
+
}
|
190
|
+
}
|
191
|
+
|
192
|
+
public virtual void setPollInterval(int nInterval)
|
193
|
+
{
|
194
|
+
m_nPollInterval = nInterval;
|
195
|
+
if ( isAlive() )
|
196
|
+
stopWait();
|
197
|
+
}
|
198
|
+
}
|
199
|
+
}
|
@@ -0,0 +1,56 @@
|
|
1
|
+
using System;
|
2
|
+
|
3
|
+
namespace rho.common
|
4
|
+
{
|
5
|
+
public class TimeInterval
|
6
|
+
{
|
7
|
+
public TimeInterval() { m_nativeTime = 0; }
|
8
|
+
|
9
|
+
public String toString()
|
10
|
+
{
|
11
|
+
long nMin = m_nativeTime / (60 * 1000);
|
12
|
+
long nSec = (m_nativeTime - nMin * (60 * 1000)) / 1000;
|
13
|
+
long mSec = m_nativeTime - nSec * 1000 - nMin * (60 * 1000);
|
14
|
+
|
15
|
+
String strTime = nMin + ":" +
|
16
|
+
nSec + ":" +
|
17
|
+
mSec;
|
18
|
+
|
19
|
+
return strTime;
|
20
|
+
}
|
21
|
+
|
22
|
+
public long toULong()
|
23
|
+
{
|
24
|
+
return m_nativeTime;
|
25
|
+
}
|
26
|
+
|
27
|
+
public TimeInterval minus(TimeInterval time)
|
28
|
+
{
|
29
|
+
TimeInterval res = new TimeInterval();
|
30
|
+
res.m_nativeTime = m_nativeTime - time.m_nativeTime;
|
31
|
+
return res;
|
32
|
+
}
|
33
|
+
|
34
|
+
public void addMillis(int nMs)
|
35
|
+
{
|
36
|
+
m_nativeTime += nMs;
|
37
|
+
}
|
38
|
+
|
39
|
+
public TimeInterval plusAssign(TimeInterval time)
|
40
|
+
{
|
41
|
+
m_nativeTime += time.m_nativeTime;
|
42
|
+
return this;
|
43
|
+
}
|
44
|
+
|
45
|
+
public static TimeInterval getCurrentTime()
|
46
|
+
{
|
47
|
+
TimeInterval res = new TimeInterval();
|
48
|
+
res.m_nativeTime = DateTime.Now.ToFileTime();
|
49
|
+
return res;
|
50
|
+
}
|
51
|
+
|
52
|
+
public boolean isEmpty() { return m_nativeTime == 0; }
|
53
|
+
|
54
|
+
private long m_nativeTime;
|
55
|
+
}
|
56
|
+
}
|
@@ -0,0 +1,52 @@
|
|
1
|
+
using System;
|
2
|
+
using rho.common;
|
3
|
+
|
4
|
+
namespace rho.common
|
5
|
+
{
|
6
|
+
public class Tokenizer
|
7
|
+
{
|
8
|
+
String m_str;
|
9
|
+
String m_delims;
|
10
|
+
int m_length;
|
11
|
+
int m_position;
|
12
|
+
|
13
|
+
public Tokenizer(String str,String delims) {
|
14
|
+
m_delims = delims;
|
15
|
+
m_str = str;
|
16
|
+
m_length = str.length();
|
17
|
+
m_position = 0;
|
18
|
+
}
|
19
|
+
|
20
|
+
public String nextToken() {
|
21
|
+
//eatDelimeters();
|
22
|
+
int start = m_position;
|
23
|
+
while (m_position<m_length && m_delims.indexOf(m_str.charAt(m_position))==-1) {
|
24
|
+
m_position++;
|
25
|
+
}
|
26
|
+
|
27
|
+
String strToken = m_str.substring(start,m_position);
|
28
|
+
eatDelimeters();
|
29
|
+
return strToken;
|
30
|
+
}
|
31
|
+
|
32
|
+
public void eatDelimeters()
|
33
|
+
{
|
34
|
+
if ( m_position == m_length )
|
35
|
+
m_position++;
|
36
|
+
else if (m_position<m_length) {
|
37
|
+
char c = m_str.charAt(m_position);
|
38
|
+
if (m_delims.indexOf(c)>=0) {
|
39
|
+
m_position++;
|
40
|
+
} else {
|
41
|
+
return;
|
42
|
+
}
|
43
|
+
|
44
|
+
}
|
45
|
+
}
|
46
|
+
|
47
|
+
public boolean hasMoreTokens() {
|
48
|
+
//eatDelimeters();
|
49
|
+
return (m_position <= m_length);
|
50
|
+
}
|
51
|
+
}
|
52
|
+
}
|
@@ -0,0 +1,1129 @@
|
|
1
|
+
using System;
|
2
|
+
using rho.common;
|
3
|
+
using rho;
|
4
|
+
using Community.CsharpSqlite;
|
5
|
+
|
6
|
+
namespace rho.db
|
7
|
+
{
|
8
|
+
public class DBAdapter
|
9
|
+
{
|
10
|
+
private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() :
|
11
|
+
new RhoLogger("DbAdapter");
|
12
|
+
private static CRhodesApp RHODESAPP(){return CRhodesApp.Instance;}
|
13
|
+
public CRhoRuby RhoRuby { get { return CRhoRuby.Instance; } }
|
14
|
+
|
15
|
+
private IDBStorage m_dbStorage;
|
16
|
+
private boolean m_bIsOpen = false;
|
17
|
+
private String m_strDBPath, m_strDbVerPath;
|
18
|
+
private String m_strDbPartition;
|
19
|
+
private DBAttrManager m_attrMgr = new DBAttrManager();
|
20
|
+
static Hashtable<String,DBAdapter> m_mapDBPartitions = new Hashtable<String,DBAdapter>();
|
21
|
+
|
22
|
+
Mutex m_mxDB = new Mutex();
|
23
|
+
int m_nTransactionCounter=0;
|
24
|
+
boolean m_bUIWaitDB = false;
|
25
|
+
|
26
|
+
static String USER_PARTITION_NAME(){return "user";}
|
27
|
+
static Hashtable<String,DBAdapter> getDBPartitions(){ return m_mapDBPartitions; }
|
28
|
+
String m_strClientInfoInsert = "";
|
29
|
+
Object[] m_dataClientInfo = null;
|
30
|
+
|
31
|
+
public DBAdapter()
|
32
|
+
{
|
33
|
+
try{
|
34
|
+
m_dbStorage = RhoClassFactory.createDBStorage();
|
35
|
+
}catch(Exception exc){
|
36
|
+
LOG.ERROR("createDBStorage failed.", exc);
|
37
|
+
}
|
38
|
+
}
|
39
|
+
|
40
|
+
private static DBAdapter getDBByHandle(Sqlite3.sqlite3 db)
|
41
|
+
{
|
42
|
+
Hashtable<String, DBAdapter>.Enumerator hashEnum = m_mapDBPartitions.GetEnumerator();
|
43
|
+
while( hashEnum.MoveNext() )
|
44
|
+
{
|
45
|
+
if(hashEnum.Current.Value.m_dbStorage == db)
|
46
|
+
return hashEnum.Current.Value;
|
47
|
+
}
|
48
|
+
|
49
|
+
return getDBPartitions().get(USER_PARTITION_NAME());
|
50
|
+
}
|
51
|
+
|
52
|
+
public static void SyncBlob_DeleteCallback(Sqlite3.sqlite3_context dbContext, int nArgs, Sqlite3.Mem[] Args)
|
53
|
+
{
|
54
|
+
if (nArgs < 3)
|
55
|
+
return;
|
56
|
+
|
57
|
+
DBAttrManager attrMgr = getDBByHandle(Sqlite3.sqlite3_context_db_handle(dbContext)).getAttrMgr();
|
58
|
+
|
59
|
+
String szAttrName = Sqlite3.sqlite3_value_text(Args[2]);
|
60
|
+
int nSrcID = Sqlite3.sqlite3_value_int(Args[1]);
|
61
|
+
if (attrMgr.isBlobAttr(nSrcID, szAttrName))
|
62
|
+
{
|
63
|
+
String strFilePath = RHODESAPP().resolveDBFilesPath(Sqlite3.sqlite3_value_text(Args[0]));
|
64
|
+
CRhoFile.deleteFile(strFilePath);
|
65
|
+
}
|
66
|
+
}
|
67
|
+
|
68
|
+
public static void SyncBlob_UpdateCallback(Sqlite3.sqlite3_context dbContext, int nArgs, Sqlite3.Mem[] Args)
|
69
|
+
{
|
70
|
+
if (nArgs < 3)
|
71
|
+
return;
|
72
|
+
|
73
|
+
DBAttrManager attrMgr = getDBByHandle(Sqlite3.sqlite3_context_db_handle(dbContext)).getAttrMgr();
|
74
|
+
|
75
|
+
String szAttrName = Sqlite3.sqlite3_value_text(Args[2]);
|
76
|
+
int nSrcID = Sqlite3.sqlite3_value_int(Args[1]);
|
77
|
+
if (attrMgr.isBlobAttr(nSrcID, szAttrName))
|
78
|
+
{
|
79
|
+
String strFilePath = RHODESAPP().resolveDBFilesPath(Sqlite3.sqlite3_value_text(Args[0]));
|
80
|
+
CRhoFile.deleteFile(strFilePath);
|
81
|
+
}
|
82
|
+
}
|
83
|
+
|
84
|
+
private void setDbPartition(String strPartition)
|
85
|
+
{
|
86
|
+
m_strDbPartition = strPartition;
|
87
|
+
}
|
88
|
+
|
89
|
+
public void close()
|
90
|
+
{
|
91
|
+
try{
|
92
|
+
m_dbStorage.close();
|
93
|
+
m_dbStorage = null;
|
94
|
+
}catch(Exception exc)
|
95
|
+
{
|
96
|
+
LOG.ERROR("DB close failed.", exc);
|
97
|
+
}
|
98
|
+
}
|
99
|
+
|
100
|
+
public DBAttrManager getAttrMgr()
|
101
|
+
{
|
102
|
+
return m_attrMgr;
|
103
|
+
}
|
104
|
+
|
105
|
+
public void executeBatchSQL(String strStatement)
|
106
|
+
{
|
107
|
+
LOG.TRACE("executeBatchSQL: " + strStatement);
|
108
|
+
|
109
|
+
Lock();
|
110
|
+
try{
|
111
|
+
m_dbStorage.executeBatchSQL(strStatement);
|
112
|
+
}
|
113
|
+
finally
|
114
|
+
{
|
115
|
+
Unlock();
|
116
|
+
}
|
117
|
+
}
|
118
|
+
|
119
|
+
public IDBResult executeSQL(String strStatement, Object[] values)
|
120
|
+
{
|
121
|
+
return executeSQL(strStatement, values, false);
|
122
|
+
}
|
123
|
+
|
124
|
+
public IDBResult executeSQL(String strStatement, Object[] values, boolean bNoCopy)
|
125
|
+
{
|
126
|
+
LOG.TRACE("executeSQL: " + strStatement + ";" + values);
|
127
|
+
IDBResult res = null;
|
128
|
+
Lock();
|
129
|
+
try{
|
130
|
+
res = m_dbStorage.executeSQL(strStatement, values, false, bNoCopy);
|
131
|
+
}finally
|
132
|
+
{
|
133
|
+
Unlock();
|
134
|
+
}
|
135
|
+
return res;
|
136
|
+
}
|
137
|
+
|
138
|
+
public IDBResult executeSQL(String strStatement){
|
139
|
+
return executeSQL(strStatement,null);
|
140
|
+
}
|
141
|
+
|
142
|
+
public IDBResult executeSQL(String strStatement, Object arg1){
|
143
|
+
Object[] values = {arg1};
|
144
|
+
return executeSQL(strStatement,values);
|
145
|
+
}
|
146
|
+
public IDBResult executeSQL(String strStatement, int arg1){
|
147
|
+
Object[] values = { arg1 };
|
148
|
+
return executeSQL(strStatement,values);
|
149
|
+
}
|
150
|
+
public IDBResult executeSQL(String strStatement, int arg1, int arg2){
|
151
|
+
Object[] values = { arg1, arg2};
|
152
|
+
return executeSQL(strStatement,values);
|
153
|
+
}
|
154
|
+
|
155
|
+
public IDBResult executeSQL(String strStatement, long arg1){
|
156
|
+
Object[] values = { arg1};
|
157
|
+
return executeSQL(strStatement,values);
|
158
|
+
}
|
159
|
+
|
160
|
+
public IDBResult executeSQL(String strStatement, Object arg1, Object arg2){
|
161
|
+
Object[] values = {arg1,arg2};
|
162
|
+
return executeSQL(strStatement,values);
|
163
|
+
}
|
164
|
+
|
165
|
+
public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3){
|
166
|
+
Object[] values = {arg1,arg2,arg3};
|
167
|
+
return executeSQL(strStatement,values);
|
168
|
+
}
|
169
|
+
public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4){
|
170
|
+
Object[] values = {arg1,arg2,arg3,arg4};
|
171
|
+
return executeSQL(strStatement,values);
|
172
|
+
}
|
173
|
+
|
174
|
+
public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5){
|
175
|
+
Object[] values = {arg1,arg2,arg3,arg4,arg5};
|
176
|
+
return executeSQL(strStatement,values);
|
177
|
+
}
|
178
|
+
public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6){
|
179
|
+
Object[] values = {arg1,arg2,arg3,arg4,arg5,arg6};
|
180
|
+
return executeSQL(strStatement,values);
|
181
|
+
}
|
182
|
+
|
183
|
+
public IDBResult executeSQLReportNonUnique(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4){
|
184
|
+
//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
|
185
|
+
|
186
|
+
Object[] values = {arg1,arg2,arg3,arg4};
|
187
|
+
IDBResult res = null;
|
188
|
+
Lock();
|
189
|
+
try{
|
190
|
+
res = m_dbStorage.executeSQL(strStatement,values, true, false);
|
191
|
+
}finally
|
192
|
+
{
|
193
|
+
Unlock();
|
194
|
+
}
|
195
|
+
|
196
|
+
return res;
|
197
|
+
}
|
198
|
+
|
199
|
+
public IDBResult executeSQLReportNonUnique(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7){
|
200
|
+
//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
|
201
|
+
|
202
|
+
Object[] values = {arg1,arg2,arg3,arg4, arg5, arg6, arg7};
|
203
|
+
IDBResult res = null;
|
204
|
+
Lock();
|
205
|
+
try{
|
206
|
+
res = m_dbStorage.executeSQL(strStatement,values, true, false);
|
207
|
+
}finally
|
208
|
+
{
|
209
|
+
Unlock();
|
210
|
+
}
|
211
|
+
|
212
|
+
return res;
|
213
|
+
}
|
214
|
+
|
215
|
+
public IDBResult executeSQLReportNonUniqueEx(String strStatement, Vector<String> vecValues){
|
216
|
+
//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
|
217
|
+
|
218
|
+
Object[] values = new Object[vecValues.size()];
|
219
|
+
for (int i = 0; i < vecValues.size(); i++ )
|
220
|
+
values[i] = vecValues.elementAt(i);
|
221
|
+
|
222
|
+
IDBResult res = null;
|
223
|
+
Lock();
|
224
|
+
try{
|
225
|
+
res = m_dbStorage.executeSQL(strStatement,values, true, false);
|
226
|
+
}finally
|
227
|
+
{
|
228
|
+
Unlock();
|
229
|
+
}
|
230
|
+
|
231
|
+
return res;
|
232
|
+
}
|
233
|
+
|
234
|
+
public IDBResult executeSQLEx(String strStatement, Vector<String> vecValues){
|
235
|
+
Object[] values = new Object[vecValues.size()];
|
236
|
+
for (int i = 0; i < vecValues.size(); i++ )
|
237
|
+
values[i] = vecValues.elementAt(i);
|
238
|
+
|
239
|
+
return executeSQL(strStatement,values);
|
240
|
+
}
|
241
|
+
|
242
|
+
public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7){
|
243
|
+
Object[] values = {arg1,arg2,arg3,arg4,arg5,arg6,arg7};
|
244
|
+
return executeSQL(strStatement,values);
|
245
|
+
}
|
246
|
+
|
247
|
+
public boolean isUIWaitDB(){ return m_bUIWaitDB; }
|
248
|
+
public void Lock()
|
249
|
+
{
|
250
|
+
if ( RHODESAPP().isMainRubyThread() )
|
251
|
+
m_bUIWaitDB = true;
|
252
|
+
|
253
|
+
m_mxDB.Lock();
|
254
|
+
|
255
|
+
if (RHODESAPP().isMainRubyThread())
|
256
|
+
m_bUIWaitDB = false;
|
257
|
+
}
|
258
|
+
|
259
|
+
public void Unlock(){ m_mxDB.Unlock(); }
|
260
|
+
public boolean isInsideTransaction(){ return m_nTransactionCounter>0; }
|
261
|
+
|
262
|
+
//public static IDBResult createResult(){
|
263
|
+
// return getInstance().m_dbStorage.createResult();
|
264
|
+
//}
|
265
|
+
|
266
|
+
public String makeBlobFolderName()
|
267
|
+
{
|
268
|
+
String fName = CFilePath.join(CRhodesApp.getRhoRootPath(), "db/db-files");
|
269
|
+
CRhoFile.recursiveCreateDir(fName);
|
270
|
+
|
271
|
+
return fName;
|
272
|
+
}
|
273
|
+
/*
|
274
|
+
RubyString[] getOrigColNames(IDBResult rows)
|
275
|
+
{
|
276
|
+
RubyString[] colNames = new RubyString[rows.getColCount()];
|
277
|
+
for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ )
|
278
|
+
colNames[nCol] = ObjectFactory.createString(rows.getOrigColName(nCol));
|
279
|
+
|
280
|
+
return colNames;
|
281
|
+
} */
|
282
|
+
|
283
|
+
private String getNameNoExt(String strPath){
|
284
|
+
int nDot = strPath.lastIndexOf('.');
|
285
|
+
String strDbName = "";
|
286
|
+
if ( nDot > 0 )
|
287
|
+
strDbName = strPath.substring(0, nDot);
|
288
|
+
else
|
289
|
+
strDbName = strPath;
|
290
|
+
|
291
|
+
return strDbName;
|
292
|
+
}
|
293
|
+
|
294
|
+
public String getDBPath(){ return getNameNoExt(m_strDBPath); }
|
295
|
+
|
296
|
+
private void initFilePaths(String strDBName)
|
297
|
+
{
|
298
|
+
CRhoFile.recursiveCreateDir(strDBName);
|
299
|
+
m_strDBPath = strDBName;
|
300
|
+
m_strDbVerPath = m_strDBPath+".version";
|
301
|
+
}
|
302
|
+
|
303
|
+
private String getSqlScript()
|
304
|
+
{
|
305
|
+
return CRhoFile.readStringFromResourceFile("db/syncdb.schema");
|
306
|
+
}
|
307
|
+
|
308
|
+
public void startTransaction()
|
309
|
+
{
|
310
|
+
Lock();
|
311
|
+
m_nTransactionCounter++;
|
312
|
+
if (m_nTransactionCounter == 1)
|
313
|
+
m_dbStorage.startTransaction();
|
314
|
+
}
|
315
|
+
|
316
|
+
public void commit()
|
317
|
+
{
|
318
|
+
m_nTransactionCounter--;
|
319
|
+
if (m_nTransactionCounter == 0)
|
320
|
+
{
|
321
|
+
m_dbStorage.onBeforeCommit();
|
322
|
+
//getAttrMgr().save(this);
|
323
|
+
m_dbStorage.commit();
|
324
|
+
}
|
325
|
+
|
326
|
+
Unlock();
|
327
|
+
}
|
328
|
+
|
329
|
+
public void rollback()
|
330
|
+
{
|
331
|
+
m_nTransactionCounter--;
|
332
|
+
if (m_nTransactionCounter == 0)
|
333
|
+
m_dbStorage.rollback();
|
334
|
+
|
335
|
+
Unlock();
|
336
|
+
}
|
337
|
+
|
338
|
+
public void endTransaction()
|
339
|
+
{
|
340
|
+
commit();
|
341
|
+
}
|
342
|
+
|
343
|
+
class DBVersion
|
344
|
+
{
|
345
|
+
public String m_strRhoVer = "";
|
346
|
+
public String m_strAppVer = "";
|
347
|
+
public boolean m_bEncrypted = false;
|
348
|
+
public boolean m_bSqlite = false;
|
349
|
+
|
350
|
+
public boolean isRhoVerChanged(DBVersion dbNewVer)
|
351
|
+
{
|
352
|
+
return m_strRhoVer.compareTo(dbNewVer.m_strRhoVer) != 0;
|
353
|
+
}
|
354
|
+
public boolean isAppVerChanged(DBVersion dbNewVer)
|
355
|
+
{
|
356
|
+
return m_strAppVer.compareTo(dbNewVer.m_strAppVer) != 0;
|
357
|
+
}
|
358
|
+
|
359
|
+
public boolean isDbFormatChanged(DBVersion dbNewVer)
|
360
|
+
{
|
361
|
+
return m_bEncrypted != dbNewVer.m_bEncrypted ||
|
362
|
+
m_bSqlite != dbNewVer.m_bSqlite;
|
363
|
+
}
|
364
|
+
|
365
|
+
public void fromFile(String strFilePath)
|
366
|
+
{
|
367
|
+
String strData = CRhoFile.readStringFromFile(strFilePath);
|
368
|
+
|
369
|
+
Tokenizer oTokenizer = new Tokenizer( strData, ";" );
|
370
|
+
int nPos = 0;
|
371
|
+
while (oTokenizer.hasMoreTokens())
|
372
|
+
{
|
373
|
+
String tok = oTokenizer.nextToken().trim();
|
374
|
+
|
375
|
+
switch(nPos)
|
376
|
+
{
|
377
|
+
case 0:
|
378
|
+
m_strRhoVer = tok;
|
379
|
+
break;
|
380
|
+
case 1:
|
381
|
+
m_strAppVer = tok;
|
382
|
+
break;
|
383
|
+
case 2:
|
384
|
+
m_bEncrypted = tok.compareTo("encrypted") == 0;
|
385
|
+
break;
|
386
|
+
case 3:
|
387
|
+
m_bSqlite = tok.compareTo("sqlite") == 0;
|
388
|
+
break;
|
389
|
+
}
|
390
|
+
nPos++;
|
391
|
+
}
|
392
|
+
}
|
393
|
+
|
394
|
+
public void toFile(String strFilePath)
|
395
|
+
{
|
396
|
+
String strFullVer = m_strRhoVer + ";" + m_strAppVer +
|
397
|
+
";" + (m_bEncrypted ? "encrypted":"") +
|
398
|
+
";" + (m_bSqlite ? "sqlite" : "");
|
399
|
+
|
400
|
+
try{
|
401
|
+
CRhoFile.writeStringToFile(strFilePath, strFullVer);
|
402
|
+
}catch (Exception e) {
|
403
|
+
LOG.ERROR("writeDBVersion failed.", e);
|
404
|
+
throw e;
|
405
|
+
}
|
406
|
+
}
|
407
|
+
};
|
408
|
+
|
409
|
+
boolean migrateDB(DBVersion dbVer, DBVersion dbNewVer )
|
410
|
+
{
|
411
|
+
LOG.INFO( "Try migrate database from " + (dbVer != null ? dbVer.m_strRhoVer:"") + " to " + (dbNewVer.m_strRhoVer !=null ? dbNewVer.m_strRhoVer:"") );
|
412
|
+
return false;
|
413
|
+
}
|
414
|
+
|
415
|
+
String getEncryptionInfo()
|
416
|
+
{
|
417
|
+
/*
|
418
|
+
boolean bEncrypted = AppBuildConfig.getItem("encrypt_database") != null &&
|
419
|
+
AppBuildConfig.getItem("encrypt_database").compareTo("1") == 0;
|
420
|
+
|
421
|
+
String strRes = "";
|
422
|
+
|
423
|
+
if (bEncrypted)
|
424
|
+
{
|
425
|
+
String strAppName = "rhodes";
|
426
|
+
try{
|
427
|
+
strAppName = RhoClassFactory.createRhoRubyHelper().getModuleName();
|
428
|
+
}catch(Exception e){}
|
429
|
+
|
430
|
+
strRes = m_strDbPartition + "_" + strAppName;
|
431
|
+
}
|
432
|
+
return strRes;*/
|
433
|
+
//TODO: getEncryptionInfo
|
434
|
+
return "";
|
435
|
+
}
|
436
|
+
|
437
|
+
void checkDBVersion()
|
438
|
+
{
|
439
|
+
DBVersion dbNewVer = new DBVersion();
|
440
|
+
dbNewVer.m_strRhoVer = RhoRuby.getRhoDBVersion();
|
441
|
+
dbNewVer.m_strAppVer = RhoConf.getInstance().getString("app_db_version");
|
442
|
+
String strEncryptionInfo = getEncryptionInfo();
|
443
|
+
dbNewVer.m_bEncrypted = strEncryptionInfo != null && strEncryptionInfo.length() > 0;
|
444
|
+
dbNewVer.m_bSqlite = true;
|
445
|
+
|
446
|
+
DBVersion dbVer = new DBVersion();
|
447
|
+
dbVer.fromFile(m_strDbVerPath);
|
448
|
+
|
449
|
+
if (dbVer.m_strRhoVer.length() == 0 )
|
450
|
+
{
|
451
|
+
dbNewVer.toFile(m_strDbVerPath);
|
452
|
+
return;
|
453
|
+
}
|
454
|
+
|
455
|
+
boolean bRhoReset = dbVer.isRhoVerChanged(dbNewVer);
|
456
|
+
boolean bAppReset = dbVer.isAppVerChanged(dbNewVer);
|
457
|
+
|
458
|
+
boolean bDbFormatChanged = dbVer.isDbFormatChanged(dbNewVer);
|
459
|
+
if ( !bDbFormatChanged && dbVer.m_bEncrypted )
|
460
|
+
{
|
461
|
+
//TODO: check encryption key
|
462
|
+
//if (!com.rho.RhoCrypto.isKeyExist(strEncryptionInfo) )
|
463
|
+
// bDbFormatChanged = true;
|
464
|
+
}
|
465
|
+
|
466
|
+
if ( bDbFormatChanged )
|
467
|
+
LOG.INFO("Reset Database( format changed ):" + m_strDBPath);
|
468
|
+
|
469
|
+
if ( bRhoReset && !bAppReset && !bDbFormatChanged )
|
470
|
+
bRhoReset = !migrateDB(dbVer, dbNewVer);
|
471
|
+
|
472
|
+
if ( bRhoReset || bAppReset || bDbFormatChanged)
|
473
|
+
{
|
474
|
+
if ( !bDbFormatChanged )
|
475
|
+
{
|
476
|
+
IDBStorage db = null;
|
477
|
+
try
|
478
|
+
{
|
479
|
+
db = RhoClassFactory.createDBStorage();
|
480
|
+
if ( db.isDbFileExists(m_strDBPath) )
|
481
|
+
{
|
482
|
+
db.open( m_strDBPath, "", strEncryptionInfo );
|
483
|
+
IDBResult res = db.executeSQL("SELECT * FROM client_info", null, false, false);
|
484
|
+
if ( !res.isEnd() )
|
485
|
+
{
|
486
|
+
m_strClientInfoInsert = createInsertStatement(res, "client_info");
|
487
|
+
m_dataClientInfo = res.getCurData();
|
488
|
+
}
|
489
|
+
}
|
490
|
+
}catch(Exception exc)
|
491
|
+
{
|
492
|
+
LOG.ERROR("Copy client_info table failed.", exc);
|
493
|
+
}finally
|
494
|
+
{
|
495
|
+
if (db != null )
|
496
|
+
try { db.close(); } catch (Exception ) { }
|
497
|
+
}
|
498
|
+
}
|
499
|
+
|
500
|
+
m_dbStorage.deleteAllFiles(m_strDBPath);
|
501
|
+
|
502
|
+
if ( this.m_strDbPartition.compareTo("user") == 0 ) //do it only once
|
503
|
+
{
|
504
|
+
String fName = makeBlobFolderName();
|
505
|
+
CRhoFile.deleteDirectory(fName);
|
506
|
+
makeBlobFolderName(); //Create folder back
|
507
|
+
}
|
508
|
+
|
509
|
+
dbNewVer.toFile(m_strDbVerPath);
|
510
|
+
|
511
|
+
if ( RhoConf.getInstance().isExist("bulksync_state") && RhoConf.getInstance().getInt("bulksync_state") != 0)
|
512
|
+
RhoConf.getInstance().setInt("bulksync_state", 0, true);
|
513
|
+
}
|
514
|
+
|
515
|
+
}
|
516
|
+
|
517
|
+
public void rb_open(String szDbName, String szDbPartition)
|
518
|
+
{
|
519
|
+
setDbPartition(szDbPartition);
|
520
|
+
openDB(szDbName, false);
|
521
|
+
|
522
|
+
DBAdapter.getDBPartitions().put(szDbPartition, this);
|
523
|
+
}
|
524
|
+
|
525
|
+
private void openDB(String strDBName, boolean bTemp)
|
526
|
+
{
|
527
|
+
if ( m_bIsOpen )
|
528
|
+
return;
|
529
|
+
|
530
|
+
initFilePaths(strDBName);
|
531
|
+
if ( !bTemp )
|
532
|
+
checkDBVersion();
|
533
|
+
|
534
|
+
m_dbStorage.open(m_strDBPath, getSqlScript(), getEncryptionInfo() );
|
535
|
+
|
536
|
+
m_bIsOpen = true;
|
537
|
+
|
538
|
+
//getAttrMgr().load(this);
|
539
|
+
|
540
|
+
m_dbStorage.setDbCallback(new DBCallback(this));
|
541
|
+
|
542
|
+
//m_dbAdapters.addElement(this);
|
543
|
+
|
544
|
+
//copy client_info table
|
545
|
+
if ( !bTemp && m_strClientInfoInsert != null && m_strClientInfoInsert.length() > 0 &&
|
546
|
+
m_dataClientInfo != null )
|
547
|
+
{
|
548
|
+
LOG.INFO("Copy client_info table from old database");
|
549
|
+
|
550
|
+
m_dbStorage.executeSQL(m_strClientInfoInsert, m_dataClientInfo, false, false );
|
551
|
+
|
552
|
+
IDBResult res = executeSQL( "SELECT client_id FROM client_info" );
|
553
|
+
if ( !res.isEnd() && res.getStringByIdx(0).length() > 0 )
|
554
|
+
{
|
555
|
+
LOG.INFO("Set reset=1 in client_info");
|
556
|
+
executeSQL( "UPDATE client_info SET reset=1" );
|
557
|
+
}
|
558
|
+
|
559
|
+
}
|
560
|
+
|
561
|
+
}
|
562
|
+
|
563
|
+
private String createInsertStatement(IDBResult res, String tableName)
|
564
|
+
{
|
565
|
+
String strInsert = "INSERT INTO ";
|
566
|
+
|
567
|
+
strInsert += tableName;
|
568
|
+
strInsert += "(";
|
569
|
+
String strQuest = ") VALUES(";
|
570
|
+
for (int i = 0; i < res.getColCount(); i++ )
|
571
|
+
{
|
572
|
+
if ( i > 0 )
|
573
|
+
{
|
574
|
+
strInsert += ",";
|
575
|
+
strQuest += ",";
|
576
|
+
}
|
577
|
+
|
578
|
+
strInsert += res.getColName(i);
|
579
|
+
strQuest += "?";
|
580
|
+
}
|
581
|
+
|
582
|
+
strInsert += strQuest + ")";
|
583
|
+
return strInsert;
|
584
|
+
}
|
585
|
+
|
586
|
+
private boolean destroyTableName(String tableName, Vector<String> arIncludeTables, Vector<String> arExcludeTables )
|
587
|
+
{
|
588
|
+
int i;
|
589
|
+
for (i = 0; i < (int)arExcludeTables.size(); i++ )
|
590
|
+
{
|
591
|
+
if ( arExcludeTables.elementAt(i).equalsIgnoreCase(tableName) )
|
592
|
+
return false;
|
593
|
+
}
|
594
|
+
|
595
|
+
for (i = 0; i < (int)arIncludeTables.size(); i++ )
|
596
|
+
{
|
597
|
+
if ( arIncludeTables.elementAt(i).equalsIgnoreCase(tableName) )
|
598
|
+
return true;
|
599
|
+
}
|
600
|
+
|
601
|
+
return arIncludeTables.size()==0;
|
602
|
+
}
|
603
|
+
|
604
|
+
public boolean isTableExist(String strTableName)
|
605
|
+
{
|
606
|
+
return m_dbStorage.isTableExists(strTableName);
|
607
|
+
}
|
608
|
+
|
609
|
+
public void rb_destroy_tables(Vector<String> vecIncludes, Vector<String> vecExcludes)
|
610
|
+
{
|
611
|
+
if ( !m_bIsOpen )
|
612
|
+
return;
|
613
|
+
|
614
|
+
IDBStorage db = null;
|
615
|
+
try{
|
616
|
+
String dbNewName = CFilePath.changeBaseName(m_strDBPath, "resetdbtemp.sqlite");
|
617
|
+
|
618
|
+
CRhoFile.deleteFile(dbNewName);
|
619
|
+
CRhoFile.deleteFile(dbNewName+"-journal");
|
620
|
+
CRhoFile.deleteFile(dbNewName+".version");
|
621
|
+
|
622
|
+
db = RhoClassFactory.createDBStorage();
|
623
|
+
db.open( dbNewName, getSqlScript(), getEncryptionInfo() );
|
624
|
+
|
625
|
+
String[] vecTables = m_dbStorage.getAllTableNames();
|
626
|
+
//IDBResult res;
|
627
|
+
|
628
|
+
db.startTransaction();
|
629
|
+
|
630
|
+
for ( int i = 0; i< vecTables.Length; i++ )
|
631
|
+
{
|
632
|
+
String tableName = vecTables[i];
|
633
|
+
if ( destroyTableName( tableName, vecIncludes, vecExcludes ) )
|
634
|
+
continue;
|
635
|
+
|
636
|
+
copyTable(tableName, this.m_dbStorage, db );
|
637
|
+
}
|
638
|
+
|
639
|
+
db.commit();
|
640
|
+
db.close();
|
641
|
+
|
642
|
+
String dbOldName = m_strDBPath;
|
643
|
+
|
644
|
+
m_dbStorage.close();
|
645
|
+
m_dbStorage = null;
|
646
|
+
m_bIsOpen = false;
|
647
|
+
|
648
|
+
CRhoFile.deleteFilesInFolder(RHODESAPP().getBlobsDirPath());
|
649
|
+
|
650
|
+
string[] ar1 = CRhoFile.enumDirectory("db");
|
651
|
+
|
652
|
+
CRhoFile.deleteFile(dbOldName);
|
653
|
+
CRhoFile.deleteFile(dbOldName + "-journal");
|
654
|
+
CRhoFile.renameFile(dbNewName,dbOldName);
|
655
|
+
CRhoFile.renameFile(dbNewName + "-journal", dbOldName + "-journal");
|
656
|
+
|
657
|
+
string[] ar2 = CRhoFile.enumDirectory("db");
|
658
|
+
|
659
|
+
m_dbStorage = RhoClassFactory.createDBStorage();
|
660
|
+
m_dbStorage.open(m_strDBPath, getSqlScript(), getEncryptionInfo() );
|
661
|
+
m_bIsOpen = true;
|
662
|
+
|
663
|
+
string[] ar3 = CRhoFile.enumDirectory("db");
|
664
|
+
m_dbStorage.setDbCallback(new DBCallback(this));
|
665
|
+
|
666
|
+
}catch(Exception e)
|
667
|
+
{
|
668
|
+
LOG.ERROR("destroy_table failed.", e);
|
669
|
+
|
670
|
+
if ( !m_bIsOpen )
|
671
|
+
{
|
672
|
+
LOG.ERROR("destroy_table error.Try to open old DB.");
|
673
|
+
try{
|
674
|
+
m_dbStorage.open(m_strDBPath, getSqlScript(), getEncryptionInfo() );
|
675
|
+
m_bIsOpen = true;
|
676
|
+
}catch(Exception exc)
|
677
|
+
{
|
678
|
+
LOG.ERROR("destroy_table open old table failed.", exc);
|
679
|
+
}
|
680
|
+
}
|
681
|
+
|
682
|
+
try {
|
683
|
+
if ( db != null)
|
684
|
+
db.close();
|
685
|
+
} catch (DBException e1) {
|
686
|
+
LOG.ERROR("closing of DB caused exception: " + e1.Message);
|
687
|
+
}
|
688
|
+
|
689
|
+
throw e;
|
690
|
+
}
|
691
|
+
}
|
692
|
+
|
693
|
+
private void copyTable(String tableName, IDBStorage dbFrom, IDBStorage dbTo)
|
694
|
+
{
|
695
|
+
IDBResult res = dbFrom.executeSQL("SELECT * from " + tableName, null, false, false);
|
696
|
+
String strInsert = "";
|
697
|
+
for ( ; !res.isEnd(); res.next() )
|
698
|
+
{
|
699
|
+
if ( strInsert.length() == 0 )
|
700
|
+
strInsert = createInsertStatement(res, tableName);
|
701
|
+
|
702
|
+
dbTo.executeSQL(strInsert, res.getCurData(), false, false );
|
703
|
+
}
|
704
|
+
}
|
705
|
+
|
706
|
+
public void updateAllAttribChanges()
|
707
|
+
{
|
708
|
+
//Check for attrib = object
|
709
|
+
IDBResult res = executeSQL("SELECT object, source_id, update_type " +
|
710
|
+
"FROM changed_values where attrib = 'object' and sent=0" );
|
711
|
+
|
712
|
+
if ( res.isEnd() )
|
713
|
+
return;
|
714
|
+
|
715
|
+
startTransaction();
|
716
|
+
|
717
|
+
Vector<String> arObj = new Vector<String>(), arUpdateType = new Vector<String>();
|
718
|
+
Vector<int> arSrcID = new Vector<int>();
|
719
|
+
for( ; !res.isEnd(); res.next() )
|
720
|
+
{
|
721
|
+
arObj.addElement(res.getStringByIdx(0));
|
722
|
+
arSrcID.addElement(res.getIntByIdx(1));
|
723
|
+
arUpdateType.addElement(res.getStringByIdx(2));
|
724
|
+
}
|
725
|
+
|
726
|
+
for( int i = 0; i < (int)arObj.size(); i++ )
|
727
|
+
{
|
728
|
+
IDBResult resSrc = executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) );
|
729
|
+
boolean bSchemaSource = false;
|
730
|
+
String strTableName = "object_values";
|
731
|
+
if ( !resSrc.isEnd() )
|
732
|
+
{
|
733
|
+
bSchemaSource = resSrc.getStringByIdx(1).length() > 0;
|
734
|
+
if ( bSchemaSource )
|
735
|
+
strTableName = resSrc.getStringByIdx(0);
|
736
|
+
}
|
737
|
+
|
738
|
+
if (bSchemaSource)
|
739
|
+
{
|
740
|
+
IDBResult res2 = executeSQL( "SELECT * FROM " + strTableName + " where object=?", arObj.elementAt(i) );
|
741
|
+
for( int j = 0; j < res2.getColCount(); j ++)
|
742
|
+
{
|
743
|
+
String strAttrib = res2.getColName(j);
|
744
|
+
String value = res2.getStringByIdx(j);
|
745
|
+
String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib) ? "blob.file" : "";
|
746
|
+
|
747
|
+
executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)",
|
748
|
+
arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, 0 );
|
749
|
+
}
|
750
|
+
}else
|
751
|
+
{
|
752
|
+
IDBResult res2 = executeSQL( "SELECT attrib, value FROM " + strTableName + " where object=? and source_id=?",
|
753
|
+
arObj.elementAt(i), arSrcID.elementAt(i) );
|
754
|
+
|
755
|
+
for( ; !res2.isEnd(); res2.next() )
|
756
|
+
{
|
757
|
+
String strAttrib = res2.getStringByIdx(0);
|
758
|
+
String value = res2.getStringByIdx(1);
|
759
|
+
String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib) ? "blob.file" : "";
|
760
|
+
|
761
|
+
executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)",
|
762
|
+
arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, 0 );
|
763
|
+
}
|
764
|
+
}
|
765
|
+
}
|
766
|
+
|
767
|
+
executeSQL("DELETE FROM changed_values WHERE attrib='object'");
|
768
|
+
|
769
|
+
endTransaction();
|
770
|
+
}
|
771
|
+
|
772
|
+
void copyChangedValues(DBAdapter db)
|
773
|
+
{
|
774
|
+
updateAllAttribChanges();
|
775
|
+
copyTable("changed_values", m_dbStorage, db.m_dbStorage );
|
776
|
+
{
|
777
|
+
Vector<int> arOldSrcs = new Vector<int>();
|
778
|
+
{
|
779
|
+
IDBResult resSrc = db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" );
|
780
|
+
for ( ; !resSrc.isEnd(); resSrc.next() )
|
781
|
+
arOldSrcs.addElement( resSrc.getIntByIdx(0) );
|
782
|
+
}
|
783
|
+
for( int i = 0; i < arOldSrcs.size(); i++)
|
784
|
+
{
|
785
|
+
int nOldSrcID = arOldSrcs.elementAt(i);
|
786
|
+
|
787
|
+
IDBResult res = executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID);
|
788
|
+
if ( !res.isEnd() )
|
789
|
+
{
|
790
|
+
String strSrcName = res.getStringByIdx(0);
|
791
|
+
IDBResult res2 = db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName );
|
792
|
+
if ( !res2.isEnd() )
|
793
|
+
{
|
794
|
+
if ( nOldSrcID != res2.getIntByIdx(0) )
|
795
|
+
{
|
796
|
+
db.executeSQL("UPDATE changed_values SET source_id=? WHERE source_id=?", res2.getIntByIdx(0), nOldSrcID);
|
797
|
+
}
|
798
|
+
continue;
|
799
|
+
}
|
800
|
+
}
|
801
|
+
|
802
|
+
//source not exist in new partition, remove this changes
|
803
|
+
db.executeSQL("DELETE FROM changed_values WHERE source_id=?", nOldSrcID);
|
804
|
+
}
|
805
|
+
}
|
806
|
+
}
|
807
|
+
|
808
|
+
public void setBulkSyncDB(String fDbName, String fScriptName)
|
809
|
+
{
|
810
|
+
//TODO: setBulkSyncDB
|
811
|
+
/*
|
812
|
+
DBAdapter db = null;
|
813
|
+
try{
|
814
|
+
db = (DBAdapter)alloc(null);
|
815
|
+
db.setDbPartition(m_strDbPartition);
|
816
|
+
db.openDB(fDbName, true);
|
817
|
+
db.m_dbStorage.createTriggers();
|
818
|
+
|
819
|
+
db.startTransaction();
|
820
|
+
|
821
|
+
copyTable("client_info", m_dbStorage, db.m_dbStorage );
|
822
|
+
copyChangedValues(db);
|
823
|
+
|
824
|
+
getDBPartitions().put(m_strDbPartition, db);
|
825
|
+
com.rho.sync.SyncThread.getSyncEngine().applyChangedValues(db);
|
826
|
+
getDBPartitions().put(m_strDbPartition, this);
|
827
|
+
|
828
|
+
db.endTransaction();
|
829
|
+
db.close();
|
830
|
+
|
831
|
+
m_dbStorage.close();
|
832
|
+
m_dbStorage = null;
|
833
|
+
m_bIsOpen = false;
|
834
|
+
|
835
|
+
String dbName = getNameNoExt(m_strDBPath);
|
836
|
+
IFileAccess fs = RhoClassFactory.createFileAccess();
|
837
|
+
|
838
|
+
String dbNameData = dbName + ".data";
|
839
|
+
String dbNameScript = dbName + ".script";
|
840
|
+
String dbNameJournal = dbName + ".journal";
|
841
|
+
String dbNameJournal2 = dbName + ".data-journal";
|
842
|
+
String dbNewNameProps = getNameNoExt(fDbName) + ".properties";
|
843
|
+
|
844
|
+
fs.delete(dbNameJournal);
|
845
|
+
fs.delete(dbNameJournal2);
|
846
|
+
fs.delete(dbNewNameProps);
|
847
|
+
|
848
|
+
String fName = makeBlobFolderName();
|
849
|
+
RhoClassFactory.createFile().delete(fName);
|
850
|
+
DBAdapter.makeBlobFolderName(); //Create folder back
|
851
|
+
|
852
|
+
fs.renameOverwrite(fDbName, dbNameData);
|
853
|
+
if ( !Capabilities.USE_SQLITE )
|
854
|
+
fs.renameOverwrite(fScriptName, dbNameScript);
|
855
|
+
|
856
|
+
m_dbStorage = RhoClassFactory.createDBStorage();
|
857
|
+
m_dbStorage.open(m_strDBPath, getSqlScript(), getEncryptionInfo() );
|
858
|
+
m_bIsOpen = true;
|
859
|
+
|
860
|
+
//getAttrMgr().load(this);
|
861
|
+
|
862
|
+
m_dbStorage.setDbCallback(new DBCallback(this));
|
863
|
+
|
864
|
+
}catch(Exception e)
|
865
|
+
{
|
866
|
+
LOG.ERROR("execute failed.", e);
|
867
|
+
|
868
|
+
if ( !m_bIsOpen )
|
869
|
+
{
|
870
|
+
LOG.ERROR("destroy_table error.Try to open old DB.");
|
871
|
+
try{
|
872
|
+
m_dbStorage.open(m_strDBPath, getSqlScript(), getEncryptionInfo() );
|
873
|
+
m_bIsOpen = true;
|
874
|
+
}catch(Exception exc)
|
875
|
+
{
|
876
|
+
LOG.ERROR("destroy_table open old table failed.", exc);
|
877
|
+
}
|
878
|
+
}
|
879
|
+
|
880
|
+
if ( db != null)
|
881
|
+
db.close();
|
882
|
+
|
883
|
+
throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
|
884
|
+
}
|
885
|
+
*/
|
886
|
+
}
|
887
|
+
/*
|
888
|
+
public RubyValue rb_execute(RubyValue v, RubyValue batch, RubyValue arg)
|
889
|
+
{
|
890
|
+
RubyArray res = new RubyArray();
|
891
|
+
try{
|
892
|
+
String strSql = v.toStr();
|
893
|
+
if ( batch == RubyConstant.QTRUE )
|
894
|
+
{
|
895
|
+
//LOG.INFO("batch execute:" + strSql);
|
896
|
+
|
897
|
+
executeBatchSQL( strSql );
|
898
|
+
}
|
899
|
+
else
|
900
|
+
{
|
901
|
+
Object[] values = null;
|
902
|
+
if ( arg != null )
|
903
|
+
{
|
904
|
+
RubyArray args1 = arg.toAry();
|
905
|
+
RubyArray args = args1;
|
906
|
+
if ( args.size() > 0 && args.get(0) instanceof RubyArray )
|
907
|
+
args = (RubyArray)args.get(0);
|
908
|
+
|
909
|
+
values = new Object[args.size()];
|
910
|
+
for ( int i = 0; i < args.size(); i++ )
|
911
|
+
{
|
912
|
+
RubyValue val = args.get(i);
|
913
|
+
if ( val == RubyConstant.QNIL )
|
914
|
+
values[i] = null;
|
915
|
+
else if ( val instanceof RubyInteger )
|
916
|
+
values[i] = new Long( ((RubyInteger)val).toLong() );
|
917
|
+
else if ( val instanceof RubyFloat )
|
918
|
+
values[i] = new Double( ((RubyFloat)val).toFloat() );
|
919
|
+
else if ( val instanceof RubyString )
|
920
|
+
values[i] = new String( ((RubyString)val).toStr() );
|
921
|
+
else if ( val == RubyConstant.QTRUE )
|
922
|
+
values[i] = new String( "true" );
|
923
|
+
else if ( val == RubyConstant.QFALSE )
|
924
|
+
values[i] = new String( "false" );
|
925
|
+
else
|
926
|
+
values[i] = val.toStr();
|
927
|
+
}
|
928
|
+
}
|
929
|
+
|
930
|
+
IDBResult rows = executeSQL( strSql, values);
|
931
|
+
RubyString[] colNames = null;
|
932
|
+
|
933
|
+
for( ; !rows.isEnd(); rows.next() )
|
934
|
+
{
|
935
|
+
RubyHash row = ObjectFactory.createHash();
|
936
|
+
for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ )
|
937
|
+
{
|
938
|
+
if ( colNames == null )
|
939
|
+
colNames = getOrigColNames(rows);
|
940
|
+
|
941
|
+
row.add( colNames[nCol], rows.getRubyValueByIdx(nCol) );
|
942
|
+
}
|
943
|
+
|
944
|
+
res.add( row );
|
945
|
+
}
|
946
|
+
}
|
947
|
+
}catch(Exception e)
|
948
|
+
{
|
949
|
+
LOG.ERROR("execute failed.", e);
|
950
|
+
throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
|
951
|
+
}
|
952
|
+
|
953
|
+
return res;
|
954
|
+
}
|
955
|
+
|
956
|
+
//@RubyAllocMethod
|
957
|
+
private static RubyValue alloc(RubyValue receiver) {
|
958
|
+
return new DBAdapter((RubyClass) receiver);
|
959
|
+
}*/
|
960
|
+
|
961
|
+
public static void closeAll()
|
962
|
+
{
|
963
|
+
Hashtable<String, DBAdapter>.Enumerator hashEnum = m_mapDBPartitions.GetEnumerator();
|
964
|
+
while( hashEnum.MoveNext() )
|
965
|
+
{
|
966
|
+
DBAdapter db = hashEnum.Current.Value;
|
967
|
+
db.close();
|
968
|
+
}
|
969
|
+
}
|
970
|
+
|
971
|
+
public static void initAttrManager()
|
972
|
+
{
|
973
|
+
Hashtable<String, DBAdapter>.Enumerator hashEnum = m_mapDBPartitions.GetEnumerator();
|
974
|
+
while (hashEnum.MoveNext())
|
975
|
+
{
|
976
|
+
DBAdapter db = hashEnum.Current.Value;
|
977
|
+
db.getAttrMgr().loadBlobAttrs(db);
|
978
|
+
if ( !db.getAttrMgr().hasBlobAttrs() )
|
979
|
+
db.m_dbStorage.setDbCallback(null);
|
980
|
+
}
|
981
|
+
}
|
982
|
+
|
983
|
+
public static DBAdapter getUserDB()
|
984
|
+
{
|
985
|
+
return (DBAdapter)getDBPartitions().get(USER_PARTITION_NAME());
|
986
|
+
}
|
987
|
+
|
988
|
+
public static DBAdapter getDB(String szPartition)
|
989
|
+
{
|
990
|
+
return (DBAdapter)getDBPartitions().get(szPartition);
|
991
|
+
}
|
992
|
+
|
993
|
+
public static Vector<String> getDBAllPartitionNames()
|
994
|
+
{
|
995
|
+
Vector<String> vecNames = new Vector<String>();
|
996
|
+
Hashtable<String, DBAdapter>.Enumerator hashEnum = m_mapDBPartitions.GetEnumerator();
|
997
|
+
while (hashEnum.MoveNext())
|
998
|
+
{
|
999
|
+
vecNames.addElement(hashEnum.Current.Key);
|
1000
|
+
}
|
1001
|
+
|
1002
|
+
return vecNames;
|
1003
|
+
}
|
1004
|
+
|
1005
|
+
public static boolean isAnyInsideTransaction()
|
1006
|
+
{
|
1007
|
+
Hashtable<String, DBAdapter>.Enumerator hashEnum = m_mapDBPartitions.GetEnumerator();
|
1008
|
+
while (hashEnum.MoveNext())
|
1009
|
+
{
|
1010
|
+
DBAdapter db = hashEnum.Current.Value;
|
1011
|
+
if ( db.isInsideTransaction() )
|
1012
|
+
return true;
|
1013
|
+
}
|
1014
|
+
|
1015
|
+
return false;
|
1016
|
+
}
|
1017
|
+
|
1018
|
+
public class DBCallback : IDBCallback
|
1019
|
+
{
|
1020
|
+
private DBAdapter m_db;
|
1021
|
+
public DBCallback(DBAdapter db){ m_db = db; }
|
1022
|
+
|
1023
|
+
public void onBeforeUpdate(String tableName, IDBResult rows2Delete, int[] cols)
|
1024
|
+
{
|
1025
|
+
try
|
1026
|
+
{
|
1027
|
+
processDelete(tableName, rows2Delete, cols);
|
1028
|
+
}catch(Exception exc)
|
1029
|
+
{
|
1030
|
+
LOG.ERROR("onAfterInsert failed.", exc);
|
1031
|
+
}
|
1032
|
+
}
|
1033
|
+
|
1034
|
+
public void onBeforeDelete(String tableName, IDBResult rows2Delete)
|
1035
|
+
{
|
1036
|
+
try
|
1037
|
+
{
|
1038
|
+
processDelete(tableName, rows2Delete, null);
|
1039
|
+
}catch(Exception exc)
|
1040
|
+
{
|
1041
|
+
LOG.ERROR("onAfterInsert failed.", exc);
|
1042
|
+
}
|
1043
|
+
}
|
1044
|
+
|
1045
|
+
private boolean isChangedCol(int[] cols, int iCol)
|
1046
|
+
{
|
1047
|
+
if (cols==null)
|
1048
|
+
return true;
|
1049
|
+
|
1050
|
+
for ( int i = 0; i < cols.Length; i++ )
|
1051
|
+
{
|
1052
|
+
if ( cols[i] == iCol )
|
1053
|
+
return true;
|
1054
|
+
}
|
1055
|
+
return false;
|
1056
|
+
}
|
1057
|
+
|
1058
|
+
private void processDelete(String tableName, IDBResult rows2Delete, int[] cols)
|
1059
|
+
{
|
1060
|
+
if ( tableName.equalsIgnoreCase("changed_values") || tableName.equalsIgnoreCase("sources") ||
|
1061
|
+
tableName.equalsIgnoreCase("client_info"))
|
1062
|
+
return;
|
1063
|
+
|
1064
|
+
boolean bProcessTable = tableName.equalsIgnoreCase("object_values");
|
1065
|
+
boolean bSchemaSrc = false;
|
1066
|
+
int nSrcID = 0;
|
1067
|
+
if ( !bProcessTable )
|
1068
|
+
{
|
1069
|
+
nSrcID = m_db.getAttrMgr().getSrcIDHasBlobsByName(tableName);
|
1070
|
+
bProcessTable = nSrcID != 0;
|
1071
|
+
bSchemaSrc = bProcessTable;
|
1072
|
+
}
|
1073
|
+
|
1074
|
+
if ( !bProcessTable)
|
1075
|
+
return;
|
1076
|
+
|
1077
|
+
if ( !bSchemaSrc && !isChangedCol(cols, 3))//value
|
1078
|
+
return;
|
1079
|
+
|
1080
|
+
for( ; !rows2Delete.isEnd(); rows2Delete.next() )
|
1081
|
+
{
|
1082
|
+
if ( !bSchemaSrc )
|
1083
|
+
{
|
1084
|
+
nSrcID = rows2Delete.getIntByIdx(0);
|
1085
|
+
|
1086
|
+
String attrib = rows2Delete.getStringByIdx(1);
|
1087
|
+
String value = rows2Delete.getStringByIdx(3);
|
1088
|
+
|
1089
|
+
//if (cols == null) //delete
|
1090
|
+
// m_db.getAttrMgr().remove(nSrcID, attrib);
|
1091
|
+
|
1092
|
+
if ( m_db.getAttrMgr().isBlobAttr(nSrcID, attrib) )
|
1093
|
+
processBlobDelete(nSrcID, attrib, value);
|
1094
|
+
}else
|
1095
|
+
{
|
1096
|
+
Object[] data = rows2Delete.getCurData();
|
1097
|
+
for ( int i = 0; i < rows2Delete.getColCount(); i++ )
|
1098
|
+
{
|
1099
|
+
if (!isChangedCol(cols, i))
|
1100
|
+
continue;
|
1101
|
+
|
1102
|
+
String attrib = rows2Delete.getColName(i);
|
1103
|
+
if ( !(data[i] is String ) )
|
1104
|
+
continue;
|
1105
|
+
|
1106
|
+
String value = (String)data[i];
|
1107
|
+
if ( m_db.getAttrMgr().isBlobAttr(nSrcID, attrib) )
|
1108
|
+
processBlobDelete(nSrcID, attrib, value);
|
1109
|
+
}
|
1110
|
+
}
|
1111
|
+
}
|
1112
|
+
}
|
1113
|
+
|
1114
|
+
private void processBlobDelete(int nSrcID, String attrib, String value)
|
1115
|
+
{
|
1116
|
+
if ( value == null || value.length() == 0 )
|
1117
|
+
return;
|
1118
|
+
|
1119
|
+
try{
|
1120
|
+
String strFilePath = RHODESAPP().resolveDBFilesPath(value);
|
1121
|
+
CRhoFile.deleteFile(strFilePath);
|
1122
|
+
}catch(Exception exc){
|
1123
|
+
LOG.ERROR("DBCallback.OnDeleteFromTable: Error delete file: " + value, exc);
|
1124
|
+
}
|
1125
|
+
}
|
1126
|
+
|
1127
|
+
}
|
1128
|
+
}
|
1129
|
+
}
|