Added a sample bsh service.

diff --git a/samples/bsh/.gitignore b/samples/bsh/.gitignore
new file mode 100644 (file)
index 0000000..ac55ebd
--- /dev/null
+++ b/samples/bsh/.gitignore
@@ -0,0 +1,3 @@
+/build
+/lib/jsvc.jar
+/lib/bsh.jar

diff --git a/samples/bsh/build.xml b/samples/bsh/build.xml
new file mode 100644 (file)
index 0000000..ad2e8c3
--- /dev/null
+++ b/samples/bsh/build.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<project name="bsvc" default="war">
+    
+   <target name="build-env">
+     <mkdir dir="build" />
+     <mkdir dir="build/bin" />
+   </target>
+
+   <target name="bin" depends="build-env">
+      <javac srcdir="src" destdir="build/bin" debug="on">
+       <classpath>
+         <pathelement location="lib/jsvc.jar" />
+         <pathelement location="lib/bsh.jar" />
+       </classpath>
+        <!-- <compilerarg value="-Xlint:unchecked" /> -->
+      </javac>
+   </target>
+   
+   <target name="bin-jar" depends="bin">
+     <copy todir="build/bin" file="etc/jsvc.properties" />
+      <copy todir="build/bin/haven/errsvc">
+       <fileset dir="static">
+         <!-- <include name="static/**" /> -->
+       </fileset>
+      </copy>
+     <jar destfile="build/bsvc.jar" basedir="build/bin" />
+   </target>
+   
+   <target name="war" depends="bin-jar">
+     <taskdef name="jsvc-war" classname="dolda.jsvc.j2ee.Archive$AntTask" classpath="lib/jsvc.jar" />
+     <jsvc-war destfile="build/bsvc.war">
+       <jars dir=".">
+        <include name="build/bsvc.jar" />
+        <include name="lib/*.jar" />
+       </jars>
+     </jsvc-war>
+   </target>
+
+   <target name="clean">
+     <delete dir="build" />
+   </target>
+</project>

diff --git a/samples/bsh/etc/jsvc.properties b/samples/bsh/etc/jsvc.properties
new file mode 100644 (file)
index 0000000..4f46acf
--- /dev/null
+++ b/samples/bsh/etc/jsvc.properties
@@ -0,0 +1,4 @@
+jsvc.j2ee.appname = Online BSH
+jsvc.bootstrap = dolda.bsvc.Main
+jsvc.timelimit = 30000
+jsvc.forcelimit = true

diff --git a/samples/bsh/lib/README b/samples/bsh/lib/README
new file mode 100644 (file)
index 0000000..6a2df68
--- /dev/null
+++ b/samples/bsh/lib/README
@@ -0,0 +1 @@
+You have to add a compiled version of jsvc.jar and bsh.jar here manually.

diff --git a/samples/bsh/src/dolda/bsvc/Main.java b/samples/bsh/src/dolda/bsvc/Main.java
new file mode 100644 (file)
index 0000000..a1687af
--- /dev/null
+++ b/samples/bsh/src/dolda/bsvc/Main.java
@@ -0,0 +1,13 @@
+package dolda.bsvc;
+
+import dolda.jsvc.*;
+import dolda.jsvc.util.*;
+
+public class Main {
+    public static Responder responder() {
+       Multiplexer root = new Multiplexer();
+       root.file("sh", new ShellPage());
+       root.file("css", new StaticContent(Main.class, "static/base.css", false, "text/css"));
+       return(Misc.stdroot(root));
+    }
+}

diff --git a/samples/bsh/src/dolda/bsvc/ShellPage.java b/samples/bsh/src/dolda/bsvc/ShellPage.java
new file mode 100644 (file)
index 0000000..29d0d3d
--- /dev/null
+++ b/samples/bsh/src/dolda/bsvc/ShellPage.java
@@ -0,0 +1,112 @@
+package dolda.bsvc;
+
+import dolda.jsvc.*;
+import dolda.jsvc.util.*;
+import java.io.*;
+import bsh.Interpreter;
+
+public class ShellPage extends SimpleWriter {
+    private static class Console implements bsh.ConsoleInterface {
+       ByteArrayOutputStream obuf = new ByteArrayOutputStream();
+       ByteArrayOutputStream ebuf = new ByteArrayOutputStream();
+       Reader in = new StringReader("");
+       PrintStream out;
+       PrintStream err;
+       {
+           try {
+               out = new PrintStream(obuf, false, "UTF-8");
+               err = new PrintStream(ebuf, false, "UTF-8");
+           } catch(UnsupportedEncodingException e) {
+               throw(new Error(e));
+           }
+       }
+       
+       public void error(Object msg) {
+           getErr().println(msg);
+       }
+       
+       public void print(Object o) {
+           getOut().print(o);
+       }
+       
+       public void println(Object o) {
+           getOut().println(o);
+       }
+       
+       public PrintStream getOut() {
+           return(out);
+       }
+
+       public PrintStream getErr() {
+           return(err);
+       }
+
+       public Reader getIn() {
+           return(in);
+       }
+    }
+    
+    public void respond(Request req, PrintWriter out) {
+       MultiMap<String, String> params = req.params();
+       String cmd = params.get("cmd");
+       
+       out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+       out.println("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">");
+       out.println("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en-US\">");
+       out.println("<head>");
+       out.println("<title>Shell</title>");
+       out.println("<link rel=\"stylesheet\" type=\"text/css\" href=\"css\" />");
+       out.println("</head>");
+       out.println("<body>");
+       out.println("<h1>Shell</h1>");
+       if((req.method() == "POST") && (cmd != null)) {
+           Console cons = new Console();
+           Interpreter ip = new Interpreter(cons);
+           Object resp;
+           try {
+               ip.set("req", req);
+               resp = ip.eval(cmd);
+               out.println("<pre>");
+               out.println(Misc.htmlq((resp == null)?"(null)":(resp.toString())));
+               out.println("</pre>");
+           } catch(bsh.EvalError exc) {
+               out.println("<h2>Evaluation error</h2>");
+               out.println("<pre>");
+               out.print(exc.toString());
+               out.println("</pre>");
+               if(exc instanceof bsh.TargetError) {
+                   bsh.TargetError te = (bsh.TargetError)exc;
+                   out.println("<h3>Target error</h3>");
+                   out.println("<pre>");
+                   te.getTarget().printStackTrace(out);
+                   out.println("</pre>");
+               }
+           }
+           String eo = new String(cons.obuf.toByteArray(), Misc.utf8);
+           String ee = new String(cons.ebuf.toByteArray(), Misc.utf8);
+           cons = null;
+           if(eo.length() > 0) {
+               out.println("<h2>Output</h2>");
+               out.println("<pre>");
+               out.println(Misc.htmlq(eo));
+               out.println("</pre>");
+           }
+           if(ee.length() > 0) {
+               out.println("<h2>Errors</h2>");
+               out.println("<pre>");
+               out.println(Misc.htmlq(ee));
+               out.println("</pre>");
+           }
+       }
+       out.println("<form action=\"sh\" method=\"post\">");
+       out.println("<textarea cols=\"80\" rows=\"5\" name=\"cmd\">");
+       if(cmd != null)
+           out.print(cmd);
+       out.println("</textarea>");
+       out.println("<input type=\"submit\" value=\"Evaluate\" />");
+       out.println("<input type=\"reset\" value=\"Reset\" />");
+       out.println("</form>");
+       out.println("</body>");
+       out.println("</html>");
+    }
+}

diff --git a/samples/bsh/static/base.css b/samples/bsh/static/base.css
new file mode 100644 (file)
index 0000000..060a727
--- /dev/null
+++ b/samples/bsh/static/base.css
@@ -0,0 +1,7 @@
+body {
+       font-family: sans-serif;
+}
+
+img {
+       border-width: 0px;
+}