forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r356864 - /forrest/trunk/main/var/pluginlist2fetch.xsl
Date Wed, 14 Dec 2005 20:48:27 GMT
Author: rgardler
Date: Wed Dec 14 12:48:20 2005
New Revision: 356864

URL: http://svn.apache.org/viewcvs?rev=356864&view=rev
Log:
use ant to deploy locally rather than copying (part of FOR-388)

Modified:
    forrest/trunk/main/var/pluginlist2fetch.xsl

Modified: forrest/trunk/main/var/pluginlist2fetch.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/var/pluginlist2fetch.xsl?rev=356864&r1=356863&r2=356864&view=diff
==============================================================================
--- forrest/trunk/main/var/pluginlist2fetch.xsl (original)
+++ forrest/trunk/main/var/pluginlist2fetch.xsl Wed Dec 14 12:48:20 2005
@@ -50,47 +50,43 @@
             <echo>Versioned plugin unavailable, trying to get versionless plugin...</echo>
             
             <echo>Looking in local plugins src...</echo>
-            <copy failonerror="false">
-              <xsl:attribute name="todir"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
-              <fileset>
-                <xsl:attribute name="dir"><xsl:value-of select="$plugin-src-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
-              </fileset>
-            </copy>
-            <available property="plugin.src.present" type="dir">
-               <xsl:attribute name="file"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
-            </available>
-            
             <if>
-                <not><isset property="plugin.src.present"/></not>
-                <then>		        
-                  <echo>Unable to find plugin src in trunk.</echo>
-                  <echo>Looking in local whiteboard plugins src...</echo>
-                  <copy failonerror="false">
-                    <xsl:attribute name="todir"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
-                    <fileset>
-                      <xsl:attribute name="dir"><xsl:value-of select="$plugin-whiteboard-src-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
-                    </fileset>
-                  </copy>
-                  <available property="whiteboard.plugin.src.present" type="dir">
-                     <xsl:attribute name="file"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
-                  </available>
+              <available property="plugin.src.present" type="dir">
+                <xsl:attribute name="file"><xsl:value-of select="$plugin-src-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
+              </available>
+              <then>
+                <ant target="local-deploy">
+                    <xsl:attribute name="antfile"><xsl:value-of select="$plugin-src-dir"/><xsl:value-of
select="$plugin-name" />/build.xml</xsl:attribute>
+                    <xsl:attribute name="dir"><xsl:value-of select="$plugin-src-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
+                </ant>
               </then>
-             </if>
+              <else>
+                  <echo>Unable to find plugin src in main plugins src dir.</echo>
+                  <echo>Looking in local whiteboard plugins src...</echo>
+                  <if>
+                    <available property="whiteboard.plugin.src.present" type="dir">
+                       <xsl:attribute name="file"><xsl:value-of select="$plugin-whiteboard-src-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
+                    </available>
+                    <then>
+                      <copy failonerror="false">
+                        <xsl:attribute name="todir"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
+                        <fileset>
+                          <xsl:attribute name="dir"><xsl:value-of select="$plugin-whiteboard-src-dir"/><xsl:value-of
select="$plugin-name" /></xsl:attribute>
+                        </fileset>
+                      </copy>
+                    </then>
+                    <else>     
+                      <echo>Unable to find plugin src in whiteboard.</echo>
+                      <echo>Downloaing from distribution site ...</echo>
+                      <get verbose="true" usetimestamp="true" ignoreerrors="true">
+                         <xsl:attribute name="src"><xsl:value-of select="plugin[@name=$plugin-name]/@url"
/>/<xsl:value-of select="$plugin-name" />.zip</xsl:attribute>
+                         <xsl:attribute name="dest"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" />.zip</xsl:attribute>
+                      </get>
+                    </else>
+                  </if>
+              </else>
+            </if>
 	           
-            <if>
-                <and>
-                  <not><isset property="plugin.src.present"/></not>
-                  <not><isset property="whiteboard.plugin.src.present"/></not>
-                </and>
-              <then>		        
-                <echo>Unable to find plugin src in whiteboard.</echo>
-                <echo>Downloaing from distribution site ...</echo>
-                <get verbose="true" usetimestamp="true" ignoreerrors="true">
-                   <xsl:attribute name="src"><xsl:value-of select="plugin[@name=$plugin-name]/@url"
/>/<xsl:value-of select="$plugin-name" />.zip</xsl:attribute>
-                   <xsl:attribute name="dest"><xsl:value-of select="$plugin-dir"/><xsl:value-of
select="$plugin-name" />.zip</xsl:attribute>
-                </get>
-              </then>
-           </if>
          </target>
 
          <target name="final-check">



Mime
View raw message