s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make sure that servlet configurations are injected even upon reloading the servlet context

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@929 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-06-01 08:02:16 +00:00
parent ba2d94cc63
commit 6dbab84ba6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/src/com/metaweb/gridworks/Gridworks.java
View File

@ -150,8 +150,6 @@ class GridworksServer extends Server {
logger.info("Initializing context: '" + contextPath + "' from '" + webapp.getAbsolutePath() + "'"); logger.info("Initializing context: '" + contextPath + "' from '" + webapp.getAbsolutePath() + "'");
WebAppContext context = new WebAppContext(webapp.getAbsolutePath(), contextPath); WebAppContext context = new WebAppContext(webapp.getAbsolutePath(), contextPath);
context.setMaxFormContentSize(1048576); context.setMaxFormContentSize(1048576);
//context.setCopyWebDir(false);
//context.setDefaultsDescriptor(null);
this.setHandler(context); this.setHandler(context);
this.setStopAtShutdown(true); this.setStopAtShutdown(true);
@ -165,12 +163,7 @@ class GridworksServer extends Server {
// start the server // start the server
this.start(); this.start();
// inject configuration parameters in the servlets configure(context);
// NOTE: this is done *after* starting the server because jetty might override the init
// parameters if we set them in the webapp context upon reading the web.xml file
ServletHolder servlet = context.getServletHandler().getServlet("gridworks");
servlet.setInitParameter("gridworks.data", getDataDir());
servlet.doStart();
} }
@Override @Override
@ -215,6 +208,8 @@ class GridworksServer extends Server {
logger.info("Starting context: " + contextRoot.getAbsolutePath()); logger.info("Starting context: " + contextRoot.getAbsolutePath());
context.start(); context.start();
configure(context);
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
@ -236,7 +231,16 @@ class GridworksServer extends Server {
} }
}); });
} }
// inject configuration parameters in the servlets
// NOTE: this is done *after* starting the server because jetty might override the init
// parameters if we set them in the webapp context upon reading the web.xml file
static private void configure(WebAppContext context) throws Exception {
ServletHolder servlet = context.getServletHandler().getServlet("gridworks");
servlet.setInitParameter("gridworks.data", getDataDir());
servlet.doStart();
}
static private String getDataDir() { static private String getDataDir() {
String data_dir = Configurations.get("gridworks.data_dir"); String data_dir = Configurations.get("gridworks.data_dir");