disable everything that requires extraneous third-party jarfiles

[org.ibex.xt.git] / src / org / ibex / xt / Servlet.java

diff --git a/src/org/ibex/xt/Servlet.java b/src/org/ibex/xt/Servlet.java
index 0265e23..01acda7 100644 (file)
--- a/src/org/ibex/xt/Servlet.java
+++ b/src/org/ibex/xt/Servlet.java
@@ -11,33 +11,15 @@ import java.net.*;
 import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
-import com.thoughtworks.xstream.*;
-import org.prevayler.*;
-import org.prevayler.implementation.snapshot.*;
+//import com.thoughtworks.xstream.*;
+//import org.prevayler.*;
+//import org.prevayler.implementation.snapshot.*;
 
-public class Servlet extends HttpServlet {
+public class Servlet extends Prevalence.PrevalentServlet {
 
     public static final JS METHOD = new JS.Method();
     private ServletScope servletscope = null;
     private String path;
-    private Prevayler prevayler;
-    private JS prevalent;
-    private ServletContext cx = null;
-
-    public void destroy() { try {
-        synchronized(this.getClass()) {
-            Prevayler privatePrevayler = prevayler;
-            if (prevayler == null) return;
-            prevayler = null;
-            Prevalence.destroy(cx, prevayler);
-        }
-    } catch (Exception e) { e.printStackTrace(); } }
-
-    public void init(ServletConfig sc) throws ServletException {
-        cx = sc.getServletContext();
-        prevayler = Prevalence.getPrevayler(cx);
-        prevalent = (JS)prevayler.prevalentSystem();
-    }
 
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { doGet(request, response); }
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -79,11 +61,11 @@ public class Servlet extends HttpServlet {
             };
         //#end
 
+        //case "prevalent":             return (JS)prevayler.prevalentSystem();
         public JS _get(JS key) throws JSExn {
             //#switch(JSU.toString(key))
             case "body":
             case "arg":                   return null;
-            case "prevalent":             return (JS)prevayler.prevalentSystem();
             case "request":               return SUBPROPERTY;
             case "request.user":          return JSU.S(request.getRemoteUser());
             case "request.header":        return requestHeader;
@@ -119,8 +101,10 @@ public class Servlet extends HttpServlet {
             case "response.redirect":     response.sendRedirect(JSU.toString(val));
             case "response.contentType":  response.setContentType(JSU.toString(val));
             case "transaction":
+                /*
                 try { prevayler.execute(new Prevalence.JSTransaction((JS)val));
                 } catch (Exception e) { e.printStackTrace(); throw new RuntimeException(e); }
+                */
             //#end
             } catch (IOException e) { throw new JSExn(JSU.S(e.toString())); }
         }