You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/04/09 04:25:02 UTC

svn commit: r160651 [1/3] - forrest/trunk/plugins/org.apache.forrest.plugin.leather forrest/trunk/plugins/org.apache.forrest.plugin.view forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/classes forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images

Author: thorsten
Date: Fri Apr  8 19:24:54 2005
New Revision: 160651

URL: http://svn.apache.org/viewcvs?view=rev&rev=160651
Log:
Renamed leather to viewHelper. Cleaned the view plugin from not needed code. added documentation to both plugins.

Added:
    forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/
    forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/basic.css   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/Thumbs.db   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter_open.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/current.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/doc.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background-grad.png   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.png   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header_white_line.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/label.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/page.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/pdfdoc.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/printer.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/search-left.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/search-right.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/sidebar_bg.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/singlepage.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/spacer.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/tab-left.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/tab-right.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/tl-off.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/tl-on.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/tr-off.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/tr-on.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/xmldoc.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets/contract.css.xsl   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets/contract.property.xsl   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets/contract.xsl   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets/ls.contracts.html.xsl   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/stylesheets/ls.contracts.xsl   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/content.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/feedback-dyn.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/feedback.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/feeder.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/fontsize.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/grouplogo.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/meta.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/nav-main-sub.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/nav-main.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/nav.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/noFt.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/pdf-link.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/pod-link.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/projectlogo.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/searchbox.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/txt-link.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/templates/xml-link.ft   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/classes/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/classes/CatalogManager.properties   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/group-logo.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/group.svg   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/icon.png   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/project-logo.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/project.svg   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/images/usemap.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/index.xml   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/site.xml   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/content/xdocs/tabs.xml   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/src/documentation/skinconf.xml   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/status.xml   (with props)
Removed:
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/
    forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/default.fv
Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/group.svg
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/project.svg
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/skinconf.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.view/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties Fri Apr  8 19:24:54 2005
@@ -107,4 +107,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.view,org.apache.forrest.plugin.leather,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.view,org.apache.forrest.plugin.viewHelper,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap Fri Apr  8 19:24:54 2005
@@ -64,16 +64,16 @@
 
 <!--
   This plugin has x components:
-  2. nuggets - delivers content that is used in the contracts
-  3. views - transforms the requested contracts (fbits) 
-     and populate them with the content (nuggets)
+  2. businessHelper - delivers content that is used in the contracts
+  3. views - transforms the requested contracts (viewHelper) 
+     and populate them with the content (businessHelper)
   -->
 
 
 
 <!--
   3. views
-  prepares and transforms the requested contracts (fbits) and populate them with the content (nuggets).
+  prepares and transforms the requested contracts (viewHelper) and populate them with the content (businessHelper).
   -->
   <map:pipeline>
   <!--
@@ -101,13 +101,13 @@
           If the above not matches then get the default view of this plugin.
           -->
         <map:otherwise>
-          <map:generate src="src/documentation/default.fv"/>
+          <map:generate src="resources/views/default.fv"/>
         </map:otherwise>
       </map:select>
      	<map:serialize type="xml"/>
     </map:match>
     
-    <!--Add nuggets to the view that the content can be used later on.-->
+    <!--Add businessHelper to the presentation model that the content can be used later on.-->
     <map:match pattern="prepare.view-nugget.**">
       <map:generate src="cocoon:/prepare.view.{1}"/>
       <map:transform src="resources/stylesheets/prepare.view.xsl">
@@ -169,12 +169,12 @@
   </map:pipeline>
   
   <!--
-  2. nuggets
+  2. businessHelper
   This is the content producing factory.
   -->
 <!--NOTE: 
-  The current factory uses the skin producing templates (e.g. document2xhtml.xsl).
-  It is only exchanging the last step of a skin producing pipe (site2xhtml.xsl) till now.
+  The current factory uses the models the skin (e.g. document2xhtml.xsl from pelt [default skin]).
+  It is only exchanging the last model of the models the skin is producing (site2xhtml.xsl) till now.
   This will have to be changed in the future.
   -->  
   <map:pipeline>
@@ -201,26 +201,11 @@
         <map:serialize type="xml"/>
       </map:match>
       
-       <map:match pattern="**.js">
-        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
-      </map:match>
-      <map:match pattern="**.css">
-        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
-      </map:match>
-      <map:match pattern="**images**">
-        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
-      </map:match>
-      <map:match pattern="**.png">
-        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
-      </map:match>
-     <map:match pattern="**.ico">
-        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
-      </map:match> 
   </map:pipeline>  
 
   
-<!-- END
-	2. nuggets
+<!-- 
+	2. businessHelper
 	-->
   
  </map:pipelines>

Added: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv Fri Apr  8 19:24:54 2005
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+
+<forrest:view
+  xmlns:forrest="http://apache.org/forrest/templates/1.0" type="xhtml">
+  
+  <forrest:contract name="meta"/>
+  
+  <forrest:hook name="container">
+    <forrest:hook name="branding">
+			<forrest:contract name="projectlogo"/>
+      <forrest:contract name="grouplogo"/>
+      <forrest:contract name="searchbox"/>
+      <forrest:contract name="nav-main"/>
+      <!--<forrest:contract name="nav-main-sub"/>-->
+    </forrest:hook>
+    <forrest:hook name="spacer" />
+    <forrest:contract name="nav"/>
+    <forrest:contract name="content">
+	    <forrest:contract name="fontsize"/>
+			<!--<forrest:hook name="export-link">
+	      <forrest:contract name="txt-link"/>
+		    <forrest:contract name="xml-link"/>
+			</forrest:hook>-->
+	  </forrest:contract>
+  </forrest:hook>
+  <forrest:contract name="feedback"/>
+  
+</forrest:view>

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml Fri Apr  8 19:24:54 2005
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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:views - x formats, one config</title>
+    <abstract>This plugin depends on a ViewHelper and a BusinessHelper implementation.</abstract> 
+  </header> 
+  <body> 
+    <section>
+      <title>How it works </title>
+      <source>
+This plugin has three components:
+  1. viewHelper - delivers contracts in form of xsl:templates
+  2. businessHelper - delivers content that is used in the contracts
+  3. views - prepares and transforms the requested contracts (viewHelper) 
+     and populate them with the content (businessHelper)
+
+1. viewHelper
+  This is the template producing factory.
+
+a. <![CDATA[<map:match pattern="resolve.contract.*">]]> -> Resolving factory
+Project implementation of templates have priority before default ones.
+If no implementation can be found we use the noFt (~ - no
+forrest:template) implementation.-> this match is implemented in the viewHelper plugin
+
+b. <![CDATA[<map:match pattern="get.contract.*.*">]]>-> this match is implemented in the viewHelper plugin
+Get the xsl:templates of the requested contract and specific format.
+
+c. <![CDATA[<map:match pattern="get.contract-property.*">]]>-> this match is implemented in the viewHelper plugin
+Get the forrest:properties of the requested contract. 
+This will determine which templates (css, head, body) we have to call
+later on
+
+GENERAL:
+Contracts are stored in forrest:templates ({contract-name}.ft) please
+have a look on the templates/*.ft that the viewHelper implementation contain to get
+an idea how your own implementation have to look like.
+
+
+2. businessHelper
+  This is the content producing factory.
+
+NOTE: <![CDATA[<map:match pattern="*.page">]]>
+  The current factory uses the models the skin (e.g. document2xhtml.xsl from pelt [default skin]).
+  It is only exchanging the last model of the models the skin is producing (site2xhtml.xsl) till now.
+  This will have to be changed in the future.
+
+3. views
+  prepares the requested contracts viewHelper and dispatches
+the corresponding businessHelper.
+
+a.  <![CDATA[<map:match pattern="prepare.view.*">]]> -> View config resolver
+File specific views have priority before default ones.
+If no view can be found in the project we use the default one of the
+views plugin.
+
+b.  <![CDATA[<map:match pattern="prepare.include.*"> ]]>
+Aggregate the contract-templates requested by the view with xinclude.
+The result is a stylesheet with all needed xsl:templates.
+
+c. <![CDATA[<map:match pattern="prepare.properties.*">]]>
+Aggregate the forrest:properties requested by the *.fv.
+The result is an aggregation of properties which defines the templates
+to be call.
+
+d. <![CDATA[<map:match pattern="prepare.xhtml.*">]]>
+Aggregate all contracts-templates requested by the view.
+Create a xsl that can be used for the last step of the transformation of
+the view.
+
+e. <![CDATA[<map:match pattern="*.html"> ]]>-> Last processing step. 
+Here we are overriding the default skin generation. 
+-> this match is implemented in the viewHelper plugin
+
+GENERAL:
+Views are stored in forrest:view ({file-name}.fv) please have look on
+plugins/org.apache.forrest.plugin.views/src/documentation/default.fv do
+get an idea how your own implementation have to look like.
+
+      </source>
+    </section>
+    <section>
+      <title>Resume</title>
+      <source>
+The views plugin can be seen as prototype for the next generation
+skinning of forrest. It is still in early stage but with extracting the businessHelper we
+hope to make it easier for all devs (not only committer) to get the idea
+and enable them to enhance the design of this plugin and their implementation.
+
+Some basic and simple hints:
+a) If you want another implementation of a contract then create a folder
+"templates" in ${project.resources-dir} and it will be matched before
+the standard implementation. 
+
+e.g. feedback contract:
+<![CDATA[
+<forrest:contract name="feedback" type="nugget"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+<description>
+This function will output the html feedback information.
+</description>
+
+<forrest:template
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+format="xhtml" name="feedback" inputFormat="xsl" body="true"
+head="false" css="true">
+
+<xsl:stylesheet version="1.1" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+
+<xsl:template name="feedback-css">
+#feedback {
+    color: black;
+    background: #CFDCED;
+    text-align:center;
+    margin-top: 5px;
+}
+#feedback #feedbackto {
+    font-size: 90%;
+    color: black;
+}</xsl:template>
+
+<xsl:template name="feedback-body">
+<div id="feedback"> Modified project implementation
+<xsl:value-of select="$config/feedback"/>
+<xsl:choose>
+<xsl:when test="$config/feedback/@href and
+not($config/feedback/@href='')">
+  <a id="feedbackto">
+    <xsl:attribute name="href">
+      <xsl:value-of select="$config/feedback/@href"/>
+      <xsl:value-of select="$path"/>
+    </xsl:attribute>
+    <xsl:value-of select="$config/feedback/@to"/>
+  </a>
+</xsl:when>
+<xsl:otherwise>
+  <xsl:value-of select="$config/feedback/@to"/>
+</xsl:otherwise>
+</xsl:choose>
+</div>
+</xsl:template>
+</xsl:stylesheet>
+</forrest:template>
+</forrest:contract>
+]]>
+The @attributes (body="true" head="false" css="true") of the 
+forrest:template defining which parts of the html page (head, head-css
+and body) we have to render. The xsl:templates are following the simple
+naming convention {@name}-(css|head|body).
+
+
+b. If you want a default view for your project then copy the default.fv
+from the viewHelper implementation to your ${project.conf-dir} and modify this file. When
+you want another view for a specific file (e.g. ${project.xdocs-dir}/index.html) then copy
+the default.fv to your ${project.xdocs-dir} and renamed it to 
+${project.xdocs-dir}/index.fv.</source>
+    </section>
+  </body>
+</document>
\ No newline at end of file

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/group.svg
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/group.svg?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/group.svg (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/group.svg Fri Apr  8 19:24:54 2005
@@ -60,8 +60,7 @@
       <stop style="stop-color:white" offset="0"/>
       <stop style="stop-color:lightgreen" offset="1"/>
     </linearGradient>
-
-    <filter id="shadowFilter"  filterUnits="objectBoundingBox">
+    <filter id="shadowFilter" filterUnits="objectBoundingBox" width="1.4" height="1.4">
       <!-- Takes the alpha channel (black outline of the text), blurs it and saves as 'blur' -->
       <feGaussianBlur in="SourceAlpha" stdDeviation="2 2" result="blur"/>
       <!-- Takes saved 'blur' and offsets it by 4 pixels, saves as 'offsetBlur' -->

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/project.svg
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/project.svg?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/project.svg (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/images/project.svg Fri Apr  8 19:24:54 2005
@@ -61,7 +61,7 @@
       <stop style="stop-color:lightgreen" offset="1"/>
     </linearGradient>
 
-    <filter id="shadowFilter"  filterUnits="objectBoundingBox">
+<filter id="shadowFilter" filterUnits="objectBoundingBox" width="1.4" height="1.4">
       <!-- Takes the alpha channel (black outline of the text), blurs it and saves as 'blur' -->
       <feGaussianBlur in="SourceAlpha" stdDeviation="2 2" result="blur"/>
       <!-- Takes saved 'blur' and offsets it by 4 pixels, saves as 'offsetBlur' -->
@@ -75,7 +75,7 @@
   </defs>
 
   <g filter="url(#shadowFilter)" fill="url(#gradient)">
-    <text x="51%" y="75%" style="font-size:32pt; font-family:Verdana ; text-anchor: middle" >
+    <text x="51%" y="75%" style="font-size:16pt; font-family:Verdana ; text-anchor: middle" >
     <for:project-name />
     </text>
   </g>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/index.xml?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/index.xml Fri Apr  8 19:24:54 2005
@@ -18,177 +18,73 @@
 <!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.views Plugin</title> 
+    <title>forrest:views - x formats, one config</title>
+    <abstract>This plugin depends on a ViewHelper and a BusinessHelper implementation.</abstract> 
   </header> 
   <body> 
     <section>
-      <title>Apache Forrest - org.apache.forrest.plugin.views Plugin</title>
-      <source>
-How it works 
-************
-
-(taken from SOME comments of the output.xmap of views)
-
-This plugin has three components:
-  1. fbits - delivers contracts in form of xsl:templates
-  2. nuggets - delivers content that is used in the contracts
-  3. views - prepares and transforms the requested contracts (fbits) 
-     and populate them with the content (nuggets)
-
-1. fbits
-  This is the template producing factory.
-
-a. <![CDATA[<map:match pattern="resolve.contract.*">]]> -> Resolving factory
-Project implementation of templates have priority before default ones.
-If no implementation can be found we use the noFt (~ - no
-forrest:template) implementation.
-
-b. <![CDATA[<map:match pattern="get.contract.*.*">]]>
-Get the xsl:templates of the requested contract and specific format.
-
-c. <![CDATA[<map:match pattern="get.contract-property.*">]]>
-Get the forrest:properties of the requested contract. 
-This will determine which templates (css, head, body) we have to call
-later on
-
-GENERAL:
-Contracts are stored in forrest:templates ({contract-name}.ft) please
-have look on
-plugins/org.apache.forrest.plugin.views/resources/templates/*.ft do get
-an idea how your own implementation have to look like.
-
-
-2. nuggets
-  This is the content producing factory.
-
-NOTE: <![CDATA[<map:match pattern="*.page">]]>
-The current factory uses the skin producing templates (e.g.
-document2xhtml.xsl).
-It is only exchanging the last step of a skin producing pipe
-(site2xhtml.xsl) till now.
-This will have to be changed in the future.
-
-
-3. views
-  prepares and transforms the requested contracts (fbits) and populate
-them with the content (nuggets).
-
-a.  <![CDATA[<map:match pattern="prepare.view.*">]]> -> View config resolver
-File specific views have priority before default ones.
-If no view can be found in the project we use the default one of the
-views plugin.
-
-b.  <![CDATA[<map:match pattern="prepare.include.*"> ]]>
-Aggregate the contract-templates requested by the view with xinclude.
-The result is a stylesheet with all needed xsl:templates.
-
-c. <![CDATA[<map:match pattern="prepare.properties.*">]]>
-Aggregate the forrest:properties requested by the *.fv.
-The result is an aggregation of properties which defines the templates
-to be call.
-
-d. <![CDATA[<map:match pattern="prepare.xhtml.*">]]>
-Aggregate all contracts-templates requested by the view.
-Create a xsl that can be used for the last step of the transformation of
-the view.
-
-e. <![CDATA[<map:match pattern="*.html"> ]]>-> Last processing step. 
-Here we are overriding the default skin generation.
-
-GENERAL:
-Views are stored in forrest:view ({file-name}.fv) please have look on
-plugins/org.apache.forrest.plugin.views/src/documentation/default.fv do
-get an idea how your own implementation have to look like.
-
-Known issues
-************
-- The generation of the linking is not working.
-- Menu /innermenu templates are added directly. Add support for
-additional templates support.
-- Uses resources of leather (document2html.xsl defines the pdf/xml/...
-link this have to be done by the template).
-- The views are only working for html so far
-- The css support and implementation is VERY basic
-- Only first level files are working
-- ...
-
-Resume
-******
-The views plugin can be seen as prototype for the next generation
-skinning of forrest. It is still in early stage but with the cleanup I
-hope to make it easier for all devs (not only committer) to get the idea
-and help to enhance it.
-
-Some basic and simple hints:
-a) If you want another implementation of a contract then create a folder
-"templates" in ${project.resources-dir} and it will be matched before
-the standard implementation. 
-
-e.g. feedback contract:
-<![CDATA[
-<forrest:contract name="feedback" type="nugget"
+      <title>view</title>
+      <p>Together with the ViewHelper and the BusinessHelper (to be implemented) 
+        plugin this plugin is following the <a href="ext:sun/j2ee/patterns/dispatcherView">DispatcherView pattern</a> 
+        and building the final view which will be delivered to the client. This implementation follows exactly the pattern shown on 
+          <a href="ext:corej2eepatterns/patterns/dispatcherView">corej2eepatterns.com</a>
+        </p><p>
+        A view will be configured by a config file 
+        which basically contains three tags (it is in a really early stage): </p>
+<source><![CDATA[<forrest:view type="xhtml">
+  <forrest:contract name="meta"/>
+  <forrest:hook name="container">
+   <forrest:contract name="feedback"/>
+  </forrest:hook />
+</forrest:view>]]></source>
+<p>The view tag's @type determines the final output format. The idea is to
+configure different output formats via a forrest:views. That means a forrest:views 
+can contain n different forrest:view for n different formats. <br/>
+In short: x formats, one config. :)</p>
+<source><![CDATA[<forrest:views
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
-<description>
-This function will output the html feedback information.
-</description>
-
-<forrest:template
-xmlns:forrest="http://apache.org/forrest/templates/1.0"
-format="xhtml" name="feedback" inputFormat="xsl" body="true"
-head="false" css="true">
-
-<xsl:stylesheet version="1.1" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-
-<xsl:template name="feedback-css">
-#feedback {
-    color: black;
-    background: #CFDCED;
-    text-align:center;
-    margin-top: 5px;
-}
-#feedback #feedbackto {
-    font-size: 90%;
-    color: black;
-}</xsl:template>
-
-<xsl:template name="feedback-body">
-<div id="feedback"> Modified project implementation
-<xsl:value-of select="$config/feedback"/>
-<xsl:choose>
-<xsl:when test="$config/feedback/@href and
-not($config/feedback/@href='')">
-  <a id="feedbackto">
-    <xsl:attribute name="href">
-      <xsl:value-of select="$config/feedback/@href"/>
-      <xsl:value-of select="$path"/>
-    </xsl:attribute>
-    <xsl:value-of select="$config/feedback/@to"/>
-  </a>
-</xsl:when>
-<xsl:otherwise>
-  <xsl:value-of select="$config/feedback/@to"/>
-</xsl:otherwise>
-</xsl:choose>
-</div>
-</xsl:template>
-</xsl:stylesheet>
-</forrest:template>
-</forrest:contract>
-]]>
-The @attributes (body="true" head="false" css="true") of the 
-forrest:template defining which parts of the html page (head, head-css
-and body) we have to render. The xsl:templates are following the simple
-naming convention {@name}-(css|head|body).
-
-
-b. If you want a default view for your project then copy the default.fv
-from the plugin to your ${project.conf-dir} and modify this file. When
-you want another view for a specific file (e.g. index.html) then copy
-the default.fv to your ${project.xdocs-dir} and renamed it to e.g.
-index.fv.
-      </source>
+<forrest:view type="xhtml">
+  <forrest:contract name="meta"/>
+  <forrest:hook name="container">
+   <forrest:contract name="feedback"/>
+  </forrest:hook />
+</forrest:view>
+<forrest:view type="fo">
+  <forrest:hook name="container">
+   <forrest:contract name="feedback"/>
+  </forrest:hook />
+</forrest:view>
+/forrest:views>]]></source>
+</section>
+<section>
+  <title>ViewHelper </title>
+  <p>
+Each forrest:hook will be transformed into a <![CDATA[<div/>]]> tag (in html
+output [only format that has an implementation]). 
+This tags are designed to help web-designers to freely move
+around and group contracts into design container.
+</p>
+<p>Each forrest:contract will dispatch a xml file (ViewHelper) that contains
+xsl:stylesheets for the different output formats, a contract can
+implement. For html, the only format that we have implemented so far, we
+have three different kind of templates:</p><p>
+<![CDATA[<xsl:templates name="{contract/@name}-css/>]]><br/>
+Here the contract specific css will be stored.
+</p><p>
+<![CDATA[<xsl:templates name="{contract/@name}-head/>]]><br/>
+Here goes everything that belongs in the html head. e.g. scripts.
+</p><p>
+<![CDATA[<xsl:templates name="{contract/@name}-body/>]]><br/>
+Everything that belongs into the body.
+  </p>
+  </section>
+  <section>
+    <title>BusinessHelper </title>
+  <p>Right now it is implemented for the forrest way of producing the models
+for the view but we will create an independent BusinessHelper to
+access all BusinessServices you may have in your application. </p><p>
+With other words the BusinessHelper we are using right now are in the core. 
+We need to extract them into BusinessHelper classes.</p>
     </section>
   </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml Fri Apr  8 19:24:54 2005
@@ -34,6 +34,7 @@
 
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.views"/>
+  	<howItWorks label="howItWorks" href="howItWork.html" description="howItWorks"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/skinconf.xml?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/skinconf.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/skinconf.xml Fri Apr  8 19:24:54 2005
@@ -75,9 +75,9 @@
 
   <!-- optional group logo
        default skin: renders it at the top-left corner -->
-  <group-name>MyGroup</group-name>
-  <group-description>MyGroup Description</group-description>
-  <group-url>http://mygroup.org</group-url>
+  <group-name>forrest</group-name>
+  <group-description>forrest</group-description>
+  <group-url>http://forrest.apache.org</group-url>
   <group-logo>images/group.png</group-logo>
   <!-- Alternative static image:
   <group-logo>images/group-logo.gif</group-logo> -->

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/status.xml?view=diff&r1=160650&r2=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/status.xml Fri Apr  8 19:24:54 2005
@@ -25,8 +25,14 @@
   <changes>
     <!-- Add new releases here -->
     <release version="0.1" date="unreleased">
-      <action dev="RDG" type="add" context="admin">
-        Initial plugin code.
+      <action dev="TS" type="add" context="admin">
+        Initial plugin code extracted from the old views plugin.
+      </action>
+      <action dev="TS" type="add" context="docs">
+        Added infos of the pattern the plugin is using.
+      </action>
+      <action dev="TS" type="add" context="docs">
+        Updated the "how it works" section and moved it to its own site.
       </action>
     </release>
   </changes>
@@ -34,14 +40,15 @@
   <todo>
     <actions priority="high">
       <action context="docs" dev="open">
-        Customize this template plugin with your plugin's details.  This
-        TODO list is generated from 'status.xml'.
+        create some more example, that it is easier to adapt the concept.
       </action>
-      <action context="docs" dev="open">
-        Create the documentation with lots of examples and samples.  
-        XML content goes in
-        <code>src/documentation/content/xdocs</code>.
+      <action context="core" dev="open">
+        Rewrite matches to allow other output implementation then html.
+      </action>
+      <action context="core" dev="open">
+        Extract businessHelper to their on implementation plugin.
       </action>
+      
     </actions>
   </todo>
 

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml Fri Apr  8 19:24:54 2005
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+<project default="docs" basedir="." name="Forrest plugin build file">
+
+  <property name="plugin-name" value="org.apache.forrest.plugin.viewHelper"/>
+
+  <import file="../build.xml"/>
+
+  <!-- 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">
+       <fileset dir="tools">
+          <include name="pluginBionaryTools.zip"/>
+        </fileset>
+     </unzip>   
+  </target>
+  -->
+</project>
+  
+  

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties Fri Apr  8 19:24:54 2005
@@ -0,0 +1,109 @@
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
+# as applicable.
+#
+# Licensed 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.
+
+##############
+# Properties used by forrest.build.xml for building the website
+# These are the defaults, un-comment them if you need to change them.
+##############
+
+# Prints out a summary of Forrest settings for this project
+#forrest.echo=true
+
+# Project name (used to name .war file)
+#project.name=my-project
+
+# Specifies name of Forrest skin to use
+#project.skin=tigris
+#project.skin=pelt
+
+# comma separated list, file:// is supported
+#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
+
+##############
+# behavioural properties
+#project.menu-scheme=tab_attributes
+#project.menu-scheme=directories
+
+##############
+# layout properties
+
+# Properties that can be set to override the default locations
+#
+# Parent properties must be set. This usually means uncommenting
+# project.content-dir if any other property using it is uncommented
+
+#project.status=status.xml
+#project.content-dir=src/documentation
+#project.raw-content-dir=${project.content-dir}/content
+#project.conf-dir=${project.content-dir}/conf
+#project.sitemap-dir=${project.content-dir}
+#project.xdocs-dir=${project.content-dir}/content/xdocs
+#project.resources-dir=${project.content-dir}/resources
+#project.stylesheets-dir=${project.resources-dir}/stylesheets
+#project.images-dir=${project.resources-dir}/images
+#project.schema-dir=${project.resources-dir}/schema
+#project.skins-dir=${project.content-dir}/skins
+#project.skinconf=${project.content-dir}/skinconf.xml
+#project.lib-dir=${project.content-dir}/lib
+#project.classes-dir=${project.content-dir}/classes
+#project.translations-dir=${project.content-dir}/translations
+
+##############
+# validation properties
+
+# This set of properties determine if validation is performed
+# Values are inherited unless overridden.
+# e.g. if forrest.validate=false then all others are false unless set to true.
+#forrest.validate=true
+#forrest.validate.xdocs=${forrest.validate}
+#forrest.validate.skinconf=${forrest.validate}
+#forrest.validate.sitemap=${forrest.validate}
+#forrest.validate.stylesheets=${forrest.validate}
+#forrest.validate.skins=${forrest.validate}
+#forrest.validate.skins.stylesheets=${forrest.validate.skins}
+
+# *.failonerror=(true|false) - stop when an XML file is invalid
+#forrest.validate.failonerror=true
+
+# *.excludes=(pattern) - comma-separated list of path patterns to not validate
+# e.g.
+#forrest.validate.xdocs.excludes=samples/subdir/**, samples/faq.xml
+#forrest.validate.xdocs.excludes=
+
+
+##############
+# General Forrest properties
+
+# The URL to start crawling from
+#project.start-uri=linkmap.html
+# Set logging level for messages printed to the console
+# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
+#project.debuglevel=ERROR
+# Max memory to allocate to Java
+#forrest.maxmemory=64m
+# Any other arguments to pass to the JVM. For example, to run on an X-less
+# server, set to -Djava.awt.headless=true
+#forrest.jvmargs=
+# The bugtracking URL - the issue number will be appended
+#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
+#project.bugtracking-url=http://issues.apache.org/jira/browse/
+# The issues list as rss
+#project.issues-rss-url=
+#I18n Property only works for the "forrest run" target.
+#project.i18n=true
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# Run "forrest available-plugins" for a list of plug-ins currently available
+project.required.plugins=org.apache.forrest.plugin.viewHelper,org.apache.forrest.plugin.view,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap Fri Apr  8 19:24:54 2005
@@ -0,0 +1,248 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+	<map:components>
+		<map:selectors>
+      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </map:selectors>
+    <map:generators default="file">
+      <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
+      <map:generator label="content" logger="sitemap.generator.jx" name="jx" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
+    </map:generators>
+    <map:transformers default="xslt">
+      <map:transformer name="cinclude"
+        src="org.apache.cocoon.transformation.CIncludeTransformer"/>
+      <map:transformer name="xinclude"
+        src="org.apache.cocoon.transformation.XIncludeTransformer"/>
+    </map:transformers>
+    <map:serializers>
+	   <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
+	      <!--+
+	          | You can choose from Strict, Transitional, or Frameset XHTML.
+	          | For Strict XHTML set doctype to:
+	          |   <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+	          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+	          | For Transitional XHTML set doctype to:
+	          |   <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+	          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+	          | For Frameset XHTML set doctype to:
+	          |   <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
+	          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
+	          |
+	          | Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
+	          | XHTML DTD simultaneously, you can define several XHTML serializers.
+	          +-->
+	      <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+	      <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+	      <encoding>UTF-8</encoding>
+	    </map:serializer>
+      <map:serializer name="txt" 
+			   src="org.apache.cocoon.serialization.TextSerializer"
+			   mime-type="text/plain" 
+			   logger="sitemap.serializer.text" 
+			 />
+    </map:serializers>
+  </map:components>
+<map:pipelines>
+
+  <map:pipeline>
+<!--
+  This plugin provides a skin implementation based on views
+  -->
+  
+<!--
+  common skining
+  This is the template producing factory.
+  -->
+ <map:pipeline>
+  <!--
+    FIXME:
+    The next pipes have to be refactored and then to go into the view-interface (internal plugin)
+    e.g. resources/templates/{1}.ft -> should become 
+    first {project:view-skin}/templates/{1}.ft 
+    then {project:skin}/templates/{1}.ft
+    -->
+  <!--FIXME:START-->
+  <!--
+    Resolving factory
+    Project implementation of templates have priority before default ones.
+    If no implementation can be found we use the noFt (~ - no forrest:template) implementation.
+    -->
+  <map:match pattern="resolve.contract.*">
+    <map:select type="exists">
+      <map:when test="{project:resources}/templates/{1}.ft">
+        <map:generate src="{project:resources}/templates/{1}.ft"/>
+      </map:when>
+      <map:when test="resources/templates/{1}.ft">
+        <map:generate src="resources/templates/{1}.ft"/>
+      </map:when>
+      <map:otherwise>
+        <map:generate src="resources/templates/noFt.ft"/>
+      </map:otherwise>
+    </map:select>
+    <map:serialize type="xml"/>
+  </map:match>
+  <!--
+    Get the xsl:templates of the requested contract.
+  -->
+   <map:match pattern="get.contract.*.*">
+     <map:generate src="cocoon:/resolve.contract.{1}"/>
+     <map:transform src="resources/stylesheets/contract.xsl">
+      <!--Which output format?-->
+      <map:parameter name="format" value="{2}"/>
+     </map:transform>
+     <map:serialize type="xml"/>
+   </map:match>
+  <!--
+  Get the forrest:properties of the requested contract. 
+  This will determine which templates (css, head, body) we have to call later on
+  -->
+   <map:match pattern="get.contract-property.*">
+     <map:generate src="cocoon:/resolve.contract.{1}"/>
+     <map:transform src="resources/stylesheets/contract.property.xsl"/>
+     <map:serialize type="xml"/>
+   </map:match>
+  <!--
+  Get the css of the requested contract. 
+  -->
+   <map:match pattern="get.contract-css.*">
+     <map:generate src="cocoon:/resolve.contract.{1}"/>
+     <map:transform src="resources/stylesheets/contract.css.xsl"/>
+     <map:serialize type="txt"/>
+   </map:match>
+<!--FIXME:END-->
+<!--
+    FIXME:
+    The next pipes have to be refactored and then to go into an input plugin
+    e.g. resources/templates -> should become 
+    first {project:view-skin}/templates 
+    then {project:skin}/templates
+    -->
+  <!--FIXME:START-->
+<!-- ls.fbits 
+  list the default fbits-->
+  <map:pipeline>
+    <map:match pattern="ls.contracts">
+		  <map:generate type="directory" src="resources/templates">
+        <map:parameter name="depth" value="1"/>
+        <!-- sorted alphabetically -->
+      	<map:parameter name="reverse" value="false"/>
+      </map:generate>
+      <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
+<!-- ls.fbits 
+  list the project fbits-->
+  <map:pipeline>
+    <map:match pattern="ls.contracts.project">
+		  <map:generate type="directory" src="{project:resources}/templates/">
+        <map:parameter name="depth" value="1"/>
+        <!-- sorted alphabetically -->
+      	<map:parameter name="reverse" value="false"/>
+      </map:generate>
+      <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
+<!--ls.fbits.l
+transform this dir-list and add more information 
+-->
+  <map:pipeline>
+    <map:match pattern="ls.contracts.l.xml">
+		  <map:generate src="cocoon:/ls.contracts"/>
+      <map:transform src="resources/stylesheets/ls.contracts.xsl">
+        <map:parameter name="contentDir" value="{forrest:plugins}/org.apache.forrest.plugin.view"/>
+      </map:transform>
+      <map:transform src="resources/stylesheets/ls.contracts.html.xsl"/>
+      <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
+<!--ls.fbits.l
+transform this dir-list of the project and add more information 
+-->
+  <map:pipeline>
+    <map:match pattern="ls.contracts.project.l.xml">
+		  <map:generate src="cocoon:/ls.contracts.project"/>
+      <map:transform src="resources/stylesheets/ls.contracts.xsl">
+        <map:parameter name="contentDir" value="{forrest:plugins}/org.apache.forrest.plugin.view"/>
+      </map:transform>
+      <map:transform src="resources/stylesheets/ls.contracts.html.xsl"/>
+      <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
+  <!--FIXME:END-->
+  
+   <!--
+    Get some util-templates from the common skin.
+    -->
+   <map:match pattern="commonSite2xhtml">
+        <map:generate src="{forrest:context}/skins/common/xslt/html/site2xhtml.xsl"/>
+        <map:serialize type="xml"/>
+    </map:match>
+    <map:match pattern="dotdots">
+        <map:generate src="{forrest:context}/skins/common/xslt/html/dotdots.xsl"/>
+        <map:serialize type="xml"/>
+    </map:match>
+    <map:match pattern="pathutils">
+        <map:generate src="{forrest:context}/skins/common/xslt/html/pathutils.xsl"/>
+        <map:serialize type="xml"/>
+    </map:match>
+    <map:match pattern="renderlogo">
+        <map:generate src="{forrest:context}/skins/common/xslt/html/renderlogo.xsl"/>
+        <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
+
+  <!--
+  Last processing step. 
+  Here we are overriding the default skin generation.
+  -->   
+    <map:match pattern="*.html">
+      <map:generate src="cocoon://{1}.page"/>
+      <map:transform src="cocoon://prepare.xhtml.{1}">
+        <map:parameter name="path" value="{0}"/>
+      </map:transform>
+     	<map:serialize type="xhtml"/>
+    </map:match>
+    <map:match pattern="**/*.html">
+      <map:generate src="cocoon://{1}/{2}.page"/>
+      <map:transform src="cocoon://prepare.xhtml.{1}/{2}">
+        <map:parameter name="path" value="{0}"/>
+      </map:transform>
+     	<map:serialize type="xhtml"/>
+    </map:match>
+  
+  <map:match pattern="**.js">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+      <map:match pattern="**.css">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+      <map:match pattern="**images**">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+      <map:match pattern="**.png">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+     <map:match pattern="**.ico">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+  </map:pipeline>
+  
+</map:pipelines>
+
+</map:sitemap>

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap Fri Apr  8 19:24:54 2005
@@ -0,0 +1,403 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+<!-- ===============================================
+Pipelines for resources (css, images, javascript etc).
+
+
+Generates  :  CSS, images (possibly from SVG), javascript.
+Example URL:  http://localhost:8888/images/project-logo.gif
+Used by    :  sitemap.xmap
+Uses       :  resources/*, skins/*/{css,images}
+
+$Revision: 1.13 $
+==================================================== -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+   <map:components>
+      <map:generators default="file" >
+        <map:generator name="asciiart-svg"
+                       src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"/>
+        <map:generator name="text" 
+                       src="org.apache.cocoon.generation.TextGenerator">
+    <parameter name="localizable" value="true"/>
+   </map:generator>
+      </map:generators>               
+      <map:serializers default="html">
+         <map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
+            <parameter name="quality" type="float" value="1.0" />
+         </map:serializer>
+         <map:serializer mime-type="image/png" 
+                         name="svg2png" 
+                         src="org.apache.cocoon.serialization.SVGSerializer" >
+            <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+            <!-- <parameter name="gamma" type="float" value="0.48"/> -->
+            <parameter name="gamma" type="float" value="0"/>
+         </map:serializer>                
+         <map:serializer name="text"   mime-type="text/plain"  src="org.apache.cocoon.serialization.TextSerializer"/>
+      </map:serializers>
+      <map:transformers default="xslt">
+       <map:transformer name="pattern" 
+                        src="org.apache.cocoon.transformation.PatternTransformer">
+        <parameter name="groups" value="true"/>
+       </map:transformer>
+      </map:transformers>
+      
+      <map:readers default="resource" />
+      <map:matchers default="wildcard" />
+   </map:components>
+
+   <map:resources>
+      <map:resource name="skin-read">
+            <map:select type="exists">
+              <!-- First location: project skin dir -->
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.css">
+		         <map:call resource="read-linked-text">
+		           <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.css" />
+		         </map:call>
+               </map:when>
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.{ext}">
+                  <map:read src="{project:skins-dir}{forrest:skin}/{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:when>
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.css.xslt">
+                  <map:call resource="pipe-text-resource">
+                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.css.xslt" />
+                    <map:parameter name="mime-type" value="text/css" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-resource">
+                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" />
+                  </map:call>
+               </map:when>
+               
+              <!-- Second location: leather skin dir -->
+
+               <map:when test="resources/skin/{path}/{name}.css">
+		         <map:call resource="read-linked-text">
+		           <map:parameter name="path" value="resources/skin/{path}/{name}.css" />
+		         </map:call>
+               </map:when>
+               <map:when test="resources/skin/{path}/{name}.{ext}">
+                  <map:read src="resources/skin/{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:when>
+               <map:when test="resources/skin/{path}/{name}.css.xslt">
+                  <map:call resource="pipe-text-resource">
+                    <map:parameter name="path" value="resources/skin/{path}/{name}.css.xslt" />
+                    <map:parameter name="mime-type" value="text/css" />
+                  </map:call>
+               </map:when>
+               <map:when test="resources/skin/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-resource">
+                    <map:parameter name="path" value="resources/skin/{path}/{name}.svg.xslt" />
+                  </map:call>
+               </map:when>
+               
+              <!-- Third location: forrest common skin dir -->
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.css">
+		         <map:call resource="read-linked-text">
+		           <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.css" />
+		         </map:call>
+               </map:when>
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.{ext}">
+                  <map:read src="{forrest:context}/skins/common/{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:when>
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.css.xslt">
+                  <map:call resource="pipe-text-resource">
+                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.css.xslt" />
+                    <map:parameter name="mime-type" value="text/css" />
+                  </map:call>
+               </map:when>
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-resource">
+                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
+                  </map:call>
+               </map:when>
+               <map:otherwise>
+                   <!-- this should always fail; it is used so the error has the correct filename and extension -->
+                  <map:read src=".../{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:otherwise>
+            </map:select>
+      </map:resource>
+
+       <map:resource name="read-svg2png-corner-resource">
+            <map:select type="exists">
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-corner-resource">
+                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" />
+                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+                    <map:parameter name="size" value="{size}"/>   
+                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+                  </map:call>
+               </map:when>
+               <map:when test="resources/skin/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-corner-resource">
+                    <map:parameter name="path" value="resources/skin/{path}/{name}.svg.xslt" />
+                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+                    <map:parameter name="size" value="{size}"/>   
+                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+                  </map:call>
+               </map:when>
+               <map:otherwise>
+                  <map:call resource="pipe-svg2png-corner-resource">
+                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
+                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+                    <map:parameter name="size" value="{size}"/>   
+                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+                  </map:call>
+               </map:otherwise>
+            </map:select>
+      </map:resource>
+      
+      <map:resource name="pipe-text-resource">
+        <map:call resource="generate-transformed-resource">
+           <map:parameter name="path" value="{path}" />
+         </map:call>
+         <map:serialize type="text" mime-type="{mime-type}"/>
+      </map:resource>
+
+      <map:resource name="pipe-aggregate-svg2png-resource">
+         <map:call resource="generate-aggregate-resource">
+           <map:parameter name="path" value="{path}" />
+         </map:call>
+         <map:call resource="transform-project2text"/>
+         <map:transform src="{forrest:stylesheets}/extract-svg.xsl"/>
+         <map:serialize type="svg2png" />
+      </map:resource>
+
+      <map:resource name="pipe-transformed-svg2png-resource">
+         <map:call resource="generate-transformed-resource">
+           <map:parameter name="path" value="{path}" />
+         </map:call>
+         <map:call resource="transform-project2text"/>
+         <map:serialize type="svg2png" />
+      </map:resource>
+
+      <map:resource name="pipe-svg2png-corner-resource">
+        <map:generate src="cocoon://skinconf.xml" />
+        <map:transform src="{path}">
+            <map:parameter name="orientation-tb" 
+                         value="{orientation-tb}"/>
+            <map:parameter name="orientation-lr" 
+                         value="{orientation-lr}"/>
+            <map:parameter name="size" 
+                         value="{size}"/>
+            <map:parameter name="bg-color-name" 
+                         value="{bg-color-name}"/>
+            <map:parameter name="stroke-color-name" 
+                         value="{stroke-color-name}"/>
+            <map:parameter name="fg-color-name" 
+                         value="{fg-color-name}"/>            
+        </map:transform>
+        <map:call resource="transform-project2text"/>
+        <map:serialize type="svg2png" />
+      </map:resource>
+      
+      <map:resource name="generate-aggregate-resource">
+        <map:aggregate element="resource">
+          <map:part src="cocoon://skinconf.xml" />
+          <map:part src="{path}"/>
+        </map:aggregate>
+      </map:resource>
+      
+      <map:resource name="generate-transformed-resource">
+        <map:generate src="cocoon://skinconf.xml" />
+        <map:transform src="{path}"/>
+      </map:resource>
+      
+      <map:resource name="transform-project2text">
+         <map:transform src="{forrest:stylesheets}/project2text.xsl"/>
+      </map:resource>
+      
+      <map:resource name="read-linked-text">
+        <map:generate type="text" src="{path}" />
+        <map:transform type="pattern" src="{forrest:context}/resources/chaperon/grammars/link.xlex"/>
+        <map:transform src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl"/>                  
+        <map:serialize type="text" mime-type="text/css"/>
+      </map:resource>
+
+   </map:resources>
+   
+   <map:pipelines>
+       <map:pipeline>
+         <map:match pattern="**skin/**.js">
+            <map:call resource="skin-read">
+               <map:parameter name="path" value="scripts" />
+               <map:parameter name="name" value="{2}" />
+               <map:parameter name="ext" value="js" />
+               <map:parameter name="mime-type" value="application/x-javascript" />
+            </map:call>
+         </map:match>
+
+         <map:match pattern="**skin/**.css">
+            <map:call resource="skin-read">
+               <map:parameter name="path" value="css" />
+               <map:parameter name="name" value="{2}" />
+               <map:parameter name="ext" value="css" />
+               <map:parameter name="mime-type" value="text/css" />
+            </map:call>
+         </map:match>
+
+         <!-- special case corner generator pipeline -->
+         <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
+            <map:call resource="read-svg2png-corner-resource">
+               <map:parameter name="path" value="images/{1}" />
+               <map:parameter name="name" value="{2}c" />
+               <map:parameter name="orientation-tb" value="{3}"/>
+               <map:parameter name="orientation-lr" value="{4}"/>
+               <map:parameter name="size" value="{5}"/>    
+               <map:parameter name="bg-color-name" value="{6}"/>
+               <map:parameter name="stroke-color-name" value="{7}"/>
+               <map:parameter name="fg-color-name" value="{8}"/>    
+            </map:call>
+         </map:match>
+         
+         <map:match pattern="skin/images**/*.*">
+            <map:call resource="skin-read">
+               <map:parameter name="path" value="images/{1}" />
+               <map:parameter name="name" value="{2}" />
+               <map:parameter name="ext" value="{3}" />
+               <map:parameter name="mime-type" value="image/{3}" />
+            </map:call>
+         </map:match>
+
+         <!-- handles images local to a contributor directory -->
+         <map:match pattern="**my-images/**.*">
+            <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" />
+         </map:match>
+
+         <map:match pattern="images/**.png">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/images/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="{project:content.xdocs}/images/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:resources.images}/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="{project:resources.images}/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="resources/images/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="resources/images/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:content.xdocs}/images/{1}.png">
+                  <map:read src="{project:content.xdocs}/images/{1}.png" mime-type="image/png" />
+               </map:when>
+               <map:when test="resources/images/{1}.png">
+                  <map:read src="resources/images/{1}.png" mime-type="image/png" />
+               </map:when>
+               <map:when test="{project:resources.images}/{1}.png">
+                  <map:read src="{project:resources.images}/{1}.png" mime-type="image/png" />
+               </map:when>
+               <map:otherwise>
+                 <!-- needed for compatibility for the standard resources/images that are now
+                      in the common skin -->
+                 <map:call resource="skin-read">
+                   <map:parameter name="path" value="images" />
+                   <map:parameter name="name" value="{1}" />
+                   <map:parameter name="ext" value="png" />
+                   <map:parameter name="mime-type" value="image/png" />
+                 </map:call>
+               </map:otherwise>
+            </map:select>
+         </map:match>
+         
+         <map:match pattern="images/**.*">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/images/{1}.{2}">
+                  <map:read src="{project:content.xdocs}/images/{1}.{2}" mime-type="image/{2}" />
+               </map:when>
+               <map:when test="resources/images/{1}.{2}">
+                  <map:read src="resources/images/{1}.{2}" mime-type="image/{2}" />
+               </map:when>
+               <map:when test="{project:resources.images}/{1}.{2}">
+                  <map:read src="{project:resources.images}/{1}.{2}" mime-type="image/{2}" />
+               </map:when>
+               <map:otherwise>
+                 <!-- needed for compatibility for the standard resources/images that are now
+                      in the common skin -->
+                 <map:call resource="skin-read">
+                   <map:parameter name="path" value="images" />
+                   <map:parameter name="name" value="{1}" />
+                   <map:parameter name="ext" value="{2}" />
+                   <map:parameter name="mime-type" value="image/{2}" />
+                 </map:call>
+               </map:otherwise>
+            </map:select>
+         </map:match>
+
+         <map:match pattern="**/images/**.*">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/{1}/images/{2}.{3}">
+                  <map:read src="{project:content.xdocs}/{1}/images/{2}.{3}" mime-type="image/{3}" />
+               </map:when>
+               <map:when test="resources/images/{2}.{3}">
+                  <map:read src="resources/images/{2}.{3}" mime-type="image/{3}" />
+               </map:when>
+               <map:otherwise>
+                  <map:read src="{project:resources.images}/{2}.{3}" mime-type="image/{3}" />
+               </map:otherwise>
+            </map:select>
+         </map:match>
+
+         <map:match pattern="**.png">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="{project:content.xdocs}/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:content.xdocs}/{1}.aart">
+                  <map:generate type="asciiart-svg" src="{project:content.xdocs}/{1}.aart" />
+                  <map:call resource="transform-project2text"/>
+                  <map:serialize type="svg2png" />
+               </map:when>
+               <map:otherwise>
+                  <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
+               </map:otherwise>
+            </map:select>
+         </map:match>
+
+         <map:match pattern="**.ico">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/{1}.ico">
+                  <map:read src="{project:content.xdocs}/{1}.ico" mime-type="image/x-icon" />
+               </map:when>
+               <map:otherwise>
+                 <map:call resource="skin-read">
+                   <map:parameter name="path" value="images" />
+                   <map:parameter name="name" value="{1}" />
+                   <map:parameter name="ext" value="ico" />
+                   <map:parameter name="mime-type" value="image/x-icon" />
+                 </map:call>
+               </map:otherwise>
+            </map:select>
+         </map:match>
+      </map:pipeline>
+   </map:pipelines>
+</map:sitemap>

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/basic.css?view=auto&rev=160651
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/basic.css (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/basic.css Fri Apr  8 19:24:54 2005
@@ -0,0 +1,148 @@
+/*============HTML tags==========================*/
+body {
+	text-align:center;
+	font-family: verdana, helvetica, sans;
+	font-size: 8pt;
+}
+img {border:0;}
+hr {border:0px; height: 1px; background-color:#ddd;}
+
+/*============Container and branding=============*/
+#container {
+	width: 750px;
+	text-align:left;
+	margin: 0 auto 12px auto;
+}
+#branding {
+	padding: 0;
+	height: 75px;
+	max-height: 75px;
+	background: url(/images/header-background.gif) transparent;
+	background-repeat: no-repeat;
+	position: relative;
+}/*
+#projectlogo {
+	height: 75px;
+	width: 0;
+	padding: 5px;
+	float: left;
+}
+#search {
+	padding: 8px;
+	float: right;
+	font-family: verdana, helvetica, sans;
+	font-size: 8pt;
+	font-weight: bold;
+	color: #ddddff;
+}
+#search input {
+	font-size: 8pt;
+	font-family: verdana, helvetica, sans;
+}*/
+#spacer {
+    clear:both;
+}
+
+/*============Sub-tabs===========================*/
+#nav-main-sub {
+	text-align: right;
+	margin-right: 20px;
+}
+
+/*============Main content=======================*/
+#content {
+	clear: none;
+	margin-left: 25%;
+	padding: 10px;
+	font-family: verdana, helvetica, sans;
+	font-size: 10pt;
+	max-width: 75%;
+}
+#content-pdf {
+	float: right;
+	text-decoration: none;
+}
+#content-pdf a {
+	text-decoration: none;
+}
+#content h1 {
+	font-weight: bold;
+	font-size: 16pt;
+	letter-spacing: 2px;
+	padding: 0;
+	margin: 0;
+	display: block;
+	border-bottom: 2px solid #ddd;
+	color: #9AB;
+}
+#content h2 {
+	font-weight: bold;
+	font-size: 11pt;
+	letter-spacing: 1.5px;
+	padding: 0;
+	margin: 0;
+	display: block;
+	border-bottom: 2px solid #ddd;
+	color: #567;
+	font-family: "Trebuchet MS", helvetica, sans
+}
+#content h3 {
+	font-weight: bold;
+	font-size: 10pt;
+	letter-spacing: 1px;
+	padding: 0;
+	margin: 0;
+	display: block;
+	border-bottom: 2px solid #ddd;
+	color: #567;
+	font-family: verdana, helvetica, sans
+}
+
+#content a {
+	text-decoration:underline;
+	color: #567;
+}
+#content a:hover {
+	text-decoration:none;
+	color: #678;
+}
+
+/*============Labels, fixme etc.=================*/
+.frame {
+	border: solid black 1px;
+	margin: 1em 3em;
+}
+.frame .label {
+	background: #369;
+	color: white;
+	font-weight: bold;
+	padding: 5px 10px;
+}
+.frame .content {
+	padding: 5px 10px;
+	background: #F0F0FF;
+	color: black;
+	line-height: 170%;
+	font-size: 90%;
+}
+.warning .label {
+	background: #C00;
+	color: white;
+}
+.warning .content {
+	background: #FFF0F0;
+	color: black;
+}
+.fixme .label {
+	background: #C6C600;
+}
+
+/*============Footer=============================*/
+#siteinfo {
+	text-align: center;
+	clear: both;
+	padding: 5px;
+}
+#siteinfo p {
+	margin: 5px;
+}

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/css/basic.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/Thumbs.db
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/Thumbs.db?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/Thumbs.db
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter_open.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter_open.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/chapter_open.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/current.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/current.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/current.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/doc.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/doc.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/doc.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background-grad.png
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background-grad.png?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background-grad.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.png
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.png?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header-background.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header_white_line.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header_white_line.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/header_white_line.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/label.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/label.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/label.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/page.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/page.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/page.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/pdfdoc.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/pdfdoc.gif?view=auto&rev=160651
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/skin/images/pdfdoc.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Re: svn commit: r160651

Posted by David Crossley <cr...@apache.org>.
David Crossley wrote:
> > Author: thorsten
> > Date: Fri Apr  8 19:24:54 2005
> > New Revision: 160651
> > 
> > URL: http://svn.apache.org/viewcvs?view=rev&rev=160651
> > Log:
> > Renamed leather to viewHelper. Cleaned the view plugin from not needed code. added documentation to both plugins.
> > 
> > Added:
> >     forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/
> >     forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv   (with props)
> >     forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml   (with props)
> >     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/
> >     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml   (with props)
> >     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties   (with props)
> >     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap   (with props)
> >     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/
> >     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap   (with props)
> [ snip ]
> 
> Are you using 'svn move' when renaming this stuff, so that
> SVN history is retained? It might not matter in this case.
> 
> Anyway i notice that "leather" still remains in the forrest/trunk/plugins/

I see now what is happening with this last issue. My svn is
not removing that directory because it contains my old "build" directory.

--David

Re: svn commit: r160651

Posted by David Crossley <cr...@apache.org>.
> Author: thorsten
> Date: Fri Apr  8 19:24:54 2005
> New Revision: 160651
> 
> URL: http://svn.apache.org/viewcvs?view=rev&rev=160651
> Log:
> Renamed leather to viewHelper. Cleaned the view plugin from not needed code. added documentation to both plugins.
> 
> Added:
>     forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/
>     forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/views/default.fv   (with props)
>     forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/howItWork.xml   (with props)
>     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/
>     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/build.xml   (with props)
>     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/forrest.properties   (with props)
>     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/output.xmap   (with props)
>     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources/
>     forrest/trunk/plugins/org.apache.forrest.plugin.viewHelper/resources.xmap   (with props)
[ snip ]

Are you using 'svn move' when renaming this stuff, so that
SVN history is retained? It might not matter in this case.

Anyway i notice that "leather" still remains in the forrest/trunk/plugins/

--David