forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Cyriaque Dupoirieux <Cyriaque.Dupoiri...@pcotech.fr>
Subject Re: svn commit: r520650 - in /forrest/trunk/whiteboard/plugins: org.apache.forrest.plugin.input.doap/ org.apache.forrest.plugin.internal.dispatcher/ org.apache.forrest.plugin.output.solr/ org.apache.forrest.themes.core/themes/common/fo/ org.apache.forrest....
Date Wed, 21 Mar 2007 09:01:52 GMT
le 21/03/2007 00:17 rgardler@apache.org a écrit :
> 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.
>   
[...SNIP...]

> 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>
>   
Ok, that's nice,
Don't you think a pattern like :

<match pattern="resolve.*.tiles.*">
	<location src="{properties:resources}/themes/{properties:dispatcher.theme}/{1}/{2}.vt.xml"/>

...
Would be clearer ?

Or at least a pattern like the following to avoid to have the format in 
the tiles filename :

<match pattern="resolve.tiles.**-*">
  <select type="exists">
    <location src="{properties:resources}/themes/{properties:dispatcher.theme}/{2}/{1}.vt.xml"



WDOT ?


Salutations,
Cyriaque

> 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>
>
>
>
>   

Mime
View raw message