dion 2002/11/16 15:23:25
Modified: src/plugins-build/xdoc site.jelly
Log:
Use DVSLPathTool to determine relativePath as in site.dvsl
Revision Changes Path
1.3 +12 -4 jakarta-turbine-maven/src/plugins-build/xdoc/site.jelly
Index: site.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/site.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- site.jelly 16 Nov 2002 10:56:35 -0000 1.2
+++ site.jelly 16 Nov 2002 23:23:25 -0000 1.3
@@ -67,20 +67,28 @@
</patternset>
</fileset>
</fileScanner>
-
- <j:set var="fromPattern"><util:replace oldChar="\" newChar="/"
value="${maven.docs.src}/*.xml"/></j:set>
- <j:set var="toPattern"><util:replace oldChar="\" newChar="/"
value="${maven.gen.docs}/*.html"/></j:set>
+ <!-- all this replace'ing is for the mapper's benefit - it treats
+ / and \ as different chars -->
+ <util:replace var="fromPattern" oldChar="\" newChar="/"
value="${maven.docs.src}/*.xml"/>
+ <util:replace var="toPattern" oldChar="\" newChar="/"
value="${maven.gen.docs}/*.html"/>
+
+ <!-- mapper for determining output file name -->
<j:new var="mapper" className="org.apache.tools.ant.util.GlobPatternMapper" />
<j:setProperties object="${mapper}" from="${fromPattern}" to="${toPattern}" />
+ <!-- path tool for relative processing -->
+ <j:new var="pathTool" className="org.apache.maven.DVSLPathTool" />
+
<j:forEach var="file" items="${docFiles.iterator()}">
<!-- need generate output file name -->
- <j:set var="outFileForward"><util:replace oldChar="\" newChar="/"
value="${file.toString()}"/></j:set>
+ <util:replace var="outFileForward" oldChar="\" newChar="/"
value="${file.toString()}"/>
<j:set var="outFiles" value="${mapper.mapFileName(outFileForward)}" />
<j:set var="outFile" value="${outFiles[0]}" />
<echo>Generating ${outFile} from ${file}</echo>
+ <util:replace var="docsForward" oldChar="\" newChar="/"
value="${maven.docs.src}"/>
+ <echo>relative=${pathTool.getRelativePath(docsForward,
outFileForward)},off=${outFileForward},df=${docsForward}</echo>
<x:parse var="doc" xml="${file.toURL()}" />
<util:available file="${maven.docs.src}/stylesheets/project.xml">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
