[OLINGO-416] - add NOTICE file
diff --git a/odatajs/Gruntfile.js b/odatajs/Gruntfile.js
index 131ec43..031a4b0 100644
--- a/odatajs/Gruntfile.js
+++ b/odatajs/Gruntfile.js
@@ -124,10 +124,10 @@
},
},
'jsdoc' : { // generate documentation
- src : {
+ 'src' : {
src: ['src/**/*.js'],
options: {
- destination: 'build/doc',
+ destination: 'build/doc-src',
verbose : false
}
},
@@ -156,28 +156,6 @@
}
},
},
- compress: { // build the zip files for the release
- /*
- build: { // just the lib
- options: {archive: 'dist/<%= filename %>-lib.zip'},
- files: [{expand: true, cwd: 'build/', src: '*', filter: 'isFile', dest: '<%= filename %>-lib/'}]
- },*/
- doc: { // just the documentation
- options: {archive: 'dist/<%= filename %>-doc.zip'},
- files: [{expand: true, cwd: 'build/doc/', src: ['**'], dest: '<%= filename %>-doc/'}]
- },
- src: { // just the source
- options: {archive: 'dist/<%= filename %>-source.zip'},
- files: [{expand: true, cwd: 'src/', src: ['**'], dest: '<%= filename %>-src/'}]
- },
- sources : { // the full repository with out the git stuff
- options: {archive: 'dist/<%= filename %>-source.zip'},
- files: [
- {expand: true, cwd: 'demo/', src: ['**'], dest: '<%= filename %>-src/'},
- {expand: true, cwd: 'src/', src: ['**'], dest: '<%= filename %>-src/'}
- ]
- }
- },
curl: {
'license': {
src: {
@@ -198,13 +176,6 @@
/*** Init ***/
grunt.initConfig(init);
- grunt.config.merge({compress: { // build the zip files for the release
- build: { // just the lib
- options: {archive: 'dist/<%= filename %>-lib.zip'},
- files: [{expand: true, cwd: 'build/', src: '*', filter: 'isFile', dest: '<%= filename %>-lib/'}]
- }}});
-
-
/*** Load tasks from npm modules ***/
grunt.loadNpmTasks('grunt-browserify');
diff --git a/odatajs/NOTICE b/odatajs/NOTICE
new file mode 100644
index 0000000..65d59ef
--- /dev/null
+++ b/odatajs/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Olingo
+Copyright 2013-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/odatajs/grunt-config/release.js b/odatajs/grunt-config/release.js
index c9e80d9..3c9a477 100644
--- a/odatajs/grunt-config/release.js
+++ b/odatajs/grunt-config/release.js
@@ -12,19 +12,46 @@
return hay.indexOf(needle) > -1;
}
+ // clean
+ grunt.config.merge( {
+ 'clean': {
+ 'release-dist': {
+ options: { force: true },
+ src: [ "./../dist/<%= filename %>*"]
+ }
+ }
+ });
+
+ grunt.loadNpmTasks("grunt-contrib-clean");
+
+ // doc
+ grunt.config.merge( {
+ 'jsdoc' : { // generate documentation
+ "release-doc-src" : {
+ src: ['src/**/*.js'],
+ options: {
+ destination: './../dist/<%= filename %>/doc',
+ verbose : false
+ }
+ },
+ },
+ });
+
// copy
grunt.config.merge( {
'copy' : {
'release-lib' : {
files: [
{ expand: true, cwd: 'build', src: ['<%= filename %>*.*'], dest: './../dist/<%= filename %>/lib/lib', filter: 'isFile'},
- { expand: true, src :'LICENSE',dest: './../dist/<%= filename %>/lib', filter: 'isFile' }
+ { expand: true, src :'LICENSE',dest: './../dist/<%= filename %>/lib', filter: 'isFile' },
+ { expand: true, src :'NOTICE',dest: './../dist/<%= filename %>/lib', filter: 'isFile' }
]
},
'release-doc' : {
files: [
- { expand: true, cwd: 'build/doc', src: ['**'], dest: './../dist/<%= filename %>/doc/doc', filter: 'isFile'},
- { expand: true, src :'LICENSE',dest: './../dist/<%= filename %>/doc', filter: 'isFile' }
+ { expand: true, cwd: 'build/doc-src', src: ['**'], dest: './../dist/<%= filename %>/doc/doc', filter: 'isFile'},
+ { expand: true, src :'LICENSE',dest: './../dist/<%= filename %>/doc', filter: 'isFile' },
+ { expand: true, src :'NOTICE',dest: './../dist/<%= filename %>/doc', filter: 'isFile' }
]
},
'release-sources' : {
@@ -61,17 +88,7 @@
grunt.loadNpmTasks("grunt-contrib-copy");
- // clean
- grunt.config.merge( {
- 'clean': {
- 'release-dist': {
- options: { force: true },
- src: [ "./../dist/<%= filename %>"]
- }
- }
- });
- grunt.loadNpmTasks("grunt-contrib-clean");
// zip
grunt.config.merge( {
@@ -94,14 +111,14 @@
});
-
grunt.loadNpmTasks('grunt-contrib-compress');
//tasks
grunt.registerTask('dist',[
- 'build',
- 'doc',
'clean:release-dist',
+
+ 'build',
+ 'jsdoc:src',
'copy:release-lib','copy:release-doc','copy:release-sources',
'compress:release-lib','compress:release-doc','compress:release-sources']);
};
diff --git a/odatajs/src/lib/odata/utils.js b/odatajs/src/lib/odata/utils.js
index 643de78..0f84f2a 100644
--- a/odatajs/src/lib/odata/utils.js
+++ b/odatajs/src/lib/odata/utils.js
@@ -43,21 +43,23 @@
};
var EDM = "Edm.";
-var EDM_BINARY = EDM + "Binary";
var EDM_BOOLEAN = EDM + "Boolean";
var EDM_BYTE = EDM + "Byte";
-var EDM_DATETIME = EDM + "DateTime";
-var EDM_DATETIMEOFFSET = EDM + "DateTimeOffset";
-var EDM_DECIMAL = EDM + "Decimal";
-var EDM_DOUBLE = EDM + "Double";
-var EDM_GUID = EDM + "Guid";
+var EDM_SBYTE = EDM + "SByte";
var EDM_INT16 = EDM + "Int16";
var EDM_INT32 = EDM + "Int32";
var EDM_INT64 = EDM + "Int64";
-var EDM_SBYTE = EDM + "SByte";
var EDM_SINGLE = EDM + "Single";
+var EDM_DOUBLE = EDM + "Double";
+var EDM_DECIMAL = EDM + "Decimal";
var EDM_STRING = EDM + "String";
-var EDM_TIME = EDM + "Time";
+
+var EDM_BINARY = EDM + "Binary";
+var EDM_DATE = EDM + "Date";
+var EDM_DATETIMEOFFSET = EDM + "DateTimeOffset";
+var EDM_DURATION = EDM + "Duration";
+var EDM_GUID = EDM + "Guid";
+var EDM_TIMEOFDAY = EDM + "Time";
var GEOGRAPHY = "Geography";
var EDM_GEOGRAPHY = EDM + GEOGRAPHY;
@@ -110,9 +112,10 @@
EDM_BOOLEAN,
EDM_DOUBLE,
EDM_SINGLE,
- EDM_DATETIME,
+ EDM_DATE,
EDM_DATETIMEOFFSET,
- EDM_TIME,
+ EDM_DURATION,
+ EDM_TIMEOFDAY,
EDM_DECIMAL,
EDM_GUID,
EDM_BYTE,
@@ -1174,8 +1177,9 @@
exports.EDM_BINARY = EDM_BINARY;
exports.EDM_BOOLEAN = EDM_BOOLEAN;
exports.EDM_BYTE = EDM_BYTE;
-exports.EDM_DATETIME = EDM_DATETIME;
+exports.EDM_DATE = EDM_DATE;
exports.EDM_DATETIMEOFFSET = EDM_DATETIMEOFFSET;
+exports.EDM_DURATION = EDM_DURATION;
exports.EDM_DECIMAL = EDM_DECIMAL;
exports.EDM_DOUBLE = EDM_DOUBLE;
exports.EDM_GEOGRAPHY = EDM_GEOGRAPHY;
@@ -1201,7 +1205,7 @@
exports.EDM_SBYTE = EDM_SBYTE;
exports.EDM_SINGLE = EDM_SINGLE;
exports.EDM_STRING = EDM_STRING;
-exports.EDM_TIME = EDM_TIME;
+exports.EDM_TIMEOFDAY = EDM_TIMEOFDAY;
exports.GEOJSON_POINT = GEOJSON_POINT;
exports.GEOJSON_LINESTRING = GEOJSON_LINESTRING;
exports.GEOJSON_POLYGON = GEOJSON_POLYGON;
