Return-Path: 
 <svn-return-3912-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 48395 invoked from network); 14 Oct 2005 18:54:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Oct 2005 18:54:07 -0000
Received: (qmail 70030 invoked by uid 500); 14 Oct 2005 18:54:06 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 69974 invoked by uid 500); 14 Oct 2005 18:54:06 -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 69962 invoked by uid 99); 14 Oct 2005 18:54:06 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2005 11:54:06 -0700
X-ASF-Spam-Status: No, hits=-9.4 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; Fri, 14 Oct 2005 11:54:06 -0700
Received: (qmail 48126 invoked by uid 65534); 14 Oct 2005 18:53:44 -0000
Message-ID: <20051014185344.48124.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r321175 - in /forrest/trunk/main: targets/plugins.xml
 var/initial_plugins_locationmap.xml var/pluginLmMountSnippet.xsl
 webapp/locationmap.xml
Date: Fri, 14 Oct 2005 18:53:42 -0000
To: svn@forrest.apache.org
From: twilliams@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: twilliams
Date: Fri Oct 14 11:53:31 2005
New Revision: 321175

URL: http://svn.apache.org/viewcvs?rev=321175&view=rev
Log:
Plugin locationmap mounting capability.

Added:
    forrest/trunk/main/var/initial_plugins_locationmap.xml   (with props)
    forrest/trunk/main/var/pluginLmMountSnippet.xsl   (with props)
Modified:
    forrest/trunk/main/targets/plugins.xml
    forrest/trunk/main/webapp/locationmap.xml

Modified: forrest/trunk/main/targets/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?rev=321175&r1=321174&r2=321175&view=diff
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Fri Oct 14 11:53:31 2005
@@ -173,6 +173,9 @@
             </antcall>
           </then>
         </if>
+        <antcall target="configure-plugin-locationmap">
+          <param name="plugin" value="${versioned.name}"/>
+        </antcall>
       </then>
       <else>
         <if>
@@ -199,6 +202,9 @@
             </antcall>
           </then>
         </if>
+        <antcall target="configure-plugin-locationmap">
+          <param name="plugin" value="{plugin.name}"/>
+        </antcall>
       </else>
     </if>
   </target>
@@ -256,6 +262,20 @@
      <move file="${project.temp-dir}/internal.xmap.new" 
        tofile="${project.temp-dir}/internal.xmap"/>
   </target>
+  
+  <target name="configure-plugin-locationmap">
+     <!-- add the snippet to plugins/locationmap.xml that will mount the plugin
+          specific locationmap -->
+     <echo>Mounting plugin locationmap for ${plugin}</echo>
+     <xslt in="${project.temp-dir}/locationmap.xml"
+       out="${project.temp-dir}/locationmap.xml.new"
+       style="${forrest.core}/var/pluginLmMountSnippet.xsl"
+       force="true">
+           <param name="plugin-name" expression="${plugin}"/>  
+     </xslt>
+     <move file="${project.temp-dir}/locationmap.xml.new" 
+       tofile="${project.temp-dir}/locationmap.xml"/>
+  </target>
 
   <target name="fetch-plugins-descriptors" if="plugin.unavailable" depends="init-proxy">
     <delete>
@@ -343,6 +363,9 @@
       overwrite="true"/>
     <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
       tofile="${project.temp-dir}/internal.xmap"
+      overwrite="true"/>
+    <copy file="${forrest.core}/var/initial_plugins_locationmap.xml"
+          tofile="${project.temp-dir}/locationmap.xml"
       overwrite="true"/>
 
       <for list="${project.required.plugins}" param="name">

Added: forrest/trunk/main/var/initial_plugins_locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/var/initial_plugins_locationmap.xml?rev=321175&view=auto
==============================================================================
--- forrest/trunk/main/var/initial_plugins_locationmap.xml (added)
+++ forrest/trunk/main/var/initial_plugins_locationmap.xml Fri Oct 14 11:53:31 2005
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-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.
+-->
+<locationmap 
+  xmlns="http://apache.org/forrest/locationmap/1.0">
+  <components>
+    <selectors default="exists">
+      <selector name="exists" logger="sitemap.selector.exists"  
+          src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+
+  <locator>
+
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/var/initial_plugins_locationmap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/main/var/pluginLmMountSnippet.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/var/pluginLmMountSnippet.xsl?rev=321175&view=auto
==============================================================================
--- forrest/trunk/main/var/pluginLmMountSnippet.xsl (added)
+++ forrest/trunk/main/var/pluginLmMountSnippet.xsl Fri Oct 14 11:53:31 2005
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-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.
+-->
+<xsl:stylesheet version="1.0" 
+  xmlns="http://apache.org/forrest/locationmap/1.0"
+  xmlns:lm="http://apache.org/forrest/locationmap/1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  
+
+   <xsl:output method="xml" indent="yes" />
+   
+   <xsl:param name="plugin-name"/>
+   
+   
+   <xsl:template match="lm:locationmap">
+    <locationmap>
+      <xsl:apply-templates/>
+    </locationmap>
+   </xsl:template>
+   
+
+
+   <xsl:template match="lm:locator">
+     <locator>
+       <xsl:apply-templates/>
+       <xsl:element name="select">
+           <xsl:element name="mount">
+             <xsl:attribute name="src">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/src/documentation/content/locationmap.xml</xsl:attribute> 
+           </xsl:element>
+       </xsl:element>
+     </locator>
+    </xsl:template>
+    
+
+  <xsl:template match="@*|*|text()|processing-instruction()|comment()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
+    </xsl:copy>
+  </xsl:template>
+  
+</xsl:stylesheet>
+

Propchange: forrest/trunk/main/var/pluginLmMountSnippet.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=321175&r1=321174&r2=321175&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Fri Oct 14 11:53:31 2005
@@ -41,6 +41,13 @@
     </select>
     
     <!-- ================================== -->
+    <!-- Mount project specific locationmap -->
+    <!-- ================================== -->
+    <select>
+      <mount src="{project:temp-dir}/locationmap.xml"/>
+    </select>
+    
+    <!-- ================================== -->
     <!-- Mount forrest locationmaps         -->
     <!-- ================================== -->
     <select>