X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Fj2ee%2FTomcatContext.java;h=db535505b9ca7f821d332a2ec8bc3c2bad8c24f2;hb=67fe85aafa08a3b3081218d698ae166b35d5bc95;hp=6dd1e939aae7e5207a2daa7882ac1a134401889f;hpb=5027c00aa2240518bc76c9db24ecdc27019cc72e;p=jsvc.git

diff --git a/src/dolda/jsvc/j2ee/TomcatContext.java b/src/dolda/jsvc/j2ee/TomcatContext.java
index 6dd1e93..db53550 100644
--- a/src/dolda/jsvc/j2ee/TomcatContext.java
+++ b/src/dolda/jsvc/j2ee/TomcatContext.java
@@ -55,13 +55,16 @@ public class TomcatContext extends J2eeContext {
 	    String basename = System.getProperty("catalina.base");
 	    base = new File(basename);
 	} catch(SecurityException e) {
-	    logger.log(Level.WARNING, "no permssions to fetch Tomcat base directory while reading configuration", e);
+	    logger.log(Level.WARNING, "no permissions to fetch Tomcat base directory while reading configuration", e);
 	    return;
 	}
-	config.put("jsvc.storage", "file:" + new File(new File(base, "work"), "jsvc").getPath());
+	File sroot = new File(new File(base, "work"), "jsvc");
+	if(name != null)
+	    sroot = new File(sroot, name());
+	sysconfig.put("jsvc.storage", "file:" + sroot.getPath());
 	File cdir = new File(base, "conf");
 	try {
-	    loadprops(config, new File(cdir, "jsvc.properties"));
+	    loadprops(sysconfig, new File(cdir, "jsvc.properties"));
 	} catch(SecurityException e) {
 	    logger.log(Level.WARNING, "no permssions to read from Tomcat conf directory while reading configuration", e);
 	}