update docs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@540512 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index e7a96f1..b8fe520 100644 (file)
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Tomcat 6.0" default="deploy" basedir=".">
+<project name="Tomcat 6.0" default="" basedir="." xmlns:artifact="urn:maven-artifact-ant">
 
   <!--
   Properties required to be set:
@@ -21,10 +21,20 @@
       <privateKey>/home/yourusername/.ssh/id_rsa</privateKey>
       <passphrase></passphrase>
     </server>
+    
+  To get a private key to work on Windows, I followed these steps
+  1. on a linux box execute 'ssh-keygen -t rsa'
+  2. same linux box execute 'cat id_rsa.pub >> authorized_keys' and 'cat id_rsa.pub >> authorized_keys2'
+  3. Copy id_rsa and id_rsa.pub to my windows box
+  4. Import id_rsa into puttygen
+  5. export id_rsa from puttygen to OpenSSH key
+  6. The key you exported from puttygen is the one you reference from the <privateKey> element
+  7. Manually create the %USERPROFILE%\.ssh directory
+  8. Manually add the %USERPROFILE%\.ssh\known_hosts file with the entry for the host
   -->
   <property file="${basedir}/mvn.properties"/>
   <property file="${basedir}/mvn.properties.default"/>
-  
+
   <target name="maven-deploy">
     <!--replace the version in the pom-->
     <copy file="${pom}" tofile="${pom}.tmp">
@@ -158,5 +168,9 @@
       <param name="maven.deploy.version" value="${maven.asf.release.deploy.version}"/>
     </antcall>
   </target>
+  
+  <target name="help">
+    <echo>Help is on the way!</echo>
+  </target>
 
 </project>

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 1d0aa34..38f7813 100644 (file)
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -1,22 +1,22 @@
 #Maven properties
 maven.home=/development/maven-2.0.4
 #Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name
-maven.bin=mvn
+maven.bin=mvn.bat
 
 #Maven snapshot properties
 maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
 maven.snapshot.repo.repositoryId=apache.snapshots
-maven.snapshot.deploy.version=6.0.X-SNAPSHOT
+maven.snapshot.deploy.version=6.T.X-SNAPSHOT
 
 #Maven release properties for Tomcat staging
 maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
 maven.release.repo.repositoryId=tomcat-staging
-maven.release.deploy.version=6.0.8
+maven.release.deploy.version=6.T.T
 
 #Maven release properties for the main ASF repo
 maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
 maven.asf.release.repo.repositoryId=apache.releases
-maven.asf.release.deploy.version=6.0.8
+maven.asf.release.deploy.version=6.T.T
 
 
 #Where do we load the libraries from