diff -r af823e6595c2 -r 5caab247ea3d components/tomcat/patches/env.patch --- a/components/tomcat/patches/env.patch Tue May 07 12:53:03 2013 -0700 +++ b/components/tomcat/patches/env.patch Tue May 07 12:53:03 2013 -0700 @@ -36,7 +36,7 @@ +# For Solaris +if $solaris; then -+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0 ++ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 +fi + # Get standard Java environment variables @@ -87,7 +87,7 @@ +# For Solaris +if $solaris; then -+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0 ++ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 +fi + # Get standard Java environment variables