From 40691af33a6ac82d9c9d6ca0295863c8d01433a7 Mon Sep 17 00:00:00 2001 From: Roberto Andrade Date: Thu, 3 Apr 2014 14:18:21 -0400 Subject: [PATCH 1/5] Mavenizing project and moving it to custom package name to avoid conflicts in environments that already have org.json in class path --- .classpath | 15 +++++ .project | 23 ++++++++ .settings/org.eclipse.jdt.core.prefs | 5 ++ .settings/org.eclipse.m2e.core.prefs | 4 ++ pom.xml | 55 +++++++++++++++++++ .../java/com/cloud/internal/json/CDL.java | 3 +- .../java/com/cloud/internal/json/Cookie.java | 3 +- .../com/cloud/internal/json/CookieList.java | 3 +- .../java/com/cloud/internal/json/HTTP.java | 3 +- .../com/cloud/internal/json/HTTPTokener.java | 3 +- .../com/cloud/internal/json/JSONArray.java | 3 +- .../cloud/internal/json/JSONException.java | 3 +- .../java/com/cloud/internal/json/JSONML.java | 3 +- .../com/cloud/internal/json/JSONObject.java | 3 +- .../com/cloud/internal/json/JSONString.java | 3 +- .../com/cloud/internal/json/JSONStringer.java | 3 +- .../com/cloud/internal/json/JSONTokener.java | 3 +- .../com/cloud/internal/json/JSONWriter.java | 3 +- .../java/com/cloud/internal/json/Kim.java | 3 +- .../com/cloud/internal/json/Property.java | 3 +- .../java/com/cloud/internal/json/XML.java | 3 +- .../com/cloud/internal/json/XMLTokener.java | 3 +- .../internal/json/zip}/BitInputStream.java | 2 +- .../internal/json/zip}/BitOutputStream.java | 2 +- .../cloud/internal/json/zip}/BitReader.java | 2 +- .../cloud/internal/json/zip}/BitWriter.java | 2 +- .../cloud/internal/json/zip}/Compressor.java | 10 ++-- .../internal/json/zip}/Decompressor.java | 10 ++-- .../com/cloud/internal/json/zip}/Huff.java | 4 +- .../com/cloud/internal/json/zip}/JSONzip.java | 2 +- .../com/cloud/internal/json/zip}/Keep.java | 2 +- .../com/cloud/internal/json/zip}/MapKeep.java | 4 +- .../com/cloud/internal/json/zip}/None.java | 2 +- .../cloud/internal/json/zip}/PostMortem.java | 2 +- .../java/com/cloud/internal/json/zip}/README | 0 .../cloud/internal/json/zip}/TrieKeep.java | 4 +- 36 files changed, 160 insertions(+), 41 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 pom.xml rename CDL.java => src/main/java/com/cloud/internal/json/CDL.java (99%) rename Cookie.java => src/main/java/com/cloud/internal/json/Cookie.java (96%) rename CookieList.java => src/main/java/com/cloud/internal/json/CookieList.java (96%) rename HTTP.java => src/main/java/com/cloud/internal/json/HTTP.java (96%) rename HTTPTokener.java => src/main/java/com/cloud/internal/json/HTTPTokener.java (98%) rename JSONArray.java => src/main/java/com/cloud/internal/json/JSONArray.java (99%) rename JSONException.java => src/main/java/com/cloud/internal/json/JSONException.java (96%) rename JSONML.java => src/main/java/com/cloud/internal/json/JSONML.java (99%) rename JSONObject.java => src/main/java/com/cloud/internal/json/JSONObject.java (99%) rename JSONString.java => src/main/java/com/cloud/internal/json/JSONString.java (95%) rename JSONStringer.java => src/main/java/com/cloud/internal/json/JSONStringer.java (96%) rename JSONTokener.java => src/main/java/com/cloud/internal/json/JSONTokener.java (99%) rename JSONWriter.java => src/main/java/com/cloud/internal/json/JSONWriter.java (96%) rename Kim.java => src/main/java/com/cloud/internal/json/Kim.java (99%) rename Property.java => src/main/java/com/cloud/internal/json/Property.java (98%) rename XML.java => src/main/java/com/cloud/internal/json/XML.java (99%) rename XMLTokener.java => src/main/java/com/cloud/internal/json/XMLTokener.java (99%) rename {zip => src/main/java/com/cloud/internal/json/zip}/BitInputStream.java (99%) rename {zip => src/main/java/com/cloud/internal/json/zip}/BitOutputStream.java (99%) rename {zip => src/main/java/com/cloud/internal/json/zip}/BitReader.java (96%) rename {zip => src/main/java/com/cloud/internal/json/zip}/BitWriter.java (97%) rename {zip => src/main/java/com/cloud/internal/json/zip}/Compressor.java (98%) rename {zip => src/main/java/com/cloud/internal/json/zip}/Decompressor.java (97%) rename {zip => src/main/java/com/cloud/internal/json/zip}/Huff.java (99%) rename {zip => src/main/java/com/cloud/internal/json/zip}/JSONzip.java (99%) rename {zip => src/main/java/com/cloud/internal/json/zip}/Keep.java (98%) rename {zip => src/main/java/com/cloud/internal/json/zip}/MapKeep.java (98%) rename {zip => src/main/java/com/cloud/internal/json/zip}/None.java (91%) rename {zip => src/main/java/com/cloud/internal/json/zip}/PostMortem.java (98%) rename {zip => src/main/java/com/cloud/internal/json/zip}/README (100%) rename {zip => src/main/java/com/cloud/internal/json/zip}/TrieKeep.java (99%) diff --git a/.classpath b/.classpath new file mode 100644 index 000000000..3686ca44d --- /dev/null +++ b/.classpath @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 000000000..e71b13e10 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + json-java + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..abec6ca38 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..7f879dfe4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + org.json + json + 0.0.1-SNAPSHOT + + JSON (JavaScript Object Notation) + + JSON (JavaScript Object Notation) is a lightweight data-interchange format. + It is easy for humans to read and write. It is easy for machines to parse and generate. + It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition + - December 1999. JSON is a text format that is completely language independent but uses + conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, + Java, JavaScript, Perl, Python, and many others. + These properties make JSON an ideal data-interchange language. + + http://www.json.org/java/index.html + + + provided without support or warranty + http://www.json.org/license.html + repo + + + + + JSON + http://json.org/ + + + + + cloud.archiva.internal + http://archiva.cliff.cloudburrito.com:8080/archiva/repository/internal/ + + + cloud.archiva.snapshots + http://archiva.cliff.cloudburrito.com:8080/archiva/repository/snapshots/ + + + + + + + maven-compiler-plugin + 3.1 + + 1.3 + 1.3 + + + + + + \ No newline at end of file diff --git a/CDL.java b/src/main/java/com/cloud/internal/json/CDL.java similarity index 99% rename from CDL.java rename to src/main/java/com/cloud/internal/json/CDL.java index 0fc3cf828..bce1a87c1 100755 --- a/CDL.java +++ b/src/main/java/com/cloud/internal/json/CDL.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/Cookie.java b/src/main/java/com/cloud/internal/json/Cookie.java similarity index 96% rename from Cookie.java rename to src/main/java/com/cloud/internal/json/Cookie.java index 9cf5ce2c5..d5a185a5b 100755 --- a/Cookie.java +++ b/src/main/java/com/cloud/internal/json/Cookie.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/CookieList.java b/src/main/java/com/cloud/internal/json/CookieList.java similarity index 96% rename from CookieList.java rename to src/main/java/com/cloud/internal/json/CookieList.java index 7f4fe0751..fc1ea2c20 100755 --- a/CookieList.java +++ b/src/main/java/com/cloud/internal/json/CookieList.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/HTTP.java b/src/main/java/com/cloud/internal/json/HTTP.java similarity index 96% rename from HTTP.java rename to src/main/java/com/cloud/internal/json/HTTP.java index 43d04a804..629b88e6c 100755 --- a/HTTP.java +++ b/src/main/java/com/cloud/internal/json/HTTP.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/HTTPTokener.java b/src/main/java/com/cloud/internal/json/HTTPTokener.java similarity index 98% rename from HTTPTokener.java rename to src/main/java/com/cloud/internal/json/HTTPTokener.java index ed41744a0..8276058cd 100755 --- a/HTTPTokener.java +++ b/src/main/java/com/cloud/internal/json/HTTPTokener.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/JSONArray.java b/src/main/java/com/cloud/internal/json/JSONArray.java similarity index 99% rename from JSONArray.java rename to src/main/java/com/cloud/internal/json/JSONArray.java index 673a91927..9c1430af7 100644 --- a/JSONArray.java +++ b/src/main/java/com/cloud/internal/json/JSONArray.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/JSONException.java b/src/main/java/com/cloud/internal/json/JSONException.java similarity index 96% rename from JSONException.java rename to src/main/java/com/cloud/internal/json/JSONException.java index 971547e63..62e159e30 100755 --- a/JSONException.java +++ b/src/main/java/com/cloud/internal/json/JSONException.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /** * The JSONException is thrown by the JSON.org classes when things are amiss. diff --git a/JSONML.java b/src/main/java/com/cloud/internal/json/JSONML.java similarity index 99% rename from JSONML.java rename to src/main/java/com/cloud/internal/json/JSONML.java index 4be686351..d1f976e30 100755 --- a/JSONML.java +++ b/src/main/java/com/cloud/internal/json/JSONML.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2008 JSON.org diff --git a/JSONObject.java b/src/main/java/com/cloud/internal/json/JSONObject.java similarity index 99% rename from JSONObject.java rename to src/main/java/com/cloud/internal/json/JSONObject.java index 5ca5a45bc..79f9ab47e 100755 --- a/JSONObject.java +++ b/src/main/java/com/cloud/internal/json/JSONObject.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/JSONString.java b/src/main/java/com/cloud/internal/json/JSONString.java similarity index 95% rename from JSONString.java rename to src/main/java/com/cloud/internal/json/JSONString.java index 1f2d77dd1..d37ee13cf 100755 --- a/JSONString.java +++ b/src/main/java/com/cloud/internal/json/JSONString.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /** * The JSONString interface allows a toJSONString() * method so that a class can change the behavior of diff --git a/JSONStringer.java b/src/main/java/com/cloud/internal/json/JSONStringer.java similarity index 96% rename from JSONStringer.java rename to src/main/java/com/cloud/internal/json/JSONStringer.java index 25c2e5d78..889756a37 100755 --- a/JSONStringer.java +++ b/src/main/java/com/cloud/internal/json/JSONStringer.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2006 JSON.org diff --git a/JSONTokener.java b/src/main/java/com/cloud/internal/json/JSONTokener.java similarity index 99% rename from JSONTokener.java rename to src/main/java/com/cloud/internal/json/JSONTokener.java index 13c84f1f5..c9ae3bf17 100644 --- a/JSONTokener.java +++ b/src/main/java/com/cloud/internal/json/JSONTokener.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + import java.io.BufferedReader; import java.io.IOException; diff --git a/JSONWriter.java b/src/main/java/com/cloud/internal/json/JSONWriter.java similarity index 96% rename from JSONWriter.java rename to src/main/java/com/cloud/internal/json/JSONWriter.java index 855b2bdb1..e4a1c27fc 100755 --- a/JSONWriter.java +++ b/src/main/java/com/cloud/internal/json/JSONWriter.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + import java.io.IOException; import java.io.Writer; diff --git a/Kim.java b/src/main/java/com/cloud/internal/json/Kim.java similarity index 99% rename from Kim.java rename to src/main/java/com/cloud/internal/json/Kim.java index d4770b566..fcec53797 100644 --- a/Kim.java +++ b/src/main/java/com/cloud/internal/json/Kim.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* diff --git a/Property.java b/src/main/java/com/cloud/internal/json/Property.java similarity index 98% rename from Property.java rename to src/main/java/com/cloud/internal/json/Property.java index dbbd7ef7e..08a6020d7 100644 --- a/Property.java +++ b/src/main/java/com/cloud/internal/json/Property.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/XML.java b/src/main/java/com/cloud/internal/json/XML.java similarity index 99% rename from XML.java rename to src/main/java/com/cloud/internal/json/XML.java index cea3abe7b..84472b57b 100755 --- a/XML.java +++ b/src/main/java/com/cloud/internal/json/XML.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/XMLTokener.java b/src/main/java/com/cloud/internal/json/XMLTokener.java similarity index 99% rename from XMLTokener.java rename to src/main/java/com/cloud/internal/json/XMLTokener.java index be15ebeba..bd68c4460 100755 --- a/XMLTokener.java +++ b/src/main/java/com/cloud/internal/json/XMLTokener.java @@ -1,4 +1,5 @@ -package org.json; +package com.cloud.internal.json; + /* Copyright (c) 2002 JSON.org diff --git a/zip/BitInputStream.java b/src/main/java/com/cloud/internal/json/zip/BitInputStream.java similarity index 99% rename from zip/BitInputStream.java rename to src/main/java/com/cloud/internal/json/zip/BitInputStream.java index 7864ce150..ece112513 100644 --- a/zip/BitInputStream.java +++ b/src/main/java/com/cloud/internal/json/zip/BitInputStream.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.io.IOException; import java.io.InputStream; diff --git a/zip/BitOutputStream.java b/src/main/java/com/cloud/internal/json/zip/BitOutputStream.java similarity index 99% rename from zip/BitOutputStream.java rename to src/main/java/com/cloud/internal/json/zip/BitOutputStream.java index 526ad6111..9bb09bfe1 100644 --- a/zip/BitOutputStream.java +++ b/src/main/java/com/cloud/internal/json/zip/BitOutputStream.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.io.IOException; import java.io.OutputStream; diff --git a/zip/BitReader.java b/src/main/java/com/cloud/internal/json/zip/BitReader.java similarity index 96% rename from zip/BitReader.java rename to src/main/java/com/cloud/internal/json/zip/BitReader.java index 1987729b8..77354e638 100644 --- a/zip/BitReader.java +++ b/src/main/java/com/cloud/internal/json/zip/BitReader.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.io.IOException; diff --git a/zip/BitWriter.java b/src/main/java/com/cloud/internal/json/zip/BitWriter.java similarity index 97% rename from zip/BitWriter.java rename to src/main/java/com/cloud/internal/json/zip/BitWriter.java index 83eb7e314..fb4e6615b 100644 --- a/zip/BitWriter.java +++ b/src/main/java/com/cloud/internal/json/zip/BitWriter.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.io.IOException; diff --git a/zip/Compressor.java b/src/main/java/com/cloud/internal/json/zip/Compressor.java similarity index 98% rename from zip/Compressor.java rename to src/main/java/com/cloud/internal/json/zip/Compressor.java index 6dddff420..72c54fb48 100644 --- a/zip/Compressor.java +++ b/src/main/java/com/cloud/internal/json/zip/Compressor.java @@ -1,14 +1,14 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.io.IOException; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.Kim; +import com.cloud.internal.json.JSONArray; +import com.cloud.internal.json.JSONException; +import com.cloud.internal.json.JSONObject; +import com.cloud.internal.json.Kim; /* Copyright (c) 2013 JSON.org diff --git a/zip/Decompressor.java b/src/main/java/com/cloud/internal/json/zip/Decompressor.java similarity index 97% rename from zip/Decompressor.java rename to src/main/java/com/cloud/internal/json/zip/Decompressor.java index 108a2e2c1..1d9c60268 100644 --- a/zip/Decompressor.java +++ b/src/main/java/com/cloud/internal/json/zip/Decompressor.java @@ -1,11 +1,11 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.io.UnsupportedEncodingException; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.Kim; +import com.cloud.internal.json.JSONArray; +import com.cloud.internal.json.JSONException; +import com.cloud.internal.json.JSONObject; +import com.cloud.internal.json.Kim; /* Copyright (c) 2012 JSON.org diff --git a/zip/Huff.java b/src/main/java/com/cloud/internal/json/zip/Huff.java similarity index 99% rename from zip/Huff.java rename to src/main/java/com/cloud/internal/json/zip/Huff.java index 2e1d1c925..3f5084339 100644 --- a/zip/Huff.java +++ b/src/main/java/com/cloud/internal/json/zip/Huff.java @@ -1,6 +1,6 @@ -package org.json.zip; +package com.cloud.internal.json.zip; -import org.json.JSONException; +import com.cloud.internal.json.JSONException; /* Copyright (c) 2013 JSON.org diff --git a/zip/JSONzip.java b/src/main/java/com/cloud/internal/json/zip/JSONzip.java similarity index 99% rename from zip/JSONzip.java rename to src/main/java/com/cloud/internal/json/zip/JSONzip.java index 2128742c2..82783e34b 100644 --- a/zip/JSONzip.java +++ b/src/main/java/com/cloud/internal/json/zip/JSONzip.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; /* diff --git a/zip/Keep.java b/src/main/java/com/cloud/internal/json/zip/Keep.java similarity index 98% rename from zip/Keep.java rename to src/main/java/com/cloud/internal/json/zip/Keep.java index 377e344e2..7181bff2c 100644 --- a/zip/Keep.java +++ b/src/main/java/com/cloud/internal/json/zip/Keep.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; /* diff --git a/zip/MapKeep.java b/src/main/java/com/cloud/internal/json/zip/MapKeep.java similarity index 98% rename from zip/MapKeep.java rename to src/main/java/com/cloud/internal/json/zip/MapKeep.java index 1374e08d3..55651dd69 100644 --- a/zip/MapKeep.java +++ b/src/main/java/com/cloud/internal/json/zip/MapKeep.java @@ -1,8 +1,8 @@ -package org.json.zip; +package com.cloud.internal.json.zip; import java.util.HashMap; -import org.json.Kim; +import com.cloud.internal.json.Kim; /* Copyright (c) 2013 JSON.org diff --git a/zip/None.java b/src/main/java/com/cloud/internal/json/zip/None.java similarity index 91% rename from zip/None.java rename to src/main/java/com/cloud/internal/json/zip/None.java index 818e68d8f..ee3bea285 100644 --- a/zip/None.java +++ b/src/main/java/com/cloud/internal/json/zip/None.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; /** * None is an interface that makes the constant none (short for diff --git a/zip/PostMortem.java b/src/main/java/com/cloud/internal/json/zip/PostMortem.java similarity index 98% rename from zip/PostMortem.java rename to src/main/java/com/cloud/internal/json/zip/PostMortem.java index 22416d700..d7584aa9f 100644 --- a/zip/PostMortem.java +++ b/src/main/java/com/cloud/internal/json/zip/PostMortem.java @@ -1,4 +1,4 @@ -package org.json.zip; +package com.cloud.internal.json.zip; /* Copyright (c) 2013 JSON.org diff --git a/zip/README b/src/main/java/com/cloud/internal/json/zip/README similarity index 100% rename from zip/README rename to src/main/java/com/cloud/internal/json/zip/README diff --git a/zip/TrieKeep.java b/src/main/java/com/cloud/internal/json/zip/TrieKeep.java similarity index 99% rename from zip/TrieKeep.java rename to src/main/java/com/cloud/internal/json/zip/TrieKeep.java index dcb13c7a0..6019a502c 100644 --- a/zip/TrieKeep.java +++ b/src/main/java/com/cloud/internal/json/zip/TrieKeep.java @@ -1,6 +1,6 @@ -package org.json.zip; +package com.cloud.internal.json.zip; -import org.json.Kim; +import com.cloud.internal.json.Kim; /* Copyright (c) 2013 JSON.org From 7dab1a5d5e0ea22e9b5f5f69df6b512e2698492b Mon Sep 17 00:00:00 2001 From: Roberto Andrade Date: Thu, 3 Apr 2014 14:40:21 -0400 Subject: [PATCH 2/5] Updating project properties from pom --- .classpath | 15 +++++++++++++-- .settings/org.eclipse.jdt.core.prefs | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.classpath b/.classpath index 3686ca44d..434fa169e 100644 --- a/.classpath +++ b/.classpath @@ -1,8 +1,8 @@ - - + + @@ -11,5 +11,16 @@ + + + + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index abec6ca38..8e2521a10 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3 +org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.3 From 18379869e577a488ba494979edc54b39315f9dc0 Mon Sep 17 00:00:00 2001 From: Roberto Andrade Date: Thu, 3 Apr 2014 14:40:31 -0400 Subject: [PATCH 3/5] Making objects serializable --- src/main/java/com/cloud/internal/json/JSONArray.java | 8 ++++++-- src/main/java/com/cloud/internal/json/JSONObject.java | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloud/internal/json/JSONArray.java b/src/main/java/com/cloud/internal/json/JSONArray.java index 9c1430af7..3dde544dc 100644 --- a/src/main/java/com/cloud/internal/json/JSONArray.java +++ b/src/main/java/com/cloud/internal/json/JSONArray.java @@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal */ import java.io.IOException; +import java.io.Serializable; import java.io.StringWriter; import java.io.Writer; import java.lang.reflect.Array; @@ -78,9 +79,9 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2013-04-18 */ -public class JSONArray { +public class JSONArray implements Serializable { - /** + /** * The arrayList where the JSONArray's properties are kept. */ private final ArrayList myArrayList; @@ -942,4 +943,7 @@ Writer write(Writer writer, int indentFactor, int indent) throw new JSONException(e); } } + + private static final long serialVersionUID = -9029420148556494629L; + } diff --git a/src/main/java/com/cloud/internal/json/JSONObject.java b/src/main/java/com/cloud/internal/json/JSONObject.java index 79f9ab47e..763f49b88 100755 --- a/src/main/java/com/cloud/internal/json/JSONObject.java +++ b/src/main/java/com/cloud/internal/json/JSONObject.java @@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal */ import java.io.IOException; +import java.io.Serializable; import java.io.StringWriter; import java.io.Writer; import java.lang.reflect.Field; @@ -93,8 +94,9 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2013-06-17 */ -public class JSONObject { - /** +public class JSONObject implements Serializable { + + /** * JSONObject.NULL is equivalent to the value that JavaScript calls null, * whilst Java's null is equivalent to the value that JavaScript calls * undefined. @@ -1639,4 +1641,7 @@ Writer write(Writer writer, int indentFactor, int indent) throw new JSONException(exception); } } + + private static final long serialVersionUID = 8790184474158900049L; + } From 254aba839ec21624bba80aaa2b31b4257a5fba63 Mon Sep 17 00:00:00 2001 From: Roberto Andrade Date: Thu, 3 Apr 2014 14:45:20 -0400 Subject: [PATCH 4/5] We wanna keep decimals intact when serializing them toString --- .../java/com/cloud/internal/json/JSONObject.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloud/internal/json/JSONObject.java b/src/main/java/com/cloud/internal/json/JSONObject.java index 763f49b88..eed2a7a4a 100755 --- a/src/main/java/com/cloud/internal/json/JSONObject.java +++ b/src/main/java/com/cloud/internal/json/JSONObject.java @@ -443,9 +443,10 @@ public static String doubleToString(double d) { return "null"; } -// Shave off trailing zeros and decimal point, if possible. - String string = Double.toString(d); + + // Shave off trailing zeros and decimal point, if possible. + /* if (string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) { while (string.endsWith("0")) { @@ -455,6 +456,8 @@ public static String doubleToString(double d) { string = string.substring(0, string.length() - 1); } } + */ + return string; } @@ -773,9 +776,10 @@ public static String numberToString(Number number) throws JSONException { } testValidity(number); -// Shave off trailing zeros and decimal point, if possible. - String string = number.toString(); + + // Shave off trailing zeros and decimal point, if possible. + /* if (string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) { while (string.endsWith("0")) { @@ -785,6 +789,8 @@ public static String numberToString(Number number) throws JSONException { string = string.substring(0, string.length() - 1); } } + */ + return string; } From ae31d45d25662922925f38442d84784413eb4c60 Mon Sep 17 00:00:00 2001 From: Steven Berlanga Date: Wed, 23 Apr 2014 08:51:37 -0400 Subject: [PATCH 5/5] adding gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9f970225a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file