--- android/TrainInfoService/build.xml	2010/06/10 09:24:27	819
+++ android/TrainInfoService/build.xml	2010/06/10 22:44:23	831
@@ -1,11 +1,14 @@
 <project name="TrainInfoService" default="war">
-	<property name="builddir" value="build" />
+	<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="/home/app/glassfishv3/glassfish/modules/">
+		<fileset dir="${glassfish}/modules/">
 			<include name="*.jar" />
 		</fileset>
 	</path>
@@ -14,8 +17,16 @@
 		<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" />
+	</target>
+
+
 
-	<target name="compile" depends="init">
+	<target name="compile" depends="init,libs">
 		<javac srcdir="src/" destdir="${builddir}" debug="off" optimize="on" includeantruntime="false">
 			<classpath refid="path.base" />
 		</javac>
@@ -23,19 +34,36 @@
 
 	<target name="clean" description="Cleans away all generated files.">
 		<delete dir="${builddir}" />
-		<delete file="${ant.project.name}.war" />
+		<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="compile" description="Builds the WAR file for installation.">
-		<war warfile="${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">
-		<!-- lib dir="lib" includes="*.jar" /-->
-		<classes dir="${builddir}" includes="**/*.class" />
-		<fileset dir="WebContent" includes="**" />
-    </war>
+	<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>
+	<target name="deploy" depends="war">
+		<copy file="${warfile}" todir="/home/app/domain1/autodeploy" />
+	</target>
 
 
 </project>