You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by br...@apache.org on 2002/04/15 04:24:09 UTC
cvs commit: jakarta-turbine-2 build-maven.xml project.properties project.xml
brekke 02/04/14 19:24:09
Modified: . build-maven.xml project.properties project.xml
Log:
Brings the maven build files up to date with the latest beta. Changed the
delagators in build-maven.xml to the latest set, made the project descriptor
a little more readable and fixed up the testing section after the auto
conversion.
Revision Changes Path
1.3 +53 -33 jakarta-turbine-2/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/build-maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-maven.xml 26 Mar 2002 04:50:33 -0000 1.2
+++ build-maven.xml 15 Apr 2002 02:24:09 -0000 1.3
@@ -18,84 +18,104 @@
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
- <target
- name="maven:site">
+ <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">
+ <target name="maven:jar">
<ant antfile="${maven.home}/build-maven.xml" target="jar"/>
</target>
- <target
- name="maven:install-jar">
+ <target name="maven:install-jar">
<ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
</target>
- <target
- name="maven:env">
+ <target name="maven:env">
<ant antfile="${maven.home}/build-maven.xml" target="env"/>
</target>
- <target
- name="maven:docs">
+ <target name="maven:docs">
<ant antfile="${maven.home}/build-docs.xml" target="docs"/>
</target>
- <target
- name="maven:test">
+ <target name="maven:test">
<ant antfile="${maven.home}/build-test.xml" target="test"/>
</target>
- <target
- name="maven:iutest">
+ <target name="maven:iutest">
<ant antfile="${maven.home}/build-iutest.xml" target="test"/>
</target>
- <target
- name="maven:singletest">
+ <target name="maven:singletest">
<ant antfile="${maven.home}/build-test.xml" target="run-singletest"/>
</target>
-
- <target
- name="maven:clean">
+
+ <target name="maven:clean">
<ant antfile="${maven.home}/build-maven.xml" target="clean"/>
</target>
- <target
- name="maven:metrics">
+ <target name="maven:metrics">
<ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
</target>
- <target
- name="maven:dist">
+ <target name="maven:dist">
<ant antfile="${maven.home}/build-maven.xml" target="dist"/>
</target>
- <target
- name="maven:deploy-site">
+ <target name="maven:deploy-site">
<ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
</target>
+
+ <target name="maven:deploy-dist">
+ <ant antfile="${maven.home}/build-maven.xml" target="deploy-dist"/>
+ </target>
- <target
- name="maven:gump-descriptor">
+ <target name="maven:gump-descriptor">
<ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
</target>
+
+ <target name="maven:cross-ref">
+ <ant antfile="${maven.home}/build-docs.xml" target="cross-ref"/>
+ </target>
+
+ <target name="maven:cvs-change-log">
+ <ant antfile="${maven.home}/build-docs.xml" target="cvs-change-log"/>
+ </target>
- <target
- name="maven:javadocs">
+ <target name="maven:javadocs">
<ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
</target>
- <target
- name="maven:compile">
+ <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">
+ <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:maven-update">
+ <ant antfile="${maven.home}/build-maven.xml" target="maven-update"/>
+ </target>
+
+ <target name="maven:validate-pom">
+ <ant antfile="${maven.home}/build-maven.xml" target="validate-pom"/>
</target>
<!-- maven:end -->
1.3 +0 -2 jakarta-turbine-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 26 Mar 2002 04:50:33 -0000 1.2
+++ project.properties 15 Apr 2002 02:24:09 -0000 1.3
@@ -7,5 +7,3 @@
compile.debug = on
compile.optimize = off
compile.deprecation = off
-
-iutest.dir = src/rttest
1.28 +85 -179 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 1 Apr 2002 16:37:52 -0000 1.27
+++ project.xml 15 Apr 2002 02:24:09 -0000 1.28
@@ -1,34 +1,30 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <version>2</version>
<name>jakarta-turbine-2</name>
<id>turbine</id>
<currentVersion>2.2-b2-dev</currentVersion>
<organization>Apache Software Foundation</organization>
<inceptionYear>2000</inceptionYear>
<package>org.apache.turbine</package>
-
- <!-- Gump integration. -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
-
- <shortDescription>
- A servlet based framework.
- </shortDescription>
-
+ <shortDescription>A servlet based framework.</shortDescription>
+
<description>
- Turbine is a servlet based framework that allows experienced Java
- developers to quickly build secure web applications. Parts of
- Turbine can also be used independently of the web portion of Turbine
- as well. In other words, we strive to make portions of Turbine
- easily available for use in other applications.
+ Turbine is a servlet based framework that allows experienced
+ Java developers to quickly build secure web applications. Parts
+ of Turbine can also be used independently of the web portion of
+ Turbine as well. In other words, we strive to make portions of
+ Turbine easily available for use in other applications.
</description>
-
+
<url>http://jakarta.apache.org/turbine/turbine-2/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-2/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/turbine-2/</siteDirectory>
-
+
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -43,268 +39,231 @@
<archive>http://nagoya.apache.org:8080/eyebrowse/SummarizeList?listName=turbine-dev@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
-
+
<developers>
-
<developer>
<name>Gary Bartlett</name>
- <id></id>
- <email></email>
+ <id/>
+ <email/>
<organization>gary_a_bartlett@yahoo.com</organization>
</developer>
-
<developer>
<name>Jeff Brekke</name>
<id>brekke</id>
<email>ekkerbj@yahoo.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Dave Bryson</name>
<id>daveb</id>
<email>mbryson@mont.mindspring.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Kevin A. Burton</name>
<id>burton</id>
<email>burton@relativity.yi.org</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Youngho Cho</name>
- <id></id>
+ <id/>
<email>youngho@nannet.co.kr</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Frank Conradie</name>
- <id></id>
+ <id/>
<email>frank@opticode.co.za</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Gonzalo A. Diethelm</name>
- <id></id>
+ <id/>
<email>gonzalo.diethelm@iname.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Eric Dobbs</name>
- <id></id>
+ <id/>
<email>dobbs@apache.org</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>David Duddleston</name>
- <id></id>
+ <id/>
<email>david@i2a.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Christopher Elkins</name>
- <id></id>
+ <id/>
<email>celkins@scardini.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Jian He</name>
- <id></id>
+ <id/>
<email>hjnet@163.net</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Fedor Karpelevitch</name>
<id>fedor</id>
<email>fedor@karpelevitch.net</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Nissim Karpenstein</name>
- <id></id>
+ <id/>
<email>nissim@nksystems.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Rafal Krzewski</name>
- <id></id>
+ <id/>
<email>krzewski@e-point.pl</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Frank Kim</name>
- <id></id>
- <email></email>
- <organization></organization>
+ <id/>
+ <email/>
+ <organization/>
</developer>
-
<developer>
<name>Chris Kimpton</name>
- <id></id>
+ <id/>
<email>kimptoc.mail@bigfoot.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Sean Legassick</name>
- <id></id>
+ <id/>
<email>mailto:sean@informage.net</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Josh Lucas</name>
- <id></id>
+ <id/>
<email>josh@stonecottage.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Carl Ludwig</name>
- <id></id>
+ <id/>
<email>carl@destinymusic.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Jonas Mauras</name>
- <id></id>
+ <id/>
<email>jm@mediaphil.de</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Brett McLaughlin</name>
- <id></id>
+ <id/>
<email>bmclaugh@algx.net</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>John McNally</name>
<id>jmcnally</id>
<email>jmcnally@collab.net</email>
<organization>CollabNet, Inc.</organization>
</developer>
-
<developer>
<name>Leon Messerschmidt</name>
- <id></id>
+ <id/>
<email>leon@opticode.co.za</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Chris Meyer</name>
- <id></id>
+ <id/>
<email>cmeyer@gatan.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Steven Nagy</name>
- <id></id>
+ <id/>
<email>snagy@web-publicity.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Kasper Nielsen</name>
- <id></id>
+ <id/>
<email>mailto:kav@kav.dk</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Paul O'Leary</name>
- <id></id>
+ <id/>
<email>paul@evolventtech.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Giacomo Pati</name>
- <id></id>
+ <id/>
<email>Giacomo.Pati@pwr.ch</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Martin Poeschl</name>
<id>mpoeschl</id>
<email>mpoeschl@marmot.at</email>
<organization>Zenplex</organization>
</developer>
-
<developer>
<name>Mark Porter</name>
- <id></id>
+ <id/>
<email>mark.porter@canlink.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Jeff Prickett</name>
- <id></id>
+ <id/>
<email>jeffprickett@mindspring.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Ilkka Priha</name>
- <id></id>
+ <id/>
<email>ilkka.priha@simsoft.fi</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Daniel Rall</name>
<id>dlr</id>
<email>dlr@finemaltcoding.com</email>
<organization>CollabNet, Inc.</organization>
</developer>
-
+
<!--
<td>Cameron Riley</td>
<td><a href="mailto:criley@ekmail.com">criley@ekmail.com</a></td>
<td></td>
<td>Apprentice</td>
-->
-
<!--
<td>Greg Ritter</td>
<td><a href="mailto:greg@shwoop.com">greg@shwoop.com</a></td>
<td></td>
<td>Master</td>
-->
-
<!--
<td>Kurt Schrader</td>
<td><a href="mailto:kschrade@engin.umich.edu">kschrade@engin.umich.edu</a></td>
<td></td>
<td>Journeyer</td>
-->
-
<!--
<td>Ingo Schuster</td>
<td><a href="mailto:ingo@raleigh.ibm.com">ingo@raleigh.ibm.com</a></td>
<td></td>
<td>Apprentice</td>
-->
-
<!--
<td>Costas Stergiou</td>
<td><a href="mailto:csterg@aias.gr">csterg@aias.gr</a></td>
@@ -325,35 +284,30 @@
<td></td>
<td>Journeyer</td>
-->
-
<!--
<td>Ralf Stranzenbach</td>
<td><a href="mailto:ralf@reswi.ruhr.de">ralf@reswi.ruhr.de</a></td>
<td></td>
<td>Journeyer</td>
-->
-
<!--
<td>Hakan Tandogan</td>
<td><a href="mailto:hakan42@gmx.de">hakan42@gmx.de</a></td>
<td></td>
<td>Journeyer</td>
-->
-
<!--
<td>Scott C. Tavares</td>
<td><a href="mailto:stavares@home.com">stavares@home.com</a></td>
<td></td>
<td>Master</td>
-->
-
<!--
<td>John Thorhauer</td>
<td><a href="mailto:john@zenplex.com">john@zenplex.com</a></td>
<td>Zenplex Inc.</td>
<td>Journeyer</td>
-->
-
<!--
<td>Magnús þór Torfason</td>
<td><a href="mailto:magnus@handpoint.com">magnus@handpoint.com</a></td>
@@ -374,132 +328,111 @@
<td></td>
<td>Apprentice</td>
-->
-
</developers>
- <!-- Need to mark these as compile-time/run-time -->
-
<dependencies>
-
<dependency>
<name>commons-collections</name>
<type>required</type>
<version>1.0</version>
<jar>commons-collections.jar</jar>
</dependency>
-
<dependency>
<name>commons-lang</name>
<type>required</type>
<version>0.1</version>
<jar>commons-lang-0.1-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-ecs</name>
<type>required</type>
<version>1.4.1</version>
<jar>ecs-1.4.1.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-regexp</name>
<type>required</type>
<version>1.3-dev</version>
<jar>jakarta-regexp-1.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>javamail</name>
<type>required</type>
<version>1.2</version>
<jar>mail-1.2.jar</jar>
</dependency>
-
<dependency>
<name>jaf</name>
<type>required</type>
<version>1.0.1</version>
<jar>activation-1.0.1.jar</jar>
</dependency>
-
<dependency>
<name>jdbc</name>
<type>required</type>
<version>2.0</version>
<jar>jdbc2_0-stdext.jar</jar>
</dependency>
-
<dependency>
<name>jndi</name>
<type>required</type>
<version>1.2.1</version>
<jar>jndi-1.2.1.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-log4j</name>
<type>required</type>
<version>1.1.3</version>
<jar>log4j-1.1.3.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-servletapi</name>
<type>required</type>
<version>2.2</version>
<jar>servlet-2.2.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-turbine-stratum</name>
<type>required</type>
<version>1.0-b2-dev</version>
<jar>stratum-1.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-turbine-torque</name>
<type>required</type>
<version>3.0-b2-dev</version>
<jar>torque-3.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-velocity</name>
<type>required</type>
<version>1.3-dev</version>
<jar>velocity-1.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>village</name>
<type>required</type>
<version>1.5.3-dev.jar</version>
<jar>village-1.5.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>xml-rpc</name>
<type>required</type>
<version>1.0</version>
<jar>xmlrpc-helma.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>xml-xalan2</name>
<type>required</type>
@@ -517,35 +450,30 @@
<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-cactus-framework-12</name>
<type>required</type>
<version>1.2</version>
<jar>cactus.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-cactus-ant</name>
<type>required</type>
<version>1.2</version>
<jar>cactus-ant.jar</jar>
</dependency>
-
<dependency>
<name>jtidy</name>
<type>required</type>
<version>04aug2001-r7-dev</version>
<jar>tidy.jar</jar>
</dependency>
-
<dependency>
<name>junit</name>
<type>required</type>
@@ -563,69 +491,47 @@
<version>0.9.3</version>
<jar>castor-0.9.3.jar</jar>
</dependency>
-
<dependency>
<name>webmacro</name>
<type>required</type>
<version>0.94</version>
<jar>webmacro-0.94.jar</jar>
</dependency>
-
<dependency>
<name>freemarker</name>
<type>required</type>
<version>1.5.3</version>
<jar>freemarker-1.5.3.jar</jar>
</dependency>
-
<dependency>
<name>jython</name>
<type>required</type>
<version>2.1</version>
<jar>jython-2.1.jar</jar>
</dependency>
-
</dependencies>
<build>
-
<sourceDirectories>
<sourceDirectory>src/java</sourceDirectory>
</sourceDirectories>
- <testSourceDirectories>
- <testSourceDirectory>src/java</testSourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <testSourceDirectory>src/rttest</testSourceDirectory>
- </testSourceDirectories>
-
- <aspectSourceDirectories>
- </aspectSourceDirectories>
-
- <!-- Unit test classes -->
- <unitTestClassEntries>
- <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = **/*ServletTest.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = **/BaseValueParserTest.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = **/FileHandlerTest.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = **/TurbineCacheTest.class</unitTestClassEntry>
- </unitTestClassEntries>
-
- <!-- Integration unit test classes -->
- <integrationUnitTestClassEntries>
- <integrationUnitTestClassEntry>exclude = **/FileHandlerTest.class</integrationUnitTestClassEntry>
- <integrationUnitTestClassEntry>include = **/*ServletTest.class</integrationUnitTestClassEntry>
- <integrationUnitTestClassEntry>include = **/TurbineCacheTest.class</integrationUnitTestClassEntry>
- <integrationUnitTestClassEntry>include = **/BaseValueParserTest.class</integrationUnitTestClassEntry>
- </integrationUnitTestClassEntries>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTestPatterns>
+ <unitTestPattern>include = **/*Test.java</unitTestPattern>
+ </unitTestPatterns>
+
+ <integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
+ <integrationUnitTestPatterns>
+ <integrationUnitTestPattern>exclude = **/FileHandlerTest.java</integrationUnitTestPattern>
+ <integrationUnitTestPattern>include = **/*Test.java</integrationUnitTestPattern>
+ </integrationUnitTestPatterns>
+
+ <aspectSourceDirectories></aspectSourceDirectories>
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
+ <jarResources/>
- <jarResources>
- </jarResources>
+ <jars/>
- <jars>
- </jars>
</build>
</project>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>