Apache Tomcat 6.x is the current focus of development. It builds upon the

improvements made in Tomcat 5.5.x and implements the Servlet 2.5 and JSP 2.1
specifications. In addition to that, it includes the following improvements:

* Memory usage optimizations
* Advanced IO capabilities
* Refactored clustering

While we're here make a number of improvements based on the old 5.5.x pkg:
- Use MASTER_SITE_APACHE
- Default to running as an unprived user
- Use a more standard rc.d script
- Cleaner pkg_delete operation based on standard files/dirs that change

1 files changed, 70 insertions, 0 deletions

diff --git a/www/apache-tomcat6/files/tomcat.sh b/www/apache-tomcat6/files/tomcat.sh
new file mode 100644
index 00000000000..fc960009fe4
--- /dev/null
+++ b/www/apache-tomcat6/files/tomcat.sh
@@ -0,0 +1,70 @@
+#! @RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: tomcat.sh,v 1.1.1.1 2009/02/14 12:02:09 adrianp Exp $
+#
+# PROVIDE: tomcat
+# REQUIRE: DAEMON
+#
+
+if [ -r /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="tomcat"
+rcvar=$name
+command="@TOMCAT_HOME@/bin/catalina.sh"
+tomcat_user="@TOMCAT_USER@"
+tomcat_group="@TOMCAT_GROUP@"
+start_cmd="$command start"
+stop_cmd="$command stop"
+restart_cmd="$stop_cmd && $start_cmd"
+run_cmd="tomcat_run"
+version_cmd="tomcat_version"
+debug_cmd="tomcat_debug"
+extra_commands="run version debug"
+
+PREFIX=@PREFIX@
+
+if [ -z "${JAVA_HOME}" ]
+then
+	JAVA_HOME="@JAVA_HOME@"
+	export JAVA_HOME
+fi
+
+CATALINA_HOME=@TOMCAT_HOME@
+TOMCAT_HOME=@TOMCAT_HOME@
+export CATALINA_HOME
+export TOMCAT_HOME
+
+CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${PREFIX}/lib/java/crimson.jar:${PREFIX}/lib/java/ant.jar
+
+if [ -n "${tomcat_classpath}" ]
+then
+	CLASSPATH=${CLASSPATH}:${tomcat_classpath}
+fi
+export CLASSPATH
+
+tomcat_run()
+{
+	${command} run
+}
+
+tomcat_version()
+{
+	${command} version
+}
+
+tomcat_debug()
+{
+	${command} debug
+}
+
+if [ -f /etc/rc.subr ]
+then
+	load_rc_config "$name"
+	run_rc_command "$1"
+else
+	echo -n ' ${name}'
+	exec ${command} ${tomcat_flags} ${command_args}
+fi