forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526999 [1/2] - /forrest/trunk/main/webapp/
Date Tue, 10 Apr 2007 02:21:49 GMT
Author: crossley
Date: Mon Apr  9 19:21:46 2007
New Revision: 526999

URL: http://svn.apache.org/viewvc?view=rev&rev=526999
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/webapp/aggregate.xmap
    forrest/trunk/main/webapp/faq.xmap
    forrest/trunk/main/webapp/forrest.xmap
    forrest/trunk/main/webapp/i18n.xmap
    forrest/trunk/main/webapp/jettyconf.xml
    forrest/trunk/main/webapp/linkmap.xmap
    forrest/trunk/main/webapp/locationmap-chaperon.xml
    forrest/trunk/main/webapp/locationmap-i18n.xml
    forrest/trunk/main/webapp/locationmap-plugin.xml
    forrest/trunk/main/webapp/locationmap-skinconf.xml
    forrest/trunk/main/webapp/locationmap-skins.xml
    forrest/trunk/main/webapp/locationmap-transforms.xml
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/menu.xmap
    forrest/trunk/main/webapp/plugins.xmap
    forrest/trunk/main/webapp/profiler.xmap
    forrest/trunk/main/webapp/raw.xmap
    forrest/trunk/main/webapp/resources.xmap
    forrest/trunk/main/webapp/revisions.xmap
    forrest/trunk/main/webapp/search.xmap
    forrest/trunk/main/webapp/sitemap.xmap
    forrest/trunk/main/webapp/tabs.xmap
    forrest/trunk/main/webapp/wiring.xml

Modified: forrest/trunk/main/webapp/aggregate.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/aggregate.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/aggregate.xmap (original)
+++ forrest/trunk/main/webapp/aggregate.xmap Mon Apr  9 19:21:46 2007
@@ -33,7 +33,6 @@
 
 $Revision: 1.2 $
 ==================================================== -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file"/>
@@ -43,10 +42,9 @@
     </map:transformers>
     <map:matchers default="wildcard"/>
   </map:components>
-
   <map:pipelines>
     <map:pipeline>
-      <!-- Aggregation of all XML in the site -->
+<!-- Aggregation of all XML in the site -->
       <map:match pattern="*.xml">
         <map:generate src="cocoon://abs-linkmap"/>
         <map:transform src="{lm:transform.site.book}" />
@@ -59,24 +57,16 @@
         <map:transform src="{lm:transform-aggregate.docs.document}"/>
         <map:serialize type="xml"/>
       </map:match>
-
-
-      <!-- Special linkmap for pages containing aggregated content.  Links to aggregated content should be internal
+<!-- Special linkmap for pages containing aggregated content.  Links to aggregated content should be internal
       (fragment identifiers), and other links should be regular hrefs.  The 'split' between these two types is decided
       by the stylesheet. -->
-
       <map:match pattern="linkmap-*.*">
         <map:generate src="cocoon://abs-linkmap" />
-
         <map:transform src="{lm:transform-aggregate.linkmap.relativized-linkmap}">
           <map:parameter name="path" value="{1}.{2}" />
         </map:transform>
         <map:serialize type="xml"/>
       </map:match>
-
-
     </map:pipeline>
-
-
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/faq.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/faq.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/faq.xmap (original)
+++ forrest/trunk/main/webapp/faq.xmap Mon Apr  9 19:21:46 2007
@@ -29,8 +29,6 @@
 
 $Revision: 1.5 $
 ==================================================== -->
-
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file"/>
@@ -59,12 +57,10 @@
         </sourcetype>
       </map:action>
     </map:actions>
-
     <map:selectors>
       <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
     </map:selectors>
   </map:components>
-
   <map:resources>
     <map:resource name="transform-to-document">
       <map:act type="sourcetype" src="{src}">
@@ -96,11 +92,10 @@
       </map:act>
       <map:transform type="idgen" />
     </map:resource>
-
     <map:resource name="skinit">
       <map:transform src="{lm:{type}}">
         <map:parameter name="notoc" value="{notoc}"/>
-        <!-- For backwards-compat with 0.2 - 0.4 skins -->
+<!-- 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}"/>
@@ -108,37 +103,32 @@
       </map:transform>
       <map:serialize/>
     </map:resource>
-
   </map:resources>
-
-
   <map:pipelines>
-      <map:pipeline internal-only="false">
-         <map:match pattern="skinconf.xml">
-           <map:generate src="{lm:project.skinconf}" />
-           <map:transform src="{lm:transform.old-skinconf.new-skinconf}"/>
-           <map:select type="exists">
-             <map:when test="{lm:project-skinconf.xsl}">
-               <map:transform src="{lm:project-skinconf.xsl}"/>
-             </map:when>
-           </map:select>
-           <map:select type="exists">
-             <map:when test="{lm:forrest-skinconf.xsl}">
-               <map:transform src="{lm:forrest-skinconf.xsl}"/>
-             </map:when>
-           </map:select>
-           <map:transform src="{lm:common-skinconf.xsl}"/>
-           <map:transform type="skinconf"/>
-           <map:serialize type="xml" />
-         </map:match>
-       </map:pipeline>
+    <map:pipeline internal-only="false">
+      <map:match pattern="skinconf.xml">
+        <map:generate src="{lm:project.skinconf}" />
+        <map:transform src="{lm:transform.old-skinconf.new-skinconf}"/>
+        <map:select type="exists">
+          <map:when test="{lm:project-skinconf.xsl}">
+            <map:transform src="{lm:project-skinconf.xsl}"/>
+          </map:when>
+        </map:select>
+        <map:select type="exists">
+          <map:when test="{lm:forrest-skinconf.xsl}">
+            <map:transform src="{lm:forrest-skinconf.xsl}"/>
+          </map:when>
+        </map:select>
+        <map:transform src="{lm:common-skinconf.xsl}"/>
+        <map:transform type="skinconf"/>
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
     <map:pipeline>
-
-      <!-- ============================================================ -->
-      <!-- OUTPUT FORMATS                                               -->
-      <!-- ============================================================ -->
-
-      <!-- Special matcher for FAQ PDFs, so we can pass an extra
+<!-- ============================================================ -->
+<!-- OUTPUT FORMATS                                               -->
+<!-- ============================================================ -->
+<!-- Special matcher for FAQ PDFs, so we can pass an extra
       'numbersections' param into document-to-fo.xsl -->
       <map:match pattern="**.fo">
         <map:aggregate element="site">
@@ -149,18 +139,16 @@
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.pdf"/>
         <map:transform src="{lm:transform.html.broken-links}" />
         <map:transform src="{lm:transform.document.fo}">
-           <map:parameter name="numbersections" value="false"/>
+          <map:parameter name="numbersections" value="false"/>
           <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
           <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
         </map:transform>
         <map:serialize type="xml"/>
       </map:match>
-
-      <!-- ============================================================ -->
-      <!-- INTERMEDIATE FORMATS                                         -->
-      <!-- ============================================================ -->
-
-      <!--Unfortunately we need to override all the document2html stuff too,
+<!-- ============================================================ -->
+<!-- INTERMEDIATE FORMATS                                         -->
+<!-- ============================================================ -->
+<!--Unfortunately we need to override all the document2html stuff too,
       since notoc must be set to true. -->
       <map:match pattern="**body-*.html">
         <map:generate src="cocoon:/{1}{2}.xml"/>
@@ -173,12 +161,9 @@
           <map:parameter name="notoc" value="true"/>
         </map:call>
       </map:match>
-
-
-      <!-- ============================================================ -->
-      <!-- SOURCE FORMATS                                               -->
-      <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- SOURCE FORMATS                                               -->
+<!-- ============================================================ -->
       <map:match pattern="**.xml">
         <map:generate type="file" src="{lm:project.{0}}" />
         <map:call resource="transform-to-document">
@@ -186,7 +171,6 @@
         </map:call>
         <map:serialize type="xml"/>
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/forrest.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap (original)
+++ forrest/trunk/main/webapp/forrest.xmap Mon Apr  9 19:21:46 2007
@@ -34,7 +34,6 @@
 
 $Revision: 1.8 $
 ==================================================== -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:actions>
@@ -99,39 +98,33 @@
       </map:action>
     </map:actions>
     <map:selectors default="parameter">
-	  <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
-   <map:selector logger="sitemap.selector.exception" name="exception"
+      <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
+      <map:selector logger="sitemap.selector.exception" name="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>
+        <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
+        <exception class="java.lang.Throwable" unroll="true"/>
+      </map:selector>
       <map:selector logger="sitemap.selector.config" name="config" src="org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
   </map:components>
-
   <map:resources>
     <map:resource name="transform-to-document">
       <map:act type="sourcetype" src="{src}">
         <map:select type="parameter">
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
-
           <map:when test="document-v10">
-          <!-- FIXME (JJP):  This should use the v12 now-->
+<!-- FIXME (JJP):  This should use the v12 now-->
             <map:transform src="{lm:transform.docv10.docv11}" />
           </map:when>
-
           <map:when test="document-v20a">
             <map:transform src="{lm:transform.docv20.docv12}" />
           </map:when>
-
           <map:when test="document-v20">
             <map:transform src="{lm:transform.docv20.docv13}" />
           </map:when>
-
           <map:when test="howto-v10">
             <map:transform src="{lm:transform.howto.document}" />
           </map:when>
-
           <map:when test="howto-v11">
             <map:transform src="{lm:transform.howto.document}" />
           </map:when>
@@ -145,44 +138,34 @@
             <map:transform src="{lm:transform.howto.document}" />
             <map:transform src="{lm:transform.docv20.docv13}" />
           </map:when>
-
           <map:when test="todo-v10">
             <map:transform src="{lm:transform.todo.document}" />
           </map:when>
-
           <map:when test="todo-v11">
             <map:transform src="{lm:transform.todo.document}" />
           </map:when>
-
           <map:when test="todo-v12">
             <map:transform src="{lm:transform.todo.document}" />
           </map:when>
-
           <map:when test="todo-v13">
             <map:transform src="{lm:transform.todo.document}" />
           </map:when>
-
           <map:when test="todo-v20">
             <map:transform src="{lm:transform.todo.document}" />
           </map:when>
-
           <map:when test="changes-v10">
             <map:transform src="{lm:transform.changesv10.changesv11}" />
             <map:transform src="{lm:transform.changesv.document}" />
           </map:when>
-
           <map:when test="changes-v11">
             <map:transform src="{lm:transform.changesv.document}" />
           </map:when>
-
           <map:when test="changes-v12">
             <map:transform src="{lm:transform.changesv.document}" />
           </map:when>
-
           <map:when test="changes-v13">
             <map:transform src="{lm:transform.changesv.document}" />
           </map:when>
-
           <map:when test="changes-v20">
             <map:transform src="{lm:transform.changesv.document}" />
           </map:when>
@@ -191,14 +174,11 @@
       </map:act>
     </map:resource>
   </map:resources>
-
   <map:pipelines>
     <map:pipeline>
-
-      <!-- ============================================================ -->
-      <!-- INTERMEDIATE FORMATS                                         -->
-      <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- INTERMEDIATE FORMATS                                         -->
+<!-- ============================================================ -->
       <map:match pattern="**body-*.html">
         <map:select type="exists">
           <map:when test="{lm:project.{1}{2}.ehtml}">
@@ -208,66 +188,60 @@
           </map:when>
         </map:select>
       </map:match>
-
-      <!-- ============================================================ -->
-      <!-- SOURCE FORMATS                                               -->
-      <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- SOURCE FORMATS                                               -->
+<!-- ============================================================ -->
       <map:match type="wildcard" pattern="**.xml">
-       <map:select type="exists">
-         <map:when test="{lm:plugin.xmap.input}">
-             <map:mount uri-prefix=""
+        <map:select type="exists">
+          <map:when test="{lm:plugin.xmap.input}">
+            <map:mount uri-prefix=""
                         src="{lm:plugin.xmap.input}"
                         check-reload="yes"
                         pass-through="true"/>
-         </map:when> 
-       </map:select>
-       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.xml">
+          </map:when>
+        </map:select>
+        <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.xml">
           <map:generate src="{source}" />
           <map:call resource="transform-to-document">
             <map:parameter name="src" value="{source}" />
           </map:call>
           <map:serialize type="xml-document"/>
-       </map:match>
-       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.ihtml">
-         <map:generate src="{source}" type="html" />
-         <map:transform src="{lm:transform.html.document}" />
-         <map:transform type="idgen" />
-         <map:serialize type="xml-document"/>
-       </map:match>
-       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.html">
-         <map:generate src="{source}" type="html" />
-         <map:transform src="{lm:transform.html.document}" />
-         <map:serialize type="xml-document"/>
-       </map:match>
-       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.txt">
-         <map:generate type="text2xml" src="{source}" />
-         <map:transform src="{lm:transform.text.document}">
-         <map:parameter name="filename" value="{2}" />
-         </map:transform>
-         <map:serialize type="xml-document"/>
-       </map:match>
-       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.xml">
+        </map:match>
+        <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.ihtml">
+          <map:generate src="{source}" type="html" />
+          <map:transform src="{lm:transform.html.document}" />
+          <map:transform type="idgen" />
+          <map:serialize type="xml-document"/>
+        </map:match>
+        <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.html">
+          <map:generate src="{source}" type="html" />
+          <map:transform src="{lm:transform.html.document}" />
+          <map:serialize type="xml-document"/>
+        </map:match>
+        <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.txt">
+          <map:generate type="text2xml" src="{source}" />
+          <map:transform src="{lm:transform.text.document}">
+            <map:parameter name="filename" value="{2}" />
+          </map:transform>
+          <map:serialize type="xml-document"/>
+        </map:match>
+        <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.xml">
           <map:generate src="{source}" />
           <map:call resource="transform-to-document">
             <map:parameter name="src" value="{source}" />
           </map:call>
           <map:serialize type="xml-document"/>
-       </map:match>
-       
-       <!-- if we got this far asking for the source.xml then it must be an XDoc -->
-       <map:match pattern="**.source.xml">
-         <map:generate src="cocoon:/{1}.xml"/>
-         <map:serialize type="xml"/>
-       </map:match>
-       
-       <map:match pattern="**.xml">
-         <map:generate src="{lm:project.{0}}"/>
-         <map:serialize type="xml"/>
-       </map:match>
-     </map:match>
-      
-  </map:pipeline>
-
+        </map:match>
+<!-- if we got this far asking for the source.xml then it must be an XDoc -->
+        <map:match pattern="**.source.xml">
+          <map:generate src="cocoon:/{1}.xml"/>
+          <map:serialize type="xml"/>
+        </map:match>
+        <map:match pattern="**.xml">
+          <map:generate src="{lm:project.{0}}"/>
+          <map:serialize type="xml"/>
+        </map:match>
+      </map:match>
+    </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/i18n.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/i18n.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/i18n.xmap (original)
+++ forrest/trunk/main/webapp/i18n.xmap Mon Apr  9 19:21:46 2007
@@ -34,25 +34,24 @@
         </catalogues>
       </map:transformer>
     </map:transformers>
-  </map:components> 
-
+  </map:components>
   <map:pipelines>
     <map:pipeline>
       <map:act type="locale" >
-      <map:match pattern="**i18n-*.*">
-      <map:generate type="directory" src="{properties:content.xdocs}{1}">
-        <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
-        <map:parameter name="include" value="^{2}" />
-        <map:parameter name="exclude" value="^{2}\.|{2}.{../language}" />
-      </map:generate>
-      <map:transform src="{lm:directory.i18n}">
-        <map:parameter name="ext"    value="{3}" />
-      </map:transform>
-      <map:transform type="i18n">
-        <map:parameter name="locale" value="{../locale}"/>
-      </map:transform>
-      <map:serialize />
-      </map:match>
+        <map:match pattern="**i18n-*.*">
+          <map:generate type="directory" src="{properties:content.xdocs}{1}">
+            <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
+            <map:parameter name="include" value="^{2}" />
+            <map:parameter name="exclude" value="^{2}\.|{2}.{../language}" />
+          </map:generate>
+          <map:transform src="{lm:directory.i18n}">
+            <map:parameter name="ext"    value="{3}" />
+          </map:transform>
+          <map:transform type="i18n">
+            <map:parameter name="locale" value="{../locale}"/>
+          </map:transform>
+          <map:serialize />
+        </map:match>
       </map:act>
     </map:pipeline>
   </map:pipelines>

Modified: forrest/trunk/main/webapp/jettyconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/jettyconf.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/jettyconf.xml (original)
+++ forrest/trunk/main/webapp/jettyconf.xml Mon Apr  9 19:21:46 2007
@@ -1,27 +1,23 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
-
-
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
 <!-- =============================================================== -->
-
 <Configure class="org.mortbay.jetty.Server">
-
-  <!-- =============================================================== -->
-  <!-- Configure the Request Listeners                                 -->
-  <!-- =============================================================== -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a HTTP listener to port 8888                  -->
-  <!-- The default port can also be changed using:                     -->
-  <!--     forrest run -Dforrest.jvmargs="-Djetty.port=80"             -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- =============================================================== -->
+<!-- Configure the Request Listeners                                 -->
+<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add and configure a HTTP listener to port 8888                  -->
+<!-- The default port can also be changed using:                     -->
+<!--     forrest run -Dforrest.jvmargs="-Djetty.port=80"             -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <Call name="addListener">
     <Arg>
       <New class="org.mortbay.http.SocketListener">
-        <Set name="Port"><SystemProperty name="jetty.port" default="8888"/></Set>
+        <Set name="Port">
+          <SystemProperty name="jetty.port" default="8888"/>
+        </Set>
         <Set name="MinThreads">5</Set>
         <Set name="MaxThreads">100</Set>
         <Set name="MaxIdleTimeMs">30000</Set>
@@ -29,34 +25,27 @@
       </New>
     </Arg>
   </Call>
-
-
-  <!-- =============================================================== -->
-  <!-- Configure the Contexts                                          -->
-  <!-- =============================================================== -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add root context web applications.                              -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the webapps directory.         -->
-  <!-- + No virtual host specified                                     -->
-  <!-- + Look in the webapps directory relative to jetty.home or .     -->
-  <!-- + Use the webdefault.xml resource for the defaults descriptor   -->
-  <!-- + Upack the war file                                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
+<!-- =============================================================== -->
+<!-- Configure the Contexts                                          -->
+<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add root context web applications.                              -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add a all web application within the webapps directory.         -->
+<!-- + No virtual host specified                                     -->
+<!-- + Look in the webapps directory relative to jetty.home or .     -->
+<!-- + Use the webdefault.xml resource for the defaults descriptor   -->
+<!-- + Upack the war file                                            -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <Call name="addWebApplication">
     <Arg>/</Arg>
-    <Arg><!--<SystemProperty name="jetty.home" default="."/>-->.</Arg>
+    <Arg>
+<!--<SystemProperty name="jetty.home" default="."/>-->.</Arg>
   </Call>
-
-  
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Build a context manually.                                  -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Build a context manually.                                  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- 
   <Call name="addContext">
     <Arg>/forrest/*</Arg>
@@ -99,4 +88,3 @@
   </Call>
   -->
 </Configure>
-

Modified: forrest/trunk/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/linkmap.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/linkmap.xmap (original)
+++ forrest/trunk/main/webapp/linkmap.xmap Mon Apr  9 19:21:46 2007
@@ -28,8 +28,6 @@
 
 $Revision: 1.2 $
 ==================================================== -->
-
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file"/>
@@ -37,29 +35,24 @@
     <map:transformers default="xslt"/>
     <map:matchers default="wildcard"/>
   </map:components>
-
   <map:pipelines>
- 
-     <map:pipeline>     
+    <map:pipeline>
       <map:match pattern="linkmap.source.xml">
         <map:generate src="cocoon://linkmap.xml" />
         <map:serialize type="xml" />
       </map:match>
-      
       <map:match pattern="linkmap.xml">
         <map:generate src="cocoon://abs-linkmap" />
-	<map:transform src="{lm:transform.linkmap.document}"/>
+        <map:transform src="{lm:transform.linkmap.document}"/>
         <map:serialize type="xml" />
       </map:match>
-      
-      <!-- site.xml with @href's appended to be context-relative. -->
+<!-- site.xml with @href's appended to be context-relative. -->
       <map:match pattern="abs-linkmap">
         <map:generate src="cocoon://site.navigation.links.xml"/>
-	      <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
+        <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
         <map:serialize type="xml" />
       </map:match>
-
-      <!-- Linkmap for regular pages -->
+<!-- Linkmap for regular pages -->
       <map:match pattern="**linkmap-*">
         <map:generate src="cocoon://abs-linkmap" />
         <map:transform src="{lm:transform.linkmap.linkmap-relativized}">
@@ -68,9 +61,6 @@
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
-
 </map:sitemap>
-

Modified: forrest/trunk/main/webapp/locationmap-chaperon.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-chaperon.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap-chaperon.xml (original)
+++ forrest/trunk/main/webapp/locationmap-chaperon.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for Chaperon -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,33 +24,26 @@
         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>
-  
     <match pattern="chaperon.grammar.*">
-        <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.grm" />
+      <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.grm" />
     </match>
-    
     <match pattern="chaperon.xgrammar.*">
-        <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.xgrm" />
+      <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.xgrm" />
     </match>
-    
     <match pattern="chaperon.lexicon.*">
-        <location src="resources/chaperon/grammars/{1}.xlex"/>
-        <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.xlex" />
+      <location src="resources/chaperon/grammars/{1}.xlex"/>
+      <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.xlex" />
     </match>
-    
     <match pattern="transform.chaperon.grammar.lexicon">
-        <location src="{forrest:forrest.context}/resources/chaperon/stylesheets/grm2xlex.xsl" />
+      <location src="{forrest:forrest.context}/resources/chaperon/stylesheets/grm2xlex.xsl" />
     </match>
-    
     <match pattern="transform.chaperon.*">
-        <location src="{forrest:forrest.context}/resources/chaperon/stylesheets/{1}.xsl" />
+      <location src="{forrest:forrest.context}/resources/chaperon/stylesheets/{1}.xsl" />
     </match>
-    
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/locationmap-i18n.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-i18n.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap-i18n.xml (original)
+++ forrest/trunk/main/webapp/locationmap-i18n.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for i18n files -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,15 +24,13 @@
         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>
-  
     <match pattern="project.translations">
-        <location src="{properties:translations}" />
+      <location src="{properties:translations}" />
     </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/locationmap-plugin.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-plugin.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap-plugin.xml (original)
+++ forrest/trunk/main/webapp/locationmap-plugin.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for plugin files -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,24 +24,19 @@
         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>
-    
     <match pattern="plugin.descriptor.whiteboard">
-        <location src="{forrest:forrest.whiteboard-plugins-src}/whiteboard-plugins.xml" />
+      <location src="{forrest:forrest.whiteboard-plugins-src}/whiteboard-plugins.xml" />
     </match>
-    
     <match pattern="plugin.descriptor.forrest">
-        <location src="{forrest:forrest.plugins-src}/plugins.xml" />
+      <location src="{forrest:forrest.plugins-src}/plugins.xml" />
     </match>
-    
     <match pattern="plugin.xmap.*">
-        <location src="{properties:temp-dir}/{1}.xmap" />
+      <location src="{properties:temp-dir}/{1}.xmap" />
     </match>
-    
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/locationmap-skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skinconf.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skinconf.xml (original)
+++ forrest/trunk/main/webapp/locationmap-skinconf.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for skinconf files -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,28 +24,22 @@
         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>
-  
     <match pattern="project.skinconf">
-        <location src="{properties:skinconf}" />
+      <location src="{properties:skinconf}" />
     </match>
-    
     <match pattern="project-skinconf.xsl">
-        <location src="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl" />
+      <location src="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl" />
     </match>
-    
     <match pattern="forrest-skinconf.xsl">
-        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl" />
+      <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl" />
     </match>
-    
     <match pattern="common-skinconf.xsl">
-        <location src="{forrest:forrest.context}/skins/common/skinconf.xsl" />
+      <location src="{forrest:forrest.context}/skins/common/skinconf.xsl" />
     </match>
-    
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/locationmap-skins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skins.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skins.xml (original)
+++ forrest/trunk/main/webapp/locationmap-skins.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for skinconf files -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher
@@ -31,9 +28,7 @@
           src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-
   <locator>
-
     <match pattern="skin.js.**">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/scripts/{1}.js" />
@@ -41,7 +36,6 @@
         <location src="{forrest:forrest.context}/skins/common/scripts/{1}.js" />
       </select>
     </match>
-
     <match pattern="skin.css.xslt.**">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/css/{1}.css.xslt" />
@@ -49,7 +43,6 @@
         <location src="{forrest:forrest.context}/skins/common/css/{1}.css.xslt" />
       </select>
     </match>
-
     <match pattern="skin.css.**">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/css/{1}.css" />
@@ -57,7 +50,6 @@
         <location src="{forrest:forrest.context}/skins/common/css/{1}.css" />
       </select>
     </match>
-
     <match pattern="skin.images.corner.**.*">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/{1}/{2}.svg.xslt"/>
@@ -65,7 +57,6 @@
         <location src="{forrest:forrest.context}/skins/common/{1}/{2}.svg.xslt"/>
       </select>
     </match>
-
     <match pattern="skin.images.**.*">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/images/{1}.{2}" />

Modified: forrest/trunk/main/webapp/locationmap-transforms.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-transforms.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap-transforms.xml (original)
+++ forrest/trunk/main/webapp/locationmap-transforms.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for transformations -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,17 +24,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>
-    
-    <!-- ================================== -->
-    <!-- skin transforms                    -->
-    <!-- ================================== -->
-    
+<!-- ================================== -->
+<!-- skin transforms                    -->
+<!-- ================================== -->
     <match pattern="transform.*.fo">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/xslt/fo/{1}-to-fo.xsl" />
@@ -45,7 +39,6 @@
         <location src="{forrest:forrest.context}/skins/common/xslt/fo/{1}-to-fo.xsl"/>
       </select>
     </match>
-    
     <match pattern="transform.xdoc.html">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/xslt/html/document-to-html.xsl" />
@@ -53,93 +46,74 @@
         <location src="{forrest:forrest.context}/skins/common/xslt/html/document-to-html.xsl"/>
       </select>
     </match>
-    
-    <!-- ================================== -->
-    <!-- utility transforms                 -->
-    <!-- ================================== -->
+<!-- ================================== -->
+<!-- utility transforms                 -->
+<!-- ================================== -->
     <match pattern="transform.xml.xml-doctype-stripped">
       <location src="{forrest:forrest.stylesheets}/strip-doctype.xsl" />
     </match>
-    
     <match pattern="transform.linkmap.linkmap-absolutized">
       <location src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" />
     </match>
-    
     <match pattern="transform.linkmap.linkmap-normalizedtabs">
       <location src="{forrest:forrest.stylesheets}/site-to-site-normalizetabs.xsl" />
     </match>
-    
     <match pattern="transform.xml.xml-normalizedhrefs">
       <location src="{forrest:forrest.stylesheets}/normalizehrefs.xsl" />
     </match>
-    
     <match pattern="transform.xml.dotdots">
       <location src="{forrest:forrest.stylesheets}/dotdots.xsl" />
     </match>
-    
     <match pattern="transform.xml.pathutils">
       <location src="{forrest:forrest.stylesheets}/pathutils.xsl" />
     </match>
-    
     <match pattern="transform.xml.copyover.helper">
       <location src="{forrest:forrest.stylesheets}/copyover.xsl" />
     </match>
-    
     <match pattern="transform.xml.generateId">
       <location src="{forrest:forrest.stylesheets}/generateId.xsl" />
     </match>
-    
     <match pattern="transform.xml.replaceCharsInString">
       <location src="{forrest:forrest.stylesheets}/replaceCharsInString.xsl" />
     </match>
-    
     <match pattern="transform.xml.extracted-svg">
       <location src="{forrest:forrest.stylesheets}/extract-svg.xsl" />
     </match>
-    
     <match pattern="transform.linkmap.linkmap-selectnode">
       <location src="{forrest:forrest.stylesheets}/site-to-site-selectnode.xsl" />
     </match>
-    
     <match pattern="transform.linkmap.linkmap-relativized">
       <location src="{forrest:forrest.stylesheets}/relativize-linkmap.xsl" />
     </match>
-    
-    <!--
+<!--
       FIXME: strip remaining i18n elements and attributes.
       workaround for http://issues.apache.org/jira/browse/FOR-592
     -->
     <match pattern="transform.xml.xml-i18n-stripped">
       <location src="{forrest:forrest.stylesheets}/strip-i18n-remains.xsl" />
     </match>
-    
-    <!--
+<!--
       FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
     -->
     <match pattern="transform.xml.xml-namespace-stripped">
       <location src="{forrest:forrest.context}/skins/common/xslt/html/strip_namespaces.xsl" />
     </match>
-
     <match pattern="transform.html.broken-links">
       <location src="{forrest:forrest.stylesheets}/declare-broken-site-links.xsl" />
     </match>
-    
-    <!-- ================================== -->
-    <!-- aggregate transforms                 -->
-    <!-- ================================== -->
+<!-- ================================== -->
+<!-- aggregate transforms                 -->
+<!-- ================================== -->
     <match pattern="transform-aggregate.*.*">
       <location src="{forrest:forrest.stylesheets}/aggregates/{1}-to-{2}.xsl" />
     </match>
-    
     <match pattern="transform-aggregate.linkmap.relativized-linkmap">
       <location src="{forrest:forrest.stylesheets}/aggregates/relativize-split-linkmap.xsl" />
     </match>
-    
     <match pattern="transform.old-skinconf.new-skinconf">
       <location src="{forrest:forrest.stylesheets}/upgrade-skinconf.xsl" />
     </match>
-    
-    <!-- All core other transforms -->
+<!-- All core other transforms -->
     <match pattern="transform.*.*">
       <select>
         <location src="{properties:skins-dir}{forrest:forrest.skin}/xslt/html/{1}-to-{2}.xsl" />

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap.xml?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Mon Apr  9 19:21:46 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,17 +24,16 @@
         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>
-    <!-- ================================== -->
-    <!-- Mount project specific locationmap -->
-    <!-- ================================== -->
+<!-- ================================== -->
+<!-- Mount project specific locationmap -->
+<!-- ================================== -->
     <select>
-      <!-- Normally it is discouraged to use the cocoon:
+<!-- Normally it is discouraged to use the cocoon:
       protocol in the locationmap as this provides too much indirection.
       
       However, this is a special case since it allows individual 
@@ -46,62 +42,51 @@
       and we want the site structure to also come from that repository
       -->
       <mount src="cocoon://locationmap-project.xml"/>
-    </select>     
-    
-    <!-- ================================== -->
-    <!-- Mount plugin specific locationmap -->
-    <!-- project files                      -->
-    <!-- ================================== -->
+    </select>
+<!-- ================================== -->
+<!-- Mount plugin specific locationmap -->
+<!-- project files                      -->
+<!-- ================================== -->
     <select>
       <mount src="{properties:temp-dir}/locationmap.xml"/>
     </select>
-    
-    <!-- ================================== -->
-    <!-- Forrest files                      -->
-    <!-- ================================== -->
+<!-- ================================== -->
+<!-- Forrest files                      -->
+<!-- ================================== -->
     <match pattern="forrest.schema.**">
-        <location src="{forrest:forrest.context}/resources/schema/dtd/{1}.dtd" />
+      <location src="{forrest:forrest.context}/resources/schema/dtd/{1}.dtd" />
     </match>
-    
-    <!-- ================================== -->
-    <!-- Mount forrest locationmaps         -->
-    <!-- ================================== -->
+<!-- ================================== -->
+<!-- Mount forrest locationmaps         -->
+<!-- ================================== -->
     <select>
       <mount src="{forrest:forrest.context}/locationmap-transforms.xml"/>
     </select>
-    
     <select>
       <mount src="{forrest:forrest.context}/locationmap-skins.xml"/>
     </select>
-    
     <select>
       <mount src="{forrest:forrest.context}/locationmap-i18n.xml"/>
     </select>
-
     <select>
       <mount src="{forrest:forrest.context}/locationmap-skinconf.xml"/>
     </select>
-    
     <select>
       <mount src="{forrest:forrest.context}/locationmap-plugin.xml"/>
     </select>
-    
-    <!--  FIXME: this should be part of a chaperon plugin -->
+<!--  FIXME: this should be part of a chaperon plugin -->
     <select>
       <mount src="{forrest:forrest.context}/locationmap-chaperon.xml"/>
     </select>
-
-    <!-- ================================== -->
-    <!-- project files                      -->
-    <!-- ================================== -->
+<!-- ================================== -->
+<!-- project files                      -->
+<!-- ================================== -->
     <match pattern="project.xmap.sitemap">
-        <location src="{properties:sitemap}" />
+      <location src="{properties:sitemap}" />
     </match>
-    
     <match pattern="project.build-info">
       <location src="{properties:temp-dir}/build-info.xml" />
     </match>
-    
     <match pattern="project.images.**.*">
       <select>
         <location src="{properties:resources.images}{1}.{2}" />
@@ -110,18 +95,14 @@
         <location src="{properties:content.xdocs}{1}.{2}" />
       </select>
     </match>
-    
     <match pattern="project.js.**">
       <location src="resources/scripts/{1}.js" />
     </match>
-    
     <match pattern="project.xml.site">
       <location src="{properties:content.xdocs}site.xml" />
     </match>
-    
     <match pattern="project.**">
       <location src="{properties:content.xdocs}{1}" />
     </match>
-    
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/menu.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/menu.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Mon Apr  9 19:21:46 2007
@@ -29,7 +29,6 @@
 
 $Revision: 1.2 $
 ==================================================== -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file"/>
@@ -39,7 +38,7 @@
         <catalogues default="menu">
           <catalogue id="menu" name="menu" location="{lm:project.translations}"/>
         </catalogues>
-        <!-- Commented out to verify your translations
+<!-- Commented out to verify your translations
         <untranslated-text>untranslated</untranslated-text> -->
         <cache-at-startup>true</cache-at-startup>
       </map:transformer>
@@ -49,13 +48,10 @@
       <map:selector logger="sitemap.selector.config" name="config" src="org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
   </map:components>
-
   <map:pipelines>
-
-    <!-- ============================================================ -->
-    <!-- SOURCE FORMATS                                               -->
-    <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- SOURCE FORMATS                                               -->
+<!-- ============================================================ -->
     <map:pipeline internal-only="false">
       <map:match pattern="abs-menulinks">
         <map:generate src="cocoon://site.navigation.links.xml"/>
@@ -64,7 +60,6 @@
         <map:transform src="{lm:transform.xml.xml-normalizedhrefs}"/>
         <map:serialize type="xml"/>
       </map:match>
-
       <map:match pattern="**menulinks-*">
         <map:generate src="cocoon://site.navigation.links.xml"/>
         <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
@@ -77,66 +72,49 @@
               <map:parameter name="path" value="{1}{2}"/>
             </map:transform>
           </map:when>
-
           <map:when test="directories">
             <map:transform type="xpath">
               <map:parameter name="include" value="//*[@href='{1}']" />
             </map:transform>
           </map:when>
-
-          </map:select>
-
+        </map:select>
         <map:transform src="{lm:transform.linkmap.linkmap-relativized}">
           <map:parameter name="path" value="{1}{2}" />
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
-
-    <!-- ============================================================ -->
-    <!-- INTERMEDIATE FORMATS                                         -->
-    <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- INTERMEDIATE FORMATS                                         -->
+<!-- ============================================================ -->
     <map:pipeline>
       <map:match pattern="**book-*">
-
         <map:select type="exists">
-
           <map:when test="{lm:project.{1}book.xml}">
-            <!-- If a hand-created book.xml exists, use it -->
+<!-- If a hand-created book.xml exists, use it -->
             <map:parameter name="url" value="{lm:project.{1}book.xml}" />
             <map:generate src="{lm:project.{1}book.xml}" />
           </map:when>
-
           <map:otherwise>
-            <!-- If no book.xml, generate it from the linkmap. -->
+<!-- If no book.xml, generate it from the linkmap. -->
             <map:generate src="cocoon:/{1}menulinks-{2}" />
-            <!-- The above generates the subset of the linkmap relevant to our directory. -->
+<!-- The above generates the subset of the linkmap relevant to our directory. -->
             <map:transform src="{lm:transform.site.book}" />
           </map:otherwise>
-
         </map:select>
-
         <map:select type="config">
           <map:parameter name="value" value="{properties:forrest.i18n}"/>
           <map:when test="true">
-
             <map:act type="locale">
               <map:transform src="{lm:transform.book.book-i18n}"/>
               <map:transform type="i18n">
                 <map:parameter name="locale" value="{locale}"/>
               </map:transform>
             </map:act>
-
           </map:when>
         </map:select>
-
         <map:serialize type="xml"/>
-
       </map:match>
-
     </map:pipeline>
-
-
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/plugins.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/plugins.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/plugins.xmap (original)
+++ forrest/trunk/main/webapp/plugins.xmap Mon Apr  9 19:21:46 2007
@@ -21,8 +21,6 @@
 Provides access to the plugins descriptor files.
 
 ==================================================== -->
-
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file">
@@ -32,43 +30,38 @@
     <map:transformers default="xslt"/>
     <map:matchers default="wildcard"/>
   </map:components>
-
   <map:pipelines>
- 
-     <map:pipeline>       
-       <map:match pattern="corePlugins.xml">
-         <map:generate type="xpathdirectory" src="{forrest:forrest.plugins-src}">
-            <map:parameter name="depth" value="2"/>
-            <map:parameter name="xpath" value="/project"/>
-            <map:parameter name="xmlFiles" value="build\.xml$"/>
-         </map:generate>
-         <map:transform src="{lm:transform.pluginBuildFiles.pluginDescriptor}">
-           <map:parameter name="type" value="released"/>
-         </map:transform>
-         <map:serialize type="xml"/>
-       </map:match>
-       
-       <map:match pattern="whiteboardPlugins.xml">
-         <map:generate type="xpathdirectory" src="{forrest:forrest.whiteboard-plugins-src}">
-            <map:parameter name="depth" value="2"/>
-            <map:parameter name="xpath" value="/project"/>
-            <map:parameter name="xmlFiles" value="build\.xml$"/>
-         </map:generate>
-         <map:transform src="{lm:transform.pluginBuildFiles.pluginDescriptor}">
-           <map:parameter name="type" value="whiteboard"/>
-         </map:transform>
-         <map:serialize type="xml"/>
-       </map:match>
-
-       <map:match pattern="pluginDocs/plugins_(.*)/index(|\.source).xml" type="regexp">
-         <map:generate src="cocoon:/plugins.xml"/>
-         <map:transform src="{lm:transform.plugins.xdoc}">
-           <map:parameter name="pluginDocsVersion" value="{1}"/>
-         </map:transform>
-         <map:serialize type="xml"/>
-       </map:match>
-       
-       <!-- This match is used if we want to generate the plugins.xml
+    <map:pipeline>
+      <map:match pattern="corePlugins.xml">
+        <map:generate type="xpathdirectory" src="{forrest:forrest.plugins-src}">
+          <map:parameter name="depth" value="2"/>
+          <map:parameter name="xpath" value="/project"/>
+          <map:parameter name="xmlFiles" value="build\.xml$"/>
+        </map:generate>
+        <map:transform src="{lm:transform.pluginBuildFiles.pluginDescriptor}">
+          <map:parameter name="type" value="released"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="whiteboardPlugins.xml">
+        <map:generate type="xpathdirectory" src="{forrest:forrest.whiteboard-plugins-src}">
+          <map:parameter name="depth" value="2"/>
+          <map:parameter name="xpath" value="/project"/>
+          <map:parameter name="xmlFiles" value="build\.xml$"/>
+        </map:generate>
+        <map:transform src="{lm:transform.pluginBuildFiles.pluginDescriptor}">
+          <map:parameter name="type" value="whiteboard"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="pluginDocs/plugins_(.*)/index(|\.source).xml" type="regexp">
+        <map:generate src="cocoon:/plugins.xml"/>
+        <map:transform src="{lm:transform.plugins.xdoc}">
+          <map:parameter name="pluginDocsVersion" value="{1}"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+<!-- This match is used if we want to generate the plugins.xml
             from the plugin build.xml files. However, it is currently
             disabled since the 0.8 release will not bundle the plugin
             sources so this match will not work.
@@ -83,17 +76,13 @@
          <map:serialize type="xml"/>
        </map:match>
        -->
-       
-       <map:match pattern="plugins.xml">
-          <map:aggregate element="pluginList">
-            <map:part src="{lm:plugin.descriptor.forrest}"/>
-            <map:part src="{lm:plugin.descriptor.whiteboard}"/>
-          </map:aggregate>
-         <map:serialize type="xml"/>
-       </map:match>
-       
-     </map:pipeline>     
+      <map:match pattern="plugins.xml">
+        <map:aggregate element="pluginList">
+          <map:part src="{lm:plugin.descriptor.forrest}"/>
+          <map:part src="{lm:plugin.descriptor.whiteboard}"/>
+        </map:aggregate>
+        <map:serialize type="xml"/>
+      </map:match>
+    </map:pipeline>
   </map:pipelines>
-
 </map:sitemap>
-

Modified: forrest/trunk/main/webapp/profiler.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/profiler.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/profiler.xmap (original)
+++ forrest/trunk/main/webapp/profiler.xmap Mon Apr  9 19:21:46 2007
@@ -31,8 +31,6 @@
 
 $Revision: 1.2 $
 ==================================================== -->
-
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file">
@@ -42,7 +40,6 @@
     <map:transformers default="xslt"/>
     <map:matchers default="wildcard"/>
   </map:components>
-
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="cprofile.html">
@@ -52,12 +49,10 @@
         </map:transform>
         <map:serialize type="html"/>
       </map:match>
-
       <map:match pattern="cprofile.xml">
         <map:generate type="profiler"/>
         <map:serialize type="xml"/>
       </map:match>
     </map:pipeline>
-
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/raw.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/raw.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/raw.xmap (original)
+++ forrest/trunk/main/webapp/raw.xmap Mon Apr  9 19:21:46 2007
@@ -29,7 +29,6 @@
 
 $Revision: 1.2 $
 ==================================================== -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file">
@@ -40,67 +39,52 @@
     <map:readers default="resource"/>
     <map:matchers default="wildcard"/>
   </map:components>
-
   <map:pipelines>
     <map:pipeline>
-
-      <!-- ============================================================ -->
-      <!-- OUTPUT FORMATS                                               -->
-      <!-- ============================================================ -->
+<!-- ============================================================ -->
+<!-- OUTPUT FORMATS                                               -->
+<!-- ============================================================ -->
       <map:match pattern="**">
-
         <map:match pattern="**.html">
-          <!--
+<!--
           Use this instead if you want JTidy to clean up your HTML
           <map:generate type="html" src="{lm:project.{0}}" />
           <map:serialize type="html"/>
           -->
           <map:read src="{lm:project.{0}}" mime-type="text/html"/>
         </map:match>
-
         <map:match pattern="**.xml">
           <map:generate type="file" src="{lm:project.{0}}" />
           <map:serialize type="xml" />
         </map:match>
-
         <map:match pattern="skin/**.css">
           <map:read src="{lm:project:{1}}" mime-type="text/css" />
         </map:match>
-
         <map:match pattern="**.js">
           <map:read src="{lm:project.{0}}" mime-type="application/javascript" />
         </map:match>
-
         <map:match pattern="**.gif">
           <map:read src="{lm:project.{0}}" mime-type="image/gif" />
         </map:match>
-
         <map:match pattern="**.jpg">
           <map:read src="{lm:project.{0}}" mime-type="image/jpeg" />
         </map:match>
-
         <map:match pattern="**.jpeg">
           <map:read src="{lm:project.{0}}" mime-type="image/jpeg" />
         </map:match>
-
         <map:match pattern="**.pdf">
           <map:read src="{lm:project.{0}}" mime-type="application/pdf" />
         </map:match>
-
         <map:match pattern="**.swf">
           <map:read src="{lm:project.{0}}" mime-type="application/x-shockwave-flash" />
         </map:match>
-
         <map:match pattern="**.txt">
           <map:read src="{lm:project.{0}}" mime-type="text/plain" />
         </map:match>
-
         <map:match pattern="**">
           <map:read src="{lm:project.{0}}"/>
         </map:match>
-
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Mon Apr  9 19:21:46 2007
@@ -43,8 +43,8 @@
       <map:serializer mime-type="image/png"
           name="svg2png"
           src="org.apache.cocoon.serialization.SVGSerializer">
-            <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
-            <!-- <parameter name="gamma" type="float" value="0.48"/> -->
+<!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+<!-- <parameter name="gamma" type="float" value="0.48"/> -->
         <parameter name="gamma" type="float" value="0"/>
       </map:serializer>
       <map:serializer name="text" mime-type="text/plain" src="org.apache.cocoon.serialization.TextSerializer"/>
@@ -55,32 +55,27 @@
         <parameter name="groups" value="true"/>
       </map:transformer>
     </map:transformers>
-
     <map:readers default="resource" />
     <map:matchers default="wildcard" />
   </map:components>
-
   <map:resources>
-
-   <map:resource name="read-svg2png-corner-resource">
+    <map:resource name="read-svg2png-corner-resource">
       <map:call resource="pipe-svg2png-corner-resource">
         <map:parameter name="path" value="{lm:skin.images.corner.{path}.{name}}" />
         <map:parameter name="orientation-tb" value="{orientation-tb}"/>
         <map:parameter name="orientation-lr" value="{orientation-lr}"/>
-        <map:parameter name="size" value="{size}"/>   
+        <map:parameter name="size" value="{size}"/>
         <map:parameter name="bg-color-name" value="{bg-color-name}"/>
         <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
-        <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+        <map:parameter name="fg-color-name" value="{fg-color-name}"/>
       </map:call>
     </map:resource>
-  
     <map:resource name="pipe-text-resource">
       <map:call resource="generate-transformed-resource">
         <map:parameter name="path" value="{path}" />
       </map:call>
       <map:serialize type="text" mime-type="{mime-type}"/>
     </map:resource>
-
     <map:resource name="pipe-aggregate-svg2png-resource">
       <map:call resource="generate-aggregate-resource">
         <map:parameter name="path" value="{path}" />
@@ -89,7 +84,6 @@
       <map:transform src="{lm:transform.xml.extracted-svg}"/>
       <map:serialize type="svg2png" />
     </map:resource>
-
     <map:resource name="pipe-transformed-svg2png-resource">
       <map:call resource="generate-transformed-resource">
         <map:parameter name="path" value="{path}" />
@@ -97,7 +91,6 @@
       <map:call resource="transform-project2text"/>
       <map:serialize type="svg2png" />
     </map:resource>
-
     <map:resource name="pipe-svg2png-corner-resource">
       <map:generate src="cocoon://skinconf.xml" />
       <map:transform src="{path}">
@@ -117,43 +110,35 @@
       <map:call resource="transform-project2text"/>
       <map:serialize type="svg2png" />
     </map:resource>
-
     <map:resource name="generate-aggregate-resource">
       <map:aggregate element="resource">
         <map:part src="cocoon://skinconf.xml" />
         <map:part src="{path}"/>
       </map:aggregate>
     </map:resource>
-
     <map:resource name="generate-transformed-resource">
       <map:generate src="cocoon://skinconf.xml" />
       <map:transform src="{path}"/>
     </map:resource>
-
     <map:resource name="transform-project2text">
       <map:transform src="{lm:transform.project.text}"/>
     </map:resource>
-
     <map:resource name="read-linked-text">
       <map:generate type="text" src="{path}" />
       <map:transform type="pattern" src="resources/chaperon/grammars/link.xlex"/>
       <map:transform src="resources/chaperon/stylesheets/pattern2link.xsl"/>
       <map:serialize type="text" mime-type="text/css"/>
     </map:resource>
-
   </map:resources>
-
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="**skin/**.js">
         <map:read src="{lm:skin.js.{2}}" mime-type="application/x-javascript" />
       </map:match>
-
-      <!-- @deprecated -->
+<!-- @deprecated -->
       <map:match pattern="**.js">
         <map:read src="{lm:project.js.{1}}" mime-type="application/x-javascript" />
       </map:match>
-
       <map:match pattern="**skin/**.css">
         <map:select type="exists">
           <map:when test="{lm:skin.css.xslt.{2}}">
@@ -169,61 +154,53 @@
           </map:otherwise>
         </map:select>
       </map:match>
-
-         <!-- @deprecated -->
+<!-- @deprecated -->
       <map:match pattern="**.css">
         <map:read src="resources/css/{1}.css" mime-type="text/css" />
       </map:match>
-      
-     <!-- special case corner generator pipeline -->
-     <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
+<!-- special case corner generator pipeline -->
+      <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
         <map:call resource="read-svg2png-corner-resource">
-           <map:parameter name="path" value="images/{1}" />
-           <map:parameter name="name" value="{2}c" />
-           <map:parameter name="orientation-tb" value="{3}"/>
-           <map:parameter name="orientation-lr" value="{4}"/>
-           <map:parameter name="size" value="{5}"/>    
-           <map:parameter name="bg-color-name" value="{6}"/>
-           <map:parameter name="stroke-color-name" value="{7}"/>
-           <map:parameter name="fg-color-name" value="{8}"/>    
+          <map:parameter name="path" value="images/{1}" />
+          <map:parameter name="name" value="{2}c" />
+          <map:parameter name="orientation-tb" value="{3}"/>
+          <map:parameter name="orientation-lr" value="{4}"/>
+          <map:parameter name="size" value="{5}"/>
+          <map:parameter name="bg-color-name" value="{6}"/>
+          <map:parameter name="stroke-color-name" value="{7}"/>
+          <map:parameter name="fg-color-name" value="{8}"/>
         </map:call>
-     </map:match>
-     
-     <!-- special case corner generator pipeline SVG -->
-     <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.svg">
-      <map:generate src="cocoon://skinconf.xml" />
-      <map:transform src="{lm:skin.images.corner.images/{1}.{2}c}">
-         <map:parameter name="orientation-tb" value="{3}"/>
-         <map:parameter name="orientation-lr" value="{4}"/>
-         <map:parameter name="size" value="{5}"/>    
-         <map:parameter name="bg-color-name" value="{6}"/>
-         <map:parameter name="stroke-color-name" value="{7}"/>
-         <map:parameter name="fg-color-name" value="{8}"/>
-      </map:transform>
-      <map:call resource="transform-project2text"/>
-      <map:serialize type="xml" />
-     </map:match>
-     
-     <!-- DEBUG: special case corner generator pipeline PNG from SVG-->
-     <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.test.png">
-      <map:generate src="cocoon:/skin/images{1}/{2}c-{3}-{4}-{5}-1{6}-2{7}-3{8}.svg" />
-      <map:serialize type="svg2png" />
-     </map:match>
-
+      </map:match>
+<!-- special case corner generator pipeline SVG -->
+      <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.svg">
+        <map:generate src="cocoon://skinconf.xml" />
+        <map:transform src="{lm:skin.images.corner.images/{1}.{2}c}">
+          <map:parameter name="orientation-tb" value="{3}"/>
+          <map:parameter name="orientation-lr" value="{4}"/>
+          <map:parameter name="size" value="{5}"/>
+          <map:parameter name="bg-color-name" value="{6}"/>
+          <map:parameter name="stroke-color-name" value="{7}"/>
+          <map:parameter name="fg-color-name" value="{8}"/>
+        </map:transform>
+        <map:call resource="transform-project2text"/>
+        <map:serialize type="xml" />
+      </map:match>
+<!-- DEBUG: special case corner generator pipeline PNG from SVG-->
+      <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.test.png">
+        <map:generate src="cocoon:/skin/images{1}/{2}c-{3}-{4}-{5}-1{6}-2{7}-3{8}.svg" />
+        <map:serialize type="svg2png" />
+      </map:match>
       <map:match pattern="skin/images**/*.*">
         <map:read src="{lm:skin.images.{1}/{2}.{3}}" mime-type="image/{3}" />
       </map:match>
-
-      <!-- handles images local to a contributor directory -->
+<!-- handles images local to a contributor directory -->
       <map:match pattern="**my-images/**.*">
         <map:read src="{lm:project.images.{1}my-images/{2}.{3}}" mime-type="image/{3}" />
       </map:match>
-
       <map:match type="regexp" pattern="^(.*?)([^/]*).svg$">
         <map:generate src="{lm:project.{1}{2}.svg}"/>
         <map:serialize type="xml"/>
       </map:match>
-
       <map:match pattern="images/**.*">
         <map:select type="exists">
           <map:when test="{lm:skin.images.{1}.{2}}">
@@ -239,7 +216,6 @@
           </map:otherwise>
         </map:select>
       </map:match>
-
       <map:match pattern="**/images/**.*">
         <map:select type="exists">
           <map:when test="{lm:project.images.{1}/images/{2}.{3}}">
@@ -250,7 +226,6 @@
           </map:when>
         </map:select>
       </map:match>
-      
       <map:match pattern="**.png">
         <map:select type="exists">
           <map:when test="{lm:project.images.{1}.svg}">
@@ -268,7 +243,6 @@
           </map:when>
         </map:select>
       </map:match>
-
       <map:match pattern="**.ico">
         <map:select type="exists">
           <map:when test="{lm:project.images.{1}.ico}">

Modified: forrest/trunk/main/webapp/revisions.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/revisions.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/revisions.xmap (original)
+++ forrest/trunk/main/webapp/revisions.xmap Mon Apr  9 19:21:46 2007
@@ -36,7 +36,6 @@
 
 $Revision: 1.2 $
 ==================================================== -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:generators default="file">
@@ -46,42 +45,36 @@
     <map:transformers default="xslt"/>
     <map:matchers default="wildcard"/>
   </map:components>
-
   <map:pipelines>
     <map:pipeline>
-
       <map:match pattern="**index.xml">
         <map:generate src="{properties:content.xdocs}{0}" />
         <map:transform type="idgen" />
         <map:serialize type="xml"/>
       </map:match>
-
       <map:match pattern="**revision-*.xml">
         <map:generate src="{properties:content.xdocs}{1}revision-{2}.xml" />
         <map:transform type="idgen" />
         <map:serialize type="xml"/>
       </map:match>
-
       <map:match pattern="**revisions-**">
-	  <map:generate type="directory" src="{properties:content.xdocs}{1}">
+        <map:generate type="directory" src="{properties:content.xdocs}{1}">
           <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
         </map:generate>
-	<map:transform src="{lm:transform.directory.revisions}">
+        <map:transform src="{lm:transform.directory.revisions}">
           <map:parameter name="use-request-parameters" value="true" />
           <map:parameter name="page" value="{2}" />
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
-
       <map:match pattern="**/*.xml">
         <map:aggregate element="all">
           <map:part src="{properties:content.xdocs}{0}" />
           <map:part src="cocoon:/{1}/revisions-{2}" />
         </map:aggregate>
-	<map:transform src="{lm:transform.howto.document}" />
+        <map:transform src="{lm:transform.howto.document}" />
         <map:serialize type="xml-document" />
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/webapp/search.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/search.xmap?view=diff&rev=526999&r1=526998&r2=526999
==============================================================================
--- forrest/trunk/main/webapp/search.xmap (original)
+++ forrest/trunk/main/webapp/search.xmap Mon Apr  9 19:21:46 2007
@@ -38,68 +38,52 @@
 
 $Revision$
 ==================================================== -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-
-    <!-- Lucene search generator: Creates a hit list from a query and
+<!-- Lucene search generator: Creates a hit list from a query and
     an existing index. -->
     <map:generators default="file">
       <map:generator name="search"
         logger="sitemap.generator.searchgenerator"
         src="org.apache.cocoon.generation.SearchGenerator" />
     </map:generators>
-
-    <!-- Lucene index transformer: Creates a new Lucene index. -->
+<!-- Lucene index transformer: Creates a new Lucene index. -->
     <map:transformers default="xslt">
       <map:transformer name="index"
         logger="sitemap.transformer.luceneindextransformer"
         src="org.apache.cocoon.transformation.LuceneIndexTransformer"/>
     </map:transformers>
-
     <map:readers default="resource"/>
     <map:serializers default="html"/>
     <map:matchers default="wildcard"/>
-
   </map:components>
-  <!-- =========================== Pipelines ================================= -->
+<!-- =========================== Pipelines ================================= -->
   <map:pipelines>
-
     <map:pipeline internal-only="false">
-
-      <!-- ===== INDEX CREATION ===== -->
-
-      <!-- Creates or updates the Lucene index -->
+<!-- ===== INDEX CREATION ===== -->
+<!-- Creates or updates the Lucene index -->
       <map:match pattern="lucene-update.xml">
         <map:generate src="cocoon:/index-creation.lucene"/>
         <map:transform type="index"/>
         <map:transform src="{lm:transform.lucene-update.xdoc}"/>
         <map:serialize type="xml"/>
       </map:match>
-
-
-      <!-- ===== INDEX QUERYING ===== -->
-
-      <!-- Searches the Lucene index using the search expression given
+<!-- ===== INDEX QUERYING ===== -->
+<!-- Searches the Lucene index using the search expression given
       in the request param named "queryString" -->
       <map:match pattern="lucene-search.xml">
         <map:generate type="search">
-          <!-- Important: This value must match that of the
+<!-- Important: This value must match that of the
           "directory" parameter passed to book-to-cinclude-lucene.xsl (see
           below) -->
           <map:parameter name="index" value="lucene-index"/>
           <map:parameter name="query-string" value="queryString"/>
         </map:generate>
-
         <map:transform src="{lm:transform.lucene-search.xdoc}"/>
-
         <map:serialize type="xml"/>
       </map:match>
-
-
-      <!-- ===== DOCUMENTS FOR LUCENE INDEX TRANSFORMER ===== -->
-
-      <!-- Generates a document suitable for processing by the
+<!-- ===== DOCUMENTS FOR LUCENE INDEX TRANSFORMER ===== -->
+<!-- Generates a document suitable for processing by the
       LuceneIndexTransformer, using sources across the whole site -->
       <map:match pattern="index-creation.lucene">
         <map:generate src="cocoon://abs-linkmap"/>
@@ -108,7 +92,7 @@
           <map:parameter name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
           <map:parameter name="merge-factor" value="20"/>
           <map:parameter name="update-index" value="true"/>
-          <!-- Important: This value must match that of the
+<!-- Important: This value must match that of the
           "index" parameter passed to the search generator (see
           above) -->
           <map:parameter name="directory" value="lucene-index"/>
@@ -116,8 +100,7 @@
         <map:transform type="cinclude"/>
         <map:serialize type="xml"/>
       </map:match>
-
-      <!-- Creates a lucene:document from a Forrest document body -->
+<!-- Creates a lucene:document from a Forrest document body -->
       <map:match pattern="**body-*.lucene">
         <map:select type="exists">
           <map:when test="{properties:content.xdocs}{1}{2}.ehtml">
@@ -133,8 +116,7 @@
         </map:transform>
         <map:serialize type="xml"/>
       </map:match>
-
-      <!-- Creates a lucene:document from a Forrest document (same as
+<!-- Creates a lucene:document from a Forrest document (same as
       above, as search-relevant information is only contained in the
       body) -->
       <map:match pattern="*.lucene">
@@ -145,13 +127,9 @@
         <map:generate src="cocoon:/{1}/body-{2}.lucene"/>
         <map:serialize type="xml"/>
       </map:match>
-
-      <!-- ===== TODO: ERROR HANDLING ===== -->
-
-      <!-- Must do something about malformed (unparseable) queries or
+<!-- ===== TODO: ERROR HANDLING ===== -->
+<!-- Must do something about malformed (unparseable) queries or
       a non-existant index. -->
-
     </map:pipeline>
-
   </map:pipelines>
 </map:sitemap>



Mime
View raw message