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/02/09 04:54:51 UTC
svn commit: r620078 - in /incubator/shindig/trunk:
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/
javascript/container/
Author: etnu
Date: Fri Feb 8 19:54:50 2008
New Revision: 620078
URL: http://svn.apache.org/viewvc?rev=620078&view=rev
Log:
Added missing parameters to RpcServlet and made GadgetRenderingServlet emit proper http error codes.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
incubator/shindig/trunk/javascript/container/gadgets.js
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java?rev=620078&r1=620077&r2=620078&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java Fri Feb 8 19:54:50 2008
@@ -92,7 +92,8 @@
if (gadget.getContentType().equals(GadgetSpec.ContentType.HTML)) {
buf.append(iframePath)
.append("url=")
- .append(URLEncoder.encode(url, "UTF-8"));
+ .append(URLEncoder.encode(url, "UTF-8"))
+ .append("&");
} else {
// type = url
buf.append(url);
@@ -102,6 +103,8 @@
buf.append('&');
}
}
+
+ buf.append("mid=").append(gadget.getId().getModuleId());
UserPrefs prefs = gadget.getUserPrefValues();
for (Map.Entry<String, String> entry : prefs.getPrefs().entrySet()) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java?rev=620078&r1=620077&r2=620078&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java Fri Feb 8 19:54:50 2008
@@ -155,7 +155,7 @@
List<GadgetContentFilter> contentFilters,
HttpServletResponse resp)
throws IOException, GadgetServer.GadgetProcessException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html; charset=UTF-8");
StringBuilder markup = new StringBuilder();
markup.append("<html><head>");
@@ -274,6 +274,7 @@
HttpServletResponse resp)
throws IOException {
// TODO: make this way more robust
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
StringBuilder markup = new StringBuilder();
markup.append("<html><body>");
markup.append("<pre>");
Modified: incubator/shindig/trunk/javascript/container/gadgets.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/gadgets.js?rev=620078&r1=620077&r2=620078&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/gadgets.js (original)
+++ incubator/shindig/trunk/javascript/container/gadgets.js Fri Feb 8 19:54:50 2008
@@ -334,7 +334,7 @@
if (layoutRoot) {
var chrome = document.createElement('div');
chrome.className = 'gadgets-gadget-chrome';
- chrome.style.float = 'left'
+ chrome.style.cssFloat = 'left'
layoutRoot.appendChild(chrome);
return chrome;
} else {