forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 36814 - in forrest/trunk/src: core/context core/context/resources/stylesheets/aggregates core/fresh-site/src/documentation/content/xdocs documentation/content/xdocs documentation/content/xdocs/docs
Date Tue, 24 Aug 2004 15:08:25 GMT
Author: brondsem
Date: Tue Aug 24 08:08:24 2004
New Revision: 36814

Modified:
   forrest/trunk/src/core/context/aggregate.xmap
   forrest/trunk/src/core/context/resources/stylesheets/aggregates/book2cinclude.xsl
   forrest/trunk/src/core/context/sitemap.xmap
   forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml
   forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
   forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml
   forrest/trunk/src/documentation/content/xdocs/faq.xml
   forrest/trunk/src/documentation/content/xdocs/site.xml
Log:
wholesite.html/pdf instead of site.html/pdf

Modified: forrest/trunk/src/core/context/aggregate.xmap
==============================================================================
--- forrest/trunk/src/core/context/aggregate.xmap	(original)
+++ forrest/trunk/src/core/context/aggregate.xmap	Tue Aug 24 08:08:24 2004
@@ -26,7 +26,7 @@
 duplicate 'id' attributes.
 
 Generates  :  Source XML, Linkmap
-Example URL:  Typically http://localhost:8888/site.pdf
+Example URL:  Typically http://localhost:8888/wholesite.pdf
 Used by    :  sitemap.xmap, which binds the URL to this pipeline
 Uses       :  cocoon://abs-linkmap, in linkmap.xmap
 

Modified: forrest/trunk/src/core/context/resources/stylesheets/aggregates/book2cinclude.xsl
==============================================================================
--- forrest/trunk/src/core/context/resources/stylesheets/aggregates/book2cinclude.xsl	(original)
+++ forrest/trunk/src/core/context/resources/stylesheets/aggregates/book2cinclude.xsl	Tue
Aug 24 08:08:24 2004
@@ -21,7 +21,7 @@
 
 jefft@apache.org
 
-See http://127.0.0.1:8888/book-site.html to see what the book xml looks like
+See http://127.0.0.1:8888/book-wholesite.html to see what the book xml looks like
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cinclude="http://apache.org/cocoon/include/1.0">

Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap	(original)
+++ forrest/trunk/src/core/context/sitemap.xmap	Tue Aug 24 08:08:24 2004
@@ -296,6 +296,10 @@
           <map:mount uri-prefix="" src="revisions.xmap" check-reload="yes" />
         </map:match>
 
+        <!-- wholesite is preferred; site is here for compatibility -->
+        <map:match pattern="wholesite.xml">
+          <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
+        </map:match>
         <map:match pattern="site.xml">
           <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
         </map:match>
@@ -325,6 +329,9 @@
       </map:match>
 
       <map:match pattern="**linkmap-*">
+        <map:match pattern="linkmap-wholesite.*">
+          <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
+        </map:match>
         <map:match pattern="linkmap-site.*">
           <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
         </map:match>

Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml	(original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml	Tue Aug 24
08:08:24 2004
@@ -76,9 +76,10 @@
   </files>
 
   <!--
+  The href must be wholesite.html/pdf  You can change the labels and node names
   <all label="All">
-    <whole_site_html label="Whole Site HTML" href="site.html"/>
-    <whole_site_pdf label="Whole Site PDF" href="site.pdf"/>
+    <whole_site_html label="Whole Site HTML" href="wholesite.html"/>
+    <whole_site_pdf label="Whole Site PDF" href="wholesite.pdf"/>
   </all>
   -->
 

Modified: forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml	Tue Aug 24 08:08:24
2004
@@ -290,6 +290,13 @@
       </table>
     </section>
 
+    <section id="wholesite">
+      <title>Wholesite.html/pdf</title>
+      <p>Instead of using site.html/pdf to create an aggregate page of your entire
site, use
+      wholesite.html/pdf.  The old names are still supported for backwards compatibility
but
+      they may not be in the future.</p>
+    </section>
+
     <section>
       <title>To be continued...</title>
       <p>...as more issues are discovered/remembered :)  Please send feedback

Modified: forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml	Tue Aug 24 08:08:24
2004
@@ -614,7 +614,7 @@
         <li>Merge XML sources via aggregation, or make content from large XML
           sources available as "virtual" files.
           (<strong>Note:</strong> Forrest's default sitemap defines a whole-site
HTML
-          and PDF, available as <code>site.html</code> and <code>site.pdf</code>.)</li>
+          and PDF, available as <code>wholesite.html</code> and <code>wholesite.pdf</code>.)</li>
         <li>Read content from exotic sources like
         <link href="http://www.rpbourret.com/xml/XMLDBLinks.htm">XML
             databases</link></li>
@@ -806,7 +806,7 @@
               We can add another *.xml matcher in this section, just before the
               catch-all subsitemap:
             </p>
-            <source><![CDATA[<map:match pattern="site.xml">
+            <source><![CDATA[<map:match pattern="wholesite.xml">
     <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
   </map:match>]]>
   <strong><![CDATA[

Modified: forrest/trunk/src/documentation/content/xdocs/faq.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/faq.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/faq.xml	Tue Aug 24 08:08:24 2004
@@ -134,10 +134,10 @@
       <answer>
       <p>Add the following entries to your site.xml file:</p>
         <source><![CDATA[
-  <about tab="home" label="Home" href="">
+  <about tab="home" label="About" href="">
  	  ...
-    <all_site label="Full HTML" href="site.html"/>    
-    <all_sitePDF label="Full PDF" href="site.pdf"/>  
+    <all_site label="Full HTML" href="wholesite.html"/>    
+    <all_sitePDF label="Full PDF" href="wholesite.pdf"/>  
      ...
   </about>]]></source>
        <p>

Modified: forrest/trunk/src/documentation/content/xdocs/site.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/site.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/site.xml	Tue Aug 24 08:08:24 2004
@@ -162,8 +162,8 @@
   </references>
   <!-- Uncomment this if we want aggregate HTML/PDFs for this site 
   <pdfs label="PDFs">
-    <whole_site_html label="Whole site HTML" href="site.html"/>
-    <whole_site_pdf label="Whole site PDF" href="site.pdf"/>
+    <whole_site_html label="Whole site HTML" href="wholesite.html"/>
+    <whole_site_pdf label="Whole site PDF" href="wholesite.pdf"/>
   </pdfs>
   -->
 

Mime
View raw message