From b8610366f01e8956cff681c123dc2bef79bdb866 Mon Sep 17 00:00:00 2001
From: Michael Dick <mikedd@apache.org>
Date: Fri, 24 Jul 2009 20:25:33 +0000
Subject: [PATCH] pass pom.version to upload ant task. Fix prompt problems with
 sshexec (should handle existing directories better).

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@797637 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-project/pom.xml    | 1 +
 openjpa-project/upload.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index 8d5505dac..c8ea26ba0 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -395,6 +395,7 @@
                                             <property name="nightly.user.name" value="${nightly.user.name}"/>
                                             <property name="nightly.password" value="${nightly.password}"/>
                                             <property name="nightly.version" value="${nightly.version}"/>
+                                            <property name="pom.version" value="${pom.version}"/>
                                         </ant>
                                     </tasks>
                                 </configuration>
diff --git a/openjpa-project/upload.xml b/openjpa-project/upload.xml
index 209336b60..90a919f40 100644
--- a/openjpa-project/upload.xml
+++ b/openjpa-project/upload.xml
@@ -35,6 +35,9 @@
                 <include name="docs.zip"/>
             </fileset>
         </scp>
+        <!-- remove directories, hopefully this fails silently. mkdir does not and stops the process these exist.-->
+        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${pom.version}/docs" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${pom.version}/downloads" trust="true" />
         <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
         <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm ${build.dir}/docs.zip" trust="true" />
         <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${pom.version}/downloads " trust="true" />