OOZIE-2723 JSON.org license is now CatX (abhishekbafna via shwethags)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/586f5227 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/586f5227 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/586f5227 Branch: refs/heads/oya Commit: 586f522721804a84bb40ad4aa528530008c95e36 Parents: 86009e9 Author: Shwetha GS <[email protected]> Authored: Wed Nov 16 09:54:17 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Wed Nov 16 09:54:17 2016 +0530 ---------------------------------------------------------------------- NOTICE.txt | 3 - RELEASE_NOTES.txt | 4 + bin/create-release-artifact | 2 + core/pom.xml | 5 - .../apache/oozie/util/ELConstantsFunctions.java | 6 +- .../client/TestOozieClientWithFakeServlet.java | 4 +- docs/src/site/twiki/DG_QuickStart.twiki | 2 + pom.xml | 6 - release-log.txt | 1 + sharelib/hive/pom.xml | 4 + sharelib/hive2/pom.xml | 10 + sharelib/pig/pom.xml | 4 + src/main/assemblies/distro-jetty.xml | 7 +- src/main/assemblies/distro-tomcat.xml | 7 +- webapp/src/main/webapp/index.jsp | 1 - webapp/src/main/webapp/json2.js | 498 ------------------- 16 files changed, 40 insertions(+), 524 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index e2a937c..b70f114 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -9,9 +9,6 @@ Copyright 2011 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This product includes org.json (http://www.json.org/java/index.html), -Copyright (c) 2002 JSON.org - Detailed License information for all components can be found in the documentation in the ooziedocs.war at index.html##LicenseInfo http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/RELEASE_NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt new file mode 100644 index 0000000..6af49f6 --- /dev/null +++ b/RELEASE_NOTES.txt @@ -0,0 +1,4 @@ +These notes are for Oozie 4.3.0 release. + +Oozie no longer includes JSON.org dependencies. If Hive or Hive2 action in workflow needs JSON.org dependencies, then they need to be +added manually into respective sharelib. http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/bin/create-release-artifact ---------------------------------------------------------------------- diff --git a/bin/create-release-artifact b/bin/create-release-artifact index 1f1bcd2..cee5fa6 100755 --- a/bin/create-release-artifact +++ b/bin/create-release-artifact @@ -58,6 +58,8 @@ run tar czf oozie-${releaseVersion}.tar.gz oozie-$releaseVersion run cp oozie-$releaseVersion/release-log.txt . +run cp oozie-$releaseVersion/RELEASE_NOTES.txt . + run cd oozie-$releaseVersion run mvn apache-rat:check http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 163bb3b..1dd1045 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -117,11 +117,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java index 4524623..87db66e 100644 --- a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java +++ b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java @@ -20,7 +20,7 @@ package org.apache.oozie.util; import org.apache.hadoop.conf.Configuration; import org.jdom.Element; -import org.json.JSONObject; +import org.json.simple.JSONValue; import java.text.SimpleDateFormat; import java.util.Map; @@ -191,8 +191,8 @@ public class ELConstantsFunctions { } public static String toJsonStr(Map<String, String> map) { - JSONObject json = new JSONObject(map); - return XmlUtils.escapeCharsForXML(json.toString()); + String json = JSONValue.toJSONString(map); + return XmlUtils.escapeCharsForXML(json); } public static String toPropertiesStr(Map<String, String> map) { http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/core/src/test/java/org/apache/oozie/client/TestOozieClientWithFakeServlet.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/client/TestOozieClientWithFakeServlet.java b/core/src/test/java/org/apache/oozie/client/TestOozieClientWithFakeServlet.java index 179b205..054d949 100644 --- a/core/src/test/java/org/apache/oozie/client/TestOozieClientWithFakeServlet.java +++ b/core/src/test/java/org/apache/oozie/client/TestOozieClientWithFakeServlet.java @@ -34,7 +34,7 @@ import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.client.CoordinatorAction.Status; import org.apache.oozie.client.rest.BulkResponseImpl; import org.apache.oozie.client.rest.JsonTags; -import org.json.JSONArray; +import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.junit.Test; @@ -150,7 +150,7 @@ public class TestOozieClientWithFakeServlet { ByteArrayInputStream result = new ByteArrayInputStream("".getBytes()); if (check) { JSONArray array = new JSONArray(); - array.put(2L); + array.add(2L); String s = JSONValue.toJSONString(array); result = new ByteArrayInputStream(s.getBytes()); check = false; http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_QuickStart.twiki b/docs/src/site/twiki/DG_QuickStart.twiki index 6dec179..76c8c64 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -83,6 +83,8 @@ The Java 1.7+ =bin= directory should be in the command path. *NOTE:* The ExtJS library is not bundled with Oozie because it uses a different license. +*NOTE:* Oozie UI browser compatibility Chrome (all), Firefox (3.5), Internet Explorer (8.0), Opera (10.5). + *NOTE:* It is recommended to use a Oozie Unix user for the Oozie server. Expand the Oozie distribution =tar.gz=. http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index acedc6e..551a622 100644 --- a/pom.xml +++ b/pom.xml @@ -1409,12 +1409,6 @@ </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>${json.version}</version> - </dependency> - - <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <version>${hive.version}</version> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 9dd6adb..add46f9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -10,6 +10,7 @@ OOZIE-2634 Queue dump command message is confusing when the queue is empty (andr -- Oozie 4.3.0 release +OOZIE-2723 JSON.org license is now CatX (abhishekbafna via shwethags) OOZIE-2725 Upgrade Tomcat to 6.0.47 for the latest security fixes (rkanter via shwethags) OOZIE-2724 coord:current resolves monthly/yearly dependencies incorrectly (satishsaley via shwethags) OOZIE-2719 Test case failure (abhishekbafna via jaydeepvishwakarma) http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/sharelib/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml index c5e9f12..2b52a82 100644 --- a/sharelib/hive/pom.xml +++ b/sharelib/hive/pom.xml @@ -91,6 +91,10 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> </exclusion> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/sharelib/hive2/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive2/pom.xml b/sharelib/hive2/pom.xml index e81bfbe..4ef219a 100644 --- a/sharelib/hive2/pom.xml +++ b/sharelib/hive2/pom.xml @@ -91,10 +91,20 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> </exclusion> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${json.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/sharelib/pig/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/pig/pom.xml b/sharelib/pig/pom.xml index 67e5bf2..da246f9 100644 --- a/sharelib/pig/pom.xml +++ b/sharelib/pig/pom.xml @@ -138,6 +138,10 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> </exclusion> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/src/main/assemblies/distro-jetty.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distro-jetty.xml b/src/main/assemblies/distro-jetty.xml index a4bee03..ba23a50 100644 --- a/src/main/assemblies/distro-jetty.xml +++ b/src/main/assemblies/distro-jetty.xml @@ -37,10 +37,11 @@ <directory>${basedir}/../</directory> <outputDirectory>/</outputDirectory> <includes> - <include>license.txt</include> - <include>notice.txt</include> - <include>readme.txt</include> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + <include>README.txt</include> <include>release-log.txt</include> + <include>RELEASE_NOTES.txt</include> </includes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/src/main/assemblies/distro-tomcat.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distro-tomcat.xml b/src/main/assemblies/distro-tomcat.xml index d7018a3..ba4f56b 100644 --- a/src/main/assemblies/distro-tomcat.xml +++ b/src/main/assemblies/distro-tomcat.xml @@ -37,10 +37,11 @@ <directory>${basedir}/../</directory> <outputDirectory>/</outputDirectory> <includes> - <include>license.txt</include> - <include>notice.txt</include> - <include>readme.txt</include> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + <include>README.txt</include> <include>release-log.txt</include> + <include>RELEASE_NOTES.txt</include> </includes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/webapp/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index feedde9..61d32ae 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -35,7 +35,6 @@ <script type="text/javascript" src="ext-2.2/adapter/ext/ext-base.js"></script> <script type="text/javascript" src="ext-2.2/ext-all.js"></script> <script type="text/javascript" src="ext-2.2/examples/grid/RowExpander.js"></script> - <script type="text/javascript" src="json2.js"></script> <script type="text/javascript" src="oozie-console.js"></script> </head> http://git-wip-us.apache.org/repos/asf/oozie/blob/586f5227/webapp/src/main/webapp/json2.js ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/json2.js b/webapp/src/main/webapp/json2.js deleted file mode 100644 index 32b21db..0000000 --- a/webapp/src/main/webapp/json2.js +++ /dev/null @@ -1,498 +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. - */ -/* - http://www.JSON.org/json2.js - 2008-11-19 - - Public Domain. - - NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. - - See http://www.JSON.org/js.html - - This file creates a global JSON object containing two methods: stringify - and parse. - - JSON.stringify(value, replacer, space) - value any JavaScript value, usually an object or array. - - replacer an optional parameter that determines how object - values are stringified for objects. It can be a - function or an array of strings. - - space an optional parameter that specifies the indentation - of nested structures. If it is omitted, the text will - be packed without extra whitespace. If it is a number, - it will specify the number of spaces to indent at each - level. If it is a string (such as '\t' or ' '), - it contains the characters used to indent at each level. - - This method produces a JSON text from a JavaScript value. - - When an object value is found, if the object contains a toJSON - method, its toJSON method will be called and the result will be - stringified. A toJSON method does not serialize: it returns the - value represented by the name/value pair that should be serialized, - or undefined if nothing should be serialized. The toJSON method - will be passed the key associated with the value, and this will be - bound to the object holding the key. - - For example, this would serialize Dates as ISO strings. - - Date.prototype.toJSON = function (key) { - function f(n) { - // Format integers to have at least two digits. - return n < 10 ? '0' + n : n; - } - - return this.getUTCFullYear() + '-' + - f(this.getUTCMonth() + 1) + '-' + - f(this.getUTCDate()) + 'T' + - f(this.getUTCHours()) + ':' + - f(this.getUTCMinutes()) + ':' + - f(this.getUTCSeconds()) + 'Z'; - }; - - You can provide an optional replacer method. It will be passed the - key and value of each member, with this bound to the containing - object. The value that is returned from your method will be - serialized. If your method returns undefined, then the member will - be excluded from the serialization. - - If the replacer parameter is an array of strings, then it will be - used to select the members to be serialized. It filters the results - such that only members with keys listed in the replacer array are - stringified. - - Values that do not have JSON representations, such as undefined or - functions, will not be serialized. Such values in objects will be - dropped; in arrays they will be replaced with null. You can use - a replacer function to replace those with JSON values. - JSON.stringify(undefined) returns undefined. - - The optional space parameter produces a stringification of the - value that is filled with line breaks and indentation to make it - easier to read. - - If the space parameter is a non-empty string, then that string will - be used for indentation. If the space parameter is a number, then - the indentation will be that many spaces. - - Example: - - text = JSON.stringify(['e', {pluribus: 'unum'}]); - // text is '["e",{"pluribus":"unum"}]' - - - text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t'); - // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' - - text = JSON.stringify([new Date()], function (key, value) { - return this[key] instanceof Date ? - 'Date(' + this[key] + ')' : value; - }); - // text is '["Date(---current time---)"]' - - - JSON.parse(text, reviver) - This method parses a JSON text to produce an object or array. - It can throw a SyntaxError exception. - - The optional reviver parameter is a function that can filter and - transform the results. It receives each of the keys and values, - and its return value is used instead of the original value. - If it returns what it received, then the structure is not modified. - If it returns undefined then the member is deleted. - - Example: - - // Parse the text. Values that look like ISO date strings will - // be converted to Date objects. - - myData = JSON.parse(text, function (key, value) { - var a; - if (typeof value === 'string') { - a = - /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); - if (a) { - return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], - +a[5], +a[6])); - } - } - return value; - }); - - myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) { - var d; - if (typeof value === 'string' && - value.slice(0, 5) === 'Date(' && - value.slice(-1) === ')') { - d = new Date(value.slice(5, -1)); - if (d) { - return d; - } - } - return value; - }); - - - This is a reference implementation. You are free to copy, modify, or - redistribute. - - This code should be minified before deployment. - See http://javascript.crockford.com/jsmin.html - - USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO - NOT CONTROL. - */ - -/*jslint evil: true */ - -/*global JSON */ - -/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply, - call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, - getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, - lastIndex, length, parse, prototype, push, replace, slice, stringify, - test, toJSON, toString, valueOf - */ - -// Create a JSON object only if one does not already exist. We create the -// methods in a closure to avoid creating global variables. - -if (!this.JSON) { - JSON = {}; -} -(function () { - - function f(n) { - // Format integers to have at least two digits. - return n < 10 ? '0' + n : n; - } - - if (typeof Date.prototype.toJSON !== 'function') { - - Date.prototype.toJSON = function (key) { - - return this.getUTCFullYear() + '-' + - f(this.getUTCMonth() + 1) + '-' + - f(this.getUTCDate()) + 'T' + - f(this.getUTCHours()) + ':' + - f(this.getUTCMinutes()) + ':' + - f(this.getUTCSeconds()) + 'Z'; - }; - - String.prototype.toJSON = - Number.prototype.toJSON = - Boolean.prototype.toJSON = function (key) { - return this.valueOf(); - }; - } - - var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, - escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, - gap, - indent, - meta = { // table of character substitutions - '\b': '\\b', - '\t': '\\t', - '\n': '\\n', - '\f': '\\f', - '\r': '\\r', - '"' : '\\"', - '\\': '\\\\' - }, - rep; - - - function quote(string) { - - // If the string contains no control characters, no quote characters, and no - // backslash characters, then we can safely slap some quotes around it. - // Otherwise we must also replace the offending characters with safe escape - // sequences. - - escapable.lastIndex = 0; - return escapable.test(string) ? - '"' + string.replace(escapable, function (a) { - var c = meta[a]; - return typeof c === 'string' ? c : - '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); - }) + '"' : - '"' + string + '"'; - } - - - function str(key, holder) { - - // Produce a string from holder[key]. - - var i, // The loop counter. - k, // The member key. - v, // The member value. - length, - mind = gap, - partial, - value = holder[key]; - - // If the value has a toJSON method, call it to obtain a replacement value. - - if (value && typeof value === 'object' && - typeof value.toJSON === 'function') { - value = value.toJSON(key); - } - - // If we were called with a replacer function, then call the replacer to - // obtain a replacement value. - - if (typeof rep === 'function') { - value = rep.call(holder, key, value); - } - - // What happens next depends on the value's type. - - switch (typeof value) { - case 'string': - return quote(value); - - case 'number': - - // JSON numbers must be finite. Encode non-finite numbers as null. - - return isFinite(value) ? String(value) : 'null'; - - case 'boolean': - case 'null': - - // If the value is a boolean or null, convert it to a string. Note: - // typeof null does not produce 'null'. The case is included here in - // the remote chance that this gets fixed someday. - - return String(value); - - // If the type is 'object', we might be dealing with an object or an array or - // null. - - case 'object': - - // Due to a specification blunder in ECMAScript, typeof null is 'object', - // so watch out for that case. - - if (!value) { - return 'null'; - } - - // Make an array to hold the partial results of stringifying this object value. - - gap += indent; - partial = []; - - // Is the value an array? - - if (Object.prototype.toString.apply(value) === '[object Array]') { - - // The value is an array. Stringify every element. Use null as a placeholder - // for non-JSON values. - - length = value.length; - for (i = 0; i < length; i += 1) { - partial[i] = str(i, value) || 'null'; - } - - // Join all of the elements together, separated with commas, and wrap them in - // brackets. - - v = partial.length === 0 ? '[]' : - gap ? '[\n' + gap + - partial.join(',\n' + gap) + '\n' + - mind + ']' : - '[' + partial.join(',') + ']'; - gap = mind; - return v; - } - - // If the replacer is an array, use it to select the members to be stringified. - - if (rep && typeof rep === 'object') { - length = rep.length; - for (i = 0; i < length; i += 1) { - k = rep[i]; - if (typeof k === 'string') { - v = str(k, value); - if (v) { - partial.push(quote(k) + (gap ? ': ' : ':') + v); - } - } - } - } - else { - - // Otherwise, iterate through all of the keys in the object. - - for (k in value) { - if (Object.hasOwnProperty.call(value, k)) { - v = str(k, value); - if (v) { - partial.push(quote(k) + (gap ? ': ' : ':') + v); - } - } - } - } - - // Join all of the member texts together, separated with commas, - // and wrap them in braces. - - v = partial.length === 0 ? '{}' : - gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + - mind + '}' : '{' + partial.join(',') + '}'; - gap = mind; - return v; - } - } - - // If the JSON object does not yet have a stringify method, give it one. - - if (typeof JSON.stringify !== 'function') { - JSON.stringify = function (value, replacer, space) { - - // The stringify method takes a value and an optional replacer, and an optional - // space parameter, and returns a JSON text. The replacer can be a function - // that can replace values, or an array of strings that will select the keys. - // A default replacer method can be provided. Use of the space parameter can - // produce text that is more easily readable. - - var i; - gap = ''; - indent = ''; - - // If the space parameter is a number, make an indent string containing that - // many spaces. - - if (typeof space === 'number') { - for (i = 0; i < space; i += 1) { - indent += ' '; - } - - // If the space parameter is a string, it will be used as the indent string. - - } - else if (typeof space === 'string') { - indent = space; - } - - // If there is a replacer, it must be a function or an array. - // Otherwise, throw an error. - - rep = replacer; - if (replacer && typeof replacer !== 'function' && - (typeof replacer !== 'object' || - typeof replacer.length !== 'number')) { - throw new Error('JSON.stringify'); - } - - // Make a fake root object containing our value under the key of ''. - // Return the result of stringifying the value. - - return str('', {'': value}); - }; - } - - - // If the JSON object does not yet have a parse method, give it one. - - if (typeof JSON.parse !== 'function') { - JSON.parse = function (text, reviver) { - - // The parse method takes a text and an optional reviver function, and returns - // a JavaScript value if the text is a valid JSON text. - - var j; - - function walk(holder, key) { - - // The walk method is used to recursively walk the resulting structure so - // that modifications can be made. - - var k, v, value = holder[key]; - if (value && typeof value === 'object') { - for (k in value) { - if (Object.hasOwnProperty.call(value, k)) { - v = walk(value, k); - if (v !== undefined) { - value[k] = v; - } - else { - delete value[k]; - } - } - } - } - return reviver.call(holder, key, value); - } - - - // Parsing happens in four stages. In the first stage, we replace certain - // Unicode characters with escape sequences. JavaScript handles many characters - // incorrectly, either silently deleting them, or treating them as line endings. - - cx.lastIndex = 0; - if (cx.test(text)) { - text = text.replace(cx, function (a) { - return '\\u' + - ('0000' + a.charCodeAt(0).toString(16)).slice(-4); - }); - } - - // In the second stage, we run the text against regular expressions that look - // for non-JSON patterns. We are especially concerned with '()' and 'new' - // because they can cause invocation, and '=' because it can cause mutation. - // But just to be safe, we want to reject all unexpected forms. - - // We split the second stage into 4 regexp operations in order to work around - // crippling inefficiencies in IE's and Safari's regexp engines. First we - // replace the JSON backslash pairs with '@' (a non-JSON character). Second, we - // replace all simple value tokens with ']' characters. Third, we delete all - // open brackets that follow a colon or comma or that begin the text. Finally, - // we look to see that the remaining characters are only whitespace or ']' or - // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval. - - if (/^[\],:{}\s]*$/. - test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@'). - replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']'). - replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) { - - // In the third stage we use the eval function to compile the text into a - // JavaScript structure. The '{' operator is subject to a syntactic ambiguity - // in JavaScript: it can begin a block or an object literal. We wrap the text - // in parens to eliminate the ambiguity. - - j = eval('(' + text + ')'); - - // In the optional fourth stage, we recursively walk the new structure, passing - // each name/value pair to a reviver function for possible transformation. - - return typeof reviver === 'function' ? - walk({'': j}, '') : j; - } - - // If the text is not JSON parseable, then a SyntaxError is thrown. - - throw new SyntaxError('JSON.parse'); - }; - } -})();
