Added dependancy manager to ant.

build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project basedir="." default="help">
+<project basedir="." default="help" xmlns:ivy="antlib:org.apache.ivy.ant">
 
 	<property file="build.properties" />
 
@@ -15,6 +15,7 @@
 	<property name="dir.hibernate.mapping" value="defs/schema/hbm"/>
 	<property name="dir.database" value="defs/sql"/>
 	<property name="dir.dist" value="dist"/>
+	<property name="dir.deps" value="lib"/>
 	<property name="dir.lib" value="lib"/>
 	<property name="dir.web" value="web"/>
 	<property name="dir.web.lib" value="${dir.web}/WEB-INF/lib"/>
@@ -40,21 +41,6 @@
 	<property name="cvs.compressionlevel" value="6" />
 	<property name="cvs.module.name" value="ieatdb"/>
 	
-	<path id="path.svn">
-		<fileset dir="${dir.lib}/svn" includes="*.jar"/>
-	</path>
-	
-	<taskdef resource="svntask.properties" classpathref="path.svn"/>
-	<property name="svn.tag" value="1.0"/>
-	<property name="svn.path" value="/tags/${svn.tag}"/>
-	<property name="svn.url" 
-		value="https://ieat.svn.sourceforge.net/svnroot/ieat/ieat${svn.path}"/>
-	<property name="svn.username" value=""/>
-	<property name="svn.password" value=""/>
-	<property name="svn.revision" value="HEAD"/>
-	<property name="svn.dir.build" value="${dir.build}/svn"/>
-	<property name="svn.env.src" value="example"/>
-	
 	<tstamp>
 		<format property="build.time" pattern="MM/dd/yyyy hh:mm aa z" />
 	</tstamp>
@@ -67,6 +53,7 @@
 	
 	<path id="jaxb.lib.path">
 		<fileset dir="${dir.web.lib}" includes="*.jar"/>
+		<fileset dir="${dir.deps}" includes="*.jar"/>
 		<fileset dir="${dir.lib}" includes="**/*.jar"/>
 	</path>
   
@@ -87,8 +74,9 @@
 		<pathelement location="${dir.build}/${app.name}/WEB-INF/classes"/>
 		<fileset dir="${dir.web.lib}" includes="*.jar"/>
 		<fileset dir="${dir.lib}" includes="**/*.jar"/>
+		<fileset dir="${dir.deps}" includes="*.jar"/>
 	</path>
-	
+
 	<target name="init">
 		<mkdir dir="${dir.build}" />
 		<mkdir dir="${dir.dist}" />
@@ -98,8 +86,32 @@
 	<target name="check-has-env">
 		<available file="${dir.env}" type="dir" property="has.env" />
 	</target>
-	
-	<target name="compile.domain" description="Compile the JAXB classes">
+
+    <target name="ivy" description="Install ivy dependency manager" unless="ivy.installed">
+      <mkdir dir="${user.home}/.ant/lib"/>
+      <get dest="${user.home}/.ant/lib/ivy.jar" src="http://search.maven.org/remotecontent?filepath=org/apache/ivy/ivy/2.3.0/ivy-2.3.0.jar"/>
+      <fail message="Ivy has been installed. Run the build again"/>
+    </target>
+
+    <target name="resolve-dependencies" description="Use ivy to resolve dependencies">
+      <ivy:cachepath pathid="dir.deps">
+        <dependency org="org.springframework" name="spring-web" rev="1.2.8" />
+        <dependency org="org.springframework" name="spring-mock" rev="1.2.8"/>
+        <dependency org="jmock" name="jmock" rev="1.0.1"/>
+        <dependency org="org.jvnet.hyperjaxb2" name="hyperjaxb2-core" rev="0.6.2"/>
+        <dependency org="org.jvnet.hyperjaxb2" name="hyperjaxb2-shared" rev="0.6.2"/>
+        <dependency org="com.sun.xml.bind" name="jaxb-xjc" rev="1.0.6"/>
+        <dependency org="org.apache.lucene" name="lucene-core" rev="2.2.0"/>
+        <dependency org="concurrent" name="concurrent" rev="1.3.4"/>
+        <dependency org="org.apache.derby" name="derbytools" rev="10.1.3.1"/>
+        <dependency org="org.apache.derby" name="derby" rev="10.1.3.1"/>
+        <!-- Outdated dependancies -->
+        <dependency org="javax.faces" name="jsf-api" rev="1.1_02"/>
+        <dependency org="javax.transaction" name="jta" rev="1.1"/>
+      </ivy:cachepath>
+    </target>
+		
+	<target name="compile.domain" depends="resolve-dependencies" description="Compile the JAXB classes">
 		<delete dir="${dir.compile.dest.domain}" failonerror="no"/>
 		<mkdir dir="${dir.compile.dest.domain}"/>
 		<javac srcdir="${dir.generated}"
@@ -108,8 +120,8 @@
 				deprecation="${compile.deprecation}" 
 				optimize="${compile.optimize}" 
 				nowarn="${compile.nowarn}"
-				target="1.5"
-				source="1.5"
+				target="1.6"
+				source="1.6"
 				fork="true"
 				memoryinitialsize="256m"
 				memorymaximumsize="400m"
@@ -157,8 +169,8 @@
 				deprecation="${compile.deprecation}" 
 				optimize="${compile.optimize}" 
 				nowarn="${compile.nowarn}"
-				target="1.5"
-				source="1.5">
+				target="1.6"
+				source="1.6">
 			<!--classpath refid="unit-test.path" /-->
 		</javac>				
 		<ant antfile="build.xml" inheritall="false" target="generate-sources" dir="${hjb.dir}">
@@ -259,16 +271,16 @@
 		
 	</target>
 
-	<target name="compile" description="Compile source files">
+	<target name="compile" depends="resolve-dependencies" description="Compile source files">
 		<mkdir dir="${dir.build}/${app.name}/WEB-INF/classes"/>
-		<javac srcdir="${dir.source}"
+		<javac verbose="false" srcdir="${dir.source}"
 				destdir="${dir.build}/${app.name}/WEB-INF/classes"
 				debug="${compile.debug}" 
 				deprecation="${compile.deprecation}" 
 				optimize="${compile.optimize}" 
 				nowarn="${compile.nowarn}"
-				target="1.5"
-				source="1.5">
+				target="1.6"
+				source="1.6">
 			<classpath refid="compile.path" />
 		</javac>
 	</target>
@@ -351,7 +363,7 @@
 				includes="README*.txt"/>
 			<mapper type="glob" from="*.txt" to="*"/>
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
@@ -377,28 +389,6 @@
 		ant -Dsvn.tag=X (svn-checkout or svn-switch) svn-src-release svn-bin-release svn-demo-release
 		
 	-->
-
-	<target name="svn-checkout" description="Checkout sources from SVN">
-		<delete dir="${svn.dir.build}"/>
-		<mkdir dir="${svn.dir.build}"/>
-		<svn username="${svn.username}" password="${svn.password}">
-			<checkout url="${svn.url}" destPath="${svn.dir.build}"
-				revision="${svn.revision}"/>
-		</svn>
-	</target>
-	
-	<target name="svn-update" description="Update sources previously checked out from SVN">
-		<svn username="${svn.username}" password="${svn.password}">
-			<update dir="${svn.dir.build}" revision="${svn.revision}"/>
-		</svn>
-	</target>
-	
-	<target name="svn-switch" 
-		description="Switch sources previously checked out from SVN to another branch">
-		<svn username="${svn.username}" password="${svn.password}">
-			<switch path="${svn.dir.build}" url="${svn.url}" revision="${svn.revision}"/>
-		</svn>
-	</target>
 	
 	<!-- Copy environment properties (to catch local env) -->
 	<target name="svn-prepare">
@@ -410,13 +400,13 @@
 
 	<target name="svn-build" depends="clean,svn-prepare" description="Build from SVN tag versions">
 		
-		<property name="app.archive.name" value="${app.name}-${svn.tag}"/>
+		<property name="app.archive.name" value="${app.name}-${build.version}"/>
 		
 		<echo />
-		<echo message="Building application version ${svn.tag} (${svn.revision})..."/>
+		<echo message="Building application version ${build.version}..."/>
 
 		<ant dir="${svn.dir.build}" target="war" inheritall="true">
-			<property name="build.version" value="${svn.tag}"/>
+			<property name="build.version" value="${build.version}"/>
 			<property name="dir.build" value="${dir.build}"/>
 			<property name="app.name" value="${app.archive.name}"/>
 			<property name="env.src" value="${svn.env.src}"/>
@@ -426,13 +416,13 @@
 	<target name="svn-demo-release" description="Create the Live Demo from SVN sources"
 		depends="clean,init">
 		
-		<property name="app.archive.name" value="${app.name}-${svn.tag}"/>
+		<property name="app.archive.name" value="${app.name}-${build.version}"/>
 		<property name="demo.build.dir" value="${app.archive.name}-livedemo"/>
 		
 		<!-- call the demo target on the code checked out from SVN -->
 		<ant dir="${svn.dir.build}" inheritall="true" target="demo">
 			<property name="dir.build" value="${dir.build}"/>
-			<property name="build.version" value="${svn.tag}"/>
+			<property name="build.version" value="${build.version}"/>
 			<property name="env.src" value="demo"/>
 		</ant>
 		
@@ -443,7 +433,7 @@
 			<fileset dir="${svn.dir.build}/defs/docs/licenses" includes="**/*.txt"/>
 			<mapper type="glob" from="*.txt" to="*"/>
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
@@ -478,7 +468,7 @@
 		description="Build source release TAR from SVN tag versions">
 
 		<property name="app.archive.name" 
-			value="${app.name}-${svn.tag}"/>
+			value="${app.name}-${build.version}"/>
 		<property name="release-source-dir-name"
 			value="${app.archive.name}-src"/>
 		<property name="release-source-dir" 
@@ -496,7 +486,7 @@
 		<copy file="${svn.dir.build}/defs/docs/release/README.src.txt" 
 			tofile="${release-source-dir}/README" filtering="true">
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
@@ -536,21 +526,21 @@
 		<delete file="${release-name}" />
 
 		<echo message="Creating README" />
-		<copy file="${svn.dir.build}/defs/docs/release/README.bin.txt" 
+		<copy file="${dir.build}/defs/docs/release/README.bin.txt" 
 			tofile="${release-dir}/README" filtering="true">
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
 
 		<echo message="Creating NOTES" />
 		<copy filtering="true" todir="${release-dir}">
-			<fileset dir="${svn.dir.build}/defs/docs/release/notes"
-				includes="notes-${svn.tag}.txt"/>
+			<fileset dir="${dir.build}/defs/docs/release/notes"
+				includes="notes-${build.version}.txt"/>
 			<mapper type="merge" to="NOTES"/>
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
@@ -559,7 +549,7 @@
 		<echo message="Creating setup scripts" />
 		<mkdir dir="${release-dir}/setup/sql"/>
 		<copy filtering="false" todir="${release-dir}/setup/sql">
-			<fileset dir="${svn.dir.build}/defs/sql"
+			<fileset dir="${dir.build}/defs/sql"
 				includes="**"/>
 		</copy>
 		
@@ -567,7 +557,7 @@
 		<echo message="Copying JDBC drivers" />
 		<mkdir dir="${release-dir}/setup/lib"/>
 		<copy todir="${release-dir}/setup/lib">
-			<fileset dir="${svn.dir.build}/lib/jdbc"
+			<fileset dir="${dir.build}/lib/jdbc"
 				includes="**"/>
 		</copy>
 
@@ -575,7 +565,7 @@
 		<echo message="Copying Java Mail JARs" />
 		<mkdir dir="${release-dir}/setup/lib/javamail"/>
 		<copy todir="${release-dir}/setup/lib/javamail">
-			<fileset dir="${svn.dir.build}/lib/javamail"
+			<fileset dir="${dir.build}/lib/javamail"
 				includes="**"/>
 		</copy>
 
@@ -583,18 +573,18 @@
 		<echo message="Copying Xalan/Xerces JARs" />
 		<mkdir dir="${release-dir}/setup/lib/xalan"/>
 		<copy todir="${release-dir}/setup/lib/xalan">
-			<fileset dir="${svn.dir.build}/lib/xalan"
+			<fileset dir="${dir.build}/lib/xalan"
 				includes="**"/>
 		</copy>
 
 		<!-- copy misc README files -->
 		<echo message="Copying README files" />
 		<copy filtering="true" todir="${release-dir}">
-			<fileset dir="${svn.dir.build}/defs/docs"
+			<fileset dir="${dir.build}/defs/docs"
 				includes="README-*.txt"/>
 			<mapper type="glob" from="*.txt" to="*"/>
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
@@ -603,10 +593,10 @@
 		<echo message="Copying licenses" />
 		<mkdir dir="${release-dir}/licenses"/>
 		<copy todir="${release-dir}/licenses" flatten="true">
-			<fileset dir="${svn.dir.build}/defs/docs/licenses" includes="**/*.txt"/>
+			<fileset dir="${dir.build}/defs/docs/licenses" includes="**/*.txt"/>
 			<mapper type="glob" from="*.txt" to="*"/>
 			<filterset>
-				<filter token="VERSION" value="${svn.tag}" />
+				<filter token="VERSION" value="${build.version}" />
 				<filter token="BUILD_DATE" value="${build.time}" />
 			</filterset>
 		</copy>
@@ -624,5 +614,4 @@
 		</tar>
 
 	</target>
-	
 </project>

hyperjaxb2-build/build.xml

@@ -1,148 +0,0 @@
-<?xml version="1.0"?>
-<project name="hyperjaxb2-sample-ant" default="install">
-	<property name="artifactId" value="hyperjaxb2-template-basic-ant"/>
-	<property name="version" value="0.6.2"/>
-	<path id="hyperjaxb2.compile.path">
-		<pathelement path="${basedir}/classes"/>
-		<fileset dir="${basedir}/lib">
-			<include name="jaxb-xjc-*.jar"/>
-			<include name="jaxb-impl-*.jar"/>
-			<include name="isorelax-*.jar"/>
-			<include name="jaxb-api-*.jar"/>
-			<include name="jaxb-libs-*.jar"/>
-			<include name="jaxp-api-*.jar"/>
-			<include name="jaxp-ri-*.jar"/>
-			<include name="relaxngDatatype-*.jar"/>
-			<include name="xsdlib-*.jar"/>
-			<include name="jaxbcommons-core-*.jar"/>
-			<include name="jaxbcommons-shared-*.jar"/>
-			<include name="jaxbcommons-testing-*.jar"/>
-			<include name="spring-*.jar"/>
-			<include name="hyperjaxb2-core-*.jar"/>
-			<include name="hyperjaxb2-hibernate-configuration-*.jar"/>
-			<include name="hyperjaxb2-hibernate-customizations-*.jar"/>
-			<include name="hyperjaxb2-hibernate-mapping-*.jar"/>
-			<include name="hyperjaxb2-shared-*.jar"/>
-			<include name="hyperjaxb2-testing-*.jar"/>
-			<include name="commons-lang-*.jar"/>
-			<include name="commons-logging-*.jar"/>
-			<include name="commons-beanutils-*.jar"/>
-			<include name="log4j-*.jar"/>
-			<include name="saxon-*.jar"/>
-			<include name="saxon-dom-*.jar"/>
-			<include name="hibernate-*.jar"/>
-			<include name="junit-*.jar"/>
-		</fileset>
-	</path>
-	<path id="hyperjaxb2.runtime.path">
-		<fileset dir="${basedir}/lib">
-			<include name="antlr-*.jar"/>
-			<include name="asm-*.jar"/>
-			<include name="asm-attrs-*.jar"/>
-			<include name="cglib-*.jar"/>
-			<include name="ehcache-*.jar"/>
-			<include name="jta-*.jar"/>
-			<include name="hibernate-*.jar"/>
-			<include name="dom4j-*.jar"/>
-			<include name="commons-collections-*.jar"/>
-			<include name="commons-io-*.jar"/>
-			<include name="commons-lang-*.jar"/>
-			<include name="jaxb-api-*.jar"/>
-			<include name="jaxb-impl-*.jar"/>
-			<include name="jaxp-api-*.jar"/>
-			<include name="jaxp-ri-*.jar"/>
-			<include name="isorelax-*.jar"/>
-			<include name="jaxb-libs-*.jar"/>
-			<include name="relaxngDatatype-*.jar"/>
-			<include name="xsdlib-*.jar"/>
-			<include name="jaxbcommons-shared-*.jar"/>
-			<include name="jaxbcommons-testing-*.jar"/>
-			<include name="hyperjaxb2-shared-*.jar"/>
-			<include name="hyperjaxb2-testing-*.jar"/>
-			<include name="commons-logging-*.jar"/>
-			<include name="log4j-*.jar"/>
-			<include name="hsqldb-*.jar"/>
-			<include name="junit-*.jar"/>
-		</fileset>
-	</path>
-	<target name="clean">
-		<delete dir="${basedir}/target/"/>
-		<delete dir="${basedir}/target/classes"/>
-		<delete dir="${basedir}/target/test-classes"/>
-	</target>
-	<target name="generate-sources">
-		<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask" classpathref="hyperjaxb2.compile.path"/>
-		<mkdir dir="${basedir}/target/generated-sources/xjc"/>
-		<xjc target="${basedir}/target/generated-sources/xjc" extension="true">
-			<arg line="
-				-Xequals
-				-XhashCode
-				-Xhyperjaxb2
-				-Xhyperjaxb2-rt=RoundtripTest"/>
-			<binding dir="${basedir}/src/main/resources">
-			 	<include name="**/*.xjb"/>
-			</binding>
-			<schema dir="${basedir}/src/main/resources">
-			 	<include name="**/*.xsd"/>
-			</schema>
-		</xjc>
-	</target>
-	<target name="compile" depends="generate-sources">
-		<mkdir dir="${basedir}/target/classes"/>
-		<javac
-			destdir="${basedir}/target/classes" 
-			srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
-			classpathref="hyperjaxb2.compile.path">
-		</javac>
-		<copy todir="${basedir}/target/classes">
-			<fileset dir="${basedir}/src/main/resources"/>
-			<fileset dir="${basedir}/target/generated-sources/xjc">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-	<target name="test-compile" depends="compile">
-		<mkdir dir="${basedir}/target/test-classes"/>
-		<javac
-			destdir="${basedir}/target/test-classes" 
-			srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
-			classpathref="hyperjaxb2.runtime.path">
-		</javac>
-		<copy todir="${basedir}/target/test-classes">
-			<fileset dir="${basedir}/src/test/resources"/>
-			<fileset dir="${basedir}/target/generated-sources/xjc">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-	<target name="test" depends="test-compile">
-		<mkdir dir="${basedir}/target/junit-reports"/>
-		<junit printsummary="yes" haltonfailure="yes">
-			<classpath>
-				<pathelement location="${basedir}/target/classes"/>
-				<pathelement location="${basedir}/target/test-classes"/>
-				<path refid="hyperjaxb2.runtime.path"/>
-			</classpath>
-
-			<formatter type="plain"/>
-			<formatter type="xml"/>
-
-			<batchtest fork="yes" todir="${basedir}/target/junit-reports">
-				<fileset dir="${basedir}/src/test/java">
-					<include name="**/*Test*.java"/>
-					<exclude name="**/AllTests.java"/>
-				</fileset>
-				<fileset dir="${basedir}/target/generated-sources/xjc">
-					<include name="**/*Test*.java"/>
-					<exclude name="**/AllTests.java"/>
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-	<target name="package" depends="test">
-		<mkdir dir="${basedir}/target"/>
-		<jar destfile="${basedir}/target/${artifactId}-${version}.jar"
-			basedir="${basedir}/target/classes"/> 
-	</target>
-	<target name="install" depends="package"/>
-</project>