You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/03/15 11:37:08 UTC
svn commit: r637386 - in
/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig:
gadgets/GadgetSpecFetcher.java gadgets/MessageBundleFetcher.java
gadgets/http/ProxyHandler.java util/ResourceLoader.java
Author: etnu
Date: Sat Mar 15 03:37:07 2008
New Revision: 637386
URL: http://svn.apache.org/viewvc?rev=637386&view=rev
Log:
Applied updated fix for SHINDIG-109 from Brian Eaton and removed some redundant logging.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/ResourceLoader.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java?rev=637386&r1=637385&r2=637386&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java Sat Mar 15 03:37:07 2008
@@ -63,7 +63,6 @@
cache.put(url, spec);
} else {
String error = "Unable to get content from " + url.toString();
- logger.info(error);
throw new GadgetException(
GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT, error);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java?rev=637386&r1=637385&r2=637386&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java Sat Mar 15 03:37:07 2008
@@ -64,7 +64,6 @@
cache.put(url, bundle);
} else {
String error = "Unable to get content from " + url.toString();
- logger.info(error);
throw new GadgetException(
GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT, error);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java?rev=637386&r1=637385&r2=637386&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java Sat Mar 15 03:37:07 2008
@@ -73,25 +73,23 @@
// Fetch the content and convert it into JSON.
RemoteContent results = fetchContent(request, state);
- response.setStatus(results.getHttpStatusCode());
- if (results.getHttpStatusCode() == HttpServletResponse.SC_OK) {
- String output;
- try {
- // Use raw param as key as URL may have to be decoded
- JSONObject resp = new JSONObject()
- .put("body", results.getResponseAsString())
- .put("rc", results.getHttpStatusCode());
- String url = request.getParameter("url");
- JSONObject json = new JSONObject().put(url, resp);
- output = UNPARSEABLE_CRUFT + json.toString();
- } catch (JSONException e) {
- output = "";
- }
- response.setContentType("application/json; charset=utf-8");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Content-Disposition", "attachment;filename=p.txt");
- response.getWriter().write(output);
- }
+ response.setStatus(HttpServletResponse.SC_OK);
+ String output;
+ try {
+ // Use raw param as key as URL may have to be decoded
+ JSONObject resp = new JSONObject()
+ .put("body", results.getResponseAsString())
+ .put("rc", results.getHttpStatusCode());
+ String url = request.getParameter("url");
+ JSONObject json = new JSONObject().put(url, resp);
+ output = UNPARSEABLE_CRUFT + json.toString();
+ } catch (JSONException e) {
+ output = "";
+ }
+ response.setContentType("application/json; charset=utf-8");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Content-Disposition", "attachment;filename=p.txt");
+ response.getWriter().write(output);
}
public void fetch(HttpServletRequest request,
@@ -282,7 +280,7 @@
private URL signUrl(CrossServletState state, URL originalUrl, GadgetToken token,
HttpServletRequest request) throws GadgetException {
String method = getParameter(request, "httpMethod", "GET");
- String body = getParameter(request, "postBody", null);
+ String body = getParameter(request, "postData", null);
RequestSigner signer = state.makeSignedFetchRequestSigner(token);
return signer.signRequest(method, originalUrl, body);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/ResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/ResourceLoader.java?rev=637386&r1=637385&r2=637386&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/ResourceLoader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/ResourceLoader.java Sat Mar 15 03:37:07 2008
@@ -24,15 +24,11 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.util.logging.Logger;
/**
* Handles loading contents from resource and file system files.
*/
public class ResourceLoader {
-
- private static final Logger logger
- = Logger.getLogger("org.apache.shindig.util");
/**
* Reads the contents of a resource as a string.