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 12:16:25 UTC
svn commit: r328024 - in /forrest/trunk/main/webapp:
default-forrest.properties locationmap-themer.xml
Author: thorsten
Date: Mon Oct 24 03:16:19 2005
New Revision: 328024
URL: http://svn.apache.org/viewcvs?rev=328024&view=rev
Log:
updated the default properties with the new theme-dir property and used it in the themer instead the fixed location
Modified:
forrest/trunk/main/webapp/default-forrest.properties
forrest/trunk/main/webapp/locationmap-themer.xml
Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/default-forrest.properties?rev=328024&r1=328023&r2=328024&view=diff
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Mon Oct 24 03:16:19 2005
@@ -62,6 +62,8 @@
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
@@ -157,6 +159,11 @@
# proxy.host=
# proxy.port=
-# Views Configuration
-project.view.internal.plugin=org.apache.forrest.plugin.internal.structurer
-project.theme.plugin=org.apache.forrest.plugin.internal.structurer
+# 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
\ No newline at end of file
Modified: forrest/trunk/main/webapp/locationmap-themer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=328024&r1=328023&r2=328024&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Mon Oct 24 03:16:19 2005
@@ -43,9 +43,9 @@
<match pattern="resolve.contract.html.**">
<select type="exists">
<!-- project-based theme -->
- <location src="{project:resources}/themes/{project:theme}/html/{1}.ft" />
+ <location src="{project:theme-dir}/{project:theme}/html/{1}.ft" />
<!-- project-based default fallback -->
- <location src="{project:resources}/themes/{defaults:theme}/html/{1}.ft" />
+ <location src="{project:theme-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 -->