From bb13e9521c7120aaf0bbbcc15dab318c31d76d0c Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 10 Jul 2006 00:32:08 +0000 Subject: [PATCH] disable everything that requires extraneous third-party jarfiles darcs-hash:20060710003208-5007d-e0b0af3794eda0f8fcfb05c0d11a92189b627e25.gz --- src/org/ibex/xt/Prevalence.java | 23 ++++++++++++----------- src/org/ibex/xt/Servlet.java | 10 ++++++---- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/org/ibex/xt/Prevalence.java b/src/org/ibex/xt/Prevalence.java index 2bfbfb1..a0be70b 100644 --- a/src/org/ibex/xt/Prevalence.java +++ b/src/org/ibex/xt/Prevalence.java @@ -11,32 +11,32 @@ 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.XmlSnapshotManager; +//import com.thoughtworks.xstream.*; +//import org.prevayler.*; +//import org.prevayler.implementation.snapshot.XmlSnapshotManager; public class Prevalence { public static abstract class PrevalentServlet extends HttpServlet { protected Hashtable prevalent; - protected Prevayler prevayler; + //protected Prevayler prevayler; protected ServletContext cx = null; public void destroy() { try { synchronized(this.getClass()) { - Prevayler privatePrevayler = prevayler; - if (prevayler == null) return; - prevayler = null; - Prevalence.destroy(cx, prevayler); + //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 = (Hashtable)prevayler.prevalentSystem(); + //prevayler = Prevalence.getPrevayler(cx); + //prevalent = (Hashtable)prevayler.prevalentSystem(); } } - + /* static final Hashtable prevaylers = new Hashtable(); public static void destroy(ServletContext cx, Prevayler prevayler) { try { @@ -117,4 +117,5 @@ public class Prevalence { } catch (Exception e) { throw new RuntimeException(e); } } } + */ } diff --git a/src/org/ibex/xt/Servlet.java b/src/org/ibex/xt/Servlet.java index 80545be..01acda7 100644 --- a/src/org/ibex/xt/Servlet.java +++ b/src/org/ibex/xt/Servlet.java @@ -11,9 +11,9 @@ 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 Prevalence.PrevalentServlet { @@ -61,11 +61,11 @@ public class Servlet extends Prevalence.PrevalentServlet { }; //#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; @@ -101,8 +101,10 @@ public class Servlet extends Prevalence.PrevalentServlet { 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())); } } -- 1.7.10.4