From 385fdae0395f19ca6d45f8c847972c80d4caa3a8 Mon Sep 17 00:00:00 2001 From: znerd Date: Sat, 30 Mar 2002 14:51:12 +0000 Subject: Lot of changes: Using USE_JAVA infrastructure. Upgraded port to 3.3.1. Using HTTP_PORT i.s.o. LISTEN_PORT. Using daemonctl.c i.s.o. tomcatctl shell script. Displaying steps i.s.o. commands being executed. Synced man page. --- www/jakarta-tomcat3/Makefile | 180 +++++----- www/jakarta-tomcat3/distinfo | 2 +- www/jakarta-tomcat3/files/daemonctl.c | 379 +++++++++++++++++++++ www/jakarta-tomcat3/files/jakarta-tomcat.sh | 18 +- www/jakarta-tomcat3/files/patch-aa | 45 --- www/jakarta-tomcat3/files/patch-ab | 19 -- www/jakarta-tomcat3/files/tomcatctl | 145 -------- www/jakarta-tomcat3/files/tomcatctl.1 | 52 +-- www/jakarta-tomcat3/pkg-plist | 509 +++++++++------------------- 9 files changed, 681 insertions(+), 668 deletions(-) create mode 100644 www/jakarta-tomcat3/files/daemonctl.c delete mode 100644 www/jakarta-tomcat3/files/patch-aa delete mode 100644 www/jakarta-tomcat3/files/patch-ab delete mode 100644 www/jakarta-tomcat3/files/tomcatctl (limited to 'www/jakarta-tomcat3') diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile index f6b3c8f87c76..430d26c52f4e 100644 --- a/www/jakarta-tomcat3/Makefile +++ b/www/jakarta-tomcat3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= jakarta-tomcat -PORTVERSION= 3.2.4 -PORTREVISION= 2 +PORTVERSION= 3.3.1 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ @@ -16,8 +15,7 @@ MASTER_SITE_SUBDIR= znerd MAINTAINER= znerd@FreeBSD.org -RUN_DEPENDS= ${JAVA_HOME}/bin/javac:${JAVA_PORT} - +USE_JAVA= 1.2+ NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -29,16 +27,29 @@ 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 +STARTUP_SCRIPT_NAME= ${PORTNAME}.sh +STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME} +USER= www +GROUP= www PW?= /usr/sbin/pw -LISTEN_PORT?= 8080 +HTTP_PORT?= 8080 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log AUTO_START?= NO +PID_FILE= /var/run/${APP_SHORTNAME}.pid +MANIFEST= MANIFEST.MF +REPLACE_FILES= ${FILESDIR}/daemonctl.c \ + ${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \ + ${FILESDIR}/${STARTUP_SCRIPT_NAME} \ + ${WRKSRC}/conf/server.xml \ + ${FILESDIR}/${MANIFEST} +# ${WRKSRC}/conf/workers.properties +JAR_FILE= lib/${APP_SHORTNAME}.jar +JAVA_ARGS= '"-Dtomcat.install=${APP_HOME}"' +JAR_ARGS= '"run"' +WRKDIR?= work + +.include pre-install: @${ECHO_CMD} "Installation settings:" @@ -47,90 +58,99 @@ pre-install: @${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} " Running as (user/group): ${USER}/${GROUP}" + @${ECHO_CMD} " HTTP port: ${HTTP_PORT}" @${ECHO_CMD} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_CMD} " Logfile stderr: ${STDERR_LOG}" @${ECHO_CMD} " Starting after install: ${AUTO_START}" + @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL 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 + @${ECHO_CMD} -n ">> Removing all .bat and .orig files..." + @${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` + @${ECHO_CMD} " [ DONE ]" + +.for f in ${REPLACE_FILES} + @${ECHO_CMD} -n ">> Customizing `basename $f`..." + @${SED} \ + -e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \ + -e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \ + -e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \ + -e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \ + -e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \ + -e "/%%GROUP%%/s//${GROUP}/g" \ + -e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \ + -e "/%%JAVA_CMD%%/s//bin\/java/g" \ + -e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \ + -e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \ + -e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \ + -e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \ + -e "/%%PORTNAME%%/s//${PORTNAME}/g" \ + -e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \ + -e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \ + -e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \ + -e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \ + -e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \ + -e "/%%USER%%/s//${USER}/g" \ + $f > ${WRKDIR}/`basename $f` + @${ECHO_CMD} " [ DONE ]" +.endfor + + @${ECHO_CMD} -n ">> Creating destination directory..." + @${MKDIR} ${APP_HOME} + @${MKDIR} ${LOG_DIR} + @${ECHO_CMD} " [ DONE ]" + + @${ECHO_CMD} -n ">> Copying files to destination directory..." + @${CP} -R ${WRKSRC}/* ${APP_HOME} + @${CP} ${WRKDIR}/workers.properties ${APP_HOME}/conf + @${ECHO_CMD} " [ DONE ]" + + @${ECHO_CMD} -n ">> Compiling and installing control script..." + @cd ${WRKDIR} && ${CC} -DJAR_ARGS=${JAR_ARGS} -DJAVA_ARGS=${JAVA_ARGS} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl.c + @${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT} + @${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT} + @${CHMOD} 6754 ${CONTROL_SCRIPT} + @${ECHO_CMD} " [ DONE ]" + + @${ECHO_CMD} -n ">> Installing startup script..." + @${CP} ${WRKDIR}/${STARTUP_SCRIPT_NAME} ${STARTUP_SCRIPT} + @${CHMOD} 0544 ${STARTUP_SCRIPT} + @${ECHO_CMD} " [ DONE ]" + .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 + @${ECHO_CMD} -n ">> Installing man pages..." + @${INSTALL_MAN} ${WRKDIR}/${CONTROL_SCRIPT_NAME}.1 ${MANPREFIX}/man/man1 + @${ECHO_CMD} " [ DONE ]" .endif + @${ECHO_CMD} -n ">> Creating log files..." + @${INSTALL} /dev/null ${STDOUT_LOG} + @${INSTALL} /dev/null ${STDERR_LOG} + @${ECHO_CMD} " [ DONE ]" + + @${ECHO_CMD} -n ">> Fixing ownership settings..." + @${CHOWN} -R ${USER}:${GROUP} ${APP_HOME} + @${ECHO_CMD} " [ DONE ]" + + @${ECHO_CMD} -n ">> Fixing permissions..." + @${CHMOD} 755 `find ${APP_HOME} -type d` + @${ECHO_CMD} " [ DONE ]" + + @${ECHO_CMD} -n ">> Creating PID file..." + @${TOUCH} ${PID_FILE} + @${CHOWN} ${USER}:${GROUP} ${PID_FILE} + @${CHMOD} 0600 ${PID_FILE} + @${ECHO_CMD} " [ DONE ]" + 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}." + @${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, put it in the group ${GROUP}." .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 +.include diff --git a/www/jakarta-tomcat3/distinfo b/www/jakarta-tomcat3/distinfo index a1316d727f9d..553a1f743175 100644 --- a/www/jakarta-tomcat3/distinfo +++ b/www/jakarta-tomcat3/distinfo @@ -1 +1 @@ -MD5 (jakarta-tomcat-3.2.4.tar.gz) = 160a3fcab769a57f774a0aef0368cad4 +MD5 (jakarta-tomcat-3.3.1.tar.gz) = a550edf2d9d30f48ee7034f52d860574 diff --git a/www/jakarta-tomcat3/files/daemonctl.c b/www/jakarta-tomcat3/files/daemonctl.c new file mode 100644 index 000000000000..39a720093a1d --- /dev/null +++ b/www/jakarta-tomcat3/files/daemonctl.c @@ -0,0 +1,379 @@ +/* + * -*- mode: Fundamental; tab-width: 4; -*- + * ex:ts=4 + * + * Daemon control program. + * + * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat3/files/Attic/daemonctl.c,v 1.1 2002-03-30 14:51:12 znerd Exp $ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MAX_FILE_SIZE 32 + +#define ERR_ILLEGAL_ARGUMENT 1 +#define ERR_PID_FILE_NOT_FOUND 2 +#define ERR_PID_FILE_TOO_LARGE 3 +#define ERR_PID_FILE_CONTAINS_ILLEGAL_CHAR 4 +#define ERR_KILL_FAILED 5 +#define ERR_ALREADY_RUNNING 6 +#define ERR_NOT_RUNNING 7 +#define ERR_CHDIR_TO_APP_HOME 8 +#define ERR_STDOUT_LOGFILE_OPEN 9 +#define ERR_STDERR_LOGFILE_OPEN 10 +#define ERR_FORK_FAILED 11 + +#if defined JAVA_ARGS +#define JAVA_ARGS_COMMA , +#else +#define JAVA_ARGS +#define JAVA_ARGS_COMMA +#endif + +#if defined JAR_ARGS +#define JAR_ARGS_COMMA , +#else +#define JAR_ARGS +#define JAR_ARGS_COMMA +#endif + +#define private static + +private void printUsage(void); +private int openPIDFile(void); +private int readPID(int); +private void writePID(int file, int pid); +private void start(void); +private void stop(void); +private void restart(void); + + +/** + * Main function. This function is called when this program is executed. + * + * @param argc + * the number of arguments plus one, so always greater than 0. + * + * @param argv + * the arguments in an array of character pointers, where the last argument + * element is followed by a NULL element. + */ +int main(int argc, char *argv[]) { + + /* Declare variables, like all other good ANSI C programs do :) */ + char *argument; + + /* Parse the arguments */ + if (argc < 2) { + printUsage(); + return 0; + } + + argument = argv[1]; + if (strcmp("start", argument) == 0) { + start(); + } else if (strcmp("stop", argument) == 0) { + stop(); + } else if (strcmp("restart", argument) == 0) { + restart(); + } else { + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Illegal argument \"%s\".\n", argument); + printUsage(); + exit(ERR_ILLEGAL_ARGUMENT); + } + + return 0; +} + + +/** + * Prints usage information to stdout. + */ +void printUsage(void) { + printf("Usage: %%CONTROL_SCRIPT_NAME%% [ start | stop | restart ]\n"); +} + + +/** + * Attempts to open the PID file. If that file is successfully opened, then + * the file handle (an int) will be returned. + * + * @return + * the file handle. + */ +int openPIDFile(void) { + + int file; + + /* Attempt to open the PID file */ + printf(">> Opening PID file (%%PID_FILE%%)..."); + file = open("%%PID_FILE%%", O_RDWR); + if (file < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to open %%PID_FILE%% for reading and writing: "); + perror(NULL); + exit(ERR_PID_FILE_NOT_FOUND); + } + printf(" [ DONE ]\n"); + + return file; +} + + +/** + * Reads a PID from the specified file. The file is identified by a file + * handle. + * + * @param file + * the file handle. + * + * @return + * the PID, or -1 if the file was empty. + */ +int readPID(int file) { + + char *buffer; + int hadNewline = 0; + unsigned int count; + unsigned int i; + int pid; + + /* Read the PID file contents */ + printf(">> Reading PID file..."); + buffer = (char *) malloc((MAX_FILE_SIZE + 1) * sizeof(char)); + count = read(file, buffer, MAX_FILE_SIZE + 1); + if (count > MAX_FILE_SIZE) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: The file %%PID_FILE%% contains more than %d bytes.\n", MAX_FILE_SIZE); + exit(ERR_PID_FILE_TOO_LARGE); + } + + /* Convert the bytes to a number */ + pid = 0; + for (i=0; i= '0' && c <= '9') { + char digit = c - '0'; + pid *= 10; + pid += digit; + } else if (i == (count - 1) && c == '\n') { + /* XXX: Ignore a newline at the end of the file */ + hadNewline = 1; + } else { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: The file %%PID_FILE%% contains an illegal character (%d) at position %d.\n", c, i); + exit(ERR_PID_FILE_CONTAINS_ILLEGAL_CHAR); + } + } + printf(" [ DONE ]\n"); + + if (count == 0 || (count == 1 && hadNewline == 1)) { + return -1; + } + + return pid; +} + + +/** + * Writes a process ID to the specified file. The file is identified by a file + * handle. + * + * @param file + * the file handle, always greater than 0. + * + * @param pid + * the PID to store, always greater than 0. + */ +void writePID(int file, int pid) { + + char *buffer; + int nbytes; + + /* Check preconditions */ + assert(file > 0); + assert(pid > 0); + + printf(">> Writing PID file..."); + + lseek(file, 0, SEEK_SET); + ftruncate(file, 0); + nbytes = asprintf(&buffer, "%d\n", pid); + write(file, buffer, nbytes); + printf(" [ DONE ]\n"); +} + + +/** + * Kills the process identified by the specified ID. + * + * @param pid + * the process id, greater than 0. + */ +void killProcess(int pid) { + + int result; + + assert(pid > 0); + + printf(">> Killing process %d...", pid); + result = kill(pid, SIGTERM); + if (result < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to kill process %d: ", pid); + perror(NULL); + exit(ERR_KILL_FAILED); + } + + printf(" [ DONE ]\n"); +} + + +/** + * Starts the daemon. + */ +void start(void) { + + int file; + int pid; + int result; + int stdoutLogFile; + int stderrLogFile; + + /* Open and read the PID file */ + file = openPIDFile(); + pid = readPID(file); + + printf(">> Checking that %%APP_TITLE%% is not already running..."); + if (pid != -1) { + + /* Check if the process actually exists */ + result = kill(pid, 0); + if (result == 0 || errno != ESRCH) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: %%APP_TITLE%% is already running, PID is %d.\n", pid); + exit(ERR_ALREADY_RUNNING); + } + } + + printf(" [ DONE ]\n"); + + /* XXX: printf(">> Checking for Java VM..."); */ + + printf(">> Starting %%APP_TITLE%%..."); + + /* Change directory */ + result = chdir("%%APP_HOME%%"); + if (result < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to access directory %%APP_HOME%%: "); + perror(NULL); + exit(ERR_CHDIR_TO_APP_HOME); + } + + /* Open the stdout log file */ + stdoutLogFile = open("%%STDOUT_LOG%%", O_WRONLY); + if (stdoutLogFile < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to open %%STDOUT_LOG%% for writing: "); + perror(NULL); + exit(ERR_STDOUT_LOGFILE_OPEN); + } + lseek(stdoutLogFile, 0, SEEK_END); + + /* Open the stderr log file */ + stderrLogFile = open("%%STDERR_LOG%%", O_WRONLY); + if (stderrLogFile < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to open %%STDERR_LOG%% for writing: "); + perror(NULL); + exit(ERR_STDERR_LOGFILE_OPEN); + } + lseek(stderrLogFile, 0, SEEK_END); + + /* Split this process in two */ + pid = fork(); + if (pid == -1) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to fork: "); + perror(NULL); + exit(ERR_FORK_FAILED); + } + + if (pid == 0) { + + /* Redirect stdout to log file */ + dup2(stdoutLogFile, STDOUT_FILENO); + + /* Redirect stderr to log file */ + dup2(stderrLogFile, STDERR_FILENO); + + /* TODO: Support redirection of both stdout and stderr to the same + file using pipe(2) */ + + /* Execute the command */ + execl("%%JAVA_HOME%%/%%JAVA_CMD%%", "%%JAVA_HOME%%/%%JAVA_CMD%%", "-jar", JAVA_ARGS JAVA_ARGS_COMMA "%%JAR_FILE%%", JAR_ARGS JAR_ARGS_COMMA NULL); + + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to start %%APP_TITLE%% as '%%JAVA_HOME%%/%%JAVA_CMD%% -jar %%JAR_FILE%%' in %%APP_HOME%%: "); + perror(NULL); + } else { + printf(" [ DONE ]\n"); + writePID(file, pid); + } +} + +/** + * Stops the daemon. + */ +void stop(void) { + + int file; + int pid; + + /* Open and read the PID file */ + file = openPIDFile(); + pid = readPID(file); + + printf(">> Checking that %%APP_TITLE%% is running..."); + + /* If there is a PID, see if the process still exists */ + if (pid != -1) { + int result = kill(pid, 0); + if (result != 0 && errno == ESRCH) { + ftruncate(file, 0); + pid = -1; + } + } + + /* If there is no running process, produce an error */ + if (pid == -1) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: %%APP_TITLE%% is currently not running.\n"); + exit(ERR_NOT_RUNNING); + } + + printf(" [ DONE ]\n"); + + killProcess(pid); + + printf(">> Clearing PID file..."); + ftruncate(file, 0); + printf(" [ DONE ]\n"); +} + + +void restart(void) { + stop(); + start(); +} diff --git a/www/jakarta-tomcat3/files/jakarta-tomcat.sh b/www/jakarta-tomcat3/files/jakarta-tomcat.sh index cbd3e16f99b1..b27dea9f7de5 100644 --- a/www/jakarta-tomcat3/files/jakarta-tomcat.sh +++ b/www/jakarta-tomcat3/files/jakarta-tomcat.sh @@ -1,15 +1,27 @@ #!/bin/sh +# -*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# %%APP_TITLE%% startup script. +# +# $FreeBSD$ +# + # Set some variables -USER_NAME=%%USER_NAME%% MYSELF=`basename $0` case "$1" in start) - su -f -m ${USER_NAME} -c "exec %%CONTROL_SCRIPT%% start" && echo -n ' %%APP_SHORTNAME%%' + truncate -s 0 %%PID_FILE%% + chown %%USER%%:%%GROUP%% %%PID_FILE%% + chmod 600 %%PID_FILE%% + su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start > /dev/null" && echo -n ' %%APP_SHORTNAME%%' ;; stop) - su -f -m ${USER_NAME} -c "exec %%CONTROL_SCRIPT%% stop" && echo -n ' %%APP_SHORTNAME%%' + chown %%USER%%:%%GROUP%% %%PID_FILE%% + chmod 600 %%PID_FILE%% + su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop > /dev/null" && echo -n ' %%APP_SHORTNAME%%' ;; *) echo "" diff --git a/www/jakarta-tomcat3/files/patch-aa b/www/jakarta-tomcat3/files/patch-aa deleted file mode 100644 index eb725993cf38..000000000000 --- a/www/jakarta-tomcat3/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- conf/workers.properties.orig Tue Dec 12 22:36:26 2000 -+++ conf/workers.properties Sun May 20 16:06:33 2001 -@@ -40,20 +40,20 @@ - # installed tomcat. This is where you have your conf, webapps and lib - # directories. - # --workers.tomcat_home=c:\jakarta-tomcat -+workers.tomcat_home=%%TOMCAT_HOME%% - - # - # workers.java_home should point to your Java installation. Normally - # you should have a bin and lib directories beneath it. - # --workers.java_home=c:\jdk1.2.2 -+workers.java_home=%%JAVA_HOME%% - - # - # You should configure your environment slash... ps=\ on NT and / on UNIX - # and maybe something different elsewhere. - # --ps=\ --# ps=/ -+#ps=\ -+ps=/ - - # - #------ ADVANCED MODE ------------------------------------------------ -@@ -166,7 +166,7 @@ - # - # Javac as available from Java2SE - # --worker.inprocess.class_path=$(workers.java_home)$(ps)lib$(ps)tools.jar -+#worker.inprocess.class_path=$(workers.java_home)$(ps)lib$(ps)tools.jar - - # - # Setting the command line for tomcat -@@ -182,7 +182,7 @@ - # - # This is for Java2 - # --worker.inprocess.jvm_lib=$(workers.java_home)$(ps)jre$(ps)bin$(ps)classic$(ps)jvm.dll -+#worker.inprocess.jvm_lib=$(workers.java_home)$(ps)jre$(ps)bin$(ps)classic$(ps)jvm.dll - - # - # And this is for jdk1.1.X diff --git a/www/jakarta-tomcat3/files/patch-ab b/www/jakarta-tomcat3/files/patch-ab deleted file mode 100644 index 9493d0cbee73..000000000000 --- a/www/jakarta-tomcat3/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ ---- conf/server.xml.orig Tue Jul 17 18:57:46 2001 -+++ conf/server.xml Thu Jan 24 14:32:56 2002 -@@ -68,6 +68,7 @@ - --> - - - - -+ value="%%LISTEN_PORT%%"/> - - -