User: jules_gosnell
Date: 01/07/08 03:43:52
Modified: jetty/src/main/org/jboss/jetty Jetty.java
Log:
only support one config file
Revision Changes Path
1.12 +25 -10 contrib/jetty/src/main/org/jboss/jetty/Jetty.java
Index: Jetty.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/Jetty.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Jetty.java 2001/06/23 10:06:07 1.11
+++ Jetty.java 2001/07/08 10:43:52 1.12
@@ -98,7 +98,6 @@
setJettyHome(String jettyHome) // not public
{
System.setProperty("jetty.home", jettyHome);
- Log.event("set JettyHome to "+jettyHome);
}
public String
@@ -144,22 +143,37 @@
}
//----------------------------------------
-
+ // configuration property
+ //----------------------------------------
+
+ String _configuration=null;
+
public void
- addConfiguration(String configUrl)
+ setConfiguration(String configUrl)
{
+ if (configUrl==null)
+ return;
+
try
{
- new XmlConfiguration(new URL(configUrl)).configure(this);
- Log.event("successfully added configuration: "+configUrl);
+ com.mortbay.Util.Log.event("loading config: "+configUrl);
+ configure(configUrl);
+ com.mortbay.Util.Log.event("loaded config: "+configUrl);
+ _configuration=configUrl;
}
catch (Exception e)
{
- Log.event("problem adding configuration: "+configUrl);
+ Log.event("problem loading configuration: "+configUrl);
e.printStackTrace();
}
}
+ public String
+ getConfiguration()
+ {
+ return _configuration;
+ }
+
//----------------------------------------------------------------------------
// 'deploy' interface
//----------------------------------------------------------------------------
@@ -177,7 +191,9 @@
wa.setURL(new URL(warUrl));
// deploy the WebApp
- WebApplicationContext app=new WebApplicationContext(this, path+"/*");
+
+ String fixedPath=path+"/*";
+ WebApplicationContext app=new WebApplicationContext(this, fixedPath);
wa.setAppData(app);
addContext(null, app);
@@ -188,9 +204,8 @@
app.setClassLoader(cl);
wa.setClassLoader(cl);
- app.initialize(warUrl+(warUrl.endsWith("/")?"":"/"),
- getWebDefault(),
- getUnpackWars());
+ String fixedWarUrl=warUrl+(warUrl.endsWith("/")?"":"/");
+ app.initialize(fixedWarUrl, getWebDefault(), getUnpackWars());
wa.setName(app.getDisplayName());
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
