dion 2003/08/28 23:27:54
Modified: src/plugins-build/javadoc plugin.jelly plugin.properties
src/plugins-build/clover/xdocs changes.xml
src/plugins-build/word2html/xdocs/current changes.xml
src/plugins-build/pdf/xdocs changes.xml
src/plugins-build/xdoc plugin.jelly plugin.properties
src/plugins-build/linkcheck/xdocs changes.xml
src/plugins-build/pdf project.xml plugin.jelly
src/plugins-build/docbook plugin.jelly
src/plugins-build/jxr plugin.properties
src/plugins-build/docbook/xdocs changes.xml
src/plugins-build/multiproject/xdocs/current changes.xml
src/plugins-build/checkstyle plugin.jelly
src/plugins-build/jdiff project.xml plugin.jelly
src/plugins-build/xdoc/xdocs changes.xml
src/plugins-build/linkcheck plugin.jelly
src/plugins-build/clover plugin.jelly
src/plugins-build/ashkelon plugin.jelly project.xml
src/plugins-build/statcvs plugin.jelly
src/plugins-build/dist/xdocs changes.xml
src/plugins-build/word2html plugin.jelly
src/plugins-build/jellydoc/xdocs changes.xml
src/plugins-build/multiproject plugin.jelly
src/plugins-build/jxr/xdocs changes.xml
src/plugins-build/license/xdocs changes.xml
src/plugins-build/tasklist plugin.jelly
src/plugins-build/tasklist/xdocs changes.xml
src/plugins-build/javadoc/xdocs changes.xml
src/plugins-build/site/xdocs changes.xml
src/plugins-build/dist plugin.jelly
src/plugins-build/statcvs/xdocs changes.xml
src/plugins-build/jellydoc plugin.jelly
src/plugins-build/license plugin.jelly
src/plugins-build/site plugin.jelly
src/plugins-build/changes/xdocs changes.xml
src/plugins-build/changes plugin.jelly
src/plugins-build/faq plugin.jelly project.xml
src/plugins-build/checkstyle/xdocs changes.xml
Added: src/plugins-build/ashkelon/xdocs changes.xml
src/plugins-build/faq/xdocs changes.xml
src/plugins-build/jdiff/xdocs changes.xml
Log:
MAVEN-548. Move common reporting properties to defaults
Revision Changes Path
1.20 +1 -1 maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 22 Aug 2003 08:43:57 -0000 1.19
+++ plugin.jelly 29 Aug 2003 06:27:51 -0000 1.20
@@ -193,7 +193,7 @@
</ant:javadoc>
<ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
- <j:set var="genDocs"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}" />
+ <j:set var="genDocs" value="${maven.gen.docs}" />
<doc:text-xdoc
title="Javadoc Report"
section="Javadoc Report"
1.5 +1 -1 maven/src/plugins-build/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 2 Jul 2003 10:24:05 -0000 1.4
+++ plugin.properties 29 Aug 2003 06:27:51 -0000 1.5
@@ -5,7 +5,7 @@
# -------------------------------------------------------------------
maven.javadoc.author = true
-maven.javadoc.destdir =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/apidocs
+maven.javadoc.destdir = ${maven.docs.dest}/apidocs
# optional properties for specifying a custom doclet
#maven.javadoc.docletpath=
1.6 +3 -0 maven/src/plugins-build/clover/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/clover/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 2 Jul 2003 09:04:16 -0000 1.5
+++ changes.xml 29 Aug 2003 06:27:51 -0000 1.6
@@ -8,6 +8,9 @@
<body>
<release version="1.2" date="in CVS">
+ <action dev="dion" type="update">
+ update to use maven.docs.*/maven.gen.docs
+ </action>
<action dev="evenisse" type="fix">
Fixed MAVEN-493. I register reports only if source, test,... exists.
So, corresponding entrys in menu will appear only if reports are registered.
1.2 +4 -0 maven/src/plugins-build/word2html/xdocs/current/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/word2html/xdocs/current/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 28 Aug 2003 07:03:02 -0000 1.1
+++ changes.xml 29 Aug 2003 06:27:51 -0000 1.2
@@ -7,6 +7,10 @@
<body>
+ <release version="1.4" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
+ </release>
+
<release version="1.3" date="2003-08-28">
<action dev="dion" type="fix">
Correctly handle files with <code>..</code> in the names
1.4 +5 -1 maven/src/plugins-build/pdf/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pdf/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 12 Mar 2003 16:03:06 -0000 1.3
+++ changes.xml 29 Aug 2003 06:27:51 -0000 1.4
@@ -6,7 +6,11 @@
</properties>
<body>
- <release version="1.1" date="in CVS">
+ <release version="1.2" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
+ </release>
+
+ <release version="1.1" date="Unknown">
<action dev="dion" type="add">
Upgraded to xerces 2.3.0, xalan 2.4.1 and fop 0.20.5rc2
</action>
1.43 +3 -9 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- plugin.jelly 21 Aug 2003 09:01:08 -0000 1.42
+++ plugin.jelly 29 Aug 2003 06:27:51 -0000 1.43
@@ -139,23 +139,17 @@
-->
<j:if test="${outputDirectory == null}">
- <j:set
- var="outputDirectory"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"
+ <j:set var="outputDirectory" value="${maven.gen.docs}"
/>
</j:if>
<!-- Set default encoding if not set. -->
<j:if test="${encoding == null}">
- <j:set
- var="encoding"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"
- />
+ <j:set var="encoding" value="${maven.docs.outputencoding}" />
</j:if>
<j:if test="${omitXmlDeclaration == null}">
- <j:set var="omitXmlDeclaration"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.omitXmlDeclaration')}"/>
+ <j:set var="omitXmlDeclaration" value="${maven.docs.omitXmlDeclaration}"/>
</j:if>
<mkdir dir="${outputDirectory}"/>
1.11 +0 -6 maven/src/plugins-build/xdoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 11 Jul 2003 05:15:25 -0000 1.10
+++ plugin.properties 29 Aug 2003 06:27:51 -0000 1.11
@@ -4,12 +4,6 @@
# Xdoc plugin.
# -------------------------------------------------------------------
-maven.docs.src = ${basedir}/xdocs
-maven.docs.dest = ${maven.build.dir}/docs
-maven.docs.outputencoding = ISO-8859-1
-maven.docs.omitXmlDeclaration=false
-maven.gen.docs = ${maven.build.dir}/generated-xdocs
-
maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
maven.xdoc.includeProjectDocumentation = yes
1.7 +1 -0 maven/src/plugins-build/linkcheck/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/linkcheck/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 25 Jul 2003 06:21:15 -0000 1.6
+++ changes.xml 29 Aug 2003 06:27:52 -0000 1.7
@@ -8,6 +8,7 @@
<body>
<release version="1.1" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="dion" type="update">
Upgrade to dom4j 1.4
</action>
1.15 +1 -1 maven/src/plugins-build/pdf/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pdf/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 19 Aug 2003 04:45:06 -0000 1.14
+++ project.xml 29 Aug 2003 06:27:52 -0000 1.15
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-pdf-plugin</id>
<name>Maven PDF Plug-in</name>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>1.2-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Java Project Management Tools</shortDescription>
<url>http://maven.apache.org/reference/plugins/pdf/</url>
1.6 +2 -4 maven/src/plugins-build/pdf/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pdf/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 12 Mar 2003 16:01:13 -0000 1.5
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.6
@@ -6,10 +6,8 @@
name="pdf:init"
prereqs="xdoc:init">
- <j:set var="docsDest"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
- <j:set var="docsSrc"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
+ <j:set var="docsSrc" value="${maven.docs.src}"/>
</goal>
1.6 +1 -2 maven/src/plugins-build/docbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/docbook/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 27 May 2003 23:25:55 -0000 1.5
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.6
@@ -11,8 +11,7 @@
prereqs="xdoc:init"
description="Transform any docbook-simple source into xdocs for later use">
- <j:set var="genDocs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+ <j:set var="genDocs" value="${maven.gen.docs}"/>
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
<j:set var="dtd" value="${maven.docbook.dtd}"/>
1.6 +2 -2 maven/src/plugins-build/jxr/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.properties 2 Jul 2003 10:24:06 -0000 1.5
+++ plugin.properties 29 Aug 2003 06:27:52 -0000 1.6
@@ -4,8 +4,8 @@
# JXR Plugin.
# -------------------------------------------------------------------
-maven.jxr.destdir =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/xref
-maven.jxr.destdir.test =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/xref-test
+maven.jxr.destdir = ${maven.docs.dest}/xref
+maven.jxr.destdir.test = ${maven.docs.dest}/xref-test
maven.jxr.stylesheet = ${plugin.resources}/stylesheet.css
maven.jxr.templateDir = ${plugin.resources}/templates
1.5 +3 -0 maven/src/plugins-build/docbook/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/docbook/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 25 Jul 2003 06:37:48 -0000 1.4
+++ changes.xml 29 Aug 2003 06:27:52 -0000 1.5
@@ -8,6 +8,9 @@
<body>
<release version="1.1" date="in CVS">
<action dev="dion" type="update">
+ update to use maven.docs.*/maven.gen.docs
+ </action>
+ <action dev="dion" type="update">
update to xalan 2.4.1
</action>
<action dev="dion" type="update">
1.2 +1 -0 maven/src/plugins-build/multiproject/xdocs/current/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/current/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 28 Aug 2003 07:30:05 -0000 1.1
+++ changes.xml 29 Aug 2003 06:27:52 -0000 1.2
@@ -7,6 +7,7 @@
<body>
<release version="1.1" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
</release>
<release version="1.0" date="2003-08-28">
1.16 +0 -2 maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 19 Aug 2003 04:45:05 -0000 1.15
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.16
@@ -165,8 +165,6 @@
</ant:checkstyle>
- <j:set var="maven.docs.outputencoding"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
-
<doc:jsl
input="${maven.build.dir}/checkstyle-raw-report.xml"
output="checkstyle-report.xml"
1.11 +1 -1 maven/src/plugins-build/jdiff/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdiff/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 19 Aug 2003 04:45:06 -0000 1.10
+++ project.xml 29 Aug 2003 06:27:52 -0000 1.11
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-jdiff-plugin</id>
<name>Maven JDiff Plugin</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Java Project Management Tools</shortDescription>
<url>http://maven.apache.org/reference/plugins/jdiff/</url>
1.8 +1 -2 maven/src/plugins-build/jdiff/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdiff/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 20 Aug 2003 12:37:18 -0000 1.7
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.8
@@ -15,8 +15,7 @@
<ant:property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
<ant:mkdir dir="${maven.jdiff.dir}"/>
- <j:set var="docsDest"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
<j:set var="javadocDestdir"
value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
1.13 +3 -0 maven/src/plugins-build/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 20 Aug 2003 17:21:43 -0000 1.12
+++ changes.xml 29 Aug 2003 06:27:52 -0000 1.13
@@ -7,6 +7,9 @@
<body>
<release version="1.4" date="in CVS">
+ <action dev='dion' type='fix'>
+ Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc
plugin
+ </action>
<action dev="evenisse" type="fix">
Fix for MAVEN-698. Fix the broken build if repository/connection is not
present.
</action>
1.12 +1 -1 maven/src/plugins-build/linkcheck/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/linkcheck/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 8 Jul 2003 11:01:07 -0000 1.11
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.12
@@ -7,7 +7,6 @@
xmlns:doc="doc">
<property name="maven.linkcheck.cache"
value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
- <property name="maven.gen.docs"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
<goal name="maven-linkcheck-plugin:register">
<doc:registerReport
@@ -50,6 +49,7 @@
<j:if test="${online.trim().length() > 0}">
<j:forEach var="report" items="${reports}">
+ <!-- FIXME: Why special case linkcheck - fix it! -->
<j:if test="${report.get('pluginName').equals('maven-linkcheck-plugin')}">
<attainGoal name="maven-linkcheck-plugin:report-real"/>
</j:if>
1.9 +1 -3 maven/src/plugins-build/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/clover/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 1 Jul 2003 13:53:41 -0000 1.8
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.9
@@ -77,9 +77,7 @@
<clover-setup initstring="${maven.clover.database.dir}/clover_coverage.db"/>
- <j:set
- var="cloverReportDirectory"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/clover"/>
+ <j:set var="cloverReportDirectory" value="${maven.docs.dest}/clover"/>
<maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>
1.1 maven/src/plugins-build/ashkelon/xdocs/changes.xml
Index: changes.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">Jason van Zyl</author>
</properties>
<body>
<release version="1.1" date="in CVS">
<action dev="dion" type="update">
update to use maven.docs.*/maven.gen.docs
</action>
</release>
</body>
</document>
1.5 +0 -2 maven/src/plugins-build/ashkelon/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ashkelon/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 30 Mar 2003 16:17:20 -0000 1.4
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.5
@@ -9,8 +9,6 @@
<ant:property name="maven.linkcheck.cache"
value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
- <ant:property name="maven.gen.docs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
<goal name="maven-ashkelon-plugin:register">
<doc:registerReport
1.9 +1 -1 maven/src/plugins-build/ashkelon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ashkelon/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 25 Jul 2003 00:47:34 -0000 1.8
+++ project.xml 29 Aug 2003 06:27:52 -0000 1.9
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-ashkelon-plugin</id>
<name>Maven Ashkelon Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Java Project Management Tools</shortDescription>
<url>http://maven.apache.org/reference/plugins/ashkelon/</url>
1.9 +0 -1 maven/src/plugins-build/statcvs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/statcvs/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 31 Jul 2003 05:39:57 -0000 1.8
+++ plugin.jelly 29 Aug 2003 06:27:52 -0000 1.9
@@ -56,7 +56,6 @@
<!-- FIXME : We must use, with cvs, the connection string define in
project.xml -->
<cvs command="-q log" output="${statcvs.logfile}"/>
- <property name="maven.docs.dest"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
<ant:mkdir dir="${maven.docs.dest}"/>
<java jar="${plugin.getDependencyPath('statcvs')}" fork="true">
1.1 maven/src/plugins-build/faq/xdocs/changes.xml
Index: changes.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
<release version="1.1" date="in CVS">
<action dev="dion" type="update">
update to use maven.docs.*/maven.gen.docs
</action>
</release>
</body>
</document>
1.3 +3 -0 maven/src/plugins-build/dist/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/dist/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 25 Jul 2003 03:04:32 -0000 1.2
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.3
@@ -8,6 +8,9 @@
<body>
<release version="1.3" date="in CVS">
<action dev="dion" type="update">
+ update to use maven.docs.*/maven.gen.docs
+ </action>
+ <action dev="dion" type="update">
update to commons-lang 1.0.1
</action>
</release>
1.8 +1 -2 maven/src/plugins-build/word2html/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/word2html/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 28 Aug 2003 05:14:34 -0000 1.7
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.8
@@ -28,8 +28,7 @@
</fileset>
</fileScanner>
- <j:set var="docsDest"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
<j:forEach var="file" items="${wordFiles.iterator()}">
<echo>Generating from ${file} to ${docsDest}</echo>
1.4 +1 -0 maven/src/plugins-build/jellydoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jellydoc/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 19 Aug 2003 04:45:08 -0000 1.3
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.4
@@ -9,6 +9,7 @@
<body>
<release version="1.1" date="In CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="dion" type="update">
Upgrade to dom4j 1.4
</action>
1.26 +0 -7 maven/src/plugins-build/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.jelly,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- plugin.jelly 28 Aug 2003 04:53:17 -0000 1.25
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.26
@@ -8,11 +8,6 @@
xmlns:util="jelly:util"
xmlns:velocity="jelly:velocity">
- <j:set var="maven.gen.docs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
- <j:set var="maven.docs.dest"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
-
<!--==================================================================-->
<!-- Default goal: builds sites for all subprojects -->
<!--==================================================================-->
@@ -120,8 +115,6 @@
template="navigation-${navType}.xml"/>
</j:if>
- <j:set var="maven.docs.src"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}" />
<j:set var="userNav" value="${maven.docs.src}/navigation.xml" />
<!-- FIXME: Will the xdoc stuff screw this up?? -->
1.7 +1 -0 maven/src/plugins-build/jxr/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 25 Jul 2003 06:25:45 -0000 1.6
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.7
@@ -8,6 +8,7 @@
<body>
<release version="1.2" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="dion" type="update">
Move to oro 2.0.7
</action>
1.2 +1 -0 maven/src/plugins-build/license/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/license/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 2 Jul 2003 09:04:17 -0000 1.1
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.2
@@ -7,6 +7,7 @@
<body>
<release version="1.1" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="evenisse" type="fix">
Fixed MAVEN-493. I register reports only if source, test,... exists.
So, corresponding entrys in menu will appear only if reports are registered.
1.8 +2 -4 maven/src/plugins-build/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/tasklist/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 1 Jul 2003 13:53:42 -0000 1.7
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.8
@@ -32,10 +32,8 @@
prereqs="xdoc:init"
description="Generate a list of tasks from @todo tags in your code">
- <j:set var="genDocs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
- <j:set var="encoding"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
+ <j:set var="genDocs" value="${maven.gen.docs}"/>
+ <j:set var="encoding" value="${maven.docs.outputencoding}"/>
<j:set var="taskTag" value="${maven.tasklist.taskTag}"/>
1.4 +1 -0 maven/src/plugins-build/tasklist/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/tasklist/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 2 Jul 2003 09:04:17 -0000 1.3
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.4
@@ -9,6 +9,7 @@
<body>
<release version="2.2" date="In CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="evenisse" type="fix">
Fixed MAVEN-493. I register reports only if source, test,... exists.
So, corresponding entrys in menu will appear only if reports are registered.
1.7 +3 -0 maven/src/plugins-build/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 25 Jul 2003 03:04:33 -0000 1.6
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.7
@@ -9,6 +9,9 @@
<body>
<release version="1.3" date="in CVS">
<action dev="dion" type="update">
+ update to use maven.docs.*/maven.gen.docs
+ </action>
+ <action dev="dion" type="update">
update to commons-lang 1.0.1
</action>
<action dev="michal" type="add">
1.4 +1 -0 maven/src/plugins-build/site/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/site/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 25 Jul 2003 03:04:34 -0000 1.3
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.4
@@ -7,6 +7,7 @@
<body>
<release version="1.3" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="dion" type="update">
update to commons-lang 1.0.1
</action>
1.9 +1 -2 maven/src/plugins-build/dist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/dist/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 31 Jul 2003 05:39:57 -0000 1.8
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.9
@@ -59,8 +59,7 @@
</ant:copy>
<!-- Copy documentation -->
- <j:set var="docsDest"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
<ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
<ant:fileset dir="${docsDest}">
<ant:include name="**"/>
1.3 +1 -0 maven/src/plugins-build/statcvs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/statcvs/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 11 Jul 2003 12:38:17 -0000 1.2
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.3
@@ -7,6 +7,7 @@
<body>
<release version="1.2" date="in CVS">
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
<action dev="evenisse" type="fix" due-to="Alwyn Schoeman">
Fixed MAVEN-561. Creates maven.build.dir and maven.docs.dest directory if
doesn't exist.
</action>
1.13 +1 -2 maven/src/plugins-build/jellydoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jellydoc/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 29 Jun 2003 17:59:32 -0000 1.12
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.13
@@ -88,8 +88,7 @@
<!-- sets the classpath used for doclet invocations -->
<goal name="jellydoc:init">
- <j:set var="genDocs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+ <j:set var="genDocs" value="${maven.gen.docs}"/>
<!-- just in case this is ran before a compile -->
<ant:mkdir dir="${genDocs}"/>
1.19 +1 -2 maven/src/plugins-build/license/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/license/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 19 Aug 2003 04:45:05 -0000 1.18
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.19
@@ -72,8 +72,7 @@
description="Generate a xml file from your license file">
<j:set var="licenseFile"><license:fileName /></j:set>
- <j:set var="genDocs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+ <j:set var="genDocs" value="${maven.gen.docs}"/>
<util:available file="${licenseFile}">
<j:set var="licensePresent" value="true"/>
1.18 +1 -2 maven/src/plugins-build/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/site/plugin.jelly,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plugin.jelly 31 Jul 2003 05:39:57 -0000 1.17
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.18
@@ -11,8 +11,7 @@
<goal name="site:generate" prereqs="site"/>
<goal name="site:init" prereqs="xdoc:init">
- <j:set var="docsDest"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
</goal>
1.4 +3 -0 maven/src/plugins-build/changes/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changes/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 5 Aug 2003 11:40:28 -0000 1.3
+++ changes.xml 29 Aug 2003 06:27:53 -0000 1.4
@@ -7,6 +7,9 @@
<body>
<release version="1.2" date="in CVS">
+ <action dev="dion" type="update">
+ update to use maven.docs.*/maven.gen.docs
+ </action>
<action dev="evenisse" type="add">
<a
href="http://jira.codehaus.org/ViewIssue.jspa?key=MAVEN-587";>Maven-587</a>.
Add index table of release.
1.9 +0 -6 maven/src/plugins-build/changes/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changes/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 11 Jul 2003 05:14:00 -0000 1.8
+++ plugin.jelly 29 Aug 2003 06:27:53 -0000 1.9
@@ -8,8 +8,6 @@
xmlns:doc="doc">
<goal name="maven-changes-plugin:register">
- <ant:property name="maven.docs.src"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
<util:file var="changes" name="${maven.docs.src}/changes.xml"/>
<j:if test="${changes.exists()}">
<doc:registerReport
@@ -31,10 +29,6 @@
<goal
name="changes:report"
description="Generate a changes report">
- <j:set var="maven.docs.src"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
- <j:set var="maven.docs.outputencoding"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
<doc:jsl
input="${maven.docs.src}/changes.xml"
1.10 +1 -1 maven/src/plugins-build/faq/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/faq/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 28 Aug 2003 13:54:51 -0000 1.9
+++ plugin.jelly 29 Aug 2003 06:27:54 -0000 1.10
@@ -47,7 +47,7 @@
<util:file var="destfileFile" name="${destfile}"/>
<j:set var="destfile" value="${destfileFile.canonicalPath}"/>
- <j:set var="outputencoding"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
+ <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>
<util:available file="${srcfile}">
<j:set var="srcFileExists" value="true" />
1.14 +1 -1 maven/src/plugins-build/faq/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/faq/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 19 Aug 2003 04:45:07 -0000 1.13
+++ project.xml 29 Aug 2003 06:27:54 -0000 1.14
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-faq-plugin</id>
<name>Maven FAQ Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
1.8 +3 -0 maven/src/plugins-build/checkstyle/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/xdocs/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 19 Aug 2003 04:45:08 -0000 1.7
+++ changes.xml 29 Aug 2003 06:27:54 -0000 1.8
@@ -9,6 +9,9 @@
<body>
<release version="2.0" date="in CVS">
+ <action dev="dion" type="update">
+ update to use maven.docs.*/maven.gen.docs
+ </action>
<action dev="dion" type="fix">
Add maven dependency and classes directory to classpath. This stops
'Unable to get class information for '<classname>' errors.
1.1 maven/src/plugins-build/jdiff/xdocs/changes.xml
Index: changes.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
<release version="1.1" date="in CVS">
<action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
</release>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
