jvanzyl 02/05/28 12:24:55
Modified: . build.xml project.xml
Removed: . build-maven.xml build-test.xml default.properties
deps.list dist.sh tdk.jar
Log:
- Getting rid of the legacy build
- Cleaning up the project.xml file. Getting rid of the <jar> where
possible (most cases) and getting rid of the <type> elements.
update your maven install.
Revision Changes Path
1.33 +99 -689 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 10 May 2002 22:36:23 -0000 1.32
+++ build.xml 28 May 2002 19:24:55 -0000 1.33
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
-<!-- Build file for Turbine -->
-
-<project name="Turbine" default="jar" basedir=".">
+<project name="maven" default="maven:jar" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) -->
@@ -12,694 +10,106 @@
<!-- Allow user defaults for this project -->
<property file="build.properties" />
<!-- Set default values for the build -->
- <property file="default.properties" />
-
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
- <property name="src.adapter.dir" value="${src.dir}/adapter"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="final.dir" value="../${final.name}/"/>
- <property name="src.aspects.dir" value="${src.dir}/aspects"/>
-
- <!-- Build classpath -->
- <path id="classpath">
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-configuration.jar}"/>
- <pathelement location="${commons-lang.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-http.jar}"/>
- <pathelement location="${commons-xo.jar}"/>
- <pathelement location="${dom4j.jar}"/>
- <pathelement location="${fulcrum.jar}"/>
- <pathelement location="${jaf.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${regexp.jar}"/>
- <pathelement location="${torque.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${stratum.jar}"/>
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${stratum.jar}"/>
- <pathelement location="${dvsl.jar}"/>
- <pathelement location="${jgen.jar}"/>
- <pathelement location="${commons-fileupload.jar}"/>
-
- <!-- AspectJ Jars for non-invasive use of aspects -->
- <pathelement location="${aspectjrt.jar}"/>
- <pathelement location="${aspectjtools.jar}"/>
-
- <!-- Required for auto jar updating -->
- <pathelement location="tdk.jar"/>
- </path>
-
- <!-- ================================================================== -->
- <!-- U P D A T E J A R S -->
- <!-- ================================================================== -->
-
- <target
- name="update-jars">
-
- <taskdef
- name="httpget"
- className="org.apache.tdk.task.Get">
- <classpath refid="classpath"/>
- </taskdef>
-
- <!-- If you need proxy support you'll have to manually add:
-
- proxyHost="x"
- proxyPort="y"
-
- We'll clean this up but it worked for a user behind a proxy.
- -->
-
- <httpget
- baseUrl="http://jakarta.apache.org/turbine/jars/";
- dest="${lib.repo}"
- dependencyFile="deps.list"
- />
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Prints useful build environment values -->
- <!-- ================================================================== -->
-
- <target name="env" depends="check_available">
- <echo message="java.home = ${java.home}"/>
- <echo message="user.home = ${user.home}"/>
- <echo message="lib.repo = ${lib.repo}"/>
-
- <echo message="commons-beanutils.jar = ${commons-beanutils.jar}"/>
- <echo message="commons-collections.jar = ${commons-collections.jar}"/>
- <echo message="commons-lang.jar = ${commons-lang.jar}"/>
- <echo message="commons-http.jar = ${commons-http.jar}"/>
- <echo message="dom4j.jar = ${dom4j.jar}"/>
- <echo message="fulcrum.jar = ${fulcrum.jar}"/>
- <echo message="jaf.jar = ${jaf.jar}"/>
- <echo message="log4j.jar = ${log4j.jar}"/>
- <echo message="regexp.jar = ${regexp.jar}"/>
- <echo message="servlet.jar = ${servlet.jar}"/>
- <echo message="stratum.jar = ${stratum.jar}"/>
- <echo message="torque.jar = ${torque.jar}"/>
- <echo message="velocity.jar = ${velocity.jar}"/>
- <echo message="xerces.jar = ${xerces.jar}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Help on usage -->
- <!-- ================================================================== -->
-
- <target name="usage">
- <echo message="use -projecthelp to see the available targets"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Check to see what optional dependencies are available -->
- <!-- ================================================================== -->
-
- <target name="check_available">
-
- <available
- classname="org.apache.commons.beanutils.PropertyUtils"
- property="commons-beanutils.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.dom4j.Node"
- property="dom4j.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.velocity.runtime.Runtime"
- property="velocity.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.log4j.Category"
- property="log4j.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.servlet.http.HttpServletRequest"
- property="servlet.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.fulcrum.BaseService"
- property="fulcrum.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.regexp.RE"
- property="regexp.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.torque.Torque"
- property="torque.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.activation.DataSource"
- property="jaf.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.xerces.parsers.SAXParser"
- property="xerces.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.collections.FastHashMap"
- property="commons-collections.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.lang.exception.NestableException"
- property="commons-lang.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.http.HttpUtils"
- property="commons-http.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.stratum.component.Component"
- property="stratum.present"
- classpathref="classpath"
- />
-
- <!-- Not required for building -->
- <available
- property="jsdk2.2.present"
- classname="javax.servlet.jsp.PageContext">
- <classpath refid="classpath"/>
- </available>
-
- </target>
-
- <target name="check.commons-beanutils"
- unless="commons-beanutils.present">
- <echo>commons-beanutils.present = ${commons-beanutils.present}</echo>
- <antcall target="property-warning">
- <param name="name" value="commons-beanutils.jar"/>
- <param name="value" value="${commons-beanutils.jar}"/>
- </antcall>
- </target>
-
- <target name="check.dom4j" unless="dom4j.present">
- <antcall target="property-warning">
- <param name="name" value="dom4j.jar"/>
- <param name="value" value="${dom4j.jar}"/>
- </antcall>
- </target>
-
- <target name="check.velocity" unless="velocity.present">
- <antcall target="property-warning">
- <param name="name" value="velocity.jar"/>
- <param name="value" value="${velocity.jar}"/>
- </antcall>
- </target>
-
- <target name="check.log4j" unless="log4j.present">
- <antcall target="property-warning">
- <param name="name" value="log4j.jar"/>
- <param name="value" value="${log4j.jar}"/>
- </antcall>
- </target>
-
- <target name="check.servlet" unless="servlet.present">
- <antcall target="property-warning">
- <param name="name" value="servlet.jar"/>
- <param name="value" value="${servlet.jar}"/>
- </antcall>
- </target>
-
- <target name="check.fulcrum" unless="fulcrum.present">
- <antcall target="property-warning">
- <param name="name" value="fulcrum.jar"/>
- <param name="value" value="${fulcrum.jar}"/>
- </antcall>
- </target>
-
- <target name="check.regexp" unless="regexp.present">
- <antcall target="property-warning">
- <param name="name" value="regexp.jar"/>
- <param name="value" value="${regexp.jar}"/>
- </antcall>
- </target>
-
- <target name="check.torque" unless="torque.present">
- <antcall target="property-warning">
- <param name="name" value="torque.jar"/>
- <param name="value" value="${torque.jar}"/>
- </antcall>
- </target>
-
- <target name="check.jaf" unless="jaf.present">
- <antcall target="property-warning">
- <param name="name" value="jaf.jar"/>
- <param name="value" value="${jaf.jar}"/>
- </antcall>
- </target>
-
- <target name="check.xerces" unless="xerces.present">
- <antcall target="property-warning">
- <param name="name" value="xerces.jar"/>
- <param name="value" value="${xerces.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-collections" unless="commons-collections.present">
- <antcall target="property-warning">
- <param name="name" value="commons-collections.jar"/>
- <param name="value" value="${commons-collections.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-lang" unless="commons-lang.present">
- <antcall target="property-warning">
- <param name="name" value="commons-lang.jar"/>
- <param name="value" value="${commons-lang.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-http" unless="commons-http.present">
- <antcall target="property-warning">
- <param name="name" value="commons-http.jar"/>
- <param name="value" value="${commons-http.jar}"/>
- </antcall>
- </target>
-
-
- <target name="check.stratum" unless="stratum.present">
- <antcall target="property-warning">
- <param name="name" value="stratum.jar"/>
- <param name="value" value="${stratum.jar}"/>
- </antcall>
- </target>
-
- <target name="property-warning">
- <echo>
- +----------------------------------------------------------------+
- + F A I L E D R E Q U I R E M E N T |
- +----------------------------------------------------------------+
- | You must define the following property in order |
- | to build Turbine: |
- | |
- | ${name} = ${value}
- | |
- | You can set this property in the provided build.properties |
- | file, or you may set this property in your |
- | ${user.home}/build.properties file.
- +----------------------------------------------------------------+
- </echo>
- <fail message="Failed Requirement"/>
- </target>
+ <property file="project.properties" />
+ <!-- maven:start -->
+
<!-- ================================================================== -->
- <!-- Prepares the build directory -->
+ <!-- D E L E G A T O R S -->
<!-- ================================================================== -->
+
+ <target name="maven:site">
+ <ant antfile="${maven.home}/build-docs.xml" target="site"/>
+ </target>
+
+ <target name="maven:fo">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs:fo"/>
+ </target>
+
+ <target name="maven:pdf">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs:pdf"/>
+ </target>
+
+ <target name="maven:jar">
+ <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
+ </target>
+
+ <target name="maven:install-jar">
+ <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
+ </target>
+
+ <target name="maven:env">
+ <ant antfile="${maven.home}/build-maven.xml" target="env"/>
+ </target>
+
+ <target name="maven:docs">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
+ </target>
+
+ <target name="maven:test">
+ <ant antfile="${maven.home}/build-test.xml" target="test"/>
+ </target>
+
+ <target name="maven:iutest">
+ <ant antfile="${maven.home}/build-iutest.xml" target="test"/>
+ </target>
+
+ <target name="maven:clean">
+ <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
+ </target>
+
+ <target name="maven:metrics">
+ <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
+ </target>
+
+ <target name="maven:dist">
+ <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
+ </target>
+
+ <target name="maven:deploy-site">
+ <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
+ </target>
+
+ <target name="maven:gump-descriptor">
+ <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
+ </target>
+
+ <target name="maven:javadocs">
+ <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
+ </target>
+
+ <target name="maven:compile">
+ <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
+ </target>
+
+ <target name="maven:check-source">
+ <ant antfile="${maven.home}/build-maven.xml" target="check-source"/>
+ </target>
+
+ <target name="maven:update-jars">
+ <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
+ </target>
+
+ <target name="maven:announce">
+ <ant antfile="${maven.home}/build-maven.xml" target="announce"/>
+ </target>
+
+ <target name="maven:update-descriptor">
+ <ant antfile="${maven.home}/build-maven.xml" target="update-descriptor"/>
+ </target>
+
+ <target name="maven:updates-available">
+ <ant antfile="${maven.home}/build-maven.xml" target="updates-available"/>
+ </target>
+
+ <target name="maven:validate-pom">
+ <ant antfile="${maven.home}/build-maven.xml" target="validate-pom"/>
+ </target>
+
+ <target name="maven:maven-update">
+ <ant antfile="${maven.home}/build-maven.xml" target="maven-update"/>
+ </target>
+
+ <!-- maven:end -->
- <target name="prepare"
- depends="env,
- check.commons-beanutils,check.commons-collections,
- check.commons-lang,check.dom4j,check.jaf,check.log4j,
- check.fulcrum,check.regexp,check.servlet,check.stratum,
- check.torque,check.xerces,check.velocity,
- check.commons-http">
-
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dest}"/>
- <mkdir dir="${build.src}"/>
-
- <filter token="VERSION" value="${version}"/>
-
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.java.dir}/org">
- <include name="**/*.java"/>
- <include name="**/package.html"/>
- <exclude name="**/*Jsp*.java"/>
- <exclude name="**/jsp/**"/>
- </fileset>
- </copy>
-
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.dir}/tool/org"/>
- </copy>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Adds Jsp related files to the build directory -->
- <!-- ================================================================== -->
-
- <target name="prepare-jsp" depends="prepare" if="jsdk2.2.present">
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.java.dir}/org">
- <include name="**/*Jsp*.java"/>
- <include name="**/jsp/**"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiles the source directory -->
- <!-- ================================================================== -->
-
- <target
- name="compile"
- depends="prepare, prepare-jsp"
- description="--> compiles the source code">
-
- <javac
- srcdir="${build.src}"
- destdir="${build.dest}"
- excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
-
- <!-- Include the pipeline and valve XML descriptors -->
- <copy todir="${build.dest}/conf" filtering="yes">
- <fileset dir="${conf.dir}">
- <include name="**/*pipeline.xml"/>
- <include name="**/*valve.xml"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- A S P E C T C O M P I L E -->
- <!-- =================================================================== -->
- <target
- name="acompile"
- depends="prepare">
-
- <!-- Move aspects into the build cycle -->
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.aspects.dir}/org">
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <taskdef
- name="ajc"
- classname="org.aspectj.tools.ant.taskdefs.Ajc"/>
-
- <ajc srcdir="${build.src}"
- destdir="${build.dest}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </ajc>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiles the source directory and creates a .jar file -->
- <!-- ================================================================== -->
-
- <target
- name="jar"
- depends="compile"
- description="--> generates the turbine.jar file (default)">
-
- <jar
- jarfile="${build.dir}/${final.name}.jar"
- basedir="${build.dest}"
- excludes="**/package.html"/>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- D I S T R I B U T I O N S -->
- <!-- ================================================================== -->
-
- <target
- name="dist"
- depends="jar,javadocs">
-
- <property name="distDir" value="${build.dir}/${final.name}"/>
-
- <!-- B I N A R Y D I S T R I B U T I O N -->
-
- <echo>
- +-------------------------------------------------------+
- | C R E A T I N G B I N A R Y D I S T R I B U T I O N |
- +-------------------------------------------------------+
- </echo>
-
- <mkdir dir="${distDir}"/>
-
- <!-- Copy README and LICENSE -->
- <copy todir="${distDir}" file="README.txt"/>
- <copy todir="${distDir}" file="LICENSE"/>
-
- <!-- Copy Jars -->
- <copy todir="${distDir}">
- <fileset dir="${build.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy documentation -->
- <copy todir="${distDir}/docs">
- <fileset dir="${docs.dest}">
- <include name="**"/>
- </fileset>
- </copy>
-
- <!-- Create a tar.gz file -->
- <tar longfile="gnu" tarfile="${final.name}.tar">
- <tarfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </tarfileset>
- </tar>
-
- <gzip zipfile="${final.name}.tar.gz" src="${final.name}.tar"/>
- <delete file="${final.name}.tar"/>
-
- <!-- Create a zip file -->
- <zip zipfile="${final.name}.zip">
- <zipfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </zipfileset>
- </zip>
-
- <!-- S O U R C E D I S T R I B U T I O N -->
-
- <echo>
- +-------------------------------------------------------+
- | C R E A T I N G S O U R C E D I S T R I B U T I O N |
- +-------------------------------------------------------+
- </echo>
-
- <delete>
- <fileset dir="${distDir}">
- <include name="**/*.jar"/>
- </fileset>
- </delete>
-
- <copy todir="${distDir}" file="default.properties"/>
- <copy todir="${distDir}" file="build.xml"/>
-
- <!-- Copy Source -->
- <copy todir="${distDir}/src">
- <fileset dir="${src.dir}">
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <!-- Create a tar.gz file -->
- <tar longfile="gnu" tarfile="${final.name}-src.tar">
- <tarfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </tarfileset>
- </tar>
-
- <gzip zipfile="${final.name}-src.tar.gz" src="${final.name}-src.tar"/>
- <delete file="${final.name}-src.tar"/>
-
- <!-- Create a zip file -->
- <zip zipfile="${final.name}-src.zip">
- <zipfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </zipfileset>
- </zip>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- I N S T A L L J A R -->
- <!-- ================================================================== -->
-
- <target name="install-jar" depends="jar"
- description="==> Installs .jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
- <fileset dir="${build.dir}">
- <include name="${final.name}.jar"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- jars the source directory -->
- <!-- ================================================================== -->
-
- <target name="jarsrc"
- depends="prepare"
- description="--> generates the turbine.src.jar file containing source
only">
-
- <jar
- jarfile="${build.dir}/${final.name}.src.jar"
- basedir="${build.src}"
- excludes="**/package.html"/>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- A N A K I A D O C U M E N T A T I O N -->
- <!-- ================================================================== -->
-
- <target
- name="check_for_jdom">
-
- <available
- property="jdom.present"
- classname="org.jdom.JDOMException">
- <classpath>
- <fileset dir="${jakarta.site2}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </available>
- </target>
-
- <target depends="check_for_jdom" name="docs-prepare-error"
- unless="jdom.present">
- <echo>
- The Jakarta-Site2 module is not present! Please check
- to make sure that you have checked it out from CVS.
-
- <http://jakarta.apache.org/site/jakarta-site2.html>
- </echo>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- D V S L D O C U M E N T A T I O N -->
- <!-- ================================================================== -->
-
- <target
- name="docs">
-
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath>
- <path refid="classpath"/>
- </classpath>
- </taskdef>
-
- <!-- Make sure the target directory -->
- <mkdir dir="${docs.dest}"/>
- <dvsl
- basedir="${docs.src}"
- destdir="${docs.dest}/"
- force="true"
- extension=".html"
- toolboxfile="${docs.src}/toolbox.props"
- style="${docs.src}/stylesheets/site.dvsl"
- excludes="**/project.xml,**/template.xml"
- includes="**/*.xml"
- />
-
- <copy todir="${docs.dest}/images" filtering="no">
- <fileset dir="${docs.src}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Creates the API documentation -->
- <!-- ================================================================== -->
-
- <target name="javadocs"
- depends="prepare"
- description="--> generates the API documentation">
-
- <mkdir dir="${javadoc.destdir}"/>
-
- <javadoc
- sourcepath="${build.src}"
- packagenames="${package}.*,org.apache.fulcrum.*,org.apache.torque.*"
- destdir="${javadoc.destdir}"
- author="true"
- private="true"
- version="true"
- use="true"
- windowtitle="${name} ${version} API"
- doctitle="${name} ${version} API"
- bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights
Reserved.">
- <classpath refid="classpath"/>
- </javadoc>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleans up the build directory -->
- <!-- ================================================================== -->
-
- <target name="clean" description="--> cleans up the build directory">
- <delete dir="${build.dir}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- T E S T S -->
- <!-- ================================================================== -->
-
- <target name="test" depends="compile"
- description="--> runs turbine unit tests">
-
- <ant antfile="build-test.xml">
- <property file="build.properties"/>
- </ant>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Create the Turbine SQL for all the supported DBs. -->
- <!-- ================================================================== -->
-
- <target name="turbine-sql"
- depends="compile"
- description="--> generates the Turbine SQL for all the supported DBs">
-
- <ant antfile="build-turbine-sql.xml" dir="${basedir}"/>
-
- </target>
</project>
1.26 +13 -67 jakarta-turbine-3/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 7 May 2002 22:54:02 -0000 1.25
+++ project.xml 28 May 2002 19:24:55 -0000 1.26
@@ -95,177 +95,123 @@
<dependencies>
<dependency>
<name>jaf</name>
- <type>required</type>
<version>1.0.1</version>
<jar>activation-1.0.1.jar</jar>
</dependency>
<dependency>
- <name>jakarta-cactus-framework-12</name>
- <type>required</type>
+ <name>cactus</name>
<version>1.2</version>
- <jar>cactus.jar</jar>
</dependency>
<dependency>
- <name>jakarta-cactus-ant</name>
- <type>required</type>
+ <name>cactus-ant</name>
<version>1.2</version>
- <jar>cactus-ant.jar</jar>
</dependency>
<dependency>
<name>commons-beanutils</name>
- <type>required</type>
<version>1.0</version>
- <jar>commons-beanutils.jar</jar>
</dependency>
<dependency>
<name>commons-collections</name>
- <type>required</type>
<version>1.0</version>
- <jar>commons-collections.jar</jar>
</dependency>
<dependency>
<name>commons-configuration</name>
- <type>required</type>
<version>1.0-dev</version>
- <jar>commons-configuration-1.0-dev.jar</jar>
</dependency>
<dependency>
<name>commons-xo</name>
- <type>required</type>
- <version>1.0-dev</version>
- <jar>commons-xo-1.0-dev.jar</jar>
+ <version>0.8</version>
</dependency>
<dependency>
<name>commons-lang</name>
- <type>required</type>
- <version>0.1</version>
- <jar>commons-lang-0.1-dev.jar</jar>
+ <version>1.0-dev</version>
</dependency>
<dependency>
<name>commons-logging</name>
- <type>required</type>
<version>1.0</version>
- <jar>commons-logging-1.0.jar</jar>
</dependency>
<dependency>
<name>commons-io</name>
- <type>required</type>
<version>0.1</version>
- <jar>commons-io.jar</jar>
</dependency>
<dependency>
<name>commons-http</name>
- <type>required</type>
<version>1.1</version>
- <jar>commons-http.jar</jar>
</dependency>
<dependency>
<name>commons-fileupload</name>
- <type>required</type>
- <version>1.0</version>
- <jar>commons-fileupload-1.0-dev.jar</jar>
+ <version>1.0-dev</version>
</dependency>
<dependency>
<name>dom4j</name>
- <type>required</type>
<version>1.3</version>
- <jar>dom4j-1.3.jar</jar>
</dependency>
<dependency>
- <name>jakarta-turbine-fulcrum</name>
- <type>required</type>
+ <name>fulcrum</name>
<version>3.0-b2-dev</version>
- <jar>fulcrum-3.0-b2-dev.jar</jar>
</dependency>
<dependency>
<name>commons-httpclient</name>
- <type>required</type>
<version>1.0</version>
- <jar>httpclient.jar</jar>
</dependency>
<dependency>
<name>httpunit</name>
- <type>required</type>
<version>1.3</version>
- <jar>httpunit.jar</jar>
</dependency>
<dependency>
- <name>jakarta-regexp</name>
- <type>required</type>
+ <name>regexp</name>
<version>1.3-dev</version>
- <jar>jakarta-regexp-1.3-dev.jar</jar>
</dependency>
<dependency>
<name>junit</name>
- <type>required</type>
<version>3.7</version>
- <jar>junit-3.7.jar</jar>
</dependency>
<dependency>
- <name>jakarta-log4j</name>
- <type>required</type>
+ <name>log4j</name>
<version>1.1.3</version>
- <jar>log4j-1.1.3.jar</jar>
</dependency>
<dependency>
- <name>jakarta-servletapi</name>
- <type>required</type>
+ <name>servletapi</name>
<version>2.2</version>
- <jar>servlet-2.2.jar</jar>
</dependency>
<dependency>
- <name>jakarta-turbine-stratum</name>
- <type>required</type>
+ <name>stratum</name>
<version>1.0-b2-dev</version>
- <jar>stratum-1.0-b2-dev.jar</jar>
</dependency>
<dependency>
<name>jtidy</name>
- <type>required</type>
<version>04aug2001-r7-dev</version>
<jar>tidy.jar</jar>
</dependency>
<dependency>
- <name>jakarta-turbine-torque</name>
- <type>required</type>
+ <name>torque</name>
<version>3.0-b2</version>
- <jar>torque-3.0-b2.jar</jar>
</dependency>
<dependency>
- <name>jakarta-velocity</name>
- <type>required</type>
+ <name>velocity</name>
<version>1.3-dev</version>
- <jar>velocity-1.3-dev.jar</jar>
</dependency>
<dependency>
- <name>jakarta-velocity-dvsl</name>
- <type>documentation</type>
+ <name>velocity-dvsl</name>
<version>0.43</version>
- <jar>velocity-dvsl-0.43.jar</jar>
</dependency>
<dependency>
<name>xml-xerces</name>
- <type>required</type>
<version>2.0.0</version>
<jar>xercesImpl-2.0.0.jar</jar>
</dependency>
<dependency>
<name>xml-apis</name>
- <type>required</type>
<version>2.0.0</version>
<jar>xmlParserAPIs-2.0.0.jar</jar>
</dependency>
<dependency>
<name>commons-jxpath</name>
- <type>required</type>
<version>0.1-dev</version>
- <jar>commons-jxpath-0.1-dev.jar</jar>
</dependency>
<dependency>
<name>jgen</name>
- <type>required</type>
<version>1.4-dev</version>
- <jar>jgen-1.4-dev.jar</jar>
</dependency>
</dependencies>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
