X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Fj2ee%2FServlet.java;h=082113c9f0a92bc54c27b80f30bc1d5673b21d2b;hb=6a0cb6cbc9b46f7e220e27e08b9eaa8805e99d6d;hp=d726474bc87746c8765f052a37da5eb3f228a987;hpb=9f01683a8fd45c753e6aa6580705e0810b701355;p=jsvc.git

diff --git a/src/dolda/jsvc/j2ee/Servlet.java b/src/dolda/jsvc/j2ee/Servlet.java
index d726474..082113c 100644
--- a/src/dolda/jsvc/j2ee/Servlet.java
+++ b/src/dolda/jsvc/j2ee/Servlet.java
@@ -11,18 +11,18 @@ public class Servlet extends HttpServlet {
     private ThreadContext tg;
 
     public void init(ServletConfig cfg) throws ServletException {
-	Properties sprop = new Properties();
+	J2eeContext ctx = J2eeContext.create(cfg);
 	try {
 	    InputStream pi = Servlet.class.getClassLoader().getResourceAsStream("jsvc.properties");
 	    try {
-		sprop.load(pi);
+		ctx.loadconfig(pi);
 	    } finally {
 		pi.close();
 	    }
 	} catch(IOException e) {
 	    throw(new Error(e));
 	}
-	String clnm = (String)sprop.get("jsvc.bootstrap");
+	String clnm = ctx.libconfig("jsvc.bootstrap", null);
 	if(clnm == null)
 	    throw(new ServletException("No JSvc bootstrapper specified"));
 	Class<?> bc;
@@ -31,7 +31,6 @@ public class Servlet extends HttpServlet {
 	} catch(ClassNotFoundException e) {
 	    throw(new ServletException("Invalid JSvc bootstrapper specified", e));
 	}
-	ServerContext ctx = J2eeContext.create(cfg);
 	String tgn;
 	if(ctx.name() != null)
 	    tgn = "JSvc service for " + ctx.name();