dion 2003/01/11 01:26:45
Modified: src/plugins-build/xdoc plugin.jelly
Log:
- Use new util:file tag to resolve file: URL conversion issues
Revision Changes Path
1.42 +9 -8 jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- plugin.jelly 7 Jan 2003 23:02:10 -0000 1.41
+++ plugin.jelly 11 Jan 2003 09:26:44 -0000 1.42
@@ -66,8 +66,9 @@
</j:if>
<mkdir dir="${outputDirectory}"/>
-
- <x:parse var="doc" xml="file:${input}"/>
+
+ <util:file name="${input}" var="inputFile" />
+ <x:parse var="doc" xml="${inputFile}"/>
<j:set var="stylesheetURI" value="file:${stylesheet}"/>
<j:file
name="${outputDirectory}/${output}"
@@ -143,25 +144,25 @@
<j:set var="relativePath" value="${pathTool.getRelativePath(docsForward,
outFileForward)}"/>
<util:available file="${file.parentFile.absoluteFile}/navigation.xml">
- <j:set var="navFile"
value="${file.parentFile.absoluteFile}/navigation.xml"/>
+ <util:file var="navFile"
name="${file.parentFile.absoluteFile}/navigation.xml"/>
</util:available>
<!-- determine nav file to be used -->
<util:available file="${maven.docs.src}/stylesheets/project.xml">
- <j:set var="navFile" value="${maven.docs.src}/stylesheets/project.xml"/>
+ <util:file var="navFile"
name="${maven.docs.src}/stylesheets/project.xml"/>
</util:available>
<util:available file="${maven.docs.src}/project.xml">
- <j:set var="navFile" value="${maven.docs.src}/project.xml"/>
+ <util:file var="navFile" name="${maven.docs.src}/project.xml"/>
</util:available>
<util:available file="${maven.docs.src}/navigation.xml">
- <j:set var="navFile" value="${maven.docs.src}/navigation.xml"/>
+ <util:file var="navFile" name="${maven.docs.src}/navigation.xml"/>
</util:available>
<!-- parse nav and make it available to the stylesheet -->
- <x:parse var="navXML" xml="file:${navFile}"/>
+ <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.toURL()}"/>
+ <x:parse var="doc" xml="${file}"/>
<j:file name="${outFile}" encoding="${outputencoding}"
omitXmlDeclaration="true" outputMode="html"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
