opendev/gerrit
Code Issues Proposed changes

Daemon: Add flag to force PolyGerrit development mode

Browse Source 
Frontend developers shouldn't even have to open Eclipse in order to
get started developing PolyGerrit: Eclipse is far from the most
popular frontend development environment, and setting it up for the
first time is an unnecessary barrier.

Add a flag --polygerrit-dev to the daemon command that does two
things:
1. Act as if gerrit.enablePolyGerrit is set to true, enabling the
   PolyGerrit UI.
2. Serve PolyGerrit from the local buck-out directory, as if it were
   launched from Eclipse, ignoring the version compiled into the war.

Change-Id: Ibfe92d3d53637c5c8424e3200791f28260c0c9fa
This commit is contained in:
Dave Borowitz
2015-11-15 17:10:57 -05:00
parent e1e1cdc5e0
commit f7c2cfa29b
5 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
View File

@@ -580,41 +580,35 @@ public final class GerritLauncher {
URL u = self.getResource(self.getSimpleName() + ".class");
if (u == null) {
throw new FileNotFoundException("Cannot find class " + self.getName());
} else if (!"file".equals(u.getProtocol())) {
} else if ("jar".equals(u.getProtocol())) {
String p = u.getPath();
try {
u = new URL(p.substring(0, p.indexOf('!')));
} catch (MalformedURLException e) {
FileNotFoundException fnfe =
new FileNotFoundException("Not a valid jar file: " + u);
fnfe.initCause(e);
throw fnfe;
}
}
if (!"file".equals(u.getProtocol())) {
throw new FileNotFoundException("Cannot find extract path from " + u);
}
// Pop up to the top level classes folder that contains us.
Path dir = Paths.get(u.getPath());
String myName = self.getName();
for (;;) {
int dot = myName.lastIndexOf('.');
if (dot < 0) {
dir = dir.getParent();
break;
while (!name(dir).equals("buck-out")) {
Path parent = dir.getParent();
if (parent == null || parent.equals(dir)) {
throw new FileNotFoundException("Cannot find buck-out from " + u);
}
myName = myName.substring(0, dot);
dir = dir.getParent();
dir = parent;
}
dir = popdir(u, dir, "classes");
dir = popdir(u, dir, "eclipse");
if (last(dir).equals("buck-out")) {
return dir;
}
throw new FileNotFoundException("Cannot find buck-out from " + u);
return dir;
}
private static String last(Path dir) {
return dir.getName(dir.getNameCount() - 1).toString();
}
private static Path popdir(URL u, Path dir, String name)
throws FileNotFoundException {
if (last(dir).equals(name)) {
return dir.getParent();
}
throw new FileNotFoundException("Cannot find buck-out from " + u);
private static String name(Path dir) {
return dir.getFileName().toString();
}
private static ClassLoader useDevClasspath()