FreeBSD Bugzilla – Attachment 129638 Details for
Bug 173662
www/tomcat7: Add missing features to init script
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
tomcat7.patch
tomcat7.patch (text/plain), 1.61 KB, created by
Victor Balada Diaz
on 2012-11-16 15:30:00 UTC
(
hide
)
Description:
tomcat7.patch
Filename:
MIME Type:
Creator:
Victor Balada Diaz
Created:
2012-11-16 15:30:00 UTC
Size:
1.61 KB
patch
obsolete
>Index: files/tomcat7.in >=================================================================== >--- files/tomcat7.in (revision 307487) >+++ files/tomcat7.in (working copy) >@@ -43,8 +43,10 @@ > # Set the JUL config file > # > # tomcat7_java_home (str): >-# Set to "%%JAVA_HOME%%" by default. >-# Specify the Java VM to use. >+# tomcat7_java_vendor (str): >+# tomcat7_java_version (str): >+# tomcat7_java_os (str): >+# Specify the requirements of the Java VM to use. See javavm(1). > # > # tomcat7_classpath (str): > # Set to "" by default. >@@ -80,8 +82,32 @@ > > load_rc_config "${name}" > >+if [ -n "${tomcat7_java_version}" ] ; then >+ export JAVA_VERSION="${tomcat7_java_version}" >+fi >+ >+if [ -n "${tomcat7_java_vendor}" ] ; then >+ export JAVA_VENDOR="${tomcat7_java_vendor}" >+fi >+ >+if [ -n "${tomcat7_java_os}" ] ; then >+ export JAVA_OS="${tomcat7_java_os}" >+fi >+ >+if [ -n "${tomcat7_java_home}" ] ; then >+ export JAVA_HOME="${tomcat7_java_home}" >+else >+ # Create a sane environment >+ export JAVAVM_DRYRUN=1 >+ OUTPUT=$(java) >+ for i in $OUTPUT >+ do >+ export $i >+ done >+ unset JAVAVM_DRYRUN >+fi >+ > eval "${rcvar}=\${${rcvar}:-'NO'}" >-eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}" > eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}" > eval "_tomcat_catalina_home='%%TOMCAT_HOME%%'" > eval "_tomcat_catalina_base=\${${name}_catalina_base:-'%%TOMCAT_HOME%%'}" >@@ -103,8 +129,7 @@ > extra_commands="reload" > > command="%%LOCALBASE%%/bin/jsvc" >-command_args="-java-home '${_tomcat_java_home}' \ >- -server \ >+command_args="-server \ > -user ${_tomcat_catalina_user} \ > -pidfile '${pidfile}' \ > -wait ${_tomcat_wait} \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 173662
: 129638