Ivy-based build

.gitignore

@@ -2,3 +2,4 @@
 .idea/
 .project/
 target/
+deployment/

build.properties

@@ -9,6 +9,3 @@ webdav.context 		= webdav
 colorized.dir		= src.html
 # Current benchmark version
 version			    = 1.08
-# Path to xdoclet
-#xdoclet                 = d:\xdoclet-1.2.3
-xdoclet                 = xdoclet-1.2.3

build.xml

@@ -1,41 +1,21 @@
 <!-- $Id: build.xml,v 1.10 2006/01/04 06:27:18 livshits Exp $ -->
-<project name="Securibench Micro" default="cleandist" basedir=".">
+<project xmlns:ivy="antlib:org.apache.ivy.ant" name="Securibench Micro" default="cleandist" basedir=".">
 	<property environment="currentenv" />
 	<property file="build.properties" />
 	<property name="rootdir" value="." />
 
-	<path id="class.path">
-		<pathelement path="${currentenv.classpath}" />
-		<fileset dir="./lib">
-			<include name="**/*.jar" />
-		</fileset>	
-	</path>
-
-	<!-- xdoclet paths -->
-	<property name="xdoclet.jar" value="${xdoclet}/xdoclet-1.2.3.jar" />
-	<property name="webdoclet.jar" value="${xdoclet}/xdoclet-web-module-1.2.3.jar" />
-	<property name="xjavadoc.jar" value="${xdoclet}/xjavadoc-1.1.jar" />
-	<property name="log4j.jar" value="${xdoclet}/log4j.jar" />
-	<property name="commons.collections.jar" value="${xdoclet}/commons-collections-2.0.jar" />
-	<property name="commons.logging.jar" value="${xdoclet}/commons-logging.jar" />
-	<property name="j2ee.jar" value="${rootdir}/lib/j2ee.jar" />
-	<property name="src.dir" value="${rootdir}/src" />	
+	<ivy:resolve/>
+	<ivy:cachepath pathid="ivy.tasks.path" conf="tasks"/>
+	<ivy:cachepath pathid="ivy.dependencies.path" conf="compile"/>
+	<ivy:cachepath pathid="ivy.runtime.path" conf="runtime"/>
+
+	<property name="src.dir" value="${rootdir}/src" />
 	<property name="appDeployDir" value="${tomcat.home}/webapps/${web.context}"/>
 	<property name="webdav" value="${tomcat.home}/webapps/${webdav.context}"/>
-
-	<path id="webdoclet.classpath">
-		<pathelement path="${xdoclet.jar}" />
-		<pathelement path="${webdoclet.jar}" />
-		<pathelement path="${xjavadoc.jar}" />
-		<pathelement path="${commons.collections.jar}" />
-		<pathelement path="${commons.logging.jar}" />
-		<pathelement path="${log4j.jar}" />
-		<pathelement path="${j2ee.jar}" />
-	</path>
 
 	<!-- additional tasks -->
-	<taskdef name="xdoclet" classname="xdoclet.modules.web.WebDocletTask" classpathref="webdoclet.classpath" />
-	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="${rootdir}/lib/java2html.jar" />
+	<taskdef name="xdoclet" classname="xdoclet.modules.web.WebDocletTask" classpathref="ivy.tasks.path" />
+	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpathref="ivy.tasks.path" />
 
 	<!-- CLEAN -->
 	<target name="clean">
@@ -55,27 +35,20 @@
 	<target name="deploy">
 		<echo message="Deploying classes, generating web.xml and index.html, colorizing sources... " />			
 
-		<copy todir="${appDeployDir}/WEB-INF/lib">
-			<fileset dir="${rootdir}/lib" />
-		</copy>
-<!--
-		<copy todir="${appDeployDir}/WEB-INF/classes">
-			<fileset dir="${rootdir}/classes" />
-		</copy>
--->		
+		<!-- Copy COS jar file to webapp lib folder -->
+		<ivy:retrieve pattern="${appDeployDir}/WEB-INF/lib/[artifact].[ext]" conf="runtime"/>
+
 		<java2html outputformat="html" srcdir="${src.dir}" destdir="${webdav}" includes="**/*.java" 
 			style="eclipse" showLineNumbers="true" showFileName="true" 
 			showTableBorder="false" includeDocumentHeader="true" />
 
-		<xdoclet destdir="${appDeployDir}" verbose="true" force="${xdoclet.force}" mergedir="metadata/web">
+		<xdoclet destdir="${appDeployDir}" verbose="true" mergedir="metadata/web">
 			<fileset dir="${rootdir}/src">
 				<include name="**/*.java" />			
 			</fileset>
-			<template templatefile="${rootdir}/web-xml-gen.xdt" destinationfile="WEB-INF/web.xml" />
-			<template templatefile="${rootdir}/index-html-gen.xdt" destinationfile="index.html" />
+			<template templatefile="${rootdir}/web-xml-gen.xdt" destinationfile="${appDeployDir}/WEB-INF/web.xml" />
+			<template templatefile="${rootdir}/index-html-gen.xdt" destinationfile="${appDeployDir}/index.html" />
 		</xdoclet>
-		<!-- make a local copy of index.html -->
-		<copy file="${appDeployDir}/index.html" tofile="${rootdir}/index.html"/>
 	</target>
 
 	<!-- a separate task to produce colorized sources -->
@@ -92,7 +65,7 @@
 
 	<target name="compile">
 		<echo message="Compiling Securibench Micro..." />
-		<javac verbose="false" classpathref="class.path" srcdir="${src.dir}" destdir="${appDeployDir}/WEB-INF/classes" />
+		<javac verbose="false" classpathref="ivy.dependencies.path" srcdir="${src.dir}" destdir="${appDeployDir}/WEB-INF/classes" />
 	</target>
 
 	<!-- CLEANDIST -->