Tabs?? -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/
[EMAIL PROTECTED] wrote on 23/07/2003 08:06:42 PM: > bwalding 2003/07/23 03:06:41 > > Modified: src/plugins-build/xdoc/src/test project.properties > project.xml > src/plugins-build/xdoc plugin.jelly > src/plugins-build/xdoc/src/plugin-resources site.jsl > Added: src/plugins-build/xdoc/src/plugin-resources navigation.jsl > Log: > Pass 1. > > o It works, but is incomplete and broken. I am committing now as > I have very bad > > non-deterministic behaviour with jelly and I like committing as I go. > > > > o Need to convert project documentation tree to navigation.jsl > > o Need to remove temporary file creation in plugin.jsl > > > > PR: MAVEN-602 > > Revision Changes Path > 1.2 +1 -1 maven/src/plugins- > build/xdoc/src/test/project.properties > > Index: project.properties > =================================================================== > RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/test/project. > properties,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- project.properties 15 Feb 2003 14:07:08 -0000 1.1 > +++ project.properties 23 Jul 2003 10:06:41 -0000 1.2 > @@ -1,2 +1,2 @@ > maven.xdoc.date=left > -maven.xdoc.includeProjectDocumentation=false > \ No newline at end of file > +mxaven.xdoc.includeProjectDocumentation=false > \ No newline at end of file > > > > 1.3 +1 -3 maven/src/plugins-build/xdoc/src/test/project.xml > > Index: project.xml > =================================================================== > RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/test/project.xml,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- project.xml 19 Mar 2003 06:11:24 -0000 1.2 > +++ project.xml 23 Jul 2003 10:06:41 -0000 1.3 > @@ -8,11 +8,9 @@ > <organization> > <name>Apache Software Foundation</name> > <url>http://jakarta.apache.org/</url> > - <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo> > </organization> > <inceptionYear>2001</inceptionYear> > - <logo>http://maven.apache.org/images/maven.jpg</logo> > - > + > > </project> > > > > > 1.35 +16 -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.34 > retrieving revision 1.35 > diff -u -r1.34 -r1.35 > --- plugin.jelly 17 Jul 2003 11:02:26 -0000 1.34 > +++ plugin.jelly 23 Jul 2003 10:06:41 -0000 1.35 > @@ -315,7 +315,22 @@ > <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}"/> > + <echo>HASHISH ${size(projectNavRoot)} - ${projectNavRoot. > getClass().getName()}</echo> > + > + <x:set var="projectNav" select="$projectNavRoot/project"/> > + > + > <j:file name="${outFile}" encoding="${outputencoding}" > omitXmlDeclaration="true" outputMode="xml" > prettyPrint="no"> > > > > 1.30 +2 -0 maven/src/plugins-build/xdoc/src/plugin- > resources/site.jsl > > Index: site.jsl > =================================================================== > RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin- > resources/site.jsl,v > retrieving revision 1.29 > retrieving revision 1.30 > diff -u -r1.29 -r1.30 > --- site.jsl 17 Jul 2003 10:44:28 -0000 1.29 > +++ site.jsl 23 Jul 2003 10:06:41 -0000 1.30 > @@ -165,6 +165,8 @@ > <x:if select="$nav"> > <jsl:applyTemplates > select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/> > </x:if> > + > + <jsl:applyTemplates select="$projectNav/body/menu"/> > > <!-- Standard Maven Navigation --> > <j:set var="fileName">${file}</j:set> > > > > 1.1 maven/src/plugins-build/xdoc/src/plugin- > resources/navigation.jsl > > Index: navigation.jsl > =================================================================== > <?xml version="1.0" encoding="ISO-8859-1"?> > <!-- stylesheet to be used --> > <jsl:stylesheet select="$doc" > xmlns:define="jelly:define" > xmlns:j="jelly:core" > xmlns:jsl="jelly:jsl" > xmlns:log="jelly:log" > xmlns:util="jelly:util" > xmlns:x="jelly:xml" > xmlns:doc="doc" > xmlns="dummy" trim="true"> > > > <jsl:template match="document" trim="false"> > <project> > <body> > <j:if test="${includeProjectDocumentation.equals('yes')}"> > <menu name="Project Documentation"> > <item name="About ${pom.name}" href="/index.html"/> > </menu> > </j:if> > </body> > </project> > </jsl:template> > > <!-- absorb any other elements --> > <jsl:template match="*" trim="false"></jsl:template> > > </jsl:stylesheet> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] >
