svn commit: r761069 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java

[awiner]

Author: awiner
Date: Wed Apr  1 21:36:55 2009
New Revision: 761069

URL: http://svn.apache.org/viewvc?rev=761069&view=rev
Log:
Add opensocial_proxed_content=1 to query parameters of proxied rendering per 
imminent spec change.
This allows third-party servers to differentiate between 
gadgets.io.makeRequest() and proxied renders.

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java?rev=761069&r1=761068&r2=761069&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
 Wed Apr  1 21:36:55 2009
@@ -91,6 +91,7 @@
     UriBuilder uri = new UriBuilder(href);
     uri.addQueryParameter("lang", context.getLocale().getLanguage());
     uri.addQueryParameter("country", context.getLocale().getCountry());
+    uri.addQueryParameter("opensocial_proxied_content", "1");
 
     HttpRequest request = new HttpRequest(uri.toUri())
         .setIgnoreCache(context.getIgnoreCache())

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java?rev=761069&r1=761068&r2=761069&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
 Wed Apr  1 21:36:55 2009
@@ -58,7 +58,7 @@
   private static final String PROXIED_HTML_CONTENT = "Hello, Universe!";
   private static final Uri PROXIED_HTML_HREF = 
Uri.parse("http://example.org/proxied.php";);
   private static final Uri EXPECTED_PROXIED_HTML_HREF
-      = Uri.parse("http://example.org/proxied.php?lang=all&country=ALL";);
+      = 
Uri.parse("http://example.org/proxied.php?lang=all&country=ALL&opensocial_proxied_content=1";);
   private static final GadgetContext CONTEXT = new GadgetContext() {
     @Override
     public SecurityToken getToken() {
@@ -107,6 +107,7 @@
     Uri resolved = new UriBuilder(base.resolve(relative))
       .addQueryParameter("lang", GadgetSpec.DEFAULT_LOCALE.getLanguage())
       .addQueryParameter("country", GadgetSpec.DEFAULT_LOCALE.getCountry())
+      .addQueryParameter("opensocial_proxied_content", "1")
       .toUri();
 
     HttpRequest request = new HttpRequest(resolved);
@@ -176,6 +177,8 @@
     UriBuilder uri = new UriBuilder(PROXIED_HTML_HREF);
     uri.putQueryParameter("lang", "foo");
     uri.putQueryParameter("country", "BAR");
+    uri.putQueryParameter("opensocial_proxied_content", "1");
+
     Gadget gadget = makeHrefGadget("none");
     gadget.setContext(new GadgetContext() {
       @Override