You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2007/07/12 04:56:43 UTC

svn commit: r555473 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos: ./ resources/stylesheets/ src/documentation/content/xdocs/ src/documentation/content/xdocs/samples/

Author: crossley
Date: Wed Jul 11 19:56:41 2007
New Revision: 555473

URL: http://svn.apache.org/viewvc?view=rev&rev=555473
Log:
Improved the Sitemap (input.xmap) to use the sourcetypeaction for handling input.
Added automatic glossary divisions.
Added some TODO items.
Contributed by: Sina K. Heshmati
Issue: FOR-1019

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/glossary-skos.xml   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/index.xml   (with props)
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/resources/stylesheets/skos-to-document.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/index.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/site.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/status.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap?view=diff&rev=555473&r1=555472&r2=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap Wed Jul 11 19:56:41 2007
@@ -16,53 +16,43 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <!-- Components -->
   <map:components>
-    <map:generators>
-      <map:generator name="directory"
-      	src="org.apache.cocoon.generation.DirectoryGenerator"/>
-    </map:generators>
-    <map:transformers default="xslt">
-      <map:transformer name="cinclude" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
-      <map:transformer name="i18n" 
-        src="org.apache.cocoon.transformation.I18nTransformer">
-        <catalogues default="projectInfo">
-          <catalogue id="other" name="OtherMessages" location="{lm:project.translations}" />
-          <catalogue id="projectInfo" name="ProjectInfoMessages" location="{lm:project.translations}" />
-        </catalogues>
-        <cache-at-startup>true</cache-at-startup>
-      </map:transformer>
-    </map:transformers>
-    <map:pipes>
-      <map:pipe name="navigation"
-        src="org.apache.cocoon.components.pipeline.impl.ExpiresCachingProcessingPipeline">
-        <parameter name="cache-expires" value="600"/>
-<!-- Expires in seconds -->
-      </map:pipe>
-    </map:pipes>
+    <map:selectors default="parameter">
+      <map:selector logger="sitemap.selector.parameter" name="parameter"
+                    src="org.apache.cocoon.selection.ParameterSelector"/>
+    </map:selectors>
+    <map:actions>
+      <map:action logger="sitemap.action.sourcetype" name="sourcetype"
+                  src="org.apache.forrest.sourcetype.SourceTypeAction">
+        <sourcetype name="skos">
+          <document-element namespace="http://www.w3.org/2004/02/skos/core#"/>
+        </sourcetype>
+      </map:action>
+    </map:actions>
   </map:components>
+  <!-- /Components -->
+
+  <!-- Pipelines -->
   <map:pipelines>
-    <map:pipeline type="navigation">
-<!-- ================================================================ -->
-<!-- indexes                                                     -->
-<!-- ================================================================ -->
-      <map:match pattern="glossary/source.xml">
-        <map:generate type="file" src="{lm:skos.glossary}" />
+    <map:pipeline>
+      <map:match pattern="**skos.xml">
+        <map:generate src="{properties:content.xdocs}{1}skos.xml"/>
+        <map:act type="sourcetype" src="{properties:content.xdocs}{1}skos.xml">
+          <map:select type="parameter">
+            <map:parameter name="parameter-selector-test" value="{sourcetype}"/>
+            <map:when test="skos">
+              <map:transform src="{lm:skos.transform.skos.document}"/>
+            </map:when>
+          </map:select>
+        </map:act>
         <map:serialize type="xml"/>
       </map:match>
-      <map:match pattern="glossary/**.source.xml">
-        <map:generate type="file" src="{lm:skos.glossary.{1}}" />
+      <map:match pattern="**skos/source.xml">
+        <map:generate src="{properties:content.xdocs}{1}skos.xml"/>
         <map:serialize type="xml"/>
       </map:match>
-      <map:match pattern="glossary.xml">
-        <map:generate src="cocoon:/glossary/source.xml" />
-        <map:transform src="{lm:skos.transform.skos.document}"/>
-        <map:serialize type="xml-document"/>
-      </map:match>
-      <map:match pattern="glossary/**.xml">
-        <map:generate src="cocoon:/glossary/{1}.source.xml" />
-        <map:transform src="{lm:skos.transform.glossary.document}"/>
-        <map:serialize type="xml-document"/>
-      </map:match>
     </map:pipeline>
   </map:pipelines>
+  <!-- /Pipelines -->
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml?view=diff&rev=555473&r1=555472&r2=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml Wed Jul 11 19:56:41 2007
@@ -18,19 +18,15 @@
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
   <components>
     <matchers default="lm">
-      <matcher 
-        name="lm" 
+      <matcher name="lm" 
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
       <selector name="exists" logger="sitemap.selector.exists"  
-                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+                src="org.apache.forrest.sourceexists.SourceExistsSelector"/>
     </selectors>
   </components>
   <locator>
-    <match pattern="skos.glossary">
-      <location src="src/documentation/content/xdocs/glossary.xml" />
-    </match>
     <match pattern="skos.transform.*.*">
       <location src="resources/stylesheets/{1}-to-{2}.xsl"/>
     </match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/resources/stylesheets/skos-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/resources/stylesheets/skos-to-document.xsl?view=diff&rev=555473&r1=555472&r2=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/resources/stylesheets/skos-to-document.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/resources/stylesheets/skos-to-document.xsl Wed Jul 11 19:56:41 2007
@@ -15,10 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version = "1.0"
+<xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
                 xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="exsl"
 		exclude-result-prefixes="rdf skos">
 
   <xsl:template match="/">
@@ -39,8 +41,31 @@
   </xsl:template>
 
   <xsl:template name="body">
+
+    <xsl:variable name="concepts">
+      <xsl:for-each select="skos:Concept">
+        <!-- Sort wrapping sections -->
+        <xsl:sort select="skos:prefLabel"/>
+	<xsl:copy-of select="."/>
+      </xsl:for-each>
+    </xsl:variable>
+
     <body>
-      <xsl:apply-templates/>
+      <!-- Ignore terms starting with the same letter except the first one. -->
+      <xsl:for-each select="exsl:node-set($concepts)/skos:Concept[not(substring(skos:prefLabel, 1, 1)=substring(following-sibling::skos:Concept/skos:prefLabel, 1, 1))]">
+        <xsl:variable name="first-char" 
+		      select="substring(skos:prefLabel, 1, 1)"/>
+        <section id="{$first-char}">
+          <title>
+  	    <xsl:value-of select="$first-char"/>
+	  </title>
+          <xsl:apply-templates 
+	             select="../*[substring(skos:prefLabel, 1, 1)=$first-char]">
+	    <!-- Sort terms inside a wrapping section -->
+  	    <xsl:sort select="skos:prefLabel"/>
+          </xsl:apply-templates>
+	</section>
+      </xsl:for-each>
     </body>
   </xsl:template>
 
@@ -49,49 +74,52 @@
   </xsl:template>
 
   <xsl:template match="skos:prefLabel">
-    <em class="bold">
-      <xsl:apply-templates/>
-    </em>
+    <dt>
+      <strong>
+        <xsl:apply-templates/>
+      </strong>
+    </dt>
   </xsl:template>
 
   <xsl:template match="skos:definition">
-    <li>
+    <li class="{local-name(.)}">
       <xsl:apply-templates/>
     </li>
   </xsl:template>
 
   <xsl:template name="concept">
-    <dl class="{local-name(.)}" id="{skos:prefLabel/text()}">
-      <dt>
-        <xsl:apply-templates select="skos:prefLabel"/>
-      </dt>
-      <dd class="{local-name(.)}">
+    <dl class="concept" id="{skos:prefLabel[1]/text()}">
+      <xsl:apply-templates select="skos:prefLabel[1]"/>
+      <dd class="definition">
         <ol>
           <xsl:apply-templates select="skos:definition"/>
         </ol>
       </dd>
+
       <xsl:if test="skos:related">
-        <dd class="{local-name(skos:related)}">
-          <p>See Also: </p>
+        <dd class="related">
+          <!-- il8n? -->
+	  <p>See Also:</p>
           <ul>
             <xsl:apply-templates select="skos:related"/>
           </ul>
-        </dd>
+	</dd>
       </xsl:if>
     </dl>
   </xsl:template>
 
   <xsl:template match="skos:related">
-    <xsl:variable name="relatedTerm" 
+    <xsl:variable name="relatedConcept" 
      		  select="@rdf:resource"/>
+
     <xsl:for-each select="../../skos:Concept">
-    <xsl:if test="$relatedTerm = @rdf:about">
-      <li>
-        <link href="#{skos:prefLabel/text()}">
-	  <xsl:value-of select="skos:prefLabel/text()"/>
-        </link>
-      </li>
-    </xsl:if>
+      <xsl:if test="$relatedConcept = @rdf:about">
+	<li class="related">
+          <link href="#{skos:prefLabel/text()}">
+	    <xsl:value-of select="skos:prefLabel/text()"/>
+          </link>
+        </li>
+      </xsl:if>
     </xsl:for-each>
   </xsl:template>
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/index.xml?view=diff&rev=555473&r1=555472&r2=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/index.xml Wed Jul 11 19:56:41 2007
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+			  "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Welcome to SKOS Plugin for Forrest</title>
@@ -37,13 +38,13 @@
       </note>
       <p>
         This section includes samples that have been made available so far to 
-	show the existing functionality of the plugin.
+	demonstrate the existing functionalities of the plugin.
       </p>
       <section id="glossary">
         <title>Glossary</title>
         <p>
-	  This sample generates a <a href="site:glossary">glossary</a> from a collection of 
-	  <code>skos:Concept</code>s written in RDF/XML format.
+	  This sample generates a <a href="site:glossary">glossary</a> from 
+	  a collection of <code>skos:Concept</code>s written in RDF/XML format.
         </p>
 	<p>An example would be:</p>
         <source>
@@ -53,6 +54,9 @@
   <skos:definition>
   ...
   </skos:definition>
+  <skos:definition>
+  ...
+  </skos:definition>
   <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Contracts"/>
 </skos:Concept>
 ]]>
@@ -62,34 +66,18 @@
 	  for the format in the near future.
         </note>
         <p>
-        The location of the glossary is specified in the locationmap
-        with the hint <code>skos.glossary</code>. This defaults to a file
-        called <code>glossary.xml</code> in 
-	<code>src/documentation/content/xdocs/</code> relative to the plugin 
-	root. To place your glossary in a different location, simply add a 
-	matcher like that shown below in your project locationmap file.
-        </p>
-        <source>
-<![CDATA[
-    <match pattern="skos.glossary">
-      <location src="[path/to/skos/glossary/]" />
-    </match>    
-      ]]>
-        </source>
-        <p>
           To retrieve the glossary file in its raw form --SKOS RDF/XML, please 
-	  request the file <code>glossary/source.xml</code>.
+	  request the file <code>samples/glossary-skos/source.xml</code>.
         </p>
         <p>
         To retrieve the glossary in other formats, please request the file
-        <code>glossary.[FORMAT]</code>. The following formats are currently 
-	supported:
-      </p>
+        <code>samples/glossary-skos.[FORMAT]</code>. The following formats are 
+	currently supported:
+        </p>
         <ul id="glossary-formats">
-	  <li><a href="/glossary.html">HTML</a></li>
-	  <li><a href="/glossary.pdf">PDF</a></li>
-	  <li><a href="/glossary.xml">XDoc</a></li>
-	  <li><a href="/glossary/source.xml">SKOS</a></li>
+	  <li><a href="site:glossary">HTML</a></li>
+	  <li><a href="/samples/glossary-skos.pdf">PDF</a></li>
+	  <li><a href="/samples/glossary-skos.xml">XDoc</a></li>
 	</ul>
       </section>
     </section>

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/glossary-skos.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/glossary-skos.xml?view=auto&rev=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/glossary-skos.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/glossary-skos.xml Wed Jul 11 19:56:41 2007
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+	 xmlns:skos="http://www.w3.org/2004/02/skos/core#">
+
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Dispatcher">
+    <skos:prefLabel>Dispatcher</skos:prefLabel>
+    <skos:definition>
+    The Dispatcher is the codename for the Forrest Implementation of the 
+    Core J2EE Dispatcher View.  java.sun.com has more information on its 
+    origins.
+    </skos:definition>
+
+    <skos:definition>
+    What we at 'Forrest' relate the Dispatcher to, is the overall 
+    technology and implementation of the replacement 'skins' system. 
+    Combining 'Views', 'Contracts' , 'Themes' enables separation of concerns 
+    to provide a fast and efficient documentation framework.
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Contracts"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Skins"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#SeparationOfConcerns"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Themes"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Views"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Contracts">
+    <skos:prefLabel>Contracts</skos:prefLabel>
+    <skos:definition>
+    A contract is a snippet of re-usable code that gets used in a 
+    structurer file. 
+    </skos:definition>
+    <skos:definition>
+    
+    Contracts can be used or omitted as neccessary, 
+    though a few are really compulsary in order to define a basic skeleton 
+    structure and to include some styling (CSS) 
+    </skos:definition>
+    
+    <skos:definition>
+    Contracts mainly come in three (3) types, static, semi-static &amp; 
+    dynamic. Static Contracts are pre-defined snippets of code that need 
+    no further information.
+    Semi-static Contracts can include extra configuration variables, these 
+    would over-ride otherwise default variables. Dynamic Contracts can have 
+    extra configuration variables, but can also define their own snippets of 
+    code information. (Such as extra CSS elements, or generic markup elements).
+    </skos:definition>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Class">
+    <skos:prefLabel>Class</skos:prefLabel>
+    <skos:definition>
+    In the context of the dispatcher, a Class is used as an optional 
+    attribute to the forrest:hook.
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Name"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Name">
+    <skos:prefLabel>Name</skos:prefLabel>
+    <skos:definition>
+    In the context of the dispatcher, a name is used as an optional 
+    attribute to the forrest:hook.
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Class"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Skins">
+    <skos:prefLabel>Skins</skos:prefLabel>
+    <skos:definition>
+     Skins is the name of the older alternative way for structuring and 
+     styling your site pages. 
+    </skos:definition>
+     
+    <skos:definition>
+     Skins is still used in Forrest versions 
+     0.7 and 0.8-dev, though for 0.8-dev and beyond it can be concidered 
+     an option with Dispatcher being the other.(It is enabled as the default 
+     option currently)
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Themes"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Dispatcher"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Views">
+    <skos:prefLabel>Views</skos:prefLabel>
+    <skos:definition>
+     Views is the older now deprecated name for what is now the 
+    'Dispatcher'. 
+    </skos:definition>
+    
+    <skos:definition>
+    Views also, confusingly, was used as a term for the 
+    Structurer, and forrest:views is a deprecated code that has been replaced
+    with forrest:template.
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Dispatcher"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Themes">
+    <skos:prefLabel>Themes</skos:prefLabel>
+    <skos:definition>
+    A more extensible and adaptable solution than its alternative 'Skins'. 
+    A 'Theme' is an overall content &amp; style set. 
+    </skos:definition>
+    
+    <skos:definition>
+    A master 'common' theme 
+    provides the basis in which you can extend, over-ride or add to in order 
+    to make your own theme, you do not have to create a complete theme from 
+    scratch, simply include/exclude/over-ride/add what you need. The current 
+    'Pelt Theme' based on its 'Pelt Skin' counterpart, but uses functionality 
+    and extends/inherits what it needs to from the 'common' theme.
+    </skos:definition>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Tiles">
+    <skos:prefLabel>Tiles</skos:prefLabel>
+    <skos:definition>
+    A tile is a collection of contracts that are grouped together for easy
+    inclusion into a theme. 
+    </skos:definition>
+    
+    <skos:definition>
+    Tiles was the original but deprecated name for 
+    a collection of contracts, it is now re-named and re-implemented as a 
+    'Panels'.
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Panel"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Hooks">
+    <skos:prefLabel>Hooks</skos:prefLabel>
+    <skos:definition>
+    forrest:hooks is a concept of defining format independent hooks to 
+    structure the output. 
+    </skos:definition>
+    
+    <skos:definition>
+    Hooks are used to help define the layout of a 
+    page. Hooks are only used to define the structure in our output that is 
+    required to enable a theme to apply its look and feel.
+    </skos:definition>
+    <skos:definition>
+    Hooks convert to layout &lt;div&gt;&lt;/div&gt; container blocks and 
+    usually only consist of forrest:contracts.
+    </skos:definition>
+    <skos:definition>
+    Hooks are applied currently in the themes.core plugin as part of a 
+    themes structurer configuration file such as %themename %-html.panel.xml 
+    (e.g pelt-html.panel.xml) or included in such configuration files via a 
+    panel file such as %themename%-%format%.panel.xml 
+    (e.g pelt-html.panel.xml).
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Contracts"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Structurer"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Structurer">
+    <skos:prefLabel>Structurer</skos:prefLabel>
+    <skos:definition>
+    The Structurer allows a user to define the layout and content of a site 
+    or parts of a site.
+    </skos:definition>
+    <skos:definition>
+    Structurer files contain hooks &amp; contracts which you can include to 
+    build up a site structure template.
+    </skos:definition>
+    <skos:definition>
+    A completed structurer file defines an overall theme (look and feel) 
+    for a site.
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Contracts"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Hooks"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Property"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Themes"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Property">
+    <skos:prefLabel>Property</skos:prefLabel>
+    <skos:definition>
+    forrest:property - Todo:open
+    </skos:definition>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Panels">
+    <skos:prefLabel>Panels</skos:prefLabel>
+    <skos:definition>
+    Panels is the new name for a tile - a collection of contracts. 
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Tiles"/>
+  </skos:Concept>
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#Panel">
+    <skos:prefLabel>Panel</skos:prefLabel>
+    <skos:definition>
+    Panels is the new name for a tile - a collection of contracts. 
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#Tiles"/>
+  </skos:Concept>
+  <!--
+  <skos:Concept rdf:about="http://forrest.apache.org/docs/glossary#">
+    <skos:prefLabel></skos:prefLabel>
+    <skos:definition>
+    </skos:definition>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#"/>
+    <skos:related rdf:resource="http://forrest.apache.org/docs/glossary#"/>
+  </skos:Concept>
+  -->
+</rdf:RDF>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/glossary-skos.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/index.xml?view=auto&rev=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/index.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/index.xml Wed Jul 11 19:56:41 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+			  "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Forrest SKOS Pligun - Samples</title>
+  </header>
+  <body>
+    <section id="overview">
+      <title>Samples</title>
+      <p>
+        Samples that have been made available so far to 
+	show the current functionality of the plugin.
+      </p>
+      <section id="glossary">
+        <title>Glossary</title>
+        <ul id="glossary-formats">
+	  <li><a href="/samples/glossary-skos.html">HTML</a></li>
+	  <li><a href="/samples/glossary-skos.pdf">PDF</a></li>
+	  <li><a href="/samples/glossary-skos.xml">XDoc</a></li>
+	  <li><a href="/samples/glossary-skos/source.xml">SKOS</a></li>
+	</ul>
+      </section>
+    </section>
+  </body>
+</document>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/samples/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/site.xml?view=diff&rev=555473&r1=555472&r2=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/src/documentation/content/xdocs/site.xml Wed Jul 11 19:56:41 2007
@@ -15,41 +15,46 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <!--
 Forrest site.xml
 
-This file contains an outline of the site's information content.  It is used to:
+This file contains an outline of the site's information content. It is used to:
 - Generate the website menus (though these can be overridden - see docs)
-- Provide semantic, location-independent aliases for internal 'site:' URIs, eg
-<link href="site:changes"> links to changes.html (or ../changes.html if in
+- Provide semantic, location-independent aliases for internal 'site:' URIs, eg.
+  <link href="site:changes"> links to changes.html (or ../changes.html if in
   subdir).
-- Provide aliases for external URLs in the external-refs section.  Eg, <link
-  href="ext:cocoon"> links to http://cocoon.apache.org/ 
+- Provide aliases for external URLs in the external-refs section. (e.g. 
+  <link href="ext:cocoon"> links to http://cocoon.apache.org/
 
-See http://forrest.apache.org/docs/linking.html for more info
+  See http://forrest.apache.org/docs/linking.html for more info
 -->
-<site 	label="org.apache.forrest.plugin.input.skos" 
-	xmlns="http://apache.org/forrest/linkmap/1.0" 
-	href="" tab="">
 
+<site label="org.apache.forrest.plugin.input.skos" 
+      xmlns="http://apache.org/forrest/linkmap/1.0" 
+      href="" tab="">
+
+  <!-- About -->
   <about label="About">
     <index label="Overview" href="index.html" 
     	   description="Home for Forrest SKOS Plugin"/>
     <changes label="Changes" href="changes.html" 
-    	   description="Keeping Track of Changes" />
+    	     description="Keeping Track of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
-  <samples label="Samples">
-    <glossary label="Glossary" href="glossary.html" 
-    	      description="A Simple SKOS Glossary in Forrest" />
+  <!-- /About -->
+
+  <!-- Samples -->
+  <samples label="Samples" href="samples/">
+    <index label="Overview" href="index.html"
+    	   description="Samples demonstrating the current functionality of the
+	   plugin"/>
+    <glossary label="Glossary" href="glossary-skos.html" 
+	      description="A Simple SKOS glossary in Forrest"/>
   </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>
-  -->
+  <!-- /Samples -->
+
+  <!-- External Links -->
   <external-refs>
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
@@ -62,4 +67,6 @@
       <specs href="specs"/>
     </skos>
   </external-refs>
+  <!-- /External Links -->
+
 </site>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/status.xml?view=diff&rev=555473&r1=555472&r2=555473
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.skos/status.xml Wed Jul 11 19:56:41 2007
@@ -17,15 +17,15 @@
 -->
 <status>
   <developers>
-<!-- Add new developers here -->
+    <!-- Add new developers here -->
     <person name="Sina K. Heshmati" email="sina@khakbaz.com" id="SKH"/>
   </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"/>
@@ -33,8 +33,16 @@
     <context id="build" title="Changes to Build"/>
   </contexts>
   <changes>
-<!-- Add new releases here -->
+    <!-- Add new releases here -->
     <release version="0.1" date="not-released">
+      <action dev="SKH" type="update" context="code" fixes-bug="FOR-1005">
+        Improved the Sitemap (input.xmap) to use the sourcetypeaction for 
+	handling requests to process input formats.
+      </action>
+      <action dev="SKH" type="add" context="code">
+        Added automatic glossary divisions. Glossary terms starting with the 
+	same letter are all wrapped by the same section.
+      </action>
       <action dev="SKH" type="add" context="admin">
         Initial plugin code.
       </action>
@@ -42,22 +50,33 @@
   </changes>
   <todo>
     <actions priority="high">
-      <action context="code" dev="SKH">
-        Provide full support for skos:Concept.
-      </action>
       <action context="docs" dev="SKH">
         Keep the documentation up-to-date.
       </action>
-      <action context="design" dev="SKH">
-        Choose an RDF framework for accessing RDF graphs in XSLT.
-      </action>
     </actions>
     <actions priority="medium">
       <action context="design" dev="SKH">
-        Provide support for concept relationships.
+        Internationalization.
+      </action>
+      <action context="design" dev="SKH">
+        Provide support for concept relationships so as to support taxonomies, 
+	etc.
       </action>
       <action context="design" dev="SKH">
         Using the Dispatcher as the rendering engine.
+      </action>
+      <action context="code" dev="SKH">
+        Writing CSS stylesheets and Javascript to have a reach, yet simple
+	user interface.
+      </action>
+      <action context="design" dev="SKH">
+        Making the output as compliant as possible to accessibility and
+	usability requirements.
+      </action>
+    </actions>
+    <actions priority="low">
+      <action context="design" dev="SKH">
+        Using an RDF framework for accessing RDF graphs in XSLT.
       </action>
     </actions>
   </todo>