|
Lines 43-50
Link Here
|
| 43 |
# Set the JUL config file |
43 |
# Set the JUL config file |
| 44 |
# |
44 |
# |
| 45 |
# tomcat7_java_home (str): |
45 |
# tomcat7_java_home (str): |
| 46 |
# Set to "%%JAVA_HOME%%" by default. |
46 |
# tomcat7_java_vendor (str): |
| 47 |
# Specify the Java VM to use. |
47 |
# tomcat7_java_version (str): |
|
|
48 |
# tomcat7_java_os (str): |
| 49 |
# Specify the requirements of the Java VM to use. See javavm(1). |
| 48 |
# |
50 |
# |
| 49 |
# tomcat7_classpath (str): |
51 |
# tomcat7_classpath (str): |
| 50 |
# Set to "" by default. |
52 |
# Set to "" by default. |
|
Lines 80-87
Link Here
|
| 80 |
|
82 |
|
| 81 |
load_rc_config "${name}" |
83 |
load_rc_config "${name}" |
| 82 |
|
84 |
|
|
|
85 |
if [ -n "${tomcat7_java_version}" ] ; then |
| 86 |
export JAVA_VERSION="${tomcat7_java_version}" |
| 87 |
fi |
| 88 |
|
| 89 |
if [ -n "${tomcat7_java_vendor}" ] ; then |
| 90 |
export JAVA_VENDOR="${tomcat7_java_vendor}" |
| 91 |
fi |
| 92 |
|
| 93 |
if [ -n "${tomcat7_java_os}" ] ; then |
| 94 |
export JAVA_OS="${tomcat7_java_os}" |
| 95 |
fi |
| 96 |
|
| 97 |
if [ -n "${tomcat7_java_home}" ] ; then |
| 98 |
export JAVA_HOME="${tomcat7_java_home}" |
| 99 |
else |
| 100 |
# Create a sane environment |
| 101 |
export JAVAVM_DRYRUN=1 |
| 102 |
OUTPUT=$(java) |
| 103 |
for i in $OUTPUT |
| 104 |
do |
| 105 |
export $i |
| 106 |
done |
| 107 |
unset JAVAVM_DRYRUN |
| 108 |
fi |
| 109 |
|
| 83 |
eval "${rcvar}=\${${rcvar}:-'NO'}" |
110 |
eval "${rcvar}=\${${rcvar}:-'NO'}" |
| 84 |
eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}" |
|
|
| 85 |
eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}" |
111 |
eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}" |
| 86 |
eval "_tomcat_catalina_home='%%TOMCAT_HOME%%'" |
112 |
eval "_tomcat_catalina_home='%%TOMCAT_HOME%%'" |
| 87 |
eval "_tomcat_catalina_base=\${${name}_catalina_base:-'%%TOMCAT_HOME%%'}" |
113 |
eval "_tomcat_catalina_base=\${${name}_catalina_base:-'%%TOMCAT_HOME%%'}" |
|
Lines 103-110
Link Here
|
| 103 |
extra_commands="reload" |
129 |
extra_commands="reload" |
| 104 |
|
130 |
|
| 105 |
command="%%LOCALBASE%%/bin/jsvc" |
131 |
command="%%LOCALBASE%%/bin/jsvc" |
| 106 |
command_args="-java-home '${_tomcat_java_home}' \ |
132 |
command_args="-server \ |
| 107 |
-server \ |
|
|
| 108 |
-user ${_tomcat_catalina_user} \ |
133 |
-user ${_tomcat_catalina_user} \ |
| 109 |
-pidfile '${pidfile}' \ |
134 |
-pidfile '${pidfile}' \ |
| 110 |
-wait ${_tomcat_wait} \ |
135 |
-wait ${_tomcat_wait} \ |