jvanzyl 2002/06/01 14:14:10
Modified: src/dvsl/xdocs file-activity.dvsl site.dvsl
src/templates/xdocs maven-reports.xml project-info.xml
xdocs/ref build-file.xml project-descriptor.xml
xdocs/start integrate.xml
Log:
Pete's patches for the doc system to match the changes made to the
POM.
Revision Changes Path
1.2 +3 -3 jakarta-turbine-maven/src/dvsl/xdocs/file-activity.dvsl
Index: file-activity.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/file-activity.dvsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file-activity.dvsl 10 May 2002 11:31:40 -0000 1.1
+++ file-activity.dvsl 1 Jun 2002 21:14:10 -0000 1.2
@@ -8,7 +8,7 @@
## to format one's site.
##
##
-## Version: $Id: file-activity.dvsl,v 1.1 2002/05/10 11:31:40 dion Exp $
+## Version: $Id: file-activity.dvsl,v 1.2 2002/06/01 21:14:10 jvanzyl Exp $
## Author: dIon Gillard
#######################################################################
@@ -19,7 +19,7 @@
## pattern.
##
#macro (cvsWebLink $pom $file)
- <a href="$pom.cvsWebUrl.toString().trim()$file">$file</a>
+ <a href="$pom.repository.url.toString().trim()$file">$file</a>
#end
@@ -69,4 +69,4 @@
#match("file")
#set ($dummy = $context.toolbox.maven.addToCount("$node.name.value()"))
-#end
\ No newline at end of file
+#end
1.45 +5 -5 jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- site.dvsl 27 May 2002 23:35:36 -0000 1.44
+++ site.dvsl 1 Jun 2002 21:14:10 -0000 1.45
@@ -178,8 +178,8 @@
<div><small><a href="$relativePath/mail-lists.html">Mailing
Lists</a></small></div>
<div><small><a
href="$relativePath/developer-list.html">Developers</a></small></div>
<div><small><a
href="$relativePath/dependencies.html">Dependencies</a></small></div>
- #if ($pom.cvsWebUrl)
- <div><small><a href="$pom.cvsWebUrl.toString().trim()">CVS
Repository</a></small></div>
+ #if ($pom.repository.url)
+ <div><small><a href="$pom.repository.url.toString().trim()">CVS
Repository</a></small></div>
#end
#if ($pom.issueTrackingUrl)
<div><small><a
href="$pom.issueTrackingUrl.toString().trim()">Issue Tracking</a></small></div>
@@ -192,7 +192,7 @@
#if
($context.toolbox.fileutil.file("$context.toolbox.docSrc/tasks.xml").exists())
<div><small><a
href="$relativePath/tasks.html">Tasks</a></small></div>
#end
- #if ($pom.cvsModule)
+ #if ($pom.repository)
<div><small><a href="$relativePath/changelog.html">Change
Log</a></small></div>
<div><small><a href="$relativePath/activity-log.html">Developer
Activity</a></small></div>
<div><small><a
href="$relativePath/file-activity-report.html">File Activity</a></small></div>
@@ -415,9 +415,9 @@
#end
#match("file")
- <a href="$pom.cvsWebUrl.toString().trim()$node.name.value()">
+ <a href="$pom.repository.url.toString().trim()$node.name.value()">
$node.name.value()</a> -
- <a
href="$pom.cvsWebUrl.toString().trim()$node.name.value()?rev=$node.revision.value()&content-type=text/vnd.viewcvs-markup">
+ <a
href="$pom.repository.url.toString().trim()$node.name.value()?rev=$node.revision.value()&content-type=text/vnd.viewcvs-markup">
v$node.revision.value()</a> <br/>
#end
1.6 +2 -2 jakarta-turbine-maven/src/templates/xdocs/maven-reports.xml
Index: maven-reports.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/xdocs/maven-reports.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven-reports.xml 10 May 2002 15:33:00 -0000 1.5
+++ maven-reports.xml 1 Jun 2002 21:14:10 -0000 1.6
@@ -29,7 +29,7 @@
</td>
</tr>
-->
- #if ($project.cvsModule)
+ #if ($project.repository)
<tr><td><a href="changelog.html">Change Log</a></td>
<td>
This document provides a history of the most recent
@@ -58,7 +58,7 @@
</td>
</tr>
#end
- #if ($project.build.sourceDirectories.size() > 0)
+ #if ($files.file($project.build.sourceDirectory).exists())
<tr><td><a href="jdepend-report.html">Metric Results</a></td>
<td>
This document provides information on various source code
1.3 +2 -2 jakarta-turbine-maven/src/templates/xdocs/project-info.xml
Index: project-info.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/xdocs/project-info.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project-info.xml 6 May 2002 01:36:03 -0000 1.2
+++ project-info.xml 1 Jun 2002 21:14:10 -0000 1.3
@@ -38,8 +38,8 @@
information on each dependency.
</td>
</tr>
- #if ($project.cvsWebUrl)
- <tr><td><a href="$project.cvsWebUrl.toString().trim()">CVS
Repository</a></td>
+ #if ($project.repository.url)
+ <tr><td><a href="$project.repository.url.toString().trim()">CVS
Repository</a></td>
<td>
This is a link to the online CVS repository that can be
viewed via a web browser.
1.18 +14 -14 jakarta-turbine-maven/xdocs/ref/build-file.xml
Index: build-file.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/build-file.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build-file.xml 30 May 2002 18:08:15 -0000 1.17
+++ build-file.xml 1 Jun 2002 21:14:10 -0000 1.18
@@ -151,7 +151,7 @@
<tr>
<td><a href="#maven:dist">maven:dist</a></td>
<td>Generates source and binary distributions from a specified
- distribution identifier.</td>
+ version identifier.</td>
</tr>
<tr>
<td><a href="#maven:dist-build">maven:dist-build</a></td>
@@ -240,8 +240,8 @@
<p>
The <code>maven:compile</code> target compiles all of the
source files that are part of a project. The list of source
- files, more specifically the directories, is determined from
- the <a
href="project-descriptor.html#sourceDirectories"><code>sourceDirectories</code></a>
+ files, more specifically the directory, is determined from
+ the <a
href="project-descriptor.html#build"><code>sourceDirectory</code></a>
element of the Maven project descriptor.
</p>
<p>
@@ -277,7 +277,7 @@
<code>${ant.home}/lib</code> directory (although this default
may be overridden via <a href="properties.html#Compile
Settings">Properties</a>).
Finally, The aspect source files are determined from the <a
-
href="project-descriptor.html#aspectSourceDirectories"><code>aspectSourceDirectories</code></a>
+
href="project-descriptor.html#build"><code>aspectSourceDirectory</code></a>
element of the Maven project descriptor.
</p>
</subsection>
@@ -354,15 +354,15 @@
<p>
The <code>maven:dist</code> target generates both a binary and
source distributions of the project from the specified
- distribution ID. Typically, the distid is specified via the
- command-line: <code>ant -Dmaven.distid=DIST_ID
- maven:dist</code> where <code>DIST_ID</code> is one of the
- distribution IDs specified by the <code>id</code> element of
- the <code>distribution</code> element of the project
- descriptor. The <code>cvsRoot</code> and
- <code>cvsModule</code> elements of the project descriptor
- provide the information required to check out the specific
- sources (see the <a href="project-descriptor.html#project">Project
+ version ID. Typically, the id is specified via the
+ command-line: <code>ant -Dmaven.versionid=VERSION_ID
+ maven:dist</code> where <code>VERSION_ID</code> is one of
+ the version IDs specified by the <code>id</code> element of
+ the <code>version</code> element of the project descriptor.
+ The <code>repository</code> element of the project descriptor
+ provides the information required to check out the specific
+ sources (see the
+ <a href="project-descriptor.html#project">Project
Descriptor</a> for more information on these elements).
</p>
<p>
@@ -388,7 +388,7 @@
The <code>maven:dist-build</code> target generates both a
binary and source distributions of the project from the
current project directory (unlike <code>maven:dist</code>
- which builds a distribution from a specific distribution ID).
+ which builds a distribution from a specific version ID).
</p>
<p>
The binary distribution includes the jar files as well
1.9 +58 -81 jakarta-turbine-maven/xdocs/ref/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/project-descriptor.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project-descriptor.xml 30 May 2002 18:08:15 -0000 1.8
+++ project-descriptor.xml 1 Jun 2002 21:14:10 -0000 1.9
@@ -132,12 +132,6 @@
</td>
</tr>
<tr>
- <td>cvsWebUrl</td>
- <td>
- Optional. The URL to the project's browsable CVS repository
- </td>
- </tr>
- <tr>
<td>issueTrackingUrl</td>
<td>
Optional. The URL to the project's issue tracking system.
@@ -169,31 +163,20 @@
</td>
</tr>
<tr>
- <td>cvsRoot</td>
+ <td><a href="#repository">repository</a></td>
<td>
- Optional. The <code>CVSROOT</code> to use when checking out
- sources for this project via CVS. This is used by Maven
- when <a href="build-file.html#maven:dist">building
- distributions</a> from specific CVS tags.
+ Information relating to the source configuration
+ management system used by this project.
</td>
</tr>
<tr>
- <td>cvsModule</td>
+ <td><a href="#versions">versions</a></td>
<td>
- Optional. The CVS module to use when checking out
- sources for this project via the <code>CVS</code> command.
- This is used by Maven when <a href="build-file.html#maven:dist">building
- distributions</a> from specific CVS tags.
- </td>
- </tr>
- <tr>
- <td><a href="#distributions">distributions</a></td>
- <td>
- Optional. Contains information on previous distributions of the
- project. This information is used when invoking the <a
- href="build-file.html#maven:dist"><code>maven:dist</code></a>
- target.
- </td>
+ Optional. Contains information on previous versions of the
+ project. This information is used when invoking the <a
+ href="build-file.html#maven:dist"><code>maven:dist</code></a>
+ target.
+ </td>
</tr>
<tr>
<td><a href="#mailingLists">mailingLists</a></td>
@@ -249,36 +232,60 @@
</tr>
</table>
</section>
- <section name="distributions">
- <p>This element describes each of the previous distributions of the
- project. Each distribution is described by a <code>distribution</code>
+ <section name="repository">
+ <table>
+ <tr><th>Element</th><th>Description</th></tr>
+ <tr>
+ <td>connection</td>
+ <td>
+ Optional. The source configuration management system URL
+ that describes the repository and how to connect to the
+ repository. This is used by Maven when <a
+ href="build-file.html#maven:dist">building versions</a>
+ from specific ID.
+ </td>
+ </tr>
+ <tr>
+ <td>url</td>
+ <td>
+ Optional. The URL to the project's browsable CVS repository
+ </td>
+ </tr>
+ </table>
+ </section>
+ <section name="versions">
+ <p>This element describes each of the previous versions of the
+ project. Each version is described by a <code>version</code>
element
</p>
- <subsection name="distribution">
+ <subsection name="version">
<table>
<tr><th>Element</th><th>Description</th></tr>
<tr>
<td>id</td>
<td>
- A unique identifier for a distribution. This ID
- is used to specify the distribution that the <a
+ A unique identifier for a version. This ID is
+ used to specify the version that <a
href="build-file.html#maven:dist"><code>maven:dist</code></a>
builds.
</td>
</tr>
<tr>
- <td>version</td>
- <td>The external version number under which this release
- was distributed. Examples include: <code>1.0</code>,
- <code>1.1-alpha1</code>, <code>1.2-beta</code>,
- <code>1.3.2</code> etc.
+ <td>name</td>
+ <td>
+ The external version number under which this
+ release was distributed. Examples include:
+ <code>1.0</code>, <code>1.1-alpha1</code>,
+ <code>1.2-beta</code>, <code>1.3.2</code> etc.
</td>
</tr>
<tr>
<td>tag</td>
- <td>The name given in the version control system (e.g. cvs)
- used by the project for the source code associated with the
- release of this version of the project
+ <td>
+ The name given in the version control system
+ (e.g. cvs) used by the project for the source
+ code associated with this version of the
+ project.
</td>
</tr>
</table>
@@ -363,8 +370,8 @@
used to construct a classpath for your project during the build
process. In addition, Maven can automatically download these
dependencies from a central repository. The filename that Maven
- downloads from the repository is <code>name-version.jar</code>
- where <code>name</code> corresponds to the <code>name</code>
+ downloads from the repository is <code>id-version.jar</code>
+ where <code>id</code> corresponds to the <code>id</code>
element and <code>version</code> corresponds to the
<code>version</code> element.
</p>
@@ -372,7 +379,7 @@
<table>
<tr><th>Element</th><th>Description</th></tr>
<tr>
- <td>name</td>
+ <td>id</td>
<td>The name of the dependency.</td>
</tr>
<tr>
@@ -433,25 +440,21 @@
</td>
</tr>
<tr>
- <td><a href="#sourceDirectories">sourceDirectories</a></td>
+ <td>sourceDirectory</td>
<td>
- This element specifies the directories containing the source
+ This element specifies a directory containing the source
of the project. The generated build system will compile
- these directories when the project is built. Each source
- directory is specified by a <code>sourceDirectory</code>
- element.
+ the source in this directory when the project is built.
</td>
</tr>
<tr>
- <td><a href="#aspectSourceDirectories">aspectSourceDirectories</a></td>
+ <td>aspectSourceDirectory</td>
<td>
- This element specifies the directories containing Aspect
+ This element specifies a directory containing Aspect
sources of the project. The generated build system will
- compile these directories when the project is built if
- Aspects have been enabled (see the <a
- href="properties.html">Properties</a> document). Each
- Aspect source directory is specified by a
- <code>aspectSourceDirectory</code> element.
+ compile the Aspects in this directory when the project is
+ built if Aspects have been enabled (see the <a
+ href="properties.html">Properties</a> document).
</td>
</tr>
<tr>
@@ -543,32 +546,6 @@
tests must use the <a
href="http://jakarta.apache.org/cactus/";>Cactus</a>
testing framework.
- </td>
- </tr>
- </table>
- </subsection>
- <subsection name="sourceDirectories">
- <table>
- <tr><th>Element</th><th>Description</th></tr>
- <tr>
- <td>sourceDirectory</td>
- <td>
- A directory containing source that should be compiled as
- part of a project. This directory is relative to the
- <code>${basedir}</code>.
- </td>
- </tr>
- </table>
- </subsection>
- <subsection name="aspectSourceDirectories">
- <table>
- <tr><th>Element</th><th>Description</th></tr>
- <tr>
- <td>aspectSourceDirectory</td>
- <td>
- A directory containing source that should be compiled as
- part of a project's aspects. The directory is relative to
- <code>${basedir}</code>.
</td>
</tr>
</table>
1.15 +84 -68 jakarta-turbine-maven/xdocs/start/integrate.xml
Index: integrate.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/start/integrate.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- integrate.xml 30 May 2002 18:08:15 -0000 1.14
+++ integrate.xml 1 Jun 2002 21:14:10 -0000 1.15
@@ -50,11 +50,10 @@
</p>
<source><![CDATA[<?xml version="1.0"?>
<project>
-
- <pomVersion>2</pomVersion>
+ <pomVersion>3</pomVersion>
<name>jakarta-turbine-maven</name>
<id>maven</id>
- <currentVersion>1.0-b3-dev</currentVersion>
+ <currentVersion>1.0-b4-dev</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
@@ -62,25 +61,25 @@
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
- <shortDescription>Project Management Tools</shortDescription>
+ <shortDescription>Java Project Management Tools</shortDescription>
+ <!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>
- Maven: a person who has special knowledge or experience;
- an expert or connoisseur. In short, Maven strives to be
- a Java project expert. The entire concept of Maven is
- based around an object model for a project.
+ Maven is a project management and project comprehension
+ tool. Maven is based on the concept of a project object
+ model: builds, documentation creation, site publication,
+ and distribution publication are all controlled from the
+ project object model. Maven also provides tools to
+ create source metrics, change logs based directly on
+ source repository, and source cross-references.
</description>
<url>http://jakarta.apache.org/turbine/maven/</url>
- <cvsWebUrl>
- http://cvs.apache.org/viewcvs/jakarta-turbine-maven/
- </cvsWebUrl>
<issueTrackingUrl>
- http://nagoya.apache.org:8080/scarab/servlet/scarab/
+ http://nagoya.apache.org/scarab/servlet/scarab/
</issueTrackingUrl>
-
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>
/www/jakarta.apache.org/turbine/maven/
@@ -89,81 +88,96 @@
/www/jakarta.apache.org/builds/jakarta-turbine-maven/
</distributionDirectory>
- <cvsRoot>:pserver:[EMAIL PROTECTED]:/home/cvspublic</cvsRoot>
- <cvsModule>jakarta-turbine-maven</cvsModule>
+ <repository>
+ <connection>
+ scm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic/jakarta-turbine-maven
+ </connection>
+ <url>
+ http://cvs.apache.org/viewcvs/jakarta-turbine-maven/
+ </url>
+ </repository>
- <distributions>
- <distribution>
+ <versions>
+ <version>
<id>b3</id>
- <version>1.0-b3</version>
+ <name>1.0-b3</name>
<tag>MAVEN_1_0_B3</tag>
- </distribution>
- <distribution>
+ </version>
+ <version>
<id>b4</id>
- <version>1.0-b4</version>
+ <name>1.0-b4</name>
<tag>HEAD</tag>
- </distribution>
- </distributions>
+ </version>
+ </versions>
<mailingLists>
<mailingList>
- <name>Turbine User List</name>
+ <name>Maven User List</name>
<subscribe>
- [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
</subscribe>
<unsubscribe>
- [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
</unsubscribe>
<archive>
- http://www.mail-archive.com/[email protected]/
+ http://www.mail-archive.com/[email protected]/
</archive>
</mailingList>
-
<mailingList>
- <name>Turbine Developer List</name>
+ <name>Maven Developer List</name>
<subscribe>
- mailto:[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
</subscribe>
<unsubscribe>
- mailto:[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
</unsubscribe>
<archive>
- http://www.mail-archive.com/[email protected]/
+ http://www.mail-archive.com/[email protected]/
</archive>
</mailingList>
</mailingLists>
<developers>
+
<developer>
<name>Juancarlo Anez</name>
<id>juanco</id>
<email>[EMAIL PROTECTED]</email>
<organization></organization>
</developer>
+
+ <developer>
+ <name>Stephane Bailliez</name>
+ <id>sbailliez</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
.
.
.
<developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Zenplex</organization>
+ <name>Glenn McAllister</name>
+ <id>glennm</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>SOMA Networks, Inc.</organization>
</developer>
+
</developers>
<dependencies>
+
<dependency>
- <name>jakarta-turbine-stratum</name>
- <version>0.1</version>
- <url>http://jakarta.apache.org/turbine/stratum/</url>
+ <id>dom4j</id>
+ <version>1.3</version>
+ <url>http://www.dom4j.org/</url>
</dependency>
<dependency>
- <name>jakarta-velocity-dvsl</name>
- <version>0.40</version>
- <url>http://jakarta.apache.org/velocity/</url>
+ <id>bcel</id>
+ <version>5.0</version>
+ <url>http://jakarta.apache.org/bcel/</url>
</dependency>
.
@@ -171,42 +185,43 @@
.
<dependency>
- <name>jdepend</name>
- <version>2.2</version>
- <url>http://jakarta.apache.org/turbine/maven/</url>
+ <id>regexp</id>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp/</url>
</dependency>
+
</dependencies>
-
+
<build>
- <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectories>
- <sourceDirectory>src/java</sourceDirectory>
- </sourceDirectories>
-
- <unitTestSourceDirectory>
- src/test
- </unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory>
- </integrationUnitTestSourceDirectory>
+ <nagEmailAddress>
+ [EMAIL PROTECTED]
+ </nagEmailAddress>
- <aspectSourceDirectories>
- </aspectSourceDirectories>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <integrationUnitTestSourceDirectory/>
+
+ <aspectSourceDirectory/>
+
+ <!-- Unit test classes -->
<unitTestPatterns>
- <unitTestPattern>
- include = **/*Test*.class
- </unitTestPattern>
- </unitTestPatterns>
+ <unitTestPattern>include = **/*Test.java</unitTestPattern>
+ </unitTestPatterns>
+
+ <!-- Integration unit test classes -->
+ <integrationUnitTestPatterns/>
- <integrationUnitTestPatterns>
- </integrationUnitTestPatterns>
+ <!-- J A R R E S O U R C E S -->
+ <!-- Resources that are packaged up inside the JAR file -->
<jarResources>
+ <jarResource>include = *.dtd</jarResource>
</jarResources>
<jars>
- </jars>
+ </jars>
</build>
</project>]]></source>
</subsection>
@@ -547,9 +562,10 @@
documentation.
</li>
<li>
- If you require the creation of J2EE distributions, please
- refer to the <a href="../plugins/j2ee/index.html">J2EE
- Plugin</a> documentation for more information.
+ Maven comes with plugins that can be used to
+ extend your build system. Please refer to the
+ <a href="../plugins/index.html">documentation</a>
+ for more information on the various plugins.
</li>
<li>
Don't forget, all of the Turbine projects have been
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
