Author: hsaputra Date: Tue Jun 21 18:25:07 2011 New Revision: 1138117 URL: http://svn.apache.org/viewvc?rev=1138117&view=rev Log: Remove scheme from default test domain/host name in config/container.js
CR: https://reviews.apache.org/r/939/ Modified: shindig/trunk/config/container.js shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java Modified: shindig/trunk/config/container.js URL: http://svn.apache.org/viewvc/shindig/trunk/config/container.js?rev=1138117&r1=1138116&r2=1138117&view=diff ============================================================================== --- shindig/trunk/config/container.js (original) +++ shindig/trunk/config/container.js Tue Jun 21 18:25:07 2011 @@ -84,8 +84,7 @@ "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", @@ -102,27 +101,25 @@ //"gadgets.securityTokenType" : "secure", //"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt", -// URI for the default shindig test instance. -//"defaultShindigTestHost": "http://${SERVER_HOST}:${SERVER_PORT}";, -"defaultShindigTestHost":"http://%authority%";, - - -// Authority (host:port without scheme) for the proxy and concat servlets. -//"defaultShindigProxyConcatAuthority": "${SERVER_HOST}:${SERVER_PORT}", -"defaultShindigProxyConcatAuthority":"%authority%", - // OS 2.0 Gadget DOCTYPE: used in Gadgets with @specificationVersion 2.0 or greater and // quirksmode on Gadget has not been set. "gadgets.doctype_qname" : "HTML", //HTML5 doctype "gadgets.doctype_pubid" : "", "gadgets.doctype_sysid" : "", + +// Authority (host:port without scheme) for the default shindig test instance. +"defaultShindigTestAuthority":"%authority%", + +// Authority (host:port without scheme) for the proxy and concat servlets. +"defaultShindigProxyConcatAuthority":"%authority%", + // Default Uri config: these must be overridden - specified here for testing purposes -"gadgets.uri.iframe.unlockedDomain": "${Cur['defaultShindigTestHost']}", -"gadgets.uri.iframe.lockedDomainSuffix": "${Cur['defaultShindigTestHost']}", +"gadgets.uri.iframe.unlockedDomain": "${Cur['defaultShindigTestAuthority']}", +"gadgets.uri.iframe.lockedDomainSuffix": "${Cur['defaultShindigTestAuthority']}", // Default Js Uri config: also must be overridden. -"gadgets.uri.js.host": "${Cur['defaultShindigTestHost']}", +"gadgets.uri.js.host": "//${Cur['defaultShindigTestAuthority']}", "gadgets.uri.js.path": "${CONTEXT_ROOT}/gadgets/js", // Default concat Uri config; used for testing. @@ -134,6 +131,7 @@ "gadgets.uri.proxy.host" : "${Cur['defaultShindigProxyConcatAuthority']}", "gadgets.uri.proxy.path" : "${CONTEXT_ROOT}/gadgets/proxy", + // This config data will be passed down to javascript. Please // configure your object using the feature name rather than // the javascript name. Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java?rev=1138117&r1=1138116&r2=1138117&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java Tue Jun 21 18:25:07 2011 @@ -133,12 +133,12 @@ public class DefaultIframeUriManager imp uri.setPath(getReqVal(container, IFRAME_BASE_PATH_KEY)); // 2. Set host/authority. - String host; + String host = "//"; if (usingLockedDomain(gadget, container)) { - host = "//" + ldGen.getLockedDomainPrefix(gadget.getSpec().getUrl()) + + host += ldGen.getLockedDomainPrefix(gadget.getSpec().getUrl()) + getReqVal(container, LOCKED_DOMAIN_SUFFIX_KEY); } else { - host = getReqVal(container, UNLOCKED_DOMAIN_KEY); + host += getReqVal(container, UNLOCKED_DOMAIN_KEY); } Uri gadgetUri = Uri.parse(host); Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java?rev=1138117&r1=1138116&r2=1138117&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java (original) +++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java Tue Jun 21 18:25:07 2011 @@ -62,7 +62,7 @@ public class DefaultIframeUriManagerTest private static final String LD_SUFFIX = ".lockeddomain.com"; private static final String LD_SUFFIX_ALT = ".altld.com"; private static final String UNLOCKED_DOMAIN = "unlockeddomain.com"; - private static final String UNLOCKED_DOMAIN_CONFIG_VALUE = "//" + UNLOCKED_DOMAIN; + private static final String UNLOCKED_DOMAIN_CONFIG_VALUE = UNLOCKED_DOMAIN; private static final int TYPE_URL_NUM_BASE_PARAMS = 8; private static final int TYPE_HTML_NUM_BASE_PARAMS = 8;
