From 02bde80725d3f64fd1fdf59d919b25558e86c7ea Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 17 Mar 2012 21:52:17 +0000
Subject: [PATCH] * Jetty: Don't extract wars
---
.../java/src/net/i2p/router/web/RouterConsoleRunner.java | 1 +
.../java/src/net/i2p/router/web/WebAppStarter.java | 2 ++
installer/resources/eepsite/jetty.xml | 4 +++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index 8a37195adb..3031997ee9 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -415,6 +415,7 @@ public class RouterConsoleRunner {
(_listenPort != null ? _listenPort : _sslListenPort));
tmpdir.mkdir();
rootWebApp.setTempDirectory(tmpdir);
+ rootWebApp.setExtractWAR(false);
rootWebApp.setSessionHandler(new SessionHandler());
rootServletHandler = new ServletHandler();
rootWebApp.setServletHandler(rootServletHandler);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 5d025f9676..f9b605d19b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -101,6 +101,8 @@ public class WebAppStarter {
WebAppContext wac = new WebAppContext(warPath, "/"+ appName);
tmpdir.mkdir();
wac.setTempDirectory(tmpdir);
+ // all the JSPs are precompiled, no need to extract
+ wac.setExtractWAR(false);
// this does the passwords...
RouterConsoleRunner.initialize(wac);
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index 64eb141645..acfb54cf58 100644
--- a/installer/resources/eepsite/jetty.xml
+++ b/installer/resources/eepsite/jetty.xml
@@ -174,6 +174,7 @@
<New class="org.mortbay.jetty.deployer.ContextDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="configurationDir">./eepsite/contexts</Set>
+ <!-- set to 60 to have it check for changes once a minute -->
<Set name="scanInterval">0</Set>
</New>
</Arg>
@@ -198,7 +199,8 @@
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="webAppDir">./eepsite/webapps</Set>
<Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
+ <!-- set to true if you have uncompiled jsps in your wars -->
+ <Set name="extract">false</Set>
<Set name="allowDuplicates">false</Set>
<Set name="defaultsDescriptor">./eepsite/etc/webdefault.xml</Set>
</New>
--
GitLab