You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/07/19 09:36:36 UTC
cvs commit: jakarta-turbine-site build-legacy.xml build.xml project.xml build-maven.xml
mpoeschl 2002/07/19 00:36:36
Modified: xdocs news.xml
. build.xml project.xml
Added: . build-legacy.xml
Removed: . build-maven.xml
Log:
update to work with maven-b4
make the maven build.xml the default
change layout of the news page
Revision Changes Path
1.11 +16 -16 jakarta-turbine-site/xdocs/news.xml
Index: news.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-site/xdocs/news.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- news.xml 17 Jul 2002 22:05:00 -0000 1.10
+++ news.xml 19 Jul 2002 07:36:35 -0000 1.11
@@ -10,7 +10,7 @@
<section name="News & Status">
-<h3>17 July 2002 - Jakarta Turbine 2.2-b2 Released</h3>
+<h4>17 July 2002 - Jakarta Turbine 2.2-b2 Released</h4>
<p>
The Turbine Team is proud to announce the 2.2-b2 release of Turbine. <br/>
This release includes:
@@ -30,7 +30,7 @@
</ul>
</p>
-<h3>18 March 2002 - Jakarta Turbine 2.2-b1 Released</h3>
+<h4>18 March 2002 - Jakarta Turbine 2.2-b1 Released</h4>
<p>
The Turbine Team is proud to announce the 2.2-b1 release of Turbine. <br/>
This release includes:
@@ -53,31 +53,31 @@
</ul>
</p>
-<h3>15 March 2002 - <a href="http://jakarta.apache.org/turbine/common/status/03-15-2002.html">
-Status Report</a></h3>
+<h4>15 March 2002 - <a href="http://jakarta.apache.org/turbine/common/status/03-15-2002.html">
+Status Report</a></h4>
-<h3>08 March 2002 - <a href="http://jakarta.apache.org/turbine/common/status/03-08-2002.html">
-Status Report</a></h3>
+<h4>08 March 2002 - <a href="http://jakarta.apache.org/turbine/common/status/03-08-2002.html">
+Status Report</a></h4>
-<h3>03 March 2002 - Snapshot downloads available</h3>
+<h4>03 March 2002 - Snapshot downloads available</h4>
<p>
You can download the latest snapshots of Torque and TDK
<a href="http://www.apache.org/dist/jakarta/jakarta-turbine/alpha/">here</a>
</p>
-<h3>01 March 2002 - <a href="http://jakarta.apache.org/turbine/common/status/03-01-2002.html">
-Status Report</a></h3>
+<h4>01 March 2002 - <a href="http://jakarta.apache.org/turbine/common/status/03-01-2002.html">
+Status Report</a></h4>
-<h3>22 February 2002 - <a href="http://jakarta.apache.org/turbine/common/status/02-22-2002.html">
-Status Report</a></h3>
+<h4>22 February 2002 - <a href="http://jakarta.apache.org/turbine/common/status/02-22-2002.html">
+Status Report</a></h4>
-<h3>15 February 2002 - <a href="http://jakarta.apache.org/turbine/common/status/02-15-2002.html">
-Status Report</a></h3>
+<h4>15 February 2002 - <a href="http://jakarta.apache.org/turbine/common/status/02-15-2002.html">
+Status Report</a></h4>
-<h3>08 February 2002 - <a href="http://jakarta.apache.org/turbine/common/status/02-08-2002.html">
-Status Report</a></h3>
+<h4>08 February 2002 - <a href="http://jakarta.apache.org/turbine/common/status/02-08-2002.html">
+Status Report</a></h4>
-<h3>04 June 2001 - Jakarta Turbine 2.1 Released</h3>
+<h4>04 June 2001 - Jakarta Turbine 2.1 Released</h4>
<p>
The <a href="http://jakarta.apache.org/turbine/">Turbine</a> Team
1.13 +85 -80 jakarta-turbine-site/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-site/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 18 Mar 2002 13:55:43 -0000 1.12
+++ build.xml 19 Jul 2002 07:36:35 -0000 1.13
@@ -1,93 +1,98 @@
<?xml version="1.0"?>
-<!-- Build file for Turbine -->
+<project name="maven" default="maven:jar" basedir=".">
-<project name="Turbine-site" default="docs" basedir=".">
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time they invoke a target) -->
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
+ <!-- Allow user defaults for this project -->
<property file="build.properties" />
-
<!-- Set default values for the build -->
- <property file="default.properties" />
+ <property file="project.properties" />
+ <!-- maven:start -->
+
<!-- ================================================================== -->
- <!-- Make Turbine documentation -->
+ <!-- D E L E G A T O R S -->
<!-- ================================================================== -->
-
- <target name="check_for_jdom">
- <available
- property="jdom.present"
- classname="org.jdom.JDOMException">
- <classpath>
- <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
- </classpath>
- </available>
- </target>
-
- <target name="docs-prepare-error" depends="check_for_jdom"
- 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>
-
- <target name="docs"
- depends="docs-prepare-error"
- description="Generates the HTML documentation"
- if="jdom.present">
-
- <!-- Define a task for and run Anakia -->
-
- <taskdef name="anakia"
- classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath>
- <fileset dir="${jakarta.site2}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </taskdef>
-
- <anakia
- basedir="${site.xdocs}"
- destdir="${site.docs}/"
- extension=".html" style="./site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/** empty.xml ${xdocs.dest.turbine2}/**"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="${jakarta.site2}/xdocs/stylesheets">
- </anakia>
-
- <copy todir="${site.docs}/images" filtering="no">
- <fileset dir="${site.xdocs}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
-
- <!-- In case we have CSS someday
- <copy todir="${site.docs}" filtering="no">
- <fileset dir="${site.xdocs}">
- <include name="**/*.css"/>
- </fileset>
- </copy>
- -->
-
- </target>
-
- <!-- =================================================================== -->
- <!-- C L E A N -->
- <!-- =================================================================== -->
-
- <target name="clean" description="Removes generated and copied files">
- <delete dir="${site.docs}"/>
- </target>
+
+ <target
+ name="maven:site">
+ <ant antfile="${maven.home}/build-docs.xml" target="site"/>
+ </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:singletest">
+ <ant antfile="${maven.home}/build-test.xml" target="run-singletest"/>
+ </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:update-jars">
+ <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
+ </target>
+
+ <!-- maven:end -->
</project>
1.4 +12 -4 jakarta-turbine-site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-site/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Apr 2002 10:15:12 -0000 1.3
+++ project.xml 19 Jul 2002 07:36:35 -0000 1.4
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <version>2</version>
+ <pomVersion>3</pomVersion>
<name>jakarta-turbine-site</name>
<id>turbine</id>
<currentVersion>1.0</currentVersion>
- <organization>Apache Software Foundation</organization>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://jakarta.apache.org/</url>
+ </organization>
<inceptionYear>2000</inceptionYear>
<package>org.apache.turbine</package>
<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.</description>
<url>http://jakarta.apache.org/turbine/</url>
- <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-site/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/</siteDirectory>
+
+ <repository>
+ <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-site</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-turbine-site/</url>
+ </repository>
+
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -52,7 +60,7 @@
<name>Martin Poeschl</name>
<id>mpoeschl</id>
<email>mpoeschl@marmot.at</email>
- <organization>Zenplex</organization>
+ <organization>Tucana.at</organization>
</developer>
<developer>
<name>Daniel Rall</name>
1.1 jakarta-turbine-site/build-legacy.xml
Index: build-legacy.xml
===================================================================
<?xml version="1.0"?>
<!-- Build file for Turbine -->
<project name="Turbine-site" default="docs" basedir=".">
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="default.properties" />
<!-- ================================================================== -->
<!-- Make Turbine documentation -->
<!-- ================================================================== -->
<target name="check_for_jdom">
<available
property="jdom.present"
classname="org.jdom.JDOMException">
<classpath>
<pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
</classpath>
</available>
</target>
<target name="docs-prepare-error" depends="check_for_jdom"
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>
<target name="docs"
depends="docs-prepare-error"
description="Generates the HTML documentation"
if="jdom.present">
<!-- Define a task for and run Anakia -->
<taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
<classpath>
<fileset dir="${jakarta.site2}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
<anakia
basedir="${site.xdocs}"
destdir="${site.docs}/"
extension=".html" style="./site.vsl"
projectFile="stylesheets/project.xml"
excludes="**/stylesheets/** empty.xml ${xdocs.dest.turbine2}/**"
includes="**/*.xml"
lastModifiedCheck="true"
templatePath="${jakarta.site2}/xdocs/stylesheets">
</anakia>
<copy todir="${site.docs}/images" filtering="no">
<fileset dir="${site.xdocs}/images">
<include name="**/*.gif"/>
<include name="**/*.jpeg"/>
<include name="**/*.jpg"/>
</fileset>
</copy>
<!-- In case we have CSS someday
<copy todir="${site.docs}" filtering="no">
<fileset dir="${site.xdocs}">
<include name="**/*.css"/>
</fileset>
</copy>
-->
</target>
<!-- =================================================================== -->
<!-- C L E A N -->
<!-- =================================================================== -->
<target name="clean" description="Removes generated and copied files">
<delete dir="${site.docs}"/>
</target>
</project>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>