Author: mwringe
Date: 2009-06-03 17:21:43 -0500 (Wed, 03 Jun 2009)
New Revision: 1956
Modified:
resources/trunk/jetty-deployer/src/main/java/org/codehaus/cargo/deployer/jetty/DeployerServlet.java
Log:
Update for Jetty 6.1.x
Modified: resources/trunk/jetty-deployer/src/main/java/org/codehaus/cargo/deployer/jetty/DeployerServlet.java
===================================================================
--- resources/trunk/jetty-deployer/src/main/java/org/codehaus/cargo/deployer/jetty/DeployerServlet.java 2009-05-26 16:20:12 UTC (rev 1955)
+++ resources/trunk/jetty-deployer/src/main/java/org/codehaus/cargo/deployer/jetty/DeployerServlet.java 2009-06-03 22:21:43 UTC (rev 1956)
@@ -79,8 +79,15 @@
public DeployerServlet(Server server)
{
this.server = server;
- //TODO find a better means of determining the configuration and webapp directories
- this.configHome = System.getProperty("config.home");
+ //TODO find a better means of determining the configuration and webapp directories
+ if (System.getProperty("jetty.home") != null)
+ {
+ this.configHome = System.getProperty("jetty.home");
+ }
+ else
+ {
+ this.configHome = System.getProperty("config.home");
+ }
this.webAppDirectory = configHome + "/webapps";
// TODO there could potentially be more than one context handler
@@ -221,7 +228,7 @@
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath(contextPath);
webappcontext.setWar(webappLocation);
- webappcontext.setDefaultsDescriptor(System.getProperty("config.home") + "/etc/webdefault.xml");
+ webappcontext.setDefaultsDescriptor(configHome + "/etc/webdefault.xml");
chc.addHandler(webappcontext);
try
{
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email
