Return-Path: 
 <commits-return-3351-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org>
Delivered-To: apmail-openjpa-commits-archive@www.apache.org
Received: (qmail 66634 invoked from network); 9 Sep 2008 15:09:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Sep 2008 15:09:54 -0000
Received: (qmail 19725 invoked by uid 500); 9 Sep 2008 15:09:52 -0000
Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org
Received: (qmail 19705 invoked by uid 500); 9 Sep 2008 15:09:51 -0000
Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openjpa.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openjpa.apache.org>
List-Post: <mailto:commits@openjpa.apache.org>
List-Id: <commits.openjpa.apache.org>
Reply-To: dev@openjpa.apache.org
Delivered-To: mailing list commits@openjpa.apache.org
Received: (qmail 19696 invoked by uid 99); 9 Sep 2008 15:09:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 08:09:51 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 15:09:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6260E2388986; Tue,  9 Sep 2008 08:09:33 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r693481 - /openjpa/trunk/openjpa-project/pom.xml
Date: Tue, 09 Sep 2008 15:09:33 -0000
To: commits@openjpa.apache.org
From: mikedd@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080909150933.6260E2388986@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mikedd
Date: Tue Sep  9 08:09:32 2008
New Revision: 693481

URL: http://svn.apache.org/viewvc?rev=693481&view=rev
Log:
OPENJPA-695 making nightly-upload profile more friendly.

Modified:
    openjpa/trunk/openjpa-project/pom.xml

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=693481&r1=693480&r2=693481&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Tue Sep  9 08:09:32 2008
@@ -79,6 +79,10 @@
         <docbook.target>${project.basedir}/target/manual</docbook.target>
         <docbook.version>1.67.2</docbook.version>
         <local.repository>${settings.localRepository}</local.repository>
+
+        <!-- authentication for nightly uploads -->
+        <nightly.user.name>${user.name}</nightly.user.name>
+        <nightly.password>passw0rd</nightly.password>
         </properties>
 
         <build>
@@ -303,6 +307,17 @@
                 </pluginRepository>
             </pluginRepositories>
         </profile>
+        <!-- 
+          Upload distribution files, javadoc and manual to openjpa.apache.org/builds/latest. 
+          This profile is designed to be run nightly by a continuous build server, but can
+          also be run manually.
+
+          The nightly.user.name and nightly.password properties need to be set prior to using
+          this profile, ie : 
+          $ mvn -Dnightly.user.name=mikedd -Dnightly.password=mikesPassword -Pnightly-upload package
+          or (using a profile defined in $user.home/.m2/settings.xml )
+          $ mvn -Pnightly-upload,mikes-nightly-credentials package
+          -->
         <profile>
             <id>nightly-upload</id>
             <build>
@@ -313,7 +328,7 @@
                             <execution>
                                 <phase>package</phase>
                                 <configuration>
-                                    <tasks> 
+                                    <tasks>
                                         <mkdir dir="target/site/tempDocs"/>
                                         <unzip dest="target/site/tempDocs">
                                             <fileset dir="target/site/downloads">
@@ -324,29 +339,23 @@
                                                 <include name="**/manual/**"/>
                                             </patternset>
                                         </unzip>
-                                        <chmod perm="g+rw">
-                                             <fileset dir="target/site/downloads"/>
-                                        </chmod>
-                                        <!-- chmod returns 255 on the javadoc and manual dirs -->
-                                        <exec executable="chmod">
-                                            <arg value="-R"/>
-                                            <arg value="g+w"/>
-                                            <arg value="target/site/tempDocs"/>
-                                        </exec>
+                                        <move todir="target/site/tempDocs/docs">
+                                            <fileset dir="target/site/tempDocs/apache-openjpa-${pom.version}/docs"/> 
+                                        </move>
+                                        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/latest/downloads">
+                                            <fileset dir="target/site/downloads"/>
+                                        </scp>
                                         
-                                        <!-- From the ant manual if we need to 
-                                             preserve permissions we should use exec
-                                          -->
-                                        <exec executable="scp">
-                                            <arg value="-rp"/>
-                                            <arg value="target/site/downloads"/>
-                                            <arg value="people.apache.org:/www/openjpa.apache.org/builds/latest/"/>
-                                        </exec>
-                                        <exec executable="scp">
-                                            <arg value="-rp"/>
-                                            <arg value="target/site/tempDocs/apache-openjpa-${pom.version}/docs/"/>
-                                            <arg value="people.apache.org:/www/openjpa.apache.org/builds/latest/"/>
-                                        </exec>
+                                        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/latest/docs">
+                                            <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/latest"/>
+                                        <delete>
+                                            <fileset dir="target/site/tempDocs"/>
+                                        </delete>
                                     </tasks>
                                 </configuration>
                                 <goals>
@@ -354,6 +363,13 @@
                                 </goals>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ant</groupId>
+                                <artifactId>ant-jsch</artifactId>
+                                <version>1.7.0</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                 </plugins>
             </build>