Author: everett
Date: Thu Jun 5 21:58:07 2014
New Revision: 1600776
URL: http://svn.apache.org/r1600776
Log:
deploy jclouds site content
Added:
jclouds/site-content/deploy-javadoc.sh (with props)
Modified:
jclouds/site-content/reference/javadoc/index.html
jclouds/site-content/releasenotes/1.7.2/index.html
jclouds/site-content/releasenotes/1.7.3/index.html
jclouds/site-content/releasenotes/atom.xml
jclouds/site-content/releasenotes/index.html
Added: jclouds/site-content/deploy-javadoc.sh
URL:
http://svn.apache.org/viewvc/jclouds/site-content/deploy-javadoc.sh?rev=1600776&view=auto
==============================================================================
--- jclouds/site-content/deploy-javadoc.sh (added)
+++ jclouds/site-content/deploy-javadoc.sh Thu Jun 5 21:58:07 2014
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+set -o errexit
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+JAVA_VERSION=`mvn --version | grep "Java version" | awk '{print $3}' | sed
's/,//' | cut -c 3`
+
+if [ "$JAVA_VERSION" -lt "7" ]; then
+ echo "Use Java 1.7+ to generate the Javadoc."
+ exit 1
+fi
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 <JCLOUDS_VERSION>"
+ exit 1
+fi
+
+JCLOUDS_VERSION=$1
+JCLOUDS_VERSION_X=`echo $JCLOUDS_VERSION | cut -c 1-3 | awk '{print $1".x"}'`
+
+cd $TMPDIR
+
+for name in jclouds jclouds-labs-openstack; do
+ rm -rf ${name}
+ git clone https://github.com/jclouds/${name}.git
+ cd ${name}
+ git checkout ${JCLOUDS_VERSION_X}
+ git reset --hard ${name}-${JCLOUDS_VERSION}
+ cd ..
+done
+
+apis="openstack-glance openstack-neutron openstack-swift openstack-marconi
rackspace-autoscale rackspace-cloudfiles"
+
+for api in ${apis}; do
+ mv jclouds-labs-openstack/${api} jclouds/apis/
+ sed -i ""
"s#<module>route53</module>#<module>route53</module><module>${api}</module>#g"
jclouds/apis/pom.xml
+done
+
+providers="rackspace-autoscale-us rackspace-cloudqueues-us
rackspace-cloudqueues-uk rackspace-cloudfiles-uk rackspace-cloudfiles-us"
+
+for provider in ${providers}; do
+ mv jclouds-labs-openstack/${provider} jclouds/providers/
+ sed -i ""
"s#<module>dynect</module>#<module>dynect</module><module>${provider}</module>#g"
jclouds/providers/pom.xml
+done
+
+cd jclouds
+mvn clean javadoc:aggregate -Dnotimestamp=true -DadditionalJOption=-J-Xmx512m
+
+cd $DIR/site-content
+
+mkdir -p reference/javadoc/$JCLOUDS_VERSION_X/
+rsync -r --ignore-times $TMPDIR/jclouds/target/site/apidocs/
reference/javadoc/$JCLOUDS_VERSION_X/
+
+svn status | awk '/^\?/{print $2}' | \
+ while read filename; do svn --no-auto-props add $filename; done
+
+if [ -z "$(svn status)" ]; then
+ echo "No modified files in svn"
+else
+ echo "Modified files in svn:"
+
+ svn status
+
+ read -p "Are you sure you want to deploy the above changes? (y|n) " -n 1 -r
+ echo
+
+ svn commit --message 'deploy jclouds javadoc site content'
+fi
Propchange: jclouds/site-content/deploy-javadoc.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: jclouds/site-content/reference/javadoc/index.html
URL:
http://svn.apache.org/viewvc/jclouds/site-content/reference/javadoc/index.html?rev=1600776&r1=1600775&r2=1600776&view=diff
==============================================================================
--- jclouds/site-content/reference/javadoc/index.html (original)
+++ jclouds/site-content/reference/javadoc/index.html Thu Jun 5 21:58:07 2014
@@ -150,7 +150,7 @@
<h1>Javadoc for Apache jclouds</h1>
</div>
<ul>
-<li><a href="/reference/javadoc/1.7.2/">1.7.2</a></li>
+<li><a href="/reference/javadoc/1.7.x/">1.7.x</a></li>
</ul>
Modified: jclouds/site-content/releasenotes/1.7.2/index.html
URL:
http://svn.apache.org/viewvc/jclouds/site-content/releasenotes/1.7.2/index.html?rev=1600776&r1=1600775&r2=1600776&view=diff
==============================================================================
--- jclouds/site-content/releasenotes/1.7.2/index.html (original)
+++ jclouds/site-content/releasenotes/1.7.2/index.html Thu Jun 5 21:58:07 2014
@@ -201,7 +201,7 @@
<ul>
-<li>Here is the <a href="/reference/javadoc/1.7.2/">Javadoc</a> for the new
Swift and Cloud Files classes.</li>
+<li>Here is the <a href="/reference/javadoc/1.7.x/">Javadoc</a> for the new
Swift and Cloud Files classes.</li>
</ul>
Modified: jclouds/site-content/releasenotes/1.7.3/index.html
URL:
http://svn.apache.org/viewvc/jclouds/site-content/releasenotes/1.7.3/index.html?rev=1600776&r1=1600775&r2=1600776&view=diff
==============================================================================
--- jclouds/site-content/releasenotes/1.7.3/index.html (original)
+++ jclouds/site-content/releasenotes/1.7.3/index.html Thu Jun 5 21:58:07 2014
@@ -199,6 +199,11 @@
</code></pre></div>
+<ul>
+<li>Here is the <a href="/reference/javadoc/1.7.x/">Javadoc</a> for the new
Swift and Cloud Files classes.</li>
+</ul>
+
+
<h2><a id="issues"></a>Known Issues</h2>
<ul>
Modified: jclouds/site-content/releasenotes/atom.xml
URL:
http://svn.apache.org/viewvc/jclouds/site-content/releasenotes/atom.xml?rev=1600776&r1=1600775&r2=1600776&view=diff
==============================================================================
--- jclouds/site-content/releasenotes/atom.xml (original)
+++ jclouds/site-content/releasenotes/atom.xml Thu Jun 5 21:58:07 2014
@@ -60,6 +60,11 @@
</code></pre></div>
+<ul>
+<li>Here is the <a href="/reference/javadoc/1.7.x/">Javadoc</a> for the new
Swift and Cloud Files classes.</li>
+</ul>
+
+
<h2><a id="issues"></a>Known Issues</h2>
<ul>
@@ -151,7 +156,7 @@
<ul>
-<li>Here is the <a href="/reference/javadoc/1.7.2/">Javadoc</a> for the new
Swift and Cloud Files classes.</li>
+<li>Here is the <a href="/reference/javadoc/1.7.x/">Javadoc</a> for the new
Swift and Cloud Files classes.</li>
</ul>
Modified: jclouds/site-content/releasenotes/index.html
URL:
http://svn.apache.org/viewvc/jclouds/site-content/releasenotes/index.html?rev=1600776&r1=1600775&r2=1600776&view=diff
==============================================================================
--- jclouds/site-content/releasenotes/index.html (original)
+++ jclouds/site-content/releasenotes/index.html Thu Jun 5 21:58:07 2014
@@ -152,10 +152,10 @@
<p>The Release Notes and Javadocs for every major release of
Apache jclouds are listed chronologically below.</p>
<ul>
-<li><a href="/releasenotes/1.7.3">1.7.3</a> | TBD</li>
-<li><a href="/releasenotes/1.7.2">1.7.2</a> | <a
href="/reference/javadoc/1.7.2/">Javadoc</a></li>
-<li><a href="/releasenotes/1.7.1">1.7.1</a> | <a
href="http://demobox.github.io/jclouds-maven-site-1.7.1/1.7.1/jclouds/apidocs/";>Javadoc</a></li>
-<li><a href="/releasenotes/1.7.0">1.7.0</a> | <a
href="http://demobox.github.io/jclouds-maven-site-1.7.0/1.7.0/jclouds/apidocs/";>Javadoc</a></li>
+<li><a href="/releasenotes/1.7.3">1.7.3</a> | <a
href="/reference/javadoc/1.7.x/">Javadoc</a></li>
+<li><a href="/releasenotes/1.7.2">1.7.2</a> | <a
href="/reference/javadoc/1.7.x/">Javadoc</a></li>
+<li><a href="/releasenotes/1.7.1">1.7.1</a> | <a
href="/reference/javadoc/1.7.x/">Javadoc</a></li>
+<li><a href="/releasenotes/1.7.0">1.7.0</a> | <a
href="/reference/javadoc/1.7.x/">Javadoc</a></li>
<li><a href="/releasenotes/1.6.3">1.6.3</a> | <a
href="http://demobox.github.io/jclouds-maven-site-1.6.3/1.6.3/jclouds/apidocs/";>Javadoc</a></li>
<li><a href="/releasenotes/1.6.2">1.6.2</a> | <a
href="http://demobox.github.io/jclouds-maven-site-1.6.2/1.6.2-incubating/jclouds/apidocs/";>Javadoc</a></li>
<li><a href="/releasenotes/1.6.1">1.6.1</a> | <a
href="http://demobox.github.io/jclouds-maven-site-1.6.1/1.6.1-incubating/jclouds/apidocs/";>Javadoc</a></li>
