diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-05-20 23:24:56 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-05-20 23:24:56 +0000 |
| commit | be9170cad2ec4f632323cf45d87144af97a74c1f (patch) | |
| tree | d3c7fd2e4dc57fb3979f79638c1735c652936143 /www-servers/tomcat/files | |
| parent | Don't force ecj compiler as requested in bug #145338. Go back to using 256m l... (diff) | |
| download | gentoo-2-be9170cad2ec4f632323cf45d87144af97a74c1f.tar.gz gentoo-2-be9170cad2ec4f632323cf45d87144af97a74c1f.tar.bz2 gentoo-2-be9170cad2ec4f632323cf45d87144af97a74c1f.zip | |
Switched init/conf.d file to use GENTOO_VM instead of JAVA_HOME.
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-servers/tomcat/files')
| -rw-r--r-- | www-servers/tomcat/files/5.5/tomcat.conf.2 | 6 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/5.5/tomcat.init.2 | 5 | ||||
| -rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.23-r5 (renamed from www-servers/tomcat/files/digest-tomcat-5.5.23-r4) | 0 |
3 files changed, 7 insertions, 4 deletions
diff --git a/www-servers/tomcat/files/5.5/tomcat.conf.2 b/www-servers/tomcat/files/5.5/tomcat.conf.2 index b1cb95d3bc37..8e33bfc34103 100644 --- a/www-servers/tomcat/files/5.5/tomcat.conf.2 +++ b/www-servers/tomcat/files/5.5/tomcat.conf.2 @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf.2,v 1.1 2007/05/15 04:37:21 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf.2,v 1.2 2007/05/20 23:24:56 wltjr Exp $ # JVM Runtime # Using the default setting, it will determine your JVM from the system-vm @@ -6,9 +6,9 @@ # See java-config(1) manual page for assistance in determining this value. # # You can override this value with whatever path you wish. -# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05 +# Example: GENTOO_VM="sun-jdk-1.5" -JAVA_HOME=`java-config --jre-home` +#GENTOO_VM="sun-jdk-1.5" # (Optional) Java runtime options used when the "start", "stop", or "run" # commands are executed. diff --git a/www-servers/tomcat/files/5.5/tomcat.init.2 b/www-servers/tomcat/files/5.5/tomcat.init.2 index a97dc5a3d7be..43cf79b0d665 100755 --- a/www-servers/tomcat/files/5.5/tomcat.init.2 +++ b/www-servers/tomcat/files/5.5/tomcat.init.2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.5 2007/05/20 23:11:45 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.6 2007/05/20 23:24:56 wltjr Exp $ init_env_vars() { if [ "$(gjl -p tomcat-5.5 --get-vm)" ] ; then @@ -11,6 +11,9 @@ init_env_vars() { eend 1 fi + # Populate JAVA_HOME + JAVA_HOME=`java-config --jre-home` + # Set some sane defaults if [ -z "${CATALINA_TMPDIR}" ] ; then CATALINA_TMPDIR="${CATALINA_BASE}"/temp diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r4 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r5 index e0e59f68fbb2..e0e59f68fbb2 100644 --- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r4 +++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r5 |