[armedbear-cvs] r12729 - in trunk/abcl/examples/google-app-engine: . src/abcl_ae

[Mark Evenson]

Author: mevenson
Date: Mon May 24 12:38:08 2010
New Revision: 12729

Log:
Restore buildable state.


Modified:
   trunk/abcl/examples/google-app-engine/build.xml
   trunk/abcl/examples/google-app-engine/src/abcl_ae/AbclInit.java
   trunk/abcl/examples/google-app-engine/src/abcl_ae/HelloWorldServlet.java

Modified: trunk/abcl/examples/google-app-engine/build.xml
==============================================================================
--- trunk/abcl/examples/google-app-engine/build.xml	(original)
+++ trunk/abcl/examples/google-app-engine/build.xml	Mon May 24 12:38:08 2010
@@ -1,6 +1,9 @@
-<project>
-  <property name="sdk.dir" location="../appengine-java-sdk" />
+<project default="compile">
+
+  <property name="sdk.dir" 
+            location="../../../appengine-java-sdk" />
   <import file="${sdk.dir}/config/user/ant-macros.xml" />
+
   <path id="project.classpath">
 	<pathelement path="war/WEB-INF/classes" />
 	<fileset dir="war/WEB-INF/lib">
@@ -10,6 +13,7 @@
 	  <include name="shared/**/*.jar" />
 	</fileset>
   </path>
+
   <target name="copyjars"
 	  description="Copies the App Engine and ABCL JARs to the WAR.">
 	<copy
@@ -18,7 +22,7 @@
 	  <fileset dir="${sdk.dir}/lib/user">
 		  <include name="**/*.jar" />
 	  </fileset>
-	  <fileset dir="../abcl">
+	  <fileset dir="../..">
 		  <include name="dist/*.jar" />
 	  </fileset>
 	</copy>
@@ -29,7 +33,8 @@
 	  </fileset>
 	</copy>
   </target>
-  <target name="compile" depends="copyjars"
+
+  <target name="compile" depends="copyjars,abcl.jar"
 	  description="Compiles Java source and copies other source files to the WAR.">
 	<mkdir dir="war/WEB-INF/classes" />
 	<copy todir="war/WEB-INF/classes">
@@ -41,8 +46,14 @@
 		srcdir="src"
 		destdir="war/WEB-INF/classes"
 		classpathref="project.classpath"
+                includeantruntime="false"
 		debug="on" />
   </target>
+
+  <target name="abcl.jar">
+    <ant dir="../.." target="abcl.jar"/>
+  </target>
+
   <target name="clean" description="Cleans all the jars and fasls.">
     <delete>
       <fileset dir="." includes="**/*.jar" />

Modified: trunk/abcl/examples/google-app-engine/src/abcl_ae/AbclInit.java
==============================================================================
--- trunk/abcl/examples/google-app-engine/src/abcl_ae/AbclInit.java	(original)
+++ trunk/abcl/examples/google-app-engine/src/abcl_ae/AbclInit.java	Mon May 24 12:38:08 2010
@@ -8,7 +8,6 @@
 import org.armedbear.lisp.Interpreter;
 import org.armedbear.lisp.Symbol;
 import org.armedbear.lisp.Pathname;
-import org.armedbear.lisp.ConditionThrowable;
 
 public final class AbclInit {
 	static private Object lock = new Object();

Modified: trunk/abcl/examples/google-app-engine/src/abcl_ae/HelloWorldServlet.java
==============================================================================
--- trunk/abcl/examples/google-app-engine/src/abcl_ae/HelloWorldServlet.java	(original)
+++ trunk/abcl/examples/google-app-engine/src/abcl_ae/HelloWorldServlet.java	Mon May 24 12:38:08 2010
@@ -9,6 +9,7 @@
 import org.armedbear.lisp.Lisp;
 import org.armedbear.lisp.Symbol;
 import org.armedbear.lisp.SpecialBinding;
+import org.armedbear.lisp.SpecialBindingsMark;
 import org.armedbear.lisp.Load;
 import org.armedbear.lisp.Stream;
 
@@ -30,7 +31,8 @@
 		SpecialBindingsMark mark = currentThread.markSpecialBindings();
 		currentThread.bindSpecial(
 			Symbol.STANDARD_OUTPUT, 
-			new Stream(resp.getOutputStream(), Symbol.CHARACTER, false));
+			new Stream(Symbol.SYSTEM_STREAM, resp.getOutputStream(), 
+                                   Symbol.CHARACTER, false));
 
 		try {
 			currentThread.execute(doGet);