[gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files: tomcat.init

[gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files: tomcat.init

[Ralph Sennhauser (sera)]

sera        12/07/25 08:12:48

  Modified:             tomcat.init
  Log:
  Pass  to vm instead of catalina in init script. Thanks to Märt Bakhoff <spam3910807@gmail.com> #427664
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  www-servers/tomcat/files/tomcat.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat.init?r1=1.1&r2=1.2

Index: tomcat.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/tomcat.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat.init	20 Jul 2012 17:36:54 -0000	1.1
+++ tomcat.init	25 Jul 2012 08:12:48 -0000	1.2
@@ -49,7 +49,7 @@
 		args="${args} ${JPDA_OPTS}"
 	fi
 	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
-		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+		args="${args} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
 		-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
 	fi
 
@@ -61,13 +61,14 @@
 		--exec ${JAVA_HOME}/bin/${cmd} \
 		-- \
 			${JAVA_OPTS} \
+			${args} \
 			-Dcatalina.base="${CATALINA_BASE}" \
 			-Dcatalina.home="${CATALINA_HOME}" \
 			-Djava.io.tmpdir="${CATALINA_TMPDIR}" \
 			-classpath "${CLASSPATH}" \
 			org.apache.catalina.startup.Bootstrap \
 			${CATALINA_OPTS} \
-			${args} ${TOMCAT_START}
+			${TOMCAT_START}
 
 	eend $?
 }