Author: rgardler
Date: Tue Dec 13 11:33:13 2005
New Revision: 356585
URL: http://svn.apache.org/viewcvs?rev=356585&view=rev
Log:
- remove duplicate matches
- ensure all project matchers are located in the same place
- add an explanation why we use cocoon:// in one special case
Modified:
forrest/trunk/main/webapp/locationmap.xml
Modified: forrest/trunk/main/webapp/locationmap.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=356585&r1=356584&r2=356585&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Tue Dec 13 11:33:13 2005
@@ -37,7 +37,15 @@
<!-- Mount project specific locationmap -->
<!-- ================================== -->
<select>
- <mount src="cocoon://locationmap-project.xml"/>
+ <!-- Normally it is discouraged to use the cocoon:
+ protocol in the locationap as this provides too much indirection.
+
+ However, this is a special case since it allows individual
+ projects to dynamically generate their locationmap. This is
+ required when content is being drawn from a remote repository
+ and we want the site structure to also come from that repository
+ -->
+ <mount src="cocoon:/locationmap-project.xml"/>
</select>
<!-- ================================== -->
@@ -56,34 +64,6 @@
</match>
<!-- ================================== -->
- <!-- project files -->
- <!-- ================================== -->
- <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:resources.images}{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>
@@ -125,6 +105,15 @@
<match pattern="project.build-info">
<location src="{project:temp-dir}/build-info.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:resources.images}{1}.{2}" />
+ <location src="{project:content}../resources/images/{1}.{2}" />
+ </select>
</match>
<match pattern="project.xml.site">
