X-Git-Url: http://dolda2000.com/gitweb/?p=jsvc.git;a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Fscgi%2FDirServer.java;h=7920977a91c67102e3b11275749d0df5c757ac5f;hp=bd8d43c89f6fecb2eccda52d3d7dbd191fa3c8ac;hb=22779185ec3cd3ab6fafdbcbe675161ceae9ce7d;hpb=a13bfa2c65aa523f9981531f3db1f125fbcfc19e

diff --git a/src/dolda/jsvc/scgi/DirServer.java b/src/dolda/jsvc/scgi/DirServer.java
index bd8d43c..7920977 100644
--- a/src/dolda/jsvc/scgi/DirServer.java
+++ b/src/dolda/jsvc/scgi/DirServer.java
@@ -10,12 +10,12 @@ import dolda.jsvc.j2ee.PosixArgs;
 
 public class DirServer extends Server {
     private final Map<File, DSContext> contexts = new HashMap<File, DSContext>();
-    private final File datroot;
+    private final Environment env;
     private final Logger logger = Logger.getLogger("dolda.jsvc.scgi.dirserver");
     
-    public DirServer(ServerSocket sk, File datroot) {
+    public DirServer(ServerSocket sk, Environment env) {
 	super(sk);
-	this.datroot = datroot;
+	this.env = env;
     }
 
     private DSContext context(File file) throws ThreadContext.CreateException {
@@ -31,7 +31,7 @@ public class DirServer extends Server {
 		}
 	    }
 	    if(ctx == null) {
-		ctx = new DSContext(file, datroot);
+		ctx = new DSContext(file, env);
 		contexts.put(file, ctx);
 		logger.config(String.format(act, file, ctx.name()));
 	    }
@@ -85,11 +85,8 @@ public class DirServer extends Server {
 	    usage(System.err);
 	    System.exit(1);
 	}
-	if(datroot == null) {
-	    datroot = new File(System.getProperty("user.home"), ".jsvc");
-	    if(!datroot.exists() || !datroot.isDirectory())
-		datroot = null;
-	}
+	Environment env = (datroot == null)?new Environment():new Environment(datroot);
+	env.initvm();
 	int port = Integer.parseInt(opt.rest[0]);
 	ServerSocket sk;
 	try {
@@ -99,7 +96,7 @@ public class DirServer extends Server {
 	    System.exit(1);
 	    return; /* Because javac is stupid. :-/ */
 	}
-	DirServer s = new DirServer(sk, datroot);
+	DirServer s = new DirServer(sk, env);
 	if(charset != null)
 	    s.headcs = charset;