--- android/TrainInfoService/build.xml	2011/04/20 19:25:54	1362
+++ android/TrainInfoService/build.xml	2011/10/14 14:00:59	1611
@@ -1,4 +1,4 @@
-<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" />
@@ -8,7 +8,7 @@
 		<fileset dir="WebContent/WEB-INF/lib/">
 			<include name="*.jar" />
 		</fileset>
-		<fileset dir="${glassfish}/modules/">
+		<fileset dir="lib/">
 			<include name="*.jar" />
 		</fileset>
 	</path>
@@ -18,6 +18,7 @@
 	</target>
 
 
+
 	<target name="libs">
 		<echo message="--CircuitBreaker--" />
 		<ant dir="../CircuitBreaker/" antfile="../CircuitBreaker/build.xml" inheritAll="false" />
@@ -40,14 +41,17 @@
 
         <echo message="--GenericJavaUtils--" />
         <ant dir="../GenericJavaUtils/" antfile="../GenericJavaUtils/build.xml" inheritAll="false" />
-        <copy file="../GenericJavaUtils/GenericJavaUtils.jar" todir="libs" />
+        <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>
@@ -56,6 +60,7 @@
 		<delete dir="${builddir}" />
 		<delete file="${warfile}" />
 		<delete dir="${jspdir}" />
+		<delete dir="lib" />
 	</target>
 
 	<target name="jspvalidate" depends="compile">