Author: zhoresh
Date: Wed Jun 16 01:04:57 2010
New Revision: 955103
URL: http://svn.apache.org/viewvc?rev=955103&view=rev
Log:
Using ProxyingContentRewriter instead of HTMLContentRewriter for accel servlet
http://codereview.appspot.com/1686043/show
Modified:
shindig/trunk/config/container.js
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
Modified: shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/config/container.js?rev=955103&r1=955102&r2=955103&view=diff
==============================================================================
--- shindig/trunk/config/container.js (original)
+++ shindig/trunk/config/container.js Wed Jun 16 01:04:57 2010
@@ -59,7 +59,7 @@
// DNS domain on which gadgets should render.
"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
-
+
// Origins for CORS requests and/or Referer validation
// Indicate a set of origins or an entry with * to indicate that all origins
are allowed
"gadgets.parentOrigins" : ["*"],
@@ -75,6 +75,15 @@
// never conflict with a lockedDomainSuffix.
"gadgets.jsUriTemplate" : "http://%host%/gadgets/js/%js%";,
+//New configuration for iframeUri generation:
+"gadgets.uri.iframe.lockedDomainSuffix" : "-a.example.com:8080",
+"gadgets.uri.iframe.unlockedDomain" : "www.example.com:8080",
+"gadgets.uri.iframe.basePath" : "/gadgets/ifr",
+
+"gadgets.uri.js.host" : "http://www.example.com/";,
+"gadgets.uri.js.path" : "/gadgets/js",
+
+
// Callback URL. Scheme relative URL for easy switch between https/http.
"gadgets.oauthGadgetCallbackTemplate" : "//%host%/gadgets/oauthcallback",
@@ -91,8 +100,12 @@
//"gadgets.securityTokenType" : "secure",
//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
+// URI for the default shindig test instance.
"defaultShindigTestHost": "http://localhost:9003";,
+// Authority (host:port without scheme) for the proxy and concat servlets.
+"defaultShindigProxyConcatAuthority": "localhost:9003",
+
// Default Uri config: these must be overridden - specified here for testing
purposes
"gadgets.uri.iframe.unlockedDomain": "${Cur['defaultShindigTestHost']}",
"gadgets.uri.iframe.lockedDomainSuffix": "${Cur['defaultShindigTestHost']}",
@@ -102,8 +115,13 @@
"gadgets.uri.js.path": "/gadgets/js",
// Default concat Uri config; used for testing.
-"gadgets.uri.concat.host" : "${Cur['defaultShindigTestHost']}",
+"gadgets.uri.concat.host" : "${Cur['defaultShindigProxyConcatAuthority']}",
"gadgets.uri.concat.path" : "/gadgets/concat",
+"gadgets.uri.concat.js.splitToken" : "false",
+
+// Default proxy Uri config; used for testing.
+"gadgets.uri.proxy.host" : "${Cur['defaultShindigProxyConcatAuthority']}",
+"gadgets.uri.proxy.path" : "/gadgets/proxy",
// This config data will be passed down to javascript. Please
// configure your object using the feature name rather than
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java?rev=955103&r1=955102&r2=955103&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
Wed Jun 16 01:04:57 2010
@@ -66,9 +66,9 @@ public class RewriteModule extends Abstr
@Singleton
@Named("shindig.rewriters.accelerate")
protected List<GadgetRewriter> provideAccelRewriters(
- HTMLContentRewriter optimizingRewriter,
+ ProxyingContentRewriter proxyingContentRewriter,
CajaContentRewriter cajaRewriter) {
- return ImmutableList.of(optimizingRewriter, cajaRewriter);
+ return ImmutableList.of(proxyingContentRewriter, cajaRewriter);
}
// TODO: Clean this up. Ideally we would let the ResponseRewriterRegistry
