[OLINGO-440] Remove odatajs.js file (not needed)
diff --git a/odatajs/Gruntfile.js b/odatajs/Gruntfile.js
index b3c9cee..5b66d60 100644
--- a/odatajs/Gruntfile.js
+++ b/odatajs/Gruntfile.js
@@ -62,6 +62,11 @@
src: 'build/lib/<%= artifactname %>.min.js',
dest: 'build/lib/<%= artifactname %>.min.js',
},
+ src: {
+ src: ['src/**/*.js'],
+ dest: 'build/lib/<%= artifactname %>.js',
+ },
+
},
"jsdoc" : { // generate documentation
src : {
@@ -79,6 +84,16 @@
dest: 'build/'
}
},
+ 'copy' : {
+ 'to-latest' : {
+ files: [
+ {
+ src :'build/lib/<%= artifactname %>.js',
+ dest: 'build/lib/odatajs-latest.js' },
+ ]
+ }
+
+ },
"npm-clean": {
options: {force: true},
"build": {
@@ -155,7 +170,8 @@
grunt.registerTask('doc-test', ['clearEnv', 'jsdoc:test']);
// Build the odatajs library
- grunt.registerTask('build', ['clean:lib','browserify:src', 'uglify:build', 'concat', 'nugetpack']);
+ grunt.registerTask('build', ['clean:lib','browserify:src', 'uglify:build', 'concat:licence','concat:licence_min','copy:to-latest','nugetpack']);
+ grunt.registerTask('build2', ['clean:lib','concat:src', 'uglify:build', 'concat:licence','concat:licence_min','nugetpack']);
grunt.registerTask('test-browser', ['configureProxies:test-browser', 'connect:test-browser']);
grunt.registerTask('test-node', ['node-qunit:default-tests']);
diff --git a/odatajs/src/index.js b/odatajs/src/index.js
index a2b71be..42615d3 100644
--- a/odatajs/src/index.js
+++ b/odatajs/src/index.js
@@ -17,7 +17,17 @@
* under the License.
*/
-var odatajs = require('./lib/odatajs.js');
+var odatajs = {};
+
+odatajs.version = {
+ major: 1,
+ minor: 1,
+ build: 1
+};
+
+odatajs.deferred = require('./lib/odatajs/deferred.js');
+odatajs.utils = require('./lib/odatajs/utils.js');
+odatajs.xml = require('./lib/odatajs/xml.js');
odatajs.oData = require('./lib/odata.js');
odatajs.store = require('./lib/store.js');
diff --git a/odatajs/src/lib/cache.js b/odatajs/src/lib/cache.js
index cc047f0..92a740d 100644
--- a/odatajs/src/lib/cache.js
+++ b/odatajs/src/lib/cache.js
@@ -19,10 +19,10 @@
/** @module cache */
-var odatajs = require('./odatajs.js');
-var utils = odatajs.utils;
-var deferred = odatajs.deferred;
-var storeReq = odatajs.store;
+//var odatajs = require('./odatajs/utils.js');
+var utils = require('./odatajs/utils.js');
+var deferred = require('./odatajs/deferred.js');
+var storeReq = require('./store.js');
var cacheSource = require('./cache/source');
diff --git a/odatajs/src/lib/cache/source.js b/odatajs/src/lib/cache/source.js
index e459157..eccf5d9 100644
--- a/odatajs/src/lib/cache/source.js
+++ b/odatajs/src/lib/cache/source.js
@@ -19,7 +19,7 @@
/** @module cache/source */
-var utils = require("./../odatajs.js").utils;
+var utils = require("./../odatajs/utils.js");
var odataRequest = require("./../odata.js");
var parseInt10 = utils.parseInt10;
diff --git a/odatajs/src/lib/odata/batch.js b/odatajs/src/lib/odata/batch.js
index 517e3a8..59fb1f8 100644
--- a/odatajs/src/lib/odata/batch.js
+++ b/odatajs/src/lib/odata/batch.js
@@ -19,7 +19,7 @@
/** @module odata/batch */
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
var odataUtils = require('./utils.js');
var odataHandler = require('./handler.js');
diff --git a/odatajs/src/lib/odata/handler.js b/odatajs/src/lib/odata/handler.js
index 876dc37..d2b62d4 100644
--- a/odatajs/src/lib/odata/handler.js
+++ b/odatajs/src/lib/odata/handler.js
@@ -20,7 +20,7 @@
/** @module odata/handler */
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
var oDataUtils = require('./utils.js');
// Imports.
diff --git a/odatajs/src/lib/odata/json.js b/odatajs/src/lib/odata/json.js
index 864ead4..d003e2b 100644
--- a/odatajs/src/lib/odata/json.js
+++ b/odatajs/src/lib/odata/json.js
@@ -21,7 +21,7 @@
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
var oDataUtils = require('./utils.js');
var oDataHandler = require('./handler.js');
diff --git a/odatajs/src/lib/odata/metadata.js b/odatajs/src/lib/odata/metadata.js
index 5a106e7..fb34286 100644
--- a/odatajs/src/lib/odata/metadata.js
+++ b/odatajs/src/lib/odata/metadata.js
@@ -19,8 +19,8 @@
/** @module odata/metadata */
-var utils = require('./../odatajs.js').utils;
-var oDSxml = require('./../odatajs.js').xml;
+var utils = require('./../odatajs/utils.js');
+var oDSxml = require('./../odatajs/xml.js');
var odataHandler = require('./handler.js');
diff --git a/odatajs/src/lib/odata/net.js b/odatajs/src/lib/odata/net.js
index 5c7fa41..0dbbce0 100644
--- a/odatajs/src/lib/odata/net.js
+++ b/odatajs/src/lib/odata/net.js
@@ -21,7 +21,7 @@
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
// Imports.
var defined = utils.defined;
diff --git a/odatajs/src/lib/odata/utils.js b/odatajs/src/lib/odata/utils.js
index 0f84f2a..b728f14 100644
--- a/odatajs/src/lib/odata/utils.js
+++ b/odatajs/src/lib/odata/utils.js
@@ -18,7 +18,7 @@
*/
/** @module odata/utils */
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
// Imports
var assigned = utils.assigned;
diff --git a/odatajs/src/lib/odatajs.js b/odatajs/src/lib/odatajs.js
deleted file mode 100644
index fcd2dc7..0000000
--- a/odatajs/src/lib/odatajs.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/** @module datajs */
-
-//expose all external usable functions via self.apiFunc = function
-exports.version = {
- major: 1,
- minor: 1,
- build: 1
-};
-
-exports.deferred = require('./odatajs/deferred.js');
-exports.utils = require('./odatajs/utils.js');
-exports.xml = require('./odatajs/xml.js');
-
diff --git a/odatajs/src/lib/store/dom.js b/odatajs/src/lib/store/dom.js
index a56e5cc..ca9d27c 100644
--- a/odatajs/src/lib/store/dom.js
+++ b/odatajs/src/lib/store/dom.js
@@ -21,7 +21,7 @@
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
// Imports.
var throwErrorCallback = utils.throwErrorCallback;
diff --git a/odatajs/src/lib/store/indexeddb.js b/odatajs/src/lib/store/indexeddb.js
index 5e82eb2..5c17816 100644
--- a/odatajs/src/lib/store/indexeddb.js
+++ b/odatajs/src/lib/store/indexeddb.js
@@ -18,7 +18,7 @@
*/
/** @module store/indexeddb */
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
// Imports.
var throwErrorCallback = utils.throwErrorCallback;
diff --git a/odatajs/src/lib/store/memory.js b/odatajs/src/lib/store/memory.js
index 00280d0..08ddafe 100644
--- a/odatajs/src/lib/store/memory.js
+++ b/odatajs/src/lib/store/memory.js
@@ -20,7 +20,7 @@
/** @module store/memory */
-var utils = require('./../odatajs.js').utils;
+var utils = require('./../odatajs/utils.js');
// Imports.
var throwErrorCallback = utils.throwErrorCallback;
