Revision: 6934
Author: [email protected]
Date: Mon Nov 16 15:49:37 2009
Log: Merge trunk r6933 into this branch
Update MissingPlugin app and associated legacy HTML page.
svn merge --ignore-ancestry -c6933 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6934
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/plugins/MissingBrowserPlugin.html
/releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html
/releases/2.0/plugins/MissingPlugin/war/WEB-INF/appengine-web.xml
=======================================
--- /releases/2.0/branch-info.txt Mon Nov 16 14:53:46 2009
+++ /releases/2.0/branch-info.txt Mon Nov 16 15:49:37 2009
@@ -692,7 +692,7 @@
Allows path to executable in RunStyleSelenium.
svn merge --ignore-ancestry -c6923
https://google-web-toolkit.googlecode.com/svn/trunk .
-tr...@6926 was merged into this branhc
+tr...@6926 was merged into this branch
Fix thread safety issues in GwtLocaleFactoryImpl and LocaleUtils.
svn merge --ignore-ancestry -c6926 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
@@ -700,3 +700,8 @@
tr...@6930 was merged into this branch
Update the generated README.txt, created when the webAppCreator script
is used.
svn merge --ignore-ancestry -c6930
https://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@6933 was merged into this branch
+ Update MissingPlugin app and associated legacy HTML page.
+ svn merge --ignore-ancestry -c6933 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/plugins/MissingBrowserPlugin.html Tue Oct 13 14:01:24 2009
+++ /releases/2.0/plugins/MissingBrowserPlugin.html Mon Nov 16 15:49:37 2009
@@ -1,57 +1,11 @@
<html>
<head>
<title>Missing GWT Browser Plugin</title>
-<!-- TODO: add JS code to detect browser/platform and just show that link
-->
</head>
<body>
<h1>No GWT Browser Plugin Detected</h1>
-<!-- TODO: alter language for final naming decisions -->
-GWT Development Mode needs a browser plugin to operate. Please install the
+GWT Development Mode needs a browser plugin to operate. Please <a
+ href="http://gwt-dev-plugin-missing.appspot.com/";>install</a> the
appropriate one for your browser.
-
-<ul>
- <li><b><font size="+1">Chrome</font></b>
- <br><font color="red"><b>Note: this is relatively untested, but appears to
- work.</b></font><br>
- If you are running the DevChannel version of Google Chrome on Windows
x86
- (<a
href="http://dev.chromium.org/getting-involved/dev-channel";>instructions</a>
for
- switching to DevChannel), you can install the
- <a
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/npapi/prebuilt/gwtdmp.crx";>GWT
Chrome extension</a>.
- Note that performance is slower than the other
- browsers right now because the plugin runs in an isolated process,
though
- we may be able to improve performance before the final release.
Also, you
- may get a "plugin unresponsive" warning which is annoying but
harmless.
- <p>
- <li><b><font size="+1">Firefox</font></b>
- <br>Install the appropriate Firefox plugin via the normal plugin install
- process.
- <ul>
- <li><a
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/xpcom/prebuilt/gwt-dmp-ff2.xpi";>Version
1.5-2.0</a> (Mac PPC/x86, Linux x86/x86_64)
- <li><a
-
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/xpcom/prebuilt/gwt-dmp-ff3.xpi";>Version
- 3.0</a> (Win x86, Mac PPC/x86, Linux x86/x86_64)
- <br><i>note that some Linux
- distributions need a plugin built with alternate libraries which will be
- available soon</i>
- <li><a
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/xpcom/prebuilt/gwt-dmp-ff3+.xpi";>Version
3.0 alternate libraries</a> (try this if the one above doesn't work on
Linux, known to be needed on Fedora Core 10))
- <li><a
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/xpcom/prebuilt/gwt-dmp-ff35.xpi";>Version
3.5</a> (Win x86, Mac PPC/x86, Linux x86/x86_64)
- </ul>
- <br>
- <li><b><font size="+1">Safari 3/4 (Mac PPC/x86)</font></b>
- <ul>
- <li>Run the installer from this <a
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/webkit/prebuilt/oophm.dmg";>disk
image</a>.
- <br><font color="red">Note that x86_64 is not yet supported, which means
- Safari on Snow Leopard is not yet supported.</font>
- </ul>
- <br>
- <li><b><font size="+1">Internet Explorer on Windows (32-bit IE)</font></b>
- <ul>
- <li>Download and run the "<a
href="http://google-web-toolkit.googlecode.com/svn/trunk/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi";>GWT
Dev Mode Plugin for IE</a>" installer.
- </ul>
-</ul>
-
-<h2>Troubleshooting</h2>
-If you believe you have the plugin installed in your current browser (and
-profile, in the case of Firefox), see the <a
href="http://code.google.com/p/google-web-toolkit/wiki/TroubleshootingOOPHM";>TroubleshootingOOPHM</a>
wiki page.
</body>
</html>
=======================================
--- /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Fri Nov 13
12:34:04 2009
+++ /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Mon Nov 16
15:49:37 2009
@@ -48,13 +48,6 @@
"supported" : false
},
- "safari-mac-sl" :
- {
- "caption" : "Sorry, at the moment, there is not yet a GWT
Developer Plugin for Safari on Mac OS X 10.6",
- "url" : troubleshootingUrl,
- "supported" : false
- },
-
"safari-iphone" :
{
"caption" : "Sorry, there is currently no GWT Developer Plugin
for mobile Safari",
@@ -124,8 +117,8 @@
"safari-mac" :
{
"caption" : "Download the GWT Developer Plugin<br>For Safari",
- "url" :
"http://google-web-toolkit.googlecode.com/svn/trunk/plugins/webkit/prebuilt/oophm.dmg";,
- "platforms" : "Mac x86/PPC",
+ "url" :
"https://dl-ssl.google.com/gwt/plugins/safari/gwt-dev-plugin.dmg";,
+ "platforms" : "Mac x86/x86_64/PPC",
"supported" : true
}
}
@@ -133,7 +126,7 @@
var ua = navigator.userAgent.toLowerCase();
- var id = 'unsupported';
+ var id = 'unknown';
if (ua.indexOf("webkit") != -1) {
if ( (ua.indexOf("iphone") != -1) || (ua.indexOf("ipod") != -1) ) {
id = 'safari-iphone';
@@ -155,11 +148,7 @@
// unknown Chrome platform
}
} else if (ua.indexOf("macintosh") != -1) {
- if (ua.indexOf("mac os x 10_6") != -1) {
- id = 'safari-mac-sl';
- } else {
- id = 'safari-mac';
- }
+ id = 'safari-mac';
} else if (ua.indexOf("windows") != -1) {
id = 'safari-win';
}
=======================================
--- /releases/2.0/plugins/MissingPlugin/war/WEB-INF/appengine-web.xml Fri
Nov 13 16:43:36 2009
+++ /releases/2.0/plugins/MissingPlugin/war/WEB-INF/appengine-web.xml Mon
Nov 16 15:49:37 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0";>
<application>gwt-dev-plugin-missing</application>
- <version>1</version>
+ <version>2</version>
<!-- Configure java.util.logging -->
<system-properties>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
