forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527038 [8/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.internal.GoogleSitemap/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/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,9 +28,7 @@
 
 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" />
@@ -39,15 +36,13 @@
     <xmlSitemap label="XML Sitemap" href="google-sitemap.xml"/>
     <xmlSitemap label="RSS Sitemap" href="google-sitemap.rss.xml"/>
   </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"/>
@@ -58,5 +53,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.internal.GoogleSitemap/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/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.internal.GoogleSitemap/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/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: GoogleSitemap internal</project-name>
   <project-description>org.apache.forrest.plugin.internal.GoogleSitemap plugin for Apache Forrest</project-description>
-
 </skinconfig>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/status.xml Mon Apr  9 22:45:15 2007
@@ -16,38 +16,35 @@
   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-dev" date="unreleased">
-       <action dev="RBP" type="add" context="code">
+      <action dev="RBP" type="add" context="code">
         Initial code contribution from Rasik Pandey (rbpandey@gmail.com)
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="medium">
-       <action context="design" dev="open">
+      <action context="design" dev="open">
        Add support for other google sitemap formats to internal.xmap, see
        TODO's in internal.xmap
       </action>
-       <action context="design" dev="open">
+      <action context="design" dev="open">
         Need ability to pass parameters from an xml file to
 	'resources/stylesheets/*', see TODO's in stylesheets
       </action>
-       <action context="design" dev="open">
+      <action context="design" dev="open">
         Need ability to pass parameters from an xml file to the
 	org.apache.cocoon.generation.LinkStatusGenerator declared in
 	internal.xmap for include-name and exclude-name regexp crawl
@@ -58,5 +55,4 @@
       </action>
     </actions>
   </todo>
-
 </status>

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap Mon Apr  9 22:45:15 2007
@@ -15,61 +15,51 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-  <!-- ============================================================ -->
-  <!-- IMS Maniifest Plugin                                         -->
-  <!-- This plugin replaces the site.xml and tabs.xml file with     -->
-  <!-- an IMS Manifest file conforming to the IMS specifications    -->
-  <!-- for Content Packages.                                        -->
-  <!--                                                              -->
-  <!-- In the absence of an IMSManifest.xml file the plugin will    -->
-  <!-- fallback to using the standard site.xml and tabs.xml files.  -->
-  <!-- ============================================================ -->
-
+<!-- ============================================================ -->
+<!-- IMS Maniifest Plugin                                         -->
+<!-- This plugin replaces the site.xml and tabs.xml file with     -->
+<!-- an IMS Manifest file conforming to the IMS specifications    -->
+<!-- for Content Packages.                                        -->
+<!--                                                              -->
+<!-- In the absence of an IMSManifest.xml file the plugin will    -->
+<!-- fallback to using the standard site.xml and tabs.xml files.  -->
+<!-- ============================================================ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:components>
     <map:selectors>
       <map:selector logger="sitemap.selector.config" name="config" src="org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
-    
     <map:transformers default="xslt">
       <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="menu">
           <catalogue id="menu" name="menu" location="{properties:translations}"/>
         </catalogues>
-        <!-- Commented out to verify your translations
+<!-- Commented out to verify your translations
         <untranslated-text>untranslated</untranslated-text> -->
         <cache-at-startup>true</cache-at-startup>
       </map:transformer>
     </map:transformers>
-    
     <map:actions>
       <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />
     </map:actions>
   </map:components>
-  
   <map:resources>
     <map:resource name="skinit">
-        <map:transform src="{lm:{type}}">
-          <map:parameter name="notoc" value="{notoc}"/>
-          <!-- For backwards-compat with 0.2 - 0.4 skins -->
-          <map:parameter name="isfaq" value="{notoc}"/>
-          <map:parameter name="nopdf" value="{nopdf}"/>
-          <map:parameter name="path" value="{path}"/>
-          <map:parameter name="config-file" value="{properties:skinconf}"/>
-        </map:transform>
+      <map:transform src="{lm:{type}}">
+        <map:parameter name="notoc" value="{notoc}"/>
+<!-- For backwards-compat with 0.2 - 0.4 skins -->
+        <map:parameter name="isfaq" value="{notoc}"/>
+        <map:parameter name="nopdf" value="{nopdf}"/>
+        <map:parameter name="path" value="{path}"/>
+        <map:parameter name="config-file" value="{properties:skinconf}"/>
+      </map:transform>
       <map:serialize/>
     </map:resource>
-
   </map:resources>
-
-    
   <map:pipelines>
-  
-   <!-- ============================================================ -->
-   <!-- Linkmap.xmap overrides                                       -->
-   <!-- ============================================================ -->
-  
+<!-- ============================================================ -->
+<!-- Linkmap.xmap overrides                                       -->
+<!-- ============================================================ -->
     <map:pipeline>
       <map:match pattern="abs-linkmap">
         <map:select type="exists">
@@ -84,13 +74,10 @@
         <map:transform src="{transform.linkmap.linkmap-absolutized}" />
         <map:serialize type="xml" />
       </map:match>
-
     </map:pipeline>
-    
-   <!-- ============================================================ -->
-   <!-- tabs.xmap overrides                                          -->
-   <!-- ============================================================ -->
-  
+<!-- ============================================================ -->
+<!-- tabs.xmap overrides                                          -->
+<!-- ============================================================ -->
     <map:pipeline >
       <map:match pattern="**tab-*.html">
         <map:select type="exists">
@@ -107,16 +94,12 @@
           <map:parameter name="type" value="transform.tab.menu"/>
           <map:parameter name="path" value="{1}{2}.html"/>
         </map:call>
-      </map:match>      
+      </map:match>
     </map:pipeline>
- 
-    
-    <!-- ============================================================ -->
-    <!-- menu.xmap overrides                                          -->
-    <!-- ============================================================ -->
-    
+<!-- ============================================================ -->
+<!-- menu.xmap overrides                                          -->
+<!-- ============================================================ -->
     <map:pipeline internal-only="false">
-
       <map:match pattern="abs-menulinks">
         <map:select type="exists">
           <map:when test="{properties:content.xdocs}imsmanifest.xml">
@@ -135,7 +118,6 @@
           </map:when>
         </map:select>
       </map:match>
-
       <map:match pattern="**menulinks-*">
         <map:select type="exists">
           <map:when test="{properties:content.xdocs}imsmanifest.xml">
@@ -148,10 +130,8 @@
             <map:transform src="{transform.linkmap.linkmap-absolutized}" />
           </map:when>
         </map:select>
-
         <map:select type="config">
           <map:parameter name="value" value="{properties:forrest.menu-scheme}"/>
-
           <map:when test="tab_attributes">
             <map:transform src="{transform.linkmap.linkmap-normalizedtabs}" />
             <map:transform src="{transform.xml.xml-normalizedhrefs}"/>
@@ -159,64 +139,50 @@
               <map:parameter name="path" value="{1}{2}"/>
             </map:transform>
           </map:when>
-
         </map:select>
-
         <map:transform src="{transform.linkmap.linkmap-relativized}">
           <map:parameter name="path" value="{1}{2}" />
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
-      
       <map:match pattern="**book-*">
-
         <map:select type="exists">
-
           <map:when test="{properties:content.xdocs}{1}book.xml">
-            <!-- If a hand-created book.xml exists, use it -->
+<!-- If a hand-created book.xml exists, use it -->
             <map:parameter name="url" value="{properties:content.xdocs}{1}book.xml" />
             <map:generate src="{properties:content.xdocs}{1}book.xml" />
           </map:when>
-
           <map:otherwise>
-            <!-- If no book.xml, generate it from the linkmap. -->
+<!-- If no book.xml, generate it from the linkmap. -->
             <map:generate src="cocoon:/{1}menulinks-{2}" />
-            <!-- The above generates the subset of the linkmap relevant to our directory. -->
+<!-- The above generates the subset of the linkmap relevant to our directory. -->
             <map:transform src="{lm:transform.site.book}" />
           </map:otherwise>
-
         </map:select>
-
         <map:select type="config">
           <map:parameter name="value" value="{properties:forrest.i18n}"/>
           <map:when test="true">
-
             <map:act type="locale">
               <map:transform src="{lm:transform.book.book-i18n}"/>
               <map:transform type="i18n">
-                <!-- We can use a default locale attribute or Request Parameter
+<!-- We can use a default locale attribute or Request Parameter
                 <map:parameter name="locale" value="{properties:forrest.locale}"/>
                 <map:parameter name="locale" value="{request-param:locale}"/>
                 -->
                 <map:parameter name="locale" value="{lang}{country}{variant}"/>
               </map:transform>
             </map:act>
-
           </map:when>
         </map:select>
-
         <map:serialize type="xml"/>
-
       </map:match>
     </map:pipeline>
-     
-    <!-- ============================================================ -->
-    <!-- Repository Commands                                          -->
-    <!-- ============================================================ -->
-    
+<!-- ============================================================ -->
+<!-- Repository Commands                                          -->
+<!-- ============================================================ -->
     <map:pipeline>
       <map:match pattern="repositoryCommand/getSCO/**/repositoryURI/**/*.xml">
-        <!-- FIXME: is there any way of preventing the need to copy this stuff manually when it changes in the forrest.xmap file in Forrest -->
+<!-- FIXME: is there any way of preventing the need to copy this stuff manually when it changes in the forrest.xmap file in Forrest -->
         <map:select type="exists">
           <map:when test="/{2}/{1}/src/documentation/content/xdocs/{3}.cwiki">
             <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
@@ -229,7 +195,6 @@
               <map:serialize/>
             </map:match>
           </map:when>
-
           <map:when test="/{2}/{1}/src/documentation/content/xdocs/{3}.txt">
             <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
               <map:generate type="text2xml" src="http://{2}/{1}/src/documentation/content/xdocs/{3}.txt" />
@@ -239,10 +204,9 @@
               <map:serialize/>
             </map:match>
           </map:when>
-
           <map:when test="/{2}/{1}/src/documentation/content/xdocs/{3}.sxw">
             <map:aggregate element="openOffice">
-              <!-- FIXME: on windows we need three / after the protocol, on Linux we need 2 -->
+<!-- FIXME: on windows we need three / after the protocol, on Linux we need 2 -->
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxw!/meta.xml"/>
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxw!/styles.xml"/>
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxw!/content.xml"/>
@@ -262,11 +226,10 @@
               </map:otherwise>
             </map:select>
             <map:serialize/>
-          </map:when>     
-          
+          </map:when>
           <map:when test="/{2}/{1}/src/documentation/content/xdocs/{3}.sxi">
             <map:aggregate element="openOffice">
-              <!-- FIXME: on windows we need three / after the protocol, on LInux we need 2 -->
+<!-- FIXME: on windows we need three / after the protocol, on LInux we need 2 -->
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxi!/meta.xml"/>
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxi!/styles.xml"/>
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxi!/content.xml"/>
@@ -287,7 +250,6 @@
             </map:select>
             <map:serialize/>
           </map:when>
-     
           <map:otherwise>
             <map:generate src="http://{2}/{1}/src/documentation/content/xdocs/{3}.xml"/>
             <map:serialize/>
@@ -295,6 +257,5 @@
         </map:select>
       </map:match>
     </map:pipeline>
-    
-  </map:pipelines>    
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2site.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2site.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2site.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2site.xsl Mon Apr  9 22:45:15 2007
@@ -18,43 +18,38 @@
 <!--
 Stylesheet for generating site.xml from a IMS Manifest file.
 -->
-
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:ims="http://www.imsproject.org/xsd/imscp_rootv1p1p2"
   xmlns:adlcp="http://www.adlnet.org/xsd/adlcp_rootv1p2">
-  
   <xsl:import href="pathutils.xsl"/>
   <xsl:import href="repositoryUtils.xsl"/>
-  
   <xsl:output doctype-system="http://apache.org/forrest/dtd/tab-cocoon-v11.dtd"
     doctype-public="-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"/>
-
   <xsl:template match="/">
     <site label="MyProj" 
       href="" 
       xmlns="http://apache.org/forrest/linkmap/1.0"
       tab="">
-      
       <xsl:apply-templates/>
-      
     </site>
   </xsl:template>
-  
   <xsl:template match="ims:manifest">
     <xsl:param name="asset_base"/>
     <xsl:apply-templates>
-      <xsl:with-param name="asset_base"><xsl:value-of select="$asset_base"/></xsl:with-param>
+      <xsl:with-param name="asset_base">
+        <xsl:value-of select="$asset_base"/>
+      </xsl:with-param>
     </xsl:apply-templates>
   </xsl:template>
-  
   <xsl:template match="ims:organizations">
     <xsl:param name="asset_base"/>
     <xsl:apply-templates select="ims:organization">
-      <xsl:with-param name="asset_base"><xsl:value-of select="$asset_base"/></xsl:with-param>
+      <xsl:with-param name="asset_base">
+        <xsl:value-of select="$asset_base"/>
+      </xsl:with-param>
     </xsl:apply-templates>
   </xsl:template>
-  
   <xsl:template match="ims:organization">
     <xsl:param name="asset_base"/>
     <xsl:variable name="title">
@@ -69,34 +64,51 @@
     </xsl:variable>
     <xsl:variable name="element_name">organisation</xsl:variable>
     <xsl:element name="{$element_name}">
-      <xsl:attribute name="label"><xsl:value-of select="$title"/></xsl:attribute>
+      <xsl:attribute name="label">
+        <xsl:value-of select="$title"/>
+      </xsl:attribute>
       <xsl:apply-templates select="ims:item">
-        <xsl:with-param name="asset_base"><xsl:value-of select="$asset_base"/></xsl:with-param>
+        <xsl:with-param name="asset_base">
+          <xsl:value-of select="$asset_base"/>
+        </xsl:with-param>
       </xsl:apply-templates>
     </xsl:element>
   </xsl:template>
-    
   <xsl:template match="ims:item[@identifierref]">
     <xsl:param name="asset_base"/>
-    <xsl:variable name="idref"><xsl:value-of select="@identifierref"/></xsl:variable>
+    <xsl:variable name="idref">
+      <xsl:value-of select="@identifierref"/>
+    </xsl:variable>
     <xsl:variable name="repositoryCommand">
       <xsl:call-template name="getRepositoryCommand">
-        <xsl:with-param name="path"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="scoName">
       <xsl:call-template name="getSCOName">
-        <xsl:with-param name="path"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="repositoryURI">
       <xsl:call-template name="getRepositoryURI">
-        <xsl:with-param name="path"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
-<sco><xsl:value-of select="$scoName"/></sco>
-<repository><xsl:value-of select="$repositoryURI"/></repository>
-<repositoryCommand><xsl:value-of select="$repositoryCommand"/></repositoryCommand>
+    <sco>
+      <xsl:value-of select="$scoName"/>
+    </sco>
+    <repository>
+      <xsl:value-of select="$repositoryURI"/>
+    </repository>
+    <repositoryCommand>
+      <xsl:value-of select="$repositoryCommand"/>
+    </repositoryCommand>
     <xsl:choose>
       <xsl:when test="$repositoryCommand='getSCO'">
         <xsl:variable name="repositoryHREF">http://<xsl:value-of select="$repositoryURI"/>/<xsl:value-of select="$scoName"/>/src/documentation/content/xdocs/imsmanifest.xml</xsl:variable>
@@ -105,76 +117,114 @@
         </xsl:apply-templates>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:variable name="title"><xsl:value-of select="ims:title"/></xsl:variable>
-        <xsl:variable name="package_base"><xsl:value-of select="$asset_base"/><xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/../../@xml:base"/></xsl:variable>
+        <xsl:variable name="title">
+          <xsl:value-of select="ims:title"/>
+        </xsl:variable>
+        <xsl:variable name="package_base">
+          <xsl:value-of select="$asset_base"/>
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/../../@xml:base"/>
+        </xsl:variable>
         <xsl:variable name="path_href">
           <xsl:choose>
             <xsl:when test="//ims:resources/ims:resource[@identifier=$idref]/ims:file">
               <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/ims:file/@href"/>
-      			</xsl:when>
-			      <xsl:otherwise>
-			        <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/>
-			      </xsl:otherwise>
-	        </xsl:choose>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@href"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:variable>
         <xsl:variable name="href_ext">
           <xsl:call-template name="ext">
-            <xsl:with-param name="path"><xsl:value-of select="$path_href"/></xsl:with-param>
+            <xsl:with-param name="path">
+              <xsl:value-of select="$path_href"/>
+            </xsl:with-param>
           </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="path_href_noext">
           <xsl:call-template name="path-noext">
-            <xsl:with-param name="path"><xsl:value-of select="$path_href"/></xsl:with-param>
+            <xsl:with-param name="path">
+              <xsl:value-of select="$path_href"/>
+            </xsl:with-param>
           </xsl:call-template>
         </xsl:variable>
-        <xsl:variable name="mimeType"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@type"/></xsl:variable>
+        <xsl:variable name="mimeType">
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$idref]/@type"/>
+        </xsl:variable>
         <xsl:variable name="href">
           <xsl:choose>
-            <xsl:when test="$mimeType='text/xml'"><xsl:value-of select="$package_base"/><xsl:value-of select="$path_href_noext"/>.html</xsl:when>                        <xsl:when test="$mimeType='text/xml'"><xsl:value-of select="$package_base"/><xsl:value-of select="$path_href_noext"/>.html</xsl:when>
-            <xsl:when test="$mimeType='application/vnd-sun-xml-impress'"><xsl:value-of select="$package_base"/><xsl:value-of select="$path_href_noext"/>.html</xsl:when>
-            <xsl:when test="$mimeType='application/vnd-sun-xml-writer'"><xsl:value-of select="$package_base"/><xsl:value-of select="$path_href_noext"/>.html</xsl:when>                        
-          	<xsl:otherwise>
-          	  <xsl:value-of select="$package_base"/><xsl:value-of select="$path_href"/>
-          	</xsl:otherwise>
-         </xsl:choose>
+            <xsl:when test="$mimeType='text/xml'">
+              <xsl:value-of select="$package_base"/>
+              <xsl:value-of select="$path_href_noext"/>.html</xsl:when>
+            <xsl:when test="$mimeType='text/xml'">
+              <xsl:value-of select="$package_base"/>
+              <xsl:value-of select="$path_href_noext"/>.html</xsl:when>
+            <xsl:when test="$mimeType='application/vnd-sun-xml-impress'">
+              <xsl:value-of select="$package_base"/>
+              <xsl:value-of select="$path_href_noext"/>.html</xsl:when>
+            <xsl:when test="$mimeType='application/vnd-sun-xml-writer'">
+              <xsl:value-of select="$package_base"/>
+              <xsl:value-of select="$path_href_noext"/>.html</xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$package_base"/>
+              <xsl:value-of select="$path_href"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:variable>
         <xsl:variable name="element_name">item</xsl:variable>
-        
         <xsl:element name="{$element_name}">
-          <xsl:attribute name="id"><xsl:value-of select="@identifier"/></xsl:attribute>
-          <xsl:attribute name="identifierref"><xsl:value-of select="$idref"/></xsl:attribute>
-          <xsl:attribute name="label"><xsl:value-of select="$title"/></xsl:attribute>   
-          <xsl:attribute name="href"><xsl:value-of select="$href"/></xsl:attribute>
-          
+          <xsl:attribute name="id">
+            <xsl:value-of select="@identifier"/>
+          </xsl:attribute>
+          <xsl:attribute name="identifierref">
+            <xsl:value-of select="$idref"/>
+          </xsl:attribute>
+          <xsl:attribute name="label">
+            <xsl:value-of select="$title"/>
+          </xsl:attribute>
+          <xsl:attribute name="href">
+            <xsl:value-of select="$href"/>
+          </xsl:attribute>
           <xsl:apply-templates select="ims:item"/>
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
   <xsl:template match="ims:item[not(@identifierref)]">
-    <xsl:variable name="title"><xsl:value-of select="ims:title"/></xsl:variable>
+    <xsl:variable name="title">
+      <xsl:value-of select="ims:title"/>
+    </xsl:variable>
     <xsl:variable name="element_name">itemGroup</xsl:variable>
-    
     <xsl:element name="{$element_name}">
-      <xsl:attribute name="id"><xsl:value-of select="@identifier"/></xsl:attribute>
-      <xsl:attribute name="label"><xsl:value-of select="$title"/></xsl:attribute>
-      
+      <xsl:attribute name="id">
+        <xsl:value-of select="@identifier"/>
+      </xsl:attribute>
+      <xsl:attribute name="label">
+        <xsl:value-of select="$title"/>
+      </xsl:attribute>
       <xsl:apply-templates select="ims:item"/>
     </xsl:element>
-    
   </xsl:template>
-  
   <xsl:template match="adlcp:prerequisites">
-    <xsl:variable name="idref"><xsl:value-of select="."/></xsl:variable>
-    <xsl:variable name="title"><xsl:value-of select="//ims:item[@identifier=$idref]/ims:title"/></xsl:variable>
-    <xsl:variable name="resource_idref"><xsl:value-of select="//ims:item[@identifier=$idref]/@identifierref"/></xsl:variable>
-    <xsl:variable name="href"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$resource_idref]/ims:file/@href"/></xsl:variable>
-    
+    <xsl:variable name="idref">
+      <xsl:value-of select="."/>
+    </xsl:variable>
+    <xsl:variable name="title">
+      <xsl:value-of select="//ims:item[@identifier=$idref]/ims:title"/>
+    </xsl:variable>
+    <xsl:variable name="resource_idref">
+      <xsl:value-of select="//ims:item[@identifier=$idref]/@identifierref"/>
+    </xsl:variable>
+    <xsl:variable name="href">
+      <xsl:value-of select="//ims:resources/ims:resource[@identifier=$resource_idref]/ims:file/@href"/>
+    </xsl:variable>
     <xsl:element name="prerequisite">
-      <xsl:attribute name="label"><xsl:value-of select="$title"/></xsl:attribute>
-      <xsl:attribute name="href"><xsl:value-of select="$href"/></xsl:attribute>
+      <xsl:attribute name="label">
+        <xsl:value-of select="$title"/>
+      </xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:value-of select="$href"/>
+      </xsl:attribute>
     </xsl:element>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2tabs.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2tabs.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2tabs.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/imsmanifest2tabs.xsl Mon Apr  9 22:45:15 2007
@@ -18,82 +18,99 @@
 <!--
 Stylesheet for generating site.xml from a IMS Manifest file.
 -->
-
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:ims="http://www.imsproject.org/xsd/imscp_rootv1p1p2"
   xmlns:adlcp="http://www.adlnet.org/xsd/adlcp_rootv1p2">
-  
   <xsl:import href="pathutils.xsl"/>
   <xsl:import href="repositoryUtils.xsl"/>
-
   <xsl:output doctype-system="http://apache.org/forrest/dtd/tab-cocoon-v11.dtd"
     doctype-public="-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"/>
-
   <xsl:template match="/">
     <tabs software="MyProj"
       title="MyProj"
       copyright="foo">
-
       <xsl:apply-templates select="ims:manifest"/>
     </tabs>
   </xsl:template>
-  
   <xsl:template match="ims:manifest">
     <xsl:apply-templates/>
   </xsl:template>
-  
   <xsl:template match="ims:organizations">
     <xsl:apply-templates select="ims:organization"/>
   </xsl:template>
-  
   <xsl:template match="ims:organization">
-    <xsl:variable name="title"><xsl:value-of select="./ims:title"/></xsl:variable>
-    <xsl:variable name="default_file_id"><xsl:value-of select=".//ims:item[@identifierref][1]/@identifierref"/></xsl:variable>
+    <xsl:variable name="title">
+      <xsl:value-of select="./ims:title"/>
+    </xsl:variable>
+    <xsl:variable name="default_file_id">
+      <xsl:value-of select=".//ims:item[@identifierref][1]/@identifierref"/>
+    </xsl:variable>
     <xsl:variable name="repositoryCommand">
       <xsl:call-template name="getRepositoryCommand">
-        <xsl:with-param name="path"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="scoName">
       <xsl:call-template name="getSCOName">
-        <xsl:with-param name="path"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="full_path">
       <xsl:choose>
-        <xsl:when test="$repositoryCommand='getSCO'">getSCO/<xsl:call-template name="getSCOName"><xsl:with-param name="path"><xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/></xsl:with-param></xsl:call-template></xsl:when>
-        <xsl:otherwise><xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/></xsl:otherwise>
+        <xsl:when test="$repositoryCommand='getSCO'">getSCO/<xsl:call-template name="getSCOName">
+            <xsl:with-param name="path">
+              <xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="//ims:resources/ims:resource[@identifier=$default_file_id]/@href"/>
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:variable name="href">
       <xsl:call-template name="dirname-nz">
-        <xsl:with-param name="path"><xsl:value-of select="$full_path"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="$full_path"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="filename_noext">
       <xsl:choose>
-        <xsl:when test="$repositoryCommand='getSCO'"><xsl:value-of select="$scoName"/>/index</xsl:when>
+        <xsl:when test="$repositoryCommand='getSCO'">
+          <xsl:value-of select="$scoName"/>/index</xsl:when>
         <xsl:otherwise>
           <xsl:call-template name="filename-noext">
-            <xsl:with-param name="path"><xsl:value-of select="$full_path"/></xsl:with-param>
+            <xsl:with-param name="path">
+              <xsl:value-of select="$full_path"/>
+            </xsl:with-param>
           </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    
     <tab>
-      <xsl:attribute name="id"><xsl:value-of select="$title"/></xsl:attribute>
-      <xsl:attribute name="label"><xsl:value-of select="$title"/></xsl:attribute>
-      <xsl:attribute name="href"><xsl:value-of select="$href"/></xsl:attribute>
+      <xsl:attribute name="id">
+        <xsl:value-of select="$title"/>
+      </xsl:attribute>
+      <xsl:attribute name="label">
+        <xsl:value-of select="$title"/>
+      </xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:value-of select="$href"/>
+      </xsl:attribute>
       <xsl:attribute name="indexfile">
         <xsl:choose>
-          <xsl:when test="not($filename_noext='')"><xsl:value-of select="$filename_noext"/>.html</xsl:when>
+          <xsl:when test="not($filename_noext='')">
+            <xsl:value-of select="$filename_noext"/>.html</xsl:when>
           <xsl:otherwise>index.html</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
       <xsl:apply-templates select="ims:item"/>
     </tab>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/pathutils.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/pathutils.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/pathutils.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/pathutils.xsl Mon Apr  9 22:45:15 2007
@@ -27,56 +27,51 @@
 filename-noext: return the file part of a path without its last extension
 
 -->
-
 <!-- Returns the directory part of a path.  Equivalent to Unix 'dirname'.
 Examples:
 '' -> ''
 'foo/index.html' -> 'foo/'
 -->
-<xsl:template name="dirname">
-  <xsl:param name="path" />
-  <xsl:if test="contains($path, '/')">
-    <xsl:value-of select="concat(substring-before($path, '/'), '/')" />
-    <xsl:call-template name="dirname">
-      <xsl:with-param name="path"
-        select="substring-after($path, '/')" />
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- Normalized (..'s eliminated) version of 'dirname' -->
-<xsl:template name="dirname-nz">
-  <xsl:param name="path" />
-  <xsl:call-template name="normalize">
-    <xsl:with-param name="path">
+  <xsl:template name="dirname">
+    <xsl:param name="path" />
+    <xsl:if test="contains($path, '/')">
+      <xsl:value-of select="concat(substring-before($path, '/'), '/')" />
       <xsl:call-template name="dirname">
-        <xsl:with-param name="path" select="$path" />
+        <xsl:with-param name="path"
+        select="substring-after($path, '/')" />
       </xsl:call-template>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-
+    </xsl:if>
+  </xsl:template>
+<!-- Normalized (..'s eliminated) version of 'dirname' -->
+  <xsl:template name="dirname-nz">
+    <xsl:param name="path" />
+    <xsl:call-template name="normalize">
+      <xsl:with-param name="path">
+        <xsl:call-template name="dirname">
+          <xsl:with-param name="path" select="$path" />
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
 <!-- Returns the filename part of a path.  Equivalent to Unix 'basename'
 Examples:
 'index.html'  ->  'index.html' 
 'foo/bar/'  ->  '' 
 'foo/bar/index.html'  ->  'index.html' 
 -->
-<xsl:template name="filename">
-  <xsl:param name="path"/>
-  <xsl:choose>
-    <xsl:when test="contains($path, '/')">
-      <xsl:call-template name="filename">
-        <xsl:with-param name="path" select="substring-after($path, '/')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$path"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
+  <xsl:template name="filename">
+    <xsl:param name="path"/>
+    <xsl:choose>
+      <xsl:when test="contains($path, '/')">
+        <xsl:call-template name="filename">
+          <xsl:with-param name="path" select="substring-after($path, '/')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$path"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 <!-- Returns the last extension of a filename in a path.
 Examples:
 'index.html'  ->  '.html' 
@@ -85,124 +80,115 @@
 'foo/bar/index.html'  ->  '.html' 
 'foo/bar/index'  ->  '' 
 -->
-<xsl:template name="ext">
-  <xsl:param name="path"/>
-  <xsl:param name="subflag"/> <!-- Outermost call? -->
-  <xsl:choose>
-    <xsl:when test="contains($path, '.')">
-      <xsl:call-template name="ext">
-        <xsl:with-param name="path" select="substring-after($path, '.')"/>
-        <xsl:with-param name="subflag" select="'sub'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!-- Handle extension-less filenames by returning '' -->
-    <xsl:when test="not($subflag) and not(contains($path, '.'))">
-      <xsl:text/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat('.', $path)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
+  <xsl:template name="ext">
+    <xsl:param name="path"/>
+    <xsl:param name="subflag"/>
+<!-- Outermost call? -->
+    <xsl:choose>
+      <xsl:when test="contains($path, '.')">
+        <xsl:call-template name="ext">
+          <xsl:with-param name="path" select="substring-after($path, '.')"/>
+          <xsl:with-param name="subflag" select="'sub'"/>
+        </xsl:call-template>
+      </xsl:when>
+<!-- Handle extension-less filenames by returning '' -->
+      <xsl:when test="not($subflag) and not(contains($path, '.'))">
+<xsl:text/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="concat('.', $path)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 <!-- Returns a filename of a path stripped of its last extension.
 Examples:
 'foo/bar/index.dtdx.html' -> 'index.dtdx'
 -->
-<xsl:template name="filename-noext">
-  <xsl:param name="path"/>
-  <xsl:variable name="filename">
-    <xsl:call-template name="filename">
-      <xsl:with-param name="path" select="$path"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="ext">
-    <xsl:call-template name="ext">
-      <xsl:with-param name="path" select="$filename"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="substring($filename, 1, string-length($filename) - string-length($ext))"/>
-</xsl:template>
-
+  <xsl:template name="filename-noext">
+    <xsl:param name="path"/>
+    <xsl:variable name="filename">
+      <xsl:call-template name="filename">
+        <xsl:with-param name="path" select="$path"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="ext">
+      <xsl:call-template name="ext">
+        <xsl:with-param name="path" select="$filename"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:value-of select="substring($filename, 1, string-length($filename) - string-length($ext))"/>
+  </xsl:template>
 <!-- Returns a path with the filename stripped of its last extension.
 Examples:
 'foo/bar/index.dtdx.html' -> 'foo/bar/index.dtdx'
 -->
-<xsl:template name="path-noext">
-  <xsl:param name="path"/>
-  <xsl:variable name="ext">
-    <xsl:call-template name="ext">
-      <xsl:with-param name="path" select="$path"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="substring($path, 1, string-length($path) - string-length($ext))"/>
-</xsl:template>
-
-<!-- Normalized (..'s eliminated) version of 'path-noext' -->
-<xsl:template name="path-noext-nz">
-  <xsl:param name="path" />
-  <xsl:call-template name="normalize">
-    <xsl:with-param name="path">
-      <xsl:call-template name="path-noext">
-        <xsl:with-param name="path" select="$path" />
+  <xsl:template name="path-noext">
+    <xsl:param name="path"/>
+    <xsl:variable name="ext">
+      <xsl:call-template name="ext">
+        <xsl:with-param name="path" select="$path"/>
       </xsl:call-template>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
+    </xsl:variable>
+    <xsl:value-of select="substring($path, 1, string-length($path) - string-length($ext))"/>
+  </xsl:template>
+<!-- Normalized (..'s eliminated) version of 'path-noext' -->
+  <xsl:template name="path-noext-nz">
+    <xsl:param name="path" />
+    <xsl:call-template name="normalize">
+      <xsl:with-param name="path">
+        <xsl:call-template name="path-noext">
+          <xsl:with-param name="path" select="$path" />
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
 <!-- Returns a path with any fragment identifier ('#...') stripped off
 Examples:
 'foo/bar/index.dtdx.html#blah' -> 'foo/bar/index.dtdx.html'
 -->
-<xsl:template name="path-nofrag">
-  <xsl:param name="path"/>
-  <xsl:if test="not(contains($path, '#'))">
-    <xsl:value-of select="$path"/>
-  </xsl:if>
-  <xsl:if test="contains($path, '#')">
-    <xsl:value-of select="substring-before($path, '#')"/>
-  </xsl:if>
-</xsl:template>
-
-
-
+  <xsl:template name="path-nofrag">
+    <xsl:param name="path"/>
+    <xsl:if test="not(contains($path, '#'))">
+      <xsl:value-of select="$path"/>
+    </xsl:if>
+    <xsl:if test="contains($path, '#')">
+      <xsl:value-of select="substring-before($path, '#')"/>
+    </xsl:if>
+  </xsl:template>
 <!-- Normalizes a path, converting '/' to '\' and eliminating ..'s
 Examples:
 'foo/bar/../baz/index.html' -> foo/baz/index.html'
 -->
-<xsl:template name="normalize">
-  <xsl:param name="path"/>
-    <!-- replace all \  with / -->
-  <xsl:variable name="path-" select="translate($path, '\', '/')"/>
-  <xsl:choose>
-      <!-- process relative refs here -->
-    <xsl:when test="contains($path-, '/../')">
-       <!--  put part before /../ into $pa: "foo/bar" -->
-      <xsl:variable name="pa" select="substring-before($path-, '/../')"/>
-        <!-- put part after first occurrence /../ into $th: "baz/index.html" -->
-      <xsl:variable name="th" select="substring-after($path-, '/../')"/>
-        <!-- cut last real directory name before /../ and put rest in $pa- : "foo/"  -->
-      <xsl:variable name="pa-">
-        <xsl:call-template name="dirname">
-          <xsl:with-param name="path" select="$pa"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <!-- recombine pieces thus eliminating one .. and one dir step before it
+  <xsl:template name="normalize">
+    <xsl:param name="path"/>
+<!-- replace all \  with / -->
+    <xsl:variable name="path-" select="translate($path, '\', '/')"/>
+    <xsl:choose>
+<!-- process relative refs here -->
+      <xsl:when test="contains($path-, '/../')">
+<!--  put part before /../ into $pa: "foo/bar" -->
+        <xsl:variable name="pa" select="substring-before($path-, '/../')"/>
+<!-- put part after first occurrence /../ into $th: "baz/index.html" -->
+        <xsl:variable name="th" select="substring-after($path-, '/../')"/>
+<!-- cut last real directory name before /../ and put rest in $pa- : "foo/"  -->
+        <xsl:variable name="pa-">
+          <xsl:call-template name="dirname">
+            <xsl:with-param name="path" select="$pa"/>
+          </xsl:call-template>
+        </xsl:variable>
+<!-- recombine pieces thus eliminating one .. and one dir step before it
               and recurse into this template to eliminate more /../
-      -->  
-      <xsl:variable name="pa-th" select="concat($pa-, $th)"/>
-      <xsl:call-template name="normalize">
-        <xsl:with-param name="path" select="$pa-th"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:value-of select="$path-"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
+      -->
+        <xsl:variable name="pa-th" select="concat($pa-, $th)"/>
+        <xsl:call-template name="normalize">
+          <xsl:with-param name="path" select="$pa-th"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$path-"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 <!--
 Uncomment this to test.
 Usage: saxon pathutils.xsl pathutils.xsl path=foo/bar
@@ -242,5 +228,4 @@
   </xsl:message>
 </xsl:template>
 -->
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/repositoryUtils.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/repositoryUtils.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/repositoryUtils.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/resources/stylesheets/repositoryUtils.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 version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <!--
 
@@ -56,31 +55,24 @@
 
 
 -->
-
-<xsl:param name="cmdRepositoryGetSCO">/repositoryCommand/getSCO/</xsl:param>
-
-<xsl:param name="repositoryURILabel">/repositoryURI/</xsl:param>
-
+  <xsl:param name="cmdRepositoryGetSCO">/repositoryCommand/getSCO/</xsl:param>
+  <xsl:param name="repositoryURILabel">/repositoryURI/</xsl:param>
 <!-- Return the burrokeet command in a path that includes one -->
-<xsl:template name="getRepositoryCommand">
-  <xsl:param name="path"/>
-  <xsl:if test="contains($path, $cmdRepositoryGetSCO)">getSCO</xsl:if>
-</xsl:template>
-
+  <xsl:template name="getRepositoryCommand">
+    <xsl:param name="path"/>
+    <xsl:if test="contains($path, $cmdRepositoryGetSCO)">getSCO</xsl:if>
+  </xsl:template>
 <!-- return the name of the SCO too use -->
-<xsl:template name="getSCOName">
-  <xsl:param name="path"/>
-  <xsl:variable name="fullCommand">
-    <xsl:value-of select="substring-after($path, $cmdRepositoryGetSCO)"/>
-  </xsl:variable>
-  <xsl:value-of select="substring-before($fullCommand, $repositoryURILabel)"/>
-</xsl:template>
-
+  <xsl:template name="getSCOName">
+    <xsl:param name="path"/>
+    <xsl:variable name="fullCommand">
+      <xsl:value-of select="substring-after($path, $cmdRepositoryGetSCO)"/>
+    </xsl:variable>
+    <xsl:value-of select="substring-before($fullCommand, $repositoryURILabel)"/>
+  </xsl:template>
 <!-- return the URI of the repository to use -->
-<xsl:template name="getRepositoryURI">
-  <xsl:param name="path"/>
-  <xsl:value-of select="substring-after($path, $repositoryURILabel)"/>
-</xsl:template>
-
-
+  <xsl:template name="getRepositoryURI">
+    <xsl:param name="path"/>
+    <xsl:value-of select="substring-after($path, $repositoryURILabel)"/>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/imsmanifest.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/imsmanifest.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/imsmanifest.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/imsmanifest.xml Mon Apr  9 22:45:15 2007
@@ -35,4 +35,3 @@
     <resource type="text/html" adlcp:scormtype="asset" identifier="RES-747E82F0-EC92-4EBC-C562-0F67B20D619C" href="/repositoryCommand/getSCO/HowTo/repositoryURI/www.burrokeet.org/repositoryData" />
   </resources>
 </manifest>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,14 +16,16 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Burrokeet Seed Project</title> 
-  </header> 
+<document>
+  <header>
+    <title>Burrokeet Seed Project</title>
+  </header>
   <body>
-  	<section>
-  		<title>Welcome to Burrokeet</title>
-  		<p>Congratulations, you have created new Burrokeet Content Package.</p>
-  	</section>
+    <section>
+      <title>Welcome to Burrokeet</title>
+      <p>
+        Congratulations, you have created new Burrokeet Content Package.
+      </p>
+    </section>
   </body>
-</document>
\ No newline at end of file
+</document>

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/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">
@@ -39,7 +37,6 @@
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="medium">
       <action context="docs" dev="open">
@@ -47,5 +44,4 @@
       </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/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.internal.NoteTaking"/>
   <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.internal.NoteTaking/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap Mon Apr  9 22:45:15 2007
@@ -16,29 +16,23 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
   <map:components>
     <map:generators>
       <map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
     </map:generators>
-
     <map:transformers>
       <map:transformer name="write-source"
           src="org.apache.cocoon.transformation.SourceWritingTransformer">
         <map:parameter name="serializer" value="xml"/>
       </map:transformer>
     </map:transformers>
-    
     <map:selectors>
       <map:selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </map:selectors>
   </map:components>
-
   <map:pipelines>
-
     <map:pipeline>
-
       <map:match pattern="noteTaking/do/addNote.xml">
         <map:generate type="request"/>
         <map:transform src="{lm:noteTaking.transform.postedNotes.sourceWriterNotes}">
@@ -50,12 +44,10 @@
         </map:transform>
         <map:serialize type="xml-document"/>
       </map:match>
-
       <map:match pattern="noteTaking/do/getNotes">
         <map:generate src="{properties:noteTaking.repository.URL}{properties:noteTaking.filename}"/>
         <map:serialize type="xml"/>
       </map:match>
-
       <map:match pattern="noteTaking/do/getNotes/**">
         <map:select type="exists">
           <map:when test="{properties:noteTaking.repository.URL}{properties:noteTaking.filename}">
@@ -70,8 +62,6 @@
         </map:transform>
         <map:serialize type="xml"/>
       </map:match>
-
     </map:pipeline>
   </map:pipelines>
-
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml 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.
 -->
-
 <!-- Default Forrest locationmap for the structurer/themer -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,16 +24,14 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
+      <selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
   <locator>
     <match pattern="noteTaking.transform.*.*">
       <location src="resources/stylesheets/{1}-to-{2}.xsl" />
     </match>
-    
     <match pattern="resolvePluginContract.*.**">
       <select type="exists">
         <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/{properties:theme}/{1}/{2}.ft" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/notes-to-pageNote.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/notes-to-pageNote.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/notes-to-pageNote.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/notes-to-pageNote.xsl Mon Apr  9 22:45:15 2007
@@ -18,14 +18,11 @@
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dyn="http://exslt.org/dynamic">
-  
-  <!-- the page for which we want to get the notes -->
+<!-- the page for which we want to get the notes -->
   <xsl:param name="path"/>
-  
   <xsl:template match="notes">
     <xsl:apply-templates select="dyn:evaluate($path)"/>
   </xsl:template>
-  
   <xsl:template match="note">
     <note>
       <xsl:apply-templates/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/postedNotes-to-sourceWriterNotes.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/postedNotes-to-sourceWriterNotes.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/postedNotes-to-sourceWriterNotes.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/postedNotes-to-sourceWriterNotes.xsl Mon Apr  9 22:45:15 2007
@@ -19,13 +19,12 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:h="http://apache.org/cocoon/request/2.0"
   xmlns:source="http://apache.org/cocoon/source/1.0">
-  
-  <!-- the name of the file to append the notes to -->
+<!-- the name of the file to append the notes to -->
   <xsl:param name="notesFile"/>
-  
   <xsl:template match="h:request">
-   <source:insert>
-      <source:path>notes/<xsl:value-of select="h:requestParameters/h:parameter[@name='path']"/></source:path>
+    <source:insert>
+      <source:path>notes/<xsl:value-of select="h:requestParameters/h:parameter[@name='path']"/>
+      </source:path>
       <source:source>
         <xsl:value-of select="$notesFile"/>
       </source:source>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/writeResult-to-acknowledgement.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/writeResult-to-acknowledgement.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/writeResult-to-acknowledgement.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/stylesheets/writeResult-to-acknowledgement.xsl Mon Apr  9 22:45:15 2007
@@ -18,10 +18,8 @@
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dyn="http://exslt.org/dynamic">
-  
-  <!-- the page for which the note was added -->
+<!-- the page for which the note was added -->
   <xsl:param name="path"/>
-  
   <xsl:template match="sourceResult">
     <xsl:choose>
       <xsl:when test="execution='success'">
@@ -32,39 +30,36 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
   <xsl:template name="success">
     <document>
       <header>
         <title>Note Written</title>
       </header>
       <body>
-        <p>Your note has been succesfully written. You can now continue to 
-        work.</p>
-        
+        <p>
+          Your note has been succesfully written. You can now continue to work.
+        </p>
         <p>
           <link>
-            <xsl:attribute name="href">/<xsl:value-of select="$path"/>.html</xsl:attribute>
-            Return to originating page.
-          </link>
+          <xsl:attribute name="href">/<xsl:value-of select="$path"/>.html</xsl:attribute>
+          Return to originating page. </link>
         </p>
       </body>
     </document>
   </xsl:template>
-  
   <xsl:template name="failure">
     <document>
       <header>
         <title>Failed Note Written</title>
       </header>
       <body>
-        <warning>There was an error recording your note.</warning>
-        
+        <warning>
+          There was an error recording your note.
+        </warning>
         <p>
           <link>
-            <xsl:attribute name="href">/<xsl:value-of select="$path"/>.html</xsl:attribute>
-            Return to originating page.
-          </link>
+          <xsl:attribute name="href">/<xsl:value-of select="$path"/>.html</xsl:attribute>
+          Return to originating page. </link>
         </p>
       </body>
     </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/common/html/content-noteTaking.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/common/html/content-noteTaking.ft?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/common/html/content-noteTaking.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/common/html/content-noteTaking.ft Mon Apr  9 22:45:15 2007
@@ -19,16 +19,17 @@
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-noteTaking" type="nugget">
-
   <description>
     content-noteTaking will output a text box to enable notes to be taken.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-noteTaking">  
+  <usage>
+<![CDATA[<forrest:contract name="content-noteTaking">  
   <forrest:property name="content-noteTaking-srcDoc">#{$cocoon/parameters/getRequest}</forrest:properties>
   <forrest:property name="content-noteTaking-notes"><jx:import uri="cocoon://noteTaking/do/getNotes/#{$cocoon/parameters/getRequest}"/></forrest:properties>
   [<forrest:property name="content-noteTaking-cols" value="[Number of Columns]"/>]
   [<forrest:property name="content-noteTaking-rows" vlaue="Number of Rows]"/>]
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
       format="html" name="content-noteTaking" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1"
@@ -47,11 +48,12 @@
       <xsl:template name="content-noteTaking-body">
         <xsl:variable name="notes">
           <xsl:choose>
-            <xsl:when test="not($content-noteTaking-notes='')"><xsl:value-of select="$content-noteTaking-notes"/></xsl:when>
+            <xsl:when test="not($content-noteTaking-notes='')">
+              <xsl:value-of select="$content-noteTaking-notes"/>
+            </xsl:when>
             <xsl:otherwise>Enter your notes here and click "SAVE" when done.</xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        
         <form action="/noteTaking/do/addNote.html" method="post">
           <textarea name="note">
             <xsl:attribute name="cols">
@@ -63,14 +65,14 @@
             <xsl:value-of select="$notes"/>
           </textarea>
           <button type="submit">Save</button>
-          <!-- The path to the node we are writing -->
+<!-- The path to the node we are writing -->
           <input type="hidden" name="path">
-            <xsl:attribute name="value"><xsl:value-of select="$content-noteTaking-srcDoc"/></xsl:attribute>
+            <xsl:attribute name="value">
+              <xsl:value-of select="$content-noteTaking-srcDoc"/>
+            </xsl:attribute>
           </input>
         </form>
-        
       </xsl:template>
-
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,37 +16,43 @@
   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.internal.NoteTaking Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.internal.NoteTaking Plugin</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Apache Forrest - org.apache.forrest.plugin.internal.NoteTaking Plugin</title>
-      <p>Provides features that facilitate the creation of a study aid package with Forrest.</p>
-      
-      <warning>This plugin will only work with a Views enabled site.</warning>
-      <note>This plugin will only work when Forrest is running in dynamic mode.</note>
+      <p>
+        Provides features that facilitate the creation of a study aid package
+        with Forrest.
+      </p>
+      <warning>
+        This plugin will only work with a Views enabled site.
+      </warning>
+      <note>
+        This plugin will only work when Forrest is running in dynamic mode.
+      </note>
     </section>
-    
     <section>
       <title>Adding a Notes Section</title>
-      <p>A notes section is provided by a contract called 
-      <code>content-noteTaking</code>. See the 
-      <a href="/ls.contracts.project.html">contract documentation</a>
-      for an example of how to include this contract in your pages.</p>
+      <p>
+        A notes section is provided by a contract called
+        <code>content-noteTaking</code>. See the
+        <a href="/ls.contracts.project.html">contract documentation</a> for an
+        example of how to include this contract in your pages.
+      </p>
     </section>
-    
     <section>
       <title>Configuration</title>
-      <p>As can be seen above, the physical representation of the notes field
-      is controlled by the contract definition in your structurer file. In addition,
-      There are various non-visual aspects of this plugin can be configured
-      by the site designer.
-      The table below lists the properties that may be configured and their 
-      defaults. To change a property add it to your 
-      <code>forrest.properties.xml</code> file.</p>
-      
+      <p>
+        As can be seen above, the physical representation of the notes field is
+        controlled by the contract definition in your structurer file. In
+        addition, There are various non-visual aspects of this plugin can be
+        configured by the site designer. The table below lists the properties
+        that may be configured and their defaults. To change a property add it
+        to your <code>forrest.properties.xml</code> file.
+      </p>
       <table>
         <tr>
           <th>Property Name</th>
@@ -64,21 +70,22 @@
           <td>notes.xml</td>
         </tr>
       </table>
-      
       <warning>
-        Defaults are not currently implemented. They are waiting on 
+        Defaults are not currently implemented. They are waiting on
         <a href="http://issues.apache.org/jira/browse/FOR-739">this issue</a>.
         However, the forrest.properties.xml file is present in the plugin
         directory and will should start working once the above issue is
         resolved. In the meantime, projects should define the above properties.
       </warning>
     </section>
-    
     <section>
       <title>Notes File</title>
-      <p>All notes are kept in a single notes file. This file has the 
-      following structure:</p>
-      <source><![CDATA[
+      <p>
+        All notes are kept in a single notes file. This file has the following
+        structure:
+      </p>
+      <source>
+<![CDATA[
 <notes>
   <path>
     <to>
@@ -93,7 +100,8 @@
     </to>
   </path>
 </notes>
-      ]]></source>
+      ]]>
+      </source>
     </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/samples/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/samples/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/samples/index.xml Mon Apr  9 22:45:15 2007
@@ -16,16 +16,20 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>NoteTaking Plugin samples</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>NoteTaking Plugin samples</title>
+  </header>
+  <body>
     <section id="introduction">
       <title>Introduction</title>
-      <p>Add notes to any page, then see PLUGIN_DIR/src/notes/notes.xml</p>
-      <note>The purpose of this samples/index.html is to test the writing of
-      path information to notes.xml</note>
+      <p>
+        Add notes to any page, then see PLUGIN_DIR/src/notes/notes.xml
+      </p>
+      <note>
+        The purpose of this samples/index.html is to test the writing of path
+        information to notes.xml
+      </note>
     </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/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,23 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.internal.NoteTaking" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.internal.NoteTaking"/>
-    <!--<forrestPlugins label="Plugins Index" href="site:forrest/plugins" description="Index of Forrest Plugins"/>-->
+<!--<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" dir="samples">    
+  <samples label="Samples" dir="samples">
     <index label="Index" href="index.html"/>
   </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"/>
@@ -59,5 +54,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/resources/themes/common.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/resources/themes/common.fv?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/resources/themes/common.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/src/documentation/resources/themes/common.fv 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:views 
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
@@ -30,7 +29,7 @@
     </forrest:contract>
     <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
       <forrest:property name="custom">
-         <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
       </forrest:property>
     </forrest:contract>
     <forrest:hook name="container">
@@ -54,13 +53,13 @@
               <jx:import uri="cocoon://#{$getRequest}.toc.xml"/>
             </forrest:property>
             <forrest:property name="toc" max-depth="2"/>
-          </forrest:contract> 
-            <forrest:contract name="search-input">
-                <forrest:property name="search-input">
-                    <search name="MyProject" domain="mydomain" 
+          </forrest:contract>
+          <forrest:contract name="search-input">
+            <forrest:property name="search-input">
+              <search name="MyProject" domain="mydomain" 
                         provider="google"/>
-                </forrest:property>
-            </forrest:contract>
+            </forrest:property>
+          </forrest:contract>
         </forrest:hook>
 <!--  You can group elements to a template and call it from any view. e.g.
 <forrest:hook name="export-link">
@@ -77,10 +76,9 @@
 <forrest:call-template name="export-link"/> is *not* working anymore!!!
 -->
         <jx:import uri="cocoon://prepare.tiles.export-link"/>
-        <!-- FIXME: jxpath -->
-        <!-- Use this when jxpath bug is solved -->
-        <!--<jx:import uri="lm:tiles.export-link"/>-->
-
+<!-- FIXME: jxpath -->
+<!-- Use this when jxpath bug is solved -->
+<!--<jx:import uri="lm:tiles.export-link"/>-->
         <forrest:hook name="content">
           <forrest:contract name="content-title" 
             dataURI="cocoon://#{$getRequest}.title.xml"/>
@@ -98,7 +96,9 @@
       <forrest:hook name="notes">
         <forrest:contract name="content-noteTaking">
           <forrest:property name="content-noteTaking-srcDoc">#{$cocoon/parameters/getRequest}</forrest:property>
-          <forrest:property name="content-noteTaking-notes"><jx:import uri="cocoon://noteTaking/do/getNotes/#{$cocoon/parameters/getRequest}"/></forrest:property>
+          <forrest:property name="content-noteTaking-notes">
+            <jx:import uri="cocoon://noteTaking/do/getNotes/#{$cocoon/parameters/getRequest}"/>
+          </forrest:property>
           <forrest:property name="content-noteTaking-cols" value="60"/>
           <forrest:property name="content-noteTaking-rows" value="10"/>
         </forrest:contract>
@@ -106,12 +106,12 @@
     </forrest:hook>
     <forrest:hook name="footer">
       <forrest:contract name="siteinfo-feedback">
-          <forrest:property name="siteinfo-feedback">
-            <feedback to="webmaster@foo.com"
+        <forrest:property name="siteinfo-feedback">
+          <feedback to="webmaster@foo.com"
               href="mailto:webmaster@foo.com?subject=Feedback&#160;" >
               Send feedback about the website to:
             </feedback>
-          </forrest:property>
+        </forrest:property>
       </forrest:contract>
       <forrest:contract name="siteinfo-last-published"/>
     </forrest:hook>

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



Mime
View raw message