[pkg-eucalyptus-commits] r295 - gwt/trunk/debian/patches

[Charles Plessy]

Author: plessy
Date: 2012-11-03 11:13:17 +0000 (Sat, 03 Nov 2012)
New Revision: 295

Modified:
   gwt/trunk/debian/patches/use-json-simple
Log:
Refreshed and unfuzzied patch.


Modified: gwt/trunk/debian/patches/use-json-simple
===================================================================
--- gwt/trunk/debian/patches/use-json-simple	2012-11-03 11:03:06 UTC (rev 294)
+++ gwt/trunk/debian/patches/use-json-simple	2012-11-03 11:13:17 UTC (rev 295)
@@ -1,7 +1,5 @@
-Index: gwt-debian.git/user/build.xml
-===================================================================
---- gwt-debian.git.orig/user/build.xml	2011-09-06 16:21:43.638141752 +0200
-+++ gwt-debian.git/user/build.xml	2011-09-13 16:05:50.430141886 +0200
+--- a/user/build.xml
++++ b/user/build.xml
 @@ -65,7 +65,7 @@
      <pathelement location="${htmlunit.jar}" />
      <pathelement location="${htmlunit-core-js.jar}" />
@@ -11,10 +9,8 @@
      <pathelement location="${geronimo-validation.jar}" />
      <pathelement location="${hibernate-validator.jar}" />
      <pathelement location="${gwt.dev.jar}" />
-Index: gwt-debian.git/user/src/com/google/web/bindery/requestfactory/vm/testing/UrlRequestTransport.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/web/bindery/requestfactory/vm/testing/UrlRequestTransport.java	2011-09-06 15:43:55.870144106 +0200
-+++ gwt-debian.git/user/src/com/google/web/bindery/requestfactory/vm/testing/UrlRequestTransport.java	2011-09-13 16:43:23.393208365 +0200
+--- a/user/src/com/google/web/bindery/requestfactory/vm/testing/UrlRequestTransport.java
++++ b/user/src/com/google/web/bindery/requestfactory/vm/testing/UrlRequestTransport.java
 @@ -19,19 +19,22 @@
  import com.google.web.bindery.requestfactory.shared.RequestTransport;
  import com.google.web.bindery.requestfactory.shared.ServerFailure;
@@ -114,10 +110,8 @@
            }
          }
        }
-Index: gwt-debian.git/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java	2011-09-06 15:43:55.886143186 +0200
-+++ gwt-debian.git/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java	2011-09-06 16:21:43.782143626 +0200
+--- a/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
++++ b/user/src/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
 @@ -18,7 +18,7 @@
  import com.google.web.bindery.autobean.shared.Splittable;
  import com.google.web.bindery.autobean.vm.impl.JsonSplittable;
@@ -136,10 +130,8 @@
    }
  
    public static Splittable split(String payload) {
-Index: gwt-debian.git/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java	2011-09-06 15:43:55.906143791 +0200
-+++ gwt-debian.git/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java	2011-09-13 16:34:12.818391717 +0200
+--- a/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java
++++ b/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java
 @@ -20,9 +20,10 @@
  import com.google.web.bindery.autobean.shared.impl.HasSplittable;
  import com.google.web.bindery.autobean.shared.impl.StringQuoter;
@@ -266,7 +258,7 @@
          throw new RuntimeException(e);
        }
      }
-@@ -282,7 +283,7 @@
+@@ -282,11 +283,11 @@
    }
  
    public int size() {
@@ -274,23 +266,17 @@
 +    return array.size();
    }
  
-   /**
-@@ -294,7 +295,7 @@
-   }
- 
    private synchronized JsonSplittable makeSplittable(Object object) {
 -    if (JSONObject.NULL.equals(object)) {
 +    if (object == null) {
        return null;
      }
      /*
-Index: gwt-debian.git/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java	2011-09-06 15:43:55.926143630 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java	2011-09-13 16:36:24.606142220 +0200
-@@ -16,9 +16,10 @@
+--- a/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java
++++ b/user/src/com/google/gwt/logging/server/JsonLogRecordServerUtil.java
+@@ -18,9 +18,10 @@
  
- package com.google.gwt.logging.server;
+ import com.google.gwt.core.client.impl.SerializableThrowable;
  
 -import org.json.JSONArray;
 -import org.json.JSONException;
@@ -302,7 +288,7 @@
  
  import java.util.logging.Level;
  import java.util.logging.LogRecord;
-@@ -36,14 +37,14 @@
+@@ -38,14 +39,14 @@
    private static Logger logger =
      Logger.getLogger(JsonLogRecordServerUtil.class.getName());
    public static LogRecord logRecordFromJson(String jsonString)
@@ -324,7 +310,7 @@
      LogRecord lr = new LogRecord(Level.parse(level), msg);
      lr.setLoggerName(loggerName);
      lr.setThrown(thrown);
-@@ -52,30 +53,30 @@
+@@ -54,31 +55,31 @@
    }
  
    private static StackTraceElement stackTraceElementFromJson(
@@ -357,16 +343,17 @@
 -      throwableFromJson(t.getString("cause"));
 +      throwableFromJson((String)t.get("cause"));
      StackTraceElement[] stackTrace = null;
--    JSONArray st = t.getJSONArray("stackTrace");
--    if (st.length() > 0) {
--      stackTrace = new StackTraceElement[st.length()];
--      for (int i = 0; i < st.length(); i++) {
--        stackTrace[i] = stackTraceElementFromJson(st.getString(i));
-+    JSONArray st = (JSONArray)t.get("stackTrace");
-+    if (st.size() > 0) {
-+      stackTrace = new StackTraceElement[st.size()];
-+      for (int i = 0; i < st.size(); i++) {
-+        stackTrace[i] = stackTraceElementFromJson((String)st.get(i));
+     if (t.has("stackTrace")) {
+-      JSONArray st = t.getJSONArray("stackTrace");
+-      if (st.length() > 0) {
+-        stackTrace = new StackTraceElement[st.length()];
+-        for (int i = 0; i < st.length(); i++) {
+-          stackTrace[i] = stackTraceElementFromJson(st.getString(i));
++      JSONArray st = (JSONArray)t.get("stackTrace");
++      if (st.size() > 0) {
++        stackTrace = new StackTraceElement[st.size()];
++        for (int i = 0; i < st.size(); i++) {
++          stackTrace[i] = stackTraceElementFromJson((String)st.get(i));
+         }
        }
-     }
-     Throwable thrown = new Throwable(message, cause);
+     } else {