olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chall...@apache.org
Subject [5/5] git commit: [OLINGO-407] JS- V4's window.OData is not defined yet: part 1 - change window.datajs.V4 into window.odatajs (while V3: window.datajs).
Date Wed, 20 Aug 2014 07:53:28 GMT
[OLINGO-407] JS- V4's window.OData is not defined yet: part 1 - change window.datajs.V4 into window.odatajs  (while V3: window.datajs).


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/5c98f9f3
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/5c98f9f3
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/5c98f9f3

Branch: refs/heads/master
Commit: 5c98f9f3ec260eac81f5beb05f34c5c2eca3d988
Parents: dd24c1f
Author: challenh <chalelnh@microsoft.com>
Authored: Wed Aug 20 15:51:43 2014 +0800
Committer: challenh <chalelnh@microsoft.com>
Committed: Wed Aug 20 15:51:43 2014 +0800

----------------------------------------------------------------------
 JSLib/src/cache-source.js                       |     8 +-
 JSLib/src/cache.js                              |    40 +-
 JSLib/src/datajs.js                             |     8 +-
 JSLib/src/deferred.js                           |     4 +-
 JSLib/src/odata-atom.js                         |    74 +-
 JSLib/src/odata-batch.js                        |     8 +-
 JSLib/src/odata-gml.js                          |    28 +-
 JSLib/src/odata-handler.js                      |     8 +-
 JSLib/src/odata-json-light.js                   |    22 +-
 JSLib/src/odata-json.js                         |    14 +-
 JSLib/src/odata-metadata.js                     |    24 +-
 JSLib/src/odata-net.js                          |     6 +-
 JSLib/src/odata-utils.js                        |    16 +-
 JSLib/src/odata-xml.js                          |    56 +-
 JSLib/src/odata.js                              |     8 +-
 JSLib/src/store-dom.js                          |     8 +-
 JSLib/src/store-indexeddb.js                    |     8 +-
 JSLib/src/store-memory.js                       |     8 +-
 JSLib/src/store.js                              |    16 +-
 JSLib/src/utils.js                              |    50 +-
 JSLib/src/xml.js                                |    82 +-
 JSLib/tests/cache-tests.js                      |    76 +-
 ...s-cache-large-collection-functional-tests.js |     4 +-
 JSLib/tests/odata-atom-tests.js                 |    62 +-
 .../odata-cache-filter-functional-tests.js      |    12 +-
 JSLib/tests/odata-cache-fperf-tests.js          |     2 +-
 JSLib/tests/odata-cache-functional-tests.js     |     2 +-
 JSLib/tests/odata-cache-rx-functional-tests.js  |     2 +-
 JSLib/tests/odata-json-tests.js                 |    12 +-
 JSLib/tests/odata-metadata-tests.js             |     6 +-
 .../odata-read-crossdomain-functional-tests.js  |     2 +-
 JSLib/tests/odata-xml-tests.js                  |    70 +-
 JSLib/tests/store-indexeddb-tests.js            |    28 +-
 JSLib/tests/store-tests.js                      |    12 +-
 datajs/demo/scripts/datajs_demo.js              |     6 +-
 datajs/src/index.js                             |    12 +-
 datajs/src/lib/cache.js                         |     6 +-
 datajs/tests/cache-tests.js                     |    76 +-
 datajs/tests/common/common.js                   |    10 +-
 ...s-cache-large-collection-functional-tests.js |     4 +-
 datajs/tests/e2etest/chh.js                     |  8373 +++++++++++++
 datajs/tests/e2etest/datajs-1.1.2.js            | 10577 +++++++++++++++++
 .../odata-cache-filter-functional-tests.js      |    12 +-
 datajs/tests/odata-cache-fperf-tests.js         |     2 +-
 datajs/tests/odata-cache-functional-tests.js    |     2 +-
 datajs/tests/odata-cache-rx-functional-tests.js |     2 +-
 datajs/tests/odata-json-tests.js                |    12 +-
 datajs/tests/odata-metadata-tests.js            |     6 +-
 .../odata-read-crossdomain-functional-tests.js  |     2 +-
 datajs/tests/odata-xml-tests.js                 |    70 +-
 datajs/tests/store-indexeddb-tests.js           |    28 +-
 datajs/tests/store-tests.js                     |    12 +-
 52 files changed, 19474 insertions(+), 524 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/cache-source.js
----------------------------------------------------------------------
diff --git a/JSLib/src/cache-source.js b/JSLib/src/cache-source.js
index 6348a92..da55d1f 100644
--- a/JSLib/src/cache-source.js
+++ b/JSLib/src/cache-source.js
@@ -17,10 +17,10 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
-    var parseInt10 = datajs.parseInt10;
-    var normalizeURICase = datajs.normalizeURICase;
+    var parseInt10 = odatajs.parseInt10;
+    var normalizeURICase = odatajs.normalizeURICase;
 
     // CONTENT START
 
@@ -190,7 +190,7 @@
     };
 
     // DATAJS INTERNAL START
-    window.datajs.ODataCacheSource = ODataCacheSource;
+    window.odatajs.ODataCacheSource = ODataCacheSource;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/cache.js
----------------------------------------------------------------------
diff --git a/JSLib/src/cache.js b/JSLib/src/cache.js
index 2092af4..b3669a9 100644
--- a/JSLib/src/cache.js
+++ b/JSLib/src/cache.js
@@ -17,23 +17,23 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
-
-    var assigned = datajs.assigned;
-    var delay = datajs.delay;
-    var extend = datajs.extend;
-    var djsassert = datajs.djsassert;
-    var isArray = datajs.isArray;
-    var normalizeURI = datajs.normalizeURI;
-    var parseInt10 = datajs.parseInt10;
-    var undefinedDefault = datajs.undefinedDefault;
-
-    var createDeferred = datajs.createDeferred;
-    var DjsDeferred = datajs.DjsDeferred;
-    var ODataCacheSource = datajs.ODataCacheSource;
-    var getJsonValueArraryLength = datajs.getJsonValueArraryLength;
-    var sliceJsonValueArray = datajs.sliceJsonValueArray;
-    var concatJsonValueArray = datajs.concatJsonValueArray;
+    var datajs = window.odatajs || {};
+
+    var assigned = odatajs.assigned;
+    var delay = odatajs.delay;
+    var extend = odatajs.extend;
+    var djsassert = odatajs.djsassert;
+    var isArray = odatajs.isArray;
+    var normalizeURI = odatajs.normalizeURI;
+    var parseInt10 = odatajs.parseInt10;
+    var undefinedDefault = odatajs.undefinedDefault;
+
+    var createDeferred = odatajs.createDeferred;
+    var DjsDeferred = odatajs.DjsDeferred;
+    var ODataCacheSource = odatajs.ODataCacheSource;
+    var getJsonValueArraryLength = odatajs.getJsonValueArraryLength;
+    var sliceJsonValueArray = odatajs.sliceJsonValueArray;
+    var concatJsonValueArray = odatajs.concatJsonValueArray;
 
     // CONTENT START
 
@@ -413,7 +413,7 @@
         source.options = options;
 
         // Create a cache local store.
-        var store = datajs.createStore(options.name, options.mechanism);
+        var store = odatajs.createStore(options.name, options.mechanism);
 
         var that = this;
 
@@ -1331,7 +1331,7 @@
         return that;
     };
 
-    datajs.createDataCache = function (options) {
+    odatajs.createDataCache = function (options) {
         /// <summary>Creates a data cache for a collection that is efficiently loaded on-demand.</summary>
         /// <param name="options">
         /// Options for the data cache, including name, source, pageSize,
@@ -1354,7 +1354,7 @@
     };
 
     // DATAJS INTERNAL START
-    window.datajs.estimateSize = estimateSize;
+    window.odatajs.estimateSize = estimateSize;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/datajs.js
----------------------------------------------------------------------
diff --git a/JSLib/src/datajs.js b/JSLib/src/datajs.js
index fc5bb62..f5251be 100644
--- a/JSLib/src/datajs.js
+++ b/JSLib/src/datajs.js
@@ -11,11 +11,11 @@
 // COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-// datajs.js
+// odatajs.js
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // AMD support
@@ -23,11 +23,11 @@
         define('datajs', datajs);
         define('OData', odata);
     } else {
-        window.datajs = datajs;
+        window.odatajs = datajs;
         window.OData = odata;
     }
 
-    datajs.version = {
+    odatajs.version = {
         major: 1,
         minor: 1,
         build: 1

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/deferred.js
----------------------------------------------------------------------
diff --git a/JSLib/src/deferred.js b/JSLib/src/deferred.js
index 7f6f6a8..1fe1657 100644
--- a/JSLib/src/deferred.js
+++ b/JSLib/src/deferred.js
@@ -171,8 +171,8 @@
     };
 
     // DATAJS INTERNAL START
-    window.datajs.createDeferred = createDeferred;
-    window.datajs.DjsDeferred = DjsDeferred;
+    window.odatajs.createDeferred = createDeferred;
+    window.odatajs.DjsDeferred = DjsDeferred;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-atom.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-atom.js b/JSLib/src/odata-atom.js
index e360e3c..09e994f 100644
--- a/JSLib/src/odata-atom.js
+++ b/JSLib/src/odata-atom.js
@@ -19,46 +19,46 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // imports
-    var contains = datajs.contains;
-    var djsassert = datajs.djsassert;
-    var isArray = datajs.isArray;
-    var isObject = datajs.isObject;
-    var isXmlNSDeclaration = datajs.isXmlNSDeclaration;
-    var normalizeURI = datajs.normalizeURI;
-    var parseInt10 = datajs.parseInt10;
-    var xmlAppendChild = datajs.xmlAppendChild;
-    var xmlAppendChildren = datajs.xmlAppendChildren
-    var xmlAttributes = datajs.xmlAttributes;
-    var xmlAttributeNode = datajs.xmlAttributeNode;
-    var xmlAttributeValue = datajs.xmlAttributeValue;
-    var xmlBaseURI = datajs.xmlBaseURI;
-    var xmlChildElements = datajs.xmlChildElements;
-    var xmlDom = datajs.xmlDom;
-    var xmlFirstChildElement = datajs.xmlFirstChildElement;
-    var xmlFindElementByPath = datajs.xmlFindElementByPath;
-    var xmlFindNodeByPath = datajs.xmlFindNodeByPath;
-    var xmlInnerText = datajs.xmlInnerText;
-    var xmlLocalName = datajs.xmlLocalName;
-    var xmlNamespaceURI = datajs.xmlNamespaceURI;
-    var xmlNewAttribute = datajs.xmlNewAttribute;
-    var xmlNewElement = datajs.xmlNewElement;
-    var xmlNewFragment = datajs.xmlNewFragment;
-    var xmlNewNodeByPath = datajs.xmlNewNodeByPath;
-    var xmlNewNSDeclaration = datajs.xmlNewNSDeclaration;
-    var xmlNewText = datajs.xmlNewText;
-    var xmlNodeValue = datajs.xmlNodeValue;
-    var xmlNS = datajs.xmlNS;
-    var xmlnsNS = datajs.xmlnsNS;
-    var xmlQualifiedName = datajs.xmlQualifiedName;
-    var xmlParse = datajs.xmlParse;
-    var xmlSerialize = datajs.xmlSerialize;
-    var xmlSerializeDescendants = datajs.xmlSerializeDescendants;
-    var xmlSibling = datajs.xmlSibling;
-    var w3org = datajs.w3org;
+    var contains = odatajs.contains;
+    var djsassert = odatajs.djsassert;
+    var isArray = odatajs.isArray;
+    var isObject = odatajs.isObject;
+    var isXmlNSDeclaration = odatajs.isXmlNSDeclaration;
+    var normalizeURI = odatajs.normalizeURI;
+    var parseInt10 = odatajs.parseInt10;
+    var xmlAppendChild = odatajs.xmlAppendChild;
+    var xmlAppendChildren = odatajs.xmlAppendChildren
+    var xmlAttributes = odatajs.xmlAttributes;
+    var xmlAttributeNode = odatajs.xmlAttributeNode;
+    var xmlAttributeValue = odatajs.xmlAttributeValue;
+    var xmlBaseURI = odatajs.xmlBaseURI;
+    var xmlChildElements = odatajs.xmlChildElements;
+    var xmlDom = odatajs.xmlDom;
+    var xmlFirstChildElement = odatajs.xmlFirstChildElement;
+    var xmlFindElementByPath = odatajs.xmlFindElementByPath;
+    var xmlFindNodeByPath = odatajs.xmlFindNodeByPath;
+    var xmlInnerText = odatajs.xmlInnerText;
+    var xmlLocalName = odatajs.xmlLocalName;
+    var xmlNamespaceURI = odatajs.xmlNamespaceURI;
+    var xmlNewAttribute = odatajs.xmlNewAttribute;
+    var xmlNewElement = odatajs.xmlNewElement;
+    var xmlNewFragment = odatajs.xmlNewFragment;
+    var xmlNewNodeByPath = odatajs.xmlNewNodeByPath;
+    var xmlNewNSDeclaration = odatajs.xmlNewNSDeclaration;
+    var xmlNewText = odatajs.xmlNewText;
+    var xmlNodeValue = odatajs.xmlNodeValue;
+    var xmlNS = odatajs.xmlNS;
+    var xmlnsNS = odatajs.xmlnsNS;
+    var xmlQualifiedName = odatajs.xmlQualifiedName;
+    var xmlParse = odatajs.xmlParse;
+    var xmlSerialize = odatajs.xmlSerialize;
+    var xmlSerializeDescendants = odatajs.xmlSerializeDescendants;
+    var xmlSibling = odatajs.xmlSibling;
+    var w3org = odatajs.w3org;
 
     var adoDs = odata.adoDs;
     var contentType = odata.contentType;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-batch.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-batch.js b/JSLib/src/odata-batch.js
index 770d875..dccac1b 100644
--- a/JSLib/src/odata-batch.js
+++ b/JSLib/src/odata-batch.js
@@ -17,14 +17,14 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports
 
-    var extend = datajs.extend;
-    var isArray = datajs.isArray;
-    var trimString = datajs.trimString;
+    var extend = odatajs.extend;
+    var isArray = odatajs.isArray;
+    var trimString = odatajs.trimString;
 
     var contentType = odata.contentType;
     var handler = odata.handler;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-gml.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-gml.js b/JSLib/src/odata-gml.js
index 2bcf5f5..3ddf432 100644
--- a/JSLib/src/odata-gml.js
+++ b/JSLib/src/odata-gml.js
@@ -15,24 +15,24 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports.
 
-    var contains = datajs.contains;
-    var djsassert = datajs.djsassert;
-    var http = datajs.http;
-    var isArray = datajs.isArray;
-    var xmlAppendChild = datajs.xmlAppendChild;
-    var xmlAttributeValue = datajs.xmlAttributeValue;
-    var xmlChildElements = datajs.xmlChildElements;
-    var xmlFirstChildElement = datajs.xmlFirstChildElement;
-    var xmlInnerText = datajs.xmlInnerText;
-    var xmlLocalName = datajs.xmlLocalName;
-    var xmlNamespaceURI = datajs.xmlNamespaceURI;
-    var xmlNewElement = datajs.xmlNewElement;
-    var xmlQualifiedName = datajs.xmlQualifiedName;
+    var contains = odatajs.contains;
+    var djsassert = odatajs.djsassert;
+    var http = odatajs.http;
+    var isArray = odatajs.isArray;
+    var xmlAppendChild = odatajs.xmlAppendChild;
+    var xmlAttributeValue = odatajs.xmlAttributeValue;
+    var xmlChildElements = odatajs.xmlChildElements;
+    var xmlFirstChildElement = odatajs.xmlFirstChildElement;
+    var xmlInnerText = odatajs.xmlInnerText;
+    var xmlLocalName = odatajs.xmlLocalName;
+    var xmlNamespaceURI = odatajs.xmlNamespaceURI;
+    var xmlNewElement = odatajs.xmlNewElement;
+    var xmlQualifiedName = odatajs.xmlQualifiedName;
     var GEOJSON_POINT = odata.GEOJSON_POINT;
     var GEOJSON_LINESTRING = odata.GEOJSON_LINESTRING;
     var GEOJSON_POLYGON = odata.GEOJSON_POLYGON;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-handler.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-handler.js b/JSLib/src/odata-handler.js
index bb83836..fa79197 100644
--- a/JSLib/src/odata-handler.js
+++ b/JSLib/src/odata-handler.js
@@ -15,13 +15,13 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports.
-    var assigned = datajs.assigned;
-    var extend = datajs.extend;
-    var trimString = datajs.trimString;
+    var assigned = odatajs.assigned;
+    var extend = odatajs.extend;
+    var trimString = odatajs.trimString;
 
     var maxVersion = odata.maxVersion;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-json-light.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-json-light.js b/JSLib/src/odata-json-light.js
index bf654ce..d963852 100644
--- a/JSLib/src/odata-json-light.js
+++ b/JSLib/src/odata-json-light.js
@@ -15,21 +15,21 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports
 
-    var assigned = datajs.assigned;
-    var djsassert = datajs.djsassert;
-    var extend = datajs.extend;
-    var getURIInfo = datajs.getURIInfo;
-    var isArray = datajs.isArray;
-    var isDate = datajs.isDate;
-    var normalizeURI = datajs.normalizeURI;
-    var renameProperty = datajs.renameProperty;
-    var undefinedDefault = datajs.undefinedDefault;
-    var convertByteArrayToHexString = datajs.convertByteArrayToHexString;
+    var assigned = odatajs.assigned;
+    var djsassert = odatajs.djsassert;
+    var extend = odatajs.extend;
+    var getURIInfo = odatajs.getURIInfo;
+    var isArray = odatajs.isArray;
+    var isDate = odatajs.isDate;
+    var normalizeURI = odatajs.normalizeURI;
+    var renameProperty = odatajs.renameProperty;
+    var undefinedDefault = odatajs.undefinedDefault;
+    var convertByteArrayToHexString = odatajs.convertByteArrayToHexString;
 
     var dataItemTypeName = odata.dataItemTypeName;
     var EDM_DATETIME = odata.EDM_DATETIME;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-json.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-json.js b/JSLib/src/odata-json.js
index 933f980..1434fa3 100644
--- a/JSLib/src/odata-json.js
+++ b/JSLib/src/odata-json.js
@@ -15,17 +15,17 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports 
 
-    var defined = datajs.defined;
-    var extend = datajs.extend;
-    var isArray = datajs.isArray;
-    var isDate = datajs.isDate;
-    var normalizeURI = datajs.normalizeURI;
-    var parseInt10 = datajs.parseInt10;
+    var defined = odatajs.defined;
+    var extend = odatajs.extend;
+    var isArray = odatajs.isArray;
+    var isDate = odatajs.isDate;
+    var normalizeURI = odatajs.normalizeURI;
+    var parseInt10 = odatajs.parseInt10;
 
     var contentType = odata.contentType;
     var jsonLightReadPayload = odata.jsonLightReadPayload;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-metadata.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-metadata.js b/JSLib/src/odata-metadata.js
index 4978c32..4908fc0 100644
--- a/JSLib/src/odata-metadata.js
+++ b/JSLib/src/odata-metadata.js
@@ -15,22 +15,22 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // imports 
 
-    var contains = datajs.contains;
-    var normalizeURI = datajs.normalizeURI;
-    var xmlAttributes = datajs.xmlAttributes;
-    var xmlChildElements = datajs.xmlChildElements;
-    var xmlFirstChildElement = datajs.xmlFirstChildElement;
-    var xmlInnerText = datajs.xmlInnerText;
-    var xmlLocalName = datajs.xmlLocalName;
-    var xmlNamespaceURI = datajs.xmlNamespaceURI;
-    var xmlNS = datajs.xmlNS;
-    var xmlnsNS = datajs.xmlnsNS;
-    var xmlParse = datajs.xmlParse;
+    var contains = odatajs.contains;
+    var normalizeURI = odatajs.normalizeURI;
+    var xmlAttributes = odatajs.xmlAttributes;
+    var xmlChildElements = odatajs.xmlChildElements;
+    var xmlFirstChildElement = odatajs.xmlFirstChildElement;
+    var xmlInnerText = odatajs.xmlInnerText;
+    var xmlLocalName = odatajs.xmlLocalName;
+    var xmlNamespaceURI = odatajs.xmlNamespaceURI;
+    var xmlNS = odatajs.xmlNS;
+    var xmlnsNS = odatajs.xmlnsNS;
+    var xmlParse = odatajs.xmlParse;
 
     var edmxNs = odata.edmxNs;
     var edmNs1 = odata.edmNs1;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-net.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-net.js b/JSLib/src/odata-net.js
index 35e3d33..a87417b 100644
--- a/JSLib/src/odata-net.js
+++ b/JSLib/src/odata-net.js
@@ -15,13 +15,13 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports.
 
-    var defined = datajs.defined;
-    var delay = datajs.delay;
+    var defined = odatajs.defined;
+    var delay = odatajs.delay;
 
     // CONTENT START
     var ticks = 0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-utils.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-utils.js b/JSLib/src/odata-utils.js
index 066bc50..2f9c4a2 100644
--- a/JSLib/src/odata-utils.js
+++ b/JSLib/src/odata-utils.js
@@ -15,17 +15,17 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports
-    var assigned = datajs.assigned;
-    var contains = datajs.contains;
-    var find = datajs.find;
-    var isArray = datajs.isArray;
-    var isDate = datajs.isDate;
-    var isObject = datajs.isObject;
-    var parseInt10 = datajs.parseInt10;
+    var assigned = odatajs.assigned;
+    var contains = odatajs.contains;
+    var find = odatajs.find;
+    var isArray = odatajs.isArray;
+    var isDate = odatajs.isDate;
+    var isObject = odatajs.isObject;
+    var parseInt10 = odatajs.parseInt10;
 
     // CONTENT START
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata-xml.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata-xml.js b/JSLib/src/odata-xml.js
index ef974af..da050bd 100644
--- a/JSLib/src/odata-xml.js
+++ b/JSLib/src/odata-xml.js
@@ -15,38 +15,38 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports.
 
-    var djsassert = datajs.djsassert;
-    var http = datajs.http;
-    var isArray = datajs.isArray;
-    var isDate = datajs.isDate;
-    var isObject = datajs.isObject;
-    var normalizeURI = datajs.normalizeURI;
-    var parseInt10 = datajs.parseInt10;
-    var xmlAppendChild = datajs.xmlAppendChild;
-    var xmlAppendChildren = datajs.xmlAppendChildren;
-    var xmlAttributes = datajs.xmlAttributes;
-    var xmlBaseURI = datajs.xmlBaseURI;
-    var xmlChildElements = datajs.xmlChildElements;
-    var xmlDom = datajs.xmlDom;
-    var xmlFirstChildElement = datajs.xmlFirstChildElement;
-    var xmlInnerText = datajs.xmlInnerText;
-    var xmlLocalName = datajs.xmlLocalName;
-    var xmlNamespaceURI = datajs.xmlNamespaceURI;
-    var xmlNewAttribute = datajs.xmlNewAttribute;
-    var xmlNewElement = datajs.xmlNewElement;
-    var xmlNodeValue = datajs.xmlNodeValue;
-    var xmlNS = datajs.xmlNS;
-    var xmlnsNS = datajs.xmlnsNS;
-    var xmlParse = datajs.xmlParse;
-    var xmlQualifiedName = datajs.xmlQualifiedName;
-    var xmlSerialize = datajs.xmlSerialize;
-    var xmlSiblingElement = datajs.xmlSiblingElement;
-    var w3org = datajs.w3org;
+    var djsassert = odatajs.djsassert;
+    var http = odatajs.http;
+    var isArray = odatajs.isArray;
+    var isDate = odatajs.isDate;
+    var isObject = odatajs.isObject;
+    var normalizeURI = odatajs.normalizeURI;
+    var parseInt10 = odatajs.parseInt10;
+    var xmlAppendChild = odatajs.xmlAppendChild;
+    var xmlAppendChildren = odatajs.xmlAppendChildren;
+    var xmlAttributes = odatajs.xmlAttributes;
+    var xmlBaseURI = odatajs.xmlBaseURI;
+    var xmlChildElements = odatajs.xmlChildElements;
+    var xmlDom = odatajs.xmlDom;
+    var xmlFirstChildElement = odatajs.xmlFirstChildElement;
+    var xmlInnerText = odatajs.xmlInnerText;
+    var xmlLocalName = odatajs.xmlLocalName;
+    var xmlNamespaceURI = odatajs.xmlNamespaceURI;
+    var xmlNewAttribute = odatajs.xmlNewAttribute;
+    var xmlNewElement = odatajs.xmlNewElement;
+    var xmlNodeValue = odatajs.xmlNodeValue;
+    var xmlNS = odatajs.xmlNS;
+    var xmlnsNS = odatajs.xmlnsNS;
+    var xmlParse = odatajs.xmlParse;
+    var xmlQualifiedName = odatajs.xmlQualifiedName;
+    var xmlSerialize = odatajs.xmlSerialize;
+    var xmlSiblingElement = odatajs.xmlSiblingElement;
+    var w3org = odatajs.w3org;
 
     var dataItemTypeName = odata.dataItemTypeName;
     var EDM_BINARY = odata.EDM_BINARY;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/odata.js
----------------------------------------------------------------------
diff --git a/JSLib/src/odata.js b/JSLib/src/odata.js
index 29f3955..10a6d2b 100644
--- a/JSLib/src/odata.js
+++ b/JSLib/src/odata.js
@@ -15,14 +15,14 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
     var odata = window.OData || {};
 
     // Imports
 
-    var assigned = datajs.assigned;
-    var defined = datajs.defined;
-    var throwErrorCallback = datajs.throwErrorCallback;
+    var assigned = odatajs.assigned;
+    var defined = odatajs.defined;
+    var throwErrorCallback = odatajs.throwErrorCallback;
 
     var invokeRequest = odata.invokeRequest;
     var MAX_DATA_SERVICE_VERSION = odata.MAX_DATA_SERVICE_VERSION;

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/store-dom.js
----------------------------------------------------------------------
diff --git a/JSLib/src/store-dom.js b/JSLib/src/store-dom.js
index bf8a887..d3aafa0 100644
--- a/JSLib/src/store-dom.js
+++ b/JSLib/src/store-dom.js
@@ -15,11 +15,11 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
 
     // Imports.
-    var throwErrorCallback = datajs.throwErrorCallback;
-    var delay = datajs.delay;
+    var throwErrorCallback = odatajs.throwErrorCallback;
+    var delay = odatajs.delay;
 
     // CONTENT START
 
@@ -313,7 +313,7 @@
     };
 
     // DATAJS INTERNAL START
-    datajs.DomStore = DomStore;
+    odatajs.DomStore = DomStore;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/store-indexeddb.js
----------------------------------------------------------------------
diff --git a/JSLib/src/store-indexeddb.js b/JSLib/src/store-indexeddb.js
index b56828f..1a0483c 100644
--- a/JSLib/src/store-indexeddb.js
+++ b/JSLib/src/store-indexeddb.js
@@ -15,11 +15,11 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
 
     // Imports.
-    var throwErrorCallback = datajs.throwErrorCallback;
-    var delay = datajs.delay;
+    var throwErrorCallback = odatajs.throwErrorCallback;
+    var delay = odatajs.delay;
 
     // CONTENT START
 
@@ -410,7 +410,7 @@
     };
 
     // DATAJS INTERNAL START
-    datajs.IndexedDBStore = IndexedDBStore;
+    odatajs.IndexedDBStore = IndexedDBStore;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/store-memory.js
----------------------------------------------------------------------
diff --git a/JSLib/src/store-memory.js b/JSLib/src/store-memory.js
index 4f35090..467ebc7 100644
--- a/JSLib/src/store-memory.js
+++ b/JSLib/src/store-memory.js
@@ -15,11 +15,11 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
 
     // Imports.
-    var throwErrorCallback = datajs.throwErrorCallback;
-    var delay = datajs.delay;
+    var throwErrorCallback = odatajs.throwErrorCallback;
+    var delay = odatajs.delay;
 
     // CONTENT START
 
@@ -224,7 +224,7 @@
     MemoryStore.prototype.mechanism = "memory";
 
     // DATAJS INTERNAL START
-    datajs.MemoryStore = MemoryStore;
+    odatajs.MemoryStore = MemoryStore;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/store.js
----------------------------------------------------------------------
diff --git a/JSLib/src/store.js b/JSLib/src/store.js
index 688e88e..4db01aa 100644
--- a/JSLib/src/store.js
+++ b/JSLib/src/store.js
@@ -15,11 +15,11 @@
 
 (function (window, undefined) {
    
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
 
-    var DomStore = datajs.DomStore;
-    var IndexedDBStore = datajs.IndexedDBStore;
-    var MemoryStore = datajs.MemoryStore;
+    var DomStore = odatajs.DomStore;
+    var IndexedDBStore = odatajs.IndexedDBStore;
+    var MemoryStore = odatajs.MemoryStore;
 
     // CONTENT START
 
@@ -29,16 +29,16 @@
         memory: MemoryStore
     };
 
-    datajs.defaultStoreMechanism = "best";
+    odatajs.defaultStoreMechanism = "best";
 
-    datajs.createStore = function (name, mechanism) {
+    odatajs.createStore = function (name, mechanism) {
         /// <summary>Creates a new store object.</summary>
         /// <param name="name" type="String">Store name.</param>
         /// <param name="mechanism" type="String" optional="true">A specific mechanism to use (defaults to best, can be "best", "dom", "indexeddb", "webdb").</param>
         /// <returns type="Object">Store object.</returns>
 
         if (!mechanism) {
-            mechanism = datajs.defaultStoreMechanism;
+            mechanism = odatajs.defaultStoreMechanism;
         }
 
         if (mechanism === "best") {
@@ -54,7 +54,7 @@
     };
 
     // DATAJS INTERNAL START
-    datajs.mechanisms = mechanisms;
+    odatajs.mechanisms = mechanisms;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/utils.js
----------------------------------------------------------------------
diff --git a/JSLib/src/utils.js b/JSLib/src/utils.js
index 3a6da46..dab73d3 100644
--- a/JSLib/src/utils.js
+++ b/JSLib/src/utils.js
@@ -15,7 +15,7 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs || {};
+    var datajs = window.odatajs || {};
 
     // CONTENT START
 
@@ -517,30 +517,30 @@
 
     // DATAJS INTERNAL START
 
-    datajs.activeXObject = activeXObject;
-    datajs.assigned = assigned;
-    datajs.contains = contains;
-    datajs.defined = defined;
-    datajs.delay = delay;
-    datajs.djsassert = djsassert;
-    datajs.extend = extend;
-    datajs.find = find;
-    datajs.getURIInfo = getURIInfo;
-    datajs.isArray = isArray;
-    datajs.isDate = isDate;
-    datajs.isObject = isObject;
-    datajs.normalizeURI = normalizeURI;
-    datajs.normalizeURICase = normalizeURICase;
-    datajs.parseInt10 = parseInt10;
-    datajs.renameProperty = renameProperty;
-    datajs.throwErrorCallback = throwErrorCallback;
-    datajs.trimString = trimString;
-    datajs.undefinedDefault = undefinedDefault;
-    datajs.decodeBase64 = decodeBase64;
-    datajs.convertByteArrayToHexString = convertByteArrayToHexString;
-    datajs.getJsonValueArraryLength = getJsonValueArraryLength;
-    datajs.sliceJsonValueArray = sliceJsonValueArray;
-    datajs.concatJsonValueArray = concatJsonValueArray;
+    odatajs.activeXObject = activeXObject;
+    odatajs.assigned = assigned;
+    odatajs.contains = contains;
+    odatajs.defined = defined;
+    odatajs.delay = delay;
+    odatajs.djsassert = djsassert;
+    odatajs.extend = extend;
+    odatajs.find = find;
+    odatajs.getURIInfo = getURIInfo;
+    odatajs.isArray = isArray;
+    odatajs.isDate = isDate;
+    odatajs.isObject = isObject;
+    odatajs.normalizeURI = normalizeURI;
+    odatajs.normalizeURICase = normalizeURICase;
+    odatajs.parseInt10 = parseInt10;
+    odatajs.renameProperty = renameProperty;
+    odatajs.throwErrorCallback = throwErrorCallback;
+    odatajs.trimString = trimString;
+    odatajs.undefinedDefault = undefinedDefault;
+    odatajs.decodeBase64 = decodeBase64;
+    odatajs.convertByteArrayToHexString = convertByteArrayToHexString;
+    odatajs.getJsonValueArraryLength = getJsonValueArraryLength;
+    odatajs.sliceJsonValueArray = sliceJsonValueArray;
+    odatajs.concatJsonValueArray = concatJsonValueArray;
     // DATAJS INTERNAL END
 
     // CONTENT END

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/src/xml.js
----------------------------------------------------------------------
diff --git a/JSLib/src/xml.js b/JSLib/src/xml.js
index 895a4c7..d0b315d 100644
--- a/JSLib/src/xml.js
+++ b/JSLib/src/xml.js
@@ -15,14 +15,14 @@
 
 (function (window, undefined) {
 
-    var datajs = window.datajs;
+    var datajs = window.odatajs;
 
-    var activeXObject = datajs.activeXObject;
-    var djsassert = datajs.djsassert;
-    var extend = datajs.extend;
-    var isArray = datajs.isArray;
-    var isObject = datajs.isObject;
-    var normalizeURI = datajs.normalizeURI;
+    var activeXObject = odatajs.activeXObject;
+    var djsassert = odatajs.djsassert;
+    var extend = odatajs.extend;
+    var isArray = odatajs.isArray;
+    var isObject = odatajs.isObject;
+    var normalizeURI = odatajs.normalizeURI;
 
     // CONTENT START
 
@@ -783,40 +783,40 @@
 
     // DATAJS INTERNAL START
 
-    datajs.http = http;
-    datajs.w3org = w3org;
-    datajs.xmlNS = xmlNS;
-    datajs.xmlnsNS = xmlnsNS;
-
-    datajs.hasLeadingOrTrailingWhitespace = hasLeadingOrTrailingWhitespace;
-    datajs.isXmlNSDeclaration = isXmlNSDeclaration;
-    datajs.xmlAppendChild = xmlAppendChild;
-    datajs.xmlAppendChildren = xmlAppendChildren;
-    datajs.xmlAttributeNode = xmlAttributeNode;
-    datajs.xmlAttributes = xmlAttributes;
-    datajs.xmlAttributeValue = xmlAttributeValue;
-    datajs.xmlBaseURI = xmlBaseURI;
-    datajs.xmlChildElements = xmlChildElements;
-    datajs.xmlFindElementByPath = xmlFindElementByPath;
-    datajs.xmlFindNodeByPath = xmlFindNodeByPath;
-    datajs.xmlFirstChildElement = xmlFirstChildElement;
-    datajs.xmlFirstDescendantElement = xmlFirstDescendantElement;
-    datajs.xmlInnerText = xmlInnerText;
-    datajs.xmlLocalName = xmlLocalName;
-    datajs.xmlNamespaceURI = xmlNamespaceURI;
-    datajs.xmlNodeValue = xmlNodeValue;
-    datajs.xmlDom = xmlDom;
-    datajs.xmlNewAttribute = xmlNewAttribute;
-    datajs.xmlNewElement = xmlNewElement;
-    datajs.xmlNewFragment = xmlNewFragment;
-    datajs.xmlNewNodeByPath = xmlNewNodeByPath;
-    datajs.xmlNewNSDeclaration = xmlNewNSDeclaration;
-    datajs.xmlNewText = xmlNewText;
-    datajs.xmlParse = xmlParse;
-    datajs.xmlQualifiedName = xmlQualifiedName;
-    datajs.xmlSerialize = xmlSerialize;
-    datajs.xmlSerializeDescendants = xmlSerializeDescendants;
-    datajs.xmlSiblingElement = xmlSiblingElement;
+    odatajs.http = http;
+    odatajs.w3org = w3org;
+    odatajs.xmlNS = xmlNS;
+    odatajs.xmlnsNS = xmlnsNS;
+
+    odatajs.hasLeadingOrTrailingWhitespace = hasLeadingOrTrailingWhitespace;
+    odatajs.isXmlNSDeclaration = isXmlNSDeclaration;
+    odatajs.xmlAppendChild = xmlAppendChild;
+    odatajs.xmlAppendChildren = xmlAppendChildren;
+    odatajs.xmlAttributeNode = xmlAttributeNode;
+    odatajs.xmlAttributes = xmlAttributes;
+    odatajs.xmlAttributeValue = xmlAttributeValue;
+    odatajs.xmlBaseURI = xmlBaseURI;
+    odatajs.xmlChildElements = xmlChildElements;
+    odatajs.xmlFindElementByPath = xmlFindElementByPath;
+    odatajs.xmlFindNodeByPath = xmlFindNodeByPath;
+    odatajs.xmlFirstChildElement = xmlFirstChildElement;
+    odatajs.xmlFirstDescendantElement = xmlFirstDescendantElement;
+    odatajs.xmlInnerText = xmlInnerText;
+    odatajs.xmlLocalName = xmlLocalName;
+    odatajs.xmlNamespaceURI = xmlNamespaceURI;
+    odatajs.xmlNodeValue = xmlNodeValue;
+    odatajs.xmlDom = xmlDom;
+    odatajs.xmlNewAttribute = xmlNewAttribute;
+    odatajs.xmlNewElement = xmlNewElement;
+    odatajs.xmlNewFragment = xmlNewFragment;
+    odatajs.xmlNewNodeByPath = xmlNewNodeByPath;
+    odatajs.xmlNewNSDeclaration = xmlNewNSDeclaration;
+    odatajs.xmlNewText = xmlNewText;
+    odatajs.xmlParse = xmlParse;
+    odatajs.xmlQualifiedName = xmlQualifiedName;
+    odatajs.xmlSerialize = xmlSerialize;
+    odatajs.xmlSerializeDescendants = xmlSerializeDescendants;
+    odatajs.xmlSiblingElement = xmlSiblingElement;
 
     // DATAJS INTERNAL END
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/cache-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/cache-tests.js b/JSLib/tests/cache-tests.js
index 13fd4b9..e25d2f8 100644
--- a/JSLib/tests/cache-tests.js
+++ b/JSLib/tests/cache-tests.js
@@ -35,7 +35,7 @@
     };
 
     djstest.addTest(function dataCacheCountTest() {
-        var cache = datajs.createDataCache({ name: "cache", source: foodsFeed });
+        var cache = odatajs.createDataCache({ name: "cache", source: foodsFeed });
         cache.count().then(function (count) {
             djstest.assertAreEqual(count, collectionSize, "expected count for Foods");
             djstest.destroyCacheAndDone(cache);
@@ -43,7 +43,7 @@
     });
 
     djstest.addTest(function dataCacheCountOnLocalTest() {
-        var cache = datajs.createDataCache({ name: "cache", source: foodsFeed, pageSize: collectionSize + 10, mechanism: "memory" });
+        var cache = odatajs.createDataCache({ name: "cache", source: foodsFeed, pageSize: collectionSize + 10, mechanism: "memory" });
         cache.readRange(0, collectionSize + 10).then(function (data) {
             var expectedCount = data.value ? data.value.length : 0;
             cache.count().then(function (count) {
@@ -55,7 +55,7 @@
 
     djstest.addTest(function dataCacheCountAbortTest() {
         // Abort before completion.
-        var cache = datajs.createDataCache({ name: "cache", source: foodsFeed });
+        var cache = odatajs.createDataCache({ name: "cache", source: foodsFeed });
         var item = cache.count().then(thenFailTest, function (err) {
             djstest.assertAreEqual(true, err.canceled, "err.aborted is true");
             djstest.destroyCacheAndDone(cache);
@@ -87,9 +87,9 @@
             }
         };
 
-        var cache = datajs.createDataCache(options);
+        var cache = odatajs.createDataCache(options);
         cache.clear().then(function () {
-            var newCache = datajs.createDataCache(options);
+            var newCache = odatajs.createDataCache(options);
             resolve(newCache);
         }, function (err) {
             rejected = true;
@@ -350,7 +350,7 @@
             then(function (cache) {
                 cache.readRange(0, 2).then(function () {
                     options.source = "HtTp://ExampleURI.cOm/my%20service.svc";
-                    var newCache = datajs.createDataCache(options);
+                    var newCache = odatajs.createDataCache(options);
                     newCache.readRange(0, 2).then(function (data) {
                         djstest.assertAreEqualDeep(data.value, [1, 2], "Got the expected data from the new cache instance");
                         newCache.clear().then(function () {
@@ -503,7 +503,7 @@
                 return null;
             }
         };
-        var cache = datajs.createDataCache({
+        var cache = odatajs.createDataCache({
             name: "mem", mechanism: "memory", source: "http://www.example.org/service/",
             httpClient: httpClient
         });
@@ -675,53 +675,53 @@
         var cache;
 
         // Verify the defaults.
-        cache = datajs.createDataCache({ name: "name", source: "src" });
+        cache = odatajs.createDataCache({ name: "name", source: "src" });
 
         djstest.assertAreEqual(cache.onidle, undefined, "onidle is undefined");
 
         // Verify specific values.
-        cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: 3, idle: 123 });
+        cache = odatajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: 3, idle: 123 });
 
         djstest.assertAreEqual(cache.onidle, 123, "onidle is as specified");
 
         // Verify 0 pageSize 
         djstest.expectException(function () {
-            datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 0, prefetchSize: 3, idle: 123 });
+            odatajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 0, prefetchSize: 3, idle: 123 });
         }, "zero pageSize");
 
         // Verify negative pageSize
         djstest.expectException(function () {
-            datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: -2, prefetchSize: 3, idle: 123 });
+            odatajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: -2, prefetchSize: 3, idle: 123 });
         }, "negative pageSize");
 
         // Verify NaN pageSize
         djstest.expectException(function () {
-            cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: "2", prefetchSize: 3, idle: 123 });
+            cache = odatajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: "2", prefetchSize: 3, idle: 123 });
         }, "NaN pageSize");
 
         // Verify NaN cacheSize
         djstest.expectException(function () {
-            cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: "1", pageSize: 2, prefetchSize: 3, idle: 123 });
+            cache = odatajs.createDataCache({ name: "name", source: "src", cacheSize: "1", pageSize: 2, prefetchSize: 3, idle: 123 });
         }, "NaN cacheSize");
 
         // Verify NaN prefetchSize
         djstest.expectException(function () {
-            cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: "3", idle: 123 });
+            cache = odatajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: "3", idle: 123 });
         }, "NaN prefetchSize");
 
         // Verify undefined name 
         djstest.expectException(function () {
-            datajs.createDataCache({ source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
+            odatajs.createDataCache({ source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
         }, "undefined name");
 
         // Verify null name 
         djstest.expectException(function () {
-            datajs.createDataCache({ name: null, source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
+            odatajs.createDataCache({ name: null, source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
         }, "null name");
 
         // Verify undefined source 
         djstest.expectException(function () {
-            datajs.createDataCache({ name: "name", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
+            odatajs.createDataCache({ name: "name", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
         }, "undefined source");
 
         djstest.done();
@@ -747,7 +747,7 @@
             }
         };
 
-        var cache = datajs.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
+        var cache = odatajs.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
         cache.count().then(function () {
             cache.readRange(0, 5).then(function () {
                 djstest.done();
@@ -760,13 +760,13 @@
         var failures = ["read-settings", "write-settings", "v2"];
         var failureIndex = 0;
 
-        var originalStore = datajs.createStore;
+        var originalStore = odatajs.createStore;
         var restoreStore = function () {
-            datajs.createStore = originalStore;
+            odatajs.createStore = originalStore;
         };
 
         var storeError = { message: "cacheInitializationFailTest error" };
-        datajs.createStore = function (name, mechanism) {
+        odatajs.createStore = function (name, mechanism) {
             return {
                 addOrUpdate: function (key, value, successCallback, errorCallback) {
                     if (failures[failureIndex] === "write-settings") {
@@ -795,7 +795,7 @@
 
         var nextFailure = function () {
             djstest.log("Failure mode: " + failures[failureIndex]);
-            var cache = datajs.createDataCache({ name: "name", source: "foo", mechanism: "memory", pageSize: 10 });
+            var cache = odatajs.createDataCache({ name: "name", source: "foo", mechanism: "memory", pageSize: 10 });
             try {
                 // The first readRange should succeed, because the data cache isn't really initialized at this time.
                 cache.readRange(1, 2).then(djstest.failAndDoneCallback("No function should succeed"), function (err) {
@@ -854,7 +854,7 @@
             }
         };
 
-        var cache = datajs.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
+        var cache = odatajs.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
         cache.readRange(0, 5).then(function () {
             djstest.fail("unexpected call to then success");
             djstest.done();
@@ -975,7 +975,7 @@
 
     djstest.addTest(function createDeferredTest() {
         // Verify basic use of deferred object.
-        var deferred = datajs.createDeferred();
+        var deferred = odatajs.createDeferred();
         deferred.then(function (val1, val2) {
             djstest.assertAreEqual(val1, 1, "val1 is as specified");
             djstest.assertAreEqual(val2, 2, "val2 is as specified");
@@ -986,7 +986,7 @@
 
     djstest.addTest(function deferredThenTest() {
         // Verify then registration and chaining.
-        var deferred = datajs.createDeferred();
+        var deferred = odatajs.createDeferred();
         deferred.then(function (val1, val2) {
             djstest.assertAreEqual(val1, 1, "val1 is as specified");
             djstest.assertAreEqual(val2, 2, "val2 is as specified");
@@ -996,7 +996,7 @@
             djstest.assert(foo !== "foo", "argument for chained 'then' is *not* result of previous call");
             djstest.assert(foo === 1, "argument for chained 'then' is same as for previous call");
 
-            var other = datajs.createDeferred();
+            var other = odatajs.createDeferred();
             other.then(null, function (err, msg) {
                 djstest.assertAreEqual("error", err, "err is as specified");
                 djstest.assertAreEqual("message", msg, "msg is as specified");
@@ -1007,7 +1007,7 @@
                 djstest.assertAreEqual("error", err, "err is as specified");
                 djstest.assertAreEqual("message", msg, "msg is as specified");
 
-                var multiple = datajs.createDeferred();
+                var multiple = odatajs.createDeferred();
                 var count = 0;
 
                 // See Compatibility Note A in DjsDeferred remarks.
@@ -1037,12 +1037,12 @@
 
     djstest.addTest(function deferredResolveTest() {
         // Resolve with no arguments.
-        var deferred = datajs.createDeferred();
+        var deferred = odatajs.createDeferred();
         deferred.then(function (arg) {
             djstest.assertAreEqual(arg, undefined, "resolve with no args shows up as undefined");
 
             // Resolve with no callbacks.
-            var other = datajs.createDeferred();
+            var other = odatajs.createDeferred();
             other.resolve();
             djstest.done();
         });
@@ -1052,12 +1052,12 @@
 
     djstest.addTest(function deferredRejectTest() {
         // Resolve with no arguments.   
-        var deferred = datajs.createDeferred();
+        var deferred = odatajs.createDeferred();
         deferred.then(null, function (arg) {
             djstest.assertAreEqual(arg, undefined, "reject with no args shows up as undefined");
 
             // Resolve with no callbacks.
-            var other = datajs.createDeferred();
+            var other = odatajs.createDeferred();
             other.reject();
             djstest.done();
         });
@@ -1079,7 +1079,7 @@
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
             var test = tests[i];
-            djstest.assertAreEqual(datajs.estimateSize(test.i), test.e);
+            djstest.assertAreEqual(odatajs.estimateSize(test.i), test.e);
         }
         djstest.done();
     });
@@ -1099,7 +1099,7 @@
             }
         });
 
-        var cache = datajs.createDataCache({
+        var cache = odatajs.createDataCache({
             name: "cacheOptionsTunnel",
             source: "http://foo-bar/",
             user: "the-user",
@@ -1121,7 +1121,7 @@
     djstest.addTest(function dataCacheHandlesFullStoreTest() {
 
         var TestStore = function (name) {
-            var that = new window.datajs.MemoryStore(name);
+            var that = new window.odatajs.MemoryStore(name);
             that.addOrUpdate = function (key, value, success, error) {
                 if (key === "__settings") {
                     window.setTimeout(function () {
@@ -1160,14 +1160,14 @@
             }
         };
 
-        var originalCreateStore = window.datajs.createStore;
+        var originalCreateStore = window.odatajs.createStore;
 
-        window.datajs.createStore = function (name, mechanism) {
+        window.odatajs.createStore = function (name, mechanism) {
             return TestStore(name);
         };
 
         try {
-            var cache = datajs.createDataCache({
+            var cache = odatajs.createDataCache({
                 name: "cache",
                 pageSize: 5,
                 prefetchSize: 0,
@@ -1175,7 +1175,7 @@
                 mechanism: "teststore"
             });
         } finally {
-            window.datajs.createStore = originalCreateStore;
+            window.odatajs.createStore = originalCreateStore;
         }
 
         cache.readRange(0, 5).then(function (data) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/datajs-cache-large-collection-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/datajs-cache-large-collection-functional-tests.js b/JSLib/tests/datajs-cache-large-collection-functional-tests.js
index fd4e826..1dd4c00 100644
--- a/JSLib/tests/datajs-cache-large-collection-functional-tests.js
+++ b/JSLib/tests/datajs-cache-large-collection-functional-tests.js
@@ -111,7 +111,7 @@
                         mechanism: params.mechanism, cacheSize: params.cacheSize
                     };
 
-                    var cache = datajs.createDataCache(options);
+                    var cache = odatajs.createDataCache(options);
                     this.caches.push({ name: options.name,
                         cache: cache
                     });
@@ -144,7 +144,7 @@
                             mechanism: params.mechanism, cacheSize: params.cacheSize
                         };
 
-                        var cache = datajs.createDataCache(options);
+                        var cache = odatajs.createDataCache(options);
                         this.caches.push({ name: options.name, cache: cache });
 
                         var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-atom-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-atom-tests.js b/JSLib/tests/odata-atom-tests.js
index 7131e1e..49d9538 100644
--- a/JSLib/tests/odata-atom-tests.js
+++ b/JSLib/tests/odata-atom-tests.js
@@ -1070,10 +1070,10 @@
            <title>empty entry</title> \r\n\
         </notAtom> \r\n";
 
-        var service = OData.atomReadDocument(datajs.xmlParse(emptyServiceString).documentElement);
-        var feed = OData.atomReadDocument(datajs.xmlParse(emptyFeedString).documentElement);
-        var entry = OData.atomReadDocument(datajs.xmlParse(emptyEntryString).documentElement);
-        var nonAtom = OData.atomReadDocument(datajs.xmlParse(nonAtomString).documentElement);
+        var service = OData.atomReadDocument(odatajs.xmlParse(emptyServiceString).documentElement);
+        var feed = OData.atomReadDocument(odatajs.xmlParse(emptyFeedString).documentElement);
+        var entry = OData.atomReadDocument(odatajs.xmlParse(emptyEntryString).documentElement);
+        var nonAtom = OData.atomReadDocument(odatajs.xmlParse(nonAtomString).documentElement);
 
         djstest.assert(service && service.workspaces.length === 1, "atomReadDocument deserialized a service document");
         djstest.assert(feed && feed.results.length === 0, "atomReadDocument deserialized a feed document");
@@ -1172,7 +1172,7 @@
            <title>test feed</title> \r\n\
         </feed> \r\n"
 
-        var feed = OData.atomReadFeed(datajs.xmlParse(feedWithExtensionsString).documentElement);
+        var feed = OData.atomReadFeed(odatajs.xmlParse(feedWithExtensionsString).documentElement);
         djstest.assert(feed, "atomReadFeed didn't return a feed object for a payload with feed extensions");
         djstest.assertAreEqual(feed.__metadata.feed_extensions.length, 4, "atomReadFeed didn't return the expected number of extensions");
 
@@ -1190,9 +1190,9 @@
           <link rel=\'alternate\' href=\'http://otheruri\'/> \r\n\
         </feed> \r\n";
 
-        var root = datajs.xmlParse(feedLinksString).documentElement;
+        var root = odatajs.xmlParse(feedLinksString).documentElement;
         var feed = { __metadata: {} };
-        datajs.xmlChildElements(root, function (child) {
+        odatajs.xmlChildElements(root, function (child) {
             OData.atomReadFeedLink(child, feed);
         });
 
@@ -1214,7 +1214,7 @@
               me:attr1=\'a1\' \r\n\
               attr2=\'a2\'/> \r\n";
 
-        var link = OData.atomReadLink(datajs.xmlParse(linkString).documentElement);
+        var link = OData.atomReadLink(odatajs.xmlParse(linkString).documentElement);
 
         djstest.assert(link, "atomReadLink didn't return a link object");
         djstest.assertAreEqual(link.href, "http://nexturi", "atomReadLink, link object href field has an unexpected value");
@@ -1236,7 +1236,7 @@
               attr2=\'a2\'/> \r\n";
 
 
-        var linkRoot = datajs.xmlParse(linkString).documentElement;
+        var linkRoot = odatajs.xmlParse(linkString).documentElement;
         djstest.expectException(function () {
             OData.atomReadLink(linkRoot);
         }, "atomReadLink didn't throw an exception when the link doesn't have the href attribute");
@@ -1258,7 +1258,7 @@
             djstest.assertAreEqual(ext.value, value, "atomReadExtensionElement, extension object value field has an unexpected value");
         };
 
-        var extension = OData.atomReadExtensionElement(datajs.xmlParse(extensionString).documentElement);
+        var extension = OData.atomReadExtensionElement(odatajs.xmlParse(extensionString).documentElement);
         validateExtension(extension, "ext", "http://myExtensions", 2, 1);
 
         extension = extension.children[0];
@@ -1271,7 +1271,7 @@
         var extensionString = "\
         <me:ext xmlns:me=\'http://myExtensions\' me:attr1=\'a1\' attr2=\'a2\' /> \r\n";
 
-        var extensionAttributes = OData.atomReadExtensionAttributes(datajs.xmlParse(extensionString).documentElement);
+        var extensionAttributes = OData.atomReadExtensionAttributes(odatajs.xmlParse(extensionString).documentElement);
         djstest.assertAreEqual(extensionAttributes.length, 2, "atomReadExtensionAttribute, returned collection doesn't have the expected number of attributes");
         djstest.done();
     });
@@ -1291,7 +1291,7 @@
 
         for (var name in tests) {
             var test = tests[name];
-            var xmlElement = datajs.xmlParse(test.i).documentElement;
+            var xmlElement = odatajs.xmlParse(test.i).documentElement;
             var extensions = OData.atomReadExtensionAttributes(xmlElement);
 
             djstest.assertAreEqualDeep(extensions[0], test.e, name + " - extension object is the expected one");
@@ -1342,7 +1342,7 @@
             Typed: 100
         };
 
-        var entry = OData.atomReadEntry(datajs.xmlParse(entryString).documentElement);
+        var entry = OData.atomReadEntry(odatajs.xmlParse(entryString).documentElement);
 
         djstest.assert(entry, "atomReadEntry didn't return an entry object");
         djstest.assertAreEqualDeep(entry, expectedEntry);
@@ -2571,7 +2571,7 @@
             Typed: 100
         };
 
-        var entry = OData.atomReadEntry(datajs.xmlParse(entryString).documentElement);
+        var entry = OData.atomReadEntry(odatajs.xmlParse(entryString).documentElement);
 
         djstest.assert(entry, "atomReadFeed didn't return an entry object for the media link entry payload");
         djstest.assertAreEqualDeep(entry, expectedEntry);
@@ -2586,7 +2586,7 @@
                   xmlns:me=\'http//:myExtensions\' \r\n\
                   xmlns=\'http://www.w3.org/2005/Atom\'/> \r\n";
         var entryMetadata = {};
-        OData.atomReadEntryType(datajs.xmlParse(categoryString).documentElement, entryMetadata);
+        OData.atomReadEntryType(odatajs.xmlParse(categoryString).documentElement, entryMetadata);
 
         djstest.assertAreEqual(entryMetadata.type, "the type", "atomReadEntryType, entry type has an unexpected value");
         djstest.assertAreEqual(entryMetadata.type_extensions.length, 2, "readATomEntryType, entry type_extensions doens't have the expected number of extensions");
@@ -2602,7 +2602,7 @@
                   xmlns=\'http://www.w3.org/2005/Atom\'/> \r\n";
 
         var entry = { __metadata: {} };
-        OData.atomReadEntryType(datajs.xmlParse(categoryString).documentElement, entry, entry.__metadata);
+        OData.atomReadEntryType(odatajs.xmlParse(categoryString).documentElement, entry, entry.__metadata);
 
         djstest.assert(!entry.__metadata.type, "atomReadEntryType, processed a category of without a scheme attribute!!");
         djstest.done();
@@ -2622,8 +2622,8 @@
         var entry = { __metadata: {} };
 
         djstest.expectException(function () {
-            var categories = datajs.xmlParse(categoryString).documentElement;
-            datajs.xmlChildElements(categories, function (child) {
+            var categories = odatajs.xmlParse(categoryString).documentElement;
+            odatajs.xmlChildElements(categories, function (child) {
                 OData.atomReadEntryType(child, entry, entry.__metadata);
             });
         }, "atomReadEntryType didn't throw the expected exception");
@@ -2636,7 +2636,7 @@
             <content src=\'http://mediasource\' xmlns=\'http://www.w3.org/2005/Atom\'/> \r\n"
 
         var entry = { __metadata: {} };
-        var content = datajs.xmlParse(contentString).documentElement;
+        var content = odatajs.xmlParse(contentString).documentElement;
         djstest.expectException(function () {
             OData.atomReadEntryContent(content, entry);
         }, "atomReadEntryContent didn't throw the expected exception");
@@ -2656,7 +2656,7 @@
            </content> \r\n";
 
         var entry = { __metadata: {} };
-        var content = datajs.xmlParse(contentString).documentElement;
+        var content = odatajs.xmlParse(contentString).documentElement;
         djstest.expectException(function () {
             OData.atomReadEntryContent(content, entry);
         }, "atomReadEntryContent didn't throw the expected exception");
@@ -2674,7 +2674,7 @@
 
         var entry = { __metadata: {} };
 
-        OData.atomReadEntryLink(datajs.xmlParse(linkString).documentElement, entry, entry.__metadata);
+        OData.atomReadEntryLink(odatajs.xmlParse(linkString).documentElement, entry, entry.__metadata);
 
         djstest.assertAreEqual(entry.__metadata.edit_media, "http://editmediauri", "edit_media field has a un expected value");
         djstest.assertAreEqual(entry.__metadata.media_etag, "etag", "media_etag field has a un expected value");
@@ -2713,8 +2713,8 @@
         };
 
         var entry = { __metadata: {} };
-        var links = datajs.xmlParse(linksString).documentElement;
-        datajs.xmlChildElements(links, function (child) {
+        var links = odatajs.xmlParse(linksString).documentElement;
+        odatajs.xmlChildElements(links, function (child) {
             OData.atomReadEntryLink(child, entry, entry.__metadata);
         });
 
@@ -2788,7 +2788,7 @@
             Typed: 100
         };
 
-        var entry = OData.atomReadEntry(datajs.xmlParse(entryString).documentElement);
+        var entry = OData.atomReadEntry(odatajs.xmlParse(entryString).documentElement);
 
         djstest.assertAreEqualDeep(entry, expectedEntry);
         djstest.done();
@@ -2810,7 +2810,7 @@
                </d:Complex>\r\n \
            </d:Data>\r\n";
 
-        var dataElement = datajs.xmlParse(content).documentElement;
+        var dataElement = odatajs.xmlParse(content).documentElement;
         var data = {};
         var metadata = {};
 
@@ -2950,7 +2950,7 @@
             }
         };
 
-        var entry = OData.atomReadEntry(datajs.xmlParse(entryString).documentElement);
+        var entry = OData.atomReadEntry(odatajs.xmlParse(entryString).documentElement);
 
         djstest.assert(entry, "atomReadEntry didn't return an entry object");
         djstest.assertAreEqualDeep(entry, expectedEntry, "atomReadEntry didn't return the expected entry object");
@@ -3261,7 +3261,7 @@
         };
 
         // Todo refactor all this tests to use the mock http client instead. 
-        var entry = OData.atomReadEntry(datajs.xmlParse(entryString).documentElement);
+        var entry = OData.atomReadEntry(odatajs.xmlParse(entryString).documentElement);
 
         djstest.assert(entry, "atomReadEntry didn't return an entry object");
         djstest.assertAreEqualDeep(entry, expectedEntry, "atomReadEntry didn't return the expected entry object");
@@ -4292,7 +4292,7 @@
 
     djstest.addFullTest(true, function getXmlPathValueTest() {
         // Tests with expected value and result based on doc.
-        var doc = datajs.xmlParse(
+        var doc = odatajs.xmlParse(
         "<atom:entry xmlns:atom='http://www.w3.org/2005/Atom' xmlns:c='custom'>" +
         " <atom:title>title</atom:title>" +
         " <atom:summary>summary</atom:summary>" +
@@ -4303,7 +4303,7 @@
         " <c:third><c:item><c:a>a</c:a><c:b>b</c:b><c:empty /></c:item></c:third>" +
         "</atom:entry>");
 
-        var root = datajs.xmlFirstChildElement(doc);
+        var root = odatajs.xmlFirstChildElement(doc);
 
         var atomXmlNs = "http://www.w3.org/2005/Atom";
         var tests = [
@@ -4331,8 +4331,8 @@
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
             var test = tests[i];
-            var node = datajs.xmlFindNodeByPath(root, test.ns, test.path);
-            var actual = node && datajs.xmlNodeValue(node);
+            var node = odatajs.xmlFindNodeByPath(root, test.ns, test.path);
+            var actual = node && odatajs.xmlNodeValue(node);
             djstest.assertAreEqual(actual, test.e, "match for test #" + i + "(" + test.path + ")");
         }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-cache-filter-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-cache-filter-functional-tests.js b/JSLib/tests/odata-cache-filter-functional-tests.js
index b11cad3..eaf9d48 100644
--- a/JSLib/tests/odata-cache-filter-functional-tests.js
+++ b/JSLib/tests/odata-cache-filter-functional-tests.js
@@ -207,7 +207,7 @@
         djstest.assertsExpected(2);
         var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
 
-        var cache = datajs.createDataCache(options);
+        var cache = odatajs.createDataCache(options);
         var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
         var session = this.observableHttpClient.newSession();
         validateFilterResultsAndRequests(params.feed, cache, params.index, params.count, params.predicate, function () { djstest.destroyCacheAndDone(cache) }, params.backwards, session, cacheOracle);
@@ -217,7 +217,7 @@
         djstest.assertsExpected(3);
         var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
 
-        var cache = datajs.createDataCache(options);
+        var cache = odatajs.createDataCache(options);
         var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
         var session = this.observableHttpClient.newSession();
 
@@ -232,7 +232,7 @@
         djstest.assertsExpected(2);
         var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
 
-        var cache = datajs.createDataCache(options);
+        var cache = odatajs.createDataCache(options);
 
         var firstfilter = function (finished) {
             validateFilterResultsAndRequests(params.feed, cache, params.firstIndex, params.firstCount, params.predicate, finished, params.backwards);
@@ -251,7 +251,7 @@
         djstest.assertsExpected(4);
         var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
 
-        var cache = datajs.createDataCache(options);
+        var cache = odatajs.createDataCache(options);
         var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
         var session = this.observableHttpClient.newSession();
 
@@ -372,7 +372,7 @@
                 function (params) {
                     djstest.assertsExpected(1);
                     var options = { name: "cache" + new Date().valueOf(), source: params.feed };
-                    var cache = datajs.createDataCache(options);
+                    var cache = odatajs.createDataCache(options);
                     try {
                         params.backwards ?
                             cache.filterForward(params.index, params.count, params.predicate).then(function (results) {
@@ -396,7 +396,7 @@
                 function (params) {
                     djstest.assertsExpected(1);
                     var options = { name: "cache" + new Date().valueOf(), source: params.feed };
-                    var cache = datajs.createDataCache(options);
+                    var cache = odatajs.createDataCache(options);
                     try {
                         params.backwards ?
                             cache.filterBack(params.index, params.count, params.predicate).then(function (results) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-cache-fperf-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-cache-fperf-tests.js b/JSLib/tests/odata-cache-fperf-tests.js
index 441022c..68c415f 100644
--- a/JSLib/tests/odata-cache-fperf-tests.js
+++ b/JSLib/tests/odata-cache-fperf-tests.js
@@ -44,7 +44,7 @@
         /// <param name="threshold">The average read time threshold for test to pass; if not specified, defaults to the slowHttpClient latency</param>
         /// <returns>The test function</param>
         return function () {
-            var cache = datajs.createDataCache({ name: "cache" + new Date().valueOf(), source: source, pageSize: pageSize, prefetchSize: prefetchSize });
+            var cache = odatajs.createDataCache({ name: "cache" + new Date().valueOf(), source: source, pageSize: pageSize, prefetchSize: prefetchSize });
             var totalTime = 0;
             var readCount = 0;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-cache-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-cache-functional-tests.js b/JSLib/tests/odata-cache-functional-tests.js
index 1a65c6f..e8c32ec 100644
--- a/JSLib/tests/odata-cache-functional-tests.js
+++ b/JSLib/tests/odata-cache-functional-tests.js
@@ -316,7 +316,7 @@
             this.createAndAddCache = function (options) {
                 /// <summary>Returns a cache created from the options object and </summary>
                 /// <param name="options" type="Object">Object to create a cache from.</param> 
-                var cache = datajs.createDataCache(options);
+                var cache = odatajs.createDataCache(options);
                 this.caches.push({ name: options.name, cache: cache });
                 return cache;
             };

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-cache-rx-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-cache-rx-functional-tests.js b/JSLib/tests/odata-cache-rx-functional-tests.js
index cb47982..f1d4f1f 100644
--- a/JSLib/tests/odata-cache-rx-functional-tests.js
+++ b/JSLib/tests/odata-cache-rx-functional-tests.js
@@ -60,7 +60,7 @@
                 djstest.addTest(function (params) {
                     djstest.assertsExpected(1);
                     var options = { name: "cache" + new Date().valueOf(), source: params.feedUri, pageSize: params.pageSize, prefetchSize: 0 };
-                    var cache = datajs.createDataCache(options);
+                    var cache = odatajs.createDataCache(options);
 
                     ODataReadOracle.readJsonAcrossServerPages(params.feedUri, function (collection) {
                         assertObservables(params.operator(cache.toObservable()), params.operator(window.Rx.Observable.FromArray(collection.value)), function () {

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-json-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-json-tests.js b/JSLib/tests/odata-json-tests.js
index 775b0d0..70f98be 100644
--- a/JSLib/tests/odata-json-tests.js
+++ b/JSLib/tests/odata-json-tests.js
@@ -8,12 +8,12 @@
 
     // DATAJS INTERNAL START
     djstest.addTest(function isArrayTest() {
-        djstest.assert(datajs.isArray([]));
-        djstest.assert(datajs.isArray([1, 2]));
-        djstest.assert(!datajs.isArray({}));
-        djstest.assert(!datajs.isArray("1,2,3,4"));
-        djstest.assert(!datajs.isArray());
-        djstest.assert(!datajs.isArray(null));
+        djstest.assert(odatajs.isArray([]));
+        djstest.assert(odatajs.isArray([1, 2]));
+        djstest.assert(!odatajs.isArray({}));
+        djstest.assert(!odatajs.isArray("1,2,3,4"));
+        djstest.assert(!odatajs.isArray());
+        djstest.assert(!odatajs.isArray(null));
         djstest.done();
     });
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-metadata-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-metadata-tests.js b/JSLib/tests/odata-metadata-tests.js
index 85e96ed..84c6e89 100644
--- a/JSLib/tests/odata-metadata-tests.js
+++ b/JSLib/tests/odata-metadata-tests.js
@@ -411,7 +411,7 @@
 
         var i, len;
         for (i = 0, len = cases.length; i < len; i++) {
-            var doc = window.datajs.xmlParse(cases[i].i);
+            var doc = window.odatajs.xmlParse(cases[i].i);
             var schema = window.OData.parseConceptualModelElement(doc.documentElement);
             djstest.assertAreEqualDeep(schema, cases[i].e, "parseConceptualModelElement result matches target");
         }
@@ -433,7 +433,7 @@
         '      </EntityType></Schema></edmx:DataServices></edmx:Edmx>';
 
 
-        var doc = window.datajs.xmlParse(testCsdl);
+        var doc = window.odatajs.xmlParse(testCsdl);
         var schema = window.OData.parseConceptualModelElement(doc.documentElement);
 
         djstest.assertAreEqual(schema.dataServices.schema[0].term.length, 2, "schema.DataServices.Schema.Term.length === 2");
@@ -467,7 +467,7 @@
         '    </Schema></edmx:DataServices></edmx:Edmx>';
 
 
-        var doc = window.datajs.xmlParse(testCsdl);
+        var doc = window.odatajs.xmlParse(testCsdl);
         var schema = window.OData.parseConceptualModelElement(doc.documentElement);
 
         djstest.assertAreEqual(schema.dataServices.schema[0].annotations.length, 2, "Annotations number");

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-read-crossdomain-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-read-crossdomain-functional-tests.js b/JSLib/tests/odata-read-crossdomain-functional-tests.js
index 7d1a013..2af4e97 100644
--- a/JSLib/tests/odata-read-crossdomain-functional-tests.js
+++ b/JSLib/tests/odata-read-crossdomain-functional-tests.js
@@ -105,7 +105,7 @@
     var dataCacheReadRangeSingleTest = function (params) {
         var options = { name: "cache", source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize, cacheSize: params.cacheSize };
         OData.defaultHttpClient.enableJsonpCallback = true;
-        var cache = datajs.createDataCache(options);
+        var cache = odatajs.createDataCache(options);
         cache.readRange(params.skip, params.take).then(function (data) {
             validateExpectedRange(cache, data, params.feed, params.skip, params.take);
         }, unexpectedErrorHandler);

http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5c98f9f3/JSLib/tests/odata-xml-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-xml-tests.js b/JSLib/tests/odata-xml-tests.js
index 64605e8..9eb936e 100644
--- a/JSLib/tests/odata-xml-tests.js
+++ b/JSLib/tests/odata-xml-tests.js
@@ -24,7 +24,7 @@
 
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
-            var actual = datajs.getURIInfo(tests[i].input);
+            var actual = odatajs.getURIInfo(tests[i].input);
             djstest.assertAreEqualDeep(actual, tests[i].expected, "test " + i + "didn't return the expected URI parts");
         }
         djstest.done();
@@ -40,7 +40,7 @@
 
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
-            var actual = datajs.normalizeURICase(tests[i].uri, tests[i].base);
+            var actual = odatajs.normalizeURICase(tests[i].uri, tests[i].base);
             djstest.assertAreEqual(actual, tests[i].expected, "test " + i + "didn't return the expected URI");
         }
         djstest.done();
@@ -68,7 +68,7 @@
 
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
-            var actual = datajs.normalizeURI(tests[i].uri, tests[i].base);
+            var actual = odatajs.normalizeURI(tests[i].uri, tests[i].base);
             djstest.assertAreEqual(actual, tests[i].expected, "test " + i + "didn't return the expected normalized URI");
         }
         djstest.done();
@@ -76,7 +76,7 @@
 
     djstest.addTest(function xmlParseTest() {
         var xml = '<root xmlns:n1="http://namespace1" xml:base="http://base.org" />';
-        var root = datajs.xmlParse(xml);
+        var root = odatajs.xmlParse(xml);
         djstest.assert(root, "xml._parse didn't return a xml dom object");
         djstest.done();
     });
@@ -88,12 +88,12 @@
            <element base=\"this is not a xml base attribute\" /> \r\n\
          </root>\r\n";
 
-        var doc = datajs.xmlParse(xml);
-        var root = datajs.xmlFirstChildElement(doc);
-        var child = datajs.xmlFirstChildElement(root);
+        var doc = odatajs.xmlParse(xml);
+        var root = odatajs.xmlFirstChildElement(doc);
+        var child = odatajs.xmlFirstChildElement(root);
 
-        djstest.assertAreEqual(datajs.xmlBaseURI(root), "http://base.org", "xml._baseURI didn't return the expected value");
-        djstest.assert(!datajs.xmlBaseURI(child), "xml._baseURI returned a value when it wasn't expected");
+        djstest.assertAreEqual(odatajs.xmlBaseURI(root), "http://base.org", "xml._baseURI didn't return the expected value");
+        djstest.assert(!odatajs.xmlBaseURI(child), "xml._baseURI returned a value when it wasn't expected");
         djstest.done();
     });
 
@@ -104,13 +104,13 @@
         <element attribute=\"value\" n1:nsAttribute=\"nsValue\" /> \r\n\
      </root> \r\n";
 
-        var doc = datajs.xmlParse(xml);
-        var root = datajs.xmlFirstChildElement(doc);
-        var child = datajs.xmlFirstChildElement(root);
+        var doc = odatajs.xmlParse(xml);
+        var root = odatajs.xmlFirstChildElement(doc);
+        var child = odatajs.xmlFirstChildElement(root);
 
-        djstest.assertAreEqual(datajs.xmlAttributeValue(child, "attribute"), "value", "xml._attribute didn't return the expected value for attribute");
-        djstest.assertAreEqual(datajs.xmlAttributeValue(child, "nsAttribute", "http://namespace1"), "nsValue", "xml._attribute didn't return the expected value for nsAttribute");
-        djstest.assert(!datajs.xmlAttributeValue(child, "nsAttribute"), "xml._attribute returned a value for nsAttribute without specifying a namespace");
+        djstest.assertAreEqual(odatajs.xmlAttributeValue(child, "attribute"), "value", "xml._attribute didn't return the expected value for attribute");
+        djstest.assertAreEqual(odatajs.xmlAttributeValue(child, "nsAttribute", "http://namespace1"), "nsValue", "xml._attribute didn't return the expected value for nsAttribute");
+        djstest.assert(!odatajs.xmlAttributeValue(child, "nsAttribute"), "xml._attribute returned a value for nsAttribute without specifying a namespace");
 
         djstest.done();
     });
@@ -118,10 +118,10 @@
     djstest.addTest(function xmlLocalNameTest() {
         var xml = "<root xmlns:n1=\"http://namespace1\" /> \r\n";
 
-        var doc = datajs.xmlParse(xml);
-        var root = datajs.xmlFirstChildElement(doc);
+        var doc = odatajs.xmlParse(xml);
+        var root = odatajs.xmlFirstChildElement(doc);
 
-        djstest.assertAreEqual(datajs.xmlLocalName(root), "root", "xml._localName didn't return the expected localName of the root element");
+        djstest.assertAreEqual(odatajs.xmlLocalName(root), "root", "xml._localName didn't return the expected localName of the root element");
         djstest.done();
     });
 
@@ -134,11 +134,11 @@
          </root>\r\n";
 
 
-        var doc = datajs.xmlParse(xml);
-        var root = datajs.xmlFirstChildElement(doc);
-        var child = datajs.xmlFirstChildElement(root);
+        var doc = odatajs.xmlParse(xml);
+        var root = odatajs.xmlFirstChildElement(doc);
+        var child = odatajs.xmlFirstChildElement(root);
 
-        djstest.assertAreEqual(datajs.xmlLocalName(child), "element1", "xml.firstElement returned didn't return the expected element");
+        djstest.assertAreEqual(odatajs.xmlLocalName(child), "element1", "xml.firstElement returned didn't return the expected element");
         djstest.done();
     });
 
@@ -159,14 +159,14 @@
 
         var actual = [];
 
-        var doc = datajs.xmlParse(xml);
-        var root = datajs.xmlFirstChildElement(doc);
+        var doc = odatajs.xmlParse(xml);
+        var root = odatajs.xmlFirstChildElement(doc);
     
-        datajs.xmlChildElements(root, function (child) {
+        odatajs.xmlChildElements(root, function (child) {
             djstest.log("in child elements callback");
             actual.push({
-                localName: datajs.xmlLocalName(child),
-                nsURI: datajs.xmlNamespaceURI(child)
+                localName: odatajs.xmlLocalName(child),
+                nsURI: odatajs.xmlNamespaceURI(child)
             });
         });
 
@@ -190,15 +190,15 @@
 
         var actual = {};
 
-        var doc = datajs.xmlParse(xml);
-        var root = datajs.xmlFirstChildElement(doc);
+        var doc = odatajs.xmlParse(xml);
+        var root = odatajs.xmlFirstChildElement(doc);
 
-        datajs.xmlAttributes(root, function (attribute) {
+        odatajs.xmlAttributes(root, function (attribute) {
             djstest.log("in child elements callback");
-            var localName = datajs.xmlLocalName(attribute);
+            var localName = odatajs.xmlLocalName(attribute);
             actual[localName] = {
                 localName: localName, 
-                nsURI: datajs.xmlNamespaceURI(attribute),
+                nsURI: odatajs.xmlNamespaceURI(attribute),
                 value: attribute.value
             };
         });
@@ -224,7 +224,7 @@
 
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
-            var result = datajs.hasLeadingOrTrailingWhitespace(tests[i].t);
+            var result = odatajs.hasLeadingOrTrailingWhitespace(tests[i].t);
             djstest.assertAreEqual(result, tests[i].r, "match for " + tests[i].t);
         }
 
@@ -247,8 +247,8 @@
         var i, len;
         for (i = 0, len = tests.length; i < len; i++) {
             var test = tests[i];
-            var doc = datajs.xmlParse(test.t);
-            var actual = datajs.xmlInnerText(doc);
+            var doc = odatajs.xmlParse(test.t);
+            var actual = odatajs.xmlInnerText(doc);
             djstest.assertAreEqual(actual, test.r, "test for [" + test.t + "]");
         }
 


Mime
View raw message