Author: cdupoirieux
Date: Mon Apr 2 01:50:52 2007
New Revision: 524748
URL: http://svn.apache.org/viewvc?view=rev&rev=524748
Log:
FOR-975 - Adapt the plugins panels management...
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/panels/
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/panels/solrbar.panel.xml
- copied unchanged from r524743,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.vt.xml
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.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/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=524748&r1=524747&r2=524748
==============================================================================
---
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
Mon Apr 2 01:50:52 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="resolvePluginPanels.**">
<select type="exists">
- <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"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.theme}/panels/{1}.panel.xml"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.doap/resources/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml"
/>
</select>
</match>
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=524748&r1=524747&r2=524748
==============================================================================
---
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
Mon Apr 2 01:50:52 2007
@@ -256,7 +256,7 @@
src="{properties:resources}/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml"
/>
<!-- plugin provided panels -->
- <location src="{lm:resolvePluginTiles.{1}}" />
+ <location src="{lm:resolvePluginPanels.{1}}" />
<location
src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/panels/{1}.panel.xml"
/>
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=524748&r1=524747&r2=524748
==============================================================================
---
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
Mon Apr 2 01:50:52 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="resolvePluginPanels.**">
<select type="exists">
- <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"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.theme}/panels/{1}.panel.xml"
/>
+ <location
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml"
/>
</select>
</match>
</locator>
