You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2008/03/31 05:43:50 UTC
svn commit: r642865 - in /incubator/shindig/trunk:
java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
javascript/samplecontainer/state-basicfriendlist.xml
Author: lindner
Date: Sun Mar 30 20:43:50 2008
New Revision: 642865
URL: http://svn.apache.org/viewvc?rev=642865&view=rev
Log:
Apply correct content-type to socialdata responses, fixes UTF-8
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
incubator/shindig/trunk/javascript/samplecontainer/state-basicfriendlist.xml
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java?rev=642865&r1=642864&r2=642865&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java Sun Mar 30 20:43:50 2008
@@ -101,7 +101,7 @@
logger.info("Request was made with invalid security token: " + token);
response = new DataResponse(ResponseError.BAD_REQUEST);
}
-
+ resp.setContentType("application/json; charset=utf-8");
PrintWriter writer = resp.getWriter();
writer.write(response.toJson().toString());
}
Modified: incubator/shindig/trunk/javascript/samplecontainer/state-basicfriendlist.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/state-basicfriendlist.xml?rev=642865&r1=642864&r2=642865&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/state-basicfriendlist.xml (original)
+++ incubator/shindig/trunk/javascript/samplecontainer/state-basicfriendlist.xml Sun Mar 30 20:43:50 2008
@@ -1,14 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<container>
<people>
<person id="john.doe" name="John Doe" gender="M">
<friend>jane.doe</friend>
<friend>george.doe</friend>
+ <friend>maija.m</friend>
</person>
<person id="jane.doe" name="Jane Doe" phone="867-5309" gender="F">
<friend>john.doe</friend>
</person>
<person id="george.doe" name="George Doe" gender="M">
<friend>john.doe</friend>
+ </person>
+ <person id="mario.rossi" name="Mario Rossi" gender="M">
+ </person>
+ <person id="maija.m" name="Maija Meikäläinen" gender="F">
</person>
</people>