Merge remote branch 'origin/1.0-beta-7' into 1.0-beta-7
diff --git a/tools/antcontrib/samples/cargooverssh/build.xml b/tools/antcontrib/samples/cargooverssh/build.xml
index 5ebf3b0..7cea3a4 100644
--- a/tools/antcontrib/samples/cargooverssh/build.xml
+++ b/tools/antcontrib/samples/cargooverssh/build.xml
@@ -22,7 +22,7 @@
<project xmlns:artifact="urn:maven-artifact-ant" name="cargooverssh" default="cargooverssh" basedir=".">
<property file="build.properties" />
- <property name="jclouds.version" value="1.0-SNAPSHOT" />
+ <property name="jclouds.version" value="1.0-beta-7" />
<property name="privatekeyfile" value="${user.home}/.ssh/id_rsa" />
<property name="publickeyfile" value="${user.home}/.ssh/id_rsa.pub" />
<property name="listenport" value="8080" />
@@ -85,7 +85,7 @@
<target name="create" description="create the nodes ${tag}" >
<compute actions="destroy,create" provider="${url}">
- <nodes tag="${tag}" os="UBUNTU" size="SMALLEST"
+ <nodes tag="${tag}" os="UBUNTU" hardware="SMALLEST"
runscript="runscript.sh" openports="22,${listenport}"
privatekeyfile="${privatekeyfile}" publickeyfile="${publickeyfile}"
hostproperty="host" usernameproperty="username" />
diff --git a/tools/antcontrib/samples/cargooverssh/runscript.sh b/tools/antcontrib/samples/cargooverssh/runscript.sh
index 8dbde3d..6c3f150 100644
--- a/tools/antcontrib/samples/cargooverssh/runscript.sh
+++ b/tools/antcontrib/samples/cargooverssh/runscript.sh
@@ -22,8 +22,8 @@
apt-get upgrade -y -qq
apt-get install -y -qq wget
apt-get install -y -qq openjdk-6-jdk
-wget -q http://mirrors.axint.net/apache/tomcat/tomcat-6/v6.0.24/bin/apache-tomcat-6.0.24.tar.gz
-tar xzf apache-tomcat-6.0.24.tar.gz
+wget -q http://mirrors.axint.net/apache/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.tar.gz
+tar xzf apache-tomcat-6.0.29.tar.gz
mkdir -p /tmp/cargo/containers
chmod 1777 /tmp/cargo
-mv apache-tomcat-6.0.24 /tmp/cargo/containers/tomcat6x
+mv apache-tomcat-6.0.29 /tmp/cargo/containers/tomcat6x
diff --git a/tools/antcontrib/samples/compute/build.xml b/tools/antcontrib/samples/compute/build.xml
index 15a9e0b..6e32cdb 100644
--- a/tools/antcontrib/samples/compute/build.xml
+++ b/tools/antcontrib/samples/compute/build.xml
@@ -21,7 +21,7 @@
<project name="compute" default="dump" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<property file="build.properties" />
- <property name="jclouds.version" value="1.0-SNAPSHOT" />
+ <property name="jclouds.version" value="1.0-beta-7" />
<property name="privatekeyfile" value="${user.home}/.ssh/id_rsa" />
<property name="publickeyfile" value="${user.home}/.ssh/id_rsa.pub" />
@@ -82,8 +82,8 @@
<compute actions="list-images" provider="${jclouds.compute.url}" />
</target>
- <target name="list-hardwares" description="list the hardwares supported">
- <compute actions="list-hardwares" provider="${jclouds.compute.url}" />
+ <target name="list-hardware" description="list the hardware supported">
+ <compute actions="list-sizes" provider="${jclouds.compute.url}" />
</target>
<target name="list-locations" description="list the locations supported">
@@ -91,7 +91,7 @@
</target>
<target name="dump" description="list all information we can obtain about the cloud">
- <compute actions="list-locations,list-hardwares,list-images,list-details" provider="${jclouds.compute.url}" />
+ <compute actions="list-locations,list-sizes,list-images,list-details" provider="${jclouds.compute.url}" />
</target>
<target name="reboot" depends="reboot-id,reboot-tag" />
