Author: lryan
Date: Wed Mar 11 08:04:05 2009
New Revision: 752400
URL: http://svn.apache.org/viewvc?rev=752400&view=rev
Log:
'osd' is no longer a standard shortcut name for opensocial.data
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriter.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriter.java?rev=752400&r1=752399&r2=752400&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriter.java
Wed Mar 11 08:04:05 2009
@@ -31,6 +31,10 @@
import org.apache.shindig.gadgets.preload.PreloaderService;
import org.apache.shindig.gadgets.spec.PipelinedData;
import org.apache.shindig.gadgets.spec.SpecParserException;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Document;
@@ -40,6 +44,7 @@
import org.w3c.dom.traversal.NodeFilter;
import org.w3c.dom.traversal.NodeIterator;
+import javax.el.CompositeELResolver;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -47,12 +52,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.CompositeELResolver;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-
/**
* ContentRewriter that resolves opensocial-data elements on the server.
*
@@ -195,7 +194,7 @@
// TODO: escape key
content.addPipelinedData(key, entry.getValue());
- script.append("osd.DataContext.putDataSet(\"")
+ script.append("opensocial.data.DataContext.putDataSet(\"")
.append(key)
.append("\",")
.append(JsonSerializer.serialize(entry.getValue()))