X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Fj2ee%2FServlet.java;h=4d0d3bdfb268df7060c8b4df773d7d47ec8fcf5c;hb=104fa78539da892fb3687325bde4759461d5eac4;hp=d050c017f05059e33af06b2f889dfe3925cedbd5;hpb=00013ab771bb86a62e6f2fc1f4304755d96c75c1;p=jsvc.git

diff --git a/src/dolda/jsvc/j2ee/Servlet.java b/src/dolda/jsvc/j2ee/Servlet.java
index d050c01..4d0d3bd 100644
--- a/src/dolda/jsvc/j2ee/Servlet.java
+++ b/src/dolda/jsvc/j2ee/Servlet.java
@@ -1,14 +1,59 @@
 package dolda.jsvc.j2ee;
 
 import dolda.jsvc.*;
+import java.lang.reflect.*;
+import java.util.*;
 import java.io.*;
 import javax.servlet.http.*;
+import javax.servlet.*;
 
 public class Servlet extends HttpServlet {
     private Responder root;
+    private ThreadGroup workers;
+    private long reqs = 0;
+
+    public void init() throws ServletException {
+	workers = new ThreadGroup("JSvc worker threads") {
+		public void uncaughtException(Thread t, Throwable e) {
+		    log("Worker thread terminated with an uncaught exception", e);
+		}
+	    };
+	Properties sprop = new Properties();
+	try {
+	    InputStream pi = Servlet.class.getClassLoader().getResourceAsStream("jsvc.properties");
+	    try {
+		sprop.load(pi);
+	    } finally {
+		pi.close();
+	    }
+	} catch(IOException e) {
+	    throw(new Error(e));
+	}
+	String clnm = (String)sprop.get("jsvc.bootstrap");
+	if(clnm == null)
+	    throw(new ServletException("No JSvc bootstrapper specified"));
+	try {
+	    Class<?> rc = Class.forName(clnm);
+	    Method cm = rc.getMethod("responder");
+	    Object resp = cm.invoke(null);
+	    if(!(resp instanceof Responder))
+		throw(new ServletException("JSvc bootstrapper did not return a responder"));
+	    root = (Responder)resp;
+	} catch(ClassNotFoundException e) {
+	    throw(new ServletException("Invalid JSvc bootstrapper specified", e));
+	} catch(NoSuchMethodException e) {
+	    throw(new ServletException("Invalid JSvc bootstrapper specified", e));
+	} catch(IllegalAccessException e) {
+	    throw(new ServletException("Invalid JSvc bootstrapper specified", e));
+	} catch(InvocationTargetException e) {
+	    throw(new ServletException("JSvc bootstrapper failed", e));
+	}
+    }
     
-    public void init() {
-	
+    public void destroy() {
+	workers.interrupt();
+	if(root instanceof ContextResponder)
+	    ((ContextResponder)root).destroy();
     }
     
     public void service(HttpServletRequest req, HttpServletResponse resp) {
@@ -18,7 +63,15 @@ public class Servlet extends HttpServlet {
 	} catch(UnsupportedEncodingException e) {
 	    throw(new Error(e));
 	}
+	long mynum = reqs++;
 	Request rr = new J2eeRequest(getServletConfig(), req, resp);
-	root.respond(rr);
+	RequestThread w = new RequestThread(root, rr, workers, "Worker thread " + mynum);
+	w.start();
+	try {
+	    w.join();
+	} catch(InterruptedException e) {
+	    w.interrupt();
+	    return;
+	}
     }
 }