forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r292903 - in /forrest/trunk/main/webapp: locationmap.xml sitemap.xmap
Date Sat, 01 Oct 2005 02:09:11 GMT
Author: rgardler
Date: Fri Sep 30 19:09:04 2005
New Revision: 292903

URL: http://svn.apache.org/viewcvs?rev=292903&view=rev
Log:
use locationmap to resolve skinconf files

Modified:
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/sitemap.xmap

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=292903&r1=292902&r2=292903&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Fri Sep 30 19:09:04 2005
@@ -40,6 +40,11 @@
       <mount src="{project:content}locationmap.xml"/>
     </select>
     
+    <!-- ================================== -->
+    <!-- transforms                         -->
+    <!-- ================================== -->
+    
+    <!-- skins                              -->
     <match pattern="transform.xdoc.html">
       <select>
         <location src="{project:skins-dir}{forrest:skin}/xslt/html/document2html.xsl"
/>
@@ -67,5 +72,37 @@
         <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/site2xhtml.xsl"/>
       </select>
     </match>
+    
+    <!-- ================================== -->
+    <!-- skinconf files                     -->
+    <!-- ================================== -->
+    
+    <match pattern="strip-doctype.xsl">
+      <location src="{forrest:stylesheets}/strip-doctype.xsl" />
+    </match>
+    
+    <match pattern="upgrade-skinconf.xsl">
+      <location src="{forrest:stylesheets}/upgrade-skinconf.xsl" />
+    </match>
+    
+    <match pattern="project-skinconf.xsl">
+        <location src="{project:skins-dir}{forrest:skin}/skinconf.xsl" />
+    </match>
+    
+    <match pattern="forrest-skinconf.xsl">
+        <location src="{forrest:context}/skins/{forrest:skin}/skinconf.xsl" />
+    </match>
+    
+    <match pattern="common-skinconf.xsl">
+        <location src="{forrest:context}/skins/common/skinconf.xsl" />
+    </match>
+    
+    <!-- ================================== -->
+    <!-- project files                      -->
+    <!-- ================================== -->
+    <match pattern="skinconf.project">
+      <location src="{project:skinconf}" />
+    </match>
+    
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=292903&r1=292902&r2=292903&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Fri Sep 30 19:09:04 2005
@@ -294,7 +294,6 @@
     </map:pipeline>
 
   <map:pipeline type="caching" internal-only="true">
- 
       <!--
         FIXME: there is a bug in the Cocoon 2.2 resolving that can make cocoon:/ 
                calls call the base sitemap; remove the following when it's fixed.
@@ -330,7 +329,7 @@
       <map:pipeline internal-only="false">
            <map:select type="exists">
              <map:when test="{project:sitemap}">
-               <map:mount uri-prefix="" 
+               <map:mount uri-prefix=""
                           src="{project:sitemap}" 
                           check-reload="yes" 
                           pass-through="true"/>
@@ -356,20 +355,18 @@
           Delivers skin configuration information in a usable form            
          -->  
          <map:match pattern="skinconf.xml">
-           <map:generate src="{project:skinconf}" />
-           <map:transform src="{forrest:stylesheets}/strip-doctype.xsl"/>
-           <map:transform src="{forrest:stylesheets}/upgrade-skinconf.xsl"/>
+           <map:generate src="{lm:skinconf.project}" />
+           <map:transform src="{lm:strip-doctype.xsl}"/>
+           <map:transform src="{lm:upgrade-skinconf.xsl}"/>
            <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>



Mime
View raw message