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/19 00:02:53 UTC
svn commit: r326267 - in /forrest/trunk/main/webapp: locationmap-skins.xml
locationmap-transforms.xml locationmap.xml sitemap.xmap
Author: rgardler
Date: Tue Oct 18 15:02:43 2005
New Revision: 326267
URL: http://svn.apache.org/viewcvs?rev=326267&view=rev
Log:
Some more locationmap stuff (skins and project files) (FOR-200)
Added:
forrest/trunk/main/webapp/locationmap-skins.xml (with props)
Modified:
forrest/trunk/main/webapp/locationmap-transforms.xml
forrest/trunk/main/webapp/locationmap.xml
forrest/trunk/main/webapp/sitemap.xmap
Added: forrest/trunk/main/webapp/locationmap-skins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-skins.xml?rev=326267&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skins.xml (added)
+++ forrest/trunk/main/webapp/locationmap-skins.xml Tue Oct 18 15:02:43 2005
@@ -0,0 +1,69 @@
+<?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="skin.js.**">
+ <select>
+ <location src="{project:skins-dir}{forrest:skin}/scripts/{1}.js" />
+ <location src="{forrest:context}/skins/{forrest:skin}/scripts/{1}.js" />
+ <location src="{forrest:context}/skins/common/scripts/{1}.js" />
+ </select>
+ </match>
+
+ <match pattern="skin.css.xslt.**">
+ <select>
+ <location src="{project:skins-dir}{forrest:skin}/css/{1}.css.xslt" />
+ <location src="{forrest:context}/skins/{forrest:skin}/css/{1}.css.xslt" />
+ <location src="{forrest:context}/skins/common/css/{1}.css.xslt" />
+ </select>
+ </match>
+
+ <match pattern="skin.css.**">
+ <select>
+ <location src="{project:skins-dir}{forrest:skin}/css/{1}.css" />
+ <location src="{forrest:context}/skins/{forrest:skin}/css/{1}.css" />
+ <location src="{forrest:context}/skins/common/css/{1}.css" />
+ </select>
+ </match>
+
+ <match pattern="skin.images.**.*">
+ <select>
+ <location src="{project:skins-dir}{forrest:skin}/images/{1}.{2}" />
+ <location src="{forrest:context}/skins/{forrest:skin}/images/{1}.{2}" />
+ <location src="{forrest:context}/skins/common/images/{1}.{2}" />
+ </select>
+ </match>
+ </locator>
+</locationmap>
Propchange: forrest/trunk/main/webapp/locationmap-skins.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/main/webapp/locationmap-transforms.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-transforms.xml?rev=326267&r1=326266&r2=326267&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-transforms.xml (original)
+++ forrest/trunk/main/webapp/locationmap-transforms.xml Tue Oct 18 15:02:43 2005
@@ -69,6 +69,10 @@
<location src="{forrest:stylesheets}/normalizehrefs.xsl" />
</match>
+ <match pattern="transform.xml.extracted-svg">
+ <location src="{forrest:stylesheets}/extract-svg.xsl" />
+ </match>
+
<match pattern="transform.linkmap.linkmap-selectnode">
<location src="{forrest:stylesheets}/site-to-site-selectnode.xsl" />
</match>
Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=326267&r1=326266&r2=326267&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Tue Oct 18 15:02:43 2005
@@ -41,17 +41,41 @@
</select>
<!-- ================================== -->
- <!-- Mount plugin specific locationmap -->
+ <!-- project files -->
<!-- ================================== -->
- <select>
- <mount src="{project:temp-dir}/locationmap.xml"/>
- </select>
+ <match pattern="project.xmap.sitemap">
+ <location src="{project:sitemap}" />
+ </match>
+
+ <match pattern="project.build-info">
+ <location src="{project:temp-dir}/build-info.xml" />
+ </match>
+
+ <match pattern="project.xml.site">
+ <location src="{project:content.xdocs}site.xml" />
+ </match>
+
+ <match pattern="project.images.**.*">
+ <select>
+ <location src="{project:content.xdocs}/images/{1}.{2}" />
+ <location src="{project:content.xdocs}/{1}.{2}" />
+ <location src="{project:content}/../resources/images/{1}.{2}" />
+ </select>
+ </match>
+
+ <match pattern="project.**">
+ <location src="{project:content.xdocs}{1}" />
+ </match>
<!-- ================================== -->
<!-- Mount forrest locationmaps -->
<!-- ================================== -->
<select>
<mount src="{forrest:context}/locationmap-transforms.xml"/>
+ </select>
+
+ <select>
+ <mount src="{forrest:context}/locationmap-skins.xml"/>
</select>
<select>
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=326267&r1=326266&r2=326267&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Tue Oct 18 15:02:43 2005
@@ -606,7 +606,7 @@
<map:match type="regexp" pattern="^.+$">
<map:select type="exists">
- <map:when test="{project:content.xdocs}/{0}">
+ <map:when test="{lm:project.{0}}">
<map:mount uri-prefix="" src="raw.xmap" check-reload="yes" />
</map:when>
</map:select>
Re: svn commit: r326267 - in /forrest/trunk/main/webapp: locationmap-skins.xml
locationmap-transforms.xml locationmap.xml sitemap.xmap
Posted by Ross Gardler <rg...@apache.org>.
Tim Williams wrote:
>>--- forrest/trunk/main/webapp/locationmap.xml (original)
>>+++ forrest/trunk/main/webapp/locationmap.xml Tue Oct 18 15:02:43 2005
>>@@ -41,17 +41,41 @@
>> </select>
>>
>> <!-- ================================== -->
>>- <!-- Mount plugin specific locationmap -->
>>+ <!-- project files -->
>> <!-- ================================== -->
>>- <select>
>>- <mount src="{project:temp-dir}/locationmap.xml"/>
>>- </select>
>
>
> Am I missing something here? Please explain.
No you are not missing anything. I had some conflicts and made a mistake
on merging.
Good catch, I'm fixing now.
Ross
Re: svn commit: r326267 - in /forrest/trunk/main/webapp: locationmap-skins.xml locationmap-transforms.xml locationmap.xml sitemap.xmap
Posted by Tim Williams <wi...@gmail.com>.
> --- forrest/trunk/main/webapp/locationmap.xml (original)
> +++ forrest/trunk/main/webapp/locationmap.xml Tue Oct 18 15:02:43 2005
> @@ -41,17 +41,41 @@
> </select>
>
> <!-- ================================== -->
> - <!-- Mount plugin specific locationmap -->
> + <!-- project files -->
> <!-- ================================== -->
> - <select>
> - <mount src="{project:temp-dir}/locationmap.xml"/>
> - </select>
Am I missing something here? Please explain.
--tim