jvanzyl 2002/07/10 20:56:44
Modified: src/plugins/xdoc plugin.jelly site.dvsl
Log:
o plugin.jelly set a toolbox value of projectFileName so that we can
get hold of the name of the project descriptor used. We now stop
assuming project.xml, at least here anyway. I was having trouble
generating the turbine documentation using the -p option until
I realized project.xml is hard-coded.
Revision Changes Path
1.13 +2 -2 jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 11 Jul 2002 01:46:49 -0000 1.12
+++ plugin.jelly 11 Jul 2002 03:56:44 -0000 1.13
@@ -63,7 +63,7 @@
outputencoding="${maven.docs.outputencoding}">
<!-- Need to add the maven jar to load the toolbox -->
<classpath refid="maven-classpath"/>
-
+ <tool name="toolbox.string.projectFileName" value="${projectFileName}"/>
<tool name="toolbox.string.basedir" value="${basedir}"/>
<tool name="toolbox.string.docDest" value="${maven.docs.dest}"/>
<tool name="toolbox.string.docSrc" value="${maven.docs.src}"/>
@@ -74,7 +74,6 @@
<tool name="toolbox.string.srcPresent" value="${sourcesPresent}"/>
<tool name="toolbox.string.testSrcPresent" value="${unitTestSourcesPresent}"/>
<tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
-
</dvsl>
<!-- Then transform user supplied xdocs next -->
@@ -90,6 +89,7 @@
outputencoding="${maven.docs.outputencoding}">
<!-- Need to add the maven jar to load the toolbox -->
<classpath refid="maven-classpath"/>
+ <tool name="toolbox.string.projectFileName" value="${projectFileName}"/>
<tool name="toolbox.string.basedir" value="${basedir}"/>
<tool name="toolbox.string.docSrc" value="${maven.docs.src}"/>
<tool name="toolbox.string.docDest" value="${maven.docs.dest}"/>
1.2 +4 -1 jakarta-turbine-maven/src/plugins/xdoc/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/xdoc/site.dvsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- site.dvsl 28 Jun 2002 01:02:19 -0000 1.1
+++ site.dvsl 11 Jul 2002 03:56:44 -0000 1.2
@@ -51,6 +51,9 @@
<!DOCTYPE html PUBLIC "-//CollabNet//DTD XHTML 1.0 Transitional//EN"
"http://www.collabnet.com/dtds/collabnet_transitional_10.dtd";>
+ ## Get the name of the project file, it may not always be 'project.xml'
+ #set ( $projectFileName = $context.toolbox.projectFileName )
+
## Setup the relativePath using the toolbox.
#set( $infilename = $context.getAppValue("infilename"))
#set( $currentDir = $context.toolbox.pathtool.getDirectoryComponent($infilename))
@@ -58,7 +61,7 @@
## Grab a reference to the project descriptor here so we can pull
## info from it such as the cvs web url, etc ...
- #set( $pomFilename = "$context.toolbox.basedir/project.xml")
+ #set( $pomFilename = "$context.toolbox.basedir/$projectFileName")
#set( $pom = $node.selectSingleNode("document('$pomFilename')/project"))
## Selects the correct navigation file to use for this document.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
