Return-Path: 
 <svn-return-8026-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 55654 invoked from network); 29 Sep 2008 23:38:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Sep 2008 23:38:24 -0000
Received: (qmail 50188 invoked by uid 500); 29 Sep 2008 23:38:23 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 50156 invoked by uid 500); 29 Sep 2008 23:38:23 -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 50137 invoked by uid 99); 29 Sep 2008 23:38:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 16:38:23 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 23:37:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E234C238889E; Mon, 29 Sep 2008 16:37:33 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r700307 -
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Date: Mon, 29 Sep 2008 23:37:33 -0000
To: svn@forrest.apache.org
From: gmcdonald@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080929233733.E234C238889E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmcdonald
Date: Mon Sep 29 16:37:33 2008
New Revision: 700307

URL: http://svn.apache.org/viewvc?rev=700307&view=rev
Log:
Alter remaining matches to use lm: , consistent styling as mentioned by Thorsten, to close issue FOR-1105

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=700307&r1=700306&r2=700307&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 Sep 29 16:37:33 2008
@@ -116,17 +116,23 @@
     <!--+
         | Configuration of general location
         +-->
+     <!--+
+         | resources home
+         +-->
+    <match pattern="resources.home">
+      <location src="{properties:resources}"/>
+    </match>
     <!--+
         |  Base location of the project themes
         +-->
     <match pattern="themer.project.dir">
-      <location src="{properties:resources}/themes" />
+      <location src="{lm:resources.home}/themes" />
     </match>
     <!--+
         |  Base location of the project structurer
         +-->
     <match pattern="structurer.project.dir">
-      <location src="{properties:resources}/structurer" />
+      <location src="{lm:resources.home}/structurer" />
     </match>
     <!--+
         | contracts (e.g. html) that can be used in the project. 
@@ -135,16 +141,22 @@
       <location src="{lm:dispatcher.themer}/themes" />
     </match>
     <!--+
+        | Base location for plugins
+        +-->
+    <match pattern="plugins.home">
+            <location src="{properties:forrest.plugins}"/>
+    </match>
+    <!--+
         | Base location of the builded dispatcher plugin
         +-->
     <match pattern="dispatcher.home">
-      <location src="{properties:forrest.plugins}/{properties:dispatcher.home}" />
+      <location src="{lm:plugins.home}/{properties:dispatcher.home}" />
     </match>
     <!--+
         | Base location of the builded themer plugin
         +-->
     <match pattern="dispatcher.themer">
-      <location src="{properties:forrest.plugins}/{properties:dispatcher.themer}" />
+      <location src="{lm:plugins.home}/{properties:dispatcher.themer}" />
     </match>
     <!--+
         | Configuration of general location
@@ -288,7 +300,7 @@
         <location 
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
         <location 
-                    src="{properties:forrest.plugins}/org.apache.forrest.themes.core/themes/common/{1}/{2}{properties:dispatcher.contract-ext}" 
+                    src="{lm:plugins.home}/org.apache.forrest.themes.core/themes/common/{1}/{2}{properties:dispatcher.contract-ext}" 
                     />
 <!--  forrest-application-based default fallback -->
         <location 
@@ -318,7 +330,7 @@
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}" 
                     />
         <location 
-                    src="{properties:forrest.plugins}/org.apache.forrest.themes.core/themes/common/images/{1}.{2}" 
+                    src="{lm:plugins.home}/org.apache.forrest.themes.core/themes/common/images/{1}.{2}" 
                     />
         <location 
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}" 
@@ -374,7 +386,7 @@
     <match pattern="dataModel-xml-document-to-**.xsl">
       <select type="exists">
         <location 
-                    src="{properties:resources}stylesheets/xslt/xml/document-to-{1}.xsl" 
+                    src="{lm:resources.home}stylesheets/xslt/xml/document-to-{1}.xsl" 
                     />
         <location 
                     src="{lm:std-dataModel-xml-document-to-{1}.xsl}" 
@@ -384,7 +396,7 @@
     <match pattern="dataModel-html-**.xsl">
       <select type="exists">
         <location 
-                    src="{properties:resources}stylesheets/xslt/html/{1}.xsl" 
+                    src="{lm:resources.home}stylesheets/xslt/html/{1}.xsl" 
                     />
         <location 
                     src="{lm:std-dataModel-html-{1}.xsl}"