From ec35dff0935d976f2915d8cedf9e52f824fcd06e Mon Sep 17 00:00:00 2001
From: Michael Dick <mikedd@apache.org>
Date: Fri, 24 Jul 2009 13:52:15 +0000
Subject: [PATCH] Moving nightly upload ant script to a separate file

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@797456 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-project/pom.xml    | 33 +++++----------------------------
 openjpa-project/upload.xml | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 28 deletions(-)
 create mode 100644 openjpa-project/upload.xml

diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index a653ffdb6..abb498cd7 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -391,34 +391,11 @@
                                 <phase>package</phase>
                                 <configuration>
                                     <tasks>
-                                        <mkdir dir="target/site/tempDocs" />
-                                        <unzip dest="target/site/tempDocs">
-                                            <fileset dir="target/site/downloads">
-                                                <include name="*binary*.zip" />
-                                            </fileset>
-                                            <patternset>
-                                                <include name="**/javadoc/**" />
-                                                <include name="**/manual/**" />
-                                            </patternset>
-                                        </unzip>
-                                        <move todir="target/site/tempDocs/docs">
-                                            <fileset dir="target/site/tempDocs/apache-openjpa-${pom.version}/docs" /> 
-                                        </move>
-                                        <checksum> 
-                                            <fileset dir="target/site/downloads/">
-                                                <include name="*.zip" />
-                                            </fileset>
-                                        </checksum>
-                                        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/downloads" trust="true">
-                                            <fileset dir="target/site/downloads" />
-                                        </scp>
-                                        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/docs" trust="true">
-                                            <fileset dir="target/site/tempDocs/docs" /> 
-                                        </scp>
-                                        <sshexec host="people.apache.org" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w /www/openjpa.apache.org/builds/${nightly.version}" trust="true" />
-                                        <delete>
-                                            <fileset dir="target/site/tempDocs" />
-                                        </delete>
+                                        <ant antfile="upload.xml" target="upload" unheritRefs="true">
+                                            <property name="${nightly.user.name}" value="${nightly.user.name}"/>
+                                            <property name="${nightly.password}" value="${nightly.password}"/>
+                                            <property name="${nightly.version}" value="${nightly.version}"/>
+                                        </ant>
                                     </tasks>
                                 </configuration>
                                 <goals>
diff --git a/openjpa-project/upload.xml b/openjpa-project/upload.xml
new file mode 100644
index 000000000..05686a153
--- /dev/null
+++ b/openjpa-project/upload.xml
@@ -0,0 +1,36 @@
+<project name="upload" default="dist" basedir=".">
+    <description>
+        Ant build file used to upload binaries to openjpa.apache.org/builds/latest. 
+    </description>
+    <target name="upload">
+        <mkdir dir="target/site/tempDocs" />
+        <unzip dest="target/site/tempDocs">
+            <fileset dir="target/site/downloads">
+                <include name="*binary*.zip" />
+            </fileset>
+            <patternset>
+                <include name="**/javadoc/**" />
+                <include name="**/manual/**" />
+            </patternset>
+        </unzip>
+        <move todir="target/site/tempDocs/docs">
+            <fileset dir="target/site/tempDocs/apache-openjpa-${pom.version}/docs" /> 
+        </move>
+        <checksum> 
+            <fileset dir="target/site/downloads/">
+                <include name="*.zip" />
+            </fileset>
+        </checksum>
+        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/downloads" trust="true">
+            <fileset dir="target/site/downloads" />
+        </scp>
+        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/docs" trust="true">
+            <fileset dir="target/site/tempDocs/docs" /> 
+        </scp>
+        <sshexec host="people.apache.org" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w /www/openjpa.apache.org/builds/${nightly.version}" trust="true" />
+        <delete>
+            <fileset dir="target/site/tempDocs" />
+        </delete>
+    </target>
+</project>
+