--- android/TrainInfoService/build.xml	2011/04/19 20:40:33	1323
+++ android/TrainInfoService/build.xml	2011/10/14 15:43:49	1613
@@ -1,50 +1,58 @@
-<project name="TrainInfoService" default="war">
+<project name="TrainInfoService" default="war" xmlns:ivy="antlib:org.apache.ivy.ant">
 	<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" />
+	<!--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/">
+		<fileset dir="lib/">
 			<include name="*.jar" />
 		</fileset>
 	</path>
 
 	<target name="init">
 		<mkdir dir="${builddir}" />
+		<mkdir dir="lib" />
 	</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="--CircuitBreaker END--" />
 
 		<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>
+		<echo message="--TrainInfoCommon END--" />
 		
 		<echo message="--WebConfig--" />
 		<ant dir="../WebConfig/" antfile="../WebConfig/build.xml" inheritAll="false" />
-		<echo message="--WebConfig END--" />
 		<copy file="../WebConfig/WebConfig.jar" todir="WebContent/WEB-INF/lib" />
+		<echo message="--WebConfig END--" />
 
+        <echo message="--GenericJavaUtils--" />
+        <ant dir="../GenericJavaUtils/" antfile="../GenericJavaUtils/build.xml" inheritAll="false" />
+        <copy file="../GenericJavaUtils/GenericJavaUtils.jar" todir="WebContent/WEB-INF/lib" />
+        <echo message="--GenericJavaUtils END--" />
 	</target>
 
 
+	<target name="resolve" depends="init" description="--> retrieve dependencies with ivy">
+        <ivy:retrieve />
+    </target>
 
-	<target name="compile" depends="init,libs">
-		<javac srcdir="src/" destdir="${builddir}" debug="on" optimize="on" includeantruntime="false">
+	<target name="compile" depends="init,libs,resolve">
+		<javac srcdir="src/" destdir="${builddir}" debug="on" optimize="on" includeantruntime="false" encoding="UTF-8">
 			<classpath refid="path.base" />
 		</javac>
 	</target>
@@ -53,8 +61,34 @@
 		<delete dir="${builddir}" />
 		<delete file="${warfile}" />
 		<delete dir="${jspdir}" />
+		<delete dir="lib" />
 	</target>
 
+
+	<target name="jspvalidate" depends="compile">
+		<taskdef classname="org.apache.jasper.JspC" name="jasper" >
+			<classpath>
+				<path refid="path.base"/>
+			</classpath>
+		</taskdef>
+
+		<echo message="launching jasper jspc" />
+		<jasper verbose="0"
+			package="src"
+			uriroot="WebContent"
+			webXmlFragment="${build.dir}/generated_web.xml"
+			outputDir="${jspdir}" />
+
+		<javac srcdir="jspdir/src" destdir="jspdir/" debug="on" optimize="on" includeantruntime="false" encoding="UTF-8">
+			<classpath>
+				<path refid="path.base"/>
+				<pathelement location="${builddir}"/>
+			</classpath>
+		</javac>
+
+	</target>
+
+<!--
 	<target name="jspvalidate" depends="compile">
 		<echo message="executing glassfish jspc" />
 		<exec executable="${glassfish}/bin/jspc" failonerror="true">
@@ -68,7 +102,7 @@
 			<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">