Return-Path: 
 <svn-return-5893-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 59363 invoked from network); 19 Jul 2006 13:01:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Jul 2006 13:01:40 -0000
Received: (qmail 28090 invoked by uid 500); 19 Jul 2006 13:01:39 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 28016 invoked by uid 500); 19 Jul 2006 13:01:39 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 28005 invoked by uid 99); 19 Jul 2006 13:01:39 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2006 06:01:39 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2006 06:01:38 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 941731A981D; Wed, 19 Jul 2006 06:01:18 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r423454 -
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Date: Wed, 19 Jul 2006 13:01:18 -0000
To: svn@forrest.apache.org
From: cdupoirieux@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060719130118.941731A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cdupoirieux
Date: Wed Jul 19 06:01:17 2006
New Revision: 423454

URL: http://svn.apache.org/viewvc?rev=423454&view=rev
Log:
FOR-893 - We have encountered a strange problem with the pattern 'resolve.structurer.**'.
The {1} sometimes matches nothing, whereas {../1} is OK.
On the contrary, the {../1} sometimes matches nothing, whereas {1} is OK.
As a temporary workaround, we put {../1}{1} which covers all the cases.

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=423454&r1=423453&r2=423454&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 Wed Jul 19 06:01:17 2006
@@ -116,6 +116,14 @@
       </select>
     </match>
     <!-- 
+      FIXME - Problem with the pattern
+      ********************************
+      We have encountered a strange problem with the pattern 'resolve.structurer.**'.
+      The {1} sometimes matches nothing, whereas {../1} is OK.
+      On the contrary, the {../1} sometimes matches nothing, whereas {1} is OK.
+      As a temporary workaround, we put {../1}{1} which covers all the cases.
+      CF. FOR-893
+      
       structurer templating
       *********************
       URL specific structurer templates (project-based) e.g. index.fv
@@ -142,18 +150,18 @@
       <select type="exists">
         <!-- project-based 
           url-based (url location) -->
-        <location src="{project:resources}/structurer/url/{1}{project:theme-ext}" />
+	  <location src="{project:resources}/structurer/url/{../1}{1}{project:theme-ext}" />
         <!-- project-based 
           url-based (xdocs location)  [depreciated]-->
-        <location src="{project:content.xdocs}{1}{project:theme-ext}" />
-        <act type="sourcetype" src="{project:content.xdocs}{1}.xml">
+	  <location src="{project:content.xdocs}{../1}{1}{project:theme-ext}" />
+	<act type="sourcetype" src="{project:content.xdocs}{../1}{1}.xml">
           <!-- Sourcetype based 
           http://forrest.apache.org/docs/cap.html-->
           <location src="lm://dispatcher.structurer.resourceType.{sourcetype}" 
             />
         </act>
         <act type="resourceTypeAction">
-          <parameter value="{../1}" name="request"/>
+	  <parameter value="{../1}{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,7 +171,7 @@
           <location src="{uri}" />
         </act>
         <act type="RecursiveDirectoryTraversalAction">
-          <parameter value="{../1}" name="request"/>
+	  <parameter value="{../1}{1}" name="request"/>
           <parameter value="{project:theme}" name="projectFallback"/>
           <parameter value="{project:theme-ext}" name="projectExtension"/>
           <parameter value="{project:resources}structurer/url/" name="projectDir"/>
@@ -172,7 +180,7 @@
           <location src="{uri}" />
         </act>
         <act type="RecursiveDirectoryTraversalAction">
-          <parameter value="{../1}" name="request"/>
+	  <parameter value="{../1}{1}" name="request"/>
           <parameter value="{project:theme}" name="projectFallback"/>
           <parameter value="{project:theme-ext}" name="projectExtension"/>
           <parameter value="{project:content.xdocs}" name="projectDir"/>
@@ -396,4 +404,4 @@
       </select>
     </match>
   </locator>
-</locationmap>
\ No newline at end of file
+</locationmap>