Revision: 7073 Author: [email protected] Date: Fri Nov 20 12:14:17 2009 Log: Merge tr...@7072 into this branch Use gwt.codesvr instead of gwt.hosted in JUnitShell svn merge --ignore-ancestry -c7072 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=7073 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java ======================================= --- /releases/2.0/branch-info.txt Fri Nov 20 11:47:11 2009 +++ /releases/2.0/branch-info.txt Fri Nov 20 12:14:17 2009 @@ -917,3 +917,7 @@ tr...@7063 was merged into this branch Simplify FF workaround for 'hasOwnProperty' String keys svn merge --ignore-ancestry -c7063 https://google-web-toolkit.googlecode.com/svn/trunk . + +tr...@7072 was merged into this branch + Use gwt.codesvr instead of gwt.hosted in JUnitShell + svn merge --ignore-ancestry -c7072 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js Tue Nov 3 13:18:00 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js Fri Nov 20 12:14:17 2009 @@ -72,7 +72,8 @@ function isHostedMode() { try { var query = $wnd.location.search; - return (query.indexOf('gwt.hosted=') != -1 + return (query.indexOf('gwt.codesvr=') != -1 + || query.indexOf('gwt.hosted=') != -1 || ($wnd.external && $wnd.external.gwtOnLoad)) && (query.indexOf('gwt.hybrid') == -1); } catch (e) { ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Fri Nov 20 11:47:11 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Fri Nov 20 12:14:17 2009 @@ -747,7 +747,7 @@ + (standardsMode ? "/junit-standards.html" : "/junit.html"); if (developmentMode) { // CHECKSTYLE_OFF - url += "?gwt.hosted=" + localhost + ":" + codeServerPort; + url += "?gwt.codesvr=" + localhost + ":" + codeServerPort; // CHECKSTYLE_ON } return url; -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
