forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527038 [7/15] - in /forrest/trunk/whiteboard/plugins: ./ org.apache.forrest.plugin.Database/ org.apache.forrest.plugin.Database/resources/stylesheets/ org.apache.forrest.plugin.Database/src/documentation/ org.apache.forrest.plugin.Database...
Date Tue, 10 Apr 2007 05:45:31 GMT
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/resources/stylesheets/status-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/resources/stylesheets/status-to-document.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/resources/stylesheets/status-to-document.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/resources/stylesheets/status-to-document.xsl Mon Apr  9 22:45:15 2007
@@ -15,29 +15,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--+
     | Converts output of the StatusGenerator into HTML page
     | 
     | CVS $Id: status2html.xslt,v 1.8 2004/03/06 02:25:41 antonio Exp $
     +-->
-
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:status="http://apache.org/cocoon/status/2.0"
                 xmlns:xalan="http://xml.apache.org/xalan"
                 exclude-result-prefixes="xalan">
- 
   <xsl:param name="contextPath"/>
-
   <xsl:template match="status:statusinfo">
     <document>
       <header>
         <title>Cocoon Status [<xsl:value-of select="@status:host"/>]</title>
       </header>
-
       <body>
-        <script type="text/javascript">
+<script type="text/javascript">
 function toggle(id) {
     var element = document.getElementById(id);
     with (element.style) {
@@ -60,136 +55,124 @@
         </section>
         <section>
           <title>Apache Cocoon <xsl:value-of select="@status:cocoon-version"/></title>
-        <li>
-          <span class="description">Created:</span>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="@status:creation-time"/>
-        </li>
-        <li>
-          <span class="description">Build:</span>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="@status:build-info"/>
-        </li>
+          <li><span class="description">Created:</span>
+<xsl:text> </xsl:text>
+            <xsl:value-of select="@status:creation-time"/></li>
+          <li><span class="description">Build:</span>
+<xsl:text> </xsl:text>
+            <xsl:value-of select="@status:build-info"/></li>
         </section>
         <xsl:apply-templates/>
-
-        <!--
+<!--
           - Add XSLT processor information
           -->
-        <section><title>XSLT Processor</title>
-        <li>
-          <span class="description">XSLT Version:</span>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="system-property('xsl:version')"/>
-        </li>
-        <li>
-          <span class="description">Vendor:</span>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="system-property('xsl:vendor')"/>
-        </li>
-        <li>
-          <span class="description">Vendor URL:</span>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="system-property('xsl:vendor-url')"/>
-        </li>
-
-        <!--
+        <section>
+          <title>XSLT Processor</title>
+          <li><span class="description">XSLT Version:</span>
+<xsl:text> </xsl:text>
+            <xsl:value-of select="system-property('xsl:version')"/></li>
+          <li><span class="description">Vendor:</span>
+<xsl:text> </xsl:text>
+            <xsl:value-of select="system-property('xsl:vendor')"/></li>
+          <li><span class="description">Vendor URL:</span>
+<xsl:text> </xsl:text>
+            <xsl:value-of select="system-property('xsl:vendor-url')"/></li>
+<!--
           - Add Xalan / Xerces information using custom Xalan extension
           - (if it's present)
           -->
-        <xsl:if test="function-available('xalan:checkEnvironment')">
-          <xsl:apply-templates select="xalan:checkEnvironment()"/>
-        </xsl:if>
+          <xsl:if test="function-available('xalan:checkEnvironment')">
+            <xsl:apply-templates select="xalan:checkEnvironment()"/>
+          </xsl:if>
         </section>
       </body>
     </document>
   </xsl:template>
-
   <xsl:template match="status:group">
-    <section><title><xsl:value-of select="@status:name"/></title>
-    <ul><xsl:apply-templates select="status:value"/></ul>
-    <xsl:apply-templates select="status:group"/>
-    <xsl:if test="status:cont">
-    	<ul>
-    		<xsl:apply-templates select="status:cont"/>    	
-    	</ul>
-    </xsl:if>
+    <section>
+      <title><xsl:value-of select="@status:name"/></title>
+      <ul>
+        <xsl:apply-templates select="status:value"/>
+      </ul>
+      <xsl:apply-templates select="status:group"/>
+      <xsl:if test="status:cont">
+        <ul>
+          <xsl:apply-templates select="status:cont"/>
+        </ul>
+      </xsl:if>
     </section>
   </xsl:template>
-  
   <xsl:template match="status:cont">
-  	<li>
-  		<xsl:for-each select="@*">
-  			<span class="description"><xsl:value-of select="name()"/>:<xsl:text> </xsl:text> </span><xsl:value-of select="."/>
-  			<xsl:if test="position() != last()">, </xsl:if>
-  		</xsl:for-each>
-  	</li>
+    <li><xsl:for-each select="@*">
+        <span class="description">
+          <xsl:value-of select="name()"/>:<xsl:text> </xsl:text>
+        </span>
+        <xsl:value-of select="."/>
+        <xsl:if test="position() != last()">, </xsl:if>
+      </xsl:for-each></li>
     <xsl:if test="status:cont">
-    	<ul>
-    		<xsl:apply-templates select="status:cont"/>    	
-    	</ul>  	
+      <ul>
+        <xsl:apply-templates select="status:cont"/>
+      </ul>
     </xsl:if>
   </xsl:template>
-
   <xsl:template match="status:value">
-    <li>
-      <span class="description"><xsl:value-of select="@status:name"/><xsl:text>: </xsl:text></span>
+    <li><span class="description">
+        <xsl:value-of select="@status:name"/>
+<xsl:text>: </xsl:text>
+      </span>
       <xsl:choose>
         <xsl:when test="contains(@status:name,'free') or contains(@status:name,'total') or contains(@status:name,'used')">
           <xsl:call-template name="suffix">
             <xsl:with-param name="bytes" select="number(.)"/>
           </xsl:call-template>
-        </xsl:when>      
+        </xsl:when>
         <xsl:when test="count(status:line) &lt;= 1">
           <xsl:value-of select="status:line"/>
         </xsl:when>
         <xsl:otherwise>
           <span class="switch" id="{generate-id(.)}-switch" onclick="toggle('{generate-id(.)}')">[show]</span>
           <ul id="{generate-id(.)}" style="display: none">
-             <xsl:apply-templates />
+            <xsl:apply-templates />
           </ul>
         </xsl:otherwise>
-      </xsl:choose>
-    </li>
+      </xsl:choose></li>
   </xsl:template>
-
   <xsl:template match="status:line">
     <li><xsl:value-of select="."/></li>
   </xsl:template>
-
   <xsl:template name="suffix">
     <xsl:param name="bytes"/>
     <xsl:choose>
-      <!-- More than 4 MB (=4194304) -->
+<!-- More than 4 MB (=4194304) -->
       <xsl:when test="$bytes &gt;= 4194304">
         <xsl:value-of select="round($bytes div 10485.76) div 100"/> MB
       </xsl:when>
-      <!-- More than 4 KB (=4096) -->
+<!-- More than 4 KB (=4096) -->
       <xsl:when test="$bytes &gt; 4096">
         <xsl:value-of select="round($bytes div 10.24) div 100"/> KB
       </xsl:when>
-      <!-- Less -->
+<!-- Less -->
       <xsl:otherwise>
         <xsl:value-of select="$bytes"/> B
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!--
+<!--
     - Process Xalan extension output
     -->
   <xsl:template match="checkEnvironmentExtension">
-    <section><title>Xerces, Xalan</title>
-    <ul><xsl:apply-templates select="EnvironmentCheck/environment/item[starts-with(@key, 'version.')]"/></ul>
+    <section>
+      <title>Xerces, Xalan</title>
+      <ul>
+        <xsl:apply-templates select="EnvironmentCheck/environment/item[starts-with(@key, 'version.')]"/>
+      </ul>
     </section>
-  </xsl:template> 
-
+  </xsl:template>
   <xsl:template match="item">
-    <li style="width: 40%">
-      <span class="description"><xsl:value-of select="@key"/>:</span>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="."/>
-    </li>
-  </xsl:template> 
-   
+    <li style="width: 40%"><span class="description">
+        <xsl:value-of select="@key"/>:</span>
+<xsl:text> </xsl:text>
+      <xsl:value-of select="."/></li>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/locationmap.xml Mon Apr  9 22:45:15 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -24,11 +23,9 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
+      <selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
-  <locator>  
-  </locator>
+  <locator></locator>
 </locationmap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,20 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welcome to the org.apache.forrest.plugin.input.serverStatus Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.input.serverStatus Plugin</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Apache Forrest - org.apache.forrest.plugin.input.serverStatus Plugin</title>
-      <p>Provides a list of the Cocoon cache and other server status information.</p>
-      <p>In 'forrest run' mode, see
+      <p>
+        Provides a list of the Cocoon cache and other server status information.
+      </p>
+      <p>
+        In 'forrest run' mode, see
         <code>http://localhost:8888/cstatus.html</code>
       </p>
     </section>
-    
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/site.xml Mon Apr  9 22:45:15 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Forrest site.xml
 
@@ -29,24 +28,20 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.input.serverStatus" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.input.serverStatus"/>
     <forrestPlugins label="Plugins Index" href="site:forrest/plugins" description="Index of Forrest Plugins"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-
-  <!--
+<!--
   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="wholesite.html"/>
     <whole_site_pdf label="Whole Site PDF" href="wholesite.pdf"/>
   </all>
   -->
-
   <external-refs>
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
@@ -56,5 +51,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/content/xdocs/tabs.xml Mon Apr  9 22:45:15 2007
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-
 <tabs software="MyProj"
   title="MyProj"
   copyright="Foo"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <!-- The rules for tabs are:
+<!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -32,12 +30,10 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="plugins" label="Forrest Plugins" href="http://forrest.apache.org/pluginDocs" indexfile="index.html"/>
   <tab id="" label="Plugin Home" dir="" indexfile="index.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/src/documentation/skinconf.xml Mon Apr  9 22:45:15 2007
@@ -15,16 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"
 [
   <!ENTITY skinconf-common PUBLIC "-//Apache Forrest//ENTITIES Skin Configuration common plugins V0.7-1//EN" "">
 ]>
-
 <skinconfig>
   &skinconf-common;
 
   <project-name>Plugin: serverStatus input</project-name>
   <project-description>org.apache.forrest.plugin.input.serverStatus plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/status.xml Mon Apr  9 22:45:15 2007
@@ -16,34 +16,30 @@
   limitations under the License.
 -->
 <status>
-
   <developers>
-    <!-- Add new developers here -->
+<!-- Add new developers here -->
     <person name="Volunteer needed" email="dev@forrest.apache.org" id="open"/>
   </developers>
-
-  <!-- Define here the Title of the Context you want to display in the Changes pages.
+<!-- Define here the Title of the Context you want to display in the Changes pages.
        id = the context value of actions
        title = Title of the Context
-  -->  
+  -->
   <contexts>
-   <!-- Add new contexts here -->
-   <context id="code" title="Changes to the Code Base"/>
-   <context id="docs" title="Changes to Documentation"/>
-   <context id="admin" title="Changes to Project Administration"/>
-   <context id="design" title="Changes to Design"/>
-   <context id="build" title="Changes to Build"/>
-  </contexts> 
-
+<!-- Add new contexts here -->
+    <context id="code" title="Changes to the Code Base"/>
+    <context id="docs" title="Changes to Documentation"/>
+    <context id="admin" title="Changes to Project Administration"/>
+    <context id="design" title="Changes to Design"/>
+    <context id="build" title="Changes to Build"/>
+  </contexts>
   <changes>
-    <!-- Add new releases here -->
+<!-- Add new releases here -->
     <release version="0.1" date="not-released">
       <action dev="DC" type="add" context="admin">
         Initial plugin code.
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="high">
       <action context="docs" dev="open">
@@ -54,5 +50,4 @@
       </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/build.xml Mon Apr  9 22:45:15 2007
@@ -24,10 +24,8 @@
   <property name="author" value="Apache Forrest Project"/>
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/org.apache.forrest.plugin.internal.DevTools"/>
   <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
-  
   <import file="../build.xml"/>
-
-  <!-- Add any additional installation work here in the build target, for example:
+<!-- Add any additional installation work here in the build target, for example:
   <target name="build"
           description="Extract the tools">
      <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
@@ -38,5 +36,3 @@
   </target>
   -->
 </project>
-  
-  

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap Mon Apr  9 22:45:15 2007
@@ -16,40 +16,36 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<map:components>
-  <map:generators>
-    <map:generator name="serverpages"
+  <map:components>
+    <map:generators>
+      <map:generator name="serverpages"
      pool-grow="2" pool-max="32" pool-min="4"
      src="org.apache.cocoon.generation.ServerPagesGenerator"/>
-     <map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
-  </map:generators>
-  <map:actions>
+      <map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
+    </map:generators>
+    <map:actions>
       <map:action name="write" src="org.apache.forrest.actions.WriteToLocalBuildAction"/>
-  </map:actions>
-</map:components>
-
-<map:pipelines>
-
-  <map:pipeline type="noncaching">    
-    <map:match pattern="devTools/do/savePage.xml">
-      <map:act type="write">
-        <map:parameter name="staging-dir" value="{properties:staging-dir}"/>
-        <map:generate type="request"/>
-        <map:transform src="{lm:devTools.transform.saveRequest.success}">
-          <map:paramaeter name="response" value="{message}"/>
-          <map:paramaeter name="staging-dir" value="{properties:staging-dir}"/>
-        </map:transform>
+    </map:actions>
+  </map:components>
+  <map:pipelines>
+    <map:pipeline type="noncaching">
+      <map:match pattern="devTools/do/savePage.xml">
+        <map:act type="write">
+          <map:parameter name="staging-dir" value="{properties:staging-dir}"/>
+          <map:generate type="request"/>
+          <map:transform src="{lm:devTools.transform.saveRequest.success}">
+            <map:paramaeter name="response" value="{message}"/>
+            <map:paramaeter name="staging-dir" value="{properties:staging-dir}"/>
+          </map:transform>
+          <map:serialize type="xml-document"/>
+        </map:act>
+      </map:match>
+      <map:match pattern="devTools/do/*.xml">
+        <map:generate src="{lm:devTools.do.{1}}" type="serverpages">
+          <map:parameter name="URL" value="index.htm"/>
+        </map:generate>
         <map:serialize type="xml-document"/>
-      </map:act>
-    </map:match>
-    
-    <map:match pattern="devTools/do/*.xml">
-      <map:generate src="{lm:devTools.do.{1}}" type="serverpages">
-        <map:parameter name="URL" value="index.htm"/>
-      </map:generate>
-      <map:serialize type="xml-document"/>
-    </map:match>
-  </map:pipeline>
-</map:pipelines>
-
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/locationmap.xml Mon Apr  9 22:45:15 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -24,16 +23,14 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
+      <selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
-  <locator>  
+  <locator>
     <match pattern="devTools.do.*">
       <location src="resources/scripts/{1}.xsp" />
     </match>
-    
     <match pattern="devTools.transform.*.*">
       <location src="resources/stylesheets/{1}-to-{2}.xsl" />
     </match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/resources/stylesheets/saveRequest-to-success.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/resources/stylesheets/saveRequest-to-success.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/resources/stylesheets/saveRequest-to-success.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/resources/stylesheets/saveRequest-to-success.xsl Mon Apr  9 22:45:15 2007
@@ -15,45 +15,50 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:h="http://apache.org/cocoon/request/2.0">
-  
-  <!-- The response from the save action -->
+<!-- The response from the save action -->
   <xsl:param name="response"/>
-  <!-- The Staging Dir -->
+<!-- The Staging Dir -->
   <xsl:param name="staging-dir"/>
-  
   <xsl:template match="h:request">
     <document>
       <header>
         <title>Site Build</title>
       </header>
       <body>
-        <warning>Your site may not be fully generated.</warning>
-        
-        <p>You have sucesfully saved the file to your local staging site. However,
-        no other versions of this page (i.e. PDF, text etc) have been saved, similarly
-        no other pages have been saved.</p>
-        
-        <note>If you have changed any of the navigation or skin/theme files you must
-        regenerate the whole site using the "forrest site" command.</note>
-        
-        <p><link>
-          <xsl:attribute name="href">/<xsl:value-of select="h:requestParameters/h:parameter[@name='URI']/h:value"/></xsl:attribute>
-          Return to the originating page</link>.</p>
-        
+        <warning>
+          Your site may not be fully generated.
+        </warning>
+        <p>
+          You have sucesfully saved the file to your local staging site.
+          However, no other versions of this page (i.e. PDF, text etc) have been
+          saved, similarly no other pages have been saved.
+        </p>
+        <note>
+          If you have changed any of the navigation or skin/theme files you must
+          regenerate the whole site using the "forrest site" command.
+        </note>
+        <p>
+          <link>
+          <xsl:attribute name="href">/<xsl:value-of select="h:requestParameters/h:parameter[@name='URI']/h:value"/>
+          </xsl:attribute>
+          Return to the originating page</link>.
+        </p>
         <section>
           <title>Details</title>
           <table>
             <tr>
               <th>Staging Directory</th>
-              <td><xsl:value-of select="$staging-dir"/></td>
+              <td>
+                <xsl:value-of select="$staging-dir"/>
+              </td>
             </tr>
             <tr>
               <th>Staged URL</th>
-              <td>/<xsl:value-of select="h:requestParameters/h:parameter[@name='URI']/h:value"/></td>
+              <td>/<xsl:value-of select="h:requestParameters/h:parameter[@name='URI']/h:value"/>
+              </td>
             </tr>
           </table>
         </section>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -15,37 +15,39 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-    <document>
-      <header>
-        <title>DevTools Plugin</title>
-      </header>
-      <body>
-        <p>The devtools plugin provides a number of useful commands for use when
-        developing Forrest based content objects. It is only useful in dynamic mode.</p>
-        
-        <p>This plugin introduces the concept of three different stages of publication.
-        To be useful it is important that you understand each of these stages.</p>
-        
-        <ol>
-          <li>Local Preview: this is a transient verson of a page that can be
+<document>
+  <header>
+    <title>DevTools Plugin</title>
+  </header>
+  <body>
+    <p>
+      The devtools plugin provides a number of useful commands for use when
+      developing Forrest based content objects. It is only useful in dynamic
+      mode.
+    </p>
+    <p>
+      This plugin introduces the concept of three different stages of
+      publication. To be useful it is important that you understand each of
+      these stages.
+    </p>
+    <ol>
+      <li>Local Preview: this is a transient verson of a page that can be
           viewed in the local browser. It is not saved and is not recoverable
           once you stop the current forrest run.</li>
-          <li>Local Staging: this is a local permanent store of a page or collection
+      <li>Local Staging: this is a local permanent store of a page or collection
           of pages. The pages are retrievable after you stop the current forrest run.</li>
-          <li>Deployed: this is a remote permanent store of a page or collection of
+      <li>Deployed: this is a remote permanent store of a page or collection of
           pages. This may be a live web server or a remote staging server used for
           quality assurance before the content goes live.</li>
-        </ol>
-        
-        <section>
-          <title>Available Tools</title>
-          <ul>
-            <li>
+    </ol>
+    <section>
+      <title>Available Tools</title>
+      <ul>
+        <li>
               Save a locally previewed page to the local staging area. 
               e.g. <link href="/devTools/do/savePage.html?URI=index.html">save this page</link> and check the timestamps on 
-              <code>PROJECT_HOME/build/site/index.html</code>
-            </li>
-            <!--
+              <code>PROJECT_HOME/build/site/index.html</code></li>
+<!--
             <li>
               <link href="/devTools/do/siteBuild.html">Build the complete content object in the local staging area</link>
             </li>
@@ -53,7 +55,7 @@
               <link href="/devTools/do/deployFromLocalStaged.html">Deploy the locally staged site</link>
             </li>
             -->
-          </ul>
-        </section>
-      </body>
-    </document>
+      </ul>
+    </section>
+  </body>
+</document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/site.xml Mon Apr  9 22:45:15 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Forrest site.xml
 
@@ -29,24 +28,20 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.internal.DevTools" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.internal.DevTools"/>
     <forrestPlugins label="Plugins Index" href="site:forrest/plugins" description="Index of Forrest Plugins"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-  
-  <!--
+<!--
   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="wholesite.html"/>
     <whole_site_pdf label="Whole Site PDF" href="wholesite.pdf"/>
   </all>
   -->
-
   <external-refs>
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
@@ -56,5 +51,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/content/xdocs/tabs.xml Mon Apr  9 22:45:15 2007
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-
 <tabs software="MyProj"
   title="MyProj"
   copyright="Foo"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <!-- The rules for tabs are:
+<!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -32,12 +30,10 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="plugins" label="Forrest Plugins" href="http://forrest.apache.org/pluginDocs" indexfile="index.html"/>
   <tab id="" label="Plugin Home" dir="" indexfile="index.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/src/documentation/skinconf.xml Mon Apr  9 22:45:15 2007
@@ -15,16 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"
 [
   <!ENTITY skinconf-common PUBLIC "-//Apache Forrest//ENTITIES Skin Configuration common plugins V0.7-1//EN" "">
 ]>
-
 <skinconfig>
   &skinconf-common;
 
   <project-name>Plugin: DevTools internal</project-name>
   <project-description>org.apache.forrest.plugin.internal.DevTools plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/status.xml Mon Apr  9 22:45:15 2007
@@ -16,56 +16,62 @@
   limitations under the License.
 -->
 <status>
-
   <developers>
-    <!-- Add new developers here -->
+<!-- Add new developers here -->
     <person name="Volunteer needed" email="dev@forrest.apache.org" id="open"/>
   </developers>
-
-  <!-- Define here the Title of the Context you want to display in the Changes pages.
+<!-- Define here the Title of the Context you want to display in the Changes pages.
        id = the context value of actions
        title = Title of the Context
-  -->  
+  -->
   <contexts>
-   <!-- Add new contexts here -->
-   <context id="code" title="Changes to the Code Base"/>
-   <context id="docs" title="Changes to Documentation"/>
-   <context id="admin" title="Changes to Project Administration"/>
-   <context id="design" title="Changes to Design"/>
-   <context id="build" title="Changes to Build"/>
-  </contexts> 
-
+<!-- Add new contexts here -->
+    <context id="code" title="Changes to the Code Base"/>
+    <context id="docs" title="Changes to Documentation"/>
+    <context id="admin" title="Changes to Project Administration"/>
+    <context id="design" title="Changes to Design"/>
+    <context id="build" title="Changes to Build"/>
+  </contexts>
   <changes>
-    <!-- Add new releases here -->
+<!-- Add new releases here -->
     <release version="0.1" date="unreleased">
       <action dev="RDG" type="add" context="code">
-        <p>Any page can be saved when running in dynamic mode by requesting the page:
-        <code>devTools/do/savePage.html?URI=$URI_OF_PAGE_TO_SAVE</code></p>
+        <p>
+          Any page can be saved when running in dynamic mode by requesting the
+          page: <code>devTools/do/savePage.html?URI=$URI_OF_PAGE_TO_SAVE</code>
+        </p>
       </action>
       <action dev="RDG" type="add" context="admin">
         Initial plugin code.
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="high">
       <action context="code" dev="open">
-        <p>Provide a Javascript overlay menu that allows functions from this plugin
-        to be easily accessed from within the browser. This can also provide information
-        such as the validity of the page etc.</p>
+        <p>
+          Provide a Javascript overlay menu that allows functions from this
+          plugin to be easily accessed from within the browser. This can also
+          provide information such as the validity of the page etc.
+        </p>
       </action>
       <action context="code" dev="open">
-        <p>Provide an indicator of how likely it is that a site, as a whole, is out of date each time a page is saved.</p>
+        <p>
+          Provide an indicator of how likely it is that a site, as a whole, is
+          out of date each time a page is saved.
+        </p>
       </action>
       <action context="code" dev="open">
-        <p>Provide an indicator on the page to show if the page is up to date in the local site-build
-        when previewing it.</p>
+        <p>
+          Provide an indicator on the page to show if the page is up to date in
+          the local site-build when previewing it.
+        </p>
       </action>
       <action context="code" dev="open">
-        <p>Trap errors writng to files and report them to the user</p>
+        <p>
+          Trap errors writng to files and report them to the user
+        </p>
       </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/build.xml Mon Apr  9 22:45:15 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
-
   <property name="plugin-name" value="org.apache.forrest.plugin.internal.GoogleSitemap"/>
   <property name="forrest.version" value="0.7"/>
   <property name="type" value="internal"/>
@@ -26,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.internal.GoogleSitemap/"/>
   <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
   <property name="publish" value="true"/>
-
   <import file="../build.xml"/>
-  
-  <!-- Add any additional installation work here in the build target, for example:
+<!-- Add any additional installation work here in the build target, for example:
   <target name="build"
           description="Extract the tools">
      <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
@@ -40,5 +37,3 @@
   </target>
   -->
 </project>
-  
-  

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap Mon Apr  9 22:45:15 2007
@@ -22,7 +22,6 @@
 
 $Revision: 1.12 $
 ==================================================== -->
-
 <!--
   internal.xmap for org.apache.forrest.plugin.internal.GoogleSitemap
   Basically, this is just the Apache Forrest 0.7 sitemap.xmap file with
@@ -34,7 +33,6 @@
   'Added for org.apache.forrest.plugin.internal.GoogleSitemap'
   to see all specific modifications.  
 -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file">
@@ -45,44 +43,37 @@
       </map:generator>
       <map:generator name="exception"
                   src="org.apache.cocoon.generation.ParseExceptionGenerator"/>
-      <!--
+<!--
       <map:generator name="html"      src="org.apache.cocoon.generation.HTMLGenerator">
         <jtidy-config>jtidy.properties</jtidy-config>
       </map:generator>
       <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
       -->
       <map:generator name="notifier" src="org.apache.cocoon.sitemap.NotifyingGenerator" />
-      
       <map:generator name="text2xml" logger="sitemap.generator.textgenerator"
                      src="org.apache.cocoon.generation.TextGenerator">
-       <parameter name="localizable" value="true"/>
+        <parameter name="localizable" value="true"/>
+      </map:generator>
+<!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
+      <map:generator name="linkstatus" src="org.apache.cocoon.generation.LinkStatusGenerator">
+<!--TODO: provide a means to allow the user to add/override regexp patterns here for include and exclude?-->
+        <include-name>.*\.html</include-name>
+        <include-name>.*\.xml</include-name>
       </map:generator>
-      
-      	<!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
-      	<map:generator name="linkstatus" src="org.apache.cocoon.generation.LinkStatusGenerator">
-            <!--TODO: provide a means to allow the user to add/override regexp patterns here for include and exclude?-->
-            <include-name>.*\.html</include-name>
-            <include-name>.*\.xml</include-name>
-        </map:generator>
     </map:generators>
-
     <map:transformers default="xslt">
-
-      <!-- Add values to skinconf that need extra processing like the color shades -->
+<!-- Add values to skinconf that need extra processing like the color shades -->
       <map:transformer name="skinconf" src="org.apache.forrest.conf.SkinconfTransformer"/>
-              
-      <!-- Generates @id attributes from <title> strings -->
+<!-- Generates @id attributes from <title> strings -->
       <map:transformer name="idgen" src="org.apache.forrest.util.IdGeneratorTransformer">
         <element>//*[local-name() = 'section']</element>
         <id>title/text()</id>
       </map:transformer>
-
-      <!-- Rewrites links, e.g. transforming href="site:index" to href="../index.html" -->
-      <!-- See http://forrest.apache.org/docs/sitemap-ref.html#linkrewriting_impl -->
+<!-- Rewrites links, e.g. transforming href="site:index" to href="../index.html" -->
+<!-- See http://forrest.apache.org/docs/sitemap-ref.html#linkrewriting_impl -->
       <map:transformer name="linkrewriter" logger="sitemap.transformer.linkrewriter" src="org.apache.cocoon.transformation.LinkRewriterTransformer">
         <link-attrs>href src</link-attrs>
         <schemes>site ext</schemes>
-
         <input-module name="site">
           <input-module name="linkmap">
             <file src="{src}" reloadable="true" />
@@ -98,92 +89,79 @@
           <suffix>/@href</suffix>
         </input-module>
       </map:transformer>
-
       <map:transformer name="xpath" logger="sitemap.transformer.xpath" src="org.apache.forrest.util.XPathTransformer" />
-      
       <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer" logger="sitemap.transformer.xslt" pool-max="32" pool-min="8" pool-grow="2">
         <use-request-parameters>false</use-request-parameters>
         <use-browser-capabilities-db>false</use-browser-capabilities-db>
         <use-deli>false</use-deli>
         <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
-        <!--<transformer-factory>net.sf.saxon.TransformerFactoryImpl</transformer-factory>-->
-        <!--<transformer-factory>com.icl.saxon.TransformerFactoryImpl</transformer-factory>-->
-        <!--<transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>-->
+<!--<transformer-factory>net.sf.saxon.TransformerFactoryImpl</transformer-factory>-->
+<!--<transformer-factory>com.icl.saxon.TransformerFactoryImpl</transformer-factory>-->
+<!--<transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>-->
       </map:transformer>
-      
       <map:transformer name="xsltc" src="org.apache.cocoon.transformation.TraxTransformer" logger="sitemap.transformer.xslt" pool-max="32" pool-min="8" pool-grow="2">
         <use-request-parameters>false</use-request-parameters>
         <use-browser-capabilities-db>false</use-browser-capabilities-db>
         <use-deli>false</use-deli>
         <transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>
       </map:transformer>
-
       <map:transformer name="xslt-saxon"
          pool-grow="2" pool-max="32" pool-min="8"
          src="org.apache.cocoon.transformation.TraxTransformer">
-       <use-request-parameters>false</use-request-parameters>
-       <use-browser-capabilities-db>false</use-browser-capabilities-db>
-       <xslt-processor-role>saxon</xslt-processor-role>
-     </map:transformer>
-      
+        <use-request-parameters>false</use-request-parameters>
+        <use-browser-capabilities-db>false</use-browser-capabilities-db>
+        <xslt-processor-role>saxon</xslt-processor-role>
+      </map:transformer>
       <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer" logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" />
-
       <map:transformer name="cinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.CIncludeTransformer" logger="sitemap.transformer.cinclude"/>
-   <map:transformer name="pattern" 
+      <map:transformer name="pattern" 
                     src="org.apache.cocoon.transformation.PatternTransformer" 
                     logger="sitemap.transformer.pattern">
-    <parameter name="groups" value="true"/>
-   </map:transformer>
-   <map:transformer name="lexer" 
+        <parameter name="groups" value="true"/>
+      </map:transformer>
+      <map:transformer name="lexer" 
                     src="org.apache.cocoon.transformation.LexicalTransformer" 
                     logger="sitemap.transformer.lexer">
-    <parameter name="localizable" value="true"/>
-   </map:transformer>
-   <map:transformer name="parser" 
+        <parameter name="localizable" value="true"/>
+      </map:transformer>
+      <map:transformer name="parser" 
                     src="org.apache.cocoon.transformation.ParserTransformer" 
                     logger="sitemap.transformer.parser">
-    <parameter name="flatten" value="true"/>
-    <parameter name="recovery" value="true"/>
-    <parameter name="localizable" value="true"/>
-   </map:transformer>
-   <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-    <catalogues default="common">
-      <catalogue id="common" name="CommonMessages" location="skins/common/translations"/>
-    </catalogues>
-    <cache-at-startup>true</cache-at-startup>
-  </map:transformer>
-  
-   <!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
-   <map:transformer name="encodeURL" src="org.apache.cocoon.transformation.EncodeURLTransformer">
-     <!-- default configuration, explicitly defined -->
-     <include-name>.*/@href</include-name>
-     <exclude-name>img/@src|(a/@href|iframe/@src)=.*adserver</exclude-name>
-   </map:transformer>
- </map:transformers>
-
+        <parameter name="flatten" value="true"/>
+        <parameter name="recovery" value="true"/>
+        <parameter name="localizable" value="true"/>
+      </map:transformer>
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="common">
+          <catalogue id="common" name="CommonMessages" location="skins/common/translations"/>
+        </catalogues>
+        <cache-at-startup>true</cache-at-startup>
+      </map:transformer>
+<!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
+      <map:transformer name="encodeURL" src="org.apache.cocoon.transformation.EncodeURLTransformer">
+<!-- default configuration, explicitly defined -->
+        <include-name>.*/@href</include-name>
+        <exclude-name>img/@src|(a/@href|iframe/@src)=.*adserver</exclude-name>
+      </map:transformer>
+    </map:transformers>
     <map:readers default="resource">
       <map:reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
     </map:readers>
-
     <map:serializers default="html">
       <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer">
         <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
         <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
         <encoding>UTF-8</encoding>
       </map:serializer>
-
       <map:serializer name="xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
-
       <map:serializer name="xml-document" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
         <cdata-section-elements>source</cdata-section-elements>
         <doctype-public>-//APACHE//DTD Documentation V1.3//EN</doctype-public>
         <doctype-system>document-v13.dtd</doctype-system>
       </map:serializer>
-
       <map:serializer name="links" src="org.apache.cocoon.serialization.LinkSerializer">
         <encoding>ISO-8859-1</encoding>
       </map:serializer>
-      
       <map:serializer name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer" mime-type="image/svg+xml">
         <doctype-public>-//W3C//DTD SVG 1.0//EN</doctype-public>
         <doctype-system>http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</doctype-system>
@@ -191,81 +169,70 @@
       <map:serializer logger="sitemap.serializer.text" mime-type="text/plain" name="text" src="org.apache.cocoon.serialization.TextSerializer">
         <encoding>UTF-8</encoding>
       </map:serializer>
-      
-     <!--
+<!--
       <map:serializer mime-type="application/x-shockwave-flash" name="swf" src="org.apache.cocoon.serialization.SWFSerializer"/>
       <map:serializer mime-type="application/msword" name="fo2rtf" src="org.apache.cocoon.serialization.RTFSerializer"/>
       -->
     </map:serializers>
-
     <map:matchers default="wildcard">
       <map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
       <map:matcher name="regexp" src="org.apache.cocoon.matching.RegexpURIMatcher"/>
     </map:matchers>
-
     <map:selectors>
       <map:selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
       <map:selector name="exception" logger="sitemap.selector.exception" 
                     src="org.apache.cocoon.selection.ExceptionSelector">
-       <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
-       <exception class="java.lang.Throwable" unroll="true"/>
-     </map:selector>
-     <map:selector name="config" logger="sitemap.selector.config" 
+        <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
+        <exception class="java.lang.Throwable" unroll="true"/>
+      </map:selector>
+      <map:selector name="config" logger="sitemap.selector.config" 
                    src="org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
-
     <map:pipes default="caching">
       <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
-      <!--
+<!--
       <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
       <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
       <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
       -->
     </map:pipes>
   </map:components>
-
-  <!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
+<!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
   <map:views>
-     <map:view name="links" from-position="last">
-        <map:serialize type="links"/>
-     </map:view>
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
   </map:views>
-  
   <map:resources>
     <map:resource name="skinit">
-        <map:transform src="{lm:{type}}">
-          <map:parameter name="notoc" value="{notoc}"/>
-          <!-- For backwards-compat with 0.2 - 0.4 skins -->
-          <map:parameter name="isfaq" value="{notoc}"/>
-          <map:parameter name="nopdf" value="{nopdf}"/>
-          <map:parameter name="path" value="{path}"/>
-          <map:parameter name="config-file" value="{properties:skinconf}"/>
-        </map:transform>
-        <map:select type="config">
-          <map:parameter name="value" value="{properties:forrest.i18n}"/>
-          <map:when test="true">	
-            <map:transform type="i18n">
-              <map:parameter name="locale" value="{request:locale}"/>
-            </map:transform>
-	  </map:when>
-        </map:select>
-      <!--
+      <map:transform src="{lm:{type}}">
+        <map:parameter name="notoc" value="{notoc}"/>
+<!-- For backwards-compat with 0.2 - 0.4 skins -->
+        <map:parameter name="isfaq" value="{notoc}"/>
+        <map:parameter name="nopdf" value="{nopdf}"/>
+        <map:parameter name="path" value="{path}"/>
+        <map:parameter name="config-file" value="{properties:skinconf}"/>
+      </map:transform>
+      <map:select type="config">
+        <map:parameter name="value" value="{properties:forrest.i18n}"/>
+        <map:when test="true">
+          <map:transform type="i18n">
+            <map:parameter name="locale" value="{request:locale}"/>
+          </map:transform>
+        </map:when>
+      </map:select>
+<!--
         FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
       -->
-        <map:transform src="{forrest:forrest.context}/skins/common/xslt/html/strip_namespaces.xsl"/>
-
+      <map:transform src="{forrest:forrest.context}/skins/common/xslt/html/strip_namespaces.xsl"/>
       <map:serialize/>
     </map:resource>
-
   </map:resources>
-
-  <!-- =========================== Pipelines ================================= -->
+<!-- =========================== Pipelines ================================= -->
   <map:pipelines>
-
-  <map:pipeline type="caching" internal-only="true">
- 
-      <!--
+    <map:pipeline type="caching" internal-only="true">
+<!--
         FIXME: there is a bug in the Cocoon 2.2 resolving that can make cocoon:/ 
                calls call the base sitemap; remove the following when it's fixed.
         
@@ -288,66 +255,56 @@
         </map:select>
       </map:match>
     </map:pipeline>
-    
-     <!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
-     <map:pipeline internal-only="false">
-     
-       <map:match pattern="linkstatus">
-         <map:redirect-to uri="linkstatus/linkmap.html"/>
-       </map:match>
-
-       <map:match pattern="linkstatus/**">
-	 <map:generate type="linkstatus" src="{request:scheme}://{request:serverName}:{request:serverPort}/{1}"/>
-         <map:serialize type="xml"/>
-       </map:match>
-
-       <!--
+<!--Added for org.apache.forrest.plugin.internal.GoogleSitemap-->
+    <map:pipeline internal-only="false">
+      <map:match pattern="linkstatus">
+        <map:redirect-to uri="linkstatus/linkmap.html"/>
+      </map:match>
+      <map:match pattern="linkstatus/**">
+        <map:generate type="linkstatus" src="{request:scheme}://{request:serverName}:{request:serverPort}/{1}"/>
+        <map:serialize type="xml"/>
+      </map:match>
+<!--
          TODO: other formats for google sitemaps - ATOM feed, text &  OAI-PMH
          SEE: http://www.google.com/webmasters/sitemaps/docs/en/other.html
        -->
-       
-       <!--
+<!--
          TODO: create resources and only pass stylesheet src value
        -->
-       
-       <map:match pattern="google-sitemap.xml">
-	       <map:generate src="cocoon://linkstatus" />
-	       <map:transform type="encodeURL"/>
-         <map:transform src="resources/stylesheets/linkstatus-google_sitemap.xsl">
-           <!--
+      <map:match pattern="google-sitemap.xml">
+        <map:generate src="cocoon://linkstatus" />
+        <map:transform type="encodeURL"/>
+        <map:transform src="resources/stylesheets/linkstatus-google_sitemap.xsl">
+<!--
              TODO: is this the correct place to replace strings 
              fromBaseURI(potentially http://localhost:8080/) WITH 
              toBaseURI (like http://www.discountdracula.com) 
              Could it be done in a prior step?
              This is necessary for 1) generating a static site, other cases?
            -->
-           <map:parameter name="request-root" value="{request:scheme}://{request:serverName}:{request:serverPort}/"/>
-	         <map:parameter name="site-root" value="{conf:project-url}"/>                                                       
-         </map:transform>
-	       <map:serialize type="xml" />
-       </map:match>
-
-       <map:match pattern="google-sitemap.rss.xml">
-         <map:generate src="cocoon://linkstatus" />
-         <map:transform type="encodeURL"/>
-         <map:transform src="resources/stylesheets/linkstatus-google_sitemap_rss.xsl">
-           <!--
+          <map:parameter name="request-root" value="{request:scheme}://{request:serverName}:{request:serverPort}/"/>
+          <map:parameter name="site-root" value="{conf:project-url}"/>
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+      <map:match pattern="google-sitemap.rss.xml">
+        <map:generate src="cocoon://linkstatus" />
+        <map:transform type="encodeURL"/>
+        <map:transform src="resources/stylesheets/linkstatus-google_sitemap_rss.xsl">
+<!--
              TODO: is this the correct place to replace strings 
              fromBaseURI(potentially http://localhost:8080/) WITH 
              toBaseURI (like http://www.discountdracula.com)
              Could it be done in a prior step?
              This is necessary for 1) generating a static site, other cases?
            -->
-                 <map:parameter name="request-root" value="{request:scheme}://{request:serverName}:{request:serverPort}/"/>
-           <map:parameter name="site-root" value="{conf:project-url}"/>                                                       
-         </map:transform>
-         <map:serialize type="xml" />
-       </map:match>
-
-       
-     </map:pipeline>
-    
-      <!-- 
+          <map:parameter name="request-root" value="{request:scheme}://{request:serverName}:{request:serverPort}/"/>
+          <map:parameter name="site-root" value="{conf:project-url}"/>
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+<!-- 
          This is the user pipeline, that can answer requests instead
          of the Forrest one, or let requests pass through.
          To take over the rendering of a file it must match the file name and path.
@@ -355,56 +312,49 @@
          Forrest the same filename but ending with xml, and a DTD that Forrest
          recognizes.
       -->
-      <map:pipeline internal-only="false">
-           <map:select type="exists">
-             <map:when test="{properties:sitemap}">
-               <map:mount uri-prefix="" 
+    <map:pipeline internal-only="false">
+      <map:select type="exists">
+        <map:when test="{properties:sitemap}">
+          <map:mount uri-prefix="" 
                           src="{properties:sitemap}" 
                           check-reload="yes" 
                           pass-through="true"/>
-             </map:when>  
-           </map:select>
-      </map:pipeline>     
-      
-    
-      
-      <map:pipeline internal-only="false">
-         <map:match pattern="skinconf.xml">
-           <map:generate src="{properties:skinconf}" />
-           <map:transform src="{forrest:forrest.stylesheets}/strip-doctype.xsl"/>
-           <map:transform src="{forrest:forrest.stylesheets}/upgrade-skinconf.xsl"/>
-           <map:select type="exists">
-             <map:when test="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl">
-               <map:transform src="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl"/>
-             </map:when>
-           </map:select>
-           <map:select type="exists">
-             <map:when test="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl">
-               <map:transform src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl"/>
-             </map:when>
-           </map:select>
-           <map:transform src="{forrest:forrest.context}/skins/common/skinconf.xsl"/>
-           <map:transform type="skinconf"/>
-           <map:serialize type="xml" />
-         </map:match>
-
-         <!-- Add some build information, which is added to the html head -->
-         <map:match pattern="build-info">
-           <map:generate src="{properties:temp-dir}/build-info.xml"/>
-           <map:serialize type="xml"/>
-         </map:match>
-       </map:pipeline>
-       
+        </map:when>
+      </map:select>
+    </map:pipeline>
     <map:pipeline internal-only="false">
-      <!-- ============================================================ -->
-      <!-- SOURCE FORMATS                                               -->
-      <!--                 Raw XML sources, typically doc-v12 format    -->
-      <!-- ============================================================ -->
-      <!-- http://forrest.apache.org/docs/sitemap-ref.html#source_pipelines -->
-     
-      <!-- Body content -->
+      <map:match pattern="skinconf.xml">
+        <map:generate src="{properties:skinconf}" />
+        <map:transform src="{forrest:forrest.stylesheets}/strip-doctype.xsl"/>
+        <map:transform src="{forrest:forrest.stylesheets}/upgrade-skinconf.xsl"/>
+        <map:select type="exists">
+          <map:when test="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl">
+            <map:transform src="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl"/>
+          </map:when>
+        </map:select>
+        <map:select type="exists">
+          <map:when test="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl">
+            <map:transform src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl"/>
+          </map:when>
+        </map:select>
+        <map:transform src="{forrest:forrest.context}/skins/common/skinconf.xsl"/>
+        <map:transform type="skinconf"/>
+        <map:serialize type="xml" />
+      </map:match>
+<!-- Add some build information, which is added to the html head -->
+      <map:match pattern="build-info">
+        <map:generate src="{properties:temp-dir}/build-info.xml"/>
+        <map:serialize type="xml"/>
+      </map:match>
+    </map:pipeline>
+    <map:pipeline internal-only="false">
+<!-- ============================================================ -->
+<!-- SOURCE FORMATS                                               -->
+<!--                 Raw XML sources, typically doc-v12 format    -->
+<!-- ============================================================ -->
+<!-- http://forrest.apache.org/docs/sitemap-ref.html#source_pipelines -->
+<!-- Body content -->
       <map:match pattern="**.xml">
-
         <map:match pattern="pluginDocs/plugins_*/index.xml">
           <map:aggregate element="pluginList">
             <map:part src="{forrest:forrest.plugins-src}/plugins.xml"/>
@@ -413,59 +363,46 @@
           <map:transform src="{forrest:forrest.stylesheets}/plugins2xdoc.xsl"/>
           <map:serialize type="xml"/>
         </map:match>
-
         <map:match pattern="linkmap.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/linkmap.xmap" check-reload="yes" />
         </map:match>
-
         <map:match pattern="forrest-issues.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/issues.xmap" check-reload="yes" />
         </map:match>
-
         <map:match pattern="**faq.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/faq.xmap" check-reload="yes" />
         </map:match>
-
         <map:match pattern="community/**index.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/forrest.xmap" check-reload="yes" />
         </map:match>
-
         <map:match pattern="community/*/**.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/revisions.xmap" check-reload="yes" />
         </map:match>
-
-        <!-- wholesite is preferred; site is here for compatibility -->
+<!-- wholesite is preferred; site is here for compatibility -->
         <map:match pattern="wholesite.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
         <map:match pattern="site.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
-
-        <!-- Lucene index update and search -->
+<!-- Lucene index update and search -->
         <map:match pattern="lucene-*.xml">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/search.xmap" check-reload="yes"/>
         </map:match>
-
-        <!-- Default source types -->
+<!-- Default source types -->
         <map:mount uri-prefix="" src="{forrest:forrest.context}/forrest.xmap" check-reload="yes" />
-
       </map:match>
-
-      <!-- Menu content -->
+<!-- Menu content -->
       <map:match pattern="abs-menulinks">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/menu.xmap" check-reload="yes" />
       </map:match>
-
       <map:match pattern="**menulinks-*">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/menu.xmap" check-reload="yes" />
       </map:match>
-
-      <!-- Link maps -->
+<!-- Link maps -->
       <map:match pattern="abs-linkmap">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/linkmap.xmap"/>
       </map:match>
-
       <map:match pattern="**linkmap-*">
         <map:match pattern="linkmap-wholesite.*">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
@@ -473,28 +410,21 @@
         <map:match pattern="linkmap-site.*">
           <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
-
         <map:mount uri-prefix="" src="{forrest:forrest.context}/linkmap.xmap" check-reload="yes" />
       </map:match>
-
     </map:pipeline>
-
-
-    <!-- ============================================================ -->
-    <!-- INTERMEDIATE FORMATS                                         -->
-    <!--                          Tabs, menus and body HTML.          -->
-    <!--                       Called from output format pipelines    -->
-    <!-- ============================================================ -->
-    <!-- http://forrest.apache.org/docs/sitemap-ref.html#intermediate_pipelines -->
-
+<!-- ============================================================ -->
+<!-- INTERMEDIATE FORMATS                                         -->
+<!--                          Tabs, menus and body HTML.          -->
+<!--                       Called from output format pipelines    -->
+<!-- ============================================================ -->
+<!-- http://forrest.apache.org/docs/sitemap-ref.html#intermediate_pipelines -->
     <map:pipeline internal-only="false">
-
-      <!-- External matches -->
-      <!-- (HTML rendered directly from special formats) -->
+<!-- External matches -->
+<!-- (HTML rendered directly from special formats) -->
       <map:match pattern="**body-faq.html">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/faq.xmap" check-reload="yes" />
       </map:match>
-
       <map:match pattern="**body-*.html">
         <map:select type="exists">
           <map:when test="{properties:content.xdocs}{1}{2}.ehtml">
@@ -506,9 +436,8 @@
           </map:when>
         </map:select>
       </map:match>
-
-      <!-- Default matches -->
-      <!-- (HTML rendered from doc-v11 intermediate format -->
+<!-- Default matches -->
+<!-- (HTML rendered from doc-v11 intermediate format -->
       <map:match pattern="**body-*.html">
         <map:generate src="cocoon:/{1}{2}.xml"/>
         <map:transform type="idgen"/>
@@ -521,7 +450,6 @@
           <map:parameter name="notoc" value="false"/>
         </map:call>
       </map:match>
-
       <map:match pattern="**menu-*.html">
         <map:generate src="cocoon:/{1}book-{2}.html"/>
         <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
@@ -531,29 +459,21 @@
           <map:parameter name="path" value="{1}{2}.html"/>
         </map:call>
       </map:match>
-
       <map:match pattern="**tab-*.html">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/tabs.xmap" check-reload="yes" />
       </map:match>
-      
       <map:match pattern="**i18n-*.html">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/i18n.xmap" check-reload="yes" />
       </map:match>
-
       <map:match pattern="**book-*.html">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/menu.xmap" check-reload="yes" />
       </map:match>
-
     </map:pipeline>
-
-    <!-- ============================================================ -->
-    <!-- OUTPUT FORMATS                                               -->
-    <!--                  Serves content directly to the user         -->
-    <!-- +==========================================================+ -->
-    <!-- http://forrest.apache.org/docs/sitemap-ref.html#output_pipelines -->
-
-    
-
+<!-- ============================================================ -->
+<!-- OUTPUT FORMATS                                               -->
+<!--                  Serves content directly to the user         -->
+<!-- +==========================================================+ -->
+<!-- http://forrest.apache.org/docs/sitemap-ref.html#output_pipelines -->
     <map:pipeline internal-only="false">
 <!--pipeline that "marries" the docs in the root dir with the skin to produce html-->
       <map:match pattern="*.html">
@@ -564,12 +484,11 @@
           <map:part src="cocoon:/menu-{0}"/>
           <map:part src="cocoon:/body-{0}"/>
         </map:aggregate>
-        
         <map:call resource="skinit">
           <map:parameter name="type" value="ransform.site.xhtml"/>
           <map:parameter name="path" value="{0}"/>
         </map:call>
-      </map:match>         
+      </map:match>
 <!--pipeline that "marries" the docs in all other dirs then root with the skin to produce html-->
       <map:match pattern="**/*.html">
         <map:aggregate element="site">
@@ -584,21 +503,18 @@
           <map:parameter name="path" value="{0}"/>
         </map:call>
       </map:match>
-
       <map:match type="regexp" pattern="^.+$">
         <map:select type="exists">
           <map:when test="{properties:content.xdocs}/{0}">
             <map:mount uri-prefix="" src="{forrest:forrest.context}/raw.xmap" check-reload="yes" />
           </map:when>
         </map:select>
-      </map:match>      
-
-      <!-- generate faq.fo specially  -->
+      </map:match>
+<!-- generate faq.fo specially  -->
       <map:match pattern="**faq.fo">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/faq.xmap" check-reload="yes" />
       </map:match>
-
-      <!-- generate .fo from .xml  -->
+<!-- generate .fo from .xml  -->
       <map:match type="regexp" pattern="^(.*?)([^/]*).fo$">
         <map:select type="exists">
           <map:when test="{properties:content.xdocs}{1}{2}.fo">
@@ -609,7 +525,7 @@
               <map:part src="cocoon:/skinconf.xml"/>
               <map:part src="cocoon:/{1}{2}.xml"/>
             </map:aggregate>
-            <!-- <map:transform type="idgen"/> -->
+<!-- <map:transform type="idgen"/> -->
             <map:transform type="xinclude"/>
             <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.fo"/>
             <map:select type="exists">
@@ -632,21 +548,16 @@
                 </map:transform>
               </map:otherwise>
             </map:select>
-        </map:otherwise>
-      </map:select>
+          </map:otherwise>
+        </map:select>
         <map:serialize type="xml"/>
       </map:match>
-
       <map:match pattern="profiler">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/profiler.xmap" check-reload="yes" />
       </map:match>
-
       <map:match pattern="**.lucene">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/search.xmap" check-reload="yes" />
-      </map:match> 
-
-     
-      
+      </map:match>
       <map:match pattern="**.js">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match>
@@ -659,26 +570,20 @@
       <map:match pattern="**.png">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match>
-     <map:match pattern="**.ico">
+      <map:match pattern="**.ico">
         <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
-      </map:match> 
+      </map:match>
     </map:pipeline>
-
-
-
-    <!-- ============================================================ -->
-    <!-- REDIRECTS                                                    -->
-    <!-- ============================================================ -->
+<!-- ============================================================ -->
+<!-- REDIRECTS                                                    -->
+<!-- ============================================================ -->
     <map:pipeline internal-only="false">
-
       <map:match pattern="">
         <map:redirect-to uri="index.html" />
       </map:match>
       <map:match type="regexp" pattern="^.+/$">
-          <map:redirect-to uri="index.html"/>
+        <map:redirect-to uri="index.html"/>
       </map:match>
     </map:pipeline>
-
-  
-     </map:pipelines>
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap.xsl Mon Apr  9 22:45:15 2007
@@ -17,52 +17,43 @@
 -->
 <!--the input for this stylesheet is the Cocoon LinkStatusGenerator XML output-->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:java="java" exclude-result-prefixes="java">
-	<xsl:output method="xml" indent="yes" />
-	<xsl:param name="request-root"/>
-	<xsl:param name="site-root"/>
-	<xsl:variable name="ns.uri.google-sitemap" value="'http://www.google.com/schemas/sitemap/0.84'"/>
-	
-	<xsl:template match="/">
-	
-		<urlset xmlns="$ns.uri.google-sitemap">
-		
-			<xsl:apply-templates select="//*[boolean(@href)]"/>
-		</urlset>
-	</xsl:template>
-	
-	<xsl:template match="//*[boolean(@href)]">
-		<url>
-			<loc>
-				<xsl:variable name="relativeURI" select="substring-after(@href, $request-root)"/>
-				<xsl:choose>
-					<!--used when generating a static site and the site uri needs to replace the local uri-->
-					<xsl:when test="string-length($site-root) &gt; 1 and $site-root != 'null'">
-						<xsl:value-of select="concat($site-root, $relativeURI)"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@href"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</loc>
-			
-			<!--
+  <xsl:output method="xml" indent="yes" />
+  <xsl:param name="request-root"/>
+  <xsl:param name="site-root"/>
+  <xsl:variable name="ns.uri.google-sitemap" value="'http://www.google.com/schemas/sitemap/0.84'"/>
+  <xsl:template match="/">
+    <urlset xmlns="$ns.uri.google-sitemap">
+      <xsl:apply-templates select="//*[boolean(@href)]"/>
+    </urlset>
+  </xsl:template>
+  <xsl:template match="//*[boolean(@href)]">
+    <url>
+      <loc>
+        <xsl:variable name="relativeURI" select="substring-after(@href, $request-root)"/>
+        <xsl:choose>
+<!--used when generating a static site and the site uri needs to replace the local uri-->
+          <xsl:when test="string-length($site-root) &gt; 1 and $site-root != 'null'">
+            <xsl:value-of select="concat($site-root, $relativeURI)"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="@href"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </loc>
+<!--
 			TODO-Think: below the user needs a means of controlling the advanced google sitemaps options (elements and values)
 			like <changefreq>daily</changefreq>
 			SEE: http://www.google.com/webmasters/sitemaps/docs/en/protocol.html#xmlTagDefinitions 
 			-->
-			<lastmod>
-			<!--
+      <lastmod>
+<!--
 			TODO-Replace: this is obviously a HACK, hopefully one day this will be provided from the LinkStatusGenerator xml ouput
 			which is the input for this stylsheet. We should then take that result and format it as 'yyyy-MM-dd' per Google's specs
 			-->
-				<xsl:value-of select="java:format(java:text.SimpleDateFormat.new('yyyy-MM-dd'), java:util.Date.new())"/>
-			</lastmod>
-			
-		</url>
-	</xsl:template>
-	
-	<!--do nothing with text nodes-->
-	<xsl:template match="*/text()"/>
-
+        <xsl:value-of select="java:format(java:text.SimpleDateFormat.new('yyyy-MM-dd'), java:util.Date.new())"/>
+      </lastmod>
+    </url>
+  </xsl:template>
+<!--do nothing with text nodes-->
+  <xsl:template match="*/text()"/>
 </xsl:stylesheet>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap_rss.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap_rss.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap_rss.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/resources/stylesheets/linkstatus-google_sitemap_rss.xsl Mon Apr  9 22:45:15 2007
@@ -17,51 +17,45 @@
 -->
 <!--the input for this stylesheet is the Cocoon LinkStatusGenerator XML output-->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:java="java" exclude-result-prefixes="java">
-	<xsl:output method="xml" indent="yes" />
-	<xsl:param name="request-root"/>
-	<xsl:param name="site-root"/>
-	<xsl:variable name="version.rss" select="'2.0'"/>
-	
-	<xsl:template match="/">
-		<rss version="$version.rss">
-			<channel>
-				<!--TODO: these need to be configurable-->
-				<title>Sitemap For a Site Built with Forrest</title>
-				<link><xsl:value-of select="$site-root"/></link>
-				<description>Sitemap file in RSS format for an Apache Forrest Site</description>
-				<xsl:apply-templates select="//*[boolean(@href)]"/>
-			</channel>
-		</rss>
-	</xsl:template>
-	
-	<xsl:template match="//*[boolean(@href)]">
-		<item>
-			<link>
-				<xsl:variable name="relativeURI" select="substring-after(@href, $request-root)"/>
-				<xsl:choose>
-					<!--used when generating a static site and the site uri needs to replace the local uri-->
-					<xsl:when test="string-length($site-root) &gt; 1 and $site-root != 'null'">
-						<xsl:value-of select="concat($site-root, $relativeURI)"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@href"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</link>
-			
-			<pubDate>
-			<!--
+  <xsl:output method="xml" indent="yes" />
+  <xsl:param name="request-root"/>
+  <xsl:param name="site-root"/>
+  <xsl:variable name="version.rss" select="'2.0'"/>
+  <xsl:template match="/">
+    <rss version="$version.rss">
+      <channel>
+<!--TODO: these need to be configurable-->
+        <title>Sitemap For a Site Built with Forrest</title><link>
+        <xsl:value-of select="$site-root"/></link>
+        <description>
+          Sitemap file in RSS format for an Apache Forrest Site
+        </description>
+        <xsl:apply-templates select="//*[boolean(@href)]"/>
+      </channel>
+    </rss>
+  </xsl:template>
+  <xsl:template match="//*[boolean(@href)]">
+    <item><link>
+      <xsl:variable name="relativeURI" select="substring-after(@href, $request-root)"/>
+      <xsl:choose>
+<!--used when generating a static site and the site uri needs to replace the local uri-->
+        <xsl:when test="string-length($site-root) &gt; 1 and $site-root != 'null'">
+          <xsl:value-of select="concat($site-root, $relativeURI)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@href"/>
+        </xsl:otherwise>
+      </xsl:choose></link>
+      <pubDate>
+<!--
 			TODO-Replace: this is obviously a HACK, hopefully one day this will be provided from the LinkStatusGenerator xml ouput
 			which is the input for this stylsheet. We should then take that result and format it like 'Sun, 19 May 2002 15:21:36 GMT'
 			per the RSS spec for the "pubDate" element
 			-->
-				<xsl:value-of select="java:util.Date.new()"/>
-			</pubDate>
-		</item>
-	</xsl:template>
-	
-	<!--do nothing with text nodes-->
-	<xsl:template match="*/text()"/>
-
+        <xsl:value-of select="java:util.Date.new()"/>
+      </pubDate>
+    </item>
+  </xsl:template>
+<!--do nothing with text nodes-->
+  <xsl:template match="*/text()"/>
 </xsl:stylesheet>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -17,26 +17,22 @@
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
-	<header>
-		<title>Google Sitemap plugin for Apache Forrest</title>
-	</header>
-	<body>
-		<section>
-			<title>Welcome to the Google Sitemap plugin for Apache Forrest website</title>
-			<p>
-		This a simple internal plugin which allows users to access a list of pages (currently crawling only
-		*.html and *.xml pages), in google sitemap format, contained in their site linkmap.html by the 
-		calling the top-level pages:
-		</p>
-			<ul>
-				<li>
-				  <a href="google-sitemap.xml">google-sitemap.xml</a>
-				</li>
-				
-				<li>
-				  <a href="google-sitemap.rss.xml">google-sitemap.rss.xml</a>
-				</li>
-			</ul>
-		</section>
-	</body>
-</document>
\ No newline at end of file
+  <header>
+    <title>Google Sitemap plugin for Apache Forrest</title>
+  </header>
+  <body>
+    <section>
+      <title>Welcome to the Google Sitemap plugin for Apache Forrest website</title>
+      <p>
+        This a simple internal plugin which allows users to access a list of
+        pages (currently crawling only *.html and *.xml pages), in google
+        sitemap format, contained in their site linkmap.html by the calling the
+        top-level pages:
+      </p>
+      <ul>
+        <li><a href="google-sitemap.xml">google-sitemap.xml</a></li>
+        <li><a href="google-sitemap.rss.xml">google-sitemap.rss.xml</a></li>
+      </ul>
+    </section>
+  </body>
+</document>



Mime
View raw message