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

* Jetty:

Browse Source 
- Set default cache-control for webapps and eepsite
    - Disable dir listing for console webapps
  * WebAppStarter: Remove static log
This commit is contained in:
zzz
2012-03-14 12:04:20 +00:00
parent 326b9998fd
commit 17f9280b3f
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,15 +2,12 @@ package net.i2p.router.web;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import net.i2p.I2PAppContext;
import net.i2p.util.FileUtil;
import net.i2p.util.Log;
import net.i2p.util.SecureDirectory;
import net.i2p.util.PortMapper;
@ -39,11 +36,16 @@ import org.mortbay.jetty.handler.ContextHandlerCollection;
*/
public class WebAppStarter {
static final Map<String, Long> warModTimes = new ConcurrentHashMap();
static private Log _log;
private static final Map<String, Long> warModTimes = new ConcurrentHashMap();
static final Map INIT_PARAMS = new HashMap(4);
//static private Log _log;
static {
_log = ContextHelper.getContext(null).logManager().getLog(WebAppStarter.class); ;
//_log = ContextHelper.getContext(null).logManager().getLog(WebAppStarter.class); ;
// see DefaultServlet javadocs
String pfx = "org.mortbay.jetty.servlet.Default.";
INIT_PARAMS.put(pfx + "cacheControl", "max-age=86400");
INIT_PARAMS.put(pfx + "dirAllowed", "false");
}
@ -55,7 +57,8 @@ public class WebAppStarter {
String appName, String warPath) throws Exception {
File tmpdir = new SecureDirectory(ctx.getTempDir(), "jetty-work-" + appName + ctx.random().nextInt());
WebAppContext wac = addWebApp(ctx, server, appName, warPath, tmpdir);
_log.debug("Loading war from: " + warPath);
//_log.debug("Loading war from: " + warPath);
wac.setInitParams(INIT_PARAMS);
wac.start();
}
@ -102,8 +105,6 @@ public class WebAppStarter {
// this does the passwords...
RouterConsoleRunner.initialize(wac);
// see WebAppConfiguration for info
String[] classNames = wac.getConfigurationClasses();
String[] newClassNames = new String[classNames.length + 1];