forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527038 [13/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.Databas...
Date Tue, 10 Apr 2007 05:45:31 GMT
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap Mon Apr  9 22:45:15 2007
@@ -16,82 +16,70 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-<map:components>
-  <map:generators default="html">
-    <map:generator name="html"      
+  <map:components>
+    <map:generators default="html">
+      <map:generator name="html"      
                    src="org.apache.cocoon.generation.HTMLGenerator">
-      <jtidy-config>conf/jtidy-config.txt</jtidy-config>
-    </map:generator>
-    <map:generator 
+        <jtidy-config>conf/jtidy-config.txt</jtidy-config>
+      </map:generator>
+      <map:generator 
         label="content" 
         name="request" 
         logger="sitemap.generator.request"
         pool-grow="2" pool-max="16" pool-min="2" 
         src="org.apache.cocoon.generation.RequestGenerator"/>
-  </map:generators>
-  
-  <map:transformers default="xslt">
-    <map:transformer 
+    </map:generators>
+    <map:transformers default="xslt">
+      <map:transformer 
       name="html" 
       src="org.apache.cocoon.transformation.HTMLTransformer">
-      <jtidy-config>conf/jtidy-config.txt</jtidy-config>
-    </map:transformer>
-    <map:transformer 
+        <jtidy-config>conf/jtidy-config.txt</jtidy-config>
+      </map:transformer>
+      <map:transformer 
       name="write-source" 
       logger="sitemap.transformer.write-source" 
       src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
-  </map:transformers>
-</map:components>
-
-<map:pipelines>
-
-  <map:pipeline>
-    
-    <map:match pattern="edit_htmlArea/write.do">
-      <map:generate type="request"/>
-      <map:transform src="resources/stylesheets/request2doc.xsl"/>
-      <map:transform type="html">    
-        <map:parameter name="tags" value="content"/>
-      </map:transform>
-      <map:transform src="resources/stylesheets/doc2write.xsl">
-        <map:parameter name="filepath" value="{properties:content.xdocs}"/>
-      </map:transform>
-      <map:transform type="write-source"/>
-      <map:transform src="resources/stylesheets/result2html.xsl">
-        <map:parameter name="queryString" value="{request:queryString}"/>
-      </map:transform>
-      <map:serialize type="html"/>
-    </map:match>
-    
-    <map:match pattern="edit_htmlArea/popups/**.html">
-      <map:read src="resources/editor/popups/{1}.html"/>
-    </map:match>
-    
-    <map:match pattern="edit_htmlArea/**.html">
-      <map:generate src="{properties:content.xdocs}/{1}.html"/>
-      <map:transform src="resources/stylesheets/html2editor.xsl">
-        <map:parameter name="filename" value="{1}.html"/>
-      </map:transform>
-      <map:serialize type="html"/>
-    </map:match>
-    
-    <map:match pattern="edit_htmlArea/**.js">
-       <map:read src="resources/editor/{1}.js"
+    </map:transformers>
+  </map:components>
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="edit_htmlArea/write.do">
+        <map:generate type="request"/>
+        <map:transform src="resources/stylesheets/request2doc.xsl"/>
+        <map:transform type="html">
+          <map:parameter name="tags" value="content"/>
+        </map:transform>
+        <map:transform src="resources/stylesheets/doc2write.xsl">
+          <map:parameter name="filepath" value="{properties:content.xdocs}"/>
+        </map:transform>
+        <map:transform type="write-source"/>
+        <map:transform src="resources/stylesheets/result2html.xsl">
+          <map:parameter name="queryString" value="{request:queryString}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="edit_htmlArea/popups/**.html">
+        <map:read src="resources/editor/popups/{1}.html"/>
+      </map:match>
+      <map:match pattern="edit_htmlArea/**.html">
+        <map:generate src="{properties:content.xdocs}/{1}.html"/>
+        <map:transform src="resources/stylesheets/html2editor.xsl">
+          <map:parameter name="filename" value="{1}.html"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="edit_htmlArea/**.js">
+        <map:read src="resources/editor/{1}.js"
            mime-type="application/x-javascript"/>
-    </map:match>
-    
-    <map:match pattern="edit_htmlArea/**.css">
-       <map:read src="resources/editor/{1}.css"
+      </map:match>
+      <map:match pattern="edit_htmlArea/**.css">
+        <map:read src="resources/editor/{1}.css"
            mime-type="text/css"/>
-    </map:match>
-    
-    <map:match pattern="edit_htmlArea/**.gif">
-       <map:read src="resources/editor/{1}.gif"
+      </map:match>
+      <map:match pattern="edit_htmlArea/**.gif">
+        <map:read src="resources/editor/{1}.gif"
            mime-type="image/gif"/>
-    </map:match>
-
-  </map:pipeline>
-</map:pipelines>
-
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/doc2write.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/doc2write.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/doc2write.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/doc2write.xsl Mon Apr  9 22:45:15 2007
@@ -15,18 +15,18 @@
   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:req="http://apache.org/cocoon/request/2.0"
                 xmlns:source="http://apache.org/cocoon/source/1.0">
-
   <xsl:param name="filepath"/>
-  
   <xsl:template match="page">
     <page>
       <source:write create="true">
-        <source:source><xsl:value-of select="$filepath"/><xsl:value-of select="meta[@name='filename']/@content"/></source:source>
+        <source:source>
+          <xsl:value-of select="$filepath"/>
+          <xsl:value-of select="meta[@name='filename']/@content"/>
+        </source:source>
         <source:path>html</source:path>
         <source:fragment>
           <xsl:call-template name="head"/>
@@ -35,24 +35,20 @@
       </source:write>
     </page>
   </xsl:template>
-  
   <xsl:template name="head">
     <head>
       <xsl:apply-templates select="/page/meta"/>
       <xsl:apply-templates select="/page/title"/>
     </head>
   </xsl:template>
-  
   <xsl:template name="body">
     <body>
       <xsl:copy-of select="/page/content/html/body/*"/>
     </body>
   </xsl:template>
-    
   <xsl:template match="node()|@*" priority="-1">
-        <xsl:copy>
-              <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/html2editor.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/html2editor.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/html2editor.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/html2editor.xsl Mon Apr  9 22:45:15 2007
@@ -15,37 +15,31 @@
   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">
-
-<xsl:param name="filename"></xsl:param>
-
+  <xsl:param name="filename"></xsl:param>
   <xsl:template match="/">
     <html xmlns="http://www.w3.org/1999/xhtml">
       <xsl:call-template name="head"/>
       <xsl:call-template name="body"/>
     </html>
   </xsl:template>
-  
   <xsl:template name="head">
     <head>
-      <!-- Configure the path to the editor.  We make it relative now, so that the
+<!-- Configure the path to the editor.  We make it relative now, so that the
       example ZIP file will work anywhere, but please NOTE THAT it's better to
       have it an absolute path, such as '/htmlarea/'. -->
-      <script type="text/javascript">
+<script type="text/javascript">
         _editor_url = "/edit_htmlArea";
         _editor_lang = "en";
       </script>
-      
-      <!-- load the main HTMLArea file, this will take care of loading the CSS and
+<!-- load the main HTMLArea file, this will take care of loading the CSS and
       other required core scripts. -->
-      <script type="text/javascript">
+<script type="text/javascript">
         <xsl:attribute name="src">/edit_htmlArea/htmlarea.js</xsl:attribute>
-      </script>  
-      
-      <!-- load the plugins -->
-      <script type="text/javascript">
+      </script>
+<!-- load the plugins -->
+<script type="text/javascript">
         // WARNING: using this interface to load plugin
         // will _NOT_ work if plugins do not have the language
         // loaded by HTMLArea.
@@ -68,8 +62,7 @@
         //HTMLArea.loadPlugin("CharacterMap");
         //HTMLArea.loadPlugin("DynamicCSS");
       </script>
-      
-      <script type="text/javascript">
+<script type="text/javascript">
       var editor = null;
       
       function initEditor() {
@@ -151,41 +144,37 @@
       </script>
     </head>
   </xsl:template>
-  
   <xsl:template name="body">
     <body onload="initEditor()">
       <form method="post" action="write.do">
         <label>Title:
           <input type="text" name="title" size="70">
-            <xsl:attribute name="value"><xsl:value-of select="/html/head/title"/></xsl:attribute>
+            <xsl:attribute name="value">
+              <xsl:value-of select="/html/head/title"/>
+            </xsl:attribute>
           </input>
         </label>
-        
         <hr/>
-        
         <textarea id="editor" name="editor" cols="80" rows="30">
-          <!--xsl:value-of select="normalize-space(.)"/-->
+<!--xsl:value-of select="normalize-space(.)"/-->
           <xsl:apply-templates/>
         </textarea>
-        
         <input type="hidden" name="filename">
-          <xsl:attribute name="value"><xsl:value-of select="$filename"/></xsl:attribute>
+          <xsl:attribute name="value">
+            <xsl:value-of select="$filename"/>
+          </xsl:attribute>
         </input>
-        
         <input type="submit" value="Submit" />
         <input type="reset" value="Reset" />
       </form>
     </body>
   </xsl:template>
-  
   <xsl:template match="body">
     <xsl:apply-templates/>
   </xsl:template>
-  
   <xsl:template match="node()|@*" priority="-1">
-        <xsl:copy>
-              <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/request2doc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/request2doc.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/request2doc.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/request2doc.xsl Mon Apr  9 22:45:15 2007
@@ -15,11 +15,9 @@
   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:req="http://apache.org/cocoon/request/2.0">
-  
   <xsl:template match="/req:request">
     <page>
       <xsl:apply-templates select="req:requestParameters" mode="meta"/>
@@ -28,38 +26,31 @@
       </content>
     </page>
   </xsl:template>
-  
   <xsl:template name="body">
     <body>
       <xsl:apply-templates select="req:requestParameters" mode="body"/>
     </body>
   </xsl:template>
-  
   <xsl:template match="req:requestParameters" mode="meta">
-      <meta name="filename">
-        <xsl:attribute name="content"><xsl:apply-templates select="req:parameter[@name='filename']"/></xsl:attribute>
-      </meta>
-      <xsl:apply-templates select="req:parameter[@name='title']"/>
+    <meta name="filename">
+      <xsl:attribute name="content">
+        <xsl:apply-templates select="req:parameter[@name='filename']"/>
+      </xsl:attribute>
+    </meta>
+    <xsl:apply-templates select="req:parameter[@name='title']"/>
   </xsl:template>
-  
   <xsl:template match="req:requestParameters" mode="body">
-      <xsl:apply-templates select="req:parameter[@name='editor']"/>
+    <xsl:apply-templates select="req:parameter[@name='editor']"/>
   </xsl:template>
-  
   <xsl:template match="req:parameter[@name='title']">
-    <title>
-      <xsl:value-of select="req:value"/>
-    </title>
+    <title><xsl:value-of select="req:value"/></title>
   </xsl:template>
-  
   <xsl:template match="req:parameter[@name='filename']">
     <filename>
       <xsl:value-of select="req:value"/>
     </filename>
   </xsl:template>
-  
   <xsl:template match="req:parameter[@name='editor']">
-      <xsl:value-of select="normalize-space(.)"/>
+    <xsl:value-of select="normalize-space(.)"/>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/result2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/result2html.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/result2html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/resources/stylesheets/result2html.xsl Mon Apr  9 22:45:15 2007
@@ -15,30 +15,27 @@
   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:req="http://apache.org/cocoon/request/2.0">
-                
   <xsl:param name="queryString"/>
-  
   <xsl:template match="/page">
     <html>
       <head>
         <title>Save Result</title>
       </head>
       <body>
-        <xsl:apply-templates select="sourceResult"/>
-        
-        <a>
-          <xsl:variable name="URI"><xsl:value-of select="substring-after($queryString, 'filename=')"/></xsl:variable>
-          <xsl:attribute name="href">/<xsl:value-of select="$URI"/></xsl:attribute>
+        <xsl:apply-templates select="sourceResult"/><a>
+        <xsl:variable name="URI">
+          <xsl:value-of select="substring-after($queryString, 'filename=')"/>
+        </xsl:variable>
+        <xsl:attribute name="href">/<xsl:value-of select="$URI"/>
+        </xsl:attribute>
           Back to Source Page
         </a>
       </body>
     </html>
   </xsl:template>
-  
   <xsl:template match="sourceResult">
     <xsl:choose>
       <xsl:when test="execution='success'">
@@ -48,26 +45,20 @@
         <h1>Problem Writing File</h1>
       </xsl:otherwise>
     </xsl:choose>
-    
     <dl>
       <dt>Message</dt>
       <dd><xsl:value-of select="message"/></dd>
-      
       <dt>Behaviour</dt>
       <dd><xsl:value-of select="behaviour"/></dd>
-      
       <dt>Action</dt>
       <dd><xsl:value-of select="action"/></dd>
-      
       <dt>Source</dt>
       <dd><xsl:value-of select="source"/></dd>
     </dl>
   </xsl:template>
-  
   <xsl:template match="node()|@*" priority="-1">
-        <xsl:copy>
-              <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/index.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/index.html?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/index.html (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/index.html Mon Apr  9 22:45:15 2007
@@ -22,23 +22,35 @@
   </head>
   <body>
     <h1>WYSIWYG Editing In Apache Forrest</h1>
-    <p>This plugin provides <span style="font-style: italic;">WYSIWYG</span> editing for the Apache Forrest appliction. 
-    It currently only works with HTML input files, but we hope to extend its range of supported file formats.</p>
-    
-    <p>This plugin uses <a href="http://sourceforge.net/projects/itools-htmlarea/">HTML Area</a> for
-    the editing widget.</p>
-    
-    <warning>With the current configuration this plugin produces HTML with
-    embedded style information (not just CSS stuff). A future version will only 
-    use CSS styling, but for now be aware that the source can be bad from a 
-    separation of content and style perspective</warning>
-    
+    <p>
+      This plugin provides
+      <span style="font-style: italic;">WYSIWYG</span>
+      editing for the Apache Forrest appliction. It currently only works with
+      HTML input files, but we hope to extend its range of supported file
+      formats.
+    </p>
+    <p>
+      This plugin uses
+      <a href="http://sourceforge.net/projects/itools-htmlarea/">HTML Area</a>
+      for the editing widget.
+    </p>
+    <warning>
+      With the current configuration this plugin produces HTML with embedded
+      style information (not just CSS stuff). A future version will only use CSS
+      styling, but for now be aware that the source can be bad from a separation
+      of content and style perspective
+    </warning>
     <h2>Try it out</h2>
     <h1>How do I allow users to edit my Pages?</h1>
-    <p>If a request is recieved with an URL that contains "edit_htmlArea/" then an edit page is generated for the indicated page. For example:</p>
+    <p>
+      If a request is recieved with an URL that contains "edit_htmlArea/" then
+      an edit page is generated for the indicated page. For example:
+    </p>
     <p class="source">
       &lt;a href="/edit_htmlArea/index.html"&gt;edit index&lt;/a&gt;
     </p>
-    <p>will create an editor for the <code>index.html</code> page.</p>
+    <p>
+      will create an editor for the <code>index.html</code> page.
+    </p>
   </body>
-</html>
\ No newline at end of file
+</html>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/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,23 +28,19 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="MyProj" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to MyProj"/>
     <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 @@
     <cocoon href="http://cocoon.apache.org/"/>
     <xml.apache.org href="http://xml.apache.org/"/>
   </external-refs>
-
 </site>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/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,11 +30,9 @@
    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="" label="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.output.htmlArea/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/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: htmlArea output</project-name>
   <project-description>org.apache.forrest.plugin.output.htmlArea plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_af.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_af.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_af.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_af.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="af">
-    <message key="About">Aangaande</message>
-    <message key="Index">Inhoud</message>
-    <message key="Changes">Veranderinge</message>
-    <message key="Todo">Om te doen</message>
-    <message key="Samples">Voorbeelde</message>
-    <message key="Apache document">Apache dokument</message>
-    <message key="Static content">Statise Inhoud</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Wiki bladsy</message>
-    <message key="ihtml page">Ihtml bladsy</message>
-    <message key="ehtml page">Ehtml bladsy</message>
-    <message key="FAQ">FAQ</message>
-    <message key="Simplifed Docbook">Vereenvoudigde Docbook</message>
-    <message key="XSP page">XSP bladsy</message>
+  <message key="About">Aangaande</message>
+  <message key="Index">Inhoud</message>
+  <message key="Changes">Veranderinge</message>
+  <message key="Todo">Om te doen</message>
+  <message key="Samples">Voorbeelde</message>
+  <message key="Apache document">Apache dokument</message>
+  <message key="Static content">Statise Inhoud</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Wiki bladsy</message>
+  <message key="ihtml page">Ihtml bladsy</message>
+  <message key="ehtml page">Ehtml bladsy</message>
+  <message key="FAQ">FAQ</message>
+  <message key="Simplifed Docbook">Vereenvoudigde Docbook</message>
+  <message key="XSP page">XSP bladsy</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_es.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_es.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_es.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_es.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="es">
-    <message key="About">Acerca de</message>
-    <message key="Index">Indice</message>
-    <message key="Changes">Cambios</message>
-    <message key="Todo">Tareas pendientes</message>
-    <message key="Samples">Ejemplos</message>
-    <message key="Apache document">Documento Apache</message>
-    <message key="Static content">Contenido Estático</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Página Wiki</message>
-    <message key="ihtml page">Página ihtml</message>
-    <message key="ehtml page">Página ehtml</message>
-    <message key="FAQ">Preguntas Frecuentes</message>
-    <message key="Simplifed Docbook">Página Simplifed Docbook</message>
-    <message key="XSP page">Página XSP</message>
+  <message key="About">Acerca de</message>
+  <message key="Index">Indice</message>
+  <message key="Changes">Cambios</message>
+  <message key="Todo">Tareas pendientes</message>
+  <message key="Samples">Ejemplos</message>
+  <message key="Apache document">Documento Apache</message>
+  <message key="Static content">Contenido Estático</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Página Wiki</message>
+  <message key="ihtml page">Página ihtml</message>
+  <message key="ehtml page">Página ehtml</message>
+  <message key="FAQ">Preguntas Frecuentes</message>
+  <message key="Simplifed Docbook">Página Simplifed Docbook</message>
+  <message key="XSP page">Página XSP</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_it.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_it.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_it.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_it.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="it">
-    <message key="About">Riguardo a</message>
-    <message key="Index">Indice</message>
-    <message key="Changes">Cambiamenti</message>
-    <message key="Todo">Cose da fare</message>
-    <message key="Samples">Esempi</message>
-    <message key="Apache document">Apache document</message>
-    <message key="Static content">Contenuto Statico</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Pagina Wiki</message>
-    <message key="ihtml page">Pagina ihtml</message>
-    <message key="ehtml page">Pagina ehtml</message>
-    <message key="FAQ">Domande frequenti</message>
-    <message key="Simplifed Docbook">Simplifed Docbook</message>
-    <message key="XSP page">Pagina XSP</message>
+  <message key="About">Riguardo a</message>
+  <message key="Index">Indice</message>
+  <message key="Changes">Cambiamenti</message>
+  <message key="Todo">Cose da fare</message>
+  <message key="Samples">Esempi</message>
+  <message key="Apache document">Apache document</message>
+  <message key="Static content">Contenuto Statico</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Pagina Wiki</message>
+  <message key="ihtml page">Pagina ihtml</message>
+  <message key="ehtml page">Pagina ehtml</message>
+  <message key="FAQ">Domande frequenti</message>
+  <message key="Simplifed Docbook">Simplifed Docbook</message>
+  <message key="XSP page">Pagina XSP</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_no.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_no.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_no.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_no.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="no">
-    <message key="About">Om</message>
-    <message key="Index">Indeks</message>
-    <message key="Changes">Endringer</message>
-    <message key="Todo">Oppgave liste</message>
-    <message key="Samples">Eksempler</message>
-    <message key="Apache document">Apache Dokument</message>
-    <message key="Static content">Statisk innhold</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Wiki side</message>
-    <message key="ihtml page">ihtml side</message>
-    <message key="ehtml page">ehtml side</message>
-    <message key="FAQ">FAQ</message>
-    <message key="Simplifed Docbook">Simplifed Docbook</message>
-    <message key="XSP page">XSP side</message>
+  <message key="About">Om</message>
+  <message key="Index">Indeks</message>
+  <message key="Changes">Endringer</message>
+  <message key="Todo">Oppgave liste</message>
+  <message key="Samples">Eksempler</message>
+  <message key="Apache document">Apache Dokument</message>
+  <message key="Static content">Statisk innhold</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Wiki side</message>
+  <message key="ihtml page">ihtml side</message>
+  <message key="ehtml page">ehtml side</message>
+  <message key="FAQ">FAQ</message>
+  <message key="Simplifed Docbook">Simplifed Docbook</message>
+  <message key="XSP page">XSP side</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_ru.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_ru.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_ru.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_ru.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="ru">
-    <message key="About">О проекте</message>
-    <message key="Index">Содержание</message>
-    <message key="Changes">Изменения</message>
-    <message key="Todo">План</message>
-    <message key="Samples">Примеры</message>
-    <message key="Apache document">Страница документа Apache</message>
-    <message key="Static content">Статическое содержание</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Страница Wiki</message>
-    <message key="ihtml page">Страница ihtml</message>
-    <message key="ehtml page">Страница ehtml</message>
-    <message key="FAQ">Вопросы/Ответы</message>
-    <message key="Simplifed Docbook">Docbook страница</message>
-    <message key="XSP page">XSP страница</message>
+  <message key="About">О проекте</message>
+  <message key="Index">Содержание</message>
+  <message key="Changes">Изменения</message>
+  <message key="Todo">План</message>
+  <message key="Samples">Примеры</message>
+  <message key="Apache document">Страница документа Apache</message>
+  <message key="Static content">Статическое содержание</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Страница Wiki</message>
+  <message key="ihtml page">Страница ihtml</message>
+  <message key="ehtml page">Страница ehtml</message>
+  <message key="FAQ">Вопросы/Ответы</message>
+  <message key="Simplifed Docbook">Docbook страница</message>
+  <message key="XSP page">XSP страница</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_sk.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_sk.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_sk.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/src/documentation/translations/menu_sk.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,18 @@
   limitations under the License.
 -->
 <catalogue xml:lang="sk">
-    <message key="About">O programe</message>
-    <message key="Index">Zoznám</message>
-    <message key="Changes">Zmeny</message>
-    <message key="Todo">Úlohy</message>
-    <message key="Samples">Príklady</message>
-    <message key="Apache document">Apache Document</message>
-    <message key="Static content">Statický Obsah</message>
-    <message key="Linking">Linking</message>
-    <message key="Wiki page">Wiki stránka</message>
-    <message key="ihtml page">ihtml stránka</message>
-    <message key="ehtml page">ehtml stránka</message>
-    <message key="FAQ">Casté Otázky</message>
-    <message key="Simplifed Docbook">Simplifed Docbook stránka</message>
-    <message key="XSP page">XSP stránka</message>
+  <message key="About">O programe</message>
+  <message key="Index">Zoznám</message>
+  <message key="Changes">Zmeny</message>
+  <message key="Todo">Úlohy</message>
+  <message key="Samples">Príklady</message>
+  <message key="Apache document">Apache Document</message>
+  <message key="Static content">Statický Obsah</message>
+  <message key="Linking">Linking</message>
+  <message key="Wiki page">Wiki stránka</message>
+  <message key="ihtml page">ihtml stránka</message>
+  <message key="ehtml page">ehtml stránka</message>
+  <message key="FAQ">Casté Otázky</message>
+  <message key="Simplifed Docbook">Simplifed Docbook stránka</message>
+  <message key="XSP page">XSP stránka</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/status.xml Mon Apr  9 22:45:15 2007
@@ -16,21 +16,19 @@
   limitations under the License.
 -->
 <status>
-
-  <!-- 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>
-   <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> 
-
+    <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="update" context="admin">
         Renamed to bring into line with naming conventions.
@@ -40,7 +38,6 @@
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="high">
       <action context="code">
@@ -50,5 +47,4 @@
       </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/build.xml Mon Apr  9 22:45:15 2007
@@ -25,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.output.solr"/>
   <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">
@@ -39,5 +37,3 @@
   </target>
   -->
 </project>
-  
-  

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/input.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/input.xmap Mon Apr  9 22:45:15 2007
@@ -20,7 +20,7 @@
     <map:generators default="file">
       <map:generator name="request"
         src="org.apache.cocoon.generation.RequestGenerator"/>
-       <map:generator name="solr-search"
+      <map:generator name="solr-search"
         logger="sitemap.generator.searchgenerator"
         src="org.apache.forrest.solr.client.SolrSearchGenerator" />
     </map:generators>
@@ -36,7 +36,7 @@
   </map:components>
   <map:pipelines>
     <map:pipeline>
-      <!-- Will dispatch a query against the solr server -->
+<!-- Will dispatch a query against the solr server -->
       <map:match pattern="solr-search.xml">
         <map:generate type="solr-search">
           <map:parameter name="destinationUrl" value="{properties:solr.select.url}"/>
@@ -47,7 +47,7 @@
         </map:transform>
         <map:serialize/>
       </map:match>
-      <!--Generating xdocs-->
+<!--Generating xdocs-->
       <map:match pattern="**.do.xml">
         <map:generate src="cocoon://{1}.do"/>
         <map:transform src="resources/stylesheets/solrResult-to-xdocs.xsl">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/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,12 +23,11 @@
         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="resolvePluginContract.*.**">
       <select type="exists">
         <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.theme}/{1}/{2}.ft" />
@@ -45,7 +43,7 @@
     <match pattern="resolvePluginPanels.**">
       <select type="exists">
         <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.theme}/panels/{1}.panel.xml" />
-	<location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml" />
       </select>
     </match>
   </locator>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap Mon Apr  9 22:45:15 2007
@@ -33,7 +33,7 @@
   </map:flow>-->
   <map:pipelines>
     <map:pipeline>
-      <!-- Update generator will send the command to the solr server and
+<!-- Update generator will send the command to the solr server and
         generate the server response -->
       <map:match pattern="**.do">
         <map:generate type="solrUpdate" src="cocoon:/{1}">
@@ -41,12 +41,12 @@
         </map:generate>
         <map:serialize/>
       </map:match>
-      <!-- Static solr commands -->
+<!-- Static solr commands -->
       <map:match pattern="solr.*">
         <map:generate src="resources/xml/{1}.xml"/>
         <map:serialize/>
       </map:match>
-      <!-- Output the whole project as solr docs 
+<!-- Output the whole project as solr docs 
         as add comand-->
       <map:match pattern="index-creation.solr.add">
         <map:generate src="cocoon://abs-linkmap"/>
@@ -55,7 +55,7 @@
         <map:transform type="cinclude"/>
         <map:serialize/>
       </map:match>
-      <!-- Output xdocs as solr docs -->
+<!-- Output xdocs as solr docs -->
       <map:match pattern="**.solr">
         <map:generate src="cocoon://{1}.xml"/>
         <map:transform src="resources/stylesheets/xdocs-to-solrDoc.xsl">
@@ -64,34 +64,34 @@
         </map:transform>
         <map:serialize/>
       </map:match>
-      <!-- Implemented solr commands -->
-      <!-- ADD -->
+<!-- Implemented solr commands -->
+<!-- ADD -->
       <map:match pattern="**.solr.add">
         <map:generate src="cocoon://{1}.solr"/>
         <map:transform src="resources/stylesheets/solrDoc-add.xsl"/>
         <map:serialize/>
       </map:match>
-      <!-- DELETE -->
+<!-- DELETE -->
       <map:match pattern="**.solr.delete">
         <map:generate src="cocoon://{1}.solr"/>
         <map:transform src="resources/stylesheets/solrDoc-delete.xsl"/>
         <map:serialize/>
       </map:match>
-      <!--Testing-->
-      <!--<map:match pattern="resolvePluginContract.*.**">
+<!--Testing-->
+<!--<map:match pattern="resolvePluginContract.*.**">
         <map:generate src="build.xml"/>
         <map:transform src="resources/stylesheets/test.xsl">
           <map:parameter name="document-url" value="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.{1}**{lm:resolvePluginThemes.{1}.{2}}-#-{lm:themes/{1}.{1}}"/>
         </map:transform>
         <map:serialize/>
       </map:match>-->
-      <!-- OLD flow approach -->
-          <!-- use JXtemplate to generate page content -->
+<!-- OLD flow approach -->
+<!-- use JXtemplate to generate page content -->
 <!--      <map:match pattern="*.jx">
         <map:generate type="jx" src="resources/flow/{1}.jx"/>
         <map:serialize/>
       </map:match>-->
-      <!--      <map:match pattern="**solr.*.do">
+<!--      <map:match pattern="**solr.*.do">
         <map:call function="update">
           <map:parameter name="action" value="{2}"/>
           <map:parameter name="destinationUrl" value="http://localhost:8983/solr/update"/>
@@ -101,5 +101,4 @@
       </map:match>-->
     </map:pipeline>
   </map:pipelines>
-  
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/flow/result.jx
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/flow/result.jx?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/flow/result.jx (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/flow/result.jx Mon Apr  9 22:45:15 2007
@@ -22,4 +22,4 @@
     <status>${status}</status>
     <body>${body}</body>
   </response>
-</result>
\ No newline at end of file
+</result>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/book-to-cinclude-solr.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/book-to-cinclude-solr.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/book-to-cinclude-solr.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/book-to-cinclude-solr.xsl Mon Apr  9 22:45:15 2007
@@ -24,47 +24,46 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cinclude="http://apache.org/cocoon/include/1.0"
   xmlns:lucene="http://apache.org/cocoon/lucene/1.0">
-
-  <!-- The extension of the lucene index fragments. -->
+<!-- The extension of the lucene index fragments. -->
   <xsl:param name="extension" select="'solr'"/>
-
-
-  <!-- Creates the lucene:index root element from the Forrest
+<!-- Creates the lucene:index root element from the Forrest
   book. -->
   <xsl:template match="book">
     <add>
       <xsl:apply-templates select="menu|menu-item"/>
     </add>
   </xsl:template>
-
-  <!-- Recursively processes menu elements. -->
+<!-- Recursively processes menu elements. -->
   <xsl:template match="menu">
     <xsl:apply-templates/>
   </xsl:template>
-
-  <xsl:template match="menu-item[@type='hidden']"/>  <!-- Ignore hidden items -->
-  <xsl:template match="menu-item[contains(@href, '#')]"/>  <!-- Ignore #frag-id items -->
-  <xsl:template match="menu-item[starts-with(@href, 'http:')]"/>  <!-- Ignore absolute http urls -->
-  <xsl:template match="menu-item[starts-with(@href, 'https:')]"/>  <!-- Ignore absolute https urls -->
-  <xsl:template match="menu-item[starts-with(@href, 'ext:')]"/>  <!-- Ignore ext: urls -->
-  <xsl:template match="menu-item[starts-with(@href, 'site:')]"/>  <!-- Ignore site: urls -->
-
-  <!-- For entries whose @href ends in "/", refer to @href/index.lucene -->
+  <xsl:template match="menu-item[@type='hidden']"/>
+<!-- Ignore hidden items -->
+  <xsl:template match="menu-item[contains(@href, '#')]"/>
+<!-- Ignore #frag-id items -->
+  <xsl:template match="menu-item[starts-with(@href, 'http:')]"/>
+<!-- Ignore absolute http urls -->
+  <xsl:template match="menu-item[starts-with(@href, 'https:')]"/>
+<!-- Ignore absolute https urls -->
+  <xsl:template match="menu-item[starts-with(@href, 'ext:')]"/>
+<!-- Ignore ext: urls -->
+  <xsl:template match="menu-item[starts-with(@href, 'site:')]"/>
+<!-- Ignore site: urls -->
+<!-- For entries whose @href ends in "/", refer to @href/index.lucene -->
   <xsl:template match="menu-item[substring(@href, string-length(@href) - string-length('/') + 1) = '/']">
     <cinclude:include>
       <xsl:attribute name="src">
-        <xsl:text>cocoon://</xsl:text>
+<xsl:text>cocoon://</xsl:text>
         <xsl:value-of select="concat(@href, 'index.', $extension)"/>
       </xsl:attribute>
     </cinclude:include>
   </xsl:template>
-
-  <!-- Inserts a cinclude:include element for document referenced by
+<!-- Inserts a cinclude:include element for document referenced by
   menu item. -->
   <xsl:template match="menu-item">
     <cinclude:include>
       <xsl:attribute name="src">
-        <xsl:text>cocoon://</xsl:text>
+<xsl:text>cocoon://</xsl:text>
         <xsl:call-template name="strip-extension">
           <xsl:with-param name="the-string" select="@href"/>
         </xsl:call-template>
@@ -72,18 +71,16 @@
       </xsl:attribute>
     </cinclude:include>
   </xsl:template>
-
-  <!-- Strips the extension from a filename. Works for filenames with
+<!-- Strips the extension from a filename. Works for filenames with
   multiple dots. -->
   <xsl:template name="strip-extension">
     <xsl:param name="the-string"/>
     <xsl:value-of select="substring-before($the-string, '.')"/>
     <xsl:if test="substring-after($the-string, '.') != ''">
-      <xsl:text>.</xsl:text>
+<xsl:text>.</xsl:text>
       <xsl:call-template name="strip-extension">
         <xsl:with-param name="the-string" select="substring-after($the-string, '.')"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/copy.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/copy.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/copy.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/copy.xsl 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.
 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:template match="/">
     <xsl:copy-of select="."/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/query-to-cinclude-solr.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/query-to-cinclude-solr.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/query-to-cinclude-solr.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/query-to-cinclude-solr.xsl Mon Apr  9 22:45:15 2007
@@ -24,12 +24,9 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cinclude="http://apache.org/cocoon/include/1.0"
   xmlns:h="http://apache.org/cocoon/request/2.0">
-
-  <!-- The extension of the lucene index fragments. -->
+<!-- The extension of the lucene index fragments. -->
   <xsl:param name="host"/>
-
-
-  <!-- Creates the lucene:index root element from the Forrest
+<!-- Creates the lucene:index root element from the Forrest
   book. -->
   <xsl:template match="h:request ">
     <xsl:variable name="query">
@@ -41,13 +38,11 @@
       </xsl:attribute>
     </cinclude:include>
   </xsl:template>
-
-  <!-- Recursively processes h:parameter elements. -->
+<!-- Recursively processes h:parameter elements. -->
   <xsl:template match="h:requestParameters">
     <xsl:for-each select="h:parameter">
       <xsl:value-of select="@name"/>=<xsl:value-of select="normalize-space(h:value/text())"/>
       <xsl:if test="position()!=last()">&amp;</xsl:if>
     </xsl:for-each>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-add.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-add.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-add.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-add.xsl 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.
 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:template match="/">
     <add>
@@ -28,5 +27,4 @@
         select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-delete.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-delete.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-delete.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrDoc-delete.xsl 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.
 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:template match="/">
     <delete>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl Mon Apr  9 22:45:15 2007
@@ -15,9 +15,6 @@
   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">
   <xsl:include href="unescape.xsl"/>
   <xsl:param name="searchForm"/>
@@ -40,32 +37,37 @@
     <xsl:apply-templates select="paginator"/>
     <section id="result">
       <title>solr search result </title>
-      <p> Results
+      <p>
+        Results
         <xsl:if test="not($found=0)">
           <xsl:value-of select="$start+1"/>
           <xsl:choose>
             <xsl:when test="($start+$rows)&gt;$found and ($start+1 &lt; $found)">
               -
-              <xsl:value-of select="$found"/> </xsl:when>
+              <xsl:value-of select="$found"/>
+            </xsl:when>
             <xsl:when test="($start+$rows)&gt;$found and ($start+1 = $found)"/>
             <xsl:otherwise> -
-              <xsl:value-of select="$start+$rows"/> </xsl:otherwise>
+              <xsl:value-of select="$start+$rows"/>
+            </xsl:otherwise>
           </xsl:choose>
           of </xsl:if>
-        <xsl:value-of select="$found"/> for
-        <code>
-          <xsl:value-of select="$query"/>
-        </code>. (
-        <code>
-          <xsl:value-of select="$time"/>
-        </code> ms) </p>
+        <xsl:value-of select="$found"/>
+        for <code>
+        <xsl:value-of select="$query"/>
+        </code>. ( <code>
+        <xsl:value-of select="$time"/>
+        </code> ms)
+      </p>
       <xsl:for-each select="doc">
         <xsl:variable name="id" select="str[@name='id']"/>
         <section id="result-{$id}">
-          <title>
+          <title><xsl:value-of select="str[@name='title']"/></title>
+          <p>
+            <a href="{concat(substring-before($id,'.xml'),'.html')}">
             <xsl:value-of select="str[@name='title']"/>
-          </title>
-          <p><a href="{concat(substring-before($id,'.xml'),'.html')}"><xsl:value-of select="str[@name='title']"/></a> </p>
+            </a>
+          </p>
           <xsl:apply-templates
             select="//lst[@name='highlighting']/lst[@name=$id]"/>
         </section>
@@ -80,12 +82,12 @@
           <xsl:variable name="current" select="@current"/>
           <xsl:choose>
             <xsl:when test="$current='true'">
-              <xsl:text> </xsl:text><xsl:value-of select="@id"/><xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
+              <xsl:value-of select="@id"/>
+<xsl:text> </xsl:text>
             </xsl:when>
-            <xsl:otherwise>
-              <a href="{concat($searchForm,'?',@queryString)}">
-                <xsl:value-of select="@id"/>
-              </a>
+            <xsl:otherwise><a href="{concat($searchForm,'?',@queryString)}">
+              <xsl:value-of select="@id"/></a>
             </xsl:otherwise>
           </xsl:choose>
         </xsl:for-each>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl Mon Apr  9 22:45:15 2007
@@ -15,9 +15,6 @@
   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">
   <xsl:param name="command"/>
   <xsl:template match="/">
@@ -40,17 +37,23 @@
   <xsl:template match="result">
     <section id="result">
       <title>solr server response</title>
-      <p>Command: <xsl:value-of select="$command"/></p>
+      <p>
+        Command:
+        <xsl:value-of select="$command"/>
+      </p>
       <xsl:choose>
         <xsl:when test="not(@status='0')">
-          <warning>There was a problem:
-            <xsl:value-of select="."/></warning>
+          <warning>
+            There was a problem:
+            <xsl:value-of select="."/>
+          </warning>
         </xsl:when>
         <xsl:otherwise>
-          <p>Success.</p>
+          <p>
+            Success.
+          </p>
         </xsl:otherwise>
       </xsl:choose>
     </section>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/test.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/test.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/test.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/test.xsl 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.
 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:param name="document-url"/>
   <xsl:template match="/">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/unescape.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/unescape.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/unescape.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/unescape.xsl 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.
 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:template name="unescapeEm">
     <xsl:param name="val" select="''"/>
@@ -24,10 +23,8 @@
       <xsl:when test="$preEm or starts-with($val, '&lt;')">
         <xsl:variable name="insideEm" select="substring-before($val,
 '&lt;/')"/>
-        <xsl:value-of select="$preEm"/>
-        <em>
-          <xsl:value-of select="substring($insideEm, string-length($preEm)+5)"/>
-        </em>
+        <xsl:value-of select="$preEm"/><em>
+        <xsl:value-of select="substring($insideEm, string-length($preEm)+5)"/></em>
         <xsl:variable name="leftover"
           select="substring($val,
 string-length($insideEm) + 6)"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/xdocs-to-solrDoc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/xdocs-to-solrDoc.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/xdocs-to-solrDoc.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/xdocs-to-solrDoc.xsl Mon Apr  9 22:45:15 2007
@@ -15,11 +15,8 @@
   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">
-  <!-- The URL of the document which the indexing information stems
+<!-- The URL of the document which the indexing information stems
   from -->
   <xsl:param name="document-url"/>
   <xsl:param name="project"/>
@@ -37,7 +34,7 @@
       </field>
     </doc>
   </xsl:template>
-  <!-- Copies document header, title, and version-->
+<!-- Copies document header, title, and version-->
   <xsl:template
     match="header/title |
                        header/subtitle |

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft Mon Apr  9 22:45:15 2007
@@ -19,15 +19,20 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="solr-actionbar">
-  
   <description>
-    <p> This is the solr-actionbar contract, it will output links to manage forrest docs with
-      a Apache solr server. </p>
-    <p>In your solr server add the following field definitions to the schema.xml. We assume
-        "id" is already set as "uniqueKey" and you changed the "defaultSearchField" to
-        "content" otherwise you need to prefix your queries.</p>
+    <p>
+      This is the solr-actionbar contract, it will output links to manage
+      forrest docs with a Apache solr server.
+    </p>
+
+    <p>
+      In your solr server add the following field definitions to the schema.xml.
+      We assume "id" is already set as "uniqueKey" and you changed the
+      "defaultSearchField" to "content" otherwise you need to prefix your
+      queries.
+    </p>
     <source>
-      <![CDATA[<field name="content" type="text" indexed="true" stored="true" />
+<![CDATA[<field name="content" type="text" indexed="true" stored="true" />
 <field name="title" type="text" indexed="true" stored="true"/>
 <field name="subtitle" type="text" indexed="true" stored="true"/>
 <field name="abstract" type="text" indexed="true" stored="true"/>
@@ -35,9 +40,11 @@
 <field name="author" type="text" indexed="true" stored="true" multiValued="true"/>]]>
     </source>
   </description>
-  <usage><![CDATA[<forrest:contract name="solr-actionbar">
+  <usage>
+<![CDATA[<forrest:contract name="solr-actionbar">
   <forrest:property name="request">#{$getRequest}</forrest:property>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="solr-actionbar" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -52,37 +59,28 @@
               <xsl:when test="$request='linkmap'"> not supported here.</xsl:when>
               <xsl:otherwise>
                 <ul>
-              <li>
-                <xsl:choose>
-                  <xsl:when test="contains($request,'solr.add.do')">
+                  <li><xsl:choose>
+                      <xsl:when test="contains($request,'solr.add.do')">
                     add document (not committed)
                   </xsl:when>
-                  <xsl:when test="contains($request,'solr-search') or contains($request,'solr.commit') or contains($request,'solr.delete.do') or contains($request,'solr.optimize')"/>
-                  <xsl:otherwise>
-                    <a href="{normalize-space($root)}{$request}.solr.add.do.html"> add document </a>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </li>
-              <li>
-                <xsl:choose>
-                  <xsl:when test="contains($request,'solr.delete.do')">
+                      <xsl:when test="contains($request,'solr-search') or contains($request,'solr.commit') or contains($request,'solr.delete.do') or contains($request,'solr.optimize')"/>
+                      <xsl:otherwise><a href="{normalize-space($root)}{$request}.solr.add.do.html"> add document </a>
+                      </xsl:otherwise>
+                    </xsl:choose></li>
+                  <li><xsl:choose>
+                      <xsl:when test="contains($request,'solr.delete.do')">
                     delete document (not committed)
                   </xsl:when>
-                  <xsl:when test="contains($request,'solr-search') or contains($request,'solr.commit') or contains($request,'solr.add.do') or contains($request,'solr.optimize')"/>
-                  <xsl:otherwise>
-                    <a href="{normalize-space($root)}{$request}.solr.delete.do.html"> delete document</a>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </li>
-              <li>
-                <a href="{normalize-space($root)}solr.commit.do.html"> commit </a>
-              </li>
-              <li>
-                <a href="{normalize-space($root)}solr.optimize.do.html"> optimize </a>
-              </li>
-            </ul>
+                      <xsl:when test="contains($request,'solr-search') or contains($request,'solr.commit') or contains($request,'solr.add.do') or contains($request,'solr.optimize')"/>
+                      <xsl:otherwise><a href="{normalize-space($root)}{$request}.solr.delete.do.html"> delete document</a>
+                      </xsl:otherwise>
+                    </xsl:choose></li>
+                  <li><a href="{normalize-space($root)}solr.commit.do.html"> commit </a></li>
+                  <li><a href="{normalize-space($root)}solr.optimize.do.html"> optimize </a></li>
+                </ul>
               </xsl:otherwise>
-            </xsl:choose> </forrest:part>
+            </xsl:choose>
+          </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-add.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-add.ft?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-add.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-add.ft Mon Apr  9 22:45:15 2007
@@ -20,13 +20,18 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="solr-add">
   <description>
-    <p> This is the solr-add contract, it will output a link to the solr server for updating the
-      solr index with the current document. When run in static mode it allows you to update the
-      Solr server with the content of your website at the same time you generate the site. </p>
+    <p>
+      This is the solr-add contract, it will output a link to the solr server
+      for updating the solr index with the current document. When run in static
+      mode it allows you to update the Solr server with the content of your
+      website at the same time you generate the site.
+    </p>
   </description>
-  <usage><![CDATA[<forrest:contract name="solr-add">
+  <usage>
+<![CDATA[<forrest:contract name="solr-add">
   <forrest:property name="request">#{$getRequest}</forrest:property>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="solr-add" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -37,8 +42,7 @@
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
-            <xsl:if test="not($request='linkmap') and not(contains($request,'solr-search')) and not(contains($request,'solr.add.do'))">
-              <link href="{normalize-space($root)}{$request}.solr.add.do.html"/>  
+            <xsl:if test="not($request='linkmap') and not(contains($request,'solr-search')) and not(contains($request,'solr.add.do'))"><link href="{normalize-space($root)}{$request}.solr.add.do.html"/>
             </xsl:if>
           </forrest:part>
         </forrest:content>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft Mon Apr  9 22:45:15 2007
@@ -19,25 +19,34 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="solr-search">
-  
   <description>
-    <p> This is the solr-search contract, it will output a search form to search an Apache solr server. </p>
-    <p>In your solr server change the following field definition in the schema.xml. We assume
-        "id" is already set as "uniqueKey" and you changed the "defaultSearchField" to
-        "content" otherwise you need to prefix your queries.</p>
-      <source><![CDATA[<field name="content" type="text" indexed="true" stored="true" />
+    <p>
+      This is the solr-search contract, it will output a search form to search
+      an Apache solr server.
+    </p>
+
+    <p>
+      In your solr server change the following field definition in the
+      schema.xml. We assume "id" is already set as "uniqueKey" and you changed
+      the "defaultSearchField" to "content" otherwise you need to prefix your
+      queries.
+    </p>
+    <source>
+<![CDATA[<field name="content" type="text" indexed="true" stored="true" />
 <field name="title" type="text" indexed="true" stored="true"/>
 <field name="subtitle" type="text" indexed="true" stored="true"/>
 <field name="abstract" type="text" indexed="true" stored="true"/>
 <field name="version" type="text" indexed="true" stored="true"/>
-<field name="author" type="text" indexed="true" stored="true" multiValued="true"/>]]> </source>
+<field name="author" type="text" indexed="true" stored="true" multiValued="true"/>]]>
+    </source>
     <div class="warning">
       <div class="label">Warning</div>
       <div class="content">You need to include <![CDATA[<forrest:contract name="helper-form-blank"/>]]>
         in your view!!! If you are not, the contract will not work correctly.</div>
     </div>
   </description>
-  <usage><![CDATA[<forrest:contract name="solr-search">
+  <usage>
+<![CDATA[<forrest:contract name="solr-search">
  <forrest:property name="hidden">
   <input name="hl" type="hidden" value="true"/>
   <input name="hl.fl" type="hidden" value="content"/>
@@ -46,7 +55,8 @@
   <input name="rows" type="hidden" value="10"/>
   <input name="start" type="hidden" value="0"/>
  </forrest:property>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="solr-search" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -74,7 +84,8 @@
               <div class="searchSubmit">
                 <input name="Search" type="submit" value="Search"/>
               </div>
-            </form> </forrest:part>
+            </form>
+          </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/panels/solrbar.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/panels/solrbar.panel.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/panels/solrbar.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/panels/solrbar.panel.xml Mon Apr  9 22:45:15 2007
@@ -17,43 +17,43 @@
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <!-- default plugin CSS -->
-    <forrest:contract name="branding-css-links">
-      <forrest:property name="branding-css-links-input">
-        <css url="solr.css" media="screen" theme="Pelt"/>
-      </forrest:property>
-    </forrest:contract>
-    <!-- In static mode solr-add allows you to update a Solr server with the content of your
+<!-- default plugin CSS -->
+  <forrest:contract name="branding-css-links">
+    <forrest:property name="branding-css-links-input">
+      <css url="solr.css" media="screen" theme="Pelt"/>
+    </forrest:property>
+  </forrest:contract>
+<!-- In static mode solr-add allows you to update a Solr server with the content of your
         website at the same time you generate the site. -->
-    <forrest:contract name="solr-add">
-      <forrest:property name="request">#{$getRequest}</forrest:property>
-    </forrest:contract>
-    <forrest:hook name="solr">
-      <forrest:hook class="solrSearch">
-      <!--Search interface (solr-search contract) to
+  <forrest:contract name="solr-add">
+    <forrest:property name="request">#{$getRequest}</forrest:property>
+  </forrest:contract>
+  <forrest:hook name="solr">
+    <forrest:hook class="solrSearch">
+<!--Search interface (solr-search contract) to
         search your solr server. -->
-        <forrest:contract name="solr-search">
-          <forrest:property name="hidden">
-            <input name="hl" type="hidden" value="true"/>
-            <input name="hl.fl" type="hidden" value="content"/>
-            <input name="fl" type="hidden" value="id,title"/>
-            <input name="indent" type="hidden" value="on"/>
-            <input name="rows" type="hidden" value="10"/>
-            <input name="start" type="hidden" value="0"/>
-          </forrest:property>
-        </forrest:contract>
-      </forrest:hook>
-      <jx:set var="userAgent" value="${cocoon.request.getHeader('User-Agent')}"/>
-      <!-- If the userAgent is the cocoon crawler then we do not want to 
+      <forrest:contract name="solr-search">
+        <forrest:property name="hidden">
+          <input name="hl" type="hidden" value="true"/>
+          <input name="hl.fl" type="hidden" value="content"/>
+          <input name="fl" type="hidden" value="id,title"/>
+          <input name="indent" type="hidden" value="on"/>
+          <input name="rows" type="hidden" value="10"/>
+          <input name="start" type="hidden" value="0"/>
+        </forrest:property>
+      </forrest:contract>
+    </forrest:hook>
+    <jx:set var="userAgent" value="${cocoon.request.getHeader('User-Agent')}"/>
+<!-- If the userAgent is the cocoon crawler then we do not want to 
       output the actionbar. The cocoon crawler does not provide the request
       header "User-Agent" meaning null.-->
-      <jx:if test="${null!=userAgent}">
-        <forrest:hook class="solrActionbar">
-        <!-- GUI to manage your project in solr. -->
-          <forrest:contract name="solr-actionbar">
-            <forrest:property name="request">#{$getRequest}</forrest:property>
-          </forrest:contract>
-        </forrest:hook>
-      </jx:if>
-    </forrest:hook>
-</forrest:template>
\ No newline at end of file
+    <jx:if test="${null!=userAgent}">
+      <forrest:hook class="solrActionbar">
+<!-- GUI to manage your project in solr. -->
+        <forrest:contract name="solr-actionbar">
+          <forrest:property name="request">#{$getRequest}</forrest:property>
+        </forrest:contract>
+      </forrest:hook>
+    </jx:if>
+  </forrest:hook>
+</forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/content/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/content/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/content/locationmap.xml Mon Apr  9 22:45:15 2007
@@ -20,7 +20,7 @@
     <matchers default="lm">
       <matcher name="lm" src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
-    <!--
+<!--
       * Can contain any sitemap selector with the following syntax. * 
     <selectors default="exists">
       <selector name="exists" logger="sitemap.selector.exists"  
@@ -28,28 +28,24 @@
     </selectors>
     -->
   </components>
-
-  <!--
+<!--
     * Can contain a mount statement as a sibling to components and locator *
     <mount src="somelocation.xml"/>
   -->
-
   <locator>
-    <!--
+<!--
       * Can contain a mount within a selector where a selector is valid. 
     <select>
       <mount src="somelocation.xml"/>
     </select>
     -->
-
     <match pattern="rewriteDemo/**">
       <location src="http://cocoon.apache.org/{1}.html"/>
     </match>
     <match pattern="remoteDemo/**.xml">
       <location src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml"/>
     </match>
-
-    <!-- 
+<!-- 
       * Can use a selector inside a match.  *
     <match pattern="somepattern/**">
       <select>
@@ -59,7 +55,7 @@
       </select>
     </match>
     -->
-    <!--
+<!--
      To locate all your source documents in a slide repository you can do:
 
     <match pattern="tabs.xml">



Mime
View raw message