fixed build to use hg revision

conf/build/build-ivy.xml

@@ -29,9 +29,13 @@
         <ivy-cachepath pathid="test.classpath" conf="test" type="jar" />
     </target>
 
-    <target name="publish">
-    	<property file="${basedir}/revision.properties"/>
-        <ivy-publish resolver="local" pubrevision="${release}" overwrite="true">
+    <target name="publish" depends="ivy-dependencies">
+    	<exec executable="hg" outputproperty="hg.revision">
+    		<arg line="id -n"/>
+    	</exec>
+		<propertyregex property="revision" input="${hg.revision}" regexp="([0-9]+)" select="\1" casesensitive="false" />
+    	<echo message="revision: ${revision}"/>
+        <ivy-publish resolver="local" pubrevision="${revision}" overwrite="true">
             <artifacts pattern="${basedir}/target/dist/[artifact].[ext]" />
         </ivy-publish>
     </target>

conf/build/build-package.xml

@@ -18,40 +18,4 @@
         </jar>
     </target>
 
-	<target name="pre-build-war"/>
-
-    <target name="build-war" depends="pre-build-war, create-dist-folder, compile">
-        <delete dir="${basedir}/target/war" />
-        <mkdir dir="${basedir}/target/war" />
-        <copy todir="${basedir}/target/war/web"/>
-        <copy todir="${basedir}/target/war/WEB-INF">
-            <fileset dir="${basedir}/webapp/WEB-INF"/>
-        </copy>
-        <copy todir="${basedir}/target/war/classes">
-            <fileset dir="${basedir}/target/classes/main" excludes="log4j*.properties"/>
-            <fileset file="conf/log4j.properties"/>
-        </copy>
-        <copy todir="${basedir}/target/war/lib" flatten="true">
-            <path refid="default.classpath" />
-        </copy>
-        <war warfile="${basedir}/target/dist/${ivy.module}.war" webxml="${basedir}/target/war/WEB-INF/web.xml">
-            <lib dir="${basedir}/target/war/lib" />
-            <webinf dir="${basedir}/target/war/WEB-INF" excludes="web.xml" />
-            <fileset dir="${basedir}/target/war/web" />
-            <classes dir="${basedir}/target/war/classes" />
-        </war>
-    </target>
-
-    <target name="build-ear" depends="build-war">
-        <delete dir="${basedir}/target/ear" />
-        <mkdir dir="${basedir}/target/ear" />
-        <copy todir="${basedir}/target/ear">
-            <fileset dir="${basedir}/conf/ear" includes="**/*"/>
-        </copy>
-        <copy todir="${basedir}/target/ear">
-            <fileset file="${basedir}/target/dist/${ivy.module}.war"/>
-        </copy>
-        <zip destfile="${basedir}/target/dist/${ivy.module}.ear" basedir="${basedir}/target/ear"/>
-    </target>
-
 </project>

conf/build/ivysettings.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivysettings>
 
-    <property name="cache.dir" value="${basedir}/../ivy-f3270/cache"/>
+    <property name="cache.dir" value="${basedir}/../ivy/f3270/cache"/>
     <property name="3rdParty.dir" value="${basedir}/ivy-repository"/>
-    <property name="local.dir" value="${basedir}/../ivy-f3270/local"/>
+    <property name="local.dir" value="${basedir}/../ivy/f3270/local"/>
 
     <settings defaultResolver="default" defaultConflictManager="strict">
         <caches defaultCacheDir="${cache.dir}" checkUpToDate="true"/>