--- android/TrainInfoService/build.xml	2010/09/16 15:54:20	1069
+++ android/TrainInfoServiceGoogle/build.xml	2010/09/22 19:13:41	1104
@@ -1,80 +1,102 @@
-<project name="TrainInfoService" default="war">
-	<property name="builddir" value="antbuild" />
-	<property name="warfile" value="${ant.project.name}.war" />
-	<property name="jspdir" value="jspdir" />
-	<property name="glassfish" value="/home/app/glassfishv3/glassfish" />
-
-	<path id="path.base">
-		<fileset dir="WebContent/WEB-INF/lib/">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${glassfish}/modules/">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-	<target name="init">
-		<mkdir dir="${builddir}" />
-	</target>
-
-	<target name="libs">
-		<echo message="--CircuitBreaker--" />
-		<ant dir="../CircuitBreaker/" antfile="../CircuitBreaker/build.xml" inheritAll="false" />
-		<echo message="--CircuitBreaker END--" />
-		<copy file="../CircuitBreaker/CircuitBreaker.jar" todir="WebContent/WEB-INF/lib" />
-
-
-		<echo message="--TrainInfoCommon--" />
-		<ant dir="../TrainInfoCommon/" antfile="../TrainInfoCommon/build.xml" inheritAll="false" />
-		<echo message="--TrainInfoCommon END--" />
-		<copy todir="WebContent/WEB-INF/lib">
-			<fileset dir="../TrainInfoCommon">
-				<include name="*.jar"/>
-			</fileset>
-		</copy>
-
-	</target>
-
-
-
-	<target name="compile" depends="init,libs">
-		<javac srcdir="src/" destdir="${builddir}" debug="on" optimize="on" includeantruntime="false">
-			<classpath refid="path.base" />
-		</javac>
-	</target>
-
-	<target name="clean" description="Cleans away all generated files.">
-		<delete dir="${builddir}" />
-		<delete file="${warfile}" />
-		<delete dir="${jspdir}" />
-	</target>
-
-	<target name="jspvalidate" depends="compile">
-		<echo message="executing glassfish jspc" />
-		<exec executable="${glassfish}/bin/jspc" failonerror="true">
-			<arg value="-die1" />
-			<arg value="-d" />
-			<arg value="${jspdir}" />
-			<arg value="-compile" />
-			<arg value="-classpath" />
-			<arg value="${builddir}" />
-			<arg value="-webapp" />
-			<arg value="WebContent" />
-		</exec>
-	</target>
-
-
-	<target name="war" depends="jspvalidate" description="Builds the WAR file for installation.">
-		<war warfile="${warfile}" webxml="WebContent/WEB-INF/web.xml">
-			<!-- lib dir="lib" includes="*.jar" /-->
-			<classes dir="${builddir}" includes="**/*.class" />
-			<fileset dir="WebContent" includes="**" />
-		</war>
-	</target>
-
-	<target name="deploy" depends="war">
-		<copy file="${warfile}" todir="/home/app/domain1/autodeploy" />
-	</target>
+<project name="Guestbook" default="datanucleusenhance">
+  <property name="sdk.dir" location="/home/torben/inst/appengine-java-sdk-1.3.7/" />
 
+  <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">
+      <include name="**/*.jar" />
+    </fileset>
+    <fileset dir="${sdk.dir}/lib">
+      <include name="shared/**/*.jar" />
+    </fileset>
+  </path>
+
+  <target name="copyjars"
+      description="Copies the App Engine JARs to the WAR.">
+    <copy
+        todir="war/WEB-INF/lib"
+        flatten="true">
+      <fileset dir="${sdk.dir}/lib/user">
+        <include name="**/*.jar" />
+      </fileset>
+    </copy>
+  </target>  
+
+  <target name="libs">
+        <echo message="--CircuitBreaker--" />
+        <ant dir="../CircuitBreaker/" antfile="../CircuitBreaker/build.xml" inheritAll="false" />
+        <echo message="--CircuitBreaker END--" />
+        <copy file="../CircuitBreaker/CircuitBreaker.jar" todir="war/WEB-INF/lib" />
+
+
+        <echo message="--TrainInfoCommon--" />
+        <ant dir="../TrainInfoCommon/" antfile="../TrainInfoCommon/build.xml" inheritAll="false" />
+        <echo message="--TrainInfoCommon END--" />
+        <copy todir="war/WEB-INF/lib">
+            <fileset dir="../TrainInfoCommon">
+                <include name="*.jar"/>
+            </fileset>
+        </copy>
+  </target>
+
+
+  <target name="compile" depends="copyjars,libs"
+      description="Compiles Java source and copies other source files to the WAR.">
+    <mkdir dir="war/WEB-INF/classes" />
+    <copy todir="war/WEB-INF/classes">
+      <fileset dir="src">
+        <exclude name="**/*.java" />
+      </fileset>
+    </copy>
+    <javac
+        srcdir="src"
+        destdir="war/WEB-INF/classes"
+        classpathref="project.classpath"
+        debug="on" />
+  </target>
+
+  <target name="datanucleusenhance" depends="compile"
+      description="Performs JDO enhancement on compiled data classes.">
+    <enhance_war war="war" />
+  </target>
+
+  <target name="runserver" depends="datanucleusenhance"
+      description="Starts the development server.">
+    <dev_appserver war="war" />
+  </target>
+
+  <target name="update" depends="datanucleusenhance"
+      description="Uploads the application to App Engine.">
+    <appcfg action="update" war="war" />
+  </target>
+
+  <target name="update_indexes" depends="datanucleusenhance"
+      description="Uploads just the datastore index configuration to App Engine.">
+    <appcfg action="update_indexes" war="war" />
+  </target>
+
+  <target name="rollback" depends="datanucleusenhance"
+      description="Rolls back an interrupted application update.">
+    <appcfg action="rollback" war="war" />
+  </target>
+
+  <target name="request_logs"
+      description="Downloads log data from App Engine for the application.">
+    <appcfg action="request_logs" war="war">
+      <options>
+        <arg value="--num_days=5"/>
+      </options>
+      <args>
+        <arg value="logs.txt"/>
+      </args>
+    </appcfg>
+  </target>
+
+  <target name="clean">
+    <delete dir="war/WEB-INF/classes" />
+    <delete dir="war/WEB-INF/appengine-generated" />
+  </target>
 
 </project>