forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 21237 - in forrest/trunk/src/core/context: . WEB-INF resources/stylesheets
Date Mon, 14 Jun 2004 21:42:41 GMT
Author: nicolaken
Date: Mon Jun 14 14:42:40 2004
New Revision: 21237

Modified:
   forrest/trunk/src/core/context/WEB-INF/cli.xconf
   forrest/trunk/src/core/context/faq.xmap
   forrest/trunk/src/core/context/resources/stylesheets/declare-broken-site-links.xsl
   forrest/trunk/src/core/context/sitemap.xmap
Log:
Fix FOR-156, by making the CLI ignore site: and ext: links and in the meantime making the
pipeline output these links with error: prepended when they are not resolved properly.

Modified: forrest/trunk/src/core/context/WEB-INF/cli.xconf
==============================================================================
--- forrest/trunk/src/core/context/WEB-INF/cli.xconf	(original)
+++ forrest/trunk/src/core/context/WEB-INF/cli.xconf	Mon Jun 14 14:42:40 2004
@@ -185,7 +185,10 @@
    <exclude pattern="**/"/>
    <exclude pattern="**apidocs**"/>
    <exclude pattern="api/**"/>
-
+   
+   <exclude pattern="site:**"/>
+   <exclude pattern="ext:**"/>
+      
    <!-- Exclude tokens used in URLs to ASF mirrors (interpreted by a CGI) -->
    <exclude pattern="[preferred]/**"/>
    <exclude pattern="[location]"/>

Modified: forrest/trunk/src/core/context/faq.xmap
==============================================================================
--- forrest/trunk/src/core/context/faq.xmap	(original)
+++ forrest/trunk/src/core/context/faq.xmap	Mon Jun 14 14:42:40 2004
@@ -153,7 +153,7 @@
         <map:generate src="cocoon:/{1}{2}.xml"/>
         <map:transform type="xinclude"/>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <map:transform src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
         <map:call resource="skinit">
           <map:parameter name="type" value="document2html"/>
           <map:parameter name="path" value="/{1}{2}.html"/>

Modified: forrest/trunk/src/core/context/resources/stylesheets/declare-broken-site-links.xsl
==============================================================================
--- forrest/trunk/src/core/context/resources/stylesheets/declare-broken-site-links.xsl	(original)
+++ forrest/trunk/src/core/context/resources/stylesheets/declare-broken-site-links.xsl	Mon
Jun 14 14:42:40 2004
@@ -18,8 +18,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template match="@*">
-
-    <xsl:attribute name="name(.)">
+    <xsl:attribute name="{name(.)}">
       <xsl:choose>
         <!-- Change the site: and ext: links in the output so that Forrest
              understands that they are broken -->
@@ -33,6 +32,12 @@
     </xsl:attribute>
   </xsl:template>
 
-  <xsl:include href="copyover.xsl"/>
+	<!-- Identity transformation template -->			
+	<xsl:template match="/ | * | comment() | processing-instruction() | text()"> 
+		<xsl:copy> 
+			<xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()"/>

+		</xsl:copy> 
+	</xsl:template> 
+    
   
 </xsl:stylesheet>

Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap	(original)
+++ forrest/trunk/src/core/context/sitemap.xmap	Mon Jun 14 14:42:40 2004
@@ -331,7 +331,7 @@
             <map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
             <map:transform src="{forrest:stylesheets}/html2htmlbody.xsl" />
             <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
-            <map:transform src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+            <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
             <map:serialize type="xml" />
           </map:when>
         </map:select>
@@ -344,7 +344,7 @@
         <map:transform type="idgen"/>
         <map:transform type="xinclude"/>
         <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
-        <map:transform src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
         <map:call resource="skinit">
           <map:parameter name="type" value="document2html"/>
           <map:parameter name="path" value="{1}{2}.html"/>
@@ -355,7 +355,7 @@
       <map:match pattern="**menu-*.html">
         <map:generate src="cocoon:/{1}book-{2}.html"/>
         <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
-        <map:transform src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
         <map:call resource="skinit">
           <map:parameter name="type" value="book2menu"/>
           <map:parameter name="path" value="{1}{2}.html"/>
@@ -428,7 +428,7 @@
         <!-- <map:transform type="idgen"/> -->
         <map:transform type="xinclude"/>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.pdf"/>
-        <map:transform src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
         <map:select type="exists">
           <map:when test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
             <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
@@ -460,7 +460,7 @@
         <!-- <map:transform type="idgen"/> -->
         <map:transform type="xinclude"/>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.svg"/>
-        <map:transform src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
         <map:select type="exists">
           <map:when test="{project:skins-dir}{forrest:skin}/xslt/svg/document2svg.xsl">
             <map:transform src="{project:skins-dir}{forrest:skin}/xslt/svg/document2svg.xsl">

Mime
View raw message