Author: rgardler Date: Wed Mar 21 15:28:18 2007 New Revision: 521028 URL: http://svn.apache.org/viewvc?view=rev&rev=521028 Log: - more reuse in the patterns - make the plugins.xml processing work properly
Modified: forrest/trunk/main/webapp/plugins.xmap Modified: forrest/trunk/main/webapp/plugins.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/plugins.xmap?view=diff&rev=521028&r1=521027&r2=521028 ============================================================================== --- forrest/trunk/main/webapp/plugins.xmap (original) +++ forrest/trunk/main/webapp/plugins.xmap Wed Mar 21 15:28:18 2007 @@ -37,19 +37,19 @@ <map:pipeline> <map:match pattern="corePlugins.xml"> - <map:generate type="xpathdirectory" src="{lm:plugin.descriptor.forrest}"> + <map:generate type="xpathdirectory" src="{forrest:forrest.plugins-src}"> <map:parameter name="depth" value="2"/> <map:parameter name="xpath" value="/project"/> <map:parameter name="xmlFiles" value="build\.xml$"/> </map:generate> <map:transform src="{lm:transform.pluginBuildFiles.pluginDescriptor}"> - <map:parameter name="type" value="core"/> + <map:parameter name="type" value="released"/> </map:transform> <map:serialize type="xml"/> </map:match> <map:match pattern="whiteboardPlugins.xml"> - <map:generate type="xpathdirectory" src="{lm:plugin.descriptor.whiteboard}"> + <map:generate type="xpathdirectory" src="{forrest:forrest.whiteboard-plugins-src}"> <map:parameter name="depth" value="2"/> <map:parameter name="xpath" value="/project"/> <map:parameter name="xmlFiles" value="build\.xml$"/> @@ -61,10 +61,7 @@ </map:match> <map:match pattern="pluginDocs/plugins_(.*)/index(|\.source).xml" type="regexp"> - <map:aggregate element="pluginList"> - <map:part src="{lm:plugin.descriptor.forrest}"/> - <map:part src="{lm:plugin.descriptor.whiteboard}"/> - </map:aggregate> + <map:generate src="cocoon:/plugins.xml"/> <map:transform src="{lm:transform.plugins.xdoc}"> <map:parameter name="pluginDocsVersion" value="{1}"/> </map:transform>