Update of /cvsroot/tacos/tacos4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21159
Modified Files:
build.xml
Log Message:
fixed Bug21: ant build errors.
Index: build.xml
===================================================================
RCS file: /cvsroot/tacos/tacos4/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** build.xml 18 Dec 2005 15:23:28 -0000 1.39
--- build.xml 24 Dec 2005 04:47:46 -0000 1.40
***************
*** 3,68 ****
<!-- Local properties -->
! <property file="${basedir}/build.properties" />
! <taskdef resource="testngtasks" classpath="ext/testng-4.4-jdk14.jar" />
! <property name="release-suffix" value="4-alpha-7" />
! <property name="debug" value="true" />
! <property name="java.src" value="src/java" />
! <property name="descriptor.src" value="src/descriptor" />
! <property name="test.src" value="src/test" />
! <property name="demo.src" value="demo/src" />
! <property name="demo.context" value="demo/docroot" />
! <property name="work.dir" value="build" />
! <property name="build.dir" value="${work.dir}/tacos-lib" />
<!-- dirs for test output -->
! <property name="test.output" value="${work.dir}/test/test-output" />
! <property name="test.report" value="${work.dir}/test/test-report" />
! <property name="test.data" value="src/test-data" />
<path id="compile.cp">
! <fileset dir="lib" includes="**/*.jar" />
! <fileset dir="ext" includes="**/*.jar" />
</path>
<!-- runtime -->
<path id="run.cp">
! <path refid="compile.cp" />
! <pathelement location="${build.dir}" />
! <pathelement location="${test.output}" />
</path>
<target name="clean">
! <delete dir="work" />
! <delete dir="dist" />
! <delete dir="lib" />
</target>
<target name="init">
! <mkdir dir="dist" />
! <mkdir dir="${work.dir}" />
! <mkdir dir="${build.dir}" />
! <mkdir dir="${test.output}" />
! <mkdir dir="${test.report}" />
! <tstamp />
</target>
<target name="dist" depends="init">
! <antcall target="build-war" />
! <antcall target="dist-lib" />
! <antcall target="dist-src" />
! <antcall target="dist-docs" />
</target>
<target name="compile" depends="init">
! <javac srcdir="${java.src}" destdir="${build.dir}" debug="${debug}"
classpathref="compile.cp" target="1.4" source="1.4" />
</target>
<target name="build-lib" depends="compile">
<jar destfile="dist/tacos${release-suffix}-lib.jar">
! <fileset dir="${build.dir}" />
! <fileset dir="${java.src}" excludes="**/*.java,descriptor/**" />
! <metainf dir="${descriptor.src}/META-INF" includes="**/*.xml" />
</jar>
</target>
--- 3,91 ----
<!-- Local properties -->
! <property file="${basedir}/build.properties"/>
! <taskdef resource="testngtasks" classpath="ext/testng-4.4-jdk14.jar"/>
! <property name="release-suffix" value="4-alpha-7"/>
! <property name="debug" value="true"/>
! <property name="java.src" value="src/java"/>
! <property name="descriptor.src" value="src/descriptor"/>
! <property name="test.src" value="src/test"/>
! <property name="demo.src" value="demo/src"/>
! <property name="demo.context" value="demo/docroot"/>
! <property name="work.dir" value="build"/>
! <property name="build.dir" value="${work.dir}/tacos-lib"/>
<!-- dirs for test output -->
! <property name="test.output" value="${work.dir}/test/test-output"/>
! <property name="test.report" value="${work.dir}/test/test-report"/>
! <property name="test.data" value="src/test-data"/>
<path id="compile.cp">
! <fileset dir="lib" includes="**/*.jar"/>
! <fileset dir="ext" includes="**/*.jar"/>
</path>
<!-- runtime -->
<path id="run.cp">
! <path refid="compile.cp"/>
! <pathelement location="${build.dir}"/>
! <pathelement location="${test.output}"/>
</path>
+ <patternset id="demo.lib.jars">
+
+ <include name="commons-logging*.jar"/>
+ <include name="commons-codec*.jar"/>
+ <include name="commons-lang*.jar"/>
+ <include name="commons-fileupload*.jar"/>
+ <include name="commons-collections*.jar"/>
+ <include name="commons-beanutils*.jar"/>
+ <include name="commons-digester*.jar"/>
+ <include name="commons-io*.jar"/>
+ <include name="bsf*.jar"/>
+ <include name="cglib*.jar"/>
+ <include name="hivemind*.jar"/>
+ <include name="tapestry*.jar"/>
+ <include name="javassist*.jar"/>
+ <include name="log4j*.jar"/>
+ <include name="ognl*.jar"/>
+ <include name="oro*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="jaxen*.jar"/>
+ </patternset>
+
<target name="clean">
! <delete dir="work"/>
! <delete dir="dist"/>
! <delete dir="lib"/>
</target>
<target name="init">
! <mkdir dir="dist"/>
! <mkdir dir="${work.dir}"/>
! <mkdir dir="${build.dir}"/>
! <mkdir dir="${test.output}"/>
! <mkdir dir="${test.report}"/>
! <tstamp/>
</target>
<target name="dist" depends="init">
! <antcall target="build-war"/>
! <antcall target="dist-lib"/>
! <antcall target="dist-src"/>
! <antcall target="dist-docs"/>
</target>
<target name="compile" depends="init">
! <javac srcdir="${java.src}" destdir="${build.dir}" debug="${debug}"
classpathref="compile.cp" target="1.4"
! source="1.4"/>
</target>
<target name="build-lib" depends="compile">
<jar destfile="dist/tacos${release-suffix}-lib.jar">
! <fileset dir="${build.dir}"/>
! <fileset dir="${java.src}" excludes="**/*.java,descriptor/**"/>
! <metainf dir="${descriptor.src}/META-INF" includes="**/*.xml"/>
</jar>
</target>
***************
*** 71,101 ****
<zip destfile="dist/tacos${release-suffix}-lib.zip">
<fileset dir="demo/docroot/">
! <include name="js/dojo/**" />
</fileset>
<fileset dir=".">
! <include name="dist/tacos${release-suffix}-lib.jar" />
</fileset>
</zip>
</target>
! <target name="build-war" depends="build-lib">
! <mkdir dir="work/tacos-demo" />
! <javac srcdir="demo/src" destdir="work/tacos-demo" debug="${debug}"
target="1.4" source="1.4">
! <classpath>
! <fileset dir="dist" includes="tacos${release-suffix}-lib.jar" />
! <fileset dir="lib" includes="**/*.jar" />
! </classpath>
! </javac>
! <war destfile="dist/tacos${release-suffix}-demo.war"
webxml="demo/docroot/WEB-INF/web.xml">
! <fileset dir="demo/docroot" excludes="WEB-INF/**" />
! <webinf dir="demo/docroot/WEB-INF">
! <exclude name="web.xml" />
! <exclude name="classes/**" />
! <!-- <exclude name="log4j.properties"/> -->
</webinf>
- <lib dir="dist" includes="tacos${release-suffix}-lib.jar" />
- <lib dir="lib" includes="*.jar" />
- <classes dir="work/tacos-demo" includes="**/*.class" />
- <classes dir="${demo.src}" excludes="**/*.java" />
</war>
</target>
--- 94,111 ----
<zip destfile="dist/tacos${release-suffix}-lib.zip">
<fileset dir="demo/docroot/">
! <include name="js/dojo/**"/>
</fileset>
<fileset dir=".">
! <include name="dist/tacos${release-suffix}-lib.jar"/>
</fileset>
</zip>
</target>
! <target name="build-war" depends="deploy-demo" description="build the demo
war">
! <war destfile="dist/tacos${release-suffix}-demo.war"
webxml="${demo.context}/WEB-INF/web.xml">
! <fileset dir="${demo.context}" excludes="WEB-INF/**"/>
! <webinf dir="${demo.context}/WEB-INF">
! <exclude name="web.xml"/>
</webinf>
</war>
</target>
***************
*** 104,112 ****
<zip destfile="dist/tacos${release-suffix}-src.zip">
<fileset dir=".">
! <include name="*" />
! <include name="${java.src}/**" />
! <include name="${demo.src}/**" />
! <exclude name="demo/docroot/WEB-INF/classes/**" />
! <exclude name="demo/docroot/WEB-INF/lib/**" />
</fileset>
</zip>
--- 114,122 ----
<zip destfile="dist/tacos${release-suffix}-src.zip">
<fileset dir=".">
! <include name="*"/>
! <include name="${java.src}/**"/>
! <include name="${demo.src}/**"/>
! <exclude name="demo/docroot/WEB-INF/classes/**"/>
! <exclude name="demo/docroot/WEB-INF/lib/**"/>
</fileset>
</zip>
***************
*** 115,144 ****
<target name="dist-docs" depends="javadoc">
<zip destfile="dist/tacos${release-suffix}-docs.zip">
! <zipfileset dir="${work.dir}/site/" />
</zip>
</target>
<target name="javadoc">
! <mkdir dir="${work.dir}/site" />
! <javadoc windowtitle="Tacos" packagenames="net.sf.tacos.*"
! destdir="${work.dir}/site/api" author="true"
! version="true" use="true" splitindex="true"
! noindex="false"
! stylesheetfile="src/documentation/resources/stylesheets/jdstyle.css">
! <sourcepath location="${java.src}" />
! <sourcepath location="${demo.src}" />
<classpath>
! <fileset dir="lib" includes="**/*.jar" />
</classpath>
! <group title="Framework" packages="net.sf.tacos*" />
! <group title="Demo" packages="net.sf.tacos.demo*" />
! <link href="http://java.sun.com/j2se/1.4.2/docs/api/"; />
! <link href="http://jakarta.apache.org/tapestry/tapestry/apidocs/"; />
! <link href="http://jakarta.apache.org/hivemind/hivemind/apidocs/"; />
</javadoc>
</target>
--- 125,154 ----
<target name="dist-docs" depends="javadoc">
<zip destfile="dist/tacos${release-suffix}-docs.zip">
! <zipfileset dir="${work.dir}/site/"/>
</zip>
</target>
<target name="javadoc">
! <mkdir dir="${work.dir}/site"/>
! <javadoc windowtitle="Tacos" packagenames="net.sf.tacos.*"
! destdir="${work.dir}/site/api" author="true"
! version="true" use="true" splitindex="true"
! noindex="false"
!
stylesheetfile="src/documentation/resources/stylesheets/jdstyle.css">
! <sourcepath location="${java.src}"/>
! <sourcepath location="${demo.src}"/>
<classpath>
! <fileset dir="lib" includes="**/*.jar"/>
</classpath>
! <group title="Framework" packages="net.sf.tacos*"/>
! <group title="Demo" packages="net.sf.tacos.demo*"/>
! <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
! <link href="http://jakarta.apache.org/tapestry/tapestry/apidocs/"/>
! <link href="http://jakarta.apache.org/hivemind/hivemind/apidocs/"/>
</javadoc>
</target>
***************
*** 146,191 ****
<!-- Testing tasks -->
<target name="compile-test" depends="compile">
! <javac srcdir="${test.src}" destdir="${test.output}"
! debug="${debug}" classpathref="run.cp" source="1.4" />
</target>
<target name="test" depends="compile-test">
! <mkdir dir="${test.report}" />
! <testng classpathref="run.cp" outputDir="${test.report}"
! sourcedir="${test.src}" haltOnfailure="true" verbose="2"
dumpCommand="true">
! <xmlfileset dir="${test.data}" includes="testng.xml" />
</testng>
</target>
<target name="clean-demo" description="clean the classes , jars in demo">
! <delete dir="${demo.context}/WEB-INF/classes" />
! <delete dir="${demo.context}/WEB-INF/lib" />
</target>
<target name="deploy-demo" description="make the demo run in web server">
! <mkdir dir="${demo.context}/WEB-INF/classes" />
! <mkdir dir="${demo.context}/WEB-INF/lib" />
! <javac srcdir="${java.src}" destdir="${demo.context}/WEB-INF/classes"
! debug="${debug}" classpathref="compile.cp" target="1.4" source="1.4" />
! <javac srcdir="${demo.src}" destdir="${demo.context}/WEB-INF/classes"
! debug="${debug}" classpathref="compile.cp" target="1.4" source="1.4">
! <classpath refid="compile.cp" />
! <classpath path="${demo.context}/WEB-INF/classes" />
</javac>
<copy todir="${demo.context}/WEB-INF/classes">
- <fileset dir="${java.src}">
- <exclude name="**/*.java" />
- </fileset>
<fileset dir="${demo.src}">
! <exclude name="**/*.java" />
</fileset>
- <fileset dir="${descriptor.src}" />
</copy>
! <copy todir="${demo.context}/WEB-INF/lib" flatten="true">
! <fileset dir="lib" includes="**/*.jar" />
! <fileset dir="ext" includes="**/*.jar" />
</copy>
--- 156,207 ----
<!-- Testing tasks -->
<target name="compile-test" depends="compile">
! <javac srcdir="${test.src}" destdir="${test.output}"
! debug="${debug}" classpathref="run.cp" source="1.4"/>
</target>
<target name="test" depends="compile-test">
! <mkdir dir="${test.report}"/>
! <testng classpathref="run.cp" outputDir="${test.report}"
! sourcedir="${test.src}" haltOnfailure="true" verbose="2"
dumpCommand="true">
! <xmlfileset dir="${test.data}" includes="testng.xml"/>
</testng>
</target>
<target name="clean-demo" description="clean the classes , jars in demo">
! <delete dir="${demo.context}/WEB-INF/classes"/>
! <delete dir="${demo.context}/WEB-INF/lib"/>
</target>
<target name="deploy-demo" description="make the demo run in web server">
! <mkdir dir="${demo.context}/WEB-INF/classes"/>
! <mkdir dir="${demo.context}/WEB-INF/lib"/>
! <delete file="dist/tacos${release-suffix}-lib.jar"/>
! <antcall target="build-lib"/>
!
! <javac srcdir="${demo.src}" destdir="${demo.context}/WEB-INF/classes"
! debug="${debug}" target="1.4" source="1.4">
!
! <classpath refid="compile.cp"/>
! <classpath>
! <fileset dir="dist">
! <include name="tacos${release-suffix}-lib.jar"/>
! </fileset>
! </classpath>
</javac>
<copy todir="${demo.context}/WEB-INF/classes">
<fileset dir="${demo.src}">
! <exclude name="**/*.java"/>
</fileset>
</copy>
! <copy todir="${demo.context}/WEB-INF/lib" flatten="true"
preservelastmodified="true">
! <fileset dir="lib">
! <patternset refid="demo.lib.jars"/>
! </fileset>
! <fileset dir="dist">
! <include name="tacos${release-suffix}-lib.jar"/>
! </fileset>
</copy>
***************
*** 193,239 ****
<macrodef name="get-lib">
! <attribute name="project" />
! <attribute name="version" />
! <attribute name="dir" default="lib/" />
! <attribute name="file" default="@{project}" />
<sequential>
! <get dest="@{dir}/@[EMAIL PROTECTED]"
src="http://www.ibiblio.org/maven/@{project}/jars/@[EMAIL PROTECTED]"
usetimestamp="yes" verbose="yes" />
</sequential>
</macrodef>
<target name="fetch-libs" description="Download dependencies">
! <mkdir dir="lib" />
! <mkdir dir="lib/build" />
! <get-lib project="commons-lang" version="2.1" />
! <get-lib project="commons-logging" version="1.0.4" />
! <get-lib project="commons-collections" version="3.1" />
! <get-lib project="commons-beanutils" version="1.7.0" />
! <get-lib project="commons-codec" version="1.3" />
! <get-lib project="commons-digester" version="1.5" />
! <get-lib project="commons-fileupload" version="1.0" />
! <get-lib project="commons-httpclient" version="3.0-rc4" />
! <get-lib project="commons-io" version="1.0" />
! <get-lib project="oro" version="2.0.8" />
! <get-lib project="javassist" version="3.0" />
! <get-lib project="ognl" version="2.6.7" />
! <get-lib project="bsf" version="2.3.0" />
! <get-lib project="tapestry" version="4.0-rc-2" />
! <get-lib project="tapestry" file="tapestry-contrib" version="4.0-rc-2" />
! <get-lib project="hivemind" version="1.1" />
! <get-lib project="hivemind" file="hivemind-lib" version="1.1" />
! <get-lib project="servletapi" version="2.3" dir="lib/build/" />
! <get-lib project="log4j" version="1.2.9" />
! <get-lib project="easymock" version="1.1" />
! <get-lib project="easymock" file="easymockclassextension" version="1.1" />
! <get-lib project="junit" version="3.8.1" />
! <get-lib project="dom4j" version="1.6.1" />
! <get-lib project="jaxen" version="1.1-beta-6" />
! <get-lib project="saxpath" version="1.0-FCS" />
! <get-lib project="xerces" file="xercesImpl" version="2.6.2" />
! <get-lib project="xml-apis" version="2.0.2" />
! <get-lib project="cglib" version="nodep-2.1" />
! <get-lib project="asm" version="2.1" />
! <get-lib project="nekohtml" version="0.9.5" />
! <get-lib project="htmlunit" version="1.7" />
</target>
--- 209,256 ----
<macrodef name="get-lib">
! <attribute name="project"/>
! <attribute name="version"/>
! <attribute name="dir" default="lib/"/>
! <attribute name="file" default="@{project}"/>
<sequential>
! <get dest="@{dir}/@[EMAIL PROTECTED]"
! src="http://www.ibiblio.org/maven/@{project}/jars/@[EMAIL
PROTECTED]" usetimestamp="yes" verbose="yes"/>
</sequential>
</macrodef>
<target name="fetch-libs" description="Download dependencies">
! <mkdir dir="lib"/>
! <mkdir dir="lib/build"/>
! <get-lib project="commons-lang" version="2.1"/>
! <get-lib project="commons-logging" version="1.0.4"/>
! <get-lib project="commons-collections" version="3.1"/>
! <get-lib project="commons-beanutils" version="1.7.0"/>
! <get-lib project="commons-codec" version="1.3"/>
! <get-lib project="commons-digester" version="1.5"/>
! <get-lib project="commons-fileupload" version="1.0"/>
! <get-lib project="commons-httpclient" version="3.0-rc4"/>
! <get-lib project="commons-io" version="1.0"/>
! <get-lib project="oro" version="2.0.8"/>
! <get-lib project="javassist" version="3.0"/>
! <get-lib project="ognl" version="2.6.7"/>
! <get-lib project="bsf" version="2.3.0"/>
! <get-lib project="tapestry" version="4.0-rc-2"/>
! <get-lib project="tapestry" file="tapestry-contrib" version="4.0-rc-2"/>
! <get-lib project="hivemind" version="1.1"/>
! <get-lib project="hivemind" file="hivemind-lib" version="1.1"/>
! <get-lib project="servletapi" version="2.3" dir="lib/build/"/>
! <get-lib project="log4j" version="1.2.9"/>
! <get-lib project="easymock" version="1.1"/>
! <get-lib project="easymock" file="easymockclassextension" version="1.1"/>
! <get-lib project="junit" version="3.8.1"/>
! <get-lib project="dom4j" version="1.6.1"/>
! <get-lib project="jaxen" version="1.1-beta-6"/>
! <get-lib project="saxpath" version="1.0-FCS"/>
! <get-lib project="xerces" file="xercesImpl" version="2.6.2"/>
! <get-lib project="xml-apis" version="2.0.2"/>
! <get-lib project="cglib" version="nodep-2.1"/>
! <get-lib project="asm" version="2.1"/>
! <get-lib project="nekohtml" version="0.9.5"/>
! <get-lib project="htmlunit" version="1.7"/>
</target>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Tacos-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tacos-devel
