Author: thorsten
Date: Sat Jan 28 18:52:28 2006
New Revision: 373277
URL: http://svn.apache.org/viewcvs?rev=373277&view=rev
Log:
Moving locationmap from the themes to the dispatcher and removed some
indirections (FOR-783 and FOR-798)
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/locationmap.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=373277&r1=373276&r2=373277&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
Sat Jan 28 18:52:28 2006
@@ -113,5 +113,147 @@
<location
src="{defaults:structurer}/resources/stylesheets/root-strip.xsl" />
</select>
</match>
+
+ <!-- Next coming from themer -->
+ <!-- Project implementation of templates have priority before default ones.
+ If no implementation can be found we use the noFt (~ - no
forrest:template) implementation.
+ {1} name of the contract -->
+ <match pattern="resolve.contract.*.**">
+ <select type="exists">
+ <!-- project-based theme -->
+ <location src="{lm:themer.project.dir}/{project: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}/resources/themes/{project:theme}/{1}/{2}.ft" />
+ <!-- project-application-based default fallback -->
+ <location
src="{project:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft" />
+ <!-- plugin provided contracts -->
+ <location src="{lm:resolvePluginContract.{1}.{2}}" />
+ <!-- forrest-application-based theme -->
+ <location
src="{defaults:themer}/resources/themes/{project:theme}/{1}/{2}.ft" />
+ <!-- forrest-application-based default fallback -->
+ <location
src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft" />
+ <!-- forrest-application-based no found -->
+ <location
src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/noFt.ft" />
+ </select>
+ </match>
+ <match pattern="contract.html.**">
+ <select type="exists">
+ <location src="cocoon://prepare.contract.html.{1}" />
+ </select>
+ </match>
+ <match pattern="dataModel-xml-document-to-**.xsl">
+ <select type="exists">
+ <!-- FIXME
+ to-xml should become xml
+ document2 should become document-to-
+ after commiting -->
+ <!--<location
src="{project:skins-dir}{project:theme}/xslt/to-xml/document2{1}.xsl" />-->
+ <!--<location
src="{project:structurer}/resources/stylesheets/to-xml/document2{1}.xsl" />-->
+ <!--<location
src="{defaults:structurer}/resources/stylesheets/to-xml/document2{1}.xsl" />-->
+ <location
+
src="{project:skins-dir}{project:theme}/xslt/xml/document-to-{1}.xsl" />
+ <location
+
src="{project:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" />
+ <location
+
src="{defaults:structurer}/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" />
+ <location
src="{project:structurer}/resources/stylesheets/html/{1}.xsl" />
+ <location
src="{defaults:structurer}/resources/stylesheets/html/{1}.xsl" />
+ </select>
+ </match>
+ <!-- contracts have to be striped to their stylesheet for aggregation.
-->
+ <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" />
+ </select>
+ </match>
+ <match pattern="hooks-to-html.xsl">
+ <select type="exists">
+ <location
src="{project:themer}/resources/stylesheets/hooksMatcher-html.xsl" />
+ <location
src="{defaults:themer}/resources/stylesheets/hooksMatcher-html.xsl" />
+ </select>
+ </match>
+ <!-- contracts (e.g. html) need to be prepared for their
stylesheet-aggregation. -->
+ <match pattern="contract-property.xsl">
+ <select type="exists">
+ <location
src="{project:structurer}/resources/stylesheets/contract.property.xsl" />
+ <location
src="{defaults:structurer}/resources/stylesheets/contract.property.xsl" />
+ </select>
+ </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>
+ </match>
+ <match pattern="ls.contracts">
+ <select type="exists">
+ <location src="cocoon://ls.contracts.source.xml" />
+ </select>
+ </match>
+ <match pattern="ls.contracts.project">
+ <select type="exists">
+ <location src="cocoon://ls.contracts.project.source.xml" />
+ </select>
+ </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>
+ </match>
+ <!--Theme dir-->
+ <match pattern="themer.project.dir">
+ <select type="exists">
+ <location src="{project:resources}themes"/>
+ <!-- v1 location -->
+ <location src="{project:resources}templates" />
+ </select>
+ </match>
+ <!-- contracts (e.g. html) that can be used in the project. -->
+ <match pattern="themer.contracts.dir">
+ <select type="exists">
+ <location src="{project:themer}/resources/themes" />
+ <location src="{defaults:themer}/resources/themes" />
+ </select>
+ </match>
+ <!-- generic match for theme image resources -->
+ <!--
+ {1} name
+ {2} extension (note we assume e.g. {1}.gif)
+ -->
+ <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}/resources/themes/{project:theme}/images/{1}.{2}" />
+ <location
src="{project:themer}/resources/themes/{defaults:theme}/images/{1}.{2}" />
+ <location
src="{defaults:themer}/resources/themes/{project:theme}/images/{1}.{2}" />
+ <location
src="{defaults:themer}/resources/themes/{defaults:theme}/images/{1}.{2}" />
+ </select>
+ </match>
+ <!-- generic match for theme resources like css and js. -->
+ <!--
+ {1} name
+ {2} extension (note we assume e.g. PATH/css/{1}.css)
+ -->
+ <match pattern="themes/**.*">
+ <select type="exists">
+ <location src="{lm:themer.project.dir}/{project:theme}/{2}/{1}.{2}" />
+ <location src="{lm:themer.project.dir}/{defaults:theme}/{2}/{1}.{2}" />
+ <location
src="{project:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" />
+ <location
src="{project:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}" />
+ <location
src="{defaults:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" />
+ <location
src="{defaults:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}" />
+ </select>
+ </match>
</locator>
</locationmap>
