forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527038 [6/15] - in /forrest/trunk/whiteboard/plugins: ./ org.apache.forrest.plugin.Database/ org.apache.forrest.plugin.Database/resources/stylesheets/ org.apache.forrest.plugin.Database/src/documentation/ org.apache.forrest.plugin.Database...
Date Tue, 10 Apr 2007 05:45:31 GMT
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -23,50 +23,59 @@
   <body>
     <section id="overview">
       <title>Apache Forrest - org.apache.forrest.plugin.input.ecs Plugin</title>
-      <p>Takes responses from Amaqzons Web Services (ECS) and renders them within a Forrest site.</p>
+      <p>
+        Takes responses from Amaqzons Web Services (ECS) and renders them within
+        a Forrest site.
+      </p>
     </section>
-
     <section id="usage">
       <title>Usage</title>
-      <p>Unfortunately Amazon does not serve content with a doctype identifier. This
-      makes it impossible for Forrest to work out which transformations need to be 
-      applied. Consequently, we need to use a naming convention to inform Forrest
-      when a file is a an Amazon file. You can use the Locationmap to hide this
-      naming structure from your users. However, in this document and the enclosed
-      samples we will using the required naming convention directly so that you can
-      see how it works.</p>
-
-      <p>All requests to be processed by this plugin must have an *.ecs.* filename.
-      The first wildcard is the requested file, the second is the requested 
-      format. The source files themselve must be named *.ecs.amazon.xml for the
-      Amazon response file. In addition you can provide an *.ecs.local.xml that defines
-      additional local information, such as your own editoriak review.</p>
-
-      <p>You can retrieve the original ECS response by requesting *.ecs.source.xml.</p>
+      <p>
+        Unfortunately Amazon does not serve content with a doctype identifier.
+        This makes it impossible for Forrest to work out which transformations
+        need to be applied. Consequently, we need to use a naming convention to
+        inform Forrest when a file is a an Amazon file. You can use the
+        Locationmap to hide this naming structure from your users. However, in
+        this document and the enclosed samples we will using the required naming
+        convention directly so that you can see how it works.
+      </p>
+      <p>
+        All requests to be processed by this plugin must have an *.ecs.*
+        filename. The first wildcard is the requested file, the second is the
+        requested format. The source files themselve must be named
+        *.ecs.amazon.xml for the Amazon response file. In addition you can
+        provide an *.ecs.local.xml that defines additional local information,
+        such as your own editoriak review.
+      </p>
+      <p>
+        You can retrieve the original ECS response by requesting
+        *.ecs.source.xml.
+      </p>
     </section>
-    
     <section>
       <title>Static or Live Data?</title>
-      <p>Using the locationmap it is possible to retrieve live data from Amazon
-      when running Forrest in dynamic mode. However, please be aware of Amazons
-      rules regarding caching of data.</p>
+      <p>
+        Using the locationmap it is possible to retrieve live data from Amazon
+        when running Forrest in dynamic mode. However, please be aware of
+        Amazons rules regarding caching of data.
+      </p>
     </section>
-    
     <section>
       <title>Layout</title>
-      
-      <note>Currently this plugin uses the "old fashioned" skinning system
-      of Forrest 0.7 and earlier. However, it will soon be modified to use
-      the brand spanking new "forrest:views" system in 0.8. This will provide 
-      much more control over the layout and use of data within an Amazon page.
-      In the meantime you have full control over the layout of an ECS page using
-      CSS, as described below.</note>
-      
-      <p>All elements are enclosed within <code>&lt;div&gt;</code> elements
-      to enable the site designer to control the laout of their page using CSS.
-      This table below indicates the names of these section for various parts
-      of the webpage.</p>
-      
+      <note>
+        Currently this plugin uses the "old fashioned" skinning system of
+        Forrest 0.7 and earlier. However, it will soon be modified to use the
+        brand spanking new "forrest:views" system in 0.8. This will provide much
+        more control over the layout and use of data within an Amazon page. In
+        the meantime you have full control over the layout of an ECS page using
+        CSS, as described below.
+      </note>
+      <p>
+        All elements are enclosed within <code>&lt;div&gt;</code> elements to
+        enable the site designer to control the laout of their page using CSS.
+        This table below indicates the names of these section for various parts
+        of the webpage.
+      </p>
       <table>
         <tr>
           <th>Page Element</th>
@@ -117,14 +126,14 @@
           <td>ecs_customerReviewsSummary</td>
         </tr>
       </table>
-      
-      <p>There are a couple of exceptions to this rule. Items such as customer reviews
-      and editorial reviews sometimes recur for multiple values. In this case we cannot
-      use the id attribute, so we assing a class to the div instead. The table below
-      describes the class name, this name will have the element number at the
-      end (in place of the asterisk in the table).</p>
-      
-      
+      <p>
+        There are a couple of exceptions to this rule. Items such as customer
+        reviews and editorial reviews sometimes recur for multiple values. In
+        this case we cannot use the id attribute, so we assing a class to the
+        div instead. The table below describes the class name, this name will
+        have the element number at the end (in place of the asterisk in the
+        table).
+      </p>
       <table>
         <tr>
           <th>Page Element</th>
@@ -151,36 +160,33 @@
           <td>ecs_largeImage_*</td>
         </tr>
       </table>
-      
-      <p>You can find examples of how to use this CSS to control the display of
-      your product page in the plugins skinconf.xml file.</p>
+      <p>
+        You can find examples of how to use this CSS to control the display of
+        your product page in the plugins skinconf.xml file.
+      </p>
     </section>
-          
-
     <section>
       <title>Status</title>
-      <p>Support of item lookups is fairly complete, but support of 
-      the search results is minimal.</p>
+      <p>
+        Support of item lookups is fairly complete, but support of the search
+        results is minimal.
+      </p>
     </section>
-
     <section id="samples">
       <title>Samples</title>
-      <p>This section includes links to a number of samples using this plugin. The
-      plugin is intended to be self documenting through these samples. If you 
-      require further help please ask on the user mailing list.</p>
-
+      <p>
+        This section includes links to a number of samples using this plugin.
+        The plugin is intended to be self documenting through these samples. If
+        you require further help please ask on the user mailing list.
+      </p>
       <ul>
-        <li>
-          <a href="sample/itemLookup1.ecs.html">An Item Lookup</a>
-        </li>
-        <li>
-          <a href="sample/itemSearch1.ecs.html">An Item Search</a>
-        </li>
+        <li><a href="sample/itemLookup1.ecs.html">An Item Lookup</a></li>
+        <li><a href="sample/itemSearch1.ecs.html">An Item Search</a></li>
       </ul>
-
-      <note>The more samples included here the easier it is for users to
-      understand this plugin. If you can provide additional samples please
-      do so.</note>
+      <note>
+        The more samples included here the easier it is for users to understand
+        this plugin. If you can provide additional samples please do so.
+      </note>
     </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.amazon.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.amazon.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.amazon.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.amazon.xml Mon Apr  9 22:45:15 2007
@@ -1097,4 +1097,4 @@
       </ListmaniaLists>
     </Item>
   </Items>
-</ItemLookupResponse>
\ No newline at end of file
+</ItemLookupResponse>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.local.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.local.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.local.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemLookup1.ecs.local.xml Mon Apr  9 22:45:15 2007
@@ -16,13 +16,13 @@
   limitations under the License.
 -->
 <item>
-<EditorialReviews  xmlns="http://webservices.amazon.com/ECSECommerceService/2005-07-26">
-  <EditorialReview>
-    <Source>Our Local Review</Source>
-    <Content>This is a product review by our own staff. 
+  <EditorialReviews  xmlns="http://webservices.amazon.com/ECSECommerceService/2005-07-26">
+    <EditorialReview>
+      <Source>Our Local Review</Source>
+      <Content>This is a product review by our own staff. 
     This product is really fantastic. Why not buy twenty of them.
     It's got squeaky bits and eveything. It even talks with a non-descript
     American/Computer accent. Go one, you know you want to ;-)</Content>
-  </EditorialReview>
-</EditorialReviews>
+    </EditorialReview>
+  </EditorialReviews>
 </item>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemSearch1.ecs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemSearch1.ecs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemSearch1.ecs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/content/xdocs/sample/itemSearch1.ecs.xml Mon Apr  9 22:45:15 2007
@@ -143,4 +143,4 @@
       </ItemAttributes>
     </Item>
   </Items>
-</ItemSearchResponse> 
+</ItemSearchResponse>

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

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/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: ecs input</project-name>
   <project-description>org.apache.forrest.plugin.input.ecs plugin for Apache Forrest</project-description>
-
 </skinconfig>

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

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap Mon Apr  9 22:45:15 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:components>
     <map:generators default="tidied-xml">
       <map:generator name="tidied-xml"      
@@ -24,7 +23,6 @@
         <jtidy-config>WEB-INF/jtidy-xml.properties</jtidy-config>
       </map:generator>
     </map:generators>
-    
     <map:actions>
       <map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.forrest.sourcetype.SourceTypeAction">
         <sourcetype name="J2SE">
@@ -32,18 +30,15 @@
         </sourcetype>
       </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.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
     </map:selectors>
   </map:components>
-  
-  <map:resources>    
+  <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="J2SE">
             <map:generate src="{properties:content.xdocs}{../../1}.xml" />
             <map:transform src="resources/stylesheets/j2se2document.xsl" />
@@ -53,23 +48,20 @@
       </map:act>
     </map:resource>
   </map:resources>
-
-<map:pipelines>
-
-  <map:pipeline>
-    <map:pipeline internal="true">
-      <map:match pattern="do/view/log.xml">
-        <map:generate src="{request-param:protocol}://{request-param:url}"/>
-        <map:transform src="resources/stylesheets/j2se2document.xsl" />
-        <map:serialize type="xml-document"/>
-      </map:match>
-      <map:match pattern="**.xml">
-        <map:call resource="transform-to-document">
-          <map:parameter name="src" value="{properties:content.xdocs}{1}.xml" />
-        </map:call>
-      </map:match>
+  <map:pipelines>
+    <map:pipeline>
+      <map:pipeline internal="true">
+        <map:match pattern="do/view/log.xml">
+          <map:generate src="{request-param:protocol}://{request-param:url}"/>
+          <map:transform src="resources/stylesheets/j2se2document.xsl" />
+          <map:serialize type="xml-document"/>
+        </map:match>
+        <map:match pattern="**.xml">
+          <map:call resource="transform-to-document">
+            <map:parameter name="src" value="{properties:content.xdocs}{1}.xml" />
+          </map:call>
+        </map:match>
+      </map:pipeline>
     </map:pipeline>
-  </map:pipeline>
-</map:pipelines>
-
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/resources/stylesheets/j2se2document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/resources/stylesheets/j2se2document.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/resources/stylesheets/j2se2document.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/resources/stylesheets/j2se2document.xsl Mon Apr  9 22:45:15 2007
@@ -16,32 +16,43 @@
   limitations under the License.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <xsl:template match="/">
-        <document>
-          <header>
-          <title>J2SE Log Output</title>
-          </header>
-          <body>
-            <xsl:for-each select="log/record">
-              <xsl:sort select="sequence" data-type="number" order="descending"/>
-              <section>
-                <xsl:choose>
-                  <xsl:when test="message='ENTRY'">
-                    <title>Entering: <xsl:value-of select="method"/>() in <xsl:value-of select="class"/></title>
-                  </xsl:when>
-                  <xsl:when test="message='EXIT'">
-                    <title>Exiting: <xsl:value-of select="method"/>() in <xsl:value-of select="class"/></title>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <title><xsl:value-of select="level"/>: <xsl:value-of select="message"/></title>
-                    <p>Logged By: <strong><xsl:value-of select="class"/>.<xsl:value-of select="method"/>()</strong></p>
-                  </xsl:otherwise>
-                </xsl:choose>
-                <p>Logged At: <strong> <xsl:value-of select="date"/> (<xsl:value-of select="millis"/>)</strong></p>
-              </section>
-            </xsl:for-each>
-          </body>
-        </document>
-    </xsl:template>
+  <xsl:template match="/">
+    <document>
+      <header>
+        <title>J2SE Log Output</title>
+      </header>
+      <body>
+        <xsl:for-each select="log/record">
+          <xsl:sort select="sequence" data-type="number" order="descending"/>
+          <section>
+            <xsl:choose>
+              <xsl:when test="message='ENTRY'">
+                <title>Entering: <xsl:value-of select="method"/>() in <xsl:value-of select="class"/></title>
+              </xsl:when>
+              <xsl:when test="message='EXIT'">
+                <title>Exiting: <xsl:value-of select="method"/>() in <xsl:value-of select="class"/></title>
+              </xsl:when>
+              <xsl:otherwise>
+                <title><xsl:value-of select="level"/>: <xsl:value-of select="message"/></title>
+                <p>
+                  Logged By: <strong>
+                  <xsl:value-of select="class"/>
+                  .
+                  <xsl:value-of select="method"/>
+                  ()</strong>
+                </p>
+              </xsl:otherwise>
+            </xsl:choose>
+            <p>
+              Logged At: <strong>
+              <xsl:value-of select="date"/>
+              (
+              <xsl:value-of select="millis"/>
+              )</strong>
+            </p>
+          </section>
+        </xsl:for-each>
+      </body>
+    </document>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,19 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welcome to the org.apache.forrest.plugin.logs Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.logs Plugin</title>
+  </header>
+  <body>
     <section>
       <title>Apache Forrest - org.apache.forrest.plugin.logs Plugin</title>
-      <p>This plugin creates a Forrest page from Java Log files. It is
-      hoped that it will, in the future, be extended to support other
-      types of logs (for example, GUMP logs, SVN logs etc.).</p>
+      <p>
+        This plugin creates a Forrest page from Java Log files. It is hoped that
+        it will, in the future, be extended to support other types of logs (for
+        example, GUMP logs, SVN logs etc.).
+      </p>
     </section>
-    
     <section>
       <title>Supported Formats</title>
       <ul>
@@ -35,4 +36,4 @@
       </ul>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/javaLogAPI.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/javaLogAPI.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/javaLogAPI.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/javaLogAPI.xml Mon Apr  9 22:45:15 2007
@@ -16,25 +16,27 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Java Logging API</title> 
-  </header> 
-  <body> 
-    <p>The Java Logging API is part the 
-    <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html">J2SE 
-    API Specification</a> an overview of the  key elements of this API is
-    <a href="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/overview.html">available</a>.</p>
-    
+<document>
+  <header>
+    <title>Java Logging API</title>
+  </header>
+  <body>
+    <p>
+      The Java Logging API is part the
+      <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html">J2SE
+      API Specification</a> an overview of the key elements of this API is
+      <a href="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/overview.html">available</a>.
+    </p>
     <section>
       <title>Integrating Java Logs in a Forrest Site</title>
-      
-      <p>If you have the log file available, simply place it in your projects 
-      xdoc directory and link to it as normal. For example, the following file
-      is stored within this projects xdocs directory in a <code>samples</code>
-      subfolder.</p>
-      
-      <source><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <p>
+        If you have the log file available, simply place it in your projects
+        xdoc directory and link to it as normal. For example, the following file
+        is stored within this projects xdocs directory in a <code>samples</code>
+        subfolder.
+      </p>
+      <source>
+<![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE log SYSTEM "logger.dtd">
 <log>
 <record>
@@ -82,20 +84,22 @@
   <message>Goodbye world!</message>
 </record>
 </log>
-      ]]></source>
-      
-      <p>To view this document as an HTML page you would use the following 
-      link <a href="samples/javaLogAPI.html">&lt;a href="samples/javaLogAPI.html&gt;</a>.</p>
-      
-      <p>If the log file is not available to you, but instead is available at
-      a given URL then you need to tell the plugin where to find the log
-      file, it will then retrieve the file and include it as if it were 
-      local. To do this you make a request the URL 
-      <code>/do/view/log.FORMAT</code>, where <code>FORMAT</code> is any 
-      extension that your Forrest project recognises (e.g. html, pdf etc). In
-      addition you need to pass some parameters in the URL so that the
-      plugin can find your log file:</p>
-      
+      ]]>
+      </source>
+      <p>
+        To view this document as an HTML page you would use the following link
+        <a href="samples/javaLogAPI.html">&lt;a
+        href="samples/javaLogAPI.html&gt;</a>.
+      </p>
+      <p>
+        If the log file is not available to you, but instead is available at a
+        given URL then you need to tell the plugin where to find the log file,
+        it will then retrieve the file and include it as if it were local. To do
+        this you make a request the URL <code>/do/view/log.FORMAT</code>, where
+        <code>FORMAT</code> is any extension that your Forrest project
+        recognises (e.g. html, pdf etc). In addition you need to pass some
+        parameters in the URL so that the plugin can find your log file:
+      </p>
       <table>
         <tr>
           <th>Parameter</th>
@@ -110,17 +114,17 @@
           <td>The protocol to use when retrieving the log file</td>
         </tr>
       </table>
-      
-      <p>For example, to retrieve a log file from a location on your local 
-      hard drive you would construct an URL something like this (to
-      view the html page):</p>
-      
+      <p>
+        For example, to retrieve a log file from a location on your local hard
+        drive you would construct an URL something like this (to view the html
+        page):
+      </p>
       <source>
         &lt;a href="/do/view/log.html?protocol=file&amp;location=path\to\file\file.log"&gt;View Log&lt;/&gt;
       </source>
-      
-      <p>or to view the PDF version of the log file:</p>
-      
+      <p>
+        or to view the PDF version of the log file:
+      </p>
       <source>
         &lt;a href="/do/view/log.pdf?protocol=file&amp;location=path\to\file\file.log"&gt;View Log&lt;/&gt;
       </source>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/samples/javaLogAPI.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/samples/javaLogAPI.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/samples/javaLogAPI.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/samples/javaLogAPI.xml Mon Apr  9 22:45:15 2007
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE log SYSTEM "logger.dtd">
 <log>
-<record>
-  <date>2000-08-23 19:21:05</date>
-  <millis>967083665789</millis>
-  <sequence>1256</sequence>
-  <logger>kgh.test.fred</logger>
-  <level>INFO</level>
-  <class>kgh.test.XMLTest</class>
-  <method>writeLog</method>
-  <thread>10</thread>
-  <message>Hello world!</message>
-</record>
-<record>
-  <date>2000-08-23 19:21:10</date>
-  <millis>967083665789</millis>
-  <sequence>1265</sequence>
-  <logger>kgh.test.fred</logger>
-  <level>INFO</level>
-  <class>kgh.test.XMLTest</class>
-  <method>writeLog</method>
-  <thread>10</thread>
-  <message>I'm the third log message (but recorded second in the file)</message>
-</record>
-<record>
-  <date>2000-08-23 19:21:06</date>
-  <millis>967083665789</millis>
-  <sequence>1260</sequence>
-  <logger>kgh.test.fred</logger>
-  <level>INFO</level>
-  <class>kgh.test.XMLTest</class>
-  <method>writeLog</method>
-  <thread>10</thread>
-  <message>This is the second log message in terms of time, but the third in the log file.</message>
-</record>
-<record>
-  <date>2000-08-23 19:21:15</date>
-  <millis>967083665789</millis>
-  <sequence>1270</sequence>
-  <logger>kgh.test.fred</logger>
-  <level>INFO</level>
-  <class>kgh.test.XMLTest</class>
-  <method>destroy</method>
-  <thread>10</thread>
-  <message>Goodbye world!</message>
-</record>
+  <record>
+    <date>2000-08-23 19:21:05</date>
+    <millis>967083665789</millis>
+    <sequence>1256</sequence>
+    <logger>kgh.test.fred</logger>
+    <level>INFO</level>
+    <class>kgh.test.XMLTest</class>
+    <method>writeLog</method>
+    <thread>10</thread>
+    <message>Hello world!</message>
+  </record>
+  <record>
+    <date>2000-08-23 19:21:10</date>
+    <millis>967083665789</millis>
+    <sequence>1265</sequence>
+    <logger>kgh.test.fred</logger>
+    <level>INFO</level>
+    <class>kgh.test.XMLTest</class>
+    <method>writeLog</method>
+    <thread>10</thread>
+    <message>I'm the third log message (but recorded second in the file)</message>
+  </record>
+  <record>
+    <date>2000-08-23 19:21:06</date>
+    <millis>967083665789</millis>
+    <sequence>1260</sequence>
+    <logger>kgh.test.fred</logger>
+    <level>INFO</level>
+    <class>kgh.test.XMLTest</class>
+    <method>writeLog</method>
+    <thread>10</thread>
+    <message>This is the second log message in terms of time, but the third in the log file.</message>
+  </record>
+  <record>
+    <date>2000-08-23 19:21:15</date>
+    <millis>967083665789</millis>
+    <sequence>1270</sequence>
+    <logger>kgh.test.fred</logger>
+    <level>INFO</level>
+    <class>kgh.test.XMLTest</class>
+    <method>destroy</method>
+    <thread>10</thread>
+    <message>Goodbye world!</message>
+  </record>
 </log>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/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,27 +28,22 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.logs" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.logs"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-  
   <sample label="Samples" href="samples/" tab="samples">
     <javaLogAPI label="Java Logger API" href="javaLogAPI.html"/>
   </sample>
-
-  <!--
+<!--
   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"/>
@@ -60,5 +54,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.input.logs/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/content/xdocs/tabs.xml Mon Apr  9 22:45:15 2007
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-
 <tabs software="MyProj"
   title="MyProj"
   copyright="Foo"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <!-- The rules for tabs are:
+<!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -32,12 +30,10 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="" label="Home" dir="" indexfile="index.html"/>
   <tab id="samples" label="Samples" dir="samples/" indexfile="javaLogAPI.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/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: logs input</project-name>
   <project-description>org.apache.forrest.plugin.input.logs plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/status.xml Mon Apr  9 22:45:15 2007
@@ -16,19 +16,17 @@
   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>
     <release version="0.1" date="unreleased">
       <action dev="RDG" type="update" context="admin">
@@ -43,7 +41,6 @@
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="high">
       <action context="docs" dev="RDG">
@@ -57,5 +54,4 @@
       </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/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.input.odt"/>
   <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.input.odt/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap Mon Apr  9 22:45:15 2007
@@ -16,29 +16,28 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:pipelines>
     <map:pipeline internal="true">
       <map:match pattern="**.xml">
-      <map:select type="exists">
-        <map:when test="{lm:project.{1}.odt}">
-          <map:aggregate element="odt">
-            <map:part src="cocoon:/{1}.meta.odt.xml" element="meta" />
-            <map:part src="cocoon:/{1}.styles.odt.xml" element="styles" />
-            <map:part src="cocoon:/{1}.content.odt.xml"
+        <map:select type="exists">
+          <map:when test="{lm:project.{1}.odt}">
+            <map:aggregate element="odt">
+              <map:part src="cocoon:/{1}.meta.odt.xml" element="meta" />
+              <map:part src="cocoon:/{1}.styles.odt.xml" element="styles" />
+              <map:part src="cocoon:/{1}.content.odt.xml"
               element="content" />
-          </map:aggregate>
-          <map:transform src="{lm:transform.odt-forrest.xhtml}">
-            <map:parameter name="path" value="{1}"/>
-          </map:transform>
-          <map:transform src="{lm:transform.xml.xml-namespace-stripped}" />
-          <map:transform src="{lm:transform.html.document}" />
-          <map:serialize type="xml" />
-        </map:when>
-      </map:select>
+            </map:aggregate>
+            <map:transform src="{lm:transform.odt-forrest.xhtml}">
+              <map:parameter name="path" value="{1}"/>
+            </map:transform>
+            <map:transform src="{lm:transform.xml.xml-namespace-stripped}" />
+            <map:transform src="{lm:transform.html.document}" />
+            <map:serialize type="xml" />
+          </map:when>
+        </map:select>
       </map:match>
     </map:pipeline>
-    <!-- FIXME - We can have just one pipeline to superseed the following... -->
+<!-- FIXME - We can have just one pipeline to superseed the following... -->
     <map:pipeline internal="true">
       <map:match pattern="**.meta.odt.xml">
         <map:generate src="zip:{lm:project.{1}.odt}!/meta.xml" />
@@ -58,5 +57,4 @@
       </map:match>
     </map:pipeline>
   </map:pipelines>
-
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/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,13 +23,12 @@
         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>  
-    <!-- A project can to supersede the standard transform.odt.xhtml file to add specific feature.
+  <locator>
+<!-- A project can to supersede the standard transform.odt.xhtml file to add specific feature.
          The customised style sheet should be in {properties:resources}stylesheets/xslt/odt/odt_to_xhtml.xsl
          to include the standard in the new stylesheet, just import the standard stylesheet has follows :
            <xsl:import href="lm://std-transform.odt.xhtml"/>
@@ -45,7 +43,6 @@
         />
       </select>
     </match>
-
     <match pattern="std-transform.odt.xhtml">
       <select>
         <location 
@@ -53,7 +50,6 @@
           />
       </select>
     </match>
-
     <match pattern="transform.odt-forrest.xhtml">
       <select type="exists">
         <location 
@@ -64,7 +60,6 @@
         />
       </select>
     </match>
-
     <match pattern="std-transform.odt-forrest.xhtml">
       <select>
         <location 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap Mon Apr  9 22:45:15 2007
@@ -18,15 +18,12 @@
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:pipelines>
     <map:pipeline internal="true">
-
       <map:match pattern="openDocumentEmbeddedImages/zip-**/file-**.*">
         <map:read src="jar:file:///{lm:project.{1}!/{2}.{3}}" mime-type="image/{3}" />
       </map:match>
-      
       <map:match pattern="**/openDocumentEmbeddedImages/zip-**/file-**.*">
         <map:read src="jar:file:///{lm:project.{1}/{2}!/{3}.{4}}" mime-type="image/{4}" />
       </map:match>
-      
     </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl Mon Apr  9 22:45:15 2007
@@ -26,55 +26,50 @@
   xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0">
   <xsl:import href="lm://transform.odt.xhtml"/>
   <xsl:param name="path" select="'odt path name'"/>
-  
   <xsl:include href="lm://transform.xml.dotdots"/>
   <xsl:include href="lm://transform.xml.pathutils"/>
-
-  <!-- Calculate dirname -->
+<!-- Calculate dirname -->
   <xsl:variable name="dirname">
     <xsl:call-template name="dirname">
       <xsl:with-param name="path" select="$path"/>
     </xsl:call-template>
   </xsl:variable>
-  <!-- Calculate filename -->
+<!-- Calculate filename -->
   <xsl:variable name="filename">
     <xsl:call-template name="filename">
       <xsl:with-param name="path" select="$path"/>
     </xsl:call-template>
   </xsl:variable>
-  <!-- Path to site root, eg '../../' -->
+<!-- Path to site root, eg '../../' -->
   <xsl:variable name="root">
     <xsl:call-template name="dotdots">
       <xsl:with-param name="path" select="$path"/>
     </xsl:call-template>
   </xsl:variable>
-
   <xsl:template match="/">
     <xsl:apply-templates select="/odt/content/*"/>
   </xsl:template>
   <xsl:template match="office:document-content">
     <html xmlns="http://www.w3.org/1999/xhtml">
       <head>
-        <title>
-          <xsl:choose>
-            <!-- display title element from ODT File:Properties -->
+        <title><xsl:choose>
+<!-- display title element from ODT File:Properties -->
             <xsl:when 
               test="//odt/meta/office:document-meta/office:meta/dc:title">
               <xsl:value-of 
                 select="//odt/meta/office:document-meta/office:meta/dc:title"/>
             </xsl:when>
-            <!-- if no title element, display 1st h1 -->
+<!-- if no title element, display 1st h1 -->
             <xsl:when 
               test="not(//odt/meta/office:document-meta/office:meta/dc:title) and
         office:body/office:text/text:h[1] != ''">
               <xsl:value-of select="office:body/office:text/text:h[1]"/>
             </xsl:when>
             <xsl:otherwise>
-              <!-- if no title element or h1 elements, display $filename -->
+<!-- if no title element or h1 elements, display $filename -->
               <xsl:value-of select="$filename"/>
             </xsl:otherwise>
-          </xsl:choose>
-        </title>
+          </xsl:choose></title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <xsl:apply-templates select="office:automatic-styles"/>
       </head>
@@ -83,234 +78,227 @@
       </body>
     </html>
   </xsl:template>
-
 <!-- FIXME : this is not XHTML -->
 <!-- Case of Notes -->
-<xsl:template match="text:p[@text:style-name='Forrest_3a__20_Note']">
-	<note>
-		<xsl:apply-templates/>
-		<xsl:if test="count(node())=0"><br /></xsl:if>
-	</note>
-</xsl:template>
-<xsl:template match="text:span[@text:style-name='Forrest_3a__20_Title']">
-	<xsl:attribute name="label">
-		<xsl:value-of select="."/>
-	</xsl:attribute>
-</xsl:template>
-
+  <xsl:template match="text:p[@text:style-name='Forrest_3a__20_Note']">
+    <note>
+      <xsl:apply-templates/>
+      <xsl:if test="count(node())=0">
+        <br />
+      </xsl:if>
+    </note>
+  </xsl:template>
+  <xsl:template match="text:span[@text:style-name='Forrest_3a__20_Title']">
+    <xsl:attribute name="label">
+      <xsl:value-of select="."/>
+    </xsl:attribute>
+  </xsl:template>
 <!-- FIXME : this is not XHTML -->
 <!-- Case of Warnings -->
-<xsl:template match="text:p[@text:style-name='Forrest_3a__20_Warning']">
-	<warning>
-		<xsl:apply-templates/>
-		<xsl:if test="count(node())=0"><br /></xsl:if>
-	</warning>
-</xsl:template>
-
+  <xsl:template match="text:p[@text:style-name='Forrest_3a__20_Warning']">
+    <warning>
+      <xsl:apply-templates/>
+      <xsl:if test="count(node())=0">
+        <br />
+      </xsl:if>
+    </warning>
+  </xsl:template>
 <!-- Case of Fixme  - still a problem to retrieve the author...-->
 <!-- FIXME : this is not XHTML -->
-<xsl:template match="text:p[@text:style-name='Forrest_3a__20_Fixme']">
-	<fixme>
-		<xsl:apply-templates/>
-		<xsl:if test="count(node())=0"><br /></xsl:if>
-	</fixme>
-</xsl:template>
-
+  <xsl:template match="text:p[@text:style-name='Forrest_3a__20_Fixme']">
+    <fixme>
+      <xsl:apply-templates/>
+      <xsl:if test="count(node())=0">
+        <br />
+      </xsl:if>
+    </fixme>
+  </xsl:template>
 <!-- Case of Sources -->
 <!-- FIXME : this is not XHTML -->
-<xsl:template match="text:p[@text:style-name='Forrest_3a__20_Source']">
-	<source>
-		<xsl:apply-templates/>
-		<xsl:if test="count(node())=0"><br /></xsl:if>
-	</source>
-</xsl:template>
-
+  <xsl:template match="text:p[@text:style-name='Forrest_3a__20_Source']">
+    <source>
+      <xsl:apply-templates/>
+      <xsl:if test="count(node())=0">
+        <br />
+      </xsl:if>
+    </source>
+  </xsl:template>
 <!-- Otherwise -->
-
 <!-- FIXME : An idea should be to add a class attribute to <p> in order to be able to keep the original
              layout. Maybe depending on a properties keepLayout=True. -->
-<xsl:template match="text:p">
-	<p>
-		<xsl:variable name="styleName" select="@text:style-name"/>
-		<xsl:variable name='layout'>
-			<xsl:apply-templates select="//odt/content/office:document-content/office:automatic-styles/style:style[@style:name=$styleName]|//odt/styles/office:document-styles/office:styles/style:style[@style:name=$styleName]"/>
-		</xsl:variable>
-		<xsl:call-template name="displayLayout">
-			<xsl:with-param name="layout" select="$layout"/>
-		</xsl:call-template>
-	</p>
-</xsl:template>
-
+  <xsl:template match="text:p">
+    <p>
+      <xsl:variable name="styleName" select="@text:style-name"/>
+      <xsl:variable name='layout'>
+        <xsl:apply-templates select="//odt/content/office:document-content/office:automatic-styles/style:style[@style:name=$styleName]|//odt/styles/office:document-styles/office:styles/style:style[@style:name=$styleName]"/>
+      </xsl:variable>
+      <xsl:call-template name="displayLayout">
+        <xsl:with-param name="layout" select="$layout"/>
+      </xsl:call-template>
+    </p>
+  </xsl:template>
 <!-- Instead of using styles like in the Lenya file, we try here to recognise the style to use XHTML specific
      tags such as <em>, <strong>, <sup> and <sub>... -->
-<xsl:template match="text:span">	
-	<xsl:variable name="styleName" select="@text:style-name"/>
-	<!-- the style can be either in content or in style, we try both, one of them does not exist and so is empty... -->
-	<xsl:variable name='layout'>
-		<xsl:apply-templates select="//odt/content/office:document-content/office:automatic-styles/style:style[@style:name=$styleName]|//odt/styles/office:document-styles/office:styles/style:style[@style:name=$styleName]"/>
-	</xsl:variable>
-	<xsl:call-template name="displayLayout">
-		<xsl:with-param name="layout" select="$layout"/>
-	</xsl:call-template>
-</xsl:template>
-
-<xsl:template name='displayLayout'>
-	<xsl:param name='layout' select="NONE"/>
-	<xsl:variable name="tag">
-		<xsl:choose>
-			<xsl:when test="contains($layout,',')">
-				<xsl:value-of select="normalize-space(substring-before($layout,','))"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="normalize-space($layout)"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:choose>
-		<xsl:when test="not($tag='NONE') and not($tag='')">
-			<xsl:element name="{$tag}">
-				<xsl:call-template name="displayLayout">
-					<xsl:with-param name="layout" select="substring-after($layout,',')"/>
-				</xsl:call-template>
-			</xsl:element>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:apply-templates/>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-	
-<xsl:template match="style:style">
-	<xsl:param name="text"/>
-	<xsl:variable name="styleName" select="@style:name"/>
-	<xsl:choose>
-		<xsl:when test='./style:text-properties/@*[last()]'>
-			<xsl:apply-templates select="./style:text-properties/@*[last()]"/>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:variable name="parentStyleName" select="@style:parent-style-name"/>
-			<xsl:apply-templates select="//odt/content/office:document-content/office:automatic-styles/style:style[@style:name=$parentStyleName]|//odt/styles/office:document-styles/office:styles/style:style[@style:name=$parentStyleName]"/>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<xsl:template match="style:text-properties/@*">
-	<xsl:param name="text"/>
-	<xsl:param name="indStyle" select="count(../@*)"/>
-	<xsl:choose>
-		<!-- Case of the code style - generally rendered with Courier -->
-		<xsl:when test="name()='style:font-name' and starts-with(.,'Courier')">
-			<xsl:call-template name="addLayout2List">
-				<xsl:with-param name="text" select="$text"/>
-				<xsl:with-param name="indStyle" select="$indStyle"/>
-				<xsl:with-param name="tag" select="'code'"/>
-			</xsl:call-template>
-		</xsl:when>
-		<!-- Case of the emphasys style - generally rendered with Italic -->
-		<xsl:when test="name()='fo:font-style' and .='italic'">
-			<xsl:call-template name="addLayout2List">
-				<xsl:with-param name="text" select="$text"/>
-				<xsl:with-param name="indStyle" select="$indStyle"/>
-				<xsl:with-param name="tag" select="'em'"/>
-			</xsl:call-template>
-		</xsl:when>
-		<!-- Case of the strong style -->
-		<xsl:when test="name()='fo:font-weight' and .='bold'">
-			<xsl:call-template name="addLayout2List">
-				<xsl:with-param name="text" select="$text"/>
-				<xsl:with-param name="indStyle" select="$indStyle"/>
-				<xsl:with-param name="tag" select="'strong'"/>
-			</xsl:call-template>
-		</xsl:when>
-		<!-- Case of the exponent style -->
-		<xsl:when test="name()='style:text-position' and starts-with(.,'super')">
-			<xsl:call-template name="addLayout2List">
-				<xsl:with-param name="text" select="$text"/>
-				<xsl:with-param name="indStyle" select="$indStyle"/>
-				<xsl:with-param name="tag" select="'sup'"/>
-			</xsl:call-template>
-		</xsl:when>
-		<!-- Case of the subscript style -->
-		<xsl:when test="name()='style:text-position' and starts-with(.,'sub')">
-			<xsl:call-template name="addLayout2List">
-				<xsl:with-param name="text" select="$text"/>
-				<xsl:with-param name="indStyle" select="$indStyle"/>
-				<xsl:with-param name="tag" select="'sub'"/>
-			</xsl:call-template>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:call-template name="addLayout2List">
-				<xsl:with-param name="text" select="$text"/>
-				<xsl:with-param name="indStyle" select="$indStyle"/>
-			</xsl:call-template>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<xsl:template name="addLayout2List">
-	<xsl:param name="text"/>
-	<xsl:param name="indStyle"/>
-	<xsl:param name="tag" select="NONE"/>
-	<!-- Add a layout tag -->
-	<!-- If the tag has been supplied, we add it to the layout list... -->
-	<xsl:if test="not($tag='NONE') and not(normalize-space($tag)='')">
-		<xsl:value-of select='$tag'/>,
-	</xsl:if>
-	<!-- if the style index is not the first (1), we continue - note we start from the end... -->
-	<xsl:if test="not($indStyle=1)">
-		<xsl:apply-templates select="../@*[number($indStyle)-1]">
-			<xsl:with-param name="text" select="$text"/>
-			<xsl:with-param name="indStyle" select="number($indStyle)-1"/>
-		</xsl:apply-templates>
+  <xsl:template match="text:span">
+    <xsl:variable name="styleName" select="@text:style-name"/>
+<!-- the style can be either in content or in style, we try both, one of them does not exist and so is empty... -->
+    <xsl:variable name='layout'>
+      <xsl:apply-templates select="//odt/content/office:document-content/office:automatic-styles/style:style[@style:name=$styleName]|//odt/styles/office:document-styles/office:styles/style:style[@style:name=$styleName]"/>
+    </xsl:variable>
+    <xsl:call-template name="displayLayout">
+      <xsl:with-param name="layout" select="$layout"/>
+    </xsl:call-template>
+  </xsl:template>
+  <xsl:template name='displayLayout'>
+    <xsl:param name='layout' select="NONE"/>
+    <xsl:variable name="tag">
+      <xsl:choose>
+        <xsl:when test="contains($layout,',')">
+          <xsl:value-of select="normalize-space(substring-before($layout,','))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="normalize-space($layout)"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="not($tag='NONE') and not($tag='')">
+        <xsl:element name="{$tag}">
+          <xsl:call-template name="displayLayout">
+            <xsl:with-param name="layout" select="substring-after($layout,',')"/>
+          </xsl:call-template>
+        </xsl:element>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="style:style">
+    <xsl:param name="text"/>
+    <xsl:variable name="styleName" select="@style:name"/>
+    <xsl:choose>
+      <xsl:when test='./style:text-properties/@*[last()]'>
+        <xsl:apply-templates select="./style:text-properties/@*[last()]"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:variable name="parentStyleName" select="@style:parent-style-name"/>
+        <xsl:apply-templates select="//odt/content/office:document-content/office:automatic-styles/style:style[@style:name=$parentStyleName]|//odt/styles/office:document-styles/office:styles/style:style[@style:name=$parentStyleName]"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="style:text-properties/@*">
+    <xsl:param name="text"/>
+    <xsl:param name="indStyle" select="count(../@*)"/>
+    <xsl:choose>
+<!-- Case of the code style - generally rendered with Courier -->
+      <xsl:when test="name()='style:font-name' and starts-with(.,'Courier')">
+        <xsl:call-template name="addLayout2List">
+          <xsl:with-param name="text" select="$text"/>
+          <xsl:with-param name="indStyle" select="$indStyle"/>
+          <xsl:with-param name="tag" select="'code'"/>
+        </xsl:call-template>
+      </xsl:when>
+<!-- Case of the emphasys style - generally rendered with Italic -->
+      <xsl:when test="name()='fo:font-style' and .='italic'">
+        <xsl:call-template name="addLayout2List">
+          <xsl:with-param name="text" select="$text"/>
+          <xsl:with-param name="indStyle" select="$indStyle"/>
+          <xsl:with-param name="tag" select="'em'"/>
+        </xsl:call-template>
+      </xsl:when>
+<!-- Case of the strong style -->
+      <xsl:when test="name()='fo:font-weight' and .='bold'">
+        <xsl:call-template name="addLayout2List">
+          <xsl:with-param name="text" select="$text"/>
+          <xsl:with-param name="indStyle" select="$indStyle"/>
+          <xsl:with-param name="tag" select="'strong'"/>
+        </xsl:call-template>
+      </xsl:when>
+<!-- Case of the exponent style -->
+      <xsl:when test="name()='style:text-position' and starts-with(.,'super')">
+        <xsl:call-template name="addLayout2List">
+          <xsl:with-param name="text" select="$text"/>
+          <xsl:with-param name="indStyle" select="$indStyle"/>
+          <xsl:with-param name="tag" select="'sup'"/>
+        </xsl:call-template>
+      </xsl:when>
+<!-- Case of the subscript style -->
+      <xsl:when test="name()='style:text-position' and starts-with(.,'sub')">
+        <xsl:call-template name="addLayout2List">
+          <xsl:with-param name="text" select="$text"/>
+          <xsl:with-param name="indStyle" select="$indStyle"/>
+          <xsl:with-param name="tag" select="'sub'"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="addLayout2List">
+          <xsl:with-param name="text" select="$text"/>
+          <xsl:with-param name="indStyle" select="$indStyle"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template name="addLayout2List">
+    <xsl:param name="text"/>
+    <xsl:param name="indStyle"/>
+    <xsl:param name="tag" select="NONE"/>
+<!-- Add a layout tag -->
+<!-- If the tag has been supplied, we add it to the layout list... -->
+    <xsl:if test="not($tag='NONE') and not(normalize-space($tag)='')">
+      <xsl:value-of select='$tag'/>,
 	</xsl:if>
-</xsl:template>
-
-  <!--+
+<!-- if the style index is not the first (1), we continue - note we start from the end... -->
+    <xsl:if test="not($indStyle=1)">
+      <xsl:apply-templates select="../@*[number($indStyle)-1]">
+        <xsl:with-param name="text" select="$text"/>
+        <xsl:with-param name="indStyle" select="number($indStyle)-1"/>
+      </xsl:apply-templates>
+    </xsl:if>
+  </xsl:template>
+<!--+
       | Images
       +-->
-<xsl:template match="draw:image[@xlink:show]">
-	<xsl:variable name="href"><xsl:value-of select="@xlink:href"/></xsl:variable>
-	<xsl:choose>
-		<xsl:when test="starts-with($href, 'http:')">
-			<img src="{$href}" alt="{../@draw:name}" heigth="{../@svg:heigth}" width="{../@svg:width}"/>
-		</xsl:when>
-		<xsl:otherwise>
-			<img src="./{$root}{$dirname}openDocumentEmbeddedImages/zip-{$filename}.odt/file-{$href}" alt="{../@draw:name}" heigth="{../@svg:heigth}" width="{../@svg:width}"/>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-  <!--+
+  <xsl:template match="draw:image[@xlink:show]">
+    <xsl:variable name="href">
+      <xsl:value-of select="@xlink:href"/>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="starts-with($href, 'http:')">
+        <img src="{$href}" alt="{../@draw:name}" heigth="{../@svg:heigth}" width="{../@svg:width}"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <img src="./{$root}{$dirname}openDocumentEmbeddedImages/zip-{$filename}.odt/file-{$href}" alt="{../@draw:name}" heigth="{../@svg:heigth}" width="{../@svg:width}"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+<!--+
       | Links
       +-->
 <!-- A little more detailled than in the Lenya file, we add a title and a target attribute if it is supplied... -->
-<xsl:template match="text:a">
-	<!-- There is a strange behaviour with the links, a .. is used when pointing to a sub-folder instead of '.' -->
-	<!-- we replace it by '.' in the next variable... -->
-	<xsl:variable name="href">
-		<xsl:choose>
-			<xsl:when test="starts-with(@xlink:href,'..')">
-				<xsl:value-of select="substring-after(@xlink:href,'.')"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="@xlink:href"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-			
-	<a href="{$href}">
-		<xsl:if test="@office:target-frame-name">
-			<xsl:attribute name="target">
-				<xsl:value-of select="@office:target-frame-name"/>
-			</xsl:attribute>
-		</xsl:if>
-		<xsl:if test="@office:name">
-			<xsl:attribute name="title">
-				<xsl:value-of select="@office:name"/>
-			</xsl:attribute>
-		</xsl:if>
-		<xsl:apply-templates/>
-	</a>
-</xsl:template>
-
+  <xsl:template match="text:a">
+<!-- There is a strange behaviour with the links, a .. is used when pointing to a sub-folder instead of '.' -->
+<!-- we replace it by '.' in the next variable... -->
+    <xsl:variable name="href">
+      <xsl:choose>
+        <xsl:when test="starts-with(@xlink:href,'..')">
+          <xsl:value-of select="substring-after(@xlink:href,'.')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@xlink:href"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable><a href="{$href}">
+    <xsl:if test="@office:target-frame-name">
+      <xsl:attribute name="target">
+        <xsl:value-of select="@office:target-frame-name"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@office:name">
+      <xsl:attribute name="title">
+        <xsl:value-of select="@office:name"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates/></a>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,34 +16,42 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welcome to the org.apache.forrest.plugin.input.odt Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.input.odt Plugin</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Apache Forrest - org.apache.forrest.plugin.input.odt Plugin</title>
-      <p>Reads opendocuments and transforms them to xhtml/xdocs</p>
+      <p>
+        Reads opendocuments and transforms them to xhtml/xdocs
+      </p>
     </section>
-    
     <section id="samples">
       <title>Samples</title>
-      <p>This section includes links to a number of samples using this plugin. The
-      plugin is intended to be self documenting through these samples. If you 
-      require further help please ask on the user mailing list.</p>
-      
+      <p>
+        This section includes links to a number of samples using this plugin.
+        The plugin is intended to be self documenting through these samples. If
+        you require further help please ask on the user mailing list.
+      </p>
       <ul>
-        <li><fixme author="rdg">Add a link to a sample here...</fixme></li>
-        <li><fixme author="rdg">Add another sample link here...</fixme></li>
+        <li><fixme author="rdg">
+            Add a link to a sample here...
+          </fixme></li>
+        <li><fixme author="rdg">
+            Add another sample link here...
+          </fixme></li>
       </ul>
-      
-      <note>The more samples included here the easier it is for users to
-      understand this plugin. If you can provide additional samples please
-      do so.</note>
+      <note>
+        The more samples included here the easier it is for users to understand
+        this plugin. If you can provide additional samples please do so.
+      </note>
     </section>
     <section>
       <title>Document Title</title>
-      <p>The displayed title is taken from the meta-data of the opendocument.</p>
+      <p>
+        The displayed title is taken from the meta-data of the opendocument.
+      </p>
       <ul>
         <li>If you set the Title field in the document <code>File -> Properties (General Tab)</code> Then this will be used</li>
         <li>Otherwise the first header - that is the title of the first section - will be used</li>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/index.xml Mon Apr  9 22:45:15 2007
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>OpenDocument Plugin Examples</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>OpenDocument Plugin Examples</title>
+  </header>
+  <body>
     <ul>
       <li><a href="opendocument-writer.html">OpenOffice Writer</a></li>
     </ul>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/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,29 +28,24 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.input.odt" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.input.odt"/>
     <forrestPlugins label="Plugins Index" href="site:forrest/plugins" description="Index of Forrest Plugins"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-
   <samples label="Samples" href="samples/">
     <index label="Index" href="index.html" description="Index of example files available"/>
     <openDocumentWriter label="ODT" href="opendocument-writer.html" description="OpenDocument Writer Example"/>
   </samples>
-  
-  <!--
+<!--
   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"/>
@@ -61,5 +55,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/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,13 +30,11 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="plugins" label="Forrest Plugins" href="http://forrest.apache.org/pluginDocs" indexfile="index.html"/>
   <tab id="" label="Plugin Home" dir="" indexfile="index.html"/>
   <tab id="samples" label="Samples" dir="samples" indexfile="index.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/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: org.apache.forrest.plugin.input.odt</project-name>
   <project-description>org.apache.forrest.plugin.input.odt plugin for Apache Forrest</project-description>
-
 </skinconfig>

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/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.input.serverStatus"/>
   <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.input.serverStatus/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/input.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.serverStatus/input.xmap Mon Apr  9 22:45:15 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:components>
     <map:generators default="file">
       <map:generator name="status" label="content" logger="sitemap.generator.status"
@@ -26,7 +25,6 @@
       </map:generator>
     </map:generators>
   </map:components>
-
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="cstatus.xml">
@@ -36,8 +34,6 @@
         </map:transform>
         <map:serialize type="xml-document"/>
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
-
 </map:sitemap>

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



Mime
View raw message