Merge "Upgrade the JVM used by the UAA to jdk1.6u35"

cloudfoundry-attic · Oct 16, 2012 · 8005f48 · 8005f48
2 parents 45282c6 + a09595d
commit 8005f48
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -603,3 +603,7 @@ postgresql/postgresql-9.1-x86_64.tar.gz:
   object_id: eyJvaWQiOiI0ZTRlNzhiY2E2MWUxMjEyMDRlNGU4NmVlYmU1OTEwNTA3NDk1%0AMDgzNWQ4MCIsInNpZyI6IjNSYks4Qk5tcFlhMHA3ejdVeVZpQjVpZ3hxND0i%0AfQ==%0A
   sha: d6c44760c1e5eb055b6ac4a8080b061d6d04fa3c
   size: 26556736
+uaa/jdk1.6.0_35.tar.gz:
+  object_id: eyJvaWQiOiI0ZTRlNzhiY2E1MWUxMjEwMDRlNGU3ZDUxOTA2Y2QwNTA3YzVk%0AODNlZDNlYSIsInNpZyI6IjJoU0Z3OXE0bHh1SzBaUmh6R1BkMnlscWJpaz0i%0AfQ==%0A
+  sha: 47ead45c658f9c72577d202d8aa1675461ee3ad6
+  size: 67126391
diff --git a/jobs/login/spec b/jobs/login/spec
@@ -14,6 +14,5 @@ templates:
 packages:
   - common
   - ruby
-  - dea_jvm
   - syslog_aggregator
   - login
diff --git a/jobs/login/templates/login_ctl.erb b/jobs/login/templates/login_ctl.erb
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/dea_jvm/bin:$PATH
+export PATH=/var/vcap/packages/login/jre/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/login
 LOG_DIR=/var/vcap/sys/log/login
 JOB_DIR=/var/vcap/jobs/login

diff --git a/jobs/uaa/spec b/jobs/uaa/spec
@@ -15,6 +15,5 @@ templates:
 packages:
   - common
   - ruby
-  - dea_jvm
   - syslog_aggregator
   - uaa
diff --git a/jobs/uaa/templates/uaa_ctl.erb b/jobs/uaa/templates/uaa_ctl.erb
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/dea_jvm/bin:$PATH
+export PATH=/var/vcap/packages/uaa/jre/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/uaa
 LOG_DIR=/var/vcap/sys/log/uaa
 JOB_DIR=/var/vcap/jobs/uaa

diff --git a/packages/login/packaging b/packages/login/packaging
@@ -1,6 +1,16 @@
 # abort script on any command that exit with a non zero value
 set -e
 
+cd ${BOSH_INSTALL_TARGET}
+tar zxvf ${BOSH_COMPILE_TARGET}/uaa/jdk1.6.0_35.tar.gz
+if [[ $? != 0 ]] ; then
+  echo "Cannot unpack JDK"
+  exit 1
+fi
+
+mv jdk1.6.0_35 jdk
+ln -s jdk/jre
+
 cd ${BOSH_INSTALL_TARGET}
 
 tar zxvf ${BOSH_COMPILE_TARGET}/uaa/apache-tomcat-7.0.32.tar.gz

diff --git a/packages/uaa/packaging b/packages/uaa/packaging
@@ -1,6 +1,16 @@
 # abort script on any command that exit with a non zero value
 set -e
 
+cd ${BOSH_INSTALL_TARGET}
+tar zxvf ${BOSH_COMPILE_TARGET}/uaa/jdk1.6.0_35.tar.gz
+if [[ $? != 0 ]] ; then
+  echo "Cannot unpack JDK"
+  exit 1
+fi
+
+mv jdk1.6.0_35 jdk
+ln -s jdk/jre
+
 cd ${BOSH_INSTALL_TARGET}
 
 tar zxvf ${BOSH_COMPILE_TARGET}/uaa/apache-tomcat-7.0.32.tar.gz