Author: rgardler Date: Wed Jan 26 06:17:56 2005 New Revision: 126505 URL: http://svn.apache.org/viewcvs?view=rev&rev=126505 Log: Allow XInclude in site.xml (thanks to Sjur N. Moshagen) Modified: forrest/trunk/main/webapp/linkmap.xmap forrest/trunk/main/webapp/menu.xmap forrest/trunk/main/webapp/tabs.xmap
Modified: forrest/trunk/main/webapp/linkmap.xmap Url: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/linkmap.xmap?view=diff&rev=126505&p1=forrest/trunk/main/webapp/linkmap.xmap&r1=126504&p2=forrest/trunk/main/webapp/linkmap.xmap&r2=126505 ============================================================================== --- forrest/trunk/main/webapp/linkmap.xmap (original) +++ forrest/trunk/main/webapp/linkmap.xmap Wed Jan 26 06:17:56 2005 @@ -49,6 +49,7 @@ <!-- site.xml with @href's appended to be context-relative. --> <map:match pattern="abs-linkmap"> <map:generate src="{project:content.xdocs}site.xml" /> + <map:transform type="xinclude"/> <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> <map:serialize type="xml" /> </map:match> Modified: forrest/trunk/main/webapp/menu.xmap Url: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/menu.xmap?view=diff&rev=126505&p1=forrest/trunk/main/webapp/menu.xmap&r1=126504&p2=forrest/trunk/main/webapp/menu.xmap&r2=126505 ============================================================================== --- forrest/trunk/main/webapp/menu.xmap (original) +++ forrest/trunk/main/webapp/menu.xmap Wed Jan 26 06:17:56 2005 @@ -61,6 +61,7 @@ <map:pipeline internal-only="false"> <map:match pattern="abs-menulinks"> <map:generate src="{project:content.xdocs}site.xml" /> + <map:transform type="xinclude"/> <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" /> <map:transform src="{forrest:stylesheets}/normalizehrefs.xsl"/> @@ -69,6 +70,7 @@ <map:match pattern="**menulinks-*"> <map:generate src="{project:content.xdocs}site.xml" /> + <map:transform type="xinclude"/> <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> <map:select type="config"> Modified: forrest/trunk/main/webapp/tabs.xmap Url: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/tabs.xmap?view=diff&rev=126505&p1=forrest/trunk/main/webapp/tabs.xmap&r1=126504&p2=forrest/trunk/main/webapp/tabs.xmap&r2=126505 ============================================================================== --- forrest/trunk/main/webapp/tabs.xmap (original) +++ forrest/trunk/main/webapp/tabs.xmap Wed Jan 26 06:17:56 2005 @@ -69,6 +69,7 @@ <map:pipeline > <map:match pattern="**tab-*.html"> <map:generate src="{project:content.xdocs}tabs.xml"/> + <map:transform type="xinclude"/> <map:select type="config"> <map:parameter name="value" value="{defaults:i18n}"/> <map:when test="true">
