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/24 10:36:31 UTC
svn commit: r327991 - in /forrest/trunk/main/webapp:
WEB-INF/xconf/forrest-core.xconf locationmap-structurer.xml
locationmap-themer.xml
Author: thorsten
Date: Mon Oct 24 01:35:58 2005
New Revision: 327991
URL: http://svn.apache.org/viewcvs?rev=327991&view=rev
Log:
Added new property theme-dir which will replace skin-dir in the future. Added support for project contract listing. Updated the locationmaps to meet new file structurer of the themes.
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=327991&r1=327990&r2=327991&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Mon Oct 24 01:35:58 2005
@@ -167,6 +167,7 @@
<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=327991&r1=327990&r2=327991&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-structurer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-structurer.xml Mon Oct 24 01:35:58 2005
@@ -52,21 +52,29 @@
<!-- project-based theme-based = directory-based / parent-directory based (recursively) -->
<location src="{uri}" />
</act>
- <!-- project-application-based theme-based -->
+ <!-- themes-dir: project-application-based theme-dir-based -->
<location
- src="{project:themer}/resources/views/{project:theme}{project:theme-ext}"
+ src="{project:theme-dir}/{project:theme}{project:theme-ext}"
/>
- <!-- project-application-based default -->
+ <!-- themer: project-application-based theme-based -->
<location
- src="{project:themer}/resources/views/{defaults:theme}{defaults:theme-ext}"
+ src="{project:themer}/resources/themes/{project:theme}{project:theme-ext}"
/>
- <!-- forrest-application-based theme-based -->
+ <!-- themes-dir: project-application-based default -->
<location
- src="{defaults:themer}/resources/views/{project:theme}{project:theme-ext}"
+ src="{project:theme-dir}/{defaults:theme}{defaults:theme-ext}"
/>
- <!-- forrest-application-based default -->
+ <!-- themer: project-application-based default -->
<location
- src="{defaults:themer}/resources/views/{defaults:theme}{defaults:theme-ext}"
+ src="{project:themer}/resources/themes/{defaults:theme}{defaults:theme-ext}"
+ />
+ <!-- themer: forrest-application-based theme-based -->
+ <location
+ src="{defaults:themer}/resources/themes/{project:theme}{project:theme-ext}"
+ />
+ <!-- themer: forrest-application-based default -->
+ <location
+ src="{defaults:themer}/resources/themes/{defaults:theme}{defaults:theme-ext}"
/>
</select>
</match>
@@ -76,7 +84,7 @@
<location src="{defaults:structurer}/resources/stylesheets/get.structurer.by.requested.format.xsl" />
</select>
</match>
- <match pattern="structurer.**.*">
+ <match pattern="structurer.*.**">
<select type="exists">
<location src="cocoon://prepare.structurer.{1}.{2}" />
</select>
@@ -85,20 +93,20 @@
<match pattern="resolve.tiles.**">
<select type="exists">
<location
- src="{project:resources}/templates/{project:theme}/{1}.vt.xml" />
+ src="{project:resources}/themes/{project:theme}/html/{1}.vt.xml" />
<location
- src="{project:resources}/templates/{defaults:theme}/{1}.vt.xml" />
+ src="{project:resources}/themes/{defaults:theme}/html/{1}.vt.xml" />
<location
- src="{project:themer}/resources/templates/{project:theme}/{1}.vt.xml"
+ src="{project:themer}/resources/themes/{project:theme}/html/{1}.vt.xml"
/>
<location
- src="{project:themer}/resources/templates/{defaults:theme}/{1}.vt.xml"
+ src="{project:themer}/resources/themes/{defaults:theme}/html/{1}.vt.xml"
/>
<location
- src="{defaults:themer}/resources/templates/{project:theme}/{1}.vt.xml"
+ src="{defaults:themer}/resources/themes/{project:theme}/html/{1}.vt.xml"
/>
<location
- src="{defaults:themer}/resources/templates/{defaults:theme}/{1}.vt.xml"
+ src="{defaults:themer}/resources/themes/{defaults:theme}/html/{1}.vt.xml"
/>
</select>
</match>
@@ -110,7 +118,7 @@
</select>
</match>
<!-- Aggregate the forrest:properties requested by the *.fv. -->
- <match pattern="structurer-properties.**.*">
+ <match pattern="structurer-properties.*.**">
<select type="exists">
<location src="cocoon://prepare.structurer-properties.{1}.{2}" />
</select>
Modified: forrest/trunk/main/webapp/locationmap-themer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=327991&r1=327990&r2=327991&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Mon Oct 24 01:35:58 2005
@@ -43,19 +43,19 @@
<match pattern="resolve.contract.html.**">
<select type="exists">
<!-- project-based theme -->
- <location src="{project:resources}/templates/{project:theme}/{1}.ft" />
+ <location src="{project:resources}/themes/{project:theme}/html/{1}.ft" />
<!-- project-based default fallback -->
- <location src="{project:resources}/templates/{defaults:theme}/{1}.ft" />
+ <location src="{project:resources}/themes/{defaults:theme}/html/{1}.ft" />
<!-- project-application-based theme -->
- <location src="{project:themer}/resources/templates/{project:theme}/{1}.ft" />
+ <location src="{project:themer}/resources/themes/{project:theme}/html/{1}.ft" />
<!-- project-application-based default fallback -->
- <location src="{project:themer}/resources/templates/{defaults:theme}/{1}.ft" />
+ <location src="{project:themer}/resources/themes/{defaults:theme}/html/{1}.ft" />
<!-- forrest-application-based theme -->
- <location src="{defaults:themer}/resources/templates/{project:theme}/{1}.ft" />
+ <location src="{defaults:themer}/resources/themes/{project:theme}/html/{1}.ft" />
<!-- forrest-application-based default fallback -->
- <location src="{defaults:themer}/resources/templates/{defaults:theme}/{1}.ft" />
+ <location src="{defaults:themer}/resources/themes/{defaults:theme}/html/{1}.ft" />
<!-- forrest-application-based no found -->
- <location src="{defaults:themer}/resources/templates/noFt.ft" />
+ <location src="{defaults:themer}/resources/themes/{defaults:theme}/html/noFt.ft" />
</select>
</match>
<match pattern="contract.html.**">
@@ -112,6 +112,11 @@
<location src="cocoon://ls.contracts" />
</select>
</match>
+ <match pattern="ls.contracts.project">
+ <select type="exists">
+ <location src="cocoon://ls.contracts.project" />
+ </select>
+ </match>
<match pattern="ls.contracts-to-document.xsl">
<select type="exists">
<location src="{project:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" />
@@ -121,8 +126,27 @@
<!-- contracts (e.g. html) that can be used in the project. -->
<match pattern="themer.contracts.dir">
<select type="exists">
- <location src="{project:themer}/resources/templates" />
- <location src="{defaults:themer}/resources/templates" />
+ <location src="{project:themer}/resources/themes" />
+ <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" />
</select>
</match>
</locator>