hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r202287 - in /jakarta/hivemind/trunk: hivebuild/dist.xml project.properties src/documentation/content/xdocs/index.xml status.xml version.properties
Date Tue, 28 Jun 2005 22:08:51 GMT
Author: hlship
Date: Tue Jun 28 15:08:49 2005
New Revision: 202287

URL: http://svn.apache.org/viewcvs?rev=202287&view=rev
Log:
Change dist targets to use SSH passphrase authentication.

Modified:
    jakarta/hivemind/trunk/hivebuild/dist.xml
    jakarta/hivemind/trunk/project.properties
    jakarta/hivemind/trunk/src/documentation/content/xdocs/index.xml
    jakarta/hivemind/trunk/status.xml
    jakarta/hivemind/trunk/version.properties

Modified: jakarta/hivemind/trunk/hivebuild/dist.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/dist.xml?rev=202287&r1=202286&r2=202287&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/dist.xml (original)
+++ jakarta/hivemind/trunk/hivebuild/dist.xml Tue Jun 28 15:08:49 2005
@@ -19,7 +19,8 @@
 	
 	<property file="${basedir}/project.properties"/>
 	<property file="${hivebuild.dir}/dist.properties"/>
-	
+  <property name="keyfile" value="${user.home}/.ssh/id_dsa"/>
+  
 	<!-- This will be here until we add some new taskdefs and typedefs to simplify this.
-->
 	
 	<target name="dist" description="Build a distribution." depends="clean,install,site,dist-build"/>
@@ -110,13 +111,13 @@
 	</target>
 
 	
-	<target name="-check-password" unless="password">
+	<target name="-check-passphrase" unless="passphrase">
 	
-		<input message="Please provide password for installation:" addproperty="password"/>
+		<input message="Please provide passphrase for installation:" addproperty="passphrase"/>
 
 	</target>
   
-	<target name="install-docs" depends="-check-password"
+	<target name="install-docs" depends="-check-passphrase"
 			description="Copies the documentation to a directory and unpacks it remotely.">
 
 		<!-- TODO: Check for missing properties. -->
@@ -126,25 +127,28 @@
 		<scp
 				file="${dist.dir}/${dist.docs.file}" 
 				todir="${dist.install.docs.dir}"
-				password="${password}"
-				trust="yes"/>
+				passphrase="${passphrase}"
+        keyfile="${keyfile}"
+  			trust="yes"/>
 		
 		<sshexec 
 			username="${dist.install.docs.user}"
 			host="${dist.install.docs.host}"
 			command="cd ${dist.install.docs.path} ; tar xzvf ${dist.docs.file} ; rm ${dist.docs.file}"
-			password="${password}"
+			passphrase="${passphrase}"
+      keyfile="${keyfile}"
 			trust="yes"/>
 
 	</target>
 	
-	<target name="install-dist" depends="-check-password"
+	<target name="install-dist" depends="-check-passphrase"
 		description="Install current distributions.">
 		
 		<announce message="Installing distributions to ${dist.install.dir} ..."/> 
     
 		<scp todir="${dist.install.dir}"
-				password="${password}"
+				passphrase="${passphrase}"
+        keyfile="${keyfile}"
 				trust="yes">
 			<fileset dir="${dist.dir}"/>
       <fileset dir="." includes="KEYS"/>
@@ -156,12 +160,13 @@
 			username="${dist.install.user}"
 			host="${dist.install.host}"
 			command="cd ${dist.install.path} ; chgrp * ${dist.install.group}; chmod ${dist.install.mode}
*"
-			password="${password}"
+			passphrase="${passphrase}"
+      keyfile="${keyfile}"
 			trust="yes"/>  
     
 	</target>
   
-  <target name="install-maven" depends="-check-password"
+  <target name="install-maven" depends="-check-passphrase"
     description="Install JARs into Maven distribution library.">
     <announce message="Building MD5 Checksums ..."/>
     
@@ -172,7 +177,8 @@
     <announce message="Copying JARs and MD5 Checksums to ${dist.install.maven.dir} ..."/>
     
     <scp todir="${dist.install.maven.dir}"
-      password="${password}"
+      passphrase="${passphrase}"
+      keyfile="${keyfile}"
       trust="yes">
       <fileset dir="${target.dir}">
         <include name="*.jar"/>
@@ -186,7 +192,8 @@
 			username="${dist.install.maven.user}"
 			host="${dist.install.maven.host}"
 			command="cd ${dist.install.maven.path} ; chmod ${dist.install.maven.mode} *"
-			password="${password}"
+			passphrase="${passphrase}"
+      keyfile="${keyfile}"
 			trust="yes"/>      
   </target>
 	

Modified: jakarta/hivemind/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/project.properties?rev=202287&r1=202286&r2=202287&view=diff
==============================================================================
--- jakarta/hivemind/trunk/project.properties (original)
+++ jakarta/hivemind/trunk/project.properties Tue Jun 28 15:08:49 2005
@@ -18,8 +18,6 @@
 dist.install.path=/www/www.apache.org/dist/jakarta/hivemind
 dist.install.user=hlship
 
-# Change this back once the current release is stable enough
-
-dist.install.docs.path=/www/jakarta.apache.org/hivemind/current
+dist.install.docs.path=/www/jakarta.apache.org/hivemind/
 
 dist.install.maven.path=/www/www.apache.org/dist/java-repository/hivemind/jars

Modified: jakarta/hivemind/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/src/documentation/content/xdocs/index.xml?rev=202287&r1=202286&r2=202287&view=diff
==============================================================================
--- jakarta/hivemind/trunk/src/documentation/content/xdocs/index.xml (original)
+++ jakarta/hivemind/trunk/src/documentation/content/xdocs/index.xml Tue Jun 28 15:08:49 2005
@@ -88,11 +88,9 @@
 		<section>
 			<title>Status</title>
         <p>HiveMind now requires Ant 1.6.<strong>2</strong> to build.</p>
-        <p>James Carman has just been voted on as a HiveMind committer.</p>
-        <p>HiveMind's final 1.0 release occured on Sep 22 2004. Work is well underway

-         on a 1.1 release.</p>
+        <p>James Carman and Achim Huegen have been voted on as HiveMind committers.</p>
 <warning>
-  This documentation describes HiveMind 1.1, which is currently in an early beta state.
+  This documentation describes HiveMind 1.1, which is currently in an late beta state.
   You may <link href="site:downloads">download HiveMind 1.0</link> to get stable
   features and matching documentation.
 </warning>          

Modified: jakarta/hivemind/trunk/status.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/status.xml?rev=202287&r1=202286&r2=202287&view=diff
==============================================================================
--- jakarta/hivemind/trunk/status.xml (original)
+++ jakarta/hivemind/trunk/status.xml Tue Jun 28 15:08:49 2005
@@ -30,6 +30,9 @@
     </actions>
   </todo>
   <changes>
+    <release version="1.1-beta-3" date="unreleased">
+      <action type="update" dev="HLS">Change dist targets to use SSH passphrase for
authentication.</action>
+    </release>
     <release version="1.1-beta-2" date="Jun 28 2005">
       <action type="fix" dev="JC" fixes-bug="HIVEMIND-122">IBM JDK 1.4.1 and java.net.URL.openStream
causes NPE"</action>
       <action type="add" dev="JC" due-to="Achim Hügen" fixes-bug="HIVEMIND-107">JMX
Enhancements </action>

Modified: jakarta/hivemind/trunk/version.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/version.properties?rev=202287&r1=202286&r2=202287&view=diff
==============================================================================
--- jakarta/hivemind/trunk/version.properties (original)
+++ jakarta/hivemind/trunk/version.properties Tue Jun 28 15:08:49 2005
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project.version=1.1-beta-2
\ No newline at end of file
+project.version=1.1-beta-3-snapshot
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message