opendev
/
gerrit
Code Issues Proposed changes

GWT: Clean up dev mode code 

GWT dev mode was removed in If541bc48. Clean up left over places.

Change-Id: I1c7bcfeca8ff828c322b6d3ed19252ceb8713628
This commit is contained in:
David Ostrovsky 2015-05-14 11:34:10 +02:00
parent 781f1311bd
commit 3f5dc1683b
4 changed files with 15 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java
View File

@ -54,8 +54,6 @@ import javax.servlet.http.HttpServletResponse;
@SuppressWarnings("serial")
@Singleton
class BecomeAnyAccountLoginServlet extends HttpServlet {
private static final boolean IS_DEV = Boolean.getBoolean("Gerrit.GwtDevMode");
private final SchemaFactory<ReviewDb> schema;
private final DynamicItem<WebSession> webSession;
private final AccountManager accountManager;
@ -120,14 +118,6 @@ class BecomeAnyAccountLoginServlet extends HttpServlet {
final StringBuilder rdr = new StringBuilder();
rdr.append(req.getContextPath());
rdr.append("/");
if (IS_DEV && req.getParameter("gwt.codesvr") != null) {
if (rdr.indexOf("?") < 0) {
rdr.append("?");
} else {
rdr.append("&");
}
rdr.append("gwt.codesvr=").append(req.getParameter("gwt.codesvr"));
}
if (res.isNew()) {
rdr.append('#' + PageLinks.REGISTER);
@ -155,12 +145,6 @@ class BecomeAnyAccountLoginServlet extends HttpServlet {
if (doc == null) {
throw new FileNotFoundException("No " + pageName + " in webapp");
}
if (!IS_DEV) {
final Element devmode = HtmlDomUtil.find(doc, "gwtdevmode");
if (devmode != null) {
devmode.getParentNode().removeChild(devmode);
}
}
Element userlistElement = HtmlDomUtil.find(doc, "userlist");
ReviewDb db = schema.open();

38
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
View File

@ -72,7 +72,6 @@ import javax.servlet.http.HttpServletResponse;
public class HostPageServlet extends HttpServlet {
private static final Logger log =
LoggerFactory.getLogger(HostPageServlet.class);
private static final boolean IS_DEV = Boolean.getBoolean("Gerrit.GwtDevMode");
private static final String HPD_ID = "gerrit_hostpagedata";
private static final int DEFAULT_JS_LOAD_TIMEOUT = 5000;
@ -129,32 +128,25 @@ public class HostPageServlet extends HttpServlet {
}
String src = "gerrit_ui/gerrit_ui.nocache.js";
if (!IS_DEV) {
Element devmode = HtmlDomUtil.find(template, "gwtdevmode");
if (devmode != null) {
devmode.getParentNode().removeChild(devmode);
}
InputStream in = servletContext.getResourceAsStream("/" + src);
if (in != null) {
Hasher md = Hashing.md5().newHasher();
InputStream in = servletContext.getResourceAsStream("/" + src);
if (in != null) {
Hasher md = Hashing.md5().newHasher();
try {
try {
try {
final byte[] buf = new byte[1024];
int n;
while ((n = in.read(buf)) > 0) {
md.putBytes(buf, 0, n);
}
} finally {
in.close();
final byte[] buf = new byte[1024];
int n;
while ((n = in.read(buf)) > 0) {
md.putBytes(buf, 0, n);
}
} catch (IOException e) {
throw new IOException("Failed reading " + src, e);
} finally {
in.close();
}
src += "?content=" + md.hash().toString();
} else {
log.debug("No " + src + " in webapp root; keeping noncache.js URL");
} catch (IOException e) {
throw new IOException("Failed reading " + src, e);
}
src += "?content=" + md.hash().toString();
} else {
log.debug("No " + src + " in webapp root; keeping noncache.js URL");
}
noCacheName = src;

28
gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html
View File

@ -1,34 +1,6 @@
<html>
<head>
<title>Gerrit Code Review</title>
<script id="gwtdevmode">
(function () {
var pn = 'gwt.codesvr';
var cn = 'gerrit_ui.' + pn;
var p_start = window.location.search.indexOf(pn + '=');
if (p_start != -1) {
p_start = p_start + pn.length + 1;
var p_end = window.location.search.indexOf(";", p_start);
if (p_end == -1) p_end = window.location.search.length;
var v = window.location.search.substring(p_start, p_end);
var e = new Date();
e.setDate(e.getDate() + 1);
document.cookie = cn + "=" + v + ';expires=' + e.toGMTString();
} else if (document.cookie.length != 0) {
var c_start = document.cookie.indexOf(cn + '=');
if (c_start != -1) {
c_start = c_start + cn.length + 1;
var c_end = document.cookie.indexOf(";", c_start);
if (c_end == -1) c_end = document.cookie.length;
var v = document.cookie.substring(c_start, c_end);
window.location.replace('?' + pn + '=' + v + document.location.hash);
}
}
})();
</script>
<style id="gerrit_sitecss" type="text/css"></style>
</head>
<body>

28
gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/HostPage.html
View File

@ -2,34 +2,6 @@
<head>
<title>Gerrit Code Review</title>
<meta name="gwt:property" content="locale=en_US" />
<script id="gwtdevmode">
(function () {
var pn = 'gwt.codesvr';
var cn = 'gerrit_ui.' + pn;
var p_start = window.location.search.indexOf(pn + '=');
if (p_start != -1) {
p_start = p_start + pn.length + 1;
var p_end = window.location.search.indexOf(";", p_start);
if (p_end == -1) p_end = window.location.search.length;
var v = window.location.search.substring(p_start, p_end);
var e = new Date();
e.setDate(e.getDate() + 1);
document.cookie = cn + "=" + v + ';expires=' + e.toGMTString();
} else if (document.cookie.length != 0) {
var c_start = document.cookie.indexOf(cn + '=');
if (c_start != -1) {
c_start = c_start + cn.length + 1;
var c_end = document.cookie.indexOf(";", c_start);
if (c_end == -1) c_end = document.cookie.length;
var v = document.cookie.substring(c_start, c_end);
window.location.replace('?' + pn + '=' + v + document.location.hash);
}
}
})();
</script>
<script id="gerrit_hostpagedata"></script>
<style id="gerrit_sitecss" type="text/css"></style>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />