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/10/27 11:32:43 UTC
svn commit: r328839 - in /forrest/trunk/main/webapp:
WEB-INF/xconf/forrest-core.xconf locationmap-structurer.xml
locationmap-themer.xml
Author: thorsten
Date: Thu Oct 27 02:32:35 2005
New Revision: 328839
URL: http://svn.apache.org/viewcvs?rev=328839&view=rev
Log:
Removed the project.theme-dir property by adding it to the lm like suggest by Ross. Thx Ross for this suggestion.
Modified:
forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
forrest/trunk/main/webapp/locationmap-structurer.xml
forrest/trunk/main/webapp/locationmap-themer.xml
Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=328839&r1=328838&r2=328839&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Thu Oct 27 02:32:35 2005
@@ -168,7 +168,6 @@
<theme-sourcetypeDir>@project.theme-sourcetypeDir@</theme-sourcetypeDir>
<theme-ext>@project.theme-extension@</theme-ext>
<theme>@project.theme@</theme>
- <theme-dir>@project.theme-dir@</theme-dir>
<skin>@project.skin@</skin>
<sitemap>@project.home@/@project.sitemap@</sitemap>
<status>@project.home@/@project.status@</status>
Modified: forrest/trunk/main/webapp/locationmap-structurer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-structurer.xml?rev=328839&r1=328838&r2=328839&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-structurer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-structurer.xml Thu Oct 27 02:32:35 2005
@@ -54,7 +54,7 @@
</act>
<!-- themes-dir: project-application-based theme-dir-based -->
<location
- src="{project:theme-dir}/{project:theme}{project:theme-ext}"
+ src="{lm:themer.project.dir}/{project:theme}{project:theme-ext}"
/>
<!-- themer: project-application-based theme-based -->
<location
@@ -62,7 +62,7 @@
/>
<!-- themes-dir: project-application-based default -->
<location
- src="{project:theme-dir}/{defaults:theme}{defaults:theme-ext}"
+ src="{lm:themer.project.dir}/{defaults:theme}{defaults:theme-ext}"
/>
<!-- themer: project-application-based default -->
<location
@@ -84,6 +84,10 @@
<location src="{defaults:structurer}/resources/stylesheets/get.structurer.by.requested.format.xsl" />
</select>
</match>
+ <!--
+ {1} format (e.g. html)
+ {2} path (e.g. samples/index)
+ -->
<match pattern="structurer.*.**">
<select type="exists">
<location src="cocoon://prepare.structurer.{1}.{2}" />
@@ -117,7 +121,11 @@
<location src="cocoon://prepare.tiles.{1}" />
</select>
</match>
- <!-- Aggregate the forrest:properties requested by the *.fv. -->
+ <!-- Aggregate the forrest:properties requested by the *.fv. -->
+ <!--
+ {1} format (e.g. html)
+ {2} path (e.g. samples/index)
+ -->
<match pattern="structurer-properties.*.**">
<select type="exists">
<location src="cocoon://prepare.structurer-properties.{1}.{2}" />
@@ -130,13 +138,6 @@
<location src="{defaults:structurer}/resources/stylesheets/root-strip.xsl" />
</select>
</match>
- <!-- Aggregate the contract-templates requested by the view with cinclude. -->
- <!--<match pattern="structurer-xsl-includes.xsl">
- <select type="exists">
- <location src="{project:structurer}/resources/stylesheets/prepare.include.xsl" />
- <location src="{defaults:structurer}/resources/stylesheets/prepare.include.xsl" />
- </select>
- </match>-->
<!-- Aggregate the forrest:properties requested by the *.fv with cinclude. -->
<match pattern="structurer-properties-includes.xsl">
<select type="exists">
Modified: forrest/trunk/main/webapp/locationmap-themer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=328839&r1=328838&r2=328839&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Thu Oct 27 02:32:35 2005
@@ -43,9 +43,9 @@
<match pattern="resolve.contract.html.**">
<select type="exists">
<!-- project-based theme -->
- <location src="{project:theme-dir}/{project:theme}/html/{1}.ft" />
+ <location src="{lm:themer.project.dir}/{project:theme}/html/{1}.ft" />
<!-- project-based default fallback -->
- <location src="{project:theme-dir}/{defaults:theme}/html/{1}.ft" />
+ <location src="{lm:themer.project.dir}/{defaults:theme}/html/{1}.ft" />
<!-- project-application-based theme -->
<location src="{project:themer}/resources/themes/{project:theme}/html/{1}.ft" />
<!-- project-application-based default fallback -->
@@ -123,6 +123,14 @@
<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">
@@ -130,23 +138,19 @@
<location src="{defaults:themer}/resources/themes" />
</select>
</match>
- <!-- project contracts (e.g. html) that can be used in the project. -->
- <match pattern="themer.contracts.project.dir">
- <select type="exists">
- <location src="{project:theme-dir}/" />
- <!-- v1 location -->
- <location src="{project:resources}/templates/" />
- </select>
- </match>
- <!-- project contracts (e.g. html) that can be used in the project. -->
- <match pattern="themes/**.css">
- <select type="exists">
- <location src="{project:theme-dir}/{project:theme}/css/{1}.css" />
- <location src="{project:theme-dir}/{defaults:theme}/css/{1}.css" />
- <location src="{project:themer}/resources/themes/{project:theme}/css/{1}.css" />
- <location src="{project:themer}/resources/themes/{defaults:theme}/css/{1}.css" />
- <location src="{defaults:themer}/resources/themes/{project:theme}/css/{1}.css" />
- <location src="{defaults:themer}/resources/themes/{defaults:theme}/css/{1}.css" />
+ <!-- generic match for theme ressources 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>