Made per-context storage roots a Tomcat-specific function.

[jsvc.git] / src / dolda / jsvc / j2ee / TomcatContext.java

diff --git a/src/dolda/jsvc/j2ee/TomcatContext.java b/src/dolda/jsvc/j2ee/TomcatContext.java
index 6dd1e93..db53550 100644 (file)
--- 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);
        }