kaz 02/05/01 12:51:05
Modified: src/templates/build build-docs.xml build-init.xml
build-maven.xml build-metrics.xml build-test.xml
build.init.target default.properties
xdocs properties.xml
Log:
Removing the docs.stylesheets property. This was added as a quick hack
until the color customizations were completed.
Revision Changes Path
1.61 +10 -11 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- build-docs.xml 30 Apr 2002 14:40:59 -0000 1.60
+++ build-docs.xml 1 May 2002 19:51:05 -0000 1.61
@@ -16,7 +16,6 @@
<mkdir dir="${docs.src}"/>
<mkdir dir="${docs.src}/images"/>
<mkdir dir="${docs.src}/stylesheets"/>
- <mkdir dir="${docs.stylesheets}"/>
<mkdir dir="${docs.dest}"/>
<mkdir dir="${gen.docs}"/>
<mkdir dir="${jxr.destdir}"/>
@@ -155,7 +154,7 @@
<dvsl
basedir="."
- style="${docs.stylesheets}/index.dvsl"
+ style="${maven.home}/stylesheets/index.dvsl"
in="project.xml"
out="${gen.docs}/index.xml"
/>
@@ -173,7 +172,7 @@
<dvsl
basedir="."
- style="${docs.stylesheets}/mail-lists.dvsl"
+ style="${maven.home}/stylesheets/mail-lists.dvsl"
in="project.xml"
out="${gen.docs}/mail-lists.xml"
/>
@@ -191,7 +190,7 @@
<dvsl
basedir="."
- style="${docs.stylesheets}/developer-list.dvsl"
+ style="${maven.home}/stylesheets/developer-list.dvsl"
in="project.xml"
out="${gen.docs}/developer-list.xml"
/>
@@ -209,7 +208,7 @@
<dvsl
basedir="."
- style="${docs.stylesheets}/dependencies.dvsl"
+ style="${maven.home}/stylesheets/dependencies.dvsl"
in="project.xml"
out="${gen.docs}/dependencies.xml"
/>
@@ -237,8 +236,8 @@
destdir="${docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${docs.stylesheets}/toolbox.props"
- style="${docs.stylesheets}/site.dvsl"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
+ style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml">
<!-- Need to add the maven jar to load the toolbox -->
@@ -259,8 +258,8 @@
destdir="${docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${docs.stylesheets}/toolbox.props"
- style="${docs.stylesheets}/site.dvsl"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
+ style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml">
<!-- Need to add the maven jar to load the toolbox -->
@@ -297,7 +296,7 @@
<!-- Copy maven supplied stylesheets. -->
<copy todir="${docs.dest}/style" overwrite="yes" filtering="yes">
- <fileset dir="${docs.stylesheets}">
+ <fileset dir="${maven.home}/stylesheets">
<include name="**/*.css"/>
</fileset>
<filterset>
@@ -375,7 +374,7 @@
<arg value="-out"/>
<arg value="${docs.dest}/project.fo"/>
<arg value="-xsl"/>
- <arg value="${docs.stylesheets}/project2fo.xslt"/>
+ <arg value="${maven.home}/stylesheets/project2fo.xslt"/>
<arg value="-param"/>
<arg value="basePath"/>
<arg value="${docs.src}"/>
1.3 +1 -1 jakarta-turbine-maven/src/templates/build/build-init.xml
Index: build-init.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-init.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-init.xml 22 Apr 2002 15:01:53 -0000 1.2
+++ build-init.xml 1 May 2002 19:51:05 -0000 1.3
@@ -236,7 +236,7 @@
style="${maven.home}/update/v${fromVersion}-v${toVersion}/update-descriptor.dvsl"
in="project.xml"
out="project.xml.${toVersion}"
- toolboxfile="${docs.stylesheets}/toolbox.props"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
/>
<!-- Give our new project descriptor its proper name -->
1.41 +2 -2 jakarta-turbine-maven/src/templates/build/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-maven.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build-maven.xml 29 Apr 2002 20:03:56 -0000 1.40
+++ build-maven.xml 1 May 2002 19:51:05 -0000 1.41
@@ -317,8 +317,8 @@
<dvsl
basedir="."
- style="${docs.stylesheets}/checkstyle.dvsl"
- toolboxfile="${docs.stylesheets}/toolbox.props"
+ style="${maven.home}/stylesheets/checkstyle.dvsl"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
in="${build.dir}/checkstyle-raw-report.xml"
out="${gen.docs}/checkstyle-report.xml">
<!-- Need to add the maven jar to load the toolbox -->
1.20 +2 -2 jakarta-turbine-maven/src/templates/build/build-metrics.xml
Index: build-metrics.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-metrics.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build-metrics.xml 22 Apr 2002 15:16:15 -0000 1.19
+++ build-metrics.xml 1 May 2002 19:51:05 -0000 1.20
@@ -104,8 +104,8 @@
<dvsl
basedir="."
- style="${docs.stylesheets}/jdepend.dvsl"
- toolboxfile="${docs.stylesheets}/toolbox.props"
+ style="${maven.home}/stylesheets/jdepend.dvsl"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
in="${build.dir}/jdepend-raw-report.xml"
out="${gen.docs}/jdepend-report.xml">
<!-- Need to add the maven jar to load the toolbox -->
1.26 +2 -2 jakarta-turbine-maven/src/templates/build/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-test.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build-test.xml 22 Apr 2002 15:01:53 -0000 1.25
+++ build-test.xml 1 May 2002 19:51:05 -0000 1.26
@@ -143,8 +143,8 @@
<!-- Convert single report into an xdoc -->
<dvsl
basedir="${basedir}"
- style="${docs.stylesheets}/junit.dvsl"
- toolboxfile="${docs.stylesheets}/toolbox.props"
+ style="${maven.home}/stylesheets/junit.dvsl"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
in="${test.reportsDirectory}/TESTS-TestSuites.xml"
out="${gen.docs}/junit-report.xml">
<classpath>
1.26 +1 -1 jakarta-turbine-maven/src/templates/build/build.init.target
Index: build.init.target
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.init.target,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.init.target 1 May 2002 01:34:46 -0000 1.25
+++ build.init.target 1 May 2002 19:51:05 -0000 1.26
@@ -308,7 +308,7 @@
style="${maven.home}/update/v${fromVersion}-v${toVersion}/update-descriptor.dvsl"
in="project.xml"
out="project.xml.${toVersion}"
- toolboxfile="${docs.stylesheets}/toolbox.props"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
/>
<!-- Give our new project descriptor its proper name -->
1.29 +0 -1 jakarta-turbine-maven/src/templates/build/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/default.properties,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- default.properties 30 Apr 2002 14:40:59 -0000 1.28
+++ default.properties 1 May 2002 19:51:05 -0000 1.29
@@ -15,7 +15,6 @@
docs.src = ${basedir}/xdocs
docs.dest = ${basedir}/docs
-docs.stylesheets = ${maven.home}/stylesheets
gen.docs = ${build.dir}/generated-xdocs
maven.repo.remote = http://jakarta.apache.org/turbine/jars/
1.16 +0 -10 jakarta-turbine-maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/properties.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- properties.xml 30 Apr 2002 14:40:59 -0000 1.15
+++ properties.xml 1 May 2002 19:51:05 -0000 1.16
@@ -242,16 +242,6 @@
</td>
</tr>
<tr>
- <td>docs.stylesheets</td>
- <td>Yes</td>
- <td>
- Specifies the location of the dvsl stylesheets used to transform the
- xdocs into html. This is used by the
- <a href="build-file.html#maven:docs">maven:docs</a> target.
- The default value is <code>${maven.home}/stylesheets</code>.
- </td>
- </tr>
- <tr>
<td>gen.docs</td>
<td>Yes</td>
<td>
