Return-Path: 
 <svn-return-3793-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 37228 invoked from network); 2 Oct 2005 18:45:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Oct 2005 18:45:30 -0000
Received: (qmail 61700 invoked by uid 500); 2 Oct 2005 18:45:30 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 61618 invoked by uid 500); 2 Oct 2005 18:45:29 -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 61607 invoked by uid 99); 2 Oct 2005 18:45:29 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2005 11:45:29 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 02 Oct 2005 11:45:34 -0700
Received: (qmail 36859 invoked by uid 65534); 2 Oct 2005 18:45:08 -0000
Message-ID: <20051002184508.36858.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r293145 - in /forrest/trunk/main/webapp: ./
 resources/stylesheets/
Date: Sun, 02 Oct 2005 18:45:08 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Sun Oct  2 11:44:49 2005
New Revision: 293145

URL: http://svn.apache.org/viewcvs?rev=293145&view=rev
Log:
Use locationmap in faw.xmap

Added:
    forrest/trunk/main/webapp/resources/stylesheets/faqv102faqv11.xsl
      - copied unchanged from r293085, forrest/trunk/main/webapp/resources/stylesheets/faqv10tofaqv11.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv202faqv12.xsl
      - copied unchanged from r293085, forrest/trunk/main/webapp/resources/stylesheets/faqv20tofaqv12.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv202faqv13.xsl
      - copied unchanged from r293085, forrest/trunk/main/webapp/resources/stylesheets/faqv20tofaqv13.xsl
Removed:
    forrest/trunk/main/webapp/resources/stylesheets/faqv10tofaqv11.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv20tofaqv12.xsl
    forrest/trunk/main/webapp/resources/stylesheets/faqv20tofaqv13.xsl
Modified:
    forrest/trunk/main/webapp/faq.xmap
    forrest/trunk/main/webapp/locationmap.xml

Modified: forrest/trunk/main/webapp/faq.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/faq.xmap?rev=293145&r1=293144&r2=293145&view=diff
==============================================================================
--- forrest/trunk/main/webapp/faq.xmap (original)
+++ forrest/trunk/main/webapp/faq.xmap Sun Oct  2 11:44:49 2005
@@ -71,25 +71,25 @@
         <map:select type="parameter">
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
           <map:when test="faq-v10">
-            <map:transform src="{forrest:stylesheets}/faqv10tofaqv11.xsl" />
-            <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
+            <map:transform src="{lm:transform.faqv10.faqv11}" />
+            <map:transform src="{lm:transform.faq.document}" />
           </map:when>
           <map:when test="faq-v11">
-            <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
+            <map:transform src="{lm:transform.faq.document}" />
           </map:when>
           <map:when test="faq-v12">
-            <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
+            <map:transform src="{lm:transform.faq.document}" />
           </map:when>
           <map:when test="faq-v13">
-            <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
+            <map:transform src="{lm:transform.faq.document}" />
           </map:when>
           <map:when test="faq-v20a">
-            <map:transform src="{forrest:stylesheets}/faqv20tofaqv12.xsl" />
-            <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
+            <map:transform src="{lm:transform.faqv20.faqv12}" />
+            <map:transform src="{lm:transform.faq.document}" />
           </map:when>
           <map:when test="faq-v20">
-            <map:transform src="{forrest:stylesheets}/faqv20tofaqv13.xsl" />
-            <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
+            <map:transform src="{lm:transform.faqv20.faqv13}" />
+            <map:transform src="{lm:transform.faq.document}" />
           </map:when>
           <map:otherwise />
         </map:select>
@@ -104,7 +104,7 @@
         <map:parameter name="isfaq" value="{notoc}"/>
         <map:parameter name="nopdf" value="{nopdf}"/>
         <map:parameter name="path" value="{path}"/>
-        <map:parameter name="config-file" value="{project:skinconf}"/>
+        <map:parameter name="config-file" value="{lm:project.skinconf}"/>
       </map:transform>
       <map:serialize/>
     </map:resource>
@@ -115,19 +115,19 @@
   <map:pipelines>
       <map:pipeline internal-only="false">
          <map:match pattern="skinconf.xml">
-           <map:generate src="{project:skinconf}" />
-           <map:transform src="{forrest:stylesheets}/upgrade-skinconf.xsl"/>
+           <map:generate src="{lm:project.skinconf}" />
+           <map:transform src="{lm:transform.old-skinconf.new-skinconf}"/>
            <map:select type="exists">
-             <map:when test="{project:skins-dir}{forrest:skin}/skinconf.xsl">
-               <map:transform src="{project:skins-dir}{forrest:skin}/skinconf.xsl"/>
+             <map:when test="{lm:project-skinconf.xsl}">
+               <map:transform src="{lm:project-skinconf.xsl}"/>
              </map:when>
            </map:select>
            <map:select type="exists">
-             <map:when test="{forrest:context}/skins/{forrest:skin}/skinconf.xsl">
-               <map:transform src="{forrest:context}/skins/{forrest:skin}/skinconf.xsl"/>
+             <map:when test="{lm:forrest-skinconf.xsl}">
+               <map:transform src="{lm:forrest-skinconf.xsl}"/>
              </map:when>
            </map:select>
-           <map:transform src="{forrest:context}/skins/common/skinconf.xsl"/>
+           <map:transform src="{lm:common-skinconf.xsl}"/>
            <map:transform type="skinconf"/>
            <map:serialize type="xml" />
          </map:match>
@@ -147,30 +147,12 @@
         </map:aggregate>
         <map:transform type="xinclude"/>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.pdf"/>
-        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
-        <map:select type="exists">
-          <map:when test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
-            <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
-               <map:parameter name="numbersections" value="false"/>
-              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
-            </map:transform>
-          </map:when>
-          <map:when test="{forrest:context}/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
-            <map:transform src="{forrest:context}/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
-              <map:parameter name="numbersections" value="false"/>
-              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
-            </map:transform>
-          </map:when>
-          <map:otherwise>
-            <map:transform src="{forrest:context}/skins/common/xslt/fo/document2fo.xsl">
-              <map:parameter name="numbersections" value="false"/>
-              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
-            </map:transform>
-          </map:otherwise>
-        </map:select>
+        <map:transform src="{lm:transform.html.broken-links}" />
+        <map:transform src="{lm:transform.document.fo}">
+           <map:parameter name="numbersections" value="false"/>
+          <map:parameter name="imagesdir" value="{project:resources.images}/"/>
+          <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+        </map:transform>
         <map:serialize type="xml"/>
       </map:match>
 
@@ -184,7 +166,7 @@
         <map:generate src="cocoon:/{1}{2}.xml"/>
         <map:transform type="xinclude"/>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <map:transform src="resources/stylesheets/declare-broken-site-links.xsl" />
+        <map:transform src="{lm:transform.html.broken-links}" />
         <map:call resource="skinit">
           <map:parameter name="type" value="transform.xdoc.html"/>
           <map:parameter name="path" value="/{1}{2}.html"/>
@@ -198,9 +180,9 @@
       <!-- ============================================================ -->
 
       <map:match pattern="**.xml">
-        <map:generate type="file" src="{project:content.xdocs}{0}" />
+        <map:generate type="file" src="{lm:project.{0}}" />
         <map:call resource="transform-to-document">
-          <map:parameter name="src" value="{project:content.xdocs}{0}" />
+          <map:parameter name="src" value="{lm:project.{0}}" />
         </map:call>
         <map:serialize type="xml"/>
       </map:match>

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=293145&r1=293144&r2=293145&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Sun Oct  2 11:44:49 2005
@@ -112,6 +112,9 @@
     <!-- ================================== -->
     <!-- skinconf files                     -->
     <!-- ================================== -->
+    <match pattern="project.skinconf">
+        <location src="{project:skinconf}" />
+    </match>
     
     <match pattern="transform.old-skinconf.new-skinconf">
       <location src="{forrest:stylesheets}/upgrade-skinconf.xsl" />
@@ -183,8 +186,8 @@
       <location src="{project:temp-dir}/build-info.xml" />
     </match>
     
-    <match pattern="project.**.*">
-      <location src="{project:content.xdocs}{1}.{2}" />
+    <match pattern="project.**">
+      <location src="{project:content.xdocs}{1}" />
     </match>
     
   </locator>