Moved the SCGI storage root default into Environment.

diff --git a/src/dolda/jsvc/scgi/DSContext.java b/src/dolda/jsvc/scgi/DSContext.java
index c72688707a6c9bfbf14a15f265210a5c052a711f..350e1c5dd7b1657b65448f539c0d9e11e0371df5 100644 (file)
--- a/src/dolda/jsvc/scgi/DSContext.java
+++ b/src/dolda/jsvc/scgi/DSContext.java
@@ -37,10 +37,6 @@ public class DSContext extends SimpleContext {
     }
     
     private void loadconfig() {
-       if(env.root != null) {
-           File sroot = new File(new File(env.root, "store"), name());
-           sysconfig.put("jsvc.storage", "file:" + sroot.getPath());
-       }
        sysconfig.putAll(env.sysconfig);
     }
     

diff --git a/src/dolda/jsvc/scgi/Environment.java b/src/dolda/jsvc/scgi/Environment.java
index e91f57a3dbecc3a8d2633867df606de2187ebbb5..b2f85bf5c845dcdb1ea6844572edb49ee8e03004 100644 (file)
--- a/src/dolda/jsvc/scgi/Environment.java
+++ b/src/dolda/jsvc/scgi/Environment.java
@@ -27,6 +27,8 @@ public class Environment {
     }
     
     private void loadconfig() {
+       File sroot = new File(root, "store");
+       sysconfig.put("jsvc.storage", "file:" + sroot.getPath());
        File conf = new File(root, "jsvc.properties");
        if(conf.exists()) {
            try {