cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/10/28 14:27:03
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Start using tag instead of ${pom.getPluginContext()}
Revision ChangesPath
1.52 +13 -17maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- plugin.jelly 26 Sep 2003 15:53:41 - 1.51
+++ plugin.jelly 28 Oct 2003 22:27:03 - 1.52
@@ -4,6 +4,7 @@
xmlns:j=jelly:core
xmlns:jsl=jelly:jsl
xmlns:log=jelly:log
+ xmlns:maven=jelly:maven
xmlns:pom=pom
xmlns:util=jelly:util
xmlns:x=jelly:xml
@@ -17,9 +18,7 @@
define:tag name=deregisterReport
!-- @name : Report to deregister, must be same as name used to register --
- j:set
-var=reports
-
value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
+ maven:pluginVar var=reports plugin=maven-xdoc-plugin property=reports
/
j:set var=removeRpt value=null/
j:forEach var=rpt items=${reports}
@@ -39,9 +38,7 @@
@description text description of report
@link the nav-bar link for this report
--
- j:set
-var=reports
-
value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
+ maven:pluginVar var=reports plugin=maven-xdoc-plugin property=reports
/
!-- check if the given name is in the list already --
j:set var=add value=true/
@@ -280,8 +277,7 @@
util:file var=docsSrcFile name=${maven.docs.src}/
!-- parse the project nav. Someone jellier than me can remove the temp file
requirement --
- j:set var=reports
-
value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
+ maven:pluginVar var=reports plugin=maven-xdoc-plugin property=reports
/
util:file var=tempnav name=${maven.build.dir}/project-nav.xml/
@@ -364,9 +360,7 @@
!-- All the templates use $project for now. --
j:set var=project value=${pom}/
-j:set
- var=reports
- value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
+maven:pluginVar var=reports plugin=maven-xdoc-plugin property=reports /
!-- Does the user want the maven-generated docs on their site? --
j:set
@@ -640,11 +634,15 @@
/goal
- !-- This is required as the linkchecker runs as a final pass over the generated
- document tree --
+ !--
+ ! This is required as the linkchecker runs as a final pass over the generated
+ ! document tree.
+ ! FIXME: Why isn't this in linkcheck?
+ !--
goal name=xdoc:performJSL
description=Allows the LinkCheck plugin to xdoc a single directory
- j:set var=maven.xdoc.src
value=${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.xdoc.src')}/
+
+maven:pluginVar var=maven.xdoc.src plugin=maven-linkcheck-plugin
property=maven.xdoc.src /
doc:performJSL
srcdir=${maven.xdoc.src}
destdir=${maven.docs.dest}/
@@ -652,9 +650,7 @@
goal name=xdoc:dump-report-settings
echoDumping report settings/echo
-j:set
- var=reports
- value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
+maven:pluginVar var=reports plugin=maven-xdoc-plugin property=reports /
j:forEach var=report items=${reports}
echoReport: ${report}/echo
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/09/26 08:53:41
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Instantiate mapper and pathTool if not provided
Revision ChangesPath
1.51 +6 -0 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- plugin.jelly 16 Sep 2003 04:54:20 - 1.50
+++ plugin.jelly 26 Sep 2003 15:53:41 - 1.51
@@ -237,6 +237,9 @@
util:replace var=fromPattern oldChar=\ newChar=/
value=${srcdir}/*.xml/
util:replace var=toPattern oldChar=\ newChar=/
value=${destdir}/*.html/
+ j:if test=${mapper == null}
+j:new var=mapper
className=org.apache.maven.util.CaseInsensitiveGlobPatternMapper/
+ /j:if
j:setProperties object=${mapper} from=${fromPattern} to=${toPattern}/
util:replace var=fromDirPattern oldChar=\ newChar=/
value=${srcdir}*/
@@ -302,6 +305,9 @@
echoGenerating ${outFile} from ${file}/echo
!-- work out relative path --
util:replace var=docsForward oldChar=\ newChar=/ value=${srcdir}/
+j:if test=${pathTool == null}
+j:useBean var=pathTool class=org.apache.maven.util.DVSLPathTool/
+/j:if
j:set var=relativePath value=${pathTool.getRelativePath(docsForward,
outFileForward)}/
!-- determine nav file to be used: 2. check for nav file --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/09/15 21:54:20
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Reformatting
use empty, not == null
Revision ChangesPath
1.50 +11 -17maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- plugin.jelly 14 Sep 2003 15:41:33 - 1.49
+++ plugin.jelly 16 Sep 2003 04:54:20 - 1.50
@@ -53,11 +53,13 @@
j:if test=${add.equals('true')}
j:new var=report className=java.util.HashMap/
-j:set var=dummy value=${report.put('name', name)}/
-j:set var=dummy value=${report.put('pluginName', pluginName)}/
-j:set var=dummy value=${report.put('description', description)}/
-j:set var=dummy value=${report.put('link', link)}/
-j:set var=dummy value=${reports.add(report)}/
+j:set var=dummy
+ ${report.put('name', name)}
+ ${report.put('pluginName', pluginName)}
+ ${report.put('description', description)}
+ ${report.put('link', link)}
+ ${reports.add(report)}
+/j:set
/j:if
/define:tag
@@ -117,10 +119,10 @@
| documents easily. See jslCore for a tag suitable for
| transforming documents how you want.
| @input
- | @output - Will be placed under ${maven.gen.docs}
+ | @outputDirectory - Will be placed under ${maven.gen.docs}
| @stylesheet
- | @encoding
- | @omitXmlDeclaration
+ | @encoding - defaults to ${maven.docs.outputencoding}
+ | @omitXmlDeclaration - defaults to ${maven.docs.omitXmlDeclaration}
| @outputMode
| @prettyPrint
--
@@ -130,15 +132,7 @@
--
!-- Set default outputDirectory if not set. --
- !--
- These do not work to evaluate to what you would expect
- j:if test=!${outputDirectory}
-
- why doesn't this give the same as comparing to null?
- why not use empty()?
-
- --
- j:if test=${outputDirectory == null}
+ j:if test=${empty(outputDirectory)}
j:set var=outputDirectory value=${maven.gen.docs}
/
/j:if
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/09/14 08:09:09 Modified:src/plugins-build/xdoc plugin.jelly Log: Remove non-existent findbugs plugin. We really need to externalise this next release. Revision ChangesPath 1.48 +0 -1 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.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- plugin.jelly 10 Sep 2003 13:26:07 - 1.47 +++ plugin.jelly 14 Sep 2003 15:09:09 - 1.48 @@ -584,7 +584,6 @@ attainGoal name=maven-changelog-plugin:register/ attainGoal name=maven-developer-activity-plugin:register/ attainGoal name=maven-file-activity-plugin:register/ -attainGoal name=maven-findbugs-plugin:register/ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/09/14 08:41:33
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Fix bad indentation
Revision ChangesPath
1.49 +11 -11maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- plugin.jelly 14 Sep 2003 15:09:09 - 1.48
+++ plugin.jelly 14 Sep 2003 15:41:33 - 1.49
@@ -579,17 +579,17 @@
!-- If the descriptor is empty, use these as defaults --
j:if test=${pom.reports.isEmpty()}
attainGoal name=maven-jdepend-plugin:register/
-attainGoal name=maven-checkstyle-plugin:register/
-attainGoal name=maven-changes-plugin:register/
-attainGoal name=maven-changelog-plugin:register/
-attainGoal name=maven-developer-activity-plugin:register/
-attainGoal name=maven-file-activity-plugin:register/
-attainGoal name=maven-license-plugin:register/
-attainGoal name=maven-javadoc-plugin:register/
-attainGoal name=maven-jxr-plugin:register/
-attainGoal name=maven-junit-report-plugin:register/
-attainGoal name=maven-linkcheck-plugin:register/
-attainGoal name=maven-tasklist-plugin:register/
+ attainGoal name=maven-checkstyle-plugin:register/
+ attainGoal name=maven-changes-plugin:register/
+ attainGoal name=maven-changelog-plugin:register/
+ attainGoal name=maven-developer-activity-plugin:register/
+ attainGoal name=maven-file-activity-plugin:register/
+ attainGoal name=maven-license-plugin:register/
+ attainGoal name=maven-javadoc-plugin:register/
+ attainGoal name=maven-jxr-plugin:register/
+ attainGoal name=maven-junit-report-plugin:register/
+ attainGoal name=maven-linkcheck-plugin:register/
+ attainGoal name=maven-tasklist-plugin:register/
/j:if
/goal
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly
I add jcoverage report in default reports, but maven site doesn't use default. - Original Message - From: [EMAIL PROTECTED] To: Maven Developers List [EMAIL PROTECTED] Sent: Tuesday, September 09, 2003 5:44 PM Subject: Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly Should we be doing this while it's still breaking 'maven site' for Maven? -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ [EMAIL PROTECTED] wrote on 09/09/2003 07:26:55 PM: evenisse2003/09/09 02:26:55 Modified:src/plugins-build/xdoc plugin.jelly Log: Add JCoverage report to default reports. Revision ChangesPath 1.46 +1 -0 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.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- plugin.jelly 30 Aug 2003 01:08:52 - 1.45 +++ plugin.jelly 9 Sep 2003 09:26:55 - 1.46 @@ -588,6 +588,7 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ +attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly
That's not my point. Other projects may use the default set and it may not work for them as it doesn't for Maven. -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ Emmanuel Venisse [EMAIL PROTECTED] wrote on 10/09/2003 06:57:06 PM: I add jcoverage report in default reports, but maven site doesn't use default. - Original Message - From: [EMAIL PROTECTED] To: Maven Developers List [EMAIL PROTECTED] Sent: Tuesday, September 09, 2003 5:44 PM Subject: Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly Should we be doing this while it's still breaking 'maven site' for Maven? -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ [EMAIL PROTECTED] wrote on 09/09/2003 07:26:55 PM: evenisse2003/09/09 02:26:55 Modified:src/plugins-build/xdoc plugin.jelly Log: Add JCoverage report to default reports. Revision ChangesPath 1.46 +1 -0 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.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- plugin.jelly 30 Aug 2003 01:08:52 - 1.45 +++ plugin.jelly 9 Sep 2003 09:26:55 - 1.46 @@ -588,6 +588,7 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ +attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
evenisse2003/09/10 06:26:07 Modified:src/plugins-build/xdoc plugin.jelly Log: Remove jcoverage report from default reports. Revision ChangesPath 1.47 +0 -1 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.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- plugin.jelly 9 Sep 2003 09:26:55 - 1.46 +++ plugin.jelly 10 Sep 2003 13:26:07 - 1.47 @@ -588,7 +588,6 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ -attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly
I'm happy for us to add it back in once we work out why 'maven site' is interfering with it. p.s. I really like the output! -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ [EMAIL PROTECTED] wrote on 10/09/2003 11:26:08 PM: evenisse2003/09/10 06:26:07 Modified:src/plugins-build/xdoc plugin.jelly Log: Remove jcoverage report from default reports. Revision ChangesPath 1.47 +0 -1 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.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- plugin.jelly 9 Sep 2003 09:26:55 - 1.46 +++ plugin.jelly 10 Sep 2003 13:26:07 - 1.47 @@ -588,7 +588,6 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ -attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly
Thanks. - Original Message - From: [EMAIL PROTECTED] To: Maven Developers List [EMAIL PROTECTED] Sent: Wednesday, September 10, 2003 4:10 PM Subject: Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly I'm happy for us to add it back in once we work out why 'maven site' is interfering with it. p.s. I really like the output! -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ [EMAIL PROTECTED] wrote on 10/09/2003 11:26:08 PM: evenisse2003/09/10 06:26:07 Modified:src/plugins-build/xdoc plugin.jelly Log: Remove jcoverage report from default reports. Revision ChangesPath 1.47 +0 -1 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.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- plugin.jelly 9 Sep 2003 09:26:55 - 1.46 +++ plugin.jelly 10 Sep 2003 13:26:07 - 1.47 @@ -588,7 +588,6 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ -attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
evenisse2003/09/09 02:26:55 Modified:src/plugins-build/xdoc plugin.jelly Log: Add JCoverage report to default reports. Revision ChangesPath 1.46 +1 -0 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.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- plugin.jelly 30 Aug 2003 01:08:52 - 1.45 +++ plugin.jelly 9 Sep 2003 09:26:55 - 1.46 @@ -588,6 +588,7 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ +attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/xdoc plugin.jelly
Should we be doing this while it's still breaking 'maven site' for Maven? -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ [EMAIL PROTECTED] wrote on 09/09/2003 07:26:55 PM: evenisse2003/09/09 02:26:55 Modified:src/plugins-build/xdoc plugin.jelly Log: Add JCoverage report to default reports. Revision ChangesPath 1.46 +1 -0 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.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- plugin.jelly 30 Aug 2003 01:08:52 - 1.45 +++ plugin.jelly 9 Sep 2003 09:26:55 - 1.46 @@ -588,6 +588,7 @@ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ +attainGoal name=maven-jcoverage-plugin:register/ attainGoal name=maven-junit-report-plugin:register/ attainGoal name=maven-linkcheck-plugin:register/ attainGoal name=maven-tasklist-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
bwalding2003/08/29 18:03:37 Modified:src/plugins-build/xdoc plugin.jelly Log: Added FindBugs report to default lineup Revision ChangesPath 1.44 +1 -0 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.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- plugin.jelly 29 Aug 2003 06:27:51 - 1.43 +++ plugin.jelly 30 Aug 2003 01:03:37 - 1.44 @@ -584,6 +584,7 @@ attainGoal name=maven-changelog-plugin:register/ attainGoal name=maven-developer-activity-plugin:register/ attainGoal name=maven-file-activity-plugin:register/ +attainGoal name=maven-findbugs-report-plugin:register/ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
bwalding2003/08/29 18:08:52 Modified:src/plugins-build/xdoc plugin.jelly Log: Fixed a typo in registration of findbugs Revision ChangesPath 1.45 +1 -1 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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- plugin.jelly 30 Aug 2003 01:03:37 - 1.44 +++ plugin.jelly 30 Aug 2003 01:08:52 - 1.45 @@ -584,7 +584,7 @@ attainGoal name=maven-changelog-plugin:register/ attainGoal name=maven-developer-activity-plugin:register/ attainGoal name=maven-file-activity-plugin:register/ -attainGoal name=maven-findbugs-report-plugin:register/ +attainGoal name=maven-findbugs-plugin:register/ attainGoal name=maven-license-plugin:register/ attainGoal name=maven-javadoc-plugin:register/ attainGoal name=maven-jxr-plugin:register/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
evenisse2003/08/21 02:01:08
Modified:src/plugins-build/xdoc plugin.jelly
Log:
set the default value of state in itemLink tag to none.
Revision ChangesPath
1.42 +3 -0 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- plugin.jelly 19 Aug 2003 04:45:07 - 1.41
+++ plugin.jelly 21 Aug 2003 09:01:08 - 1.42
@@ -179,6 +179,9 @@
@state - expanded / collapsed / none
--
a href=${pathTool.calculateLink(link,relativePath)}
+j:if test=${empty(state)}
+ j:set var=state value=none/
+/j:if
img class=handle src=${relativePath}/images/${state}.png alt=/
j:if test=${empty(img)}${name}/j:if
j:if test=${!empty(img)}img style=border: 1px src=${img}
title=${name} alt=${name}//j:if
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/07/28 19:03:08 Modified:src/plugins-build/xdoc plugin.jelly Log: Fix badly declared velocity taglib Revision ChangesPath 1.39 +1 -1 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.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- plugin.jelly 25 Jul 2003 22:47:30 - 1.38 +++ plugin.jelly 29 Jul 2003 02:03:08 - 1.39 @@ -7,7 +7,7 @@ xmlns:pom=pom xmlns:util=jelly:util xmlns:x=jelly:xml - xmlns:velocity=jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary + xmlns:velocity=jelly:velocity xmlns:doc=doc j:new var=reports className=java.util.ArrayList/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/07/23 23:26:44
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Generate nav template in a different way
Revision ChangesPath
1.37 +13 -17maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plugin.jelly 23 Jul 2003 10:25:17 - 1.36
+++ plugin.jelly 24 Jul 2003 06:26:44 - 1.37
@@ -283,6 +283,19 @@
util:file var=siteNavFile name=${maven.gen.docs}/navigation.xml/
/util:available
+ !-- parse the project nav. Someone jellier than me can remove the temp file
requirement --
+ j:set var=reports
+
value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
+
+ util:file var=tempnav name=${maven.build.dir}/project-nav.xml/
+
+ j:file name=${tempnav.toString()} outputMode=xml
+j:import file=${plugin.resources}/navigation.jelly inherit=true/
+ /j:file
+
+ x:parse var=projectNavRoot xml=${tempnav}/
+ x:set var=projectNav select=$projectNavRoot/project/
+
j:forEach var=file items=${docFiles.iterator()}
util:replace var=inDirForward oldChar=\ newChar=/
value=${file.parent}/
@@ -306,28 +319,11 @@
util:file var=navFile
name=${file.parentFile.absoluteFile}/navigation.xml/
/util:available
-j:set
- var=reports
-
value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}/
-
!-- parse nav and make it available to the stylesheet --
x:parse var=navXML xml=${navFile}/
x:set var=nav select=$navXML/project/
!-- parse the doc and pass it to the stylesheet --
x:parse var=doc xml=${file}/
-
-
-!-- parse the project nav. Someone jellier than me can remove the temp
file requirement --
- util:file var=tempnav name=${basedir}/target/pnav.xml/
-
- j:set var=navigationJSL
value=${resourceTool.findResource('plugin-resources/navigation.jsl')}/
- j:file name=${tempnav.toString()} outputMode=xml
- j:include uri=${navigationJSL.toString()}/
- /j:file
-
- x:parse var=projectNavRoot xml=${tempnav}/
- x:set var=projectNav select=$projectNavRoot/project/
-
j:file name=${outFile} encoding=${outputencoding}
omitXmlDeclaration=true outputMode=xml
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly plugin.properties
dion2003/07/10 22:15:25
Modified:src/plugins-build/xdoc plugin.jelly plugin.properties
Log:
ensure maven.docs.omitXmlDeclaration has a value
Revision ChangesPath
1.31 +5 -0 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plugin.jelly 9 Jul 2003 07:22:28 - 1.30
+++ plugin.jelly 11 Jul 2003 05:15:25 - 1.31
@@ -152,6 +152,11 @@
/
/j:if
+ j:if test=${omitXmlDeclaration == null}
+j:set var=omitXmlDeclaration
+
value=${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.omitXmlDeclaration')}/
+ /j:if
+
mkdir dir=${outputDirectory}/
doc:jslFile
1.10 +1 -0 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.properties 11 Apr 2003 18:33:36 - 1.9
+++ plugin.properties 11 Jul 2003 05:15:25 - 1.10
@@ -7,6 +7,7 @@
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
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
dion2003/07/09 00:22:29
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Remove tabs
Revision ChangesPath
1.30 +1 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plugin.jelly 8 Jul 2003 11:01:08 - 1.29
+++ plugin.jelly 9 Jul 2003 07:22:28 - 1.30
@@ -373,7 +373,7 @@
basedir=${plugin.resources}/templates
template=${pomDocument}
inputEncoding=${encoding}
- outputEncoding=${encoding}
+outputEncoding=${encoding}
/
/j:forEach
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
bwalding2003/04/05 15:37:32
Modified:src/plugins-build/xdoc plugin.jelly
Log:
Pass in encoding to velocity merge in generate-from-pom
PR: MAVEN-293
Submitted by: Kuisong Tong
Revision ChangesPath
1.23 +2 -0 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plugin.jelly 30 Mar 2003 16:17:19 - 1.22
+++ plugin.jelly 5 Apr 2003 23:37:32 - 1.23
@@ -358,6 +358,8 @@
name=${maven.gen.docs}/${pomDocument}
basedir=${plugin.resources}/templates
template=${pomDocument}
+inputEncoding=${encoding}
+ outputEncoding=${encoding}
/
/j:forEach
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
