forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r381282 - in /forrest/branches/forrest_07_branch: site-author/status.xml tools/forrestbot/core/deploy.xml
Date Mon, 27 Feb 2006 07:49:09 GMT
Author: crossley
Date: Sun Feb 26 23:49:08 2006
New Revision: 381282

URL: http://svn.apache.org/viewcvs?rev=381282&view=rev
Log:
Forrestbot deploy.scp workstage now uses keyfile/passphrase in preference,
then fallback to remote password.
Issue: FOR-818

Modified:
    forrest/branches/forrest_07_branch/site-author/status.xml
    forrest/branches/forrest_07_branch/tools/forrestbot/core/deploy.xml

Modified: forrest/branches/forrest_07_branch/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/site-author/status.xml?rev=381282&r1=381281&r2=381282&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/site-author/status.xml (original)
+++ forrest/branches/forrest_07_branch/site-author/status.xml Sun Feb 26 23:49:08 2006
@@ -146,6 +146,10 @@
         Added document to facilitate
         <link href="site:v0.70//upgrading_07">upgrading to v0.7</link>
       </action>
+      <action context="code" type="update" dev="DC" fix-for="FOR-818">
+        Forrestbot deploy.scp workstage now uses keyfile/passphrase in preference,
+        then fallback to remote password.
+      </action>
         <action dev="FSO" type="update" context="code">
             Changed handling of table elements with class-attributes in source:
             Table elements w/o class elements will receive standard Forrest styling like
before

Modified: forrest/branches/forrest_07_branch/tools/forrestbot/core/deploy.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/tools/forrestbot/core/deploy.xml?rev=381282&r1=381281&r2=381282&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/tools/forrestbot/core/deploy.xml (original)
+++ forrest/branches/forrest_07_branch/tools/forrestbot/core/deploy.xml Sun Feb 26 23:49:08
2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2004 The Apache Software Foundation or its licensors,
+  Copyright 2004-2006 The Apache Software Foundation or its licensors,
   as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,9 @@
 -->
 <project name="deploy">
 
+  <!-- ================================================================= -->
+  <!-- The deploy.local target                                           -->
+  <!-- ================================================================= -->
   <property name="deploy.local.dir" location="sites/${ant.project.name}"/>
 
   <target name="deploy.local" unless="build.failed" description="FB: Deploy to a local
location">
@@ -30,19 +33,50 @@
     <property name="notify.deploy-location" value="${deploy.local.dir}"/>
   </target>
 
+  <!-- ================================================================= -->
+  <!-- The deploy.scp target                                             -->
+  <!-- ================================================================= -->
   <property name="deploy.scp.dest" value=""/>
   <target name="deploy.scp" unless="build.failed" description="FB: Deploy to a remote
location via scp">
     <if>
+      <isset property="deploy.scp.keyfile"/>
+      <then>
+        <antcall target="deploy.scp-with-keyfile"/>
+      </then>
+      <else>
+        <antcall target="deploy.scp-with-password"/>
+      </else>
+    </if>
+  </target>
+  <target name="deploy.scp-with-keyfile">
+    <if>
+      <not><isset property="deploy.scp.passphrase"/></not>
+      <then>
+        <input addproperty="deploy.scp.passphrase"
+            message="Enter local passphrase for key to enable scp to ${deploy.scp.dest}:"/>
+      </then>
+    </if>
+    <scp todir="${deploy.scp.dest}"
+        keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}">
+      <fileset dir="${build.site-dir}"/>
+    </scp>
+  </target>
+  <target name="deploy.scp-with-password">
+    <if>
       <not><isset property="deploy.scp.password"/></not>
       <then>
-        <input addproperty="deploy.scp.password" message="Enter password for scp to ${deploy.scp.dest}:"/>
+        <input addproperty="deploy.scp.password"
+            message="Enter remote password to enable scp to ${deploy.scp.dest}:"/>
       </then>
     </if>
     <scp todir="${deploy.scp.dest}" password="${deploy.scp.password}">
-     <fileset dir="${build.site-dir}"/>
+      <fileset dir="${build.site-dir}"/>
     </scp>
   </target>
-  
+
+  <!-- ================================================================= -->
+  <!-- The deploy.cvs target                                             -->
+  <!-- ================================================================= -->
   <property name="deploy.cvs.user" value="anoncvs"/>
   <property name="deploy.cvs.password" value="anoncvs"/>
   <property name="deploy.cvs.root" value="/home/cvs"/>
@@ -81,7 +115,9 @@
     </exec>
   </target>
 
-
+  <!-- ================================================================= -->
+  <!-- The deploy.svn target                                             -->
+  <!-- ================================================================= -->
   <property name="deploy.svn.user" value=""/>
   <property name="deploy.svn.password" value=""/>
   <property name="deploy.svn.url" value=""/>
@@ -104,7 +140,7 @@
       <fileset dir="${build.site-dir}"/>
     </copy>
     
-    <!-- add new files to CVS -->
+    <!-- add new files to SVN -->
     <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
     <exec executable="svn" dir="${deploy.svn.svn-dir}" output="${deploy.svn.svn-filestoadd}"
failonerror="true">
       <arg value="status"/>
@@ -132,5 +168,4 @@
     />
     
   </target>
-
 </project>



Mime
View raw message