dion 2002/11/16 02:56:35
Modified: src/plugins-build/xdoc site.jelly
Log:
Fix output file mapping
Revision Changes Path
1.2 +9 -10 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- site.jelly 16 Nov 2002 09:33:15 -0000 1.1
+++ site.jelly 16 Nov 2002 10:56:35 -0000 1.2
@@ -67,19 +67,17 @@
</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>
- <b:script>
- context.setVariable("fromPattern",
- context.findVariable("maven.docs.src").toString().replace('C', 'D'));
- </b:script>
- <echo>fromPattern=${fromPattern}</echo>
- <mapper id="mapper"
- className="org.apache.tools.ant.util.GlobPatternMapper"
- from="${maven.docs.src}/*.xml" to="${maven.docs.src}/*.html" />
+ <j:new var="mapper" className="org.apache.tools.ant.util.GlobPatternMapper" />
+ <j:setProperties object="${mapper}" from="${fromPattern}" to="${toPattern}" />
<j:forEach var="file" items="${docFiles.iterator()}">
<!-- need generate output file name -->
- <j:set var="outFiles"
value="${mapper.implementation.mapFileName(file.toString())}" />
+ <j:set var="outFileForward"><util:replace oldChar="\" newChar="/"
value="${file.toString()}"/></j:set>
+ <j:set var="outFiles" value="${mapper.mapFileName(outFileForward)}" />
<j:set var="outFile" value="${outFiles[0]}" />
<echo>Generating ${outFile} from ${file}</echo>
@@ -100,7 +98,8 @@
<echo>nav = ${navFile}</echo>
<!--<x:parse var="nav" xml="${navFile}" />-->
<x:set var="nav" select="document($navFile)/project" />
-
+
+ <!-- stick a j:file around this and make it a tag -->
<jsl:stylesheet select="$doc">
<jsl:template match="document" trim="no">
<x:doctype name="html"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
