You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/10/27 22:44:45 UTC
svn commit: r328948 - in /forrest/trunk/main/webapp: linkmap.xmap menu.xmap
sitemap.xmap
Author: rgardler
Date: Thu Oct 27 13:44:36 2005
New Revision: 328948
URL: http://svn.apache.org/viewcvs?rev=328948&view=rev
Log:
Do the XInclude before the namespaces are removed, otherwise it doesn;t work (namespaces removed as a workaround for FOR-675
Modified:
forrest/trunk/main/webapp/linkmap.xmap
forrest/trunk/main/webapp/menu.xmap
forrest/trunk/main/webapp/sitemap.xmap
Modified: forrest/trunk/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/linkmap.xmap?rev=328948&r1=328947&r2=328948&view=diff
==============================================================================
--- forrest/trunk/main/webapp/linkmap.xmap (original)
+++ forrest/trunk/main/webapp/linkmap.xmap Thu Oct 27 13:44:36 2005
@@ -55,8 +55,7 @@
<!-- site.xml with @href's appended to be context-relative. -->
<map:match pattern="abs-linkmap">
<map:generate src="cocoon://site.navigation.links.xml"/>
- <map:transform type="xinclude"/>
- <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
+ <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
<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?rev=328948&r1=328947&r2=328948&view=diff
==============================================================================
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Thu Oct 27 13:44:36 2005
@@ -62,7 +62,6 @@
<map:pipeline internal-only="false">
<map:match pattern="abs-menulinks">
<map:generate src="cocoon://site.navigation.links.xml"/>
- <map:transform type="xinclude"/>
<map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
<map:transform src="{lm:transform.linkmap.linkmap-normalizedtabs}" />
<map:transform src="{lm:transform.xml.xml-normalizedhrefs}"/>
@@ -71,7 +70,6 @@
<map:match pattern="**menulinks-*">
<map:generate src="cocoon://site.navigation.links.xml"/>
- <map:transform type="xinclude"/>
<map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
<map:select type="config">
<map:parameter name="value" value="{defaults:menu-scheme}"/>
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=328948&r1=328947&r2=328948&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Thu Oct 27 13:44:36 2005
@@ -316,15 +316,6 @@
<map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
</map:match>
</map:pipeline>
-
- <!-- Project supplied locationmap. Projects can override this
- matcher if they want to generate the locationmap dynamically -->
- <map:pipeline internal-only="true">
- <map:match pattern="locationmap-project.xml">
- <map:generate src="{project:content}locationmap.xml"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
<!-- The navigation and links file "site.xml" -->
<map:pipeline internal-only="true">
@@ -337,6 +328,7 @@
<map:generate src="{lm:site.xml}"/>
</map:when>
</map:select>
+ <map:transform type="xinclude"/>
<!-- FIXME: This is a workaround to Issue FOR-675 and commons-jxpath-1.2 -->
<map:transform src="{lm:transform.xml.xml-namespace-stripped}"/>
<!-- end FIXME: FOR-675 -->
@@ -397,6 +389,15 @@
</map:when>
</map:select>
</map:pipeline>
+
+ <!-- Project supplied locationmap. Projects can override this
+ matcher if they want to generate the locationmap dynamically -->
+ <map:pipeline internal-only="true">
+ <map:match pattern="locationmap-project.xml">
+ <map:generate src="{project:content}locationmap.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
<map:pipeline internal-only="false">