Adding Java 7 support

- modifying bosh templates to support new Java 7 runtime - adding Java 7 as runtime for standalone apps - adding Java 7 as runtime for jvm based web frameworks - adding Java 7 package - adding Java 7 blobs - bump submodule pointer of core to "Adding Java 7 support" Change-Id: I0981f06f87bc940b0dd4cec41e9c2a99989cfac5
cloudfoundry-attic · Jun 22, 2012 · d0ea5a0 · d0ea5a0
1 parent 26f942e
commit d0ea5a0
Show file tree

Hide file tree

Showing 21 changed files with 168 additions and 1 deletion.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -75,6 +75,14 @@ java/jre-1.6.0_24.tar.gz:
   object_id: eyJvaWQiOiI0ZTRlNzhiY2E1MWUxMjIwMDRlNGU4ZWM2ODQwNzcwNGYzMDY4%0AZDQzMzRhNyIsInNpZyI6InRGclltRjJGUURNNDhRS2VaaGZKSkx4Nkt2ST0i%0AfQ==%0A
   sha: 20c6f2cd888b0b01eafdd8f1d6285569ecdca904
   size: 36132629
+java/jre-7u4-linux-i586.tar.gz:
+  object_id: eyJzaWciOiJhZTAzTkVsbUZwRjZpUDVTcmdDS1FFaXFJanM9Iiwib2lkIjoi%0ANGU0ZTc4YmNhMzFlMTIyMDA0ZTRlOGVjNjQ2ZTIxMDRmZDU2NDVmZWMxNDQi%0AfQ==%0A
+  sha: b8eee3f910083f5b7f490df75dcae9544da1f964
+  size: 34239229
+java/jre-7u4-linux-x64.tar.gz:
+  object_id: eyJzaWciOiJ4a3ltQW1ncitIa0hRUkdlUi9jeGpoSEEraFU9Iiwib2lkIjoi%0ANGU0ZTc4YmNhNDFlMTIxMjA0ZTRlODZlZTUzOTIxMDRmZDU0MjY2MTZiODEi%0AfQ==%0A
+  sha: 1108d1744baa73bf6caa2adf965d0f489ea1ef60
+  size: 32771159
 hbase/native-lib.tar.gz:
   object_id: eyJvaWQiOiI0ZTRlNzhiY2E2MWUxMjEwMDRlNGU3ZDUxZDk1MGUwNGYzMDY4%0AZTQ5ODhjOCIsInNpZyI6IkFlK1c2bGlOVFVqSGk2alB0Q3IzUlBOR3pvdz0i%0AfQ==%0A
   sha: 8d35c05ce07f0af4a19926fb1497ba101b4116ba

diff --git a/jobs/cloud_controller/spec b/jobs/cloud_controller/spec
@@ -35,6 +35,7 @@ packages:
   - dea_ruby18
   - dea_ruby19
   - dea_jvm
+  - dea_jvm7
   - dea_transition
   - dea_seed
   - syslog_aggregator

diff --git a/jobs/cloud_controller/templates/cloud_controller.yml.erb b/jobs/cloud_controller/templates/cloud_controller.yml.erb
@@ -227,5 +227,10 @@ runtimes:
     debug_modes:
       - run
       - suspend
+  java7:
+    version: 1.7.0
+    debug_modes:
+      - run
+      - suspend
   erlangR14B02:
     version: ".* 5.8.3"
diff --git a/jobs/cloud_controller/templates/grails_staging.yml b/jobs/cloud_controller/templates/grails_staging.yml
@@ -11,6 +11,15 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/cloud_controller/templates/java_web_staging.yml b/jobs/cloud_controller/templates/java_web_staging.yml
@@ -11,6 +11,15 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/cloud_controller/templates/lift_staging.yml b/jobs/cloud_controller/templates/lift_staging.yml
@@ -13,6 +13,17 @@ runtimes:
         # via the staged resources/generate_server_xml script.
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      default: false
+      environment:
+        # Ruby needed here to generate Tomcat server.xml
+        # via the staged resources/generate_server_xml script.
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/cloud_controller/templates/play_staging.yml b/jobs/cloud_controller/templates/play_staging.yml
@@ -11,6 +11,15 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_jvm/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_jvm7/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 detection:
   - "lib/play.*.jar": true
diff --git a/jobs/cloud_controller/templates/spring_staging.yml b/jobs/cloud_controller/templates/spring_staging.yml
@@ -11,6 +11,15 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/cloud_controller/templates/standalone_staging.yml b/jobs/cloud_controller/templates/standalone_staging.yml
@@ -10,6 +10,14 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_jvm/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      environment:
+        path: /var/vcap/packages/dea_jvm7/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
   - ruby18:
       description: Ruby 1.8
       version: 1.8.7

diff --git a/jobs/dea/spec b/jobs/dea/spec
@@ -17,6 +17,7 @@ packages:
 - dea_node04
 - dea_node06
 - dea_jvm
+- dea_jvm7
 - dea_transition
 - syslog_aggregator
 - libpq
diff --git a/jobs/dea/templates/dea.yml.erb b/jobs/dea/templates/dea.yml.erb
@@ -62,3 +62,16 @@ runtimes:
         - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
       suspend:
         - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
+  java7:
+    executable: /var/vcap/packages/dea_jvm7/bin/java
+    version: 1.7.0
+    version_flag: '-version'
+    environment:
+      PATH: /var/vcap/packages/ruby/bin:$PATH
+      JAVA_HOME: /var/vcap/packages/dea_jvm7
+      LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:$LIBRARY_PATH'
+    debug_env:
+      run:
+        - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
+      suspend:
+        - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
diff --git a/jobs/stager/spec b/jobs/stager/spec
@@ -31,6 +31,7 @@ packages:
 - dea_ruby18
 - dea_ruby19
 - dea_jvm
+- dea_jvm7
 - dea_transition
 - dea_seed
 - syslog_aggregator

diff --git a/jobs/stager/templates/manifests/grails.yml b/jobs/stager/templates/manifests/grails.yml
@@ -10,6 +10,14 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/stager/templates/manifests/java_web.yml b/jobs/stager/templates/manifests/java_web.yml
@@ -10,6 +10,14 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/stager/templates/manifests/lift.yml b/jobs/stager/templates/manifests/lift.yml
@@ -12,6 +12,16 @@ runtimes:
         # via the staged resources/generate_server_xml script.
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      default: false
+      environment:
+        # Ruby needed here to generate Tomcat server.xml
+        # via the staged resources/generate_server_xml script.
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/stager/templates/manifests/play.yml b/jobs/stager/templates/manifests/play.yml
@@ -11,6 +11,15 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_jvm/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_jvm7/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 detection:
   - "lib/play.*.jar": true
diff --git a/jobs/stager/templates/manifests/spring.yml b/jobs/stager/templates/manifests/spring.yml
@@ -10,6 +10,14 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_ruby18/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      default: false
+      environment:
+        path: /var/vcap/packages/dea_ruby18/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
 
 app_servers:
   - tomcat:

diff --git a/jobs/stager/templates/manifests/standalone.yml b/jobs/stager/templates/manifests/standalone.yml
@@ -10,6 +10,14 @@ runtimes:
       environment:
         path: /var/vcap/packages/dea_jvm/bin:$PATH
         java_home: /var/vcap/packages/dea_jvm
+  - java7:
+      description: Java 7
+      version: 1.7
+      executable: /var/vcap/packages/dea_jvm7/bin/java
+      staging: /var/vcap/packages/ruby/bin/ruby stage
+      environment:
+        path: /var/vcap/packages/dea_jvm7/bin:$PATH
+        java_home: /var/vcap/packages/dea_jvm7
   - ruby18:
       description: Ruby 1.8
       version: 1.8.7

diff --git a/packages/dea_jvm7/packaging b/packages/dea_jvm7/packaging
@@ -0,0 +1,27 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+if [[ `uname -a` =~ "x86_64" ]] ; then
+  archive="java/jre-7u4-linux-x64.tar.gz"
+  echo "Using 64-bit version"
+else
+  archive="java/jre-7u4-linux-i586.tar.gz"
+  echo "Using 32-bit version"
+fi
+
+if [[ -f $archive ]] ; then
+  echo "Archive found"
+else
+  echo "Archive not found"
+  exit 1
+fi
+
+echo "Extracting archive..."
+tar xzf $archive
+
+if [[ -d bin && `bin/java -version 2>&1` =~ "Java HotSpot" && $? == 0 ]]; then
+  cp -a * ${BOSH_INSTALL_TARGET}
+else
+  echo "JVM is not properly packaged"
+  exit 1
+fi
diff --git a/packages/dea_jvm7/spec b/packages/dea_jvm7/spec
@@ -0,0 +1,5 @@
+---
+name: dea_jvm7
+files:
+- java/jre-7u4-linux-i586.tar.gz
+- java/jre-7u4-linux-x64.tar.gz
diff --git a/src/core b/src/core