Index: build.xml
===================================================================
RCS file: /cvs/equinox/build.xml,v
retrieving revision 1.23
diff -u -r1.23 build.xml
--- build.xml	15 Aug 2005 23:38:01 -0000	1.23
+++ build.xml	15 Oct 2005 19:17:22 -0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="equinox" basedir="." default="help">
+<project name="equinox" basedir="." default="help" xmlns:artifact="urn:maven-artifact-ant">
     <property file="build.properties"/>
     <property file="web/WEB-INF/classes/jdbc.properties"/>
 
@@ -15,10 +15,25 @@
     <property name="tomcat.home" value="${env.CATALINA_HOME}"/>
     <property name="deploy.dir" value="${tomcat.home}/webapps/${webapp.name}"/>
 
-    <path id="classpath">
-        <fileset dir="${web.dir}/WEB-INF/lib" includes="*.jar"/>
-        <pathelement path="${build.dir}"/>
-    </path>
+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
+        <classpath>
+            <pathelement location="${basedir}/lib/maven-artifact-ant-2.0-dep.jar" />
+        </classpath>
+    </typedef>
+    
+    <artifact:pom file="pom.xml" id="maven.project"/>
+    
+    <artifact:dependencies pathId="compile.classpath" filesetId="compile.fileset" useScope="compile">
+        <pom refid="maven.project"/>
+    </artifact:dependencies>
+    
+    <artifact:dependencies pathId="test.classpath" filesetId="test.fileset" useScope="test">
+        <pom refid="maven.project"/>
+    </artifact:dependencies>
+    
+    <artifact:dependencies pathId="runtime.classpath" filesetId="runtime.fileset" useScope="runtime">
+        <pom refid="maven.project"/>
+    </artifact:dependencies>
 
     <target name="help">
         <echo message=""/>
@@ -47,13 +62,13 @@
         <echo message="clean        --> Deletes compiled classes and WAR"/>
         <echo message="new          --> Creates a new project"/>
     </target>
-
+        
     <target name="compile" description="Compile main source tree java files">
         <mkdir dir="${build.dir}/classes"/>
         <javac destdir="${build.dir}/classes" debug="true" optimize="false"
             deprecation="false" failonerror="true">
             <src path="${src.dir}"/>
-            <classpath refid="classpath"/>
+            <classpath refid="compile.classpath"/>
         </javac>
         <!-- compile tests -->
         <mkdir dir="${test.dir}/classes"/>
@@ -61,7 +76,7 @@
             deprecation="false" failonerror="true">
             <src path="${test.src}"/>
             <classpath>
-                <path refid="classpath"/>
+                <path refid="test.classpath"/>
                 <path location="${build.dir}/classes"/>
             </classpath>
         </javac>
@@ -81,7 +96,8 @@
         <junit printsummary="no" fork="true"
             errorProperty="test.failed" failureProperty="test.failed">
             <classpath>
-                <path refid="classpath"/>
+                <path refid="compile.classpath"/>
+                <path refid="test.classpath"/>
                 <path location="${build.dir}/classes"/>
                 <path location="${test.dir}/classes"/>
                 <path location="web/WEB-INF/classes"/>
@@ -119,7 +135,7 @@
     <target name="test-tomcat" depends="war"
         description="Starts Tomcat, runs jWebUnit tests, stops Tomcat">
 
-        <taskdef resource="cargo.tasks" classpathref="classpath"/>
+        <taskdef resource="cargo.tasks" classpathref="test.classpath"/>
 
         <cargo-tomcat5x homeDir="${tomcat.home}" id="cargo.tomcat5"
             output="${test.dir}/cargo.log" action="start">
@@ -146,41 +162,42 @@
             <report format="frames" todir="${test.dir}/reports"/>
         </junitreport>
     </target>
-
-    <patternset id="war.files">
-        <include name="**/*.*"/>
-        <exclude name="**/cargo*.jar"/>
-        <exclude name="**/junit.jar"/>
-        <exclude name="**/jwebunit*.jar"/>
-        <exclude name="**/httpunit*.jar"/>
-        <exclude name="**/*mock*.jar"/>
-        <exclude name="**/servlet-api*.jar"/>
-        <exclude name="**/strutstestcase*.jar"/>
-        <exclude name="**/Tidy.jar"/>
-    </patternset>
-
+    
     <target name="war" depends="compile" description="Packages app as WAR">
+        <mkdir dir="${build.dir}/jars"/>
+        <copy todir="${build.dir}/jars">
+            <fileset refid="compile.fileset"/>
+            <fileset refid="runtime.fileset"/>
+            <mapper type="flatten"/>
+        </copy>
+        <delete>
+            <fileset dir="${build.dir}/jars" includes="servlet-api*"/>
+        </delete>
         <mkdir dir="${dist.dir}"/>
         <war destfile="${dist.dir}/${webapp.name}.war"
             webxml="${web.dir}/WEB-INF/web.xml" compress="true">
             <classes dir="${build.dir}/classes"/>
-            <fileset dir="${web.dir}">
-                <patternset refid="war.files"/>
-                <exclude name="**/web.xml"/>
-            </fileset>
+            <fileset dir="${web.dir}" excludes="**/web.xml"/>
+            <zipfileset prefix="WEB-INF/lib" dir="${build.dir}/jars"/>
         </war>
     </target>
 
     <target name="deploy" depends="compile" description="Deploy application">
         <copy todir="${deploy.dir}" preservelastmodified="true">
-            <fileset dir="${web.dir}">
-                <patternset refid="war.files"/>
-            </fileset>
+            <fileset dir="${web.dir}"/>
         </copy>
         <copy todir="${deploy.dir}/WEB-INF/classes"
             preservelastmodified="true">
             <fileset dir="${build.dir}/classes"/>
         </copy>
+        <copy todir="${deploy.dir}/WEB-INF/lib">
+            <fileset refid="compile.classpath"/>
+            <fileset refid="runtime.classpath"/>
+            <mapper type="flatten"/>
+        </copy>
+        <delete>
+            <fileset dir="${deploy.dir}/WEB-INF/lib" includes="servlet-api*"/>
+        </delete>
     </target>
 
     <target name="deploywar" depends="war" description="Deploy application as a WAR file">
@@ -287,7 +304,10 @@
         <echo message="Loading sample data..."/>
         <sql driver="${jdbc.driverClassName}" url="${jdbc.url}"
             userid="${jdbc.username}" password="${jdbc.password}">
-            <classpath refid="classpath"/>
+            <classpath refid="compile.classpath"/>
+            <classpath>
+                <fileset refid="compile.classpath"/>
+            </classpath>
             <![CDATA[ 
                 INSERT INTO app_user (id, first_name, last_name) 
             	    values (5, 'Julie', 'Raible');
@@ -302,7 +322,7 @@
         <echo message="Deleting data from database..."/>
         <sql driver="${jdbc.driverClassName}" url="${jdbc.url}"
             userid="${jdbc.username}" password="${jdbc.password}">
-            <classpath refid="classpath"/>
+            <classpath refid="compile.classpath"/>
             <![CDATA[ 
                 DELETE FROM app_user;
             ]]>