svn commit: r817827 - in /incubator/shindig/trunk: java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java javascript/samplecontainer/samplecontainer.js

[li...@apache.org]

Author: lindner
Date: Tue Sep 22 20:31:16 2009
New Revision: 817827

URL: http://svn.apache.org/viewvc?rev=817827&view=rev
Log:
SHINDIG-1083 | Patch from Arne Roomann-Kurrik | ampleContainer uses Content-Type application/x-www-form-urlencoded, even though Shindig Java disallows it

Modified:
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
    incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java?rev=817827&r1=817826&r2=817827&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java Tue Sep 22 20:31:16 2009
@@ -32,6 +32,7 @@
 
 import java.io.IOException;
 import java.util.concurrent.Future;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -59,12 +60,14 @@
    * Handles /samplecontainer/setstate and /samplecontainer/setevilness/{doevil}. TODO(doll): These
    * urls aren't very resty. Consider changing the samplecontainer.html calls post.
    */
-  @Operation(httpMethods = "POST")
+  @Operation(httpMethods = "POST", bodyParam = "data")
   public Future<?> create(RequestItem request) throws ProtocolException {
     String type = request.getParameter("type");
     if (type.equals("setstate")) {
       try {
-        String stateFile = request.getParameter("fileurl");
+        @SuppressWarnings("unchecked")
+        Map<String, String> bodyparams = request.getTypedParameter("data", Map.class);
+        String stateFile = bodyparams.get("fileurl");
         service.setDb(new JSONObject(fetchStateDocument(stateFile)));
       } catch (JSONException e) {
         throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,

Modified: incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js?rev=817827&r1=817826&r2=817827&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js (original)
+++ incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js Tue Sep 22 20:31:16 2009
@@ -115,7 +115,7 @@
 
   function reloadStateFile(opt_callback) {
     sendRequestToServer('setstate', 'POST',
-        gadgets.io.encodeValues({"fileurl" : stateFileUrl}),
+        gadgets.json.stringify({"fileurl" : stateFileUrl}),
         opt_callback);
   };
 
@@ -139,7 +139,8 @@
             opt_callback(data);
         }
       },
-      makeRequestParams
+      makeRequestParams,
+      "application/javascript"
     );
   };