svn commit: rev 65596 - in forrest/trunk/main: targets var webapp

[rg...@apache.org]

Author: rgardler
Date: Sun Nov 14 07:02:28 2004
New Revision: 65596

Modified:
   forrest/trunk/main/targets/plugins.xml
   forrest/trunk/main/var/pluginMountSnippet.xsl
   forrest/trunk/main/var/pluginlist2echo.xsl
   forrest/trunk/main/webapp/forrest.xmap
Log:
input plugins use the name input.xmap rather than sitemap.xmap

Modified: forrest/trunk/main/targets/plugins.xml
==============================================================================
--- forrest/trunk/main/targets/plugins.xml	(original)
+++ forrest/trunk/main/targets/plugins.xml	Sun Nov 14 07:02:28 2004
@@ -66,16 +66,16 @@
   </target>  
   
   <target name="configure-plugin" unless="plugin.unavailable">
-     <!-- add the snippet to plugins/sitemap.xmap that will mount the plugin
-          specific sitemap -->
-     <xslt in="${forrest.plugins-dir}/sitemap.xmap"
-       out="${forrest.plugins-dir}/sitemap.xmap.new"
+     <!-- add the snippet to plugins/input.xmap that will mount the plugin
+          specific input.xmap -->
+     <xslt in="${forrest.plugins-dir}/input.xmap"
+       out="${forrest.plugins-dir}/input.xmap.new"
        style="${forrest.home}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
      </xslt>
-     <move file="${forrest.plugins-dir}/sitemap.xmap.new" 
-       tofile="${forrest.plugins-dir}/sitemap.xmap"/>
+     <move file="${forrest.plugins-dir}/input.xmap.new" 
+       tofile="${forrest.plugins-dir}/input.xmap"/>
   </target>
 
   <target name="fetch-plugins-descriptors" if="plugin.unavailable">
@@ -123,7 +123,7 @@
     
     <mkdir dir="${forrest.plugins-dir}"/>
     <copy file="${forrest.home}/var/initial_plugins_sitemap.xmap"
-      tofile="${forrest.plugins-dir}/sitemap.xmap"
+      tofile="${forrest.plugins-dir}/input.xmap"
       overwrite="true"/>
     
       <for list="${project.required.plugins}" param="name">

Modified: forrest/trunk/main/var/pluginMountSnippet.xsl
==============================================================================
--- forrest/trunk/main/var/pluginMountSnippet.xsl	(original)
+++ forrest/trunk/main/var/pluginMountSnippet.xsl	Sun Nov 14 07:02:28 2004
@@ -38,10 +38,10 @@
        <xsl:element name="map:select">
          <xsl:attribute name="type">exists</xsl:attribute>
          <xsl:element name="map:when">
-           <xsl:attribute name="test">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/sitemap.xmap</xsl:attribute>
+           <xsl:attribute name="test">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/input.xmap</xsl:attribute>
            <xsl:element name="map:mount">
              <xsl:attribute name="uri-prefix"/>
-             <xsl:attribute name="src">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/sitemap.xmap</xsl:attribute> 
+             <xsl:attribute name="src">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/input.xmap</xsl:attribute> 
              <xsl:attribute name="check-reload">yes</xsl:attribute>  
              <xsl:attribute name="pass-through">true</xsl:attribute>
            </xsl:element>

Modified: forrest/trunk/main/var/pluginlist2echo.xsl
==============================================================================
--- forrest/trunk/main/var/pluginlist2echo.xsl	(original)
+++ forrest/trunk/main/var/pluginlist2echo.xsl	Sun Nov 14 07:02:28 2004
@@ -40,6 +40,7 @@
   - Author: <xsl:value-of select="@author"/>
   - Website: <xsl:value-of select="@website"/>
   - Version:  <xsl:value-of select="@version"/>
+  - Required Forrest Version: <xsl:value-of select="forrestVersion"/> 
 </echo>
 	</xsl:template>	
 	

Modified: forrest/trunk/main/webapp/forrest.xmap
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap	(original)
+++ forrest/trunk/main/webapp/forrest.xmap	Sun Nov 14 07:02:28 2004
@@ -296,9 +296,9 @@
         <map:otherwise>
         
           <map:select type="exists">
-             <map:when test="{forrest:plugins}/sitemap.xmap">
+             <map:when test="{forrest:plugins}/input.xmap">
                <map:mount uri-prefix="" 
-                          src="{forrest:plugins}/sitemap.xmap" 
+                          src="{forrest:plugins}/input.xmap" 
                           check-reload="yes" 
                           pass-through="true"/>
             </map:when>