Author: dwoods
Date: Thu Oct 21 15:20:01 2010
New Revision: 1026026
URL: http://svn.apache.org/viewvc?rev=1026026&view=rev
Log:
OPENJPA-1836 Update nightly-upload build script to use key/passphrase. Also
had to udpate ref_guide_slice.xml to fix a section id, which had spaces and
created a manual file with spaces which caused chmod failures (used same
section id as 2.0.x.)
Modified:
openjpa/branches/1.2.x/openjpa-project/pom.xml
openjpa/branches/1.2.x/openjpa-project/src/doc/manual/ref_guide_slice.xml
openjpa/branches/1.2.x/openjpa-project/upload.xml
Modified: openjpa/branches/1.2.x/openjpa-project/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/pom.xml?rev=1026026&r1=1026025&r2=1026026&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-project/pom.xml Thu Oct 21 15:20:01 2010
@@ -15,9 +15,9 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
-<!--
+<!--
Maven release plugin requires the project tag to be on a single line.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
@@ -395,6 +395,8 @@
<ant antfile="upload.xml"
target="upload" inheritRefs="true">
<property name="nightly.user.name"
value="${nightly.user.name}" />
<property name="nightly.password"
value="${nightly.password}" />
+ <property name="nightly.keyfile"
value="${nightly.keyfile}" />
+ <property
name="nightly.passphrase" value="${nightly.passphrase}" />
<property name="nightly.version"
value="${nightly.version}" />
<property name="project.version"
value="${project.version}" />
</ant>
Modified:
openjpa/branches/1.2.x/openjpa-project/src/doc/manual/ref_guide_slice.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/src/doc/manual/ref_guide_slice.xml?rev=1026026&r1=1026025&r2=1026026&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/src/doc/manual/ref_guide_slice.xml
(original)
+++ openjpa/branches/1.2.x/openjpa-project/src/doc/manual/ref_guide_slice.xml
Thu Oct 21 15:20:01 2010
@@ -55,7 +55,7 @@
</para>
</section>
- <section id="Features and Limitations">
+ <section id="features_and_limitations">
<title>Salient Features</title>
<section><title>Transparency</title>
<para>
@@ -540,4 +540,4 @@ the JDBC connection URL of a slice.
</section>
</chapter>
-
\ No newline at end of file
+
Modified: openjpa/branches/1.2.x/openjpa-project/upload.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/upload.xml?rev=1026026&r1=1026025&r2=1026026&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/upload.xml (original)
+++ openjpa/branches/1.2.x/openjpa-project/upload.xml Thu Oct 21 15:20:01 2010
@@ -48,24 +48,27 @@
<include name="*.zip" />
</fileset>
</checksum>
-
- <scp
todir="${nightly.user.name}:${nightly.passwo...@${host}:${build.dir}"
trust="true">
+
+ <!-- update ${build.dir}/apache-openjpa-${project.version}/docs -->
+ <scp todir="${nightly.user.na...@${host}:${build.dir}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" trust="true"
sftp="true">
<fileset dir="target/site/tempDocs">
<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-${project.version}/docs" trust="true" />
- <sshexec host="${host}" username="${nightly.user.name}"
password="${nightly.password}" command="rm -Rf
${build.dir}/apache-openjpa-${project.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-${project.version}/downloads " trust="true" />
-
- <scp
todir="${nightly.user.name}:${nightly.passwo...@${host}:${build.dir}/apache-openjpa-${project.version}/downloads"
trust="true">
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf
${build.dir}/apache-openjpa-${project.version}/docs" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="unzip
-qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm
${build.dir}/docs.zip" trust="true" />
+
+ <!-- update ${build.dir}/apache-openjpa-${project.version}/downloads
-->
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf
${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="mkdir
${build.dir}/apache-openjpa-${project.version}/downloads " trust="true" />
+ <scp
todir="${nightly.user.na...@${host}:${build.dir}/apache-openjpa-${project.version}/downloads"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" trust="true">
<fileset dir="target/site/downloads" />
</scp>
- <sshexec host="${host}" username="${nightly.user.name}"
password="${nightly.password}" command="chmod -R g+w
${build.dir}/apache-openjpa-${project.version}" trust="true" />
+ <!-- update ACLs in ${build.dir}/apache-openjpa-${project.version} -->
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="find
${build.dir}/apache-openjpa-${project.version} -user ${nightly.user.name} -type
d | xargs chmod 775" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}"
keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="find
${build.dir}/apache-openjpa-${project.version} -user ${nightly.user.name} -type
f | xargs chmod 664" trust="true" />
<delete>
<fileset dir="target/site/tempDocs" />
