forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r422649 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Date Mon, 17 Jul 2006 07:50:13 GMT
Author: thorsten
Date: Mon Jul 17 00:50:09 2006
New Revision: 422649

URL: http://svn.apache.org/viewvc?rev=422649&view=rev
Log:
FOR-893
wildcard matcher such as **.xml when used in lm actions like {1} are not rewritten

Thanks to David that suggested to use {../1} instead. The problem occur in the lm when you
have 
<select>
 <act>
  <param value="{1}" name="something"/>
...

The param needs to look into the parent (act) for {1}. So changing to {../1} returns the correct
value.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml

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?rev=422649&r1=422648&r2=422649&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
Mon Jul 17 00:50:09 2006
@@ -153,7 +153,7 @@
             />
         </act>
         <act type="resourceTypeAction">
-          <parameter value="{1}" name="request"/>
+          <parameter value="{../1}" name="request"/>
           <parameter value="{project:content.xdocs}" name="projectDir"/>
           <parameter value="lm://dispatcher.structurer.resourceType." name="resourceTypeBase"/>
           <parameter value=".xml.meta" name="metaExtension"/>
@@ -163,16 +163,16 @@
           <location src="{uri}" />
         </act>
         <act type="RecursiveDirectoryTraversalAction">
-          <parameter value="{1}" name="request"/>
+          <parameter value="{../1}" name="request"/>
           <parameter value="{project:theme}" name="projectFallback"/>
           <parameter value="{project:theme-ext}" name="projectExtension"/>
-          <parameter value="{project:resources}/structurer/url" name="projectDir"/>
+          <parameter value="{project:resources}structurer/url/" name="projectDir"/>
           <!--  url
             project-based theme-based = directory-based / parent-directory based (recursively)
-->
           <location src="{uri}" />
         </act>
         <act type="RecursiveDirectoryTraversalAction">
-          <parameter value="{1}" name="request"/>
+          <parameter value="{../1}" name="request"/>
           <parameter value="{project:theme}" name="projectFallback"/>
           <parameter value="{project:theme-ext}" name="projectExtension"/>
           <parameter value="{project:content.xdocs}" name="projectDir"/>



Mime
View raw message