give xt.shell its own package

[org.ibex.xt-crawshaw.git] / src / java / org / ibex / xt / shell / Servlet.java

diff --git a/src/java/org/ibex/xt/ShellServlet.java b/src/java/org/ibex/xt/shell/Servlet.java
similarity index 85%
rename from src/java/org/ibex/xt/ShellServlet.java
rename to src/java/org/ibex/xt/shell/Servlet.java
index e9fc0a8..44cc346 100644 (file)
--- a/src/java/org/ibex/xt/ShellServlet.java
+++ b/src/java/org/ibex/xt/shell/Servlet.java
@@ -1,15 +1,15 @@
-package org.ibex.xt;
+package org.ibex.xt.shell;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
+import org.ibex.xt.Prevalence;
 import org.ibex.js.*;
 
 import org.prevayler.*;
 
-
-public class ShellServlet extends HttpServlet {
+public class Servlet extends HttpServlet {
     private ServletContext cx = null;
     private Prevayler prevayler;
     private JS prevalent;
@@ -22,8 +22,8 @@ public class ShellServlet extends HttpServlet {
     }
 
     public void doPost(HttpServletRequest rq, HttpServletResponse rs) throws IOException {
-        Shell.Request r;
-        try { r = (Shell.Request)new ObjectInputStream(rq.getInputStream()).readObject(); }
+        Request r;
+        try { r = (Request)new ObjectInputStream(rq.getInputStream()).readObject(); }
         catch (ClassNotFoundException e) {
             e.printStackTrace();
             throw new IOException("exception receiving request, class not found");
@@ -47,8 +47,8 @@ public class ShellServlet extends HttpServlet {
             }
             rq.getSession().setAttribute("scope", scope);
         }
-        Object ret;
-        try { ret = r.process(scope); } catch (JSExn e) { ret = e; }
+        Request.Response ret;
+        try { ret = r.process(scope); } catch (JSExn e) { ret = new Request.Response(e); }
         new ObjectOutputStream(rs.getOutputStream()).writeObject(ret);
     }
 }