Merge branch 'dev' of https://github.com/bhariharan/SalesforceMobileS…

…DK-Shared into dev

README.md

@@ -23,9 +23,9 @@ Library to do file related REST API calls from JavaScript.
 
 Library to do REST API calls from JavaScript using promises instead of callbacks.
 
-**smartsync.js**
+**mobilesync.js**
 
-Contains the SmartSync data library. 
+Contains the MobileSync data library. 
 This library depends on force.js and cordova.force.js. It also requires underscore and backbone.
 
 # /test
@@ -36,7 +36,7 @@ Contains all the tests for the SalesforceMobileSDK JavaScript libraries.
 
 HTML page to run the tests outside the container.
 
-**MockCordova.js, MockSDKInfo.js, MockSmartStore.js, MockSmartSyncPlugin.js**
+**MockCordova.js, MockSDKInfo.js, MockSmartStore.js, MockMobileSyncPlugin.js**
 
 Libraries used to mock the container when running tests directly in a browser.
 
@@ -48,6 +48,6 @@ Super class of test suites.
 
 Test suites for SmartStore.
 
-**SFSmartSyncTestSuite.js**
+**SFMobileSyncTestSuite.js**
 
-Test suite for SmartSync library.
+Test suite for MobileSync library.

gen/cordova_plugins.js

@@ -27,8 +27,8 @@ module.exports = [
         ]
     },
     {
-        "file": "plugins/com.salesforce/com.salesforce.plugin.smartsync.js",
-        "id": "com.salesforce.plugin.smartsync",
+        "file": "plugins/com.salesforce/com.salesforce.plugin.mobilesync.js",
+        "id": "com.salesforce.plugin.mobilesync",
     },
     {
         "file": "plugins/com.salesforce/com.salesforce.util.bootstrap.js",

gen/plugins/com.salesforce/com.salesforce.plugin.smartsync.js → gen/plugins/com.salesforce/com.salesforce.plugin.mobilesync.js

@@ -26,7 +26,7 @@
 
 // Version this js was shipped with
 var SALESFORCE_MOBILE_SDK_VERSION = "8.0.0";
-var SERVICE = "com.salesforce.smartsync";
+var SERVICE = "com.salesforce.mobilesync";
 
 var exec = require("com.salesforce.util.exec").exec;
 var defaultStoreConfig = {'isGlobalStore':false};

gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartsync.js → gen/plugins_with_define/com.salesforce/com.salesforce.plugin.mobilesync.js

@@ -1,4 +1,4 @@
-cordova.define("com.salesforce.plugin.smartsync", function(require, exports, module) {
+cordova.define("com.salesforce.plugin.mobilesync", function(require, exports, module) {
 /*
  * Copyright (c) 2012-present, salesforce.com, inc.
  * All rights reserved.
@@ -27,7 +27,7 @@ cordova.define("com.salesforce.plugin.smartsync", function(require, exports, mod
 
 // Version this js was shipped with
 var SALESFORCE_MOBILE_SDK_VERSION = "8.0.0";
-var SERVICE = "com.salesforce.smartsync";
+var SERVICE = "com.salesforce.mobilesync";
 
 var exec = require("com.salesforce.util.exec").exec;
 var defaultStoreConfig = {'isGlobalStore':false};

libs/cordova.force.js

@@ -1078,8 +1078,8 @@ cordova.define("com.salesforce.plugin.smartstore.client", function(require, expo
 // For backward compatibility
 navigator.smartstoreClient = cordova.require("com.salesforce.plugin.smartstore.client");
 
-cordova.define("com.salesforce.plugin.smartsync", function (require, exports, module) {
-    var SERVICE = "com.salesforce.smartsync";
+cordova.define("com.salesforce.plugin.mobilesync", function (require, exports, module) {
+    var SERVICE = "com.salesforce.mobilesync";
 
     var exec = require("com.salesforce.util.exec").exec;
     var defaultStoreConfig = {'isGlobalStore':false};

libs/smartsync.js → libs/mobilesync.js

@@ -84,7 +84,7 @@
         {
           var sdkinfo = cordova.require("com.salesforce.plugin.sdkinfo");
           if(sdkinfo && typeof(sdkinfo.registerAppFeature) === 'function'){
-            // register SmartSync JS App feature
+            // register MobileSync JS App feature
             sdkinfo.registerAppFeature('SJ');
           }
         }

samples/accounteditor/AccountEditor.html

@@ -28,7 +28,7 @@
 
 <script src="js/force.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>

samples/accounteditor/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

samples/fileexplorer/FileExplorer.html

@@ -28,7 +28,7 @@
 <script src="js/force.js"></script>
 <script src="js/force+files.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>

samples/fileexplorer/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

samples/smartsyncexplorer/SmartSyncExplorer.html → samples/mobilesyncexplorer/MobileSyncExplorer.html

@@ -20,7 +20,7 @@
 <script src="js/MockCordova.js"></script>
 <script src="js/cordova.force.js"></script>
 <script src="js/MockSmartStore.js"></script>
-<script src="js/MockSmartSyncPlugin.js"></script>
+<script src="js/MockMobileSyncPlugin.js"></script>
 <!-- End Local Testing -->
 
 <!-- Container -->
@@ -29,7 +29,7 @@
 
 <script src="js/force.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>
@@ -175,11 +175,11 @@ <h1 class="title">Contacts</h1>
     },
 
     syncDown: function() {
-        cordova.require("com.salesforce.plugin.smartsync").reSync("syncDownContacts" /* see usersyncs.json */, this.handleSyncUpdate.bind(this));
+        cordova.require("com.salesforce.plugin.mobilesync").reSync("syncDownContacts" /* see usersyncs.json */, this.handleSyncUpdate.bind(this));
     },
 
     syncUp: function() {
-        cordova.require("com.salesforce.plugin.smartsync").reSync("syncUpContacts" /* see usersyncs.json */, this.handleSyncUpdate.bind(this));
+        cordova.require("com.salesforce.plugin.mobilesync").reSync("syncUpContacts" /* see usersyncs.json */, this.handleSyncUpdate.bind(this));
     },
 
     sync: function() {

samples/smartsyncexplorer/bootconfig.json → samples/mobilesyncexplorer/bootconfig.json

@@ -3,7 +3,7 @@
     "oauthRedirectURI": "testsfdc:///mobilesdk/detect/oauth/done",
     "oauthScopes": ["api","web"],
     "isLocal": true,
-    "startPage": "SmartSyncExplorer.html",
+    "startPage": "MobileSyncExplorer.html",
     "errorPage": "error.html",
     "shouldAuthenticate": true,
     "attemptOfflineLoad": false,

samples/mobilesyncexplorer/js/MockMobileSyncPlugin.js

@@ -0,0 +1 @@
+../../../test/MockMobileSyncPlugin.js

samples/mobilesyncexplorer/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

samples/notesync/NoteSync.html

@@ -20,7 +20,7 @@
 <script src="js/MockCordova.js"></script>
 <script src="js/cordova.force.js"></script>
 <script src="js/MockSmartStore.js"></script>
-<script src="js/MockSmartSyncPlugin.js"></script>
+<script src="js/MockMobileSyncPlugin.js"></script>
 <!-- End Local Testing -->
 
 <!-- Container -->
@@ -29,7 +29,7 @@
 
 <script src="js/force.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>
@@ -161,11 +161,11 @@ <h1 class="title"><%= Title %></h1>
 
     syncDown: function() {
         var target = {type:"custom", androidImpl:"com.salesforce.samples.notesync.ContentSoqlSyncDownTarget", iOSImpl:"SFContentSoqlSyncDownTarget", query:"SELECT " + this.fieldlist.join(",") + " FROM ContentNote LIMIT 1000"};
-        cordova.require("com.salesforce.plugin.smartsync").syncDown(target, "notes", {mergeMode:Force.MERGE_MODE_DOWNLOAD.LEAVE_IF_CHANGED}, this.handleSyncUpdate.bind(this));
+        cordova.require("com.salesforce.plugin.mobilesync").syncDown(target, "notes", {mergeMode:Force.MERGE_MODE_DOWNLOAD.LEAVE_IF_CHANGED}, this.handleSyncUpdate.bind(this));
     },
 
     syncUp: function(event) {
-        cordova.require("com.salesforce.plugin.smartsync").syncUp("notes", {fieldlist: this.fieldlist}, this.handleSyncUpdate.bind(this));
+        cordova.require("com.salesforce.plugin.mobilesync").syncUp("notes", {fieldlist: this.fieldlist}, this.handleSyncUpdate.bind(this));
     },
 
     inspect: function() {

samples/notesync/js/MockMobileSyncPlugin.js

@@ -0,0 +1 @@
+../../../test/MockMobileSyncPlugin.js

samples/notesync/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

samples/simplesyncreact/SimpleSync.html

@@ -22,7 +22,7 @@
 <script src="js/MockCordova.js"></script>
 <script src="js/cordova.force.js"></script>
 <script src="js/MockSmartStore.js"></script>
-<script src="js/MockSmartSyncPlugin.js"></script>
+<script src="js/MockMobileSyncPlugin.js"></script>
 <!-- End Local Testing -->
 
 <!-- Container -->
@@ -31,7 +31,7 @@
 
 <script src="js/force.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>
@@ -120,7 +120,7 @@ <h1 className="title">Users</h1>
     },
 
     syncDown: function(target) {
-        cordova.require("com.salesforce.plugin.smartsync").syncDown(target, "users", {}, this.handleSyncUpdate.bind(this));
+        cordova.require("com.salesforce.plugin.mobilesync").syncDown(target, "users", {}, this.handleSyncUpdate.bind(this));
     },
 
     syncDownMru: function(event) {
@@ -136,7 +136,7 @@ <h1 className="title">Users</h1>
     },
 
     syncUp: function(event) {
-        cordova.require("com.salesforce.plugin.smartsync").syncUp("users", {fieldlist: this.fieldlist}, this.handleSyncUpdate.bind(this));
+        cordova.require("com.salesforce.plugin.mobilesync").syncUp("users", {fieldlist: this.fieldlist}, this.handleSyncUpdate.bind(this));
     },
 
     cacheSize: function() {

samples/simplesyncreact/js/MockMobileSyncPlugin.js

@@ -0,0 +1 @@
+../../../test/MockMobileSyncPlugin.js

samples/simplesyncreact/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

samples/userandgroupsearch/UserAndGroupSearch.html

@@ -27,7 +27,7 @@
 
 <script src="js/force.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>

samples/userandgroupsearch/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

samples/usersearch/UserSearch.html

@@ -27,7 +27,7 @@
 
 <script src="js/force.js"></script>
 <script src="js/force+promise.js"></script>
-<script src="js/smartsync.js"></script>
+<script src="js/mobilesync.js"></script>
 <script src="js/fastclick.js"></script>
 <script src="js/stackrouter.js"></script>
 <script src="js/auth.js"></script>

samples/usersearch/js/mobilesync.js

@@ -0,0 +1 @@
+../../../libs/mobilesync.js

setversion.sh

@@ -11,7 +11,7 @@ usage ()
 {
     echo "Use this script to set Mobile SDK version number in source files"
     echo "Usage: $0 -v <version>"
-    echo "  where: version is the version e.g. 7.2.0"
+    echo "  where: version is the version e.g. 8.0.0"
 }
 
 parse_opts ()
@@ -73,6 +73,15 @@ echo -e "${YELLOW}*** SETTING VERSION TO ${OPT_VERSION} ***${NC}"
 echo "*** Updating package.json ***"
 update_package_json "./package.json" "${OPT_VERSION}"
 
+echo "*** Updating bower.json ***"
+update_package_json "./tools/bower.json" "${OPT_VERSION}"
+
+echo "*** Updating package.json in tools ***"
+update_package_json "./tools/package.json" "${OPT_VERSION}"
+
+echo "*** Updating package-lock.json ***"
+update_package_json "./tools/package-lock.json" "${OPT_VERSION}"
+
 echo "*** Updating MockSDKInfo test ***"
 update_mock_sdk_info "./test/MockSDKInfo.js" "${OPT_VERSION}"
 

test/MockSmartSyncPlugin.js → test/MockMobileSyncPlugin.js

@@ -25,12 +25,12 @@
  */
 
 /**
- * MockSmartSyncPlugin
+ * MockMobileSyncPlugin
  * Meant for development and testing only, the data is stored in SessionStorage, queries do full scans.
  * NB: cleanResyncGhosts only works for soql sync down
  */
 
-var MockSmartSyncPlugin = (function(window) {
+var MockMobileSyncPlugin = (function(window) {
     // Constructor
     var module = function(storeConfig) {
         this.storeConfig = storeConfig;
@@ -145,7 +145,7 @@ var MockSmartSyncPlugin = (function(window) {
                 successCB(sync);
 
                 if (target.type == "refresh") {
-                    // smartsync.js doesn't have something equivalent to the (new in 5.0) refresh sync down
+                    // mobilesync.js doesn't have something equivalent to the (new in 5.0) refresh sync down
                     // So we need to get the local ids, build a soql query out of them
                     // And use that for the collection
                     cache.find({queryType:"range", orderPath:cache.keyField, pageSize:500}) // XXX not handling case with more than 500 local ids
@@ -328,7 +328,7 @@ var SyncManagerMap = (function() {
          syncManager = isGlobalStore?this.globalSyncManagers[storeName]:this.userSyncManagers[storeName];
 
          if(syncManager == null) {
-            syncManager = new MockSmartSyncPlugin({'isGlobalStore': isGlobalStore,'storeName' :storeName});
+            syncManager = new MockMobileSyncPlugin({'isGlobalStore': isGlobalStore,'storeName' :storeName});
             if(isGlobalStore == true)
                this.globalSyncManagers[storeName] = syncManager;
             else
@@ -376,34 +376,34 @@ var syncManagerMap = new SyncManagerMap();
 
 (function (cordova, syncManager, globalSyncManager) {
 
-    var SMARTSYNC_SERVICE = "com.salesforce.smartsync";
+    var MOBILESYNC_SERVICE = "com.salesforce.mobilesync";
 
-    cordova.interceptExec(SMARTSYNC_SERVICE, "syncUp", function (successCB, errorCB, args) {
+    cordova.interceptExec(MOBILESYNC_SERVICE, "syncUp", function (successCB, errorCB, args) {
         var mgr = syncManagerMap.getSyncManager(args);
         mgr.syncUp(args[0].target, args[0].soupName, args[0].options, args[0].syncName, successCB, errorCB);
     });
 
-    cordova.interceptExec(SMARTSYNC_SERVICE, "syncDown", function (successCB, errorCB, args) {
+    cordova.interceptExec(MOBILESYNC_SERVICE, "syncDown", function (successCB, errorCB, args) {
         var mgr = syncManagerMap.getSyncManager(args);
         mgr.syncDown(args[0].target, args[0].soupName, args[0].options, args[0].syncName, successCB, errorCB);
     });
 
-    cordova.interceptExec(SMARTSYNC_SERVICE, "getSyncStatus", function (successCB, errorCB, args) {
+    cordova.interceptExec(MOBILESYNC_SERVICE, "getSyncStatus", function (successCB, errorCB, args) {
         var mgr = syncManagerMap.getSyncManager(args);
         mgr.getSyncStatus(args[0].syncId || args[0].syncName, successCB, errorCB);
     });
 
-    cordova.interceptExec(SMARTSYNC_SERVICE, "reSync", function (successCB, errorCB, args) {
+    cordova.interceptExec(MOBILESYNC_SERVICE, "reSync", function (successCB, errorCB, args) {
         var mgr = syncManagerMap.getSyncManager(args);
         mgr.reSync(args[0].syncId || args[0].syncName, successCB, errorCB);
     });
 
-    cordova.interceptExec(SMARTSYNC_SERVICE, "cleanResyncGhosts", function (successCB, errorCB, args) {
+    cordova.interceptExec(MOBILESYNC_SERVICE, "cleanResyncGhosts", function (successCB, errorCB, args) {
         var mgr = syncManagerMap.getSyncManager(args);
         mgr.cleanResyncGhosts(args[0].syncId, successCB, errorCB);
     });
 
-    cordova.interceptExec(SMARTSYNC_SERVICE, "deleteSync", function (successCB, errorCB, args) {
+    cordova.interceptExec(MOBILESYNC_SERVICE, "deleteSync", function (successCB, errorCB, args) {
         var mgr = syncManagerMap.getSyncManager(args);
         mgr.deleteSync(args[0].syncId || args[0].syncName, successCB, errorCB);
     });

test/MockSDKInfo.js

@@ -46,7 +46,7 @@ var MockSDKInfo = (function(window) {
 
             cordova.interceptExec(SDKINFO_SERVICE, "getInfo", function (successCB, errorCB, args) {
                 successCB(new SDKInfo("8.0.0", 
-                                      ["com.salesforce.oauth", "com.salesforce.sdkinfo", "com.salesforce.sfaccountmanager", "com.salesforce.network", "com.salesforce.testrunner", "com.salesforce.smartstore", "com.salesforce.smartsync"], 
+                                      ["com.salesforce.oauth", "com.salesforce.sdkinfo", "com.salesforce.sfaccountmanager", "com.salesforce.network", "com.salesforce.testrunner", "com.salesforce.smartstore", "com.salesforce.mobilesync"], 
                                       "SalesforceHybridSDKTestApp", "1.0",
                                       {
                                           "remoteAccessConsumerKey": "3MVG9Iu66FKeHhINkB1l7xt7kR8czFcCTUhgoA8Ol2Ltf1eYHOU4SqQRSEitYFDUpqRWcoQ2.dBv_a1Dyu5xa",