Author: thorsten
Date: Wed Aug  2 16:29:56 2006
New Revision: 428188

URL: http://svn.apache.org/viewvc?rev=428188&view=rev
Log:
FOR-799 - remove all references from the core to the dispatcher
I removed all properties related to the dispatcher (or former versions) from the core.
This includes cleaning 
 - basic (further switched to a minimal config) and fresh-site seed forrest.properties
 - default-forrest.properties
 - forrest-core.xconf
Further adding of forrest.properties.xml to basic and fresh-site seed.

Switching to the new properties system in all code of the dispatcher plugin where former core references have been.


Added:
    forrest/trunk/main/fresh-site/forrest.properties.xml   (with props)
    forrest/trunk/main/template-sites/basic/forrest.properties.xml   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml   (with props)
Modified:
    forrest/trunk/main/template-sites/basic/forrest.properties
    forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
    forrest/trunk/main/webapp/default-forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap

Added: forrest/trunk/main/fresh-site/forrest.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/forrest.properties.xml?rev=428188&view=auto
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties.xml (added)
+++ forrest/trunk/main/fresh-site/forrest.properties.xml Wed Aug  2 16:29:56 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<properties>
+  <!--
+    # codename: Dispatcher
+    # Dispatcher is using a fallback mechanism for theming.
+    # You can configure the theme name and its extension here
+    -->
+  <property name="dispatcher.theme" value="pelt"/>
+  <property name="dispatcher.theme-ext" value=".fv"/>
+</properties>

Propchange: forrest/trunk/main/fresh-site/forrest.properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/main/template-sites/basic/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/forrest.properties?rev=428188&r1=428187&r2=428188&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/basic/forrest.properties (original)
+++ forrest/trunk/main/template-sites/basic/forrest.properties Wed Aug  2 16:29:56 2006
@@ -14,144 +14,12 @@
 # limitations under the License.
 
 ##############
-# These are the defaults, un-comment them only if you need to change them.
-#
-# You can even have a completely empty file, to assist with maintenance.
-# The file obtained from 'forrest seed-sample' shows the defaults.
+# This is a minimal properties file.
+# These are defaults, un-comment them only if you need to change them.
+# See the full set of default properties in a 'forrest seed-sample' site.
+# Copy properties from there as needed.
 ##############
-
-# 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
-# See list at http://forrest.apache.org/docs/skins.html
-#project.skin=pelt
-
-# codename: Dispatcher
-# Dispatcher is using a fallback mechanism for theming.
-# You can configure the theme name and its extension here
-#project.theme-extension=.fv
-#project.theme=pelt
-
-
-# Descriptors for plugins and skins
-# comma separated list, file:// is supported
-#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
-#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.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
-
-#project.build-dir=${project.home}/build
-#project.site=site
-#project.site-dir=${project.build-dir}/${project.site}
-#project.temp-dir=${project.build-dir}/tmp
-
-##############
-# Cocoon catalog entity resolver properties
-# A local OASIS catalog file to supplement the default Forrest catalog
-#project.catalog=${project.schema-dir}/catalog.xcat
-
-##############
-# 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
-# Note: If you do add an "excludes" list then you need to specify site.xml too.
-# e.g.
-#forrest.validate.xdocs.excludes=site.xml, samples/subdir/**, samples/faq.xml
-#forrest.validate.xdocs.excludes=site.xml
-
-
-##############
-# 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
-# Projects would use their own issue tracker, of course.
-#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. Based on the locale request for the browser.
-#If you want to use it for static site then modify the JVM system.language
-# and run once per language
-#project.i18n=false
-
-# The names of plugins that are required to build the project
-# comma separated list (no spaces)
-# You can request a specific version by appending "-VERSION" to the end of
-# the plugin name. If you exclude a version number, the latest released version
-# will be used. However, be aware that this may be a development version. In
-# a production environment it is recommended that you specify a known working
-# version.
-# Run "forrest available-plugins" for a list of plug-ins currently available.
 project.required.plugins=org.apache.forrest.plugin.output.pdf
-
 # codename: Dispatcher
 # Add the following plugins to project.required.plugins:
 #org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
-
-# Proxy configuration
-# - proxy.user and proxy.password are only needed if the proxy is an authenticated one...
-# proxy.host=myproxy.myhost.com
-# proxy.port=<ProxyPort, if not the default : 80>
-# proxy.user=<login, if authenticated proxy>
-# proxy.password=<password, if authenticated proxy>

Added: forrest/trunk/main/template-sites/basic/forrest.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/forrest.properties.xml?rev=428188&view=auto
==============================================================================
--- forrest/trunk/main/template-sites/basic/forrest.properties.xml (added)
+++ forrest/trunk/main/template-sites/basic/forrest.properties.xml Wed Aug  2 16:29:56 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<properties>
+  <!--
+    # codename: Dispatcher
+    # Dispatcher is using a fallback mechanism for theming.
+    # You can configure the theme name and its extension here
+    -->
+  <property name="dispatcher.theme" value="pelt"/>
+  <property name="dispatcher.theme-ext" value=".fv"/>
+</properties>

Propchange: forrest/trunk/main/template-sites/basic/forrest.properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=428188&r1=428187&r2=428188&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Wed Aug  2 16:29:56 2006
@@ -238,12 +238,6 @@
         <whiteboard-plugins-src>@forrest.home@/whiteboard/plugins</whiteboard-plugins-src>
         <plugins>@forrest.home@/build/plugins</plugins>
         <locationmap>@context.home@/locationmap.xml</locationmap>
-        <structurer>@forrest.home@/build/plugins/org.apache.forrest.plugin.internal.dispatcher</structurer>
-        <themer>@forrest.home@/build/plugins/org.apache.forrest.themes.core</themer>
-        <view-internal>@forrest.home@/build/plugins/@project.view.internal.plugin@</view-internal>
-        <view-themes>@forrest.home@/build/plugins/@project.theme.plugin@/resources/views</view-themes>
-        <theme-ext>.fv</theme-ext>
-        <theme>common</theme>
       </values>
     </component-instance>
 
@@ -251,11 +245,6 @@
       <values>
         <home>@project.home@</home>
         <staging-dir>@project.build-dir@/@project.site@</staging-dir>
-        <themer>@project.themer@</themer>
-        <structurer>@project.stucturer@</structurer>
-        <theme-sourcetypeDir>@project.theme-sourcetypeDir@</theme-sourcetypeDir>
-        <theme-ext>@project.theme-extension@</theme-ext>
-        <theme>@project.theme@</theme>
         <skin>@project.skin@</skin>
         <sitemap>@project.home@/@project.sitemap@</sitemap>
         <status>@project.home@/@project.status@</status>

Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/default-forrest.properties?rev=428188&r1=428187&r2=428188&view=diff
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Wed Aug  2 16:29:56 2006
@@ -23,9 +23,6 @@
 # Project name (used to name .war file)
 project.name=my-project
 
-#views
-project.theme-extension=.fv
-project.theme=common
 
 # Specifies name of Forrest skin to use
 project.skin=pelt
@@ -63,8 +60,6 @@
 project.grammars-dir=${project.resources-dir}/grammars
 project.skins-dir=${project.content-dir}/skins
 project.skinconf=${project.content-dir}/skinconf.xml
-# theme-dir this overtakes the functionality of the former skins-dir
-project.theme-dir=${project.resources-dir}/themes
 project.lib-dir=${project.content-dir}/lib
 project.classes-dir=${project.content-dir}/classes
 project.translations-dir=${project.content-dir}/translations
@@ -161,11 +156,3 @@
 # comma separated list (no spaces)
 project.required.plugins.src=${forrest.home}/plugins,${forrest.home}/whiteboard/plugins
 
-# Views v1 Configuration
-project.view.internal.plugin=org.apache.forrest.plugin.internal.view
-project.theme.plugin=org.apache.forrest.plugin.internal.view
-##########################################
-#   *advanced configuration*  v2 - you can specify which plugins you want
-#   use internal.
-project.themer=${forrest.home}/build/plugins/org.apache.forrest.plugin.output.themer
-project.stucturer=${forrest.home}/build/plugins/org.apache.forrest.plugin.internal.structurer

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml?rev=428188&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml Wed Aug  2 16:29:56 2006
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<properties>
+  <property name="dispatcher.theme" value="pelt"/>
+  <property name="dispatcher.fallback.theme" value="common"/>
+  <property name="dispatcher.theme-ext" value=".fv"/>
+  <property name="dispatcher.fallback.theme-ext" value=".fv"/>
+  <property name="dispatcher.themer" value="org.apache.forrest.themes.core"/>
+  <property name="dispatcher.home" value="org.apache.forrest.plugin.internal.dispatcher"/>
+</properties>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties?rev=428188&r1=428187&r2=428188&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties Wed Aug  2 16:29:56 2006
@@ -24,5 +24,4 @@
 forrest.validate.skinconf=false
 # FIXME: FOR-912
 forrest.validate.xdocs.excludes=dispatcher-glossary.xml
-project.theme=pelt
 project.required.plugins=org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.glossary

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=428188&r1=428187&r2=428188&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Wed Aug  2 16:29:56 2006
@@ -113,25 +113,28 @@
         </selectors>
     </components>
     <locator>
+        <!-- Base location of the builded dispatcher plugin-->
+        <match pattern="dispatcher.home">
+          <location src="{defaults:plugins}/{project:dispatcher.home}" />
+        </match> 
+        <!-- Base location of the builded themer plugin-->
+        <match pattern="dispatcher.themer">
+          <location src="{defaults:plugins}/{project:dispatcher.themer}" />
+        </match>
         <!-- xhtml2 to html core transformation -->
         <match pattern="transform.xhtml2.html.structurer">
-            <select>
-                <location 
-                    src="{project:structurer}/resources/stylesheets/html/xhtml2_to_html.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/html/xhtml2_to_html.xsl" 
-                    />
-            </select>
+          <location 
+            src="{lm:dispatcher.home}/resources/stylesheets/html/xhtml2_to_html.xsl" 
+            />
         </match>
         <!-- resource types -->
         <match pattern="dispatcher.structurer.resourceType.**">
             <select>
                 <location 
-                    src="{project:resources}/structurer/resource-types/{1}{project:theme-ext}" 
+                    src="{project:resources}/structurer/resource-types/{1}{project:dispatcher.theme-ext}" 
                     />
                 <location 
-                    src="{defaults:themer}/structurer/resource-types/{1}{project:theme-ext}" 
+                    src="{lm:dispatcher.themer}/structurer/resource-types/{1}{project:dispatcher.theme-ext}" 
                     />
             </select>
         </match>
@@ -163,20 +166,20 @@
       a) custom implementation of the themes.core plugin
       b) themes.core plugin
       where we test for 
-      1) {project:theme}{project:theme-ext}
-      2) {defaults:theme}{defaults:theme-ext}
+      1) {project:dispatcher.theme}{project:dispatcher.theme-ext}
+      2) {project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}
       -->
         <match pattern="resolve.structurer.**">
             <select type="exists">
                 <!-- project-based 
           url-based (url location) -->
                 <location 
-                    src="{project:resources}/structurer/url/{1}{project:theme-ext}" 
+                    src="{project:resources}/structurer/url/{1}{project:dispatcher.theme-ext}" 
                     />
                 <!-- project-based 
           url-based (xdocs location)  [depreciated]-->
                 <location 
-                    src="{project:content.xdocs}{1}{project:theme-ext}" />
+                    src="{project:content.xdocs}{1}{project:dispatcher.theme-ext}" />
                 <act type="sourcetype" 
                     src="{project:content.xdocs}{1}.xml">
                     <!-- Sourcetype based 
@@ -201,8 +204,8 @@
                 </act>
                 <act type="RecursiveDirectoryTraversalAction">
                     <parameter value="{../1}{1}" name="request"/>
-                    <parameter value="{project:theme}" name="projectFallback"/>
-                    <parameter value="{project:theme-ext}" 
+                    <parameter value="{project:dispatcher.theme}" name="projectFallback"/>
+                    <parameter value="{project:dispatcher.theme-ext}" 
                         name="projectExtension"/>
                     <parameter value="{project:resources}structurer/url/" 
                         name="projectDir"/>
@@ -212,8 +215,8 @@
                 </act>
                 <act type="RecursiveDirectoryTraversalAction">
                     <parameter value="{../1}{1}" name="request"/>
-                    <parameter value="{project:theme}" name="projectFallback"/>
-                    <parameter value="{project:theme-ext}" 
+                    <parameter value="{project:dispatcher.theme}" name="projectFallback"/>
+                    <parameter value="{project:dispatcher.theme-ext}" 
                         name="projectExtension"/>
                     <parameter value="{project:content.xdocs}" 
                         name="projectDir"/>
@@ -223,27 +226,19 @@
                 </act>
                 <!-- themes-dir: project-application-based theme-dir-based -->
                 <location 
-                    src="{lm:themer.project.dir}/{project:theme}{project:theme-ext}" 
-                    />
-                <!-- themer: project-application-based theme-based -->
-                <location 
-                    src="{project:themer}/themes/{project:theme}{project:theme-ext}" 
+                    src="{lm:themer.project.dir}/{project:dispatcher.theme}{project:dispatcher.theme-ext}" 
                     />
                 <!-- themes-dir: project-application-based default -->
                 <location 
-                    src="{lm:themer.project.dir}/{defaults:theme}{defaults:theme-ext}" 
-                    />
-                <!-- themer: project-application-based default -->
-                <location 
-                    src="{project:themer}/themes/{defaults:theme}{defaults:theme-ext}" 
+                    src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}" 
                     />
                 <!-- themer: forrest-application-based theme-based -->
                 <location 
-                    src="{defaults:themer}/themes/{project:theme}{project:theme-ext}" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}{project:dispatcher.theme-ext}" 
                     />
                 <!-- themer: forrest-application-based default -->
                 <location 
-                    src="{defaults:themer}/themes/{defaults:theme}{defaults:theme-ext}" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}" 
                     />
             </select>
         </match>
@@ -251,22 +246,16 @@
         <match pattern="resolve.tiles.**">
             <select type="exists">
                 <location 
-                    src="{project:resources}/themes/{project:theme}/html/{1}.vt.xml" 
-                    />
-                <location 
-                    src="{project:resources}/themes/{defaults:theme}/html/{1}.vt.xml" 
-                    />
-                <location 
-                    src="{project:themer}/themes/{project:theme}/html/{1}.vt.xml" 
+                    src="{project:resources}/themes/{project:dispatcher.theme}/html/{1}.vt.xml" 
                     />
                 <location 
-                    src="{project:themer}/themes/{defaults:theme}/html/{1}.vt.xml" 
+                    src="{project:resources}/themes/{project:dispatcher.fallback.theme}/html/{1}.vt.xml" 
                     />
                 <location 
-                    src="{defaults:themer}/themes/{project:theme}/html/{1}.vt.xml" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/html/{1}.vt.xml" 
                     />
                 <location 
-                    src="{defaults:themer}/themes/{defaults:theme}/html/{1}.vt.xml" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/html/{1}.vt.xml" 
                     />
             </select>
         </match>
@@ -274,10 +263,7 @@
         <match pattern="root-strip.xsl">
             <select type="exists">
                 <location 
-                    src="{project:structurer}/resources/stylesheets/root-strip.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/root-strip.xsl" 
+                    src="{lm:dispatcher.home}/resources/stylesheets/root-strip.xsl" 
                     />
             </select>
         </match>
@@ -289,54 +275,42 @@
             <select type="exists">
                 <!-- project-based theme -->
                 <location 
-                    src="{lm:themer.project.dir}/{project:theme}/{1}/{2}.ft" />
+                    src="{lm:themer.project.dir}/{project:dispatcher.theme}/{1}/{2}.ft" />
                 <!-- project-based default fallback -->
                 <location 
-                    src="{lm:themer.project.dir}/{defaults:theme}/{1}/{2}.ft" />
-                <!-- project-application-based theme -->
-                <location 
-                    src="{project:themer}/themes/{project:theme}/{1}/{2}.ft" />
-                <!--  project-application-based default fallback -->
-                <location 
-                    src="{project:themer}/themes/{defaults:theme}/{1}/{2}.ft" />
+                    src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}/{1}/{2}.ft" />
                 <!--  plugin provided contracts -->
                 <location src="{lm:resolvePluginContract.{1}.{2}}" />
                 <!-- forrest-application-based theme -->
                 <location 
-                    src="{defaults:themer}/themes/{project:theme}/{1}/{2}.ft" />
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/{1}/{2}.ft" />
                 <!--  forrest-application-based default fallback -->
                 <location 
-                    src="{defaults:themer}/themes/{defaults:theme}/{1}/{2}.ft" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/{1}/{2}.ft" 
                     />
                 <!--  forrest-application-based no found -->
                 <location 
-                    src="{defaults:themer}/themes/{defaults:theme}/{1}/noFt.ft" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/{1}/noFt.ft" 
                     />
             </select>
         </match>
         <match pattern="dataModel-xml-document-to-**.xsl">
             <select type="exists">
                 <location 
-                    src="{project:skins-dir}{project:theme}/xslt/xml/document-to-{1}.xsl" 
-                    />
-                <location 
-                    src="{project:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" 
+                    src="{project:skins-dir}{project:dispatcher.theme}/xslt/xml/document-to-{1}.xsl" 
                     />
                 <location 
-                    src="{defaults:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" 
+                    src="{lm:dispatcher.home}/resources/stylesheets/xml/document-to-{1}.xsl" 
                     />
             </select>
         </match>
         <match pattern="dataModel-html-**.xsl">
             <select type="exists">
                 <location 
-                    src="{project:skins-dir}{project:theme}/xslt/html/{1}.xsl" 
+                    src="{project:skins-dir}{project:dispatcher.theme}/xslt/html/{1}.xsl" 
                     />
                 <location 
-                    src="{project:structurer}/resources/stylesheets/html/{1}.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/html/{1}.xsl" 
+                    src="{lm:dispatcher.home}/resources/stylesheets/html/{1}.xsl" 
                     />
             </select>
         </match>
@@ -344,43 +318,24 @@
         <match pattern="contract-strip-xsl.xsl">
             <select type="exists">
                 <location 
-                    src="{project:structurer}/resources/stylesheets/contract-strip-xsl.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/contract-strip-xsl.xsl" 
+                    src="{lm:dispatcher.home}/resources/stylesheets/contract-strip-xsl.xsl" 
                     />
             </select>
         </match>
         <match pattern="hooks-to-html.xsl">
-            <select type="exists">
-                <location 
-                    src="{project:structurer}/resources/stylesheets/hooksMatcher-html.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/hooksMatcher-html.xsl" 
-                    />
-            </select>
+          <location 
+            src="{lm:dispatcher.home}/resources/stylesheets/hooksMatcher-html.xsl" 
+            />
         </match>
         <!-- contracts (e.g. html) that can be used in the project. -->
         <match pattern="ls.contracts.xsl">
-            <select type="exists">
-                <location 
-                    src="{project:structurer}/resources/stylesheets/ls.contracts.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/ls.contracts.xsl" 
-                    />
-            </select>
+          <location 
+            src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts.xsl" />
         </match>
         <match pattern="ls.contracts-to-document.xsl">
-            <select type="exists">
-                <location 
-                    src="{project:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" 
-                    />
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" 
-                    />
-            </select>
+          <location 
+            src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts-to-document.xsl" 
+            />
         </match>
         <!--Theme dir-->
         <match pattern="themer.project.dir">
@@ -392,10 +347,7 @@
         </match>
         <!-- contracts (e.g. html) that can be used in the project. -->
         <match pattern="themer.contracts.dir">
-            <select type="exists">
-                <location src="{project:themer}/themes" />
-                <location src="{defaults:themer}/themes" />
-            </select>
+          <location src="{lm:dispatcher.themer}/themes" />
         </match>
         <!-- generic match for theme image resources -->
         <!-- 
@@ -405,22 +357,16 @@
         <match pattern="themes/images/**.*">
             <select type="exists">
                 <location 
-                    src="{lm:themer.project.dir}/{project:theme}/images/{1}.{2}" 
-                    />
-                <location 
-                    src="{lm:themer.project.dir}/{defaults:theme}/images/{1}.{2}" 
-                    />
-                <location 
-                    src="{project:themer}/themes/{project:theme}/images/{1}.{2}" 
+                    src="{lm:themer.project.dir}/{project:dispatcher.theme}/images/{1}.{2}" 
                     />
                 <location 
-                    src="{project:themer}/themes/{defaults:theme}/images/{1}.{2}" 
+                    src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}/images/{1}.{2}" 
                     />
                 <location 
-                    src="{defaults:themer}/themes/{project:theme}/images/{1}.{2}" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/images/{1}.{2}" 
                     />
                 <location 
-                    src="{defaults:themer}/themes/{defaults:theme}/images/{1}.{2}" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/images/{1}.{2}" 
                     />
             </select>
         </match>
@@ -432,32 +378,23 @@
         <match pattern="themes/**.*">
             <select type="exists">
                 <location 
-                    src="{lm:themer.project.dir}/{project:theme}/{2}/{1}.{2}" />
+                    src="{lm:themer.project.dir}/{project:dispatcher.theme}/{2}/{1}.{2}" />
                 <location 
-                    src="{lm:themer.project.dir}/{defaults:theme}/{2}/{1}.{2}" 
+                    src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}/{2}/{1}.{2}" 
                     />
                 <location 
-                    src="{project:themer}/themes/{project:theme}/{2}/{1}.{2}" />
-                <location 
-                    src="{project:themer}/themes/{defaults:theme}/{2}/{1}.{2}" 
-                    />
-                <location 
-                    src="{defaults:themer}/themes/{project:theme}/{2}/{1}.{2}" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/{2}/{1}.{2}" 
                     />
                 <location 
-                    src="{defaults:themer}/themes/{defaults:theme}/{2}/{1}.{2}" 
+                    src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/{2}/{1}.{2}" 
                     />
             </select>
         </match>
         <!--  Extracts the style sheet from the contract.  -->
         <match pattern="contract-strip-xsl.xsl">
-            <select type="exists">
-                <!-- don't think it's wise to let project override this... -->
-                <!-- location src="{project:structurer}/resources/stylesheets/helper/contract-strip-xsl.xsl" /-->
-                <location 
-                    src="{defaults:structurer}/resources/stylesheets/helper/contract-strip-xsl.xsl" 
-                    />
-            </select>
+          <location 
+            src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" 
+            />
         </match>
     </locator>
 </locationmap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap?rev=428188&r1=428187&r2=428188&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap Wed Aug  2 16:29:56 2006
@@ -87,27 +87,27 @@
           </map:call>
         </map:when>
         <!-- Second location: skin dir -->
-        <map:when test="resources/skin/{path}/{project:theme}/{name}.css">
+        <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.css">
           <map:call resource="read-linked-text">
             <map:parameter name="path" 
-              value="resources/skin/{path}/{project:theme}/{name}.css" />
+              value="resources/skin/{path}/{project:dispatcher.theme}/{name}.css" />
           </map:call>
         </map:when>
-        <map:when test="resources/skin/{path}/{project:theme}/{name}.{ext}">
-          <map:read src="resources/skin/{path}/{project:theme}/{name}.{ext}" 
+        <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.{ext}">
+          <map:read src="resources/skin/{path}/{project:dispatcher.theme}/{name}.{ext}" 
             mime-type="{mime-type}" />
         </map:when>
-        <map:when test="resources/skin/{path}/{project:theme}/{name}.css.xslt">
+        <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.css.xslt">
           <map:call resource="pipe-text-resource">
             <map:parameter name="path" 
-              value="resources/skin/{path}/{project:theme}/{name}.css.xslt" />
+              value="resources/skin/{path}/{project:dispatcher.theme}/{name}.css.xslt" />
             <map:parameter name="mime-type" value="text/css" />
           </map:call>
         </map:when>
-        <map:when test="resources/skin/{path}/{project:theme}/{name}.svg.xslt">
+        <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.svg.xslt">
           <map:call resource="pipe-transformed-svg2png-resource">
             <map:parameter name="path" 
-              value="resources/skin/{path}/{project:theme}/{name}.svg.xslt" />
+              value="resources/skin/{path}/{project:dispatcher.theme}/{name}.svg.xslt" />
           </map:call>
         </map:when>
         <!-- Third location: leather skin dir -->