opendev/gerrit
Code Issues Proposed changes

Remove servlet-api from WAR/lib

Browse Source 
It is wrong to include the servlet API in a WAR's WEB-INF/lib
directory. This confuses some servlet containers who refuse to
load the Gerrit WAR. Instead package the Jetty runtime and the
servlet API in a new WEB-INF/pgm-lib directory.

Change-Id: Ic5fe14c735e781b2d78d2fa8d0d403a08b7ee21f
This commit is contained in:
Shawn O. Pearce
2012-10-21 21:15:36 -07:00
parent ea48b3c250
commit 136d6cc3a5
3 changed files with 85 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,27 +206,10 @@ public final class GerritLauncher {
final ZipEntry ze = e.nextElement();
if (ze.isDirectory()) {
continue;
}
if (ze.getName().startsWith("WEB-INF/lib/")) {
String name = ze.getName().substring("WEB-INF/lib/".length());
final File tmp = createTempFile(safeName(ze), ".jar");
final FileOutputStream out = new FileOutputStream(tmp);
try {
final InputStream in = zf.getInputStream(ze);
try {
final byte[] buf = new byte[4096];
int n;
while ((n = in.read(buf, 0, buf.length)) > 0) {
out.write(buf, 0, n);
}
} finally {
in.close();
}
} finally {
out.close();
}
jars.put(name, tmp.toURI().toURL());
} else if (ze.getName().startsWith("WEB-INF/lib/")) {
extractJar(zf, ze, jars);
} else if (ze.getName().startsWith("WEB-INF/pgm-lib/")) {
extractJar(zf, ze, jars);
}
}
} finally {
@@ -261,6 +244,31 @@ public final class GerritLauncher {
parent);
}
private static void extractJar(ZipFile zf, ZipEntry ze,
SortedMap<String, URL> jars) throws IOException {
File tmp = createTempFile(safeName(ze), ".jar");
FileOutputStream out = new FileOutputStream(tmp);
try {
InputStream in = zf.getInputStream(ze);
try {
byte[] buf = new byte[4096];
int n;
while ((n = in.read(buf, 0, buf.length)) > 0) {
out.write(buf, 0, n);
}
} finally {
in.close();
}
} finally {
out.close();
}
String name = ze.getName();
jars.put(
name.substring(name.lastIndexOf('/'), name.length()),
tmp.toURI().toURL());
}
private static void move(SortedMap<String, URL> jars,
String prefix,
List<URL> extapi) {