resolved some conflicts, added CommandLine

[sbp.git] / src / edu / berkeley / sbp / misc / ParserServlet.java

diff --git a/src/edu/berkeley/sbp/misc/ParserServlet.java b/src/edu/berkeley/sbp/misc/ParserServlet.java
index 9eeb7b8..d2f7d39 100644 (file)
--- a/src/edu/berkeley/sbp/misc/ParserServlet.java
+++ b/src/edu/berkeley/sbp/misc/ParserServlet.java
@@ -6,17 +6,19 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.chr.*;
 import java.util.*;
 import java.io.*;
-//import javax.servlet.*;
-//import javax.servlet.http.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import java.io.*;
 import java.net.*;
 import java.util.*;
 
-public class ParserServlet /*extends HttpServlet*/ {
-    /*
+public class ParserServlet extends HttpServlet {
+
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
         doPost(req, resp);
     }
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+        /*
         try {
         try {
             System.out.println("a");
@@ -70,7 +72,7 @@ public class ParserServlet /*extends HttpServlet*/ {
         } catch (Exception e) {
             throw new ServletException(e);
         }
-       
-  }
+        */
+    }
     */
 }