Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tomcat/patches/env.patch
changeset 1166 36691b5d318b
parent 788 ab1a623335b6
child 1386 4e8ea821eb75 
--- a/components/tomcat/patches/env.patch	Thu Feb 21 10:32:47 2013 -0800
+++ b/components/tomcat/patches/env.patch	Fri Feb 22 01:07:26 2013 -0800
@@ -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
upstream/oracle/userland-gate