Index: head/www/jakarta-tomcat/Makefile =================================================================== --- head/www/jakarta-tomcat/Makefile (revision 55055) +++ head/www/jakarta-tomcat/Makefile (revision 55056) @@ -1,133 +1,136 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd MAINTAINER= znerd@FreeBSD.org RUN_DEPENDS= ${JAVA_HOME}/bin/javac:${JAVA_PORT} NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} LOG_DIR= ${APP_HOME}/logs PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} APP_TITLE= Jakarta Tomcat APP_SHORTNAME= tomcat CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl CONTROL_SCRIPT= ${PREFIX}/bin/${CONTROL_SCRIPT_NAME} STARTUP_ORDER?= 020 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME= www GROUP_NAME= www PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CONTROL_SCRIPT}" @${ECHO_CMD} " Startup script location: ${STARTUP_SCRIPT}" @${ECHO_CMD} " Location of JDK: ${JAVA_HOME}" @${ECHO_CMD} " Location of Java port: ${JAVA_PORT}" @${ECHO_CMD} " Running as (user/group): ${USER_NAME}/${GROUP_NAME}" @${ECHO_CMD} " Port to listen at: ${LISTEN_PORT}" @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}" @${ECHO_CMD} " Starting after install: ${AUTO_START}" do-install: @# Create the destination directory ${MKDIR} ${APP_HOME} @# Copy all files except .bat and .orig files ${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` ${RM} -f `${FIND} ${WRKSRC} -name '*.orig'` ${CP} -R ${WRKSRC}/* ${APP_HOME} ${CHMOD} 755 `find ${APP_HOME} -type d` @# Install the workers.properties file after processing it ${CAT} ${WRKSRC}/conf/workers.properties \ | ${SED} "/%%TOMCAT_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ > ${WRKDIR}/workers.properties ${MV} ${WRKDIR}/workers.properties ${APP_HOME}/conf/workers.properties @# Install the startup script ${CAT} ${FILESDIR}/${PORTNAME}.sh \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/" \ > ${STARTUP_SCRIPT} ${CHMOD} 0554 ${STARTUP_SCRIPT} @# Install the control script ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/" \ | ${SED} "/%%STARTUP_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/" \ | ${SED} "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/" \ > ${CONTROL_SCRIPT} ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CONTROL_SCRIPT} ${CHMOD} 6554 ${CONTROL_SCRIPT} @# Create the directories that the application will create at the @# first run ${MKDIR} ${LOG_DIR} ${CHMOD} 6775 ${LOG_DIR} @# Install the server.xml file after processing it ${CAT} ${WRKSRC}/conf/server.xml \ | ${SED} "/%%LISTEN_PORT%%/s//${LISTEN_PORT}/" \ > ${WRKDIR}/server.xml ${MV} ${WRKDIR}/server.xml ${APP_HOME}/conf/server.xml @# Change ownership for the files ${CHOWN} -R ${USER_NAME}:${GROUP_NAME} ${APP_HOME} @# Change the execute permissions for all shell scripts ${CHMOD} 0554 ${APP_HOME}/bin/* @# Install the man page .if !defined(NOPORTDOCS) ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \ + | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ + | ${SED} "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/" \ + | ${SED} "/%%STARTUP_ORDER%%/s//${STARTUP_ORDER}.sh/" \ > ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${MANPREFIX}/man/man1 .endif post-install: @${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}." @${ECHO_CMD} "If you would like a user to be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CONTROL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/www/jakarta-tomcat/files/tomcatctl.1 =================================================================== --- head/www/jakarta-tomcat/files/tomcatctl.1 (revision 55055) +++ head/www/jakarta-tomcat/files/tomcatctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/jakarta-tomcat/files/tomcatctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/jakarta-tomcat3/Makefile =================================================================== --- head/www/jakarta-tomcat3/Makefile (revision 55055) +++ head/www/jakarta-tomcat3/Makefile (revision 55056) @@ -1,133 +1,136 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd MAINTAINER= znerd@FreeBSD.org RUN_DEPENDS= ${JAVA_HOME}/bin/javac:${JAVA_PORT} NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} LOG_DIR= ${APP_HOME}/logs PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} APP_TITLE= Jakarta Tomcat APP_SHORTNAME= tomcat CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl CONTROL_SCRIPT= ${PREFIX}/bin/${CONTROL_SCRIPT_NAME} STARTUP_ORDER?= 020 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME= www GROUP_NAME= www PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CONTROL_SCRIPT}" @${ECHO_CMD} " Startup script location: ${STARTUP_SCRIPT}" @${ECHO_CMD} " Location of JDK: ${JAVA_HOME}" @${ECHO_CMD} " Location of Java port: ${JAVA_PORT}" @${ECHO_CMD} " Running as (user/group): ${USER_NAME}/${GROUP_NAME}" @${ECHO_CMD} " Port to listen at: ${LISTEN_PORT}" @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}" @${ECHO_CMD} " Starting after install: ${AUTO_START}" do-install: @# Create the destination directory ${MKDIR} ${APP_HOME} @# Copy all files except .bat and .orig files ${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` ${RM} -f `${FIND} ${WRKSRC} -name '*.orig'` ${CP} -R ${WRKSRC}/* ${APP_HOME} ${CHMOD} 755 `find ${APP_HOME} -type d` @# Install the workers.properties file after processing it ${CAT} ${WRKSRC}/conf/workers.properties \ | ${SED} "/%%TOMCAT_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ > ${WRKDIR}/workers.properties ${MV} ${WRKDIR}/workers.properties ${APP_HOME}/conf/workers.properties @# Install the startup script ${CAT} ${FILESDIR}/${PORTNAME}.sh \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/" \ > ${STARTUP_SCRIPT} ${CHMOD} 0554 ${STARTUP_SCRIPT} @# Install the control script ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/" \ | ${SED} "/%%STARTUP_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/" \ | ${SED} "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/" \ > ${CONTROL_SCRIPT} ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CONTROL_SCRIPT} ${CHMOD} 6554 ${CONTROL_SCRIPT} @# Create the directories that the application will create at the @# first run ${MKDIR} ${LOG_DIR} ${CHMOD} 6775 ${LOG_DIR} @# Install the server.xml file after processing it ${CAT} ${WRKSRC}/conf/server.xml \ | ${SED} "/%%LISTEN_PORT%%/s//${LISTEN_PORT}/" \ > ${WRKDIR}/server.xml ${MV} ${WRKDIR}/server.xml ${APP_HOME}/conf/server.xml @# Change ownership for the files ${CHOWN} -R ${USER_NAME}:${GROUP_NAME} ${APP_HOME} @# Change the execute permissions for all shell scripts ${CHMOD} 0554 ${APP_HOME}/bin/* @# Install the man page .if !defined(NOPORTDOCS) ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \ + | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ + | ${SED} "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/" \ + | ${SED} "/%%STARTUP_ORDER%%/s//${STARTUP_ORDER}.sh/" \ > ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${MANPREFIX}/man/man1 .endif post-install: @${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}." @${ECHO_CMD} "If you would like a user to be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CONTROL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/www/jakarta-tomcat3/files/tomcatctl.1 =================================================================== --- head/www/jakarta-tomcat3/files/tomcatctl.1 (revision 55055) +++ head/www/jakarta-tomcat3/files/tomcatctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/jakarta-tomcat3/files/tomcatctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/jakarta-tomcat4/Makefile =================================================================== --- head/www/jakarta-tomcat4/Makefile (revision 55055) +++ head/www/jakarta-tomcat4/Makefile (revision 55056) @@ -1,133 +1,136 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd MAINTAINER= znerd@FreeBSD.org RUN_DEPENDS= ${JAVA_HOME}/bin/javac:${JAVA_PORT} NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} LOG_DIR= ${APP_HOME}/logs PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} APP_TITLE= Jakarta Tomcat APP_SHORTNAME= tomcat CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl CONTROL_SCRIPT= ${PREFIX}/bin/${CONTROL_SCRIPT_NAME} STARTUP_ORDER?= 020 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME= www GROUP_NAME= www PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CONTROL_SCRIPT}" @${ECHO_CMD} " Startup script location: ${STARTUP_SCRIPT}" @${ECHO_CMD} " Location of JDK: ${JAVA_HOME}" @${ECHO_CMD} " Location of Java port: ${JAVA_PORT}" @${ECHO_CMD} " Running as (user/group): ${USER_NAME}/${GROUP_NAME}" @${ECHO_CMD} " Port to listen at: ${LISTEN_PORT}" @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}" @${ECHO_CMD} " Starting after install: ${AUTO_START}" do-install: @# Create the destination directory ${MKDIR} ${APP_HOME} @# Copy all files except .bat and .orig files ${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` ${RM} -f `${FIND} ${WRKSRC} -name '*.orig'` ${CP} -R ${WRKSRC}/* ${APP_HOME} ${CHMOD} 755 `find ${APP_HOME} -type d` @# Install the workers.properties file after processing it ${CAT} ${WRKSRC}/conf/workers.properties \ | ${SED} "/%%TOMCAT_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ > ${WRKDIR}/workers.properties ${MV} ${WRKDIR}/workers.properties ${APP_HOME}/conf/workers.properties @# Install the startup script ${CAT} ${FILESDIR}/${PORTNAME}.sh \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/" \ > ${STARTUP_SCRIPT} ${CHMOD} 0554 ${STARTUP_SCRIPT} @# Install the control script ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/" \ | ${SED} "/%%STARTUP_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/" \ | ${SED} "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/" \ > ${CONTROL_SCRIPT} ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CONTROL_SCRIPT} ${CHMOD} 6554 ${CONTROL_SCRIPT} @# Create the directories that the application will create at the @# first run ${MKDIR} ${LOG_DIR} ${CHMOD} 6775 ${LOG_DIR} @# Install the server.xml file after processing it ${CAT} ${WRKSRC}/conf/server.xml \ | ${SED} "/%%LISTEN_PORT%%/s//${LISTEN_PORT}/" \ > ${WRKDIR}/server.xml ${MV} ${WRKDIR}/server.xml ${APP_HOME}/conf/server.xml @# Change ownership for the files ${CHOWN} -R ${USER_NAME}:${GROUP_NAME} ${APP_HOME} @# Change the execute permissions for all shell scripts ${CHMOD} 0554 ${APP_HOME}/bin/* @# Install the man page .if !defined(NOPORTDOCS) ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \ + | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ + | ${SED} "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/" \ + | ${SED} "/%%STARTUP_ORDER%%/s//${STARTUP_ORDER}.sh/" \ > ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${MANPREFIX}/man/man1 .endif post-install: @${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}." @${ECHO_CMD} "If you would like a user to be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CONTROL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/www/jakarta-tomcat4/files/daemonctl.1 =================================================================== --- head/www/jakarta-tomcat4/files/daemonctl.1 (revision 55055) +++ head/www/jakarta-tomcat4/files/daemonctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/jakarta-tomcat4/files/daemonctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/jakarta-tomcat4/files/tomcatctl.1 =================================================================== --- head/www/jakarta-tomcat4/files/tomcatctl.1 (revision 55055) +++ head/www/jakarta-tomcat4/files/tomcatctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/jakarta-tomcat4/files/tomcatctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/jakarta-tomcat41/Makefile =================================================================== --- head/www/jakarta-tomcat41/Makefile (revision 55055) +++ head/www/jakarta-tomcat41/Makefile (revision 55056) @@ -1,133 +1,136 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd MAINTAINER= znerd@FreeBSD.org RUN_DEPENDS= ${JAVA_HOME}/bin/javac:${JAVA_PORT} NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} LOG_DIR= ${APP_HOME}/logs PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} APP_TITLE= Jakarta Tomcat APP_SHORTNAME= tomcat CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl CONTROL_SCRIPT= ${PREFIX}/bin/${CONTROL_SCRIPT_NAME} STARTUP_ORDER?= 020 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME= www GROUP_NAME= www PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CONTROL_SCRIPT}" @${ECHO_CMD} " Startup script location: ${STARTUP_SCRIPT}" @${ECHO_CMD} " Location of JDK: ${JAVA_HOME}" @${ECHO_CMD} " Location of Java port: ${JAVA_PORT}" @${ECHO_CMD} " Running as (user/group): ${USER_NAME}/${GROUP_NAME}" @${ECHO_CMD} " Port to listen at: ${LISTEN_PORT}" @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}" @${ECHO_CMD} " Starting after install: ${AUTO_START}" do-install: @# Create the destination directory ${MKDIR} ${APP_HOME} @# Copy all files except .bat and .orig files ${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` ${RM} -f `${FIND} ${WRKSRC} -name '*.orig'` ${CP} -R ${WRKSRC}/* ${APP_HOME} ${CHMOD} 755 `find ${APP_HOME} -type d` @# Install the workers.properties file after processing it ${CAT} ${WRKSRC}/conf/workers.properties \ | ${SED} "/%%TOMCAT_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ > ${WRKDIR}/workers.properties ${MV} ${WRKDIR}/workers.properties ${APP_HOME}/conf/workers.properties @# Install the startup script ${CAT} ${FILESDIR}/${PORTNAME}.sh \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/" \ > ${STARTUP_SCRIPT} ${CHMOD} 0554 ${STARTUP_SCRIPT} @# Install the control script ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/" \ | ${SED} "/%%STARTUP_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/" \ | ${SED} "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/" \ > ${CONTROL_SCRIPT} ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CONTROL_SCRIPT} ${CHMOD} 6554 ${CONTROL_SCRIPT} @# Create the directories that the application will create at the @# first run ${MKDIR} ${LOG_DIR} ${CHMOD} 6775 ${LOG_DIR} @# Install the server.xml file after processing it ${CAT} ${WRKSRC}/conf/server.xml \ | ${SED} "/%%LISTEN_PORT%%/s//${LISTEN_PORT}/" \ > ${WRKDIR}/server.xml ${MV} ${WRKDIR}/server.xml ${APP_HOME}/conf/server.xml @# Change ownership for the files ${CHOWN} -R ${USER_NAME}:${GROUP_NAME} ${APP_HOME} @# Change the execute permissions for all shell scripts ${CHMOD} 0554 ${APP_HOME}/bin/* @# Install the man page .if !defined(NOPORTDOCS) ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \ + | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ + | ${SED} "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/" \ + | ${SED} "/%%STARTUP_ORDER%%/s//${STARTUP_ORDER}.sh/" \ > ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${MANPREFIX}/man/man1 .endif post-install: @${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}." @${ECHO_CMD} "If you would like a user to be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CONTROL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat41/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/www/jakarta-tomcat41/files/daemonctl.1 =================================================================== --- head/www/jakarta-tomcat41/files/daemonctl.1 (revision 55055) +++ head/www/jakarta-tomcat41/files/daemonctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/jakarta-tomcat41/files/daemonctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/jakarta-tomcat41/files/tomcatctl.1 =================================================================== --- head/www/jakarta-tomcat41/files/tomcatctl.1 (revision 55055) +++ head/www/jakarta-tomcat41/files/tomcatctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/jakarta-tomcat41/files/tomcatctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/tomcat41/Makefile =================================================================== --- head/www/tomcat41/Makefile (revision 55055) +++ head/www/tomcat41/Makefile (revision 55056) @@ -1,133 +1,136 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd MAINTAINER= znerd@FreeBSD.org RUN_DEPENDS= ${JAVA_HOME}/bin/javac:${JAVA_PORT} NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} LOG_DIR= ${APP_HOME}/logs PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} APP_TITLE= Jakarta Tomcat APP_SHORTNAME= tomcat CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl CONTROL_SCRIPT= ${PREFIX}/bin/${CONTROL_SCRIPT_NAME} STARTUP_ORDER?= 020 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME= www GROUP_NAME= www PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CONTROL_SCRIPT}" @${ECHO_CMD} " Startup script location: ${STARTUP_SCRIPT}" @${ECHO_CMD} " Location of JDK: ${JAVA_HOME}" @${ECHO_CMD} " Location of Java port: ${JAVA_PORT}" @${ECHO_CMD} " Running as (user/group): ${USER_NAME}/${GROUP_NAME}" @${ECHO_CMD} " Port to listen at: ${LISTEN_PORT}" @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}" @${ECHO_CMD} " Starting after install: ${AUTO_START}" do-install: @# Create the destination directory ${MKDIR} ${APP_HOME} @# Copy all files except .bat and .orig files ${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` ${RM} -f `${FIND} ${WRKSRC} -name '*.orig'` ${CP} -R ${WRKSRC}/* ${APP_HOME} ${CHMOD} 755 `find ${APP_HOME} -type d` @# Install the workers.properties file after processing it ${CAT} ${WRKSRC}/conf/workers.properties \ | ${SED} "/%%TOMCAT_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ > ${WRKDIR}/workers.properties ${MV} ${WRKDIR}/workers.properties ${APP_HOME}/conf/workers.properties @# Install the startup script ${CAT} ${FILESDIR}/${PORTNAME}.sh \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/" \ > ${STARTUP_SCRIPT} ${CHMOD} 0554 ${STARTUP_SCRIPT} @# Install the control script ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/" \ | ${SED} "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/" \ | ${SED} "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/" \ | ${SED} "/%%STARTUP_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ | ${SED} "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/" \ | ${SED} "/%%USER_NAME%%/s//${USER_NAME}/" \ | ${SED} "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/" \ | ${SED} "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/" \ > ${CONTROL_SCRIPT} ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CONTROL_SCRIPT} ${CHMOD} 6554 ${CONTROL_SCRIPT} @# Create the directories that the application will create at the @# first run ${MKDIR} ${LOG_DIR} ${CHMOD} 6775 ${LOG_DIR} @# Install the server.xml file after processing it ${CAT} ${WRKSRC}/conf/server.xml \ | ${SED} "/%%LISTEN_PORT%%/s//${LISTEN_PORT}/" \ > ${WRKDIR}/server.xml ${MV} ${WRKDIR}/server.xml ${APP_HOME}/conf/server.xml @# Change ownership for the files ${CHOWN} -R ${USER_NAME}:${GROUP_NAME} ${APP_HOME} @# Change the execute permissions for all shell scripts ${CHMOD} 0554 ${APP_HOME}/bin/* @# Install the man page .if !defined(NOPORTDOCS) ${CAT} ${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \ + | ${SED} "/%%APP_TITLE%%/s//${APP_TITLE}/" \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ + | ${SED} "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/" \ + | ${SED} "/%%STARTUP_ORDER%%/s//${STARTUP_ORDER}.sh/" \ > ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${MANPREFIX}/man/man1 .endif post-install: @${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}." @${ECHO_CMD} "If you would like a user to be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CONTROL_SCRIPT} start || true .endif .include Property changes on: head/www/tomcat41/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/www/tomcat41/files/daemonctl.1 =================================================================== --- head/www/tomcat41/files/daemonctl.1 (revision 55055) +++ head/www/tomcat41/files/daemonctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/tomcat41/files/daemonctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/tomcat41/files/tomcatctl.1 =================================================================== --- head/www/tomcat41/files/tomcatctl.1 (revision 55055) +++ head/www/tomcat41/files/tomcatctl.1 (revision 55056) @@ -1,96 +1,63 @@ -.Dd May 26, 2001 +.Dd February 21, 2002 .Dt TOMCATCTL 1 .Os FreeBSD .Sh NAME -.Nm tomcatctl -.Nd Tomcat server control interface +.Nm %%CONTROL_SCRIPT_NAME%% +.Nd %%APP_TITLE%% server control interface .Sh SYNOPSIS .Nm -.Op Ar start | Ar stop +.Op Ar start | Ar restart | Ar stop .Sh DESCRIPTION The .Nm -shell script provides an interface to the Tomcat application server. +shell script provides an interface to the %%APP_TITLE%% application server. .Pp -This script has 2 modes of operation, One is -.Em shell script mode -and the other is -.Em rc script mode . -If run as -.Nm -shell script mode is used, otherwise rc script mode is used. Shell script mode -assumes that the script is used as a normal shell script, while rc script mode -assumes the script is used to start or stop Tomcat at boot time. -.Pp The script expects exactly one argument, either -.Ar start +.Ar start , +.Ar restart or .Ar stop . If more than one argument is given, then all arguments but the first are ignored. .Bl -tag -width indent .It Ar start -Start Tomcat, if it is not already running. The ID of the started process will -be saved in a PID file. +Start %%APP_TITLE%%, if it is not already running. +.It Ar restart +Restart %%APP_TITLE%%. If it is already running, then it will be stopped and then +started right after that. Otherwise it will just be started up. .It Ar stop -Stop Tomcat, if it is actually running. The process with the ID stored in -the PID file will be killed. +Stop %%APP_TITLE%%, if it is actually running. .El .Sh ERRORS The following error conditions are detected. They will be checked in the -specified order. In every case where an error message is printed it will be -prepended by the name of the script -.Em ( basename $0 ) . +specified order. In each case where an error message is printed, the name of +the script +.Em ( basename $0 ) +will be prepended. .Pp If no argument is passed, or if an argument other than -.Ar start +.Ar start , +.Ar restart or .Ar stop is passed as the first argument, then a simple help message is printed and the script is exited with error code 64. .Pp -In -.Em rc script mode -a newline will be printed before any error message. -.Pp -When using the argument -.Ar start -the following errors conditions can be triggered: +Other than that, the following errors conditions are defined: .Bl -tag -width indent -.It Em The Tomcat PID file already exists. -Tomcat is probably already running. Prints an error message and exits the -script with error code 1. -.It Em Tomcat home directory cannot be found +.It Em %%APP_TITLE%% home directory cannot be found Prints an error message and exits the script with error code 2. -.It Em Tomcat script cannot be found +.It Em %%APP_TITLE%% script cannot be found Prints an error message and exits the script with error code 3. .It Em Java VM cannot be found Prints an error message and exits the script with error code 4. .El -.Pp -When using the argument -.Ar stop -the following error condition can be triggered: -.Bl -tag -width indent -.It Em The Tomcat PID file cannot be found -Tomcat is probably not running. Prints an error message and exits the script -with error code 16. -.El .Sh FILES .Bl -tag -width -indent -.It Pa /var/run/jakarta-tomcat.pid -The Tomcat PID file that is used to store the process ID of the currently -running Tomcat process in. It is deleted as soon as Tomcat is stopped and -recreated when Tomcat is started. It should never be writable for anyone but -.Em root , -.It Pa %%PREFIX%%/etc/rc.d/jakarta-tomcat.sh -A symlink to the +.It Pa %%PREFIX%%/etc/rc.d/%%STARTUP_ORDER%%.jakarta-tomcat.sh +A script that starts the .Nm -script. This causes Tomcat to be started at boot time. When called from this -location the -.Nm -script will use -.Em rc script mode . +script. It start %%APP_TITLE%% at startup time. .El .Sh AUTHORS -.An Ernst de Haan Aq ernst@jollem.com +.An Ernst de Haan Aq znerd@FreeBSD.org Property changes on: head/www/tomcat41/files/tomcatctl.1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property