marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Jetty: Don't extract wars

Browse Source
This commit is contained in:
zzz
2012-03-17 21:52:17 +00:00
parent e2a39a3eb5
commit 02bde80725
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -415,6 +415,7 @@ public class RouterConsoleRunner {
(_listenPort != null ? _listenPort : _sslListenPort)); (_listenPort != null ? _listenPort : _sslListenPort));
tmpdir.mkdir(); tmpdir.mkdir();
rootWebApp.setTempDirectory(tmpdir); rootWebApp.setTempDirectory(tmpdir);
rootWebApp.setExtractWAR(false);
rootWebApp.setSessionHandler(new SessionHandler()); rootWebApp.setSessionHandler(new SessionHandler());
rootServletHandler = new ServletHandler(); rootServletHandler = new ServletHandler();
rootWebApp.setServletHandler(rootServletHandler); rootWebApp.setServletHandler(rootServletHandler);

2
apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
View File

@ -101,6 +101,8 @@ public class WebAppStarter {
WebAppContext wac = new WebAppContext(warPath, "/"+ appName); WebAppContext wac = new WebAppContext(warPath, "/"+ appName);
tmpdir.mkdir(); tmpdir.mkdir();
wac.setTempDirectory(tmpdir); wac.setTempDirectory(tmpdir);
// all the JSPs are precompiled, no need to extract
wac.setExtractWAR(false);
// this does the passwords... // this does the passwords...
RouterConsoleRunner.initialize(wac); RouterConsoleRunner.initialize(wac);

4
installer/resources/eepsite/jetty.xml
View File

@ -174,6 +174,7 @@
<New class="org.mortbay.jetty.deployer.ContextDeployer"> <New class="org.mortbay.jetty.deployer.ContextDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set> <Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="configurationDir">./eepsite/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> <Set name="scanInterval">0</Set>
</New> </New>
</Arg> </Arg>
@ -198,7 +199,8 @@
<Set name="contexts"><Ref id="Contexts"/></Set> <Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="webAppDir">./eepsite/webapps</Set> <Set name="webAppDir">./eepsite/webapps</Set>
<Set name="parentLoaderPriority">false</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="allowDuplicates">false</Set>
<Set name="defaultsDescriptor">./eepsite/etc/webdefault.xml</Set> <Set name="defaultsDescriptor">./eepsite/etc/webdefault.xml</Set>
</New> </New>