Rebase android-json to avoid conflicts with org.json. This patch rebases android-json from org.json to c.g.g.thirdparty.json. In the future it will probably make sense to migrate to unrebased GSON. Bug: issue 8762. Change-Id: I47352cebdd8d8092dd512f2bd6b623ff8022d854
diff --git a/dev/build.xml b/dev/build.xml index f06e97c..c943e06 100755 --- a/dev/build.xml +++ b/dev/build.xml
@@ -71,8 +71,8 @@ <include name="icu4j/50.1.1/icu4j.jar"/> <include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/> <include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> - <include name="jscomp/20131118/compiler-rebased.jar"/> - <include name="jscomp/20131118/sourcemap-rebased.jar"/> + <include name="jscomp/20131118.json.rebased/compiler-rebased.jar"/> + <include name="jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> <include name="jsr305/jsr305.jar"/> <include name="protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> <!-- dependencies needed for JSP support in DevMode: BEGIN --> @@ -103,7 +103,7 @@ <include name="xerces/xerces-2_11_0/xml-apis-1.4.01.jar"/> <include name="w3c/sac/sac-1.3.jar"/> <!-- htmlunit dependencies not already included: END --> - <include name="json/android-sdk-19.1/json-android.jar"/> + <include name="json/android-sdk-19.1/json-android-rebased.jar"/> </fileset> <fileset file="build.xml"/> </sourcefiles> @@ -125,8 +125,8 @@ src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/> <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> - <zipfileset src="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar"/> - <zipfileset src="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar"/> + <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/> + <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> <zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar"/> <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> @@ -159,7 +159,7 @@ <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xml-apis-1.4.01.jar"/> <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/> <!-- htmlunit dependencies not already included: END --> - <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/> + <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/> </gwt.jar> </sequential> </outofdate> @@ -207,9 +207,9 @@ location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.10.0.jar"/> <pathelement location="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/> - <pathelement location="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar"/> - <pathelement location="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar"/> - <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/> + <pathelement location="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/> + <pathelement location="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> + <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/> <pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar"/> <pathelement location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java index 4af9939..2c71e39 100644 --- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java +++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java
@@ -18,10 +18,9 @@ import com.google.gwt.core.ext.soyc.coderef.EntityDescriptor.Fragment; import com.google.gwt.thirdparty.guava.common.collect.Maps; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; +import com.google.gwt.thirdparty.json.JSONArray; +import com.google.gwt.thirdparty.json.JSONException; +import com.google.gwt.thirdparty.json.JSONObject; import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java index 69d6daa..fedb297 100644 --- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java +++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java
@@ -35,12 +35,11 @@ import com.google.gwt.thirdparty.guava.common.collect.Lists; import com.google.gwt.thirdparty.guava.common.collect.Maps; import com.google.gwt.thirdparty.guava.common.collect.Sets; +import com.google.gwt.thirdparty.json.JSONArray; +import com.google.gwt.thirdparty.json.JSONException; +import com.google.gwt.thirdparty.json.JSONObject; import com.google.gwt.util.tools.Utility; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter;
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java index f2ad2e8..c820112 100644 --- a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java +++ b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
@@ -31,14 +31,15 @@ import com.google.gwt.thirdparty.guava.common.collect.Maps; import com.google.gwt.thirdparty.guava.common.collect.Sets; import com.google.gwt.thirdparty.guava.common.primitives.Ints; +import com.google.gwt.thirdparty.json.JSONArray; +import com.google.gwt.thirdparty.json.JSONException; +import com.google.gwt.thirdparty.json.JSONObject; import com.google.gwt.util.tools.Utility; import junit.framework.TestCase; import org.eclipse.jdt.internal.compiler.problem.ShouldNotImplement; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; + import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler;
diff --git a/doc/build.xml b/doc/build.xml index 53fcbc7..067e352 100644 --- a/doc/build.xml +++ b/doc/build.xml
@@ -25,7 +25,7 @@ <path id="USER_CLASS_PATH"> <pathelement location="${gwt.dev.jar}" /> <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.tools.lib}/lib/json/android-sdk-19.1/json-android.jar" /> + <pathelement location="${gwt.tools.lib}/lib/json/android-sdk-19.1/json-android-rebased.jar" /> <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" /> <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" /> <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" />
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath index e0d44b3..4441746 100644 --- a/eclipse/dev/.classpath +++ b/eclipse/dev/.classpath
@@ -23,9 +23,9 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/compiler-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> <classpathentry kind="output" path="bin"/>
diff --git a/eclipse/dev/codeserver/.classpath b/eclipse/dev/codeserver/.classpath index 5837833..0318d20 100644 --- a/eclipse/dev/codeserver/.classpath +++ b/eclipse/dev/codeserver/.classpath
@@ -5,8 +5,8 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/compiler-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath index 1837fd6..eaf6462 100644 --- a/eclipse/user/.classpath +++ b/eclipse/user/.classpath
@@ -37,7 +37,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android.jar" sourcepath="/GWT_TOOLS/lib/json/android-sdk-19.1/json-android-sources.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar" sourcepath="/GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased-sources.jar"/> <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA.jar" sourcepath="/GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/> <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/> @@ -62,7 +62,7 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/testng/testng-5.14.1-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/testng/testng-5.14.1-nojunit.jar" sourcepath="/GWT_TOOLS/lib/testng/testng-5.14.1-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdt-3.10.0.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter-3.10.0.jar"/> <classpathentry kind="output" path="bin"/>
diff --git a/requestfactory/build.xml b/requestfactory/build.xml index 53a6724..d5638fc 100755 --- a/requestfactory/build.xml +++ b/requestfactory/build.xml
@@ -30,7 +30,7 @@ classname="com.google.web.bindery.requestfactory.server.RequestFactoryJarExtractor"> <classpath> <fileset dir="${gwt.build.lib}" includes="gwt-user.jar,gwt-dev.jar" /> - <fileset dir="${gwt.tools.lib}" includes="json/android-sdk-19.1/json-android.jar" /> + <fileset dir="${gwt.tools.lib}" includes="json/android-sdk-19.1/json-android-rebased.jar" /> <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" /> <pathelement path="${gwt.build.out}/user/bin" /> <pathelement path="${gwt.build.out}/dev/bin-test" />
diff --git a/servlet/build.xml b/servlet/build.xml index 458f43c..1dd50b3 100644 --- a/servlet/build.xml +++ b/servlet/build.xml
@@ -25,7 +25,7 @@ <gwt.jar> <!-- Rebased dependencies go in gwt-servlet too --> <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" /> - <zipfileset src="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar" /> + <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" /> <fileset dir="${gwt.dev.bin}"> @@ -56,7 +56,7 @@ <mkdir dir="${gwt.build.lib}" /> <gwt.jar destfile="${project.lib.deps}"> <!-- The following two jars satisfy RequestFactory dependencies. --> - <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar" /> + <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" /> </gwt.jar> </target>
diff --git a/user/build.xml b/user/build.xml index 2952aa5..84e0872 100755 --- a/user/build.xml +++ b/user/build.xml
@@ -63,7 +63,7 @@ location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/> <pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/> <pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/> - <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/> + <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/> <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/> <!-- TCK jars --> @@ -97,7 +97,7 @@ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/> <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/> <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/> - <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/> + <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/> <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/> <!-- The source is included so validation is available from client code --> <pathelement
diff --git a/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java b/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java index 48930c1..ea57e16 100644 --- a/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java +++ b/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java
@@ -16,9 +16,9 @@ package com.google.gwt.logging.server; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; +import com.google.gwt.thirdparty.json.JSONArray; +import com.google.gwt.thirdparty.json.JSONException; +import com.google.gwt.thirdparty.json.JSONObject; import java.util.logging.Level; import java.util.logging.LogRecord;
diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java b/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java index d30fb3e..ff4f9af 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
@@ -15,11 +15,10 @@ */ package com.google.web.bindery.autobean.shared.impl; +import com.google.gwt.thirdparty.json.JSONObject; import com.google.web.bindery.autobean.shared.Splittable; import com.google.web.bindery.autobean.vm.impl.JsonSplittable; -import org.json.JSONObject; - import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat;
diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java b/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java index 7ce0d54..2d4bb97 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java
@@ -16,14 +16,13 @@ package com.google.web.bindery.autobean.vm.impl; import com.google.gwt.core.client.impl.WeakMapping; +import com.google.gwt.thirdparty.json.JSONArray; +import com.google.gwt.thirdparty.json.JSONException; +import com.google.gwt.thirdparty.json.JSONObject; import com.google.web.bindery.autobean.shared.Splittable; import com.google.web.bindery.autobean.shared.impl.HasSplittable; import com.google.web.bindery.autobean.shared.impl.StringQuoter; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -83,7 +82,7 @@ } /** - * Private equivalent of org.json.JSONObject.getNames(JSONObject) since that + * Private equivalent of com.google.gwt.thirdparty.json.JSONObject.getNames(JSONObject) since that * method is not available in Android 2.2. Used to represent a null value. */ private static String[] getNames(JSONObject json) {