Author: rgardler
Date: Tue Mar 20 16:17:47 2007
New Revision: 520650
URL: http://svn.apache.org/viewvc?view=rev&rev=520650
Log:
Enable *.vt.xml files to be located in the correct directory within themes.
./build.sh test passes, but I'd appreciate some more eyes on this I'm not
totally up to speed with dispatcher.
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/common-fo.vt.xml
- copied unchanged from r520441,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/common-fo.vt.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt-css.vt.xml
- copied unchanged from r520441,
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-css.vt.xml
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/common-fo.vt.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-css.vt.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/locationmap.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/locationmap.xml?view=diff&rev=520650&r1=520649&r2=520650
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/locationmap.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/locationmap.xml
Tue Mar 20 16:17:47 2007
@@ -50,10 +50,10 @@
<location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.{1}"
/>
</select>
</match>
- <match pattern="resolvePluginTiles.**">
+ <match pattern="resolvePluginTiles..**-*">
<select type="exists">
- <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.theme}/html/{1}.vt.xml"
/>
- <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.fallback.theme}/html/{1}.vt.xml"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.theme}/{2}/{1}-{2}.vt.xml"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.fallback.theme}/{2}/{1}-{2}.vt.xml"
/>
</select>
</match>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?view=diff&rev=520650&r1=520649&r2=520650
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
Tue Mar 20 16:17:47 2007
@@ -133,8 +133,8 @@
<jx:import uri="cocoon://prepare.tiles.export-link"/>
-->
<map:pipeline>
- <map:match pattern="prepare.tiles.**">
- <map:generate src="{lm:resolve.tiles.{1}}" />
+ <map:match pattern="prepare.tiles.**-*">
+ <map:generate src="{lm:resolve.tiles.{1}-{2}}" />
<map:transform type="linkrewriter" />
<map:transform src="{lm:root-strip.xsl}" />
<map:serialize />
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?view=diff&rev=520650&r1=520649&r2=520650
==============================================================================
---
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
Tue Mar 20 16:17:47 2007
@@ -247,21 +247,21 @@
</select>
</match>
<!-- Structurer tiles - You can group elements to a template and call
it from any view. -->
- <match pattern="resolve.tiles.**">
+ <match pattern="resolve.tiles.**-*">
<select type="exists">
<location
-
src="{properties:resources}/themes/{properties:dispatcher.theme}/html/{1}.vt.xml"
+
src="{properties:resources}/themes/{properties:dispatcher.theme}/{2}/{1}-{2}.vt.xml"
/>
<location
-
src="{properties:resources}/themes/{properties:dispatcher.fallback.theme}/html/{1}.vt.xml"
+
src="{properties:resources}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}-{2}.vt.xml"
/>
<!-- plugin provided tiles -->
- <location src="{lm:resolvePluginTiles.{1}}" />
+ <location src="{lm:resolvePluginTiles.{1}-{2}}" />
<location
-
src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/html/{1}.vt.xml"
+
src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{2}/{1}-{2}.vt.xml"
/>
<location
-
src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/html/{1}.vt.xml"
+
src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}-{2}.vt.xml"
/>
</select>
</match>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml?view=diff&rev=520650&r1=520649&r2=520650
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/locationmap.xml
Tue Mar 20 16:17:47 2007
@@ -42,10 +42,10 @@
<location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.{1}"
/>
</select>
</match>
- <match pattern="resolvePluginTiles.**">
+ <match pattern="resolvePluginTiles.**-*">
<select type="exists">
- <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.theme}/html/{1}.vt.xml"
/>
- <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/html/{1}.vt.xml"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.theme}/{2}/{1}-{2}.vt.xml"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/{2}/{1-{2}}.vt.xml"
/>
</select>
</match>
</locator>
