Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-16 15:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert back to openjdk6 and without implicit apt-upgrade

Browse Source
This commit is contained in:
Adrian Cole 2012-04-11 17:00:49 -06:00
parent 23cb01f977
commit 5a3d2a11d6
5 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compute/src/test/resources/initscript_with_java.sh
View File

@ -154,14 +154,9 @@ END_OF_JCLOUDS_FILE
function installOpenJDK() {
if hash apt-get 2>/dev/null; then
pkg=openjdk-7-jdk
(apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )) &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk*|grep -v common`
# ex. lucid where jdk 7 is not present
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-6-openjdk}
test -d $JAVA_HOME || apt-get-install openjdk-6-jdk
elif hash yum 2>/dev/null; then
#TODO: find a jdk7 yum repo
export pkg=java-1.6.0-openjdk-devel
yum --nogpgcheck -y install $pkg &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`

5
compute/src/test/resources/initscript_with_jboss.sh
View File

@ -154,14 +154,9 @@ END_OF_JCLOUDS_FILE
function installOpenJDK() {
if hash apt-get 2>/dev/null; then
pkg=openjdk-7-jdk
(apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )) &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk*|grep -v common`
# ex. lucid where jdk 7 is not present
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-6-openjdk}
test -d $JAVA_HOME || apt-get-install openjdk-6-jdk
elif hash yum 2>/dev/null; then
#TODO: find a jdk7 yum repo
export pkg=java-1.6.0-openjdk-devel
yum --nogpgcheck -y install $pkg &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`

5
compute/src/test/resources/runscript.sh
View File

@ -154,14 +154,9 @@ END_OF_JCLOUDS_FILE
function installOpenJDK() {
if hash apt-get 2>/dev/null; then
pkg=openjdk-7-jdk
(apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )) &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk*|grep -v common`
# ex. lucid where jdk 7 is not present
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-6-openjdk}
test -d $JAVA_HOME || apt-get-install openjdk-6-jdk
elif hash yum 2>/dev/null; then
#TODO: find a jdk7 yum repo
export pkg=java-1.6.0-openjdk-devel
yum --nogpgcheck -y install $pkg &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`

5
scriptbuilder/src/main/resources/functions/installOpenJDK.sh
View File

@ -19,14 +19,9 @@ END_OF_JCLOUDS_FILE
function installOpenJDK() {
if hash apt-get 2>/dev/null; then
pkg=openjdk-7-jdk
(apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )) &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk*|grep -v common`
# ex. lucid where jdk 7 is not present
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-6-openjdk}
test -d $JAVA_HOME || apt-get-install openjdk-6-jdk
elif hash yum 2>/dev/null; then
#TODO: find a jdk7 yum repo
export pkg=java-1.6.0-openjdk-devel
yum --nogpgcheck -y install $pkg &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`

5
scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
View File

@ -154,14 +154,9 @@ END_OF_JCLOUDS_FILE
function installOpenJDK() {
if hash apt-get 2>/dev/null; then
pkg=openjdk-7-jdk
(apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )) &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk*|grep -v common`
# ex. lucid where jdk 7 is not present
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-6-openjdk}
test -d $JAVA_HOME || apt-get-install openjdk-6-jdk
elif hash yum 2>/dev/null; then
#TODO: find a jdk7 yum repo
export pkg=java-1.6.0-openjdk-devel
yum --nogpgcheck -y install $pkg &&
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`