You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/10/03 20:20:44 UTC

svn commit: r293417 - /forrest/trunk/main/webapp/

Author: rgardler
Date: Mon Oct  3 11:20:26 2005
New Revision: 293417

URL: http://svn.apache.org/viewcvs?rev=293417&view=rev
Log:
Split locationmap into multiple files for easy maintenance (part of FOR-200)

Added:
    forrest/trunk/main/webapp/locationmap-chaperon.xml   (with props)
    forrest/trunk/main/webapp/locationmap-i18n.xml   (with props)
    forrest/trunk/main/webapp/locationmap-i18n.xml~
    forrest/trunk/main/webapp/locationmap-plugin.xml   (with props)
    forrest/trunk/main/webapp/locationmap-plugin.xml~
    forrest/trunk/main/webapp/locationmap-skinconf.xml   (with props)
    forrest/trunk/main/webapp/locationmap-skinconf.xml~
    forrest/trunk/main/webapp/locationmap-transforms.xml   (with props)
    forrest/trunk/main/webapp/locationmap-transforms.xml~
Modified:
    forrest/trunk/main/webapp/locationmap.xml

Added: forrest/trunk/main/webapp/locationmap-chaperon.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-chaperon.xml?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-chaperon.xml (added)
+++ forrest/trunk/main/webapp/locationmap-chaperon.xml Mon Oct  3 11:20:26 2005
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for Chaperon -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+  
+    <match pattern="chaperon.grammar.*">
+        <location src="{forrest:context}/resources/chaperon/grammars/{1}.grm" />
+    </match>
+    
+    <match pattern="chaperon.xgrammar.*">
+        <location src="{forrest:context}/resources/chaperon/grammars/{1}.xgrm" />
+    </match>
+    
+    <match pattern="chaperon.lexicon.*">
+        <location src="resources/chaperon/grammars/{1}.xlex"/>
+        <location src="{forrest:context}/resources/chaperon/grammars/{1}.xlex" />
+    </match>
+    
+    <match pattern="transform.chaperon.grammar.lexicon">
+        <location src="{forrest:context}/resources/chaperon/stylesheets/grm2xlex.xsl" />
+    </match>
+    
+    <match pattern="transform.chaperon.*">
+        <location src="{forrest:context}/resources/chaperon/stylesheets/{1}.xsl" />
+    </match>
+    
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/webapp/locationmap-chaperon.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/main/webapp/locationmap-i18n.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-i18n.xml?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-i18n.xml (added)
+++ forrest/trunk/main/webapp/locationmap-i18n.xml Mon Oct  3 11:20:26 2005
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for i18n files ->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+  
+    <match pattern="project.translations">
+        <location src="{project:translations}" />
+    </match>
+    
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/webapp/locationmap-i18n.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/main/webapp/locationmap-i18n.xml~
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-i18n.xml%7E?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-i18n.xml~ (added)
+++ forrest/trunk/main/webapp/locationmap-i18n.xml~ Mon Oct  3 11:20:26 2005
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for transformations -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+  
+    <match pattern="project.translations">
+        <location src="{project:translations}" />
+    </match>
+    
+  </locator>
+</locationmap>

Added: forrest/trunk/main/webapp/locationmap-plugin.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-plugin.xml?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-plugin.xml (added)
+++ forrest/trunk/main/webapp/locationmap-plugin.xml Mon Oct  3 11:20:26 2005
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for plugin files -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+    
+    <match pattern="plugin.descriptor.whiteboard">
+        <location src="{forrest:whiteboard-plugins-src}/whiteboard-plugins.xml" />
+    </match>
+    
+    <match pattern="plugin.descriptor.forrest">
+        <location src="{forrest:plugins-src}/plugins.xml" />
+    </match>
+    
+    <match pattern="plugin.xmap.*">
+        <location src="{project:temp-dir}/{1}.xmap" />
+    </match>
+    
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/webapp/locationmap-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/main/webapp/locationmap-plugin.xml~
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-plugin.xml%7E?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-plugin.xml~ (added)
+++ forrest/trunk/main/webapp/locationmap-plugin.xml~ Mon Oct  3 11:20:26 2005
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for transformations -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+    
+    <match pattern="plugin.descriptor.whiteboard">
+        <location src="{forrest:whiteboard-plugins-src}/whiteboard-plugins.xml" />
+    </match>
+    
+    <match pattern="plugin.descriptor.forrest">
+        <location src="{forrest:plugins-src}/plugins.xml" />
+    </match>
+    
+    <match pattern="plugin.xmap.*">
+        <location src="{project:temp-dir}/{1}.xmap" />
+    </match>
+    
+  </locator>
+</locationmap>

Added: forrest/trunk/main/webapp/locationmap-skinconf.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-skinconf.xml?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skinconf.xml (added)
+++ forrest/trunk/main/webapp/locationmap-skinconf.xml Mon Oct  3 11:20:26 2005
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for skinconf files -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+    
+    <!-- FIXME: skinconf.project is a duplicate of project.skinconf -->
+    <match pattern="skinconf.project">
+      <location src="{project:skinconf}" />
+    </match>
+  
+    <match pattern="project.skinconf">
+        <location src="{project:skinconf}" />
+    </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>
+    
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/webapp/locationmap-skinconf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/main/webapp/locationmap-skinconf.xml~
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-skinconf.xml%7E?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skinconf.xml~ (added)
+++ forrest/trunk/main/webapp/locationmap-skinconf.xml~ Mon Oct  3 11:20:26 2005
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for skinconf files -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+  
+    <match pattern="project.skinconf">
+        <location src="{project:skinconf}" />
+    </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>
+    
+  </locator>
+</locationmap>

Added: forrest/trunk/main/webapp/locationmap-transforms.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-transforms.xml?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-transforms.xml (added)
+++ forrest/trunk/main/webapp/locationmap-transforms.xml Mon Oct  3 11:20:26 2005
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for transformations -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+    
+    <match pattern="transform.*.fo">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/fo/{1}2fo.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/fo/{1}2fo.xsl"/>
+        <location src="{forrest:context}/skins/common/xslt/fo/{1}2fo.xsl"/>
+      </select>
+    </match>
+    
+    <!-- skins                              -->
+    <match pattern="transform.xdoc.html">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/html/document2html.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/document2html.xsl"/>
+      </select>
+    </match>
+    
+    <!-- ================================== -->
+    <!-- utility transforms                 -->
+    <!-- ================================== -->
+    <match pattern="transform.xml.xml-doctype-stripped">
+      <location src="{forrest:stylesheets}/strip-doctype.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-absolutized">
+      <location src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-normalizedtabs">
+      <location src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
+    </match>
+    
+    <match pattern="transform.xml.xml-normalizedhrefs">
+      <location src="{forrest:stylesheets}/normalizehrefs.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-selectnode">
+      <location src="{forrest:stylesheets}/site2site-selectnode.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-relativized">
+      <location src="{forrest:stylesheets}/relativize-linkmap.xsl" />
+    </match>
+    
+    <!--
+      FIXME: strip remaining i18n elements and attributes.
+      workaround for http://issues.apache.org/jira/browse/FOR-592
+    -->
+    <match pattern="transform.xml.xml-i18n-stripped">
+      <location src="{forrest:stylesheets}/strip-i18n-remains.xsl" />
+    </match>
+    
+    <!--
+      FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
+    -->
+    <match pattern="transform.xml.xml-namespace-stripped">
+      <location src="{forrest:context}/skins/common/xslt/html/strip_namespaces.xsl" />
+    </match>
+    
+    <match pattern="transform.html.broken-links">
+      <location src="resources/stylesheets/declare-broken-site-links.xsl" />
+    </match>
+    
+    <!-- ================================== -->
+    <!-- aggregate transforms                 -->
+    <!-- ================================== -->
+    <match pattern="transform-aggregate.*.*">
+      <location src="{forrest:stylesheets}/aggregates/{1}2{2}.xsl" />
+    </match>
+    
+    <match pattern="transform-aggregate.linkmap.relativized-linkmap">
+      <location src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl" />
+    </match>
+    
+    <match pattern="transform.old-skinconf.new-skinconf">
+      <location src="{forrest:stylesheets}/upgrade-skinconf.xsl" />
+    </match>
+    
+    <!-- All core other transforms -->
+    <match pattern="transform.*.*">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/html/{1}2{2}.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/{1}2{2}.xsl"/>
+        <location src="{forrest:stylesheets}/{1}2{2}.xsl"/>
+      </select>
+    </match>
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/webapp/locationmap-transforms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/main/webapp/locationmap-transforms.xml~
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-transforms.xml%7E?rev=293417&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-transforms.xml~ (added)
+++ forrest/trunk/main/webapp/locationmap-transforms.xml~ Mon Oct  3 11:20:26 2005
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Default Forrest locationmap for transformations -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+    
+    <match pattern="transform.*.fo">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/fo/{1}2fo.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/fo/{1}2fo.xsl"/>
+        <location src="{forrest:context}/skins/common/xslt/fo/{1}2fo.xsl"/>
+      </select>
+    </match>
+    
+    <!-- skins                              -->
+    <match pattern="transform.xdoc.html">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/html/document2html.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/document2html.xsl"/>
+      </select>
+    </match>
+    
+    <!-- ================================== -->
+    <!-- utility transforms                 -->
+    <!-- ================================== -->
+    <match pattern="transform.xml.xml-doctype-stripped">
+      <location src="{forrest:stylesheets}/strip-doctype.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-absolutized">
+      <location src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-normalizedtabs">
+      <location src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
+    </match>
+    
+    <match pattern="transform.xml.xml-normalizedhrefs">
+      <location src="{forrest:stylesheets}/normalizehrefs.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-selectnode">
+      <location src="{forrest:stylesheets}/site2site-selectnode.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-relativized">
+      <location src="{forrest:stylesheets}/relativize-linkmap.xsl" />
+    </match>
+    
+    <!--
+      FIXME: strip remaining i18n elements and attributes.
+      workaround for http://issues.apache.org/jira/browse/FOR-592
+    -->
+    <match pattern="transform.xml.xml-i18n-stripped">
+      <location src="{forrest:stylesheets}/strip-i18n-remains.xsl" />
+    </match>
+    
+    <!--
+      FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
+    -->
+    <match pattern="transform.xml.xml-namespace-stripped">
+      <location src="{forrest:context}/skins/common/xslt/html/strip_namespaces.xsl" />
+    </match>
+    
+    <match pattern="transform.html.broken-links">
+      <location src="resources/stylesheets/declare-broken-site-links.xsl" />
+    </match>
+    
+    <!-- ================================== -->
+    <!-- aggregate transforms                 -->
+    <!-- ================================== -->
+    <match pattern="transform-aggregate.*.*">
+      <location src="{forrest:stylesheets}/aggregates/{1}2{2}.xsl" />
+    </match>
+    
+    <match pattern="transform-aggregate.linkmap.relativized-linkmap">
+      <location src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl" />
+    </match>
+    
+    <match pattern="transform.old-skinconf.new-skinconf">
+      <location src="{forrest:stylesheets}/upgrade-skinconf.xsl" />
+    </match>
+    
+    <!-- All core other transforms -->
+    <match pattern="transform.*.*">
+      <select>
+        <location src="{project:skins-dir}{forrest:skin}/xslt/html/{1}2{2}.xsl" />
+        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/{1}2{2}.xsl"/>
+        <location src="{forrest:stylesheets}/{1}2{2}.xsl"/>
+      </select>
+    </match>
+  </locator>
+</locationmap>

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=293417&r1=293416&r2=293417&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Mon Oct  3 11:20:26 2005
@@ -41,171 +41,34 @@
     </select>
     
     <!-- ================================== -->
-    <!-- transforms                         -->
+    <!-- Mount forrest locationmaps         -->
     <!-- ================================== -->
+    <select>
+      <mount src="{forrest:context}/locationmap-transforms.xml"/>
+    </select>
+    
+    <select>
+      <mount src="{forrest:context}/locationmap-i18n.xml"/>
+    </select>
+    
+    <select>
+      <mount src="{forrest:context}/locationmap-skinconf.xml"/>
+    </select>
+    
+    <select>
+      <mount src="{forrest:context}/locationmap-plugin.xml"/>
+    </select>
+    
+    <select>
+      <mount src="{forrest:context}/locationmap-chaperon.xml"/>
+    </select>
     
     
-    <!-- FO -->
-    <match pattern="transform.*.fo">
-      <select>
-        <location src="{project:skins-dir}{forrest:skin}/xslt/fo/{1}2fo.xsl" />
-        <location src="{forrest:context}/skins/{forrest:skin}/xslt/fo/{1}2fo.xsl"/>
-        <location src="{forrest:context}/skins/common/xslt/fo/{1}2fo.xsl"/>
-      </select>
-    </match>
-    
-    <!-- skins                              -->
-    <match pattern="transform.xdoc.html">
-      <select>
-        <location src="{project:skins-dir}{forrest:skin}/xslt/html/document2html.xsl" />
-        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/document2html.xsl"/>
-      </select>
-    </match>
-    
-    <!-- ================================== -->
-    <!-- utility transforms                 -->
-    <!-- ================================== -->
-    <match pattern="transform.xml.xml-doctype-stripped">
-      <location src="{forrest:stylesheets}/strip-doctype.xsl" />
-    </match>
-    
-    <match pattern="transform.linkmap.linkmap-absolutized">
-      <location src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
-    </match>
-    
-    <match pattern="transform.linkmap.linkmap-normalizedtabs">
-      <location src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
-    </match>
-    
-    <match pattern="transform.xml.xml-normalizedhrefs">
-      <location src="{forrest:stylesheets}/normalizehrefs.xsl" />
-    </match>
-    
-    <match pattern="transform.linkmap.linkmap-selectnode">
-      <location src="{forrest:stylesheets}/site2site-selectnode.xsl" />
-    </match>
-    
-    <match pattern="transform.linkmap.linkmap-relativized">
-      <location src="{forrest:stylesheets}/relativize-linkmap.xsl" />
-    </match>
-    
-    <!--
-      FIXME: strip remaining i18n elements and attributes.
-      workaround for http://issues.apache.org/jira/browse/FOR-592
-    -->
-    <match pattern="transform.xml.xml-i18n-stripped">
-      <location src="{forrest:stylesheets}/strip-i18n-remains.xsl" />
-    </match>
-    
-    <!--
-      FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
-    -->
-    <match pattern="transform.xml.xml-namespace-stripped">
-      <location src="{forrest:context}/skins/common/xslt/html/strip_namespaces.xsl" />
-    </match>
-    
-    <match pattern="transform.html.broken-links">
-      <location src="resources/stylesheets/declare-broken-site-links.xsl" />
-    </match>
-    
-    <!-- ================================== -->
-    <!-- aggregate transforms                 -->
-    <!-- ================================== -->
-    <match pattern="transform-aggregate.*.*">
-      <location src="{forrest:stylesheets}/aggregates/{1}2{2}.xsl" />
-    </match>
-    
-    <match pattern="transform-aggregate.linkmap.relativized-linkmap">
-      <location src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl" />
-    </match>
-    
-    <!-- All core other transforms -->
-    <match pattern="transform.*.*">
-      <select>
-        <location src="{project:skins-dir}{forrest:skin}/xslt/html/{1}2{2}.xsl" />
-        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/{1}2{2}.xsl"/>
-        <location src="{forrest:stylesheets}/{1}2{2}.xsl"/>
-      </select>
-    </match>
-    
-    <!-- ================================== -->
-    <!-- i18n files                         -->
-    <!-- ================================== -->
-    <match pattern="project.translations">
-        <location src="{project:translations}" />
-    </match>
-    
-    <!-- ================================== -->
-    <!-- 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" />
-    </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>
-    
-    <!-- ================================== -->
-    <!-- plugin files                       -->
-    <!-- ================================== -->    
-    <match pattern="plugin.descriptor.whiteboard">
-        <location src="{forrest:whiteboard-plugins-src}/whiteboard-plugins.xml" />
-    </match>
-    
-    <match pattern="plugin.descriptor.forrest">
-        <location src="{forrest:plugins-src}/plugins.xml" />
-    </match>
-    
-    <match pattern="plugin.xmap.*">
-        <location src="{project:temp-dir}/{1}.xmap" />
-    </match>
-    
-    <!-- ================================== -->
-    <!-- chaperon files                     -->
-    <!-- ================================== -->
-    <match pattern="chaperon.grammar.*">
-        <location src="{forrest:context}/resources/chaperon/grammars/{1}.grm" />
-    </match>
-    
-    <match pattern="chaperon.xgrammar.*">
-        <location src="{forrest:context}/resources/chaperon/grammars/{1}.xgrm" />
-    </match>
-    
-    <match pattern="chaperon.lexicon.*">
-        <location src="resources/chaperon/grammars/{1}.xlex"/>
-        <location src="{forrest:context}/resources/chaperon/grammars/{1}.xlex" />
-    </match>
-    
-    <match pattern="transform.chaperon.grammar.lexicon">
-        <location src="{forrest:context}/resources/chaperon/stylesheets/grm2xlex.xsl" />
-    </match>
-    
-    <match pattern="transform.chaperon.*">
-        <location src="{forrest:context}/resources/chaperon/stylesheets/{1}.xsl" />
-    </match>
-    
     <!-- ================================== -->
     <!-- project files                      -->
     <!-- ================================== -->
     <match pattern="project.xmap.sitemap">
         <location src="{project:sitemap}" />
-    </match>
-    
-    <match pattern="skinconf.project">
-      <location src="{project:skinconf}" />
     </match>
     
     <match pattern="project.build-info">