Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7063435 tomcat package missing dependency on java
authorRich Burridge <rich.burridge@oracle.com>
Mon, 31 Oct 2011 12:43:57 -0700
changeset 555 f8fe8d6e1917
parent 554 0ed48135019d
child 556 9091af512d03
7063435 tomcat package missing dependency on java
components/tomcat/patches/env.patch file | annotate | diff | comparison | revisions
components/tomcat/tomcat.p5m file | annotate | diff | comparison | revisions 
--- a/components/tomcat/patches/env.patch	Mon Oct 31 03:15:38 2011 -0700
+++ b/components/tomcat/patches/env.patch	Mon Oct 31 12:43:57 2011 -0700
@@ -14,7 +14,7 @@
  
 +# For Solaris
 +if $solaris; then
-+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/java
++  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0
 +fi
 +
  # Get standard Java environment variables
@@ -39,7 +39,7 @@
  
 +# For Solaris
 +if $solaris; then
-+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/java
++  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0
 +fi
 +
  # Get standard Java environment variables
--- a/components/tomcat/tomcat.p5m	Mon Oct 31 03:15:38 2011 -0700
+++ b/components/tomcat/tomcat.p5m	Mon Oct 31 12:43:57 2011 -0700
@@ -294,6 +294,8 @@
 legacy pkg=SUNWtcat desc="Tomcat Servlet/JSP Container" \
     name="Tomcat Servlet/JSP Container"
 
+depend fmri=__TBD pkg.debug.depend.file=usr/jdk/instances/jdk1.6.0/bin/java \
+    type=require
 
 license tomcat.license license="Apache v2.0"
 link path=etc/tomcat6 target=../var/tomcat6/conf
upstream/oracle/userland-gate