Merge remote branch 'origin/upstream' into tempbranch

frontend/client/src/autotest/common/JsonRpcProxy.java

 package autotest.common;
 
 import autotest.common.ui.NotifyManager;
 
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONNull;
 import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
 public abstract class JsonRpcProxy {
     public static final String AFE_BASE_URL = "/afe/server/";
     public static final String TKO_BASE_URL = "/new_tko/server/";
+    public static final String PLANNER_BASE_URL = "/planner/server/";
     private static final String RPC_URL_SUFFIX = "rpc/";
     private static final String JSON_RPC_URL_SUFFIX = "jsonp_rpc/";
 
     private static String defaultBaseUrl;
     private static final Map<String, JsonRpcProxy> instanceMap =
         new HashMap<String, JsonRpcProxy>();
     protected static final NotifyManager notify = NotifyManager.getInstance();
 
     public static void setDefaultBaseUrl(String baseUrl) {
         defaultBaseUrl = baseUrl;
@@ skipping 67 matching lines @@
         }
         else if (error.isObject() != null) {
             callback.onError(error.isObject());
             return;
         }
 
         JSONValue result = responseObject.get("result");
         callback.onSuccess(result);
     }
 }