forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527038 [2/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.Blog/src/documentation/content/xdocs/blog/entry2.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry2.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry2.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry2.xml Mon Apr  9 22:45:15 2007
@@ -16,17 +16,18 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>An entry relevant to both news and sports</title> 
+<document>
+  <header>
+    <title>An entry relevant to both news and sports</title>
     <meta name="category">News</meta>
     <meta name="category">Sports</meta>
-  </header> 
-  <body> 
+  </header>
+  <body>
     <section id="overview">
       <title>Sample Blog Entry</title>
-      <p>A sample blog entry that is relevant to both news and sports. </p>
+      <p>
+        A sample blog entry that is relevant to both news and sports.
+      </p>
     </section>
-
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry3.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry3.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry3.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry3.xml Mon Apr  9 22:45:15 2007
@@ -16,15 +16,17 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Another sports entry</title> 
+<document>
+  <header>
+    <title>Another sports entry</title>
     <meta name="category">Sports</meta>
-  </header> 
-  <body> 
+  </header>
+  <body>
     <section id="overview">
       <title>Sample Blog Entry</title>
-      <p>Another sample blog entry for the "Sports" category.</p>
+      <p>
+        Another sample blog entry for the "Sports" category.
+      </p>
     </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry4.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry4.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry4.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/entry4.xml Mon Apr  9 22:45:15 2007
@@ -16,16 +16,17 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>My second News entry</title> 
+<document>
+  <header>
+    <title>My second News entry</title>
     <meta name="category">News</meta>
-  </header> 
-  <body> 
+  </header>
+  <body>
     <section id="overview">
       <title>Sample Blog Entry</title>
-      <p>Another sample blog entry for the "News" category.</p>
+      <p>
+        Another sample blog entry for the "News" category.
+      </p>
     </section>
-
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/test-descending/entry5.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/test-descending/entry5.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/test-descending/entry5.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/blog/test-descending/entry5.xml Mon Apr  9 22:45:15 2007
@@ -16,18 +16,20 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Sub-directoried entry for news</title> 
+<document>
+  <header>
+    <title>Sub-directoried entry for news</title>
     <meta name="category">News</meta>
-  </header> 
-  <body> 
+  </header>
+  <body>
     <section id="overview">
       <title>Sample Blog Entry</title>
-      <p>A sample blog entry in the "News" category.  This one is intended to physically reside in a
-      sub-directory to test whether the XPathDirectory Generator is decending directories properly.  (That
-      you're reading this right now means that it did;)</p>
+      <p>
+        A sample blog entry in the "News" category. This one is intended to
+        physically reside in a sub-directory to test whether the XPathDirectory
+        Generator is decending directories properly. (That you're reading this
+        right now means that it did;)
+      </p>
     </section>
-
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/default.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/default.fv?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/default.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/default.fv Mon Apr  9 22:45:15 2007
@@ -15,30 +15,29 @@
 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" >
-    <forrest:view type="xhtml">
-        <forrest:css url="default.css"/>
-        <forrest:contract name="siteinfo-meta"/>
-        <forrest:hook name="container">
-            <forrest:hook name="header">
-              <forrest:contract name="branding-tagline">
-		            <forrest:properties contract="branding-tagline">
-								  <forrest:property name="branding-tagline-name">new seed</forrest:property>
-		              <forrest:property name="branding-tagline-tagline">powered by forrest:views</forrest:property>
-								 </forrest:properties>
-		          </forrest:contract>
-              <forrest:hook name="nav-main-hook">
-                <forrest:contract name="nav-main"/>
-              	<forrest:contract name="nav-main-sub"/>
-              </forrest:hook>
-            </forrest:hook>
-            <forrest:hook name="page">
-                <forrest:hook name="leftbar">
-                    <forrest:contract name="nav-section"/>
-                    <forrest:contract name="search-input"/>
-                </forrest:hook>
-                <!-- You can group elements to a template and call it from any view.
+  <forrest:view type="xhtml">
+    <forrest:css url="default.css"/>
+    <forrest:contract name="siteinfo-meta"/>
+    <forrest:hook name="container">
+      <forrest:hook name="header">
+        <forrest:contract name="branding-tagline">
+          <forrest:properties contract="branding-tagline">
+            <forrest:property name="branding-tagline-name">new seed</forrest:property>
+            <forrest:property name="branding-tagline-tagline">powered by forrest:views</forrest:property>
+          </forrest:properties>
+        </forrest:contract>
+        <forrest:hook name="nav-main-hook">
+          <forrest:contract name="nav-main"/>
+          <forrest:contract name="nav-main-sub"/>
+        </forrest:hook>
+      </forrest:hook>
+      <forrest:hook name="page">
+        <forrest:hook name="leftbar">
+          <forrest:contract name="nav-section"/>
+          <forrest:contract name="search-input"/>
+        </forrest:hook>
+<!-- You can group elements to a template and call it from any view.
 	                e.g.
 	                <forrest:hook name="export-link">
 	                  <forrest:contract name="content-xml-link"/>
@@ -47,19 +46,18 @@
 	                can be called as <forrest:call-template name="export-link"/>
 	                when saved as {project:resources}/templates/export-link.vt.xml 
 	              -->
-                <forrest:call-template name="export-link"/>
-                
-                <forrest:hook name="content">
-                    <forrest:contract name="content-title"/>
-                    <forrest:contract name="content-abstract"/>
-                    <!--<forrest:contract name="content-minitoc"/>-->
-                    <forrest:contract name="content-main"/>
-                </forrest:hook>
-            </forrest:hook>
-        </forrest:hook>
-        <forrest:hook name="footer">
-            <forrest:contract name="siteinfo-feedback"/>
-            <forrest:contract name="siteinfo-last-published"/>
+        <forrest:call-template name="export-link"/>
+        <forrest:hook name="content">
+          <forrest:contract name="content-title"/>
+          <forrest:contract name="content-abstract"/>
+<!--<forrest:contract name="content-minitoc"/>-->
+          <forrest:contract name="content-main"/>
         </forrest:hook>
-    </forrest:view>
+      </forrest:hook>
+    </forrest:hook>
+    <forrest:hook name="footer">
+      <forrest:contract name="siteinfo-feedback"/>
+      <forrest:contract name="siteinfo-last-published"/>
+    </forrest:hook>
+  </forrest:view>
 </forrest:views>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,34 +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.input.Blog Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.input.Blog Plugin</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Apache Forrest - org.apache.forrest.plugin.input.Blog Plugin</title>
-      <p>Use Forrest to publish a weblog - One use-case for metadata driven indices.</p>
+      <p>
+        Use Forrest to publish a weblog - One use-case for metadata driven
+        indices.
+      </p>
     </section>
-    
     <section id="samples">
       <title>Samples</title>
-      <p>In the menu on the left side of the page is a link to "Web Blog".  Under there you will 
-      find a couple sample blog categories.  Click on one of them and an index comes up with all
-      articles listed for that category.</p>
-      <p>Try it out by opening a blog entry (e.g. /blog/entry1.xml) and adding or changing the category
-      from or to "News" or "Sports". 
+      <p>
+        In the menu on the left side of the page is a link to "Web Blog". Under
+        there you will find a couple sample blog categories. Click on one of
+        them and an index comes up with all articles listed for that category.
+      </p>
+      <p>
+        Try it out by opening a blog entry (e.g. /blog/entry1.xml) and adding or
+        changing the category from or to "News" or "Sports".
       </p>
     </section>
     <section id="why">
       <title>Why is this interesting?</title>
-      <p>Ok, so this isn't the most powerful blogging software out there but it's interesting because
-      it demonstrates using an XPathDirectory generator to publish indices of articles.  If 
-      you want an article listed on multiple pages, just add the appropriate "meta" entry for it with
-      the appropriate category.</p>
-      
-      <p>In that sense, a Blog becomes just another use-case for metadata driven indices. Several other 
-      use-cases that might follow a similar approach once fleshed out:
+      <p>
+        Ok, so this isn't the most powerful blogging software out there but it's
+        interesting because it demonstrates using an XPathDirectory generator to
+        publish indices of articles. If you want an article listed on multiple
+        pages, just add the appropriate "meta" entry for it with the appropriate
+        category.
+      </p>
+      <p>
+        In that sense, a Blog becomes just another use-case for metadata driven
+        indices. Several other use-cases that might follow a similar approach
+        once fleshed out:
       </p>
       <ul>
         <li>Product catalogs where each product might belong to more than one category.</li>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/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,30 +28,25 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.input.Blog" 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.Blog"/>
     <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>
-  
   <blog label="Categories">
     <index label="Index" href="blog/index.html" description="My Sample Web Blog"/>
     <news label="News" href="blog/News/index.html" description="Thoughts on the current events"/>
     <sports label="Sports" href="blog/Sports/index.html" description="Thoughts on sports"/>
   </blog>
-
-  <!--
+<!--
   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"/>
@@ -62,5 +56,4 @@
       <plugins href="docs/plugins"/>
     </forrest>
   </external-refs>
-
 </site>

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

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/status.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/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="Tim Williams" 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-dev" date="unreleased">
       <action dev="tww" type="add" context="admin">
         Initial plugin code.
       </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="high">
       <action context="code" dev="open">
@@ -54,8 +50,7 @@
       </action>
       <action context="docs" dev="open">
         Make the example more interesting by having entries that look "blogg-ish".
-      </action>      
+      </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/build.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/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.Daisy"/>
   <property name="forrest.version" value="0.8"/>
   <property name="type" value="input"/>
@@ -26,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.input.Daisy/"/>
   <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.Daisy/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/default.plugin.properties.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/default.plugin.properties.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/default.plugin.properties.xml Mon Apr  9 22:45:15 2007
@@ -16,25 +16,19 @@
   limitations under the License.
 -->
 <properties>
-   <!-- Daisy plugin properties -->
-   
-   <!-- The Daisy document ID for the navigation document to use to 
+<!-- Daisy plugin properties -->
+<!-- The Daisy document ID for the navigation document to use to 
         generate the site navigation (site.xml) -->
-   <property name="daisy.navigation.docID" value="[FIXME: set value in forrest.properties.xml]"/>
-      
-   <!-- The Daisy document ID for the page coresponding to index.* -->
-   <property name="daisy.index.docID" value="[FIXME: set value in forrest.properties.xml]"/>
-   
-   <!-- The URL of the Daisy publisher -->
-   <property name="daisy.publisher.URL" value="[FIXME: set value in forrest.properties.xml]"/>
-  
-   <!-- A prefix to add to the URL of any documents generated from Daisy -->
-   <property name="daisy.pathPrefix" value=""/>
-   
-   <!-- The extension to use for documents retrieved from Daisy
+  <property name="daisy.navigation.docID" value="[FIXME: set value in forrest.properties.xml]"/>
+<!-- The Daisy document ID for the page coresponding to index.* -->
+  <property name="daisy.index.docID" value="[FIXME: set value in forrest.properties.xml]"/>
+<!-- The URL of the Daisy publisher -->
+  <property name="daisy.publisher.URL" value="[FIXME: set value in forrest.properties.xml]"/>
+<!-- A prefix to add to the URL of any documents generated from Daisy -->
+  <property name="daisy.pathPrefix" value=""/>
+<!-- The extension to use for documents retrieved from Daisy
         This is places between the filename and the file extension.
         If you change this in your project you will need to add
         handling to your sitemap (see plugin docs) -->
-   <property name="daisy.fileExt" value=".daisy"/>
-  
+  <property name="daisy.fileExt" value=".daisy"/>
 </properties>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties.xml Mon Apr  9 22:45:15 2007
@@ -16,26 +16,20 @@
   limitations under the License.
 -->
 <properties>
-   <!-- Daisy plugin properties for the Daisy docs site.
+<!-- Daisy plugin properties for the Daisy docs site.
         We are using the Cocoon Daisy instance for examples. -->
-   
-   <!-- The Daisy document ID for the navigation document to use to 
+<!-- The Daisy document ID for the navigation document to use to 
         generate the site navigation (site.xml) -->
-   <property name="daisy.navigation.docID" value="655"/>
-      
-   <!-- The Daisy document ID for the page coresponding to index.* -->
-   <property name="daisy.index.docID" value="653"/>
-   
-   <!-- The URL of the Daisy publisher -->
-   <property name="daisy.publisher.URL" value="http://publish:publish@cocoon.zones.apache.org:9263/publisher/"/>
-  
-   <!-- A prefix to add to the URL of any documents generated from Daisy -->
-   <property name="daisy.pathPrefix" value=""/>
-   
-   <!-- The extension to use for documents retrieved from Daisy
+  <property name="daisy.navigation.docID" value="655"/>
+<!-- The Daisy document ID for the page coresponding to index.* -->
+  <property name="daisy.index.docID" value="653"/>
+<!-- The URL of the Daisy publisher -->
+  <property name="daisy.publisher.URL" value="http://publish:publish@cocoon.zones.apache.org:9263/publisher/"/>
+<!-- A prefix to add to the URL of any documents generated from Daisy -->
+  <property name="daisy.pathPrefix" value=""/>
+<!-- The extension to use for documents retrieved from Daisy
         This is places between the filename and the file extension.
         If you change this in your project you will need to add
         handling to your sitemap (see plugin docs) -->
-   <property name="daisy.fileExt" value=".daisy"/>
-  
+  <property name="daisy.fileExt" value=".daisy"/>
 </properties>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap Mon Apr  9 22:45:15 2007
@@ -16,50 +16,44 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-	<map:components>
-		<map:generators default="file">
-			<map:generator name="html"
+  <map:components>
+    <map:generators default="file">
+      <map:generator name="html"
 				src="org.apache.cocoon.generation.HTMLGenerator">
-				<jtidy-config>WEB-INF/jtidy.properties</jtidy-config>
-			</map:generator>
-			<map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
-		</map:generators>
-    
+        <jtidy-config>WEB-INF/jtidy.properties</jtidy-config>
+      </map:generator>
+      <map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
+    </map:generators>
     <map:selectors>
       <map:selector logger="sitemap.selector.request-parameter" name="request-parameter" src="org.apache.cocoon.selection.RequestParameterSelector"/>
     </map:selectors>
-    
-	</map:components>
-  
+  </map:components>
   <map:resources>
     <map:resource name="daisy-to-document">
-        <map:aggregate element="daisyDocument">
-          <map:part src="cocoon://{properties:daisy.pathPrefix}{docID}.daisy.source" />
-          <map:part src="cocoon://daisy.site.{properties:daisy.navigation.docID}" />
-        </map:aggregate>
-        <map:transform src="{lm:daisy.transform.daisy.html}">
-          <map:parameter name="documentPath" value="{path}"/>
-          <map:parameter name="pathPrefix" value="{properties:daisy.pathPrefix}"/>
-          <map:parameter name="daisyExt" value="{properties:daisy.fileExt}"/>
-        </map:transform>
-        <map:transform src="{lm:transform.html.document}"/>
-        <map:select type="exists">
-          <map:when test="{properties:resources.stylesheets}/daisy/postFilter.xsl">
-            <map:transform src="{properties:resources.stylesheets}/daisy/postFilter.xsl"/>
-          </map:when>
-        </map:select>
-        <map:serialize/>
+      <map:aggregate element="daisyDocument">
+        <map:part src="cocoon://{properties:daisy.pathPrefix}{docID}.daisy.source" />
+        <map:part src="cocoon://daisy.site.{properties:daisy.navigation.docID}" />
+      </map:aggregate>
+      <map:transform src="{lm:daisy.transform.daisy.html}">
+        <map:parameter name="documentPath" value="{path}"/>
+        <map:parameter name="pathPrefix" value="{properties:daisy.pathPrefix}"/>
+        <map:parameter name="daisyExt" value="{properties:daisy.fileExt}"/>
+      </map:transform>
+      <map:transform src="{lm:transform.html.document}"/>
+      <map:select type="exists">
+        <map:when test="{properties:resources.stylesheets}/daisy/postFilter.xsl">
+          <map:transform src="{properties:resources.stylesheets}/daisy/postFilter.xsl"/>
+        </map:when>
+      </map:select>
+      <map:serialize/>
     </map:resource>
   </map:resources>
-
-	<map:pipelines>
-		<!-- ============================================================== -->
-		<!-- Repository pipeline                                            -->
-		<!-- ============================================================== -->
-		
+  <map:pipelines>
+<!-- ============================================================== -->
+<!-- Repository pipeline                                            -->
+<!-- ============================================================== -->
     <map:pipeline>
-      
-      <!-- Workaround: When Cocoondocs are generated the FAQ index page (id 856)
+<!-- Workaround: When Cocoondocs are generated the FAQ index page (id 856)
       has URLs that have the *.daisy.html extension. I don't have the time
       now to work out why this is, so the match below is a quick hack to get the
       FAQ pages working again.
@@ -76,14 +70,12 @@
           <map:parameter name="path" value="{0}"/>
         </map:call>
       </map:match>
-      
       <map:match pattern="{properties:daisy.pathPrefix}*{properties:daisy.fileExt}.xml">
         <map:call resource="daisy-to-document">
           <map:parameter name="docID" value="{1}"/>
           <map:parameter name="path" value="{0}"/>
         </map:call>
       </map:match>
-      
       <map:match pattern="{properties:daisy.pathPrefix}**{properties:daisy.fileExt}.xml">
         <map:call resource="daisy-to-document">
           <map:parameter name="docID" value="{1}"/>
@@ -91,6 +83,5 @@
         </map:call>
       </map:match>
     </map:pipeline>
-    
-	</map:pipelines>
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/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,17 +23,16 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
+      <selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
-  <locator>    
+  <locator>
     <match pattern="daisy.transform.*.*">
       <select>
         <location src="{properties:resources.stylesheets}/daisy/{1}-to-{2}.xsl"/>
         <location src="resources/stylesheets/{1}-to-{2}.xsl"/>
       </select>
-    </match>   
+    </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap Mon Apr  9 22:45:15 2007
@@ -20,42 +20,37 @@
     <map:pipes>
       <map:pipe name="navigation"
         src="org.apache.cocoon.components.pipeline.impl.ExpiresCachingProcessingPipeline">
-        <parameter name="cache-expires" value="600"/> <!-- Expires in seconds -->
+        <parameter name="cache-expires" value="600"/>
+<!-- Expires in seconds -->
       </map:pipe>
     </map:pipes>
   </map:components>
-
-	<map:pipelines>
-		<!-- ============================================================== -->
-		<!-- Repository pipeline                                            -->
-		<!-- ============================================================== -->
-		<map:pipeline>   
-       <map:match pattern="**.daisy.source">
+  <map:pipelines>
+<!-- ============================================================== -->
+<!-- Repository pipeline                                            -->
+<!-- ============================================================== -->
+    <map:pipeline>
+      <map:match pattern="**.daisy.source">
         <map:generate src="{lm:{0}}" />
         <map:select type="exists">
           <map:when test="{properties:resources.stylesheets}/daisy/preFilter.xsl">
-				    <map:transform src="{properties:resources.stylesheets}/daisy/preFilter.xsl"/>
+            <map:transform src="{properties:resources.stylesheets}/daisy/preFilter.xsl"/>
           </map:when>
         </map:select>
         <map:serialize type="xml"/>
-       </map:match>
-       
-       <map:match pattern="**.daisy.img">
-         <map:read src="{lm:{0}}"/>
-       </map:match>
-
-       <map:match pattern="**.daisy.rawHTML">
-         <map:generate type="html" src="{lm:{0}}"/>
-         <map:serialize type="html"/>
-       </map:match>
-
-		</map:pipeline>
-    
-   <!-- ============================================================ -->
-   <!-- Navigation elements                                          -->
-   <!-- ============================================================ -->
-  
-    <map:pipeline ype="navigation">      
+      </map:match>
+      <map:match pattern="**.daisy.img">
+        <map:read src="{lm:{0}}"/>
+      </map:match>
+      <map:match pattern="**.daisy.rawHTML">
+        <map:generate type="html" src="{lm:{0}}"/>
+        <map:serialize type="html"/>
+      </map:match>
+    </map:pipeline>
+<!-- ============================================================ -->
+<!-- Navigation elements                                          -->
+<!-- ============================================================ -->
+    <map:pipeline ype="navigation">
       <map:match pattern="daisy.site.*">
         <map:generate src="{properties:daisy.publisher.URL}blob?documentId={1}&amp;version=live&amp;partType=1" />
         <map:transform src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl">
@@ -65,6 +60,5 @@
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
-    
-	</map:pipelines>
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl Mon Apr  9 22:45:15 2007
@@ -15,28 +15,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:p="http://outerx.org/daisy/1.0#publisher"
     xmlns:ns="http://outerx.org/daisy/1.0"
     version="1.0">
-    
-  
-  <!-- The path to the current document, used to calculate the path
+<!-- The path to the current document, used to calculate the path
        to the site root when working out paths in links -->
   <xsl:param name="documentPath"/>
-  
-  <!-- The pathPrefix is added to the start of all resolved Daisy links 
+<!-- The pathPrefix is added to the start of all resolved Daisy links 
        It must include a trailing slash if it is non-empty -->
   <xsl:param name="pathPrefix">/</xsl:param>
-  
-  <!-- The daisyExt is added between the Daisy ID and the extension of 
+<!-- The daisyExt is added between the Daisy ID and the extension of 
         of all daisy links. If non-empty it must include a prefixing '.' -->
   <xsl:param name="daisyExt">.daisy</xsl:param>
-    
   <xsl:template match="daisyDocument">
-    <xsl:variable name="rootElementName"><xsl:value-of select="name(*)"/></xsl:variable>
+    <xsl:variable name="rootElementName">
+      <xsl:value-of select="name(*)"/>
+    </xsl:variable>
     <html>
       <head>
         <xsl:choose>
@@ -62,25 +58,32 @@
           </xsl:when>
           <xsl:otherwise>
             <h1>Daisy Error</h1>
-            <p>Unable to transform the daisy document with root element of <xsl:value-of select="$rootElementName"/>.</p>
+            <p>
+              Unable to transform the daisy document with root element of
+              <xsl:value-of select="$rootElementName"/>
+              .
+            </p>
           </xsl:otherwise>
         </xsl:choose>
       </body>
     </html>
   </xsl:template>
-  
   <xsl:template match="ns:field">
     <xsl:for-each select="ns:string">
       <meta>
-        <xsl:attribute name="name"><xsl:value-of select="../@name"/></xsl:attribute>
-        <xsl:attribute name="content"><xsl:value-of select="."/></xsl:attribute>
+        <xsl:attribute name="name">
+          <xsl:value-of select="../@name"/>
+        </xsl:attribute>
+        <xsl:attribute name="content">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
       </meta>
     </xsl:for-each>
   </xsl:template>
-  
   <xsl:template match="p:preparedDocument">
-    <xsl:comment>Prepared Document: ID = <xsl:value-of select="@id"/></xsl:comment>
-    <!-- Test whether the p:preparedDocument contains directly a ns:document (up to Daisy 1.4)
+    <xsl:comment>Prepared Document: ID = <xsl:value-of select="@id"/>
+    </xsl:comment>
+<!-- Test whether the p:preparedDocument contains directly a ns:document (up to Daisy 1.4)
          or a new publisherResponse (from Daisy 1.5). -->
     <xsl:choose>
       <xsl:when test="ns:document">
@@ -91,51 +94,46 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
   <xsl:template match="ns:part">
-    <xsl:comment>Part: Name <xsl:value-of select="@name"/></xsl:comment>
+    <xsl:comment>Part: Name <xsl:value-of select="@name"/>
+    </xsl:comment>
     <xsl:if test="@name!='SimpleDocumentContent'">
-      <h1><xsl:value-of select="@name"/></h1>
+      <h1>
+        <xsl:value-of select="@name"/>
+      </h1>
     </xsl:if>
     <xsl:apply-templates select="html/body"/>
   </xsl:template>
-  
   <xsl:template match="ns:searchResult">
     <table>
-        <xsl:apply-templates/>
+      <xsl:apply-templates/>
     </table>
   </xsl:template>
-  
   <xsl:template match="ns:titles">
     <tr>
       <xsl:apply-templates/>
     </tr>
   </xsl:template>
-  
   <xsl:template match="ns:title">
     <td>
       <xsl:apply-templates/>
     </td>
   </xsl:template>
-  
   <xsl:template match="ns:rows">
     <xsl:apply-templates/>
   </xsl:template>
-  
   <xsl:template match="ns:row">
     <tr>
       <xsl:apply-templates/>
     </tr>
   </xsl:template>
-  
   <xsl:template match="ns:value">
     <td>
       <xsl:choose>
-        <xsl:when test="position() = 1">
-          <a>
-            <xsl:attribute name="href"><xsl:value-of select="../@documentId"/>.daisy.html</xsl:attribute>
-            <xsl:apply-templates/>
-          </a>
+        <xsl:when test="position() = 1"><a>
+          <xsl:attribute name="href">
+            <xsl:value-of select="../@documentId"/>.daisy.html</xsl:attribute>
+          <xsl:apply-templates/></a>
         </xsl:when>
         <xsl:otherwise>
           <xsl:apply-templates/>
@@ -143,16 +141,14 @@
       </xsl:choose>
     </td>
   </xsl:template>
-  
   <xsl:template match="body">
     <xsl:apply-templates/>
   </xsl:template>
-
   <xsl:template match="p:daisyPreparedInclude">
     <xsl:variable name="id" select="@id"/>
     <xsl:variable name="preparedDocument" select="//p:preparedDocument[@id=$id]"/>
     <h1>
-      <!-- Test whether the p:preparedDocument contains directly a ns:document (up to Daisy 1.4)
+<!-- Test whether the p:preparedDocument contains directly a ns:document (up to Daisy 1.4)
            or a new publisherResponse (from Daisy 1.5). -->
       <xsl:choose>
         <xsl:when test="$preparedDocument/ns:document">
@@ -165,114 +161,142 @@
     </h1>
     <xsl:apply-templates select="//p:preparedDocument[@id=$id]"/>
   </xsl:template>
-  
   <xsl:template match="p[@class='note']">
     <div class="frame note">
       <div class="label">Note</div>
-      <div class="content"><xsl:apply-templates/></div>
+      <div class="content">
+        <xsl:apply-templates/>
+      </div>
     </div>
   </xsl:template>
-  
   <xsl:template match="p[@class='fixme']">
     <div class="frame fixme">
       <div class="label">Fixme</div>
-      <div class="content"><xsl:apply-templates/></div>
+      <div class="content">
+        <xsl:apply-templates/>
+      </div>
     </div>
   </xsl:template>
-  
   <xsl:template match="p[@class='warning']">
     <div class="frame warning">
       <div class="label">Warning</div>
-      <div class="content"><xsl:apply-templates/></div>
+      <div class="content">
+        <xsl:apply-templates/>
+      </div>
     </div>
   </xsl:template>
-  
   <xsl:template match="a">
     <xsl:variable name="pathToRoot">
       <xsl:call-template name="dotdots">
-        <xsl:with-param name="path"><xsl:value-of select="$documentPath"/></xsl:with-param>
+        <xsl:with-param name="path">
+          <xsl:value-of select="$documentPath"/>
+        </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
-    
     <xsl:choose>
       <xsl:when test="starts-with(@href, 'daisy:')">
-        <xsl:variable name="docIdPlusAnchor"><xsl:value-of select="substring-after(@href, 'daisy:')"/></xsl:variable>
+        <xsl:variable name="docIdPlusAnchor">
+          <xsl:value-of select="substring-after(@href, 'daisy:')"/>
+        </xsl:variable>
         <xsl:variable name="docId">
           <xsl:choose>
-            <xsl:when test="contains($docIdPlusAnchor, '#')"><xsl:value-of select="substring-before($docIdPlusAnchor, '#')"/></xsl:when>
-            <xsl:otherwise><xsl:value-of select="$docIdPlusAnchor"/></xsl:otherwise>
+            <xsl:when test="contains($docIdPlusAnchor, '#')">
+              <xsl:value-of select="substring-before($docIdPlusAnchor, '#')"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$docIdPlusAnchor"/>
+            </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
         <xsl:variable name="anchor">
           <xsl:choose>
-            <xsl:when test="contains($docIdPlusAnchor, '#')">#<xsl:value-of select="substring-after($docIdPlusAnchor, '#')"/></xsl:when>
+            <xsl:when test="contains($docIdPlusAnchor, '#')">#<xsl:value-of select="substring-after($docIdPlusAnchor, '#')"/>
+            </xsl:when>
             <xsl:otherwise></xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
         <xsl:variable name="path">
           <xsl:value-of select="$pathPrefix"/>
-          <xsl:for-each select="//daisyDocument/descendant::doc[@id=$docId][1]/ancestor::group|//daisyDocument/descendant::doc[@id=$docId][1]/ancestor::doc[@nodeId]"><xsl:value-of select="@href"/></xsl:for-each>
+          <xsl:for-each select="//daisyDocument/descendant::doc[@id=$docId][1]/ancestor::group|//daisyDocument/descendant::doc[@id=$docId][1]/ancestor::doc[@nodeId]">
+            <xsl:value-of select="@href"/>
+          </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="url">
           <xsl:choose>
-            <xsl:when test="//daisyDocument/descendant::doc[@id=$docId]"><xsl:value-of select="$pathToRoot"/><xsl:value-of select="$path"/><xsl:value-of select="//doc[@id=$docId]/@href"/><xsl:value-of select="$anchor"/></xsl:when>
-            <xsl:otherwise><xsl:value-of select="$pathToRoot"/><xsl:value-of select="$path"/><xsl:value-of select="$docId"/><xsl:value-of select="$daisyExt"/>.html<xsl:value-of select="$anchor"/></xsl:otherwise>
+            <xsl:when test="//daisyDocument/descendant::doc[@id=$docId]">
+              <xsl:value-of select="$pathToRoot"/>
+              <xsl:value-of select="$path"/>
+              <xsl:value-of select="//doc[@id=$docId]/@href"/>
+              <xsl:value-of select="$anchor"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$pathToRoot"/>
+              <xsl:value-of select="$path"/>
+              <xsl:value-of select="$docId"/>
+              <xsl:value-of select="$daisyExt"/>.html<xsl:value-of select="$anchor"/>
+            </xsl:otherwise>
           </xsl:choose>
-        </xsl:variable>
-        <a>
-          <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute>
-          <xsl:attribute name="description"><xsl:value-of select="@daisyDocumentName"/></xsl:attribute>
-          <xsl:apply-templates/>
-        </a>
+        </xsl:variable><a>
+        <xsl:attribute name="href">
+          <xsl:value-of select="$url"/>
+        </xsl:attribute>
+        <xsl:attribute name="description">
+          <xsl:value-of select="@daisyDocumentName"/>
+        </xsl:attribute>
+        <xsl:apply-templates/></a>
       </xsl:when>
-      <xsl:otherwise>
-        <a>
-          <xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute>
-          <xsl:attribute name="description"><xsl:value-of select="@daisyDocumentName"/></xsl:attribute>
-          <xsl:apply-templates/>
-        </a>
+      <xsl:otherwise><a>
+        <xsl:attribute name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:attribute>
+        <xsl:attribute name="description">
+          <xsl:value-of select="@daisyDocumentName"/>
+        </xsl:attribute>
+        <xsl:apply-templates/></a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
   <xsl:template match="img">
     <xsl:choose>
       <xsl:when test="starts-with(@src, 'daisy:')">
         <img>
           <xsl:apply-templates select="@*"/>
-          <xsl:attribute name="src"><xsl:value-of select="substring-after(@src, 'daisy:')"/>.daisy.img</xsl:attribute>
+          <xsl:attribute name="src">
+            <xsl:value-of select="substring-after(@src, 'daisy:')"/>.daisy.img</xsl:attribute>
           <xsl:apply-templates/>
         </img>
       </xsl:when>
       <xsl:otherwise>
         <img>
           <xsl:apply-templates select="@*"/>
-          <xsl:attribute name="src"><xsl:value-of select="@src"/></xsl:attribute>
+          <xsl:attribute name="src">
+            <xsl:value-of select="@src"/>
+          </xsl:attribute>
           <xsl:apply-templates/>
         </img>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
   <xsl:template match="@ns:*|ns:*"/>
   <xsl:template match="@p:*|p:*"/>
-  
   <xsl:template match="@id">
-    <xsl:attribute name="id"><xsl:value-of select="."/></xsl:attribute>
-    <a><xsl:attribute name="name"><xsl:value-of select="."/></xsl:attribute></a>
+    <xsl:attribute name="id">
+      <xsl:value-of select="."/>
+    </xsl:attribute><a>
+    <xsl:attribute name="name">
+      <xsl:value-of select="."/>
+    </xsl:attribute></a>
   </xsl:template>
-  
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
-  
-  <!-- FIXME: this should come from include of dotdots.xsl in forest core -->
+<!-- FIXME: this should come from include of dotdots.xsl in forest core -->
   <xsl:template name="dotdots">
     <xsl:param name="path"/>
     <xsl:variable name="dirs" select="normalize-space(translate(concat($path, 'x'), ' /\', '_  '))"/>
-    <!-- The above does the following:
+<!-- The above does the following:
        o Adds a trailing character to the path. This prevents us having to deal
          with the special case of ending with '/'
        o Translates all directory separators to ' ', and normalize spaces,
@@ -281,12 +305,11 @@
     -->
     <xsl:variable name="remainder" select="substring-after($dirs, ' ')"/>
     <xsl:if test="$remainder">
-      <xsl:text>../</xsl:text>
+<xsl:text>../</xsl:text>
       <xsl:call-template name="dotdots">
         <xsl:with-param name="path" select="translate($remainder, ' ', '/')"/>
-		<!-- Translate back to /'s because that's what the template expects. -->
+<!-- Translate back to /'s because that's what the template expects. -->
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.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.
 -->
-
 <!--+
     | Create a version of the navigation document that excludes all nodes that 
     | only contain imports and expand those imports.
@@ -23,34 +22,28 @@
     | This is a workaround for the fact that Daisy Navigation documents cannot
     | group content in the menu without adding something to the directory.
     +-->
-
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:d="http://outerx.org/daisy/1.0#navigationspec"
                 xmlns="http://apache.org/forrest/locationmap/1.0"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
-                
   <xsl:param name="publisherURL"/>
-                
   <xsl:template match="/">
     <xsl:apply-templates/>
   </xsl:template>
-  
   <xsl:template match="d:group[d:import]">
-    <!-- ignore groups with only imports -->
+<!-- ignore groups with only imports -->
     <xsl:apply-templates/>
   </xsl:template>
-  
   <xsl:template match="d:import">
     <xi:include>
-      <xsl:attribute name="href">cocoon://daisy.navigation.<xsl:value-of select="@docId"/></xsl:attribute>
+      <xsl:attribute name="href">cocoon://daisy.navigation.<xsl:value-of select="@docId"/>
+      </xsl:attribute>
     </xi:include>
   </xsl:template>
-
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl Mon Apr  9 22:45:15 2007
@@ -15,24 +15,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--+
     | Add an edit link into the page content.
     +-->
-
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:d="http://outerx.org/daisy/1.0#navigationspec"
                 xmlns="http://apache.org/forrest/locationmap/1.0"
                 xmlns:xi="http://www.w3.org/2001/XInclude" >
-                
   <xsl:param name="publisherURL"/>
   <xsl:param name="pathPrefix"/>
   <xsl:param name="navigationID"/>
-                
   <xsl:template match="/">
     <locationmap>
-  
       <components>
         <matchers default="lm">
           <matcher 
@@ -40,78 +35,82 @@
             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>
-      
-       <xi:include href="locationmap-daisy-include.xml#xpointer(//locationmapInclude/*)"/>
-     
-       <xsl:apply-templates/>
-        
-       <match pattern="*.daisy.source">
-           <location>
-             <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>document?documentId={1}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live</xsl:attribute>
-           </location>
-       </match>
-        
-       <match pattern="**/*.daisy.source">
-           <location>
-               <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>document?documentId={2}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live</xsl:attribute>
-           </location> 
-       </match>
-     
-       <match pattern="**/*.daisy.img">
-           <location>
-             <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>blob?documentId={2}&amp;version=live&amp;partType=3</xsl:attribute>
-           </location>
-       </match>
-     
-       <match pattern="**.daisy.img">
-           <location>
-             <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>blob?documentId={1}&amp;version=live&amp;partType=3</xsl:attribute>
-           </location>
-       </match>
-     
-       <match pattern="daisy.site.*">
-           <location>
-             <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>blob?documentId={1}&amp;version=live&amp;partType=1</xsl:attribute>
-           </location>
-       </match>
-     
-       <match pattern="*.daisy.rawHTML">
-           <location>
-             <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>blob?documentId={1}&amp;version=live&amp;partType=4</xsl:attribute>
-           </location>
-       </match>
+        <xi:include href="locationmap-daisy-include.xml#xpointer(//locationmapInclude/*)"/>
+        <xsl:apply-templates/>
+        <match pattern="*.daisy.source">
+          <location>
+            <xsl:attribute name="src">
+              <xsl:value-of select="$publisherURL"/>document?documentId={1}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live</xsl:attribute>
+          </location>
+        </match>
+        <match pattern="**/*.daisy.source">
+          <location>
+            <xsl:attribute name="src">
+              <xsl:value-of select="$publisherURL"/>document?documentId={2}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live</xsl:attribute>
+          </location>
+        </match>
+        <match pattern="**/*.daisy.img">
+          <location>
+            <xsl:attribute name="src">
+              <xsl:value-of select="$publisherURL"/>blob?documentId={2}&amp;version=live&amp;partType=3</xsl:attribute>
+          </location>
+        </match>
+        <match pattern="**.daisy.img">
+          <location>
+            <xsl:attribute name="src">
+              <xsl:value-of select="$publisherURL"/>blob?documentId={1}&amp;version=live&amp;partType=3</xsl:attribute>
+          </location>
+        </match>
+        <match pattern="daisy.site.*">
+          <location>
+            <xsl:attribute name="src">
+              <xsl:value-of select="$publisherURL"/>blob?documentId={1}&amp;version=live&amp;partType=1</xsl:attribute>
+          </location>
+        </match>
+        <match pattern="*.daisy.rawHTML">
+          <location>
+            <xsl:attribute name="src">
+              <xsl:value-of select="$publisherURL"/>blob?documentId={1}&amp;version=live&amp;partType=4</xsl:attribute>
+          </location>
+        </match>
       </locator>
     </locationmap>
   </xsl:template>
-    
-  <xsl:template match="d:doc">    
+  <xsl:template match="d:doc">
     <xsl:variable name="path">
       <xsl:for-each select="ancestor::d:group|ancestor::d:doc">
         <xsl:choose>
-          <xsl:when test="@nodeId"><xsl:value-of select="@nodeId"/>/</xsl:when>
+          <xsl:when test="@nodeId">
+            <xsl:value-of select="@nodeId"/>/</xsl:when>
           <xsl:otherwise>
-            <xsl:if test="name()='d:group' and @id"><xsl:value-of select="@id"/>/</xsl:if>
+            <xsl:if test="name()='d:group' and @id">
+              <xsl:value-of select="@id"/>/</xsl:if>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>
       <xsl:choose>
-        <xsl:when test="@nodeId"><xsl:value-of select="@nodeId"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="@id"/></xsl:otherwise>
+        <xsl:when test="@nodeId">
+          <xsl:value-of select="@nodeId"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@id"/>
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-     <match>
-       <xsl:attribute name="pattern"><xsl:value-of select="$pathPrefix"/><xsl:value-of select="$path"/>.daisy.source</xsl:attribute>
-       <location>
-         <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>document?documentId=<xsl:value-of select="@id"/>&amp;includeNavigation=false&amp;locale=en_US&amp;version=live</xsl:attribute>
-       </location> 
-     </match>
-     <xsl:apply-templates/>
+    <match>
+      <xsl:attribute name="pattern">
+        <xsl:value-of select="$pathPrefix"/>
+        <xsl:value-of select="$path"/>.daisy.source</xsl:attribute>
+      <location>
+        <xsl:attribute name="src">
+          <xsl:value-of select="$publisherURL"/>document?documentId=<xsl:value-of select="@id"/>&amp;includeNavigation=false&amp;locale=en_US&amp;version=live</xsl:attribute>
+      </location>
+    </match>
+    <xsl:apply-templates/>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl Mon Apr  9 22:45:15 2007
@@ -15,41 +15,49 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:d="http://outerx.org/daisy/1.0#navigationspec"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     version="1.0">
-    
   <xsl:param name="daisyExt"/>
-      
   <xsl:template match="/">
     <xsl:apply-templates/>
   </xsl:template>
-  
   <xsl:template match="d:doc">
     <xsl:choose>
       <xsl:when test="d:doc">
         <group>
-          <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-          <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+          <xsl:attribute name="id">
+            <xsl:value-of select="@id"/>
+          </xsl:attribute>
+          <xsl:attribute name="label">
+            <xsl:value-of select="@label"/>
+          </xsl:attribute>
           <xsl:if test="@nodeId">
-            <xsl:attribute name="href"><xsl:value-of select="@nodeId"/>/</xsl:attribute>
+            <xsl:attribute name="href">
+              <xsl:value-of select="@nodeId"/>/</xsl:attribute>
           </xsl:if>
           <xsl:choose>
             <xsl:when test="@nodeId">
               <doc>
-                <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+                <xsl:attribute name="id">
+                  <xsl:value-of select="@id"/>
+                </xsl:attribute>
                 <xsl:attribute name="label">Section Home</xsl:attribute>
-                <xsl:attribute name="href">../<xsl:value-of select="@nodeId"/><xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
+                <xsl:attribute name="href">../<xsl:value-of select="@nodeId"/>
+                  <xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
               </doc>
             </xsl:when>
             <xsl:otherwise>
               <doc>
-                <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+                <xsl:attribute name="id">
+                  <xsl:value-of select="@id"/>
+                </xsl:attribute>
                 <xsl:attribute name="label">Section Home</xsl:attribute>
-                <xsl:attribute name="href"><xsl:value-of select="@id"/><xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
+                <xsl:attribute name="href">
+                  <xsl:value-of select="@id"/>
+                  <xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
               </doc>
             </xsl:otherwise>
           </xsl:choose>
@@ -58,52 +66,70 @@
       </xsl:when>
       <xsl:when test="d:link">
         <group>
-          <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-          <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+          <xsl:attribute name="id">
+            <xsl:value-of select="@id"/>
+          </xsl:attribute>
+          <xsl:attribute name="label">
+            <xsl:value-of select="@label"/>
+          </xsl:attribute>
           <xsl:if test="@nodeId">
-            <xsl:attribute name="href"><xsl:value-of select="@nodeId"/>/</xsl:attribute>
+            <xsl:attribute name="href">
+              <xsl:value-of select="@nodeId"/>/</xsl:attribute>
           </xsl:if>
           <xsl:apply-templates/>
         </group>
       </xsl:when>
       <xsl:otherwise>
         <doc>
-          <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-          <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+          <xsl:attribute name="id">
+            <xsl:value-of select="@id"/>
+          </xsl:attribute>
+          <xsl:attribute name="label">
+            <xsl:value-of select="@label"/>
+          </xsl:attribute>
           <xsl:choose>
             <xsl:when test="@nodeId">
-              <xsl:attribute name="href"><xsl:value-of select="@nodeId"/><xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
+              <xsl:attribute name="href">
+                <xsl:value-of select="@nodeId"/>
+                <xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:attribute name="href"><xsl:value-of select="@id"/><xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
+              <xsl:attribute name="href">
+                <xsl:value-of select="@id"/>
+                <xsl:value-of select="$daisyExt"/>.html</xsl:attribute>
             </xsl:otherwise>
           </xsl:choose>
         </doc>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
-  <xsl:template match="d:link">
-    <link>
-      <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
-      <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
-    </link>
+  <xsl:template match="d:link"><link>
+    <xsl:attribute name="label">
+      <xsl:value-of select="@label"/>
+    </xsl:attribute>
+    <xsl:attribute name="href">
+      <xsl:value-of select="@url"/>
+    </xsl:attribute></link>
   </xsl:template>
-    
   <xsl:template match="d:group">
     <group>
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-      <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+      <xsl:attribute name="id">
+        <xsl:value-of select="@id"/>
+      </xsl:attribute>
+      <xsl:attribute name="label">
+        <xsl:value-of select="@label"/>
+      </xsl:attribute>
       <xsl:if test="not(d:import)">
-        <xsl:attribute name="href"><xsl:value-of select="@id"/>/</xsl:attribute>
+        <xsl:attribute name="href">
+          <xsl:value-of select="@id"/>/</xsl:attribute>
       </xsl:if>
       <xsl:apply-templates/>
     </group>
   </xsl:template>
-  
   <xsl:template match="d:import">
     <xi:include>
-      <xsl:attribute name="href">cocoon://daisy.site.<xsl:value-of select="@docId"/></xsl:attribute>
+      <xsl:attribute name="href">cocoon://daisy.site.<xsl:value-of select="@docId"/>
+      </xsl:attribute>
     </xi:include>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml Mon Apr  9 22:45:15 2007
@@ -15,9 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -25,28 +23,21 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
   </components>
-  
   <locator>
-   
-     <match pattern="project.cocoon/index.xml">
-         <location src="cocoon://659.daisy.xml" />
-     </match>
-   
-     <match pattern="*.daisy.source">
-         <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/document?documentId={1}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live" />
-     </match>
-   
-     <match pattern="*.daisy.img">
-         <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=3" />
-     </match>
-   
-     <match pattern="*.daisy.navigation">
-         <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1" />
-     </match>
-     
-     <match pattern="daisy.site.*">
-          <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1" />
-     </match>
- 
+    <match pattern="project.cocoon/index.xml">
+      <location src="cocoon://659.daisy.xml" />
+    </match>
+    <match pattern="*.daisy.source">
+      <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/document?documentId={1}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live" />
+    </match>
+    <match pattern="*.daisy.img">
+      <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=3" />
+    </match>
+    <match pattern="*.daisy.navigation">
+      <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1" />
+    </match>
+    <match pattern="daisy.site.*">
+      <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1" />
+    </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml Mon Apr  9 22:45:15 2007
@@ -16,43 +16,44 @@
   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.Daisy Plugin</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to the org.apache.forrest.plugin.input.Daisy Plugin</title>
+  </header>
+  <body>
     <section>
       <title>Apache Forrest - org.apache.forrest.plugin.input.Daisy Plugin</title>
-      <p>This plugin retrieves documents from a 
-      <a href="http://www.cocoondev.org/daisy">Daisy</a>
-      repository.</p>
+      <p>
+        This plugin retrieves documents from a
+        <a href="http://www.cocoondev.org/daisy">Daisy</a> repository.
+      </p>
     </section>
-    
     <section>
       <title>Usage</title>
-      
-      <p>This plugin allows content to be retrieved from a 
-      <a href="http://www.cocoondev.org/daisy/">Daisy CMS repository</a>
-      and displayed alongside any other Forrest content. Unlike many
-      other plugins there is some configuraiton of your project requried.</p>
-            
+      <p>
+        This plugin allows content to be retrieved from a
+        <a href="http://www.cocoondev.org/daisy/">Daisy CMS repository</a> and
+        displayed alongside any other Forrest content. Unlike many other plugins
+        there is some configuraiton of your project requried.
+      </p>
       <section>
         <title>Configuration</title>
-      
         <section>
           <title>Locationmap</title>
-          
-          <p>The project locationmap for a Daisy generated site is automatically
-          created from the daisy navigation documents. This allows the URL of the
-          published Forrest site to be set within the Daisy CMS system as opposed
-          to using the daisy ID for the page.</p>
-          
-          <p>In order for Forrest to know the id of the navigation document to be
-          used your project must set some required properties
-          (see below for details). The project also needs to provide the following match in
-          PROJECT_HOME/sitemap.xmap:</p>
-          
-          <source><![CDATA[
+          <p>
+            The project locationmap for a Daisy generated site is automatically
+            created from the daisy navigation documents. This allows the URL of
+            the published Forrest site to be set within the Daisy CMS system as
+            opposed to using the daisy ID for the page.
+          </p>
+          <p>
+            In order for Forrest to know the id of the navigation document to be
+            used your project must set some required properties (see below for
+            details). The project also needs to provide the following match in
+            PROJECT_HOME/sitemap.xmap:
+          </p>
+          <source>
+<![CDATA[
     <map:pipeline>
       <map:parameter name="expires" value="access plus 2 hours"/>
     
@@ -67,25 +68,27 @@
         <map:serialize type="xml"/>
       </map:match>
     </map:pipeline>
-          ]]></source>
-                            
-          <p>If your site needs to provide additional locationmap entries it can
-          do so by including them in 
-          <code>PROJECT_HOME/src/documentation/locationmap-include.xml</code>.
-          The matchers in this file will override any of the auto-generated matchers
-          from the Daisy navigation file. The location of this file can be changed
-          by overriding the locationmap pattern <code>daisy.locationmap.include</code>.</p>
-        
-          <note>The pipeline above
-          caches the navigation for 2 hours. This is because it is computationally
-          expensive to regenerate these files.</note>
+          ]]>
+          </source>
+          <p>
+            If your site needs to provide additional locationmap entries it can
+            do so by including them in
+            <code>PROJECT_HOME/src/documentation/locationmap-include.xml</code>.
+            The matchers in this file will override any of the auto-generated
+            matchers from the Daisy navigation file. The location of this file
+            can be changed by overriding the locationmap pattern
+            <code>daisy.locationmap.include</code>.
+          </p>
+          <note>
+            The pipeline above caches the navigation for 2 hours. This is
+            because it is computationally expensive to regenerate these files.
+          </note>
         </section>
-        
         <section>
           <title>Properties</title>
-          
-          <p>The table below describes all properties that this plugin exposes.</p>
-          
+          <p>
+            The table below describes all properties that this plugin exposes.
+          </p>
           <table>
             <tr>
               <th>Property Name</th>
@@ -132,80 +135,85 @@
           </table>
         </section>
       </section>
-      
       <section>
         <title>Using Daisy Navigation Documents</title>
-        <p>It is possible to use a daisy navigation document in place of a local
-        site.xml file. However, you may want to mix content from different sources
-        by adding other entries to site.xml, ones that are not sourced from the 
-        Daisy navigation document. Therefore, you still need a site.xml file.</p>
-        
-        <p>A minimal site.xml file for your project would be:</p>
-        
-        <source><![CDATA[
+        <p>
+          It is possible to use a daisy navigation document in place of a local
+          site.xml file. However, you may want to mix content from different
+          sources by adding other entries to site.xml, ones that are not sourced
+          from the Daisy navigation document. Therefore, you still need a
+          site.xml file.
+        </p>
+        <p>
+          A minimal site.xml file for your project would be:
+        </p>
+        <source>
+<![CDATA[
 <site label="MyProj" href="" 
   xmlns="http://apache.org/forrest/linkmap/1.0" 
   xmlns:xi="http://www.w3.org/2001/XInclude" 
   tab="">
   <xi:include href="cocoon://1208.daisy.navigation"/>
 </site>
-        ]]></source>
-        
-        <p>Note that we use <code>xi:include</code> to include a navigation
-        document in the site.xml file, in this case the document retrieved has
-        id 1208. By using include in this way the site editor is free to use
-        site.xml to reference content from other sources.</p>
-        
-        <note>As with the locationmap generation, the pipelines that generate the site.xml
-        snippets are cached for at least 1 hour. This is because it is computationally
-        expecnsive to regenerate these files. A future version of this plugin will provide
-        a more flexible caching mechanism. But for now you need to force a refresh 
-        during development.</note>
+        ]]>
+        </source>
+        <p>
+          Note that we use <code>xi:include</code> to include a navigation
+          document in the site.xml file, in this case the document retrieved has
+          id 1208. By using include in this way the site editor is free to use
+          site.xml to reference content from other sources.
+        </p>
+        <note>
+          As with the locationmap generation, the pipelines that generate the
+          site.xml snippets are cached for at least 1 hour. This is because it
+          is computationally expecnsive to regenerate these files. A future
+          version of this plugin will provide a more flexible caching mechanism.
+          But for now you need to force a refresh during development.
+        </note>
       </section>
-      
       <section>
         <title>Retrieving RAW content</title>
-        <p>If you want to retrieve the raw, unprocessed XML from
-        Daisy simply request the file with a <code>.daisy.source</code>
-        extenstion.</p>
+        <p>
+          If you want to retrieve the raw, unprocessed XML from Daisy simply
+          request the file with a <code>.daisy.source</code> extenstion.
+        </p>
       </section>
     </section>
-      
+    <section>
+      <title>Filtering Content</title>
+      <p>
+        You may not have full control of the content in the repository, or you
+        may wish to supress the presentation of some of the parts, for example,
+        the fields within the repository. There are two points at which you can
+        filter the content, at the point of retrieval (called a pre-filter) and
+        once the file has been converted to the internal Forrest format (called
+        a post-filter).
+      </p>
       <section>
-        <title>Filtering Content</title>
-        
-        <p>You may not have full control of the content in the repository, or
-        you may wish to supress the presentation of some of the parts, for 
-        example, the fields within the repository. There are two points at 
-        which you can filter the content, at the point of retrieval (called a
-        pre-filter) and once the file has been converted to the internal 
-        Forrest format (called a post-filter).</p>
-        
-        <section>
-          <title>Pre-Filters</title>
-          
-          <p>Pre-Filters are applied to the XML retrieved from the 
-          Daisy repository. To achieve this you can 
-          provide an XSL file called <code>daisy/preFilter.xsl</code> in your 
-          projects stylesheet directory (default location is 
-          <code>PROJECT_HOME/src/documentation/resources/stylesheets</code>).</p>
-        
-        </section>
-        
-        <section>
-          <title>Post-Filters</title>
-          
-          <p>Post-Filters are applied to the XDoc generated by 
-          Forrest. To achieve this you can 
-          provide an XSL file called <code>daisy/postFilter.xsl</code> in your 
-          projects stylesheet directory (default location is 
-          <code>PROJECT_HOME/src/documentation/resources/stylesheets</code>).</p>
-        
-          <p>The postFilter XSL file operates on the XDoc generated by Forrest. 
-          If you wish to look at this format of the document simply request 
-          the page with an <code>.xml</code> extension.</p>
-        
+        <title>Pre-Filters</title>
+        <p>
+          Pre-Filters are applied to the XML retrieved from the Daisy
+          repository. To achieve this you can provide an XSL file called
+          <code>daisy/preFilter.xsl</code> in your projects stylesheet directory
+          (default location is
+          <code>PROJECT_HOME/src/documentation/resources/stylesheets</code>).
+        </p>
+      </section>
+      <section>
+        <title>Post-Filters</title>
+        <p>
+          Post-Filters are applied to the XDoc generated by Forrest. To achieve
+          this you can provide an XSL file called
+          <code>daisy/postFilter.xsl</code> in your projects stylesheet
+          directory (default location is
+          <code>PROJECT_HOME/src/documentation/resources/stylesheets</code>).
+        </p>
+        <p>
+          The postFilter XSL file operates on the XDoc generated by Forrest. If
+          you wish to look at this format of the document simply request the
+          page with an <code>.xml</code> extension.
+        </p>
+      </section>
     </section>
-  </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/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.input.Daisy" 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.Daisy"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-
   <samples label="samples">
     <cocoon label="Cocoon Home Page" href="cocoon/index.html" description="Cocoon home page from their Daisy repository"/>
   </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"/>
@@ -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.Daisy/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/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.input.Daisy/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/skinconf.xml?view=diff&rev=527038&r1=527037&r2=527038
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/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: Daisy input</project-name>
   <project-description>org.apache.forrest.plugin.input.Daisy plugin for Apache Forrest</project-description>
-
 </skinconfig>



Mime
View raw message