forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r111444 - /forrest/trunk/main/targets/plugins.xml /forrest/trunk/main/webapp/forrest.xmap /forrest/trunk/main/webapp/sitemap.xmap
Date Thu, 09 Dec 2004 23:43:17 GMT
Author: rgardler
Date: Thu Dec  9 15:43:16 2004
New Revision: 111444

URL: http://svn.apache.org/viewcvs?view=rev&rev=111444
Log:
write temporary plugin files to user build directory (fixes FOR-406)
Modified:
   forrest/trunk/main/targets/plugins.xml
   forrest/trunk/main/webapp/forrest.xmap
   forrest/trunk/main/webapp/sitemap.xmap

Modified: forrest/trunk/main/targets/plugins.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?view=diff&rev=111444&p1=forrest/trunk/main/targets/plugins.xml&r1=111443&p2=forrest/trunk/main/targets/plugins.xml&r2=111444
==============================================================================
--- forrest/trunk/main/targets/plugins.xml	(original)
+++ forrest/trunk/main/targets/plugins.xml	Thu Dec  9 15:43:16 2004
@@ -23,7 +23,7 @@
           description="What plugins are available?">
     <for param="plugin-descriptor-file">
       <path>
-        <fileset dir="${forrest.plugins-dir}" includes="plugins-*.xml"/>
+        <fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
       </path>
       <sequential>
         <xslt in="@{plugin-descriptor-file}" 
@@ -82,24 +82,24 @@
      <!-- add the snippet to plugins/input.xmap that will mount the plugin
           specific input.xmap -->
      <echo>Mounting input plugin: ${plugin.name}</echo>
-     <xslt in="${forrest.plugins-dir}/input.xmap"
-       out="${forrest.plugins-dir}/input.xmap.new"
+     <xslt in="${project.temp-dir}/input.xmap"
+       out="${project.temp-dir}/input.xmap.new"
        style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="input"/>  
      </xslt>
-     <move file="${forrest.plugins-dir}/input.xmap.new" 
-       tofile="${forrest.plugins-dir}/input.xmap"/>
-     <xslt in="${forrest.plugins-dir}/resources.xmap"
-       out="${forrest.plugins-dir}/resources.xmap.new"
+     <move file="${project.temp-dir}/input.xmap.new" 
+       tofile="${project.temp-dir}/input.xmap"/>
+     <xslt in="${project.temp-dir}/resources.xmap"
+       out="${project.temp-dir}/resources.xmap.new"
        style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="resources"/>  
      </xslt>
-     <move file="${forrest.plugins-dir}/resources.xmap.new" 
-       tofile="${forrest.plugins-dir}/resources.xmap"/>
+     <move file="${project.temp-dir}/resources.xmap.new" 
+       tofile="${project.temp-dir}/resources.xmap"/>
   </target>
   
   <target name="configure-output-plugin"
@@ -108,15 +108,15 @@
      <!-- add the snippet to plugins/output.xmap that will mount the plugin
           specific input.xmap -->
      <echo>Mounting output plugin: ${plugin.name}</echo>
-     <xslt in="${forrest.plugins-dir}/output.xmap"
-       out="${forrest.plugins-dir}/output.xmap.new"
+     <xslt in="${project.temp-dir}/output.xmap"
+       out="${project.temp-dir}/output.xmap.new"
        style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="output"/>  
      </xslt>
-     <move file="${forrest.plugins-dir}/output.xmap.new" 
-       tofile="${forrest.plugins-dir}/output.xmap"/>
+     <move file="${project.temp-dir}/output.xmap.new" 
+       tofile="${project.temp-dir}/output.xmap"/>
   </target>
   
   <target name="configure-internal-plugin"
@@ -125,20 +125,20 @@
      <!-- add the snippet to plugins/internal.xmap that will mount the plugin
           specific input.xmap -->
      <echo>Mounting internals plugin: ${plugin-name}</echo>
-     <xslt in="${forrest.plugins-dir}/internal.xmap"
-       out="${forrest.plugins-dir}/internal.xmap.new"
+     <xslt in="${project.temp-dir}/internal.xmap"
+       out="${project.temp-dir}/internal.xmap.new"
        style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="internal"/>  
      </xslt>
-     <move file="${forrest.plugins-dir}/internal.xmap.new" 
-       tofile="${forrest.plugins-dir}/internal.xmap"/>
+     <move file="${project.temp-dir}/internal.xmap.new" 
+       tofile="${project.temp-dir}/internal.xmap"/>
   </target>
 
   <target name="fetch-plugins-descriptors" if="plugin.unavailable">
     <delete>
-      <fileset dir="${forrest.plugins-dir}" includes="plugins-*.xml"/>
+      <fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
     </delete>
   
     <var name="plugin-counter" value="1"/>
@@ -146,7 +146,7 @@
       <sequential>
         <echo>fetching descriptor: @{url}</echo>
         <get src="@{url}" 
-           dest="${forrest.plugins-dir}/plugins-${plugin-counter}.xml"
+           dest="${project.temp-dir}/plugins-${plugin-counter}.xml"
            verbose="true" usetimestamp="true" ignoreerrors="true"/>
         <math result="plugin-counter" operand1="${plugin-counter}" operation="+" operand2="1"
datatype="int"/>
       </sequential>
@@ -158,7 +158,7 @@
           depends="init-props, fetch-plugins-descriptors">
     <for param="plugin-descriptor-file">
       <path>
-        <fileset dir="${forrest.plugins-dir}" includes="plugins-*.xml"/>
+        <fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
       </path>
       <sequential>
         <xslt in="@{plugin-descriptor-file}" 
@@ -180,17 +180,18 @@
     description="ensure the required plugins are available locally, if any are not download
them automatically">
     
     <mkdir dir="${forrest.plugins-dir}"/>
+    <mkdir dir="${project.temp-dir}"/>
     <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
-      tofile="${forrest.plugins-dir}/input.xmap"
+      tofile="${project.temp-dir}/input.xmap"
       overwrite="true"/>
     <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
-      tofile="${forrest.plugins-dir}/resources.xmap"
+      tofile="${project.temp-dir}/resources.xmap"
       overwrite="true"/>
     <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
-      tofile="${forrest.plugins-dir}/output.xmap"
+      tofile="${project.temp-dir}/output.xmap"
       overwrite="true"/>
     <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
-      tofile="${forrest.plugins-dir}/internal.xmap"
+      tofile="${project.temp-dir}/internal.xmap"
       overwrite="true"/>
     
       <for list="${project.required.plugins}" param="name">

Modified: forrest/trunk/main/webapp/forrest.xmap
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/forrest.xmap?view=diff&rev=111444&p1=forrest/trunk/main/webapp/forrest.xmap&r1=111443&p2=forrest/trunk/main/webapp/forrest.xmap&r2=111444
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap	(original)
+++ forrest/trunk/main/webapp/forrest.xmap	Thu Dec  9 15:43:16 2004
@@ -257,9 +257,9 @@
         <map:otherwise>
         
           <map:select type="exists">
-             <map:when test="{forrest:plugins}/input.xmap">
+             <map:when test="{project:temp-dir}/input.xmap">
                <map:mount uri-prefix="" 
-                          src="{forrest:plugins}/input.xmap" 
+                          src="{project:temp-dir}/input.xmap" 
                           check-reload="yes" 
                           pass-through="true"/>
             </map:when>  

Modified: forrest/trunk/main/webapp/sitemap.xmap
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?view=diff&rev=111444&p1=forrest/trunk/main/webapp/sitemap.xmap&r1=111443&p2=forrest/trunk/main/webapp/sitemap.xmap&r2=111444
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap	(original)
+++ forrest/trunk/main/webapp/sitemap.xmap	Thu Dec  9 15:43:16 2004
@@ -320,8 +320,8 @@
       
       <map:pipeline internal-only="false">
         <map:select type="exists">
-          <map:when test="{forrest:plugins}/internal.xmap">
-            <map:mount uri-prefix="" src="{forrest:plugins}/internal.xmap" check-reload="yes"
pass-through="true"/>
+          <map:when test="{project:temp-dir}/internal.xmap">
+            <map:mount uri-prefix="" src="{project:temp-dir}/internal.xmap" check-reload="yes"
pass-through="true"/>
           </map:when>
         </map:select>
       </map:pipeline>
@@ -518,8 +518,8 @@
 
       <map:pipeline internal-only="false">
         <map:select type="exists">
-          <map:when test="{forrest:plugins}/output.xmap">
-            <map:mount uri-prefix="" src="{forrest:plugins}/output.xmap" check-reload="yes"
pass-through="true"/>
+          <map:when test="{project:temp-dir}/output.xmap">
+            <map:mount uri-prefix="" src="{project:temp-dir}/output.xmap" check-reload="yes"
pass-through="true"/>
           </map:when>
         </map:select>
       </map:pipeline>
@@ -671,9 +671,9 @@
       </map:match>
         
       <map:select type="exists">
-         <map:when test="{forrest:plugins}/resources.xmap">
+         <map:when test="{project:temp-dir}/resources.xmap">
            <map:mount uri-prefix="" 
-                      src="{forrest:plugins}/resources.xmap" 
+                      src="{project:temp-dir}/resources.xmap" 
                       check-reload="yes" 
                       pass-through="true"/>
         </map:when>  

Mime
View raw message