Author: thorsten
Date: Sun Jan 29 14:26:31 2006
New Revision: 373373
URL: http://svn.apache.org/viewcvs?rev=373373&view=rev
Log:
FOR-801 - flatten dir structur for themes and finished this issue.
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/
- copied from r373364,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv
- copied unchanged from r373372,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/coat.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/
- copied from r373372,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/common/
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv
- copied unchanged from r373372,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/common.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/
- copied from r373372,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/pelt/
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
- copied unchanged from r373372,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/pelt.fv
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/resources/
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.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=373373&r1=373372&r2=373373&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
Sun Jan 29 14:26:31 2006
@@ -63,22 +63,22 @@
src="{lm:themer.project.dir}/{project:theme}{project:theme-ext}" />
<!-- themer: project-application-based theme-based -->
<location
-
src="{project:themer}/resources/themes/{project:theme}{project:theme-ext}"
+ src="{project:themer}/themes/{project:theme}{project: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}/resources/themes/{defaults:theme}{defaults:theme-ext}"
+ src="{project:themer}/themes/{defaults:theme}{defaults:theme-ext}"
/>
<!-- themer: forrest-application-based theme-based -->
<location
-
src="{defaults:themer}/resources/themes/{project:theme}{project:theme-ext}"
+ src="{defaults:themer}/themes/{project:theme}{project:theme-ext}"
/>
<!-- themer: forrest-application-based default -->
<location
-
src="{defaults:themer}/resources/themes/{defaults:theme}{defaults:theme-ext}"
+ src="{defaults:themer}/themes/{defaults:theme}{defaults:theme-ext}"
/>
</select>
</match>
@@ -90,16 +90,16 @@
<location
src="{project:resources}/themes/{defaults:theme}/html/{1}.vt.xml" />
<location
-
src="{project:themer}/resources/themes/{project:theme}/html/{1}.vt.xml"
+ src="{project:themer}/themes/{project:theme}/html/{1}.vt.xml"
/>
<location
-
src="{project:themer}/resources/themes/{defaults:theme}/html/{1}.vt.xml"
+ src="{project:themer}/themes/{defaults:theme}/html/{1}.vt.xml"
/>
<location
-
src="{defaults:themer}/resources/themes/{project:theme}/html/{1}.vt.xml"
+ src="{defaults:themer}/themes/{project:theme}/html/{1}.vt.xml"
/>
<location
-
src="{defaults:themer}/resources/themes/{defaults:theme}/html/{1}.vt.xml"
+ src="{defaults:themer}/themes/{defaults:theme}/html/{1}.vt.xml"
/>
</select>
</match>
@@ -124,22 +124,22 @@
<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" />
+ src="{project:themer}/themes/{project:theme}/{1}/{2}.ft" />
<!-- project-application-based default fallback -->
<location
- src="{project:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft"
/>
+ src="{project:themer}/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"
/>
+ src="{defaults:themer}/themes/{project:theme}/{1}/{2}.ft" />
<!-- forrest-application-based default fallback -->
<location
- src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft"
+ src="{defaults:themer}/themes/{defaults:theme}/{1}/{2}.ft"
/>
<!-- forrest-application-based no found -->
<location
-
src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/noFt.ft"
+ src="{defaults:themer}/themes/{defaults:theme}/{1}/noFt.ft"
/>
</select>
</match>
@@ -214,8 +214,8 @@
<!-- 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" />
+ <location src="{project:themer}/themes" />
+ <location src="{defaults:themer}/themes" />
</select>
</match>
<!-- generic match for theme image resources -->
@@ -230,16 +230,16 @@
<location
src="{lm:themer.project.dir}/{defaults:theme}/images/{1}.{2}"
/>
<location
-
src="{project:themer}/resources/themes/{project:theme}/images/{1}.{2}"
+ src="{project:themer}/themes/{project:theme}/images/{1}.{2}"
/>
<location
-
src="{project:themer}/resources/themes/{defaults:theme}/images/{1}.{2}"
+ src="{project:themer}/themes/{defaults:theme}/images/{1}.{2}"
/>
<location
-
src="{defaults:themer}/resources/themes/{project:theme}/images/{1}.{2}"
+ src="{defaults:themer}/themes/{project:theme}/images/{1}.{2}"
/>
<location
-
src="{defaults:themer}/resources/themes/{defaults:theme}/images/{1}.{2}"
+ src="{defaults:themer}/themes/{defaults:theme}/images/{1}.{2}"
/>
</select>
</match>
@@ -253,15 +253,15 @@
<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}"
/>
+ src="{project:themer}/themes/{project:theme}/{2}/{1}.{2}" />
<location
- src="{project:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}"
+ src="{project:themer}/themes/{defaults:theme}/{2}/{1}.{2}"
/>
<location
- src="{defaults:themer}/resources/themes/{project:theme}/{2}/{1}.{2}"
+ src="{defaults:themer}/themes/{project:theme}/{2}/{1}.{2}"
/>
<location
-
src="{defaults:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}"
+ src="{defaults:themer}/themes/{defaults:theme}/{2}/{1}.{2}"
/>
</select>
</match>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml?rev=373373&r1=373372&r2=373373&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml
Sun Jan 29 14:26:31 2006
@@ -36,19 +36,16 @@
<changes>
<!-- Add new releases here -->
<release version="0.1" date="unreleased">
- <action dev="TS" type="add" context="admin">
- initial plugin code extracted from the old views plugin and leather
plugin.
- </action>
- <action dev="TS" type="add" context="docs">
- added initial index description of the plugin.
- </action>
+ <action dev="TS" type="add" context="admin"> Initial version of forrest
+ core theme plugin. The contracts and structurer are coming from all
+ former view/dispatcher plugins. </action>
</release>
</changes>
<todo>
<actions priority="high">
<action context="docs" dev="open">
- create some more example, that it is easier to adapt the concept.
+ Create initial index for the core themes.
</action>
</actions>
</todo>
