You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by jc...@apache.org on 2012/01/09 16:26:23 UTC
svn commit: r1229202 -
/incubator/rave/site/trunk/content/rave/documentation/configure-locked-domain.mdtext
Author: jcian
Date: Mon Jan 9 15:26:23 2012
New Revision: 1229202
URL: http://svn.apache.org/viewvc?rev=1229202&view=rev
Log:
Locked domain documentation.
Modified:
incubator/rave/site/trunk/content/rave/documentation/configure-locked-domain.mdtext
Modified: incubator/rave/site/trunk/content/rave/documentation/configure-locked-domain.mdtext
URL: http://svn.apache.org/viewvc/incubator/rave/site/trunk/content/rave/documentation/configure-locked-domain.mdtext?rev=1229202&r1=1229201&r2=1229202&view=diff
==============================================================================
--- incubator/rave/site/trunk/content/rave/documentation/configure-locked-domain.mdtext (original)
+++ incubator/rave/site/trunk/content/rave/documentation/configure-locked-domain.mdtext Mon Jan 9 15:26:23 2012
@@ -39,86 +39,83 @@ For the Shindig configuration changes pl
## Complete diff of modified files follows
-<blockquote>
-<br>Index: rave-project/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js
-<br>===================================================================
-<br>--- rave-project/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js (revision 1228369)
-<br>+++ rave-project/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js (revision )
-<br>@@ -59,15 +59,15 @@
-<br> "gadgets.parent" : null,
-<br>
-<br> // Should all gadgets be forced on to a locked domain?
-<br>-"gadgets.uri.iframe.lockedDomainRequired" : false,
-<br>+"gadgets.uri.iframe.lockedDomainRequired" : true,
-<br>
-<br> // DNS domain on which gadgets should render.
-<br> // Default Uri config: these must be overridden - specified here for testing purposes
-<br>-"gadgets.uri.iframe.unlockedDomain": "${Cur['defaultShindigTestAuthority']}",
-<br>+"gadgets.uri.iframe.unlockedDomain": "localhost:8080",
-<br> // When setting up the server to enable locked domains, you should set this to something that does not
-<br> // attempt to use the authority at all. Ideally it would be another hostname that points to this server.
-<br> // Example: unlockedDomain="shindig.example.com" lockedDomainSuffix="-locked.gadgets.example.com"
-<br>-"gadgets.uri.iframe.lockedDomainSuffix": "${Cur['defaultShindigTestAuthority']}",
-<br>+"gadgets.uri.iframe.lockedDomainSuffix": "-locked.gadgets.example.com:8080",
-<br>
-<br> // Origins for CORS requests and/or Referer validation
-<br> // Indicate a set of origins or an entry with * to indicate that all origins are allowed
-<br>@@ -84,11 +84,8 @@
-<br> // jsUriTemplate will have %host% and %js% substituted.
-<br> // No locked domain special cases, but jsUriTemplate must
-<br> // never conflict with a lockedDomainSuffix.
-<br>-"gadgets.jsUriTemplate" : "http://%host%${CONTEXT_ROOT}/gadgets/js/%js%",
-<br>+"gadgets.jsUriTemplate" : "http://${Cur['gadgets.uri.iframe.unlockedDomain']}{CONTEXT_ROOT}/gadgets/js/%js%",
-<br>
-<br>-"gadgets.uri.js.host" : "http://www.example.com/",
-<br>-"gadgets.uri.js.path" : "${CONTEXT_ROOT}/gadgets/js",
-<br>-
-<br> // Callback URL. Scheme relative URL for easy switch between https/http.
-<br> "gadgets.uri.oauth.callbackTemplate" : "//%host%${CONTEXT_ROOT}/gadgets/oauthcallback",
-<br>
-<br>@@ -124,16 +121,16 @@
-<br> "defaultShindigProxyConcatAuthority":"%authority%",
-<br>
-<br> // Default Js Uri config: also must be overridden.
-<br>-"gadgets.uri.js.host": "//${Cur['defaultShindigTestAuthority']}",
-<br>+"gadgets.uri.js.host": "//${Cur['gadgets.uri.iframe.unlockedDomain']}",
-<br> "gadgets.uri.js.path": "${CONTEXT_ROOT}/gadgets/js",
-<br>
-<br> // Default concat Uri config; used for testing.
-<br>-"gadgets.uri.concat.host" : "${Cur['defaultShindigProxyConcatAuthority']}",
-<br>+"gadgets.uri.concat.host" : "${Cur['gadgets.uri.iframe.unlockedDomain']}",
-<br> "gadgets.uri.concat.path" : "${CONTEXT_ROOT}/gadgets/concat",
-<br> "gadgets.uri.concat.js.splitToken" : "false",
-<br>
-<br> // Default proxy Uri config; used for testing.
-<br>-"gadgets.uri.proxy.host" : "${Cur['defaultShindigProxyConcatAuthority']}",
-<br>+"gadgets.uri.proxy.host" : "${Cur['gadgets.uri.iframe.unlockedDomain']}",
-<br> "gadgets.uri.proxy.path" : "${CONTEXT_ROOT}/gadgets/proxy",
-<br>
-<br> //Enables/Disables feature administration
-<br>@@ -153,7 +150,7 @@
-<br> // Note: /proxy is an open proxy. Be careful how you expose this!
-<br> // Note: Here // is replaced with the current protocol http/https
-<br> //"proxyUrl" : "//%host%${CONTEXT_ROOT}/gadgets/proxy?container=%container%%rewriteMime%&refresh=%refresh%&gadget=%gadget%/%rawurl%",
-<br>- "proxyUrl" : "//%host%${CONTEXT_ROOT}/gadgets/proxy?container=%container%&refresh=%refresh%&url=%url%%rewriteMime%",
-<br>+ "proxyUrl" : "//${Cur['gadgets.uri.iframe.unlockedDomain']}${CONTEXT_ROOT}/gadgets/proxy?container=%container%&refresh=%refresh%&url=%url%%rewriteMime%",
-<br> "jsonProxyUrl" : "//%host%${CONTEXT_ROOT}/gadgets/makeRequest"
-<br> },
-<br> "views" : {
-<br>Index: rave-project/rave-shindig/src/main/resources/rave.shindig.properties
-<br>===================================================================
-<br>--- rave-project/rave-shindig/src/main/resources/rave.shindig.properties (revision 1228398)
-<br>+++ rave-project/rave-shindig/src/main/resources/rave.shindig.properties (revision )
-<br>@@ -96,7 +96,7 @@
-<br> shindig.signing.viewer-access-tokens-enabled=false
-<br>
-<br> # If enabled here, configuration values can be found in container configuration files.
-<br>-shindig.locked-domain.enabled=false
-<br>+shindig.locked-domain.enabled=true
-<br>
-<br> # TODO: This needs to be moved to container configuration.
-<br> shindig.content-rewrite.only-allow-excludes=false
-<br>
-</blockquote>
+ Index: rave-project/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js
+ ===================================================================
+ --- rave-project/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js (revision 1228369)
+ +++ rave-project/rave-shindig/src/main/webapp/WEB-INF/classes/containers/default/container.js (revision )
+ @@ -59,15 +59,15 @@
+ "gadgets.parent" : null,
+
+ // Should all gadgets be forced on to a locked domain?
+ -"gadgets.uri.iframe.lockedDomainRequired" : false,
+ +"gadgets.uri.iframe.lockedDomainRequired" : true,
+
+ // DNS domain on which gadgets should render.
+ // Default Uri config: these must be overridden - specified here for testing purposes
+ -"gadgets.uri.iframe.unlockedDomain": "${Cur['defaultShindigTestAuthority']}",
+ +"gadgets.uri.iframe.unlockedDomain": "localhost:8080",
+ // When setting up the server to enable locked domains, you should set this to something that does not
+ // attempt to use the authority at all. Ideally it would be another hostname that points to this server.
+ // Example: unlockedDomain="shindig.example.com" lockedDomainSuffix="-locked.gadgets.example.com"
+ -"gadgets.uri.iframe.lockedDomainSuffix": "${Cur['defaultShindigTestAuthority']}",
+ +"gadgets.uri.iframe.lockedDomainSuffix": "-locked.gadgets.mmodules.org: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
+ @@ -84,11 +84,8 @@
+ // jsUriTemplate will have %host% and %js% substituted.
+ // No locked domain special cases, but jsUriTemplate must
+ // never conflict with a lockedDomainSuffix.
+ -"gadgets.jsUriTemplate" : "http://%host%${CONTEXT_ROOT}/gadgets/js/%js%",
+ +"gadgets.jsUriTemplate" : "http://${Cur['gadgets.uri.iframe.unlockedDomain']}{CONTEXT_ROOT}/gadgets/js/%js%",
+
+ -"gadgets.uri.js.host" : "http://www.example.com/",
+ -"gadgets.uri.js.path" : "${CONTEXT_ROOT}/gadgets/js",
+ -
+ // Callback URL. Scheme relative URL for easy switch between https/http.
+ "gadgets.uri.oauth.callbackTemplate" : "//%host%${CONTEXT_ROOT}/gadgets/oauthcallback",
+
+ @@ -124,16 +121,16 @@
+ "defaultShindigProxyConcatAuthority":"%authority%",
+
+ // Default Js Uri config: also must be overridden.
+ -"gadgets.uri.js.host": "//${Cur['defaultShindigTestAuthority']}",
+ +"gadgets.uri.js.host": "//${Cur['gadgets.uri.iframe.unlockedDomain']}",
+ "gadgets.uri.js.path": "${CONTEXT_ROOT}/gadgets/js",
+
+ // Default concat Uri config; used for testing.
+ -"gadgets.uri.concat.host" : "${Cur['defaultShindigProxyConcatAuthority']}",
+ +"gadgets.uri.concat.host" : "${Cur['gadgets.uri.iframe.unlockedDomain']}",
+ "gadgets.uri.concat.path" : "${CONTEXT_ROOT}/gadgets/concat",
+ "gadgets.uri.concat.js.splitToken" : "false",
+
+ // Default proxy Uri config; used for testing.
+ -"gadgets.uri.proxy.host" : "${Cur['defaultShindigProxyConcatAuthority']}",
+ +"gadgets.uri.proxy.host" : "${Cur['gadgets.uri.iframe.unlockedDomain']}",
+ "gadgets.uri.proxy.path" : "${CONTEXT_ROOT}/gadgets/proxy",
+
+ //Enables/Disables feature administration
+ @@ -153,7 +150,7 @@
+ // Note: /proxy is an open proxy. Be careful how you expose this!
+ // Note: Here // is replaced with the current protocol http/https
+ //"proxyUrl" : "//%host%${CONTEXT_ROOT}/gadgets/proxy?container=%container%%rewriteMime%&refresh=%refresh%&gadget=%gadget%/%rawurl%",
+ - "proxyUrl" : "//%host%${CONTEXT_ROOT}/gadgets/proxy?container=%container%&refresh=%refresh%&url=%url%%rewriteMime%",
+ + "proxyUrl" : "//${Cur['gadgets.uri.iframe.unlockedDomain']}${CONTEXT_ROOT}/gadgets/proxy?container=%container%&refresh=%refresh%&url=%url%%rewriteMime%",
+ "jsonProxyUrl" : "//%host%${CONTEXT_ROOT}/gadgets/makeRequest"
+ },
+ "views" : {
+ Index: rave-project/rave-shindig/src/main/resources/rave.shindig.properties
+ ===================================================================
+ --- rave-project/rave-shindig/src/main/resources/rave.shindig.properties (revision 1228398)
+ +++ rave-project/rave-shindig/src/main/resources/rave.shindig.properties (revision )
+ @@ -96,7 +96,7 @@
+ shindig.signing.viewer-access-tokens-enabled=false
+
+ # If enabled here, configuration values can be found in container configuration files.
+ -shindig.locked-domain.enabled=false
+ +shindig.locked-domain.enabled=true
+
+ # TODO: This needs to be moved to container configuration.
+ shindig.content-rewrite.only-allow-excludes=false
[1]: installing.html
\ No newline at end of file