Index: head/www/jakarta-tomcat/Makefile =================================================================== --- head/www/jakarta-tomcat/Makefile (revision 54885) +++ head/www/jakarta-tomcat/Makefile (revision 54886) @@ -1,131 +1,137 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.apache.org/dist/jakarta/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd DIST_SUBDIR= jakarta/tomcat/${PORTVERSION} 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 APPCTL_NAME= ${APP_SHORTNAME}ctl CTL_SCRIPT= ${PREFIX}/bin/${APPCTL_NAME} STARTUP_ORDER?= 020 -RC_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh -APP_TITLE= Jakarta Tomcat +STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME?= ${APP_SHORTNAME} GROUP_NAME?= ${USER_NAME} USER_ID?= 7103 GROUP_ID?= ${USER_ID} PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG?= ${LOG_DIR}/stdout.log STDERR_LOG?= ${LOG_DIR}/stderr.log -AUTO_START?= YES +AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CTL_SCRIPT}" - @${ECHO_CMD} " Startup script location: ${RC_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} (${USER_ID}:${GROUP_ID})" @${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: @# Add the group and the user if they do not exist ${PW} groupadd -n ${GROUP_NAME} -g ${GROUP_ID} || true ${PW} useradd -n ${USER_NAME} -u ${USER_ID} -g ${GROUP_NAME} -c "${APP_TITLE} account" -d ${APP_HOME} -s ${SH} -h - || true @# 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 control script ${CAT} ${FILESDIR}/${APPCTL_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%PORTVERSION%%/s//${PORTVERSION}/" \ | ${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} "/%%RC_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ + | ${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}/" \ > ${CTL_SCRIPT} - ${CHMOD} 755 ${CTL_SCRIPT} + ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CTL_SCRIPT} + ${CHMOD} 6554 ${CTL_SCRIPT} @# Install the startup script - ${LN} -sf ${CTL_SCRIPT} ${RC_SCRIPT} + ${CP} ${FILESDIR}/${PORTNAME}.sh ${STARTUP_SCRIPT} + ${CHMOD} 0554 ${STARTUP_SCRIPT} - @# Create the directories that the application will create it at the + @# Create the directories that the application will create at the @# first run - ${MKDIR} ${APP_HOME}/logs + ${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}/${APPCTL_NAME}.1 \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ > ${WRKDIR}/${APPCTL_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${APPCTL_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 ${APPCTL_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${APPCTL_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CTL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/www/jakarta-tomcat/files/tomcatctl =================================================================== --- head/www/jakarta-tomcat/files/tomcatctl (revision 54885) +++ head/www/jakarta-tomcat/files/tomcatctl (revision 54886) @@ -1,99 +1,146 @@ #!/bin/sh # Set some variables VERSION=%%PORTVERSION%% APP_HOME=%%APP_HOME%% -USER_NAME=%%USER_NAME%% STDOUT_LOG=%%STDOUT_LOG%% STDERR_LOG=%%STDERR_LOG%% JAR_FILE=${APP_HOME}/lib/webserver.jar MYSELF=`basename $0` # Set the CLASSPATH unset CLASSPATH for i in ${APP_HOME}/lib/* ; do if [ "$CLASSPATH" != "" ]; then CLASSPATH=${CLASSPATH}:$i else CLASSPATH=$i fi done if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar fi -# Check if we're being run as a shell script or as an rc script -if [ ${MYSELF} = "%%RC_SCRIPT_NAME%%" ]; then - AS_RC_SCRIPT=yes -else - AS_RC_SCRIPT=no -fi - # Check if the JAVA_HOME directory is defined, otherwise set it to the # fallback default if [ "${JAVA_HOME}a" = "a" ]; then JAVA_HOME=%%JAVA_HOME%% fi JAVA_CMD=${JAVA_HOME}/bin/java -# Function that starts the application -start() { + +############################################################################## +# Function that shows an error message +# +# This function is called by the 'checks' function +# +# Parameters: +# 1: The message to be displayed. + +error() { + echo -n "%%APP_SHORTNAME%%: ERROR: " + echo $1 +} + + +############################################################################## +# Function that performs all checks necessary for starting or stopping the +# application. +# +# This function is called by the 'start' and 'stop' functions +# +# This function expects no parameters + +checks() { # Make sure the application directory does exist if [ ! -d ${APP_HOME} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." + error "Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." exit 2 fi # Make sure the application JAR file exists if [ ! -r ${JAR_FILE} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." + error "Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." exit 3 fi # Make sure the Java VM can be found if [ ! -x ${JAVA_CMD} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find Java VM at ${JAVA_HOME}." + error "Unable to find Java VM at ${JAVA_HOME}." exit 4 fi +} - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + +############################################################################## +# Functions that calls the application with the specified parameter +# +# Parameters: +# 1: The argument to pass to the application (optional) + +app() { + (cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat $1) >> ${STDOUT_LOG} 2>> ${STDERR_LOG} } + +############################################################################## +# Function that starts the application +# +# This function is called from the main function +# +# This function expects no parameters + +start() { + # Perform the checks + checks + + # Stop the application + app +} + + +############################################################################## # Function that stops the application +# +# This function is called from the main function +# +# This function expects no parameters + stop() { - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat -stop) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + # Perform the checks + checks + + # Stop the application + app -stop } -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "" - echo "Usage: ${MYSELF} { start | stop | restart }" - echo "" - exit 64 - ;; -esac + +############################################################################## +# Main function. This function calls the 'start' and 'stop' functions. +# +# Parameters: +# 1: The argument to this shell script + +main() { + case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: ${MYSELF} { start | stop | restart }" + exit 64 + ;; + esac +} + + +# Call the main function and exit +main $1 +exit 0 Property changes on: head/www/jakarta-tomcat/files/tomcatctl ___________________________________________________________________ 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-tomcat/pkg-plist =================================================================== --- head/www/jakarta-tomcat/pkg-plist (revision 54885) +++ head/www/jakarta-tomcat/pkg-plist (revision 54886) @@ -1,413 +1,414 @@ +bin/tomcatctl etc/rc.d/020.jakarta-tomcat.sh %%T%%/KEYS %%T%%/LICENSE %%T%%/RELEASE-NOTES %%T%%/bin/ant %%T%%/bin/antRun %%T%%/bin/jspc.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat.sh %%T%%/conf/build.xml %%T%%/conf/jni_server.xml %%T%%/conf/jni_workers.properties %%T%%/conf/manifest.servlet %%T%%/conf/mod_jk.conf %%T%%/conf/obj.conf %%T%%/conf/server.xml %%T%%/conf/test-tomcat.xml %%T%%/conf/tomcat-users.xml %%T%%/conf/tomcat.conf %%T%%/conf/tomcat.policy %%T%%/conf/tomcat.properties %%T%%/conf/uriworkermap.properties %%T%%/conf/web.dtd %%T%%/conf/web.xml %%T%%/conf/workers.properties %%T%%/conf/wrapper.properties %%T%%/doc/AJPv13.html %%T%%/doc/JDBCRealm.howto %%T%%/doc/NT-Service-howto.html %%T%%/doc/Tomcat-Workers-HowTo.html %%T%%/doc/Tomcat-on-NetWare-HowTo.html %%T%%/doc/appdev/build.xml.txt %%T%%/doc/appdev/contents.html %%T%%/doc/appdev/deployment.html %%T%%/doc/appdev/footer.html %%T%%/doc/appdev/header.html %%T%%/doc/appdev/index.html %%T%%/doc/appdev/installation.html %%T%%/doc/appdev/introduction.html %%T%%/doc/appdev/processes.html %%T%%/doc/appdev/sample/build.sh %%T%%/doc/appdev/sample/build.xml %%T%%/doc/appdev/sample/etc/web.xml %%T%%/doc/appdev/sample/src/Hello.java %%T%%/doc/appdev/sample/web/hello.jsp %%T%%/doc/appdev/sample/web/images/tomcat.gif %%T%%/doc/appdev/sample/web/index.html %%T%%/doc/appdev/source.html %%T%%/doc/appdev/tomcat.gif %%T%%/doc/appdev/web.xml.txt %%T%%/doc/faq %%T%%/doc/in-process-howto.html %%T%%/doc/index.html %%T%%/doc/mod_jk-howto.html %%T%%/doc/readme %%T%%/doc/tomcat-apache-howto.html %%T%%/doc/tomcat-iis-howto.html %%T%%/doc/tomcat-localization-howto.html %%T%%/doc/tomcat-netscape-howto.html %%T%%/doc/tomcat-ssl-howto.html %%T%%/doc/uguide/images/banner.gif %%T%%/doc/uguide/images/tomcat.gif %%T%%/doc/uguide/style.css %%T%%/doc/uguide/tomcat-security-unix.html %%T%%/doc/uguide/tomcat-security.html %%T%%/doc/uguide/tomcat_ug.html %%T%%/lib/ant.jar %%T%%/lib/jasper.jar %%T%%/lib/jaxp.jar %%T%%/lib/parser.jar %%T%%/lib/servlet.jar %%T%%/lib/webserver.jar %%T%%/lib/test/Golden/Err.txt %%T%%/lib/test/Golden/ForwardWithQuery.txt %%T%%/lib/test/Golden/HelloWorld.txt %%T%%/lib/test/Golden/Include.txt %%T%%/lib/test/Golden/IncludeFile.txt %%T%%/lib/test/Golden/Mismatch1.txt %%T%%/lib/test/Golden/Mismatch2.txt %%T%%/lib/test/Golden/MustFail.txt %%T%%/lib/test/Golden/PrintWriterTest.txt %%T%%/lib/test/Golden/ServletParam.txt %%T%%/lib/test/Golden/SimpleForward.txt %%T%%/lib/test/Golden/SimpleInclude.txt %%T%%/lib/test/Golden/beanSer.txt %%T%%/lib/test/Golden/beanTest.txt %%T%%/lib/test/Golden/buffer.txt %%T%%/lib/test/Golden/classTest.txt %%T%%/lib/test/Golden/image1.gif %%T%%/lib/test/Golden/implicitConfig.txt %%T%%/lib/test/Golden/implicitContext.txt %%T%%/lib/test/Golden/implicitException.txt %%T%%/lib/test/Golden/implicitOut.txt %%T%%/lib/test/Golden/implicitPage.txt %%T%%/lib/test/Golden/implicitPageContext.txt %%T%%/lib/test/Golden/implicitRequest.txt %%T%%/lib/test/Golden/implicitResponse.txt %%T%%/lib/test/Golden/implicitSession.txt %%T%%/lib/test/Golden/import.txt %%T%%/lib/test/Golden/index.txt %%T%%/lib/test/Golden/jsptoservlet.txt %%T%%/lib/test/Golden/movedindex.txt %%T%%/lib/test/Golden/movedwelcome.txt %%T%%/lib/test/Golden/pageImport.txt %%T%%/lib/test/Golden/parse.txt %%T%%/lib/test/Golden/servletParam1.txt %%T%%/lib/test/Golden/servletParam2.txt %%T%%/lib/test/Golden/welcome.txt %%T%%/src/org/apache/tomcat/facade/HttpServletRequestFacade.java %%T%%/src/org/apache/tomcat/facade/package.html %%T%%/src/org/apache/tomcat/facade/ServletInputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletWriterFacade.java %%T%%/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletContextFacade.java %%T%%/src/org/apache/tomcat/facade/SimpleFacadeManager.java %%T%%/src/org/apache/tomcat/facade/HttpServletResponseFacade.java %%T%%/src/org/apache/tomcat/facade/SessionContextImpl.java %%T%%/src/org/apache/tomcat/facade/ServletConfigImpl.java %%T%%/src/org/apache/tomcat/facade/HttpSessionFacade.java %%T%%/src/org/apache/tomcat/facade/RequestDispatcherImpl.java %%T%%/src/org/apache/tomcat/service/http/HttpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/http/HttpRequestAdapter.java %%T%%/src/org/apache/tomcat/service/http/HttpResponseAdapter.java %%T%%/src/org/apache/tomcat/service/http/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java %%T%%/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/MsgBuffer.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorResponse.java %%T%%/src/org/apache/tomcat/service/connector/MsgConnector.java %%T%%/src/org/apache/tomcat/service/connector/TcpConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings.properties %%T%%/src/org/apache/tomcat/service/SimpleTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpoint.java %%T%%/src/org/apache/tomcat/service/package.html %%T%%/src/org/apache/tomcat/service/PoolTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpointConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/service/TcpConnection.java %%T%%/src/org/apache/tomcat/service/SimpleTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/service/PoolTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/JNIEndpointConnector.java %%T%%/src/org/apache/tomcat/service/TcpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/JNIEndpoint.java %%T%%/src/org/apache/tomcat/core/ContextInterceptor.java %%T%%/src/org/apache/tomcat/core/RequestImpl.java %%T%%/src/org/apache/tomcat/core/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/core/ContextManager.java %%T%%/src/org/apache/tomcat/core/BufferedServletInputStream.java %%T%%/src/org/apache/tomcat/core/ResponseImpl.java %%T%%/src/org/apache/tomcat/core/BufferedServletOutputStream.java %%T%%/src/org/apache/tomcat/core/ServerConnector.java %%T%%/src/org/apache/tomcat/core/BaseInterceptor.java %%T%%/src/org/apache/tomcat/core/ServletLoader.java %%T%%/src/org/apache/tomcat/core/TomcatException.java %%T%%/src/org/apache/tomcat/core/Container.java %%T%%/src/org/apache/tomcat/core/ServletWrapper.java %%T%%/src/org/apache/tomcat/core/Response.java %%T%%/src/org/apache/tomcat/core/Context.java %%T%%/src/org/apache/tomcat/core/Constants.java %%T%%/src/org/apache/tomcat/core/Handler.java %%T%%/src/org/apache/tomcat/core/LocalStrings_se.properties %%T%%/src/org/apache/tomcat/core/package.html %%T%%/src/org/apache/tomcat/core/FacadeManager.java %%T%%/src/org/apache/tomcat/core/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/core/RequestInterceptor.java %%T%%/src/org/apache/tomcat/core/LocalStrings.properties %%T%%/src/org/apache/tomcat/core/Request.java %%T%%/src/org/apache/tomcat/context/AutoSetup.java %%T%%/src/org/apache/tomcat/context/DefaultCMSetter.java %%T%%/src/org/apache/tomcat/context/WebXmlReader.java %%T%%/src/org/apache/tomcat/context/LoaderInterceptor.java %%T%%/src/org/apache/tomcat/context/LogEvents.java %%T%%/src/org/apache/tomcat/context/WorkDirInterceptor.java %%T%%/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java %%T%%/src/org/apache/tomcat/context/PolicyInterceptor.java %%T%%/src/org/apache/tomcat/logging/Logger.java %%T%%/src/org/apache/tomcat/logging/LogHelper.java %%T%%/src/org/apache/tomcat/logging/TomcatLogger.java %%T%%/src/org/apache/tomcat/util/pattern/ImplicationTable.java %%T%%/src/org/apache/tomcat/util/pattern/WildcardPattern.java %%T%%/src/org/apache/tomcat/util/pattern/Implication.java %%T%%/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java %%T%%/src/org/apache/tomcat/util/pattern/PatternMatcher.java %%T%%/src/org/apache/tomcat/util/xml/XmlAction.java %%T%%/src/org/apache/tomcat/util/xml/XmlMapper.java %%T%%/src/org/apache/tomcat/util/xml/SaxContext.java %%T%%/src/org/apache/tomcat/util/xml/XmlMatch.java %%T%%/src/org/apache/tomcat/util/xml/PathMatch.java %%T%%/src/org/apache/tomcat/util/compat/SimpleClassLoader.java %%T%%/src/org/apache/tomcat/util/compat/Action.java %%T%%/src/org/apache/tomcat/util/compat/Jdk11Compat.java %%T%%/src/org/apache/tomcat/util/compat/Jdk12Support.java %%T%%/src/org/apache/tomcat/util/WARUtil.java %%T%%/src/org/apache/tomcat/util/HexUtils.java %%T%%/src/org/apache/tomcat/util/RecycleBufferedInputStream.java %%T%%/src/org/apache/tomcat/util/MimeMap.java %%T%%/src/org/apache/tomcat/util/URLUtil.java %%T%%/src/org/apache/tomcat/util/Queue.java %%T%%/src/org/apache/tomcat/util/LocaleToCharsetMap.java %%T%%/src/org/apache/tomcat/util/FileUtil.java %%T%%/src/org/apache/tomcat/util/MessageChars.java %%T%%/src/org/apache/tomcat/util/SimpleHashtable.java %%T%%/src/org/apache/tomcat/util/DateTool.java %%T%%/src/org/apache/tomcat/util/LocalStrings.properties %%T%%/src/org/apache/tomcat/util/CookieTools.java %%T%%/src/org/apache/tomcat/util/Ascii.java %%T%%/src/org/apache/tomcat/util/BufferListener.java %%T%%/src/org/apache/tomcat/util/BufferEvent.java %%T%%/src/org/apache/tomcat/util/SessionIdGenerator.java %%T%%/src/org/apache/tomcat/util/ArrayEnumerator.java %%T%%/src/org/apache/tomcat/util/PrefixMapper.java %%T%%/src/org/apache/tomcat/util/RequestUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaderField.java %%T%%/src/org/apache/tomcat/util/ThreadPool.java %%T%%/src/org/apache/tomcat/util/ThreadPoolRunnable.java %%T%%/src/org/apache/tomcat/util/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/util/BuffTool.java %%T%%/src/org/apache/tomcat/util/SecurityTools.java %%T%%/src/org/apache/tomcat/util/SimplePrincipal.java %%T%%/src/org/apache/tomcat/util/ByteBuffer.java %%T%%/src/org/apache/tomcat/util/SimplePool.java %%T%%/src/org/apache/tomcat/util/StringManager.java %%T%%/src/org/apache/tomcat/util/EmptyEnumeration.java %%T%%/src/org/apache/tomcat/util/Reaper.java %%T%%/src/org/apache/tomcat/util/MessageBytes.java %%T%%/src/org/apache/tomcat/util/SessionUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaders.java %%T%%/src/org/apache/tomcat/util/DevNullOutputStream.java %%T%%/src/org/apache/tomcat/util/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/util/MessageString.java %%T%%/src/org/apache/tomcat/util/package.html %%T%%/src/org/apache/tomcat/adapter/HttpAdapter.java %%T%%/src/org/apache/tomcat/adapter/AdapterHandler.java %%T%%/src/org/apache/tomcat/resources/web.dtd %%T%%/src/org/apache/tomcat/resources/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_en.properties %%T%%/src/org/apache/tomcat/request/InvokerInterceptor.java %%T%%/src/org/apache/tomcat/request/SimpleMapper1.java %%T%%/src/org/apache/tomcat/request/SimpleRealm.java %%T%%/src/org/apache/tomcat/request/AccessInterceptor.java %%T%%/src/org/apache/tomcat/request/SessionInterceptor.java %%T%%/src/org/apache/tomcat/request/JspInterceptor.java %%T%%/src/org/apache/tomcat/request/LocalStrings.properties %%T%%/src/org/apache/tomcat/request/StaticInterceptor.java %%T%%/src/org/apache/tomcat/request/JDBCRealm.java %%T%%/src/org/apache/tomcat/request/AccountingInterceptor.java %%T%%/src/org/apache/tomcat/request/Jdk12Interceptor.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader.java %%T%%/src/org/apache/tomcat/loader/AdaptiveServletLoader.java %%T%%/src/org/apache/tomcat/loader/SimpleFileFilter.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java %%T%%/src/org/apache/tomcat/loader/ClassRepository.java %%T%%/src/org/apache/tomcat/task/StopTomcat.java %%T%%/src/org/apache/tomcat/task/ApacheConfig.java %%T%%/src/org/apache/tomcat/task/Expand.java %%T%%/src/org/apache/tomcat/task/IISConfig.java %%T%%/src/org/apache/tomcat/task/NSConfig.java %%T%%/src/org/apache/tomcat/task/GTest.java %%T%%/src/org/apache/tomcat/net/ServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/DefaultServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/SSLSocketFactory.java %%T%%/src/org/apache/tomcat/session/LocalStrings.properties %%T%%/src/org/apache/tomcat/session/StandardSessionInterceptor.java %%T%%/src/org/apache/tomcat/session/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/session/StandardManager.java %%T%%/src/org/apache/tomcat/session/StandardSession.java %%T%%/src/org/apache/tomcat/session/SessionSerializer.java %%T%%/src/org/apache/tomcat/protocol/war/Handler.java %%T%%/src/org/apache/tomcat/protocol/jar/Handler.java %%T%%/src/org/apache/tomcat/protocol/WARConnection.java %%T%%/src/org/apache/tomcat/protocol/WARManager.java %%T%%/src/org/apache/tomcat/startup/Tomcat.java %%T%%/src/org/apache/tomcat/startup/HostConfig.java %%T%%/src/org/apache/tomcat/startup/EmbededTomcat.java %%T%%/src/org/apache/jasper/resources/messages_fr.properties %%T%%/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd %%T%%/src/org/apache/jasper/resources/messages.properties %%T%%/src/org/apache/jasper/resources/messages_es.properties %%T%%/src/org/apache/jasper/resources/web.dtd %%T%%/src/org/apache/jasper/servlet/JasperLoader.java %%T%%/src/org/apache/jasper/servlet/TomcatServletEngine.java %%T%%/src/org/apache/jasper/servlet/JspServlet.java %%T%%/src/org/apache/jasper/servlet/ServletEngine.java %%T%%/src/org/apache/jasper/servlet/JasperLoader12.java %%T%%/src/org/apache/jasper/runtime/JspFactoryImpl.java %%T%%/src/org/apache/jasper/runtime/JspRuntimeLibrary.java %%T%%/src/org/apache/jasper/runtime/PageContextImpl.java %%T%%/src/org/apache/jasper/runtime/JspWriterImpl.java %%T%%/src/org/apache/jasper/runtime/BodyContentImpl.java %%T%%/src/org/apache/jasper/runtime/HttpJspBase.java %%T%%/src/org/apache/jasper/runtime/JspLoader.java %%T%%/src/org/apache/jasper/compiler/JspCompiler.java %%T%%/src/org/apache/jasper/compiler/BeanRepository.java %%T%%/src/org/apache/jasper/compiler/ForwardGenerator.java %%T%%/src/org/apache/jasper/compiler/DestroyMethodPhase.java %%T%%/src/org/apache/jasper/compiler/IncludeGenerator.java %%T%%/src/org/apache/jasper/compiler/TagGeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java %%T%%/src/org/apache/jasper/compiler/Mangler.java %%T%%/src/org/apache/jasper/compiler/StaticInitializerPhase.java %%T%%/src/org/apache/jasper/compiler/CommandLineCompiler.java %%T%%/src/org/apache/jasper/compiler/Mark.java %%T%%/src/org/apache/jasper/compiler/JikesJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/SunJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagBeginGenerator.java %%T%%/src/org/apache/jasper/compiler/ClassName.java %%T%%/src/org/apache/jasper/compiler/PluginGenerator.java %%T%%/src/org/apache/jasper/compiler/BeanGenerator.java %%T%%/src/org/apache/jasper/compiler/DelegatingListener.java %%T%%/src/org/apache/jasper/compiler/SetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/InfoGenerator.java %%T%%/src/org/apache/jasper/compiler/CommentGenerator.java %%T%%/src/org/apache/jasper/compiler/GetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/Parser.java %%T%%/src/org/apache/jasper/compiler/ScriptletGenerator.java %%T%%/src/org/apache/jasper/compiler/FileDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/GeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspUtil.java %%T%%/src/org/apache/jasper/compiler/BeanEndGenerator.java %%T%%/src/org/apache/jasper/compiler/Generator.java %%T%%/src/org/apache/jasper/compiler/ParseException.java %%T%%/src/org/apache/jasper/compiler/ExpressionGenerator.java %%T%%/src/org/apache/jasper/compiler/JspReader.java %%T%%/src/org/apache/jasper/compiler/InitMethodPhase.java %%T%%/src/org/apache/jasper/compiler/MappedCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/CompileException.java %%T%%/src/org/apache/jasper/compiler/DumbParseEventListener.java %%T%%/src/org/apache/jasper/compiler/Compiler.java %%T%%/src/org/apache/jasper/compiler/ServletWriter.java %%T%%/src/org/apache/jasper/compiler/ClassDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/CoreElement.java %%T%%/src/org/apache/jasper/compiler/ParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagEndGenerator.java %%T%%/src/org/apache/jasper/compiler/StoredCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/JavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagLibraries.java %%T%%/src/org/apache/jasper/compiler/ServiceMethodPhase.java %%T%%/src/org/apache/jasper/compiler/TagCache.java %%T%%/src/org/apache/jasper/compiler/JakartaCommentGenerator.java %%T%%/src/org/apache/jasper/compiler/DeclarationGenerator.java %%T%%/src/org/apache/jasper/compiler/CharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/BaseJspListener.java %%T%%/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java %%T%%/src/org/apache/jasper/CommandLineContext.java %%T%%/src/org/apache/jasper/EmbededServletOptions.java %%T%%/src/org/apache/jasper/JspC.java %%T%%/src/org/apache/jasper/JspEngineContext.java %%T%%/src/org/apache/jasper/Options.java %%T%%/src/org/apache/jasper/Constants.java %%T%%/src/org/apache/jasper/JasperException.java %%T%%/src/org/apache/jasper/JspCompilationContext.java %%T%%/webapps/ROOT.war %%T%%/webapps/admin.war %%T%%/webapps/examples.war %%T%%/webapps/test.war @dirrm %%T%%/webapps @dirrm %%T%%/src/org/apache/tomcat/util/xml @dirrm %%T%%/src/org/apache/tomcat/util/pattern @dirrm %%T%%/src/org/apache/tomcat/util/compat @dirrm %%T%%/src/org/apache/tomcat/util @dirrm %%T%%/src/org/apache/tomcat/task @dirrm %%T%%/src/org/apache/tomcat/startup @dirrm %%T%%/src/org/apache/tomcat/session @dirrm %%T%%/src/org/apache/tomcat/service/http @dirrm %%T%%/src/org/apache/tomcat/service/connector @dirrm %%T%%/src/org/apache/tomcat/service @dirrm %%T%%/src/org/apache/tomcat/resources @dirrm %%T%%/src/org/apache/tomcat/request @dirrm %%T%%/src/org/apache/tomcat/protocol/war @dirrm %%T%%/src/org/apache/tomcat/protocol/jar @dirrm %%T%%/src/org/apache/tomcat/protocol @dirrm %%T%%/src/org/apache/tomcat/net @dirrm %%T%%/src/org/apache/tomcat/loader @dirrm %%T%%/src/org/apache/tomcat/facade @dirrm %%T%%/src/org/apache/tomcat/adapter @dirrm %%T%%/src/org/apache/tomcat/core @dirrm %%T%%/src/org/apache/tomcat/context @dirrm %%T%%/src/org/apache/tomcat/logging @dirrm %%T%%/src/org/apache/tomcat @dirrm %%T%%/src/org/apache/jasper/servlet @dirrm %%T%%/src/org/apache/jasper/runtime @dirrm %%T%%/src/org/apache/jasper/resources @dirrm %%T%%/src/org/apache/jasper/compiler @dirrm %%T%%/src/org/apache/jasper @dirrm %%T%%/src/org/apache @dirrm %%T%%/src/org @dirrm %%T%%/src @dirrm %%T%%/logs @dirrm %%T%%/lib/test/Golden @dirrm %%T%%/lib/test @dirrm %%T%%/lib @dirrm %%T%%/doc/uguide/images @dirrm %%T%%/doc/uguide @dirrm %%T%%/doc/appdev/sample/web/images @dirrm %%T%%/doc/appdev/sample/web @dirrm %%T%%/doc/appdev/sample/src @dirrm %%T%%/doc/appdev/sample/etc @dirrm %%T%%/doc/appdev/sample @dirrm %%T%%/doc/appdev @dirrm %%T%%/doc @dirrm %%T%%/conf @dirrm %%T%%/bin @dirrm %%T%% @unexec pw groupdel tomcat || true @unexec pw userdel tomcat || true Property changes on: head/www/jakarta-tomcat/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/www/jakarta-tomcat3/Makefile =================================================================== --- head/www/jakarta-tomcat3/Makefile (revision 54885) +++ head/www/jakarta-tomcat3/Makefile (revision 54886) @@ -1,131 +1,137 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.apache.org/dist/jakarta/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd DIST_SUBDIR= jakarta/tomcat/${PORTVERSION} 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 APPCTL_NAME= ${APP_SHORTNAME}ctl CTL_SCRIPT= ${PREFIX}/bin/${APPCTL_NAME} STARTUP_ORDER?= 020 -RC_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh -APP_TITLE= Jakarta Tomcat +STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME?= ${APP_SHORTNAME} GROUP_NAME?= ${USER_NAME} USER_ID?= 7103 GROUP_ID?= ${USER_ID} PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG?= ${LOG_DIR}/stdout.log STDERR_LOG?= ${LOG_DIR}/stderr.log -AUTO_START?= YES +AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CTL_SCRIPT}" - @${ECHO_CMD} " Startup script location: ${RC_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} (${USER_ID}:${GROUP_ID})" @${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: @# Add the group and the user if they do not exist ${PW} groupadd -n ${GROUP_NAME} -g ${GROUP_ID} || true ${PW} useradd -n ${USER_NAME} -u ${USER_ID} -g ${GROUP_NAME} -c "${APP_TITLE} account" -d ${APP_HOME} -s ${SH} -h - || true @# 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 control script ${CAT} ${FILESDIR}/${APPCTL_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%PORTVERSION%%/s//${PORTVERSION}/" \ | ${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} "/%%RC_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ + | ${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}/" \ > ${CTL_SCRIPT} - ${CHMOD} 755 ${CTL_SCRIPT} + ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CTL_SCRIPT} + ${CHMOD} 6554 ${CTL_SCRIPT} @# Install the startup script - ${LN} -sf ${CTL_SCRIPT} ${RC_SCRIPT} + ${CP} ${FILESDIR}/${PORTNAME}.sh ${STARTUP_SCRIPT} + ${CHMOD} 0554 ${STARTUP_SCRIPT} - @# Create the directories that the application will create it at the + @# Create the directories that the application will create at the @# first run - ${MKDIR} ${APP_HOME}/logs + ${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}/${APPCTL_NAME}.1 \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ > ${WRKDIR}/${APPCTL_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${APPCTL_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 ${APPCTL_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${APPCTL_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CTL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/www/jakarta-tomcat3/files/tomcatctl =================================================================== --- head/www/jakarta-tomcat3/files/tomcatctl (revision 54885) +++ head/www/jakarta-tomcat3/files/tomcatctl (revision 54886) @@ -1,99 +1,146 @@ #!/bin/sh # Set some variables VERSION=%%PORTVERSION%% APP_HOME=%%APP_HOME%% -USER_NAME=%%USER_NAME%% STDOUT_LOG=%%STDOUT_LOG%% STDERR_LOG=%%STDERR_LOG%% JAR_FILE=${APP_HOME}/lib/webserver.jar MYSELF=`basename $0` # Set the CLASSPATH unset CLASSPATH for i in ${APP_HOME}/lib/* ; do if [ "$CLASSPATH" != "" ]; then CLASSPATH=${CLASSPATH}:$i else CLASSPATH=$i fi done if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar fi -# Check if we're being run as a shell script or as an rc script -if [ ${MYSELF} = "%%RC_SCRIPT_NAME%%" ]; then - AS_RC_SCRIPT=yes -else - AS_RC_SCRIPT=no -fi - # Check if the JAVA_HOME directory is defined, otherwise set it to the # fallback default if [ "${JAVA_HOME}a" = "a" ]; then JAVA_HOME=%%JAVA_HOME%% fi JAVA_CMD=${JAVA_HOME}/bin/java -# Function that starts the application -start() { + +############################################################################## +# Function that shows an error message +# +# This function is called by the 'checks' function +# +# Parameters: +# 1: The message to be displayed. + +error() { + echo -n "%%APP_SHORTNAME%%: ERROR: " + echo $1 +} + + +############################################################################## +# Function that performs all checks necessary for starting or stopping the +# application. +# +# This function is called by the 'start' and 'stop' functions +# +# This function expects no parameters + +checks() { # Make sure the application directory does exist if [ ! -d ${APP_HOME} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." + error "Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." exit 2 fi # Make sure the application JAR file exists if [ ! -r ${JAR_FILE} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." + error "Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." exit 3 fi # Make sure the Java VM can be found if [ ! -x ${JAVA_CMD} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find Java VM at ${JAVA_HOME}." + error "Unable to find Java VM at ${JAVA_HOME}." exit 4 fi +} - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + +############################################################################## +# Functions that calls the application with the specified parameter +# +# Parameters: +# 1: The argument to pass to the application (optional) + +app() { + (cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat $1) >> ${STDOUT_LOG} 2>> ${STDERR_LOG} } + +############################################################################## +# Function that starts the application +# +# This function is called from the main function +# +# This function expects no parameters + +start() { + # Perform the checks + checks + + # Stop the application + app +} + + +############################################################################## # Function that stops the application +# +# This function is called from the main function +# +# This function expects no parameters + stop() { - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat -stop) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + # Perform the checks + checks + + # Stop the application + app -stop } -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "" - echo "Usage: ${MYSELF} { start | stop | restart }" - echo "" - exit 64 - ;; -esac + +############################################################################## +# Main function. This function calls the 'start' and 'stop' functions. +# +# Parameters: +# 1: The argument to this shell script + +main() { + case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: ${MYSELF} { start | stop | restart }" + exit 64 + ;; + esac +} + + +# Call the main function and exit +main $1 +exit 0 Property changes on: head/www/jakarta-tomcat3/files/tomcatctl ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/www/jakarta-tomcat3/pkg-plist (revision 54885) +++ head/www/jakarta-tomcat3/pkg-plist (revision 54886) @@ -1,413 +1,414 @@ +bin/tomcatctl etc/rc.d/020.jakarta-tomcat.sh %%T%%/KEYS %%T%%/LICENSE %%T%%/RELEASE-NOTES %%T%%/bin/ant %%T%%/bin/antRun %%T%%/bin/jspc.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat.sh %%T%%/conf/build.xml %%T%%/conf/jni_server.xml %%T%%/conf/jni_workers.properties %%T%%/conf/manifest.servlet %%T%%/conf/mod_jk.conf %%T%%/conf/obj.conf %%T%%/conf/server.xml %%T%%/conf/test-tomcat.xml %%T%%/conf/tomcat-users.xml %%T%%/conf/tomcat.conf %%T%%/conf/tomcat.policy %%T%%/conf/tomcat.properties %%T%%/conf/uriworkermap.properties %%T%%/conf/web.dtd %%T%%/conf/web.xml %%T%%/conf/workers.properties %%T%%/conf/wrapper.properties %%T%%/doc/AJPv13.html %%T%%/doc/JDBCRealm.howto %%T%%/doc/NT-Service-howto.html %%T%%/doc/Tomcat-Workers-HowTo.html %%T%%/doc/Tomcat-on-NetWare-HowTo.html %%T%%/doc/appdev/build.xml.txt %%T%%/doc/appdev/contents.html %%T%%/doc/appdev/deployment.html %%T%%/doc/appdev/footer.html %%T%%/doc/appdev/header.html %%T%%/doc/appdev/index.html %%T%%/doc/appdev/installation.html %%T%%/doc/appdev/introduction.html %%T%%/doc/appdev/processes.html %%T%%/doc/appdev/sample/build.sh %%T%%/doc/appdev/sample/build.xml %%T%%/doc/appdev/sample/etc/web.xml %%T%%/doc/appdev/sample/src/Hello.java %%T%%/doc/appdev/sample/web/hello.jsp %%T%%/doc/appdev/sample/web/images/tomcat.gif %%T%%/doc/appdev/sample/web/index.html %%T%%/doc/appdev/source.html %%T%%/doc/appdev/tomcat.gif %%T%%/doc/appdev/web.xml.txt %%T%%/doc/faq %%T%%/doc/in-process-howto.html %%T%%/doc/index.html %%T%%/doc/mod_jk-howto.html %%T%%/doc/readme %%T%%/doc/tomcat-apache-howto.html %%T%%/doc/tomcat-iis-howto.html %%T%%/doc/tomcat-localization-howto.html %%T%%/doc/tomcat-netscape-howto.html %%T%%/doc/tomcat-ssl-howto.html %%T%%/doc/uguide/images/banner.gif %%T%%/doc/uguide/images/tomcat.gif %%T%%/doc/uguide/style.css %%T%%/doc/uguide/tomcat-security-unix.html %%T%%/doc/uguide/tomcat-security.html %%T%%/doc/uguide/tomcat_ug.html %%T%%/lib/ant.jar %%T%%/lib/jasper.jar %%T%%/lib/jaxp.jar %%T%%/lib/parser.jar %%T%%/lib/servlet.jar %%T%%/lib/webserver.jar %%T%%/lib/test/Golden/Err.txt %%T%%/lib/test/Golden/ForwardWithQuery.txt %%T%%/lib/test/Golden/HelloWorld.txt %%T%%/lib/test/Golden/Include.txt %%T%%/lib/test/Golden/IncludeFile.txt %%T%%/lib/test/Golden/Mismatch1.txt %%T%%/lib/test/Golden/Mismatch2.txt %%T%%/lib/test/Golden/MustFail.txt %%T%%/lib/test/Golden/PrintWriterTest.txt %%T%%/lib/test/Golden/ServletParam.txt %%T%%/lib/test/Golden/SimpleForward.txt %%T%%/lib/test/Golden/SimpleInclude.txt %%T%%/lib/test/Golden/beanSer.txt %%T%%/lib/test/Golden/beanTest.txt %%T%%/lib/test/Golden/buffer.txt %%T%%/lib/test/Golden/classTest.txt %%T%%/lib/test/Golden/image1.gif %%T%%/lib/test/Golden/implicitConfig.txt %%T%%/lib/test/Golden/implicitContext.txt %%T%%/lib/test/Golden/implicitException.txt %%T%%/lib/test/Golden/implicitOut.txt %%T%%/lib/test/Golden/implicitPage.txt %%T%%/lib/test/Golden/implicitPageContext.txt %%T%%/lib/test/Golden/implicitRequest.txt %%T%%/lib/test/Golden/implicitResponse.txt %%T%%/lib/test/Golden/implicitSession.txt %%T%%/lib/test/Golden/import.txt %%T%%/lib/test/Golden/index.txt %%T%%/lib/test/Golden/jsptoservlet.txt %%T%%/lib/test/Golden/movedindex.txt %%T%%/lib/test/Golden/movedwelcome.txt %%T%%/lib/test/Golden/pageImport.txt %%T%%/lib/test/Golden/parse.txt %%T%%/lib/test/Golden/servletParam1.txt %%T%%/lib/test/Golden/servletParam2.txt %%T%%/lib/test/Golden/welcome.txt %%T%%/src/org/apache/tomcat/facade/HttpServletRequestFacade.java %%T%%/src/org/apache/tomcat/facade/package.html %%T%%/src/org/apache/tomcat/facade/ServletInputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletWriterFacade.java %%T%%/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletContextFacade.java %%T%%/src/org/apache/tomcat/facade/SimpleFacadeManager.java %%T%%/src/org/apache/tomcat/facade/HttpServletResponseFacade.java %%T%%/src/org/apache/tomcat/facade/SessionContextImpl.java %%T%%/src/org/apache/tomcat/facade/ServletConfigImpl.java %%T%%/src/org/apache/tomcat/facade/HttpSessionFacade.java %%T%%/src/org/apache/tomcat/facade/RequestDispatcherImpl.java %%T%%/src/org/apache/tomcat/service/http/HttpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/http/HttpRequestAdapter.java %%T%%/src/org/apache/tomcat/service/http/HttpResponseAdapter.java %%T%%/src/org/apache/tomcat/service/http/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java %%T%%/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/MsgBuffer.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorResponse.java %%T%%/src/org/apache/tomcat/service/connector/MsgConnector.java %%T%%/src/org/apache/tomcat/service/connector/TcpConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings.properties %%T%%/src/org/apache/tomcat/service/SimpleTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpoint.java %%T%%/src/org/apache/tomcat/service/package.html %%T%%/src/org/apache/tomcat/service/PoolTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpointConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/service/TcpConnection.java %%T%%/src/org/apache/tomcat/service/SimpleTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/service/PoolTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/JNIEndpointConnector.java %%T%%/src/org/apache/tomcat/service/TcpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/JNIEndpoint.java %%T%%/src/org/apache/tomcat/core/ContextInterceptor.java %%T%%/src/org/apache/tomcat/core/RequestImpl.java %%T%%/src/org/apache/tomcat/core/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/core/ContextManager.java %%T%%/src/org/apache/tomcat/core/BufferedServletInputStream.java %%T%%/src/org/apache/tomcat/core/ResponseImpl.java %%T%%/src/org/apache/tomcat/core/BufferedServletOutputStream.java %%T%%/src/org/apache/tomcat/core/ServerConnector.java %%T%%/src/org/apache/tomcat/core/BaseInterceptor.java %%T%%/src/org/apache/tomcat/core/ServletLoader.java %%T%%/src/org/apache/tomcat/core/TomcatException.java %%T%%/src/org/apache/tomcat/core/Container.java %%T%%/src/org/apache/tomcat/core/ServletWrapper.java %%T%%/src/org/apache/tomcat/core/Response.java %%T%%/src/org/apache/tomcat/core/Context.java %%T%%/src/org/apache/tomcat/core/Constants.java %%T%%/src/org/apache/tomcat/core/Handler.java %%T%%/src/org/apache/tomcat/core/LocalStrings_se.properties %%T%%/src/org/apache/tomcat/core/package.html %%T%%/src/org/apache/tomcat/core/FacadeManager.java %%T%%/src/org/apache/tomcat/core/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/core/RequestInterceptor.java %%T%%/src/org/apache/tomcat/core/LocalStrings.properties %%T%%/src/org/apache/tomcat/core/Request.java %%T%%/src/org/apache/tomcat/context/AutoSetup.java %%T%%/src/org/apache/tomcat/context/DefaultCMSetter.java %%T%%/src/org/apache/tomcat/context/WebXmlReader.java %%T%%/src/org/apache/tomcat/context/LoaderInterceptor.java %%T%%/src/org/apache/tomcat/context/LogEvents.java %%T%%/src/org/apache/tomcat/context/WorkDirInterceptor.java %%T%%/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java %%T%%/src/org/apache/tomcat/context/PolicyInterceptor.java %%T%%/src/org/apache/tomcat/logging/Logger.java %%T%%/src/org/apache/tomcat/logging/LogHelper.java %%T%%/src/org/apache/tomcat/logging/TomcatLogger.java %%T%%/src/org/apache/tomcat/util/pattern/ImplicationTable.java %%T%%/src/org/apache/tomcat/util/pattern/WildcardPattern.java %%T%%/src/org/apache/tomcat/util/pattern/Implication.java %%T%%/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java %%T%%/src/org/apache/tomcat/util/pattern/PatternMatcher.java %%T%%/src/org/apache/tomcat/util/xml/XmlAction.java %%T%%/src/org/apache/tomcat/util/xml/XmlMapper.java %%T%%/src/org/apache/tomcat/util/xml/SaxContext.java %%T%%/src/org/apache/tomcat/util/xml/XmlMatch.java %%T%%/src/org/apache/tomcat/util/xml/PathMatch.java %%T%%/src/org/apache/tomcat/util/compat/SimpleClassLoader.java %%T%%/src/org/apache/tomcat/util/compat/Action.java %%T%%/src/org/apache/tomcat/util/compat/Jdk11Compat.java %%T%%/src/org/apache/tomcat/util/compat/Jdk12Support.java %%T%%/src/org/apache/tomcat/util/WARUtil.java %%T%%/src/org/apache/tomcat/util/HexUtils.java %%T%%/src/org/apache/tomcat/util/RecycleBufferedInputStream.java %%T%%/src/org/apache/tomcat/util/MimeMap.java %%T%%/src/org/apache/tomcat/util/URLUtil.java %%T%%/src/org/apache/tomcat/util/Queue.java %%T%%/src/org/apache/tomcat/util/LocaleToCharsetMap.java %%T%%/src/org/apache/tomcat/util/FileUtil.java %%T%%/src/org/apache/tomcat/util/MessageChars.java %%T%%/src/org/apache/tomcat/util/SimpleHashtable.java %%T%%/src/org/apache/tomcat/util/DateTool.java %%T%%/src/org/apache/tomcat/util/LocalStrings.properties %%T%%/src/org/apache/tomcat/util/CookieTools.java %%T%%/src/org/apache/tomcat/util/Ascii.java %%T%%/src/org/apache/tomcat/util/BufferListener.java %%T%%/src/org/apache/tomcat/util/BufferEvent.java %%T%%/src/org/apache/tomcat/util/SessionIdGenerator.java %%T%%/src/org/apache/tomcat/util/ArrayEnumerator.java %%T%%/src/org/apache/tomcat/util/PrefixMapper.java %%T%%/src/org/apache/tomcat/util/RequestUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaderField.java %%T%%/src/org/apache/tomcat/util/ThreadPool.java %%T%%/src/org/apache/tomcat/util/ThreadPoolRunnable.java %%T%%/src/org/apache/tomcat/util/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/util/BuffTool.java %%T%%/src/org/apache/tomcat/util/SecurityTools.java %%T%%/src/org/apache/tomcat/util/SimplePrincipal.java %%T%%/src/org/apache/tomcat/util/ByteBuffer.java %%T%%/src/org/apache/tomcat/util/SimplePool.java %%T%%/src/org/apache/tomcat/util/StringManager.java %%T%%/src/org/apache/tomcat/util/EmptyEnumeration.java %%T%%/src/org/apache/tomcat/util/Reaper.java %%T%%/src/org/apache/tomcat/util/MessageBytes.java %%T%%/src/org/apache/tomcat/util/SessionUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaders.java %%T%%/src/org/apache/tomcat/util/DevNullOutputStream.java %%T%%/src/org/apache/tomcat/util/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/util/MessageString.java %%T%%/src/org/apache/tomcat/util/package.html %%T%%/src/org/apache/tomcat/adapter/HttpAdapter.java %%T%%/src/org/apache/tomcat/adapter/AdapterHandler.java %%T%%/src/org/apache/tomcat/resources/web.dtd %%T%%/src/org/apache/tomcat/resources/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_en.properties %%T%%/src/org/apache/tomcat/request/InvokerInterceptor.java %%T%%/src/org/apache/tomcat/request/SimpleMapper1.java %%T%%/src/org/apache/tomcat/request/SimpleRealm.java %%T%%/src/org/apache/tomcat/request/AccessInterceptor.java %%T%%/src/org/apache/tomcat/request/SessionInterceptor.java %%T%%/src/org/apache/tomcat/request/JspInterceptor.java %%T%%/src/org/apache/tomcat/request/LocalStrings.properties %%T%%/src/org/apache/tomcat/request/StaticInterceptor.java %%T%%/src/org/apache/tomcat/request/JDBCRealm.java %%T%%/src/org/apache/tomcat/request/AccountingInterceptor.java %%T%%/src/org/apache/tomcat/request/Jdk12Interceptor.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader.java %%T%%/src/org/apache/tomcat/loader/AdaptiveServletLoader.java %%T%%/src/org/apache/tomcat/loader/SimpleFileFilter.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java %%T%%/src/org/apache/tomcat/loader/ClassRepository.java %%T%%/src/org/apache/tomcat/task/StopTomcat.java %%T%%/src/org/apache/tomcat/task/ApacheConfig.java %%T%%/src/org/apache/tomcat/task/Expand.java %%T%%/src/org/apache/tomcat/task/IISConfig.java %%T%%/src/org/apache/tomcat/task/NSConfig.java %%T%%/src/org/apache/tomcat/task/GTest.java %%T%%/src/org/apache/tomcat/net/ServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/DefaultServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/SSLSocketFactory.java %%T%%/src/org/apache/tomcat/session/LocalStrings.properties %%T%%/src/org/apache/tomcat/session/StandardSessionInterceptor.java %%T%%/src/org/apache/tomcat/session/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/session/StandardManager.java %%T%%/src/org/apache/tomcat/session/StandardSession.java %%T%%/src/org/apache/tomcat/session/SessionSerializer.java %%T%%/src/org/apache/tomcat/protocol/war/Handler.java %%T%%/src/org/apache/tomcat/protocol/jar/Handler.java %%T%%/src/org/apache/tomcat/protocol/WARConnection.java %%T%%/src/org/apache/tomcat/protocol/WARManager.java %%T%%/src/org/apache/tomcat/startup/Tomcat.java %%T%%/src/org/apache/tomcat/startup/HostConfig.java %%T%%/src/org/apache/tomcat/startup/EmbededTomcat.java %%T%%/src/org/apache/jasper/resources/messages_fr.properties %%T%%/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd %%T%%/src/org/apache/jasper/resources/messages.properties %%T%%/src/org/apache/jasper/resources/messages_es.properties %%T%%/src/org/apache/jasper/resources/web.dtd %%T%%/src/org/apache/jasper/servlet/JasperLoader.java %%T%%/src/org/apache/jasper/servlet/TomcatServletEngine.java %%T%%/src/org/apache/jasper/servlet/JspServlet.java %%T%%/src/org/apache/jasper/servlet/ServletEngine.java %%T%%/src/org/apache/jasper/servlet/JasperLoader12.java %%T%%/src/org/apache/jasper/runtime/JspFactoryImpl.java %%T%%/src/org/apache/jasper/runtime/JspRuntimeLibrary.java %%T%%/src/org/apache/jasper/runtime/PageContextImpl.java %%T%%/src/org/apache/jasper/runtime/JspWriterImpl.java %%T%%/src/org/apache/jasper/runtime/BodyContentImpl.java %%T%%/src/org/apache/jasper/runtime/HttpJspBase.java %%T%%/src/org/apache/jasper/runtime/JspLoader.java %%T%%/src/org/apache/jasper/compiler/JspCompiler.java %%T%%/src/org/apache/jasper/compiler/BeanRepository.java %%T%%/src/org/apache/jasper/compiler/ForwardGenerator.java %%T%%/src/org/apache/jasper/compiler/DestroyMethodPhase.java %%T%%/src/org/apache/jasper/compiler/IncludeGenerator.java %%T%%/src/org/apache/jasper/compiler/TagGeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java %%T%%/src/org/apache/jasper/compiler/Mangler.java %%T%%/src/org/apache/jasper/compiler/StaticInitializerPhase.java %%T%%/src/org/apache/jasper/compiler/CommandLineCompiler.java %%T%%/src/org/apache/jasper/compiler/Mark.java %%T%%/src/org/apache/jasper/compiler/JikesJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/SunJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagBeginGenerator.java %%T%%/src/org/apache/jasper/compiler/ClassName.java %%T%%/src/org/apache/jasper/compiler/PluginGenerator.java %%T%%/src/org/apache/jasper/compiler/BeanGenerator.java %%T%%/src/org/apache/jasper/compiler/DelegatingListener.java %%T%%/src/org/apache/jasper/compiler/SetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/InfoGenerator.java %%T%%/src/org/apache/jasper/compiler/CommentGenerator.java %%T%%/src/org/apache/jasper/compiler/GetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/Parser.java %%T%%/src/org/apache/jasper/compiler/ScriptletGenerator.java %%T%%/src/org/apache/jasper/compiler/FileDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/GeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspUtil.java %%T%%/src/org/apache/jasper/compiler/BeanEndGenerator.java %%T%%/src/org/apache/jasper/compiler/Generator.java %%T%%/src/org/apache/jasper/compiler/ParseException.java %%T%%/src/org/apache/jasper/compiler/ExpressionGenerator.java %%T%%/src/org/apache/jasper/compiler/JspReader.java %%T%%/src/org/apache/jasper/compiler/InitMethodPhase.java %%T%%/src/org/apache/jasper/compiler/MappedCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/CompileException.java %%T%%/src/org/apache/jasper/compiler/DumbParseEventListener.java %%T%%/src/org/apache/jasper/compiler/Compiler.java %%T%%/src/org/apache/jasper/compiler/ServletWriter.java %%T%%/src/org/apache/jasper/compiler/ClassDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/CoreElement.java %%T%%/src/org/apache/jasper/compiler/ParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagEndGenerator.java %%T%%/src/org/apache/jasper/compiler/StoredCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/JavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagLibraries.java %%T%%/src/org/apache/jasper/compiler/ServiceMethodPhase.java %%T%%/src/org/apache/jasper/compiler/TagCache.java %%T%%/src/org/apache/jasper/compiler/JakartaCommentGenerator.java %%T%%/src/org/apache/jasper/compiler/DeclarationGenerator.java %%T%%/src/org/apache/jasper/compiler/CharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/BaseJspListener.java %%T%%/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java %%T%%/src/org/apache/jasper/CommandLineContext.java %%T%%/src/org/apache/jasper/EmbededServletOptions.java %%T%%/src/org/apache/jasper/JspC.java %%T%%/src/org/apache/jasper/JspEngineContext.java %%T%%/src/org/apache/jasper/Options.java %%T%%/src/org/apache/jasper/Constants.java %%T%%/src/org/apache/jasper/JasperException.java %%T%%/src/org/apache/jasper/JspCompilationContext.java %%T%%/webapps/ROOT.war %%T%%/webapps/admin.war %%T%%/webapps/examples.war %%T%%/webapps/test.war @dirrm %%T%%/webapps @dirrm %%T%%/src/org/apache/tomcat/util/xml @dirrm %%T%%/src/org/apache/tomcat/util/pattern @dirrm %%T%%/src/org/apache/tomcat/util/compat @dirrm %%T%%/src/org/apache/tomcat/util @dirrm %%T%%/src/org/apache/tomcat/task @dirrm %%T%%/src/org/apache/tomcat/startup @dirrm %%T%%/src/org/apache/tomcat/session @dirrm %%T%%/src/org/apache/tomcat/service/http @dirrm %%T%%/src/org/apache/tomcat/service/connector @dirrm %%T%%/src/org/apache/tomcat/service @dirrm %%T%%/src/org/apache/tomcat/resources @dirrm %%T%%/src/org/apache/tomcat/request @dirrm %%T%%/src/org/apache/tomcat/protocol/war @dirrm %%T%%/src/org/apache/tomcat/protocol/jar @dirrm %%T%%/src/org/apache/tomcat/protocol @dirrm %%T%%/src/org/apache/tomcat/net @dirrm %%T%%/src/org/apache/tomcat/loader @dirrm %%T%%/src/org/apache/tomcat/facade @dirrm %%T%%/src/org/apache/tomcat/adapter @dirrm %%T%%/src/org/apache/tomcat/core @dirrm %%T%%/src/org/apache/tomcat/context @dirrm %%T%%/src/org/apache/tomcat/logging @dirrm %%T%%/src/org/apache/tomcat @dirrm %%T%%/src/org/apache/jasper/servlet @dirrm %%T%%/src/org/apache/jasper/runtime @dirrm %%T%%/src/org/apache/jasper/resources @dirrm %%T%%/src/org/apache/jasper/compiler @dirrm %%T%%/src/org/apache/jasper @dirrm %%T%%/src/org/apache @dirrm %%T%%/src/org @dirrm %%T%%/src @dirrm %%T%%/logs @dirrm %%T%%/lib/test/Golden @dirrm %%T%%/lib/test @dirrm %%T%%/lib @dirrm %%T%%/doc/uguide/images @dirrm %%T%%/doc/uguide @dirrm %%T%%/doc/appdev/sample/web/images @dirrm %%T%%/doc/appdev/sample/web @dirrm %%T%%/doc/appdev/sample/src @dirrm %%T%%/doc/appdev/sample/etc @dirrm %%T%%/doc/appdev/sample @dirrm %%T%%/doc/appdev @dirrm %%T%%/doc @dirrm %%T%%/conf @dirrm %%T%%/bin @dirrm %%T%% @unexec pw groupdel tomcat || true @unexec pw userdel tomcat || true Property changes on: head/www/jakarta-tomcat3/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/www/jakarta-tomcat4/Makefile =================================================================== --- head/www/jakarta-tomcat4/Makefile (revision 54885) +++ head/www/jakarta-tomcat4/Makefile (revision 54886) @@ -1,131 +1,137 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.apache.org/dist/jakarta/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd DIST_SUBDIR= jakarta/tomcat/${PORTVERSION} 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 APPCTL_NAME= ${APP_SHORTNAME}ctl CTL_SCRIPT= ${PREFIX}/bin/${APPCTL_NAME} STARTUP_ORDER?= 020 -RC_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh -APP_TITLE= Jakarta Tomcat +STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME?= ${APP_SHORTNAME} GROUP_NAME?= ${USER_NAME} USER_ID?= 7103 GROUP_ID?= ${USER_ID} PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG?= ${LOG_DIR}/stdout.log STDERR_LOG?= ${LOG_DIR}/stderr.log -AUTO_START?= YES +AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CTL_SCRIPT}" - @${ECHO_CMD} " Startup script location: ${RC_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} (${USER_ID}:${GROUP_ID})" @${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: @# Add the group and the user if they do not exist ${PW} groupadd -n ${GROUP_NAME} -g ${GROUP_ID} || true ${PW} useradd -n ${USER_NAME} -u ${USER_ID} -g ${GROUP_NAME} -c "${APP_TITLE} account" -d ${APP_HOME} -s ${SH} -h - || true @# 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 control script ${CAT} ${FILESDIR}/${APPCTL_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%PORTVERSION%%/s//${PORTVERSION}/" \ | ${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} "/%%RC_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ + | ${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}/" \ > ${CTL_SCRIPT} - ${CHMOD} 755 ${CTL_SCRIPT} + ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CTL_SCRIPT} + ${CHMOD} 6554 ${CTL_SCRIPT} @# Install the startup script - ${LN} -sf ${CTL_SCRIPT} ${RC_SCRIPT} + ${CP} ${FILESDIR}/${PORTNAME}.sh ${STARTUP_SCRIPT} + ${CHMOD} 0554 ${STARTUP_SCRIPT} - @# Create the directories that the application will create it at the + @# Create the directories that the application will create at the @# first run - ${MKDIR} ${APP_HOME}/logs + ${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}/${APPCTL_NAME}.1 \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ > ${WRKDIR}/${APPCTL_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${APPCTL_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 ${APPCTL_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${APPCTL_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CTL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/www/jakarta-tomcat4/files/tomcatctl =================================================================== --- head/www/jakarta-tomcat4/files/tomcatctl (revision 54885) +++ head/www/jakarta-tomcat4/files/tomcatctl (revision 54886) @@ -1,99 +1,146 @@ #!/bin/sh # Set some variables VERSION=%%PORTVERSION%% APP_HOME=%%APP_HOME%% -USER_NAME=%%USER_NAME%% STDOUT_LOG=%%STDOUT_LOG%% STDERR_LOG=%%STDERR_LOG%% JAR_FILE=${APP_HOME}/lib/webserver.jar MYSELF=`basename $0` # Set the CLASSPATH unset CLASSPATH for i in ${APP_HOME}/lib/* ; do if [ "$CLASSPATH" != "" ]; then CLASSPATH=${CLASSPATH}:$i else CLASSPATH=$i fi done if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar fi -# Check if we're being run as a shell script or as an rc script -if [ ${MYSELF} = "%%RC_SCRIPT_NAME%%" ]; then - AS_RC_SCRIPT=yes -else - AS_RC_SCRIPT=no -fi - # Check if the JAVA_HOME directory is defined, otherwise set it to the # fallback default if [ "${JAVA_HOME}a" = "a" ]; then JAVA_HOME=%%JAVA_HOME%% fi JAVA_CMD=${JAVA_HOME}/bin/java -# Function that starts the application -start() { + +############################################################################## +# Function that shows an error message +# +# This function is called by the 'checks' function +# +# Parameters: +# 1: The message to be displayed. + +error() { + echo -n "%%APP_SHORTNAME%%: ERROR: " + echo $1 +} + + +############################################################################## +# Function that performs all checks necessary for starting or stopping the +# application. +# +# This function is called by the 'start' and 'stop' functions +# +# This function expects no parameters + +checks() { # Make sure the application directory does exist if [ ! -d ${APP_HOME} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." + error "Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." exit 2 fi # Make sure the application JAR file exists if [ ! -r ${JAR_FILE} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." + error "Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." exit 3 fi # Make sure the Java VM can be found if [ ! -x ${JAVA_CMD} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find Java VM at ${JAVA_HOME}." + error "Unable to find Java VM at ${JAVA_HOME}." exit 4 fi +} - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + +############################################################################## +# Functions that calls the application with the specified parameter +# +# Parameters: +# 1: The argument to pass to the application (optional) + +app() { + (cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat $1) >> ${STDOUT_LOG} 2>> ${STDERR_LOG} } + +############################################################################## +# Function that starts the application +# +# This function is called from the main function +# +# This function expects no parameters + +start() { + # Perform the checks + checks + + # Stop the application + app +} + + +############################################################################## # Function that stops the application +# +# This function is called from the main function +# +# This function expects no parameters + stop() { - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat -stop) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + # Perform the checks + checks + + # Stop the application + app -stop } -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "" - echo "Usage: ${MYSELF} { start | stop | restart }" - echo "" - exit 64 - ;; -esac + +############################################################################## +# Main function. This function calls the 'start' and 'stop' functions. +# +# Parameters: +# 1: The argument to this shell script + +main() { + case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: ${MYSELF} { start | stop | restart }" + exit 64 + ;; + esac +} + + +# Call the main function and exit +main $1 +exit 0 Property changes on: head/www/jakarta-tomcat4/files/tomcatctl ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/www/jakarta-tomcat4/pkg-plist (revision 54885) +++ head/www/jakarta-tomcat4/pkg-plist (revision 54886) @@ -1,413 +1,414 @@ +bin/tomcatctl etc/rc.d/020.jakarta-tomcat.sh %%T%%/KEYS %%T%%/LICENSE %%T%%/RELEASE-NOTES %%T%%/bin/ant %%T%%/bin/antRun %%T%%/bin/jspc.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat.sh %%T%%/conf/build.xml %%T%%/conf/jni_server.xml %%T%%/conf/jni_workers.properties %%T%%/conf/manifest.servlet %%T%%/conf/mod_jk.conf %%T%%/conf/obj.conf %%T%%/conf/server.xml %%T%%/conf/test-tomcat.xml %%T%%/conf/tomcat-users.xml %%T%%/conf/tomcat.conf %%T%%/conf/tomcat.policy %%T%%/conf/tomcat.properties %%T%%/conf/uriworkermap.properties %%T%%/conf/web.dtd %%T%%/conf/web.xml %%T%%/conf/workers.properties %%T%%/conf/wrapper.properties %%T%%/doc/AJPv13.html %%T%%/doc/JDBCRealm.howto %%T%%/doc/NT-Service-howto.html %%T%%/doc/Tomcat-Workers-HowTo.html %%T%%/doc/Tomcat-on-NetWare-HowTo.html %%T%%/doc/appdev/build.xml.txt %%T%%/doc/appdev/contents.html %%T%%/doc/appdev/deployment.html %%T%%/doc/appdev/footer.html %%T%%/doc/appdev/header.html %%T%%/doc/appdev/index.html %%T%%/doc/appdev/installation.html %%T%%/doc/appdev/introduction.html %%T%%/doc/appdev/processes.html %%T%%/doc/appdev/sample/build.sh %%T%%/doc/appdev/sample/build.xml %%T%%/doc/appdev/sample/etc/web.xml %%T%%/doc/appdev/sample/src/Hello.java %%T%%/doc/appdev/sample/web/hello.jsp %%T%%/doc/appdev/sample/web/images/tomcat.gif %%T%%/doc/appdev/sample/web/index.html %%T%%/doc/appdev/source.html %%T%%/doc/appdev/tomcat.gif %%T%%/doc/appdev/web.xml.txt %%T%%/doc/faq %%T%%/doc/in-process-howto.html %%T%%/doc/index.html %%T%%/doc/mod_jk-howto.html %%T%%/doc/readme %%T%%/doc/tomcat-apache-howto.html %%T%%/doc/tomcat-iis-howto.html %%T%%/doc/tomcat-localization-howto.html %%T%%/doc/tomcat-netscape-howto.html %%T%%/doc/tomcat-ssl-howto.html %%T%%/doc/uguide/images/banner.gif %%T%%/doc/uguide/images/tomcat.gif %%T%%/doc/uguide/style.css %%T%%/doc/uguide/tomcat-security-unix.html %%T%%/doc/uguide/tomcat-security.html %%T%%/doc/uguide/tomcat_ug.html %%T%%/lib/ant.jar %%T%%/lib/jasper.jar %%T%%/lib/jaxp.jar %%T%%/lib/parser.jar %%T%%/lib/servlet.jar %%T%%/lib/webserver.jar %%T%%/lib/test/Golden/Err.txt %%T%%/lib/test/Golden/ForwardWithQuery.txt %%T%%/lib/test/Golden/HelloWorld.txt %%T%%/lib/test/Golden/Include.txt %%T%%/lib/test/Golden/IncludeFile.txt %%T%%/lib/test/Golden/Mismatch1.txt %%T%%/lib/test/Golden/Mismatch2.txt %%T%%/lib/test/Golden/MustFail.txt %%T%%/lib/test/Golden/PrintWriterTest.txt %%T%%/lib/test/Golden/ServletParam.txt %%T%%/lib/test/Golden/SimpleForward.txt %%T%%/lib/test/Golden/SimpleInclude.txt %%T%%/lib/test/Golden/beanSer.txt %%T%%/lib/test/Golden/beanTest.txt %%T%%/lib/test/Golden/buffer.txt %%T%%/lib/test/Golden/classTest.txt %%T%%/lib/test/Golden/image1.gif %%T%%/lib/test/Golden/implicitConfig.txt %%T%%/lib/test/Golden/implicitContext.txt %%T%%/lib/test/Golden/implicitException.txt %%T%%/lib/test/Golden/implicitOut.txt %%T%%/lib/test/Golden/implicitPage.txt %%T%%/lib/test/Golden/implicitPageContext.txt %%T%%/lib/test/Golden/implicitRequest.txt %%T%%/lib/test/Golden/implicitResponse.txt %%T%%/lib/test/Golden/implicitSession.txt %%T%%/lib/test/Golden/import.txt %%T%%/lib/test/Golden/index.txt %%T%%/lib/test/Golden/jsptoservlet.txt %%T%%/lib/test/Golden/movedindex.txt %%T%%/lib/test/Golden/movedwelcome.txt %%T%%/lib/test/Golden/pageImport.txt %%T%%/lib/test/Golden/parse.txt %%T%%/lib/test/Golden/servletParam1.txt %%T%%/lib/test/Golden/servletParam2.txt %%T%%/lib/test/Golden/welcome.txt %%T%%/src/org/apache/tomcat/facade/HttpServletRequestFacade.java %%T%%/src/org/apache/tomcat/facade/package.html %%T%%/src/org/apache/tomcat/facade/ServletInputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletWriterFacade.java %%T%%/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletContextFacade.java %%T%%/src/org/apache/tomcat/facade/SimpleFacadeManager.java %%T%%/src/org/apache/tomcat/facade/HttpServletResponseFacade.java %%T%%/src/org/apache/tomcat/facade/SessionContextImpl.java %%T%%/src/org/apache/tomcat/facade/ServletConfigImpl.java %%T%%/src/org/apache/tomcat/facade/HttpSessionFacade.java %%T%%/src/org/apache/tomcat/facade/RequestDispatcherImpl.java %%T%%/src/org/apache/tomcat/service/http/HttpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/http/HttpRequestAdapter.java %%T%%/src/org/apache/tomcat/service/http/HttpResponseAdapter.java %%T%%/src/org/apache/tomcat/service/http/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java %%T%%/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/MsgBuffer.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorResponse.java %%T%%/src/org/apache/tomcat/service/connector/MsgConnector.java %%T%%/src/org/apache/tomcat/service/connector/TcpConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings.properties %%T%%/src/org/apache/tomcat/service/SimpleTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpoint.java %%T%%/src/org/apache/tomcat/service/package.html %%T%%/src/org/apache/tomcat/service/PoolTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpointConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/service/TcpConnection.java %%T%%/src/org/apache/tomcat/service/SimpleTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/service/PoolTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/JNIEndpointConnector.java %%T%%/src/org/apache/tomcat/service/TcpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/JNIEndpoint.java %%T%%/src/org/apache/tomcat/core/ContextInterceptor.java %%T%%/src/org/apache/tomcat/core/RequestImpl.java %%T%%/src/org/apache/tomcat/core/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/core/ContextManager.java %%T%%/src/org/apache/tomcat/core/BufferedServletInputStream.java %%T%%/src/org/apache/tomcat/core/ResponseImpl.java %%T%%/src/org/apache/tomcat/core/BufferedServletOutputStream.java %%T%%/src/org/apache/tomcat/core/ServerConnector.java %%T%%/src/org/apache/tomcat/core/BaseInterceptor.java %%T%%/src/org/apache/tomcat/core/ServletLoader.java %%T%%/src/org/apache/tomcat/core/TomcatException.java %%T%%/src/org/apache/tomcat/core/Container.java %%T%%/src/org/apache/tomcat/core/ServletWrapper.java %%T%%/src/org/apache/tomcat/core/Response.java %%T%%/src/org/apache/tomcat/core/Context.java %%T%%/src/org/apache/tomcat/core/Constants.java %%T%%/src/org/apache/tomcat/core/Handler.java %%T%%/src/org/apache/tomcat/core/LocalStrings_se.properties %%T%%/src/org/apache/tomcat/core/package.html %%T%%/src/org/apache/tomcat/core/FacadeManager.java %%T%%/src/org/apache/tomcat/core/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/core/RequestInterceptor.java %%T%%/src/org/apache/tomcat/core/LocalStrings.properties %%T%%/src/org/apache/tomcat/core/Request.java %%T%%/src/org/apache/tomcat/context/AutoSetup.java %%T%%/src/org/apache/tomcat/context/DefaultCMSetter.java %%T%%/src/org/apache/tomcat/context/WebXmlReader.java %%T%%/src/org/apache/tomcat/context/LoaderInterceptor.java %%T%%/src/org/apache/tomcat/context/LogEvents.java %%T%%/src/org/apache/tomcat/context/WorkDirInterceptor.java %%T%%/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java %%T%%/src/org/apache/tomcat/context/PolicyInterceptor.java %%T%%/src/org/apache/tomcat/logging/Logger.java %%T%%/src/org/apache/tomcat/logging/LogHelper.java %%T%%/src/org/apache/tomcat/logging/TomcatLogger.java %%T%%/src/org/apache/tomcat/util/pattern/ImplicationTable.java %%T%%/src/org/apache/tomcat/util/pattern/WildcardPattern.java %%T%%/src/org/apache/tomcat/util/pattern/Implication.java %%T%%/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java %%T%%/src/org/apache/tomcat/util/pattern/PatternMatcher.java %%T%%/src/org/apache/tomcat/util/xml/XmlAction.java %%T%%/src/org/apache/tomcat/util/xml/XmlMapper.java %%T%%/src/org/apache/tomcat/util/xml/SaxContext.java %%T%%/src/org/apache/tomcat/util/xml/XmlMatch.java %%T%%/src/org/apache/tomcat/util/xml/PathMatch.java %%T%%/src/org/apache/tomcat/util/compat/SimpleClassLoader.java %%T%%/src/org/apache/tomcat/util/compat/Action.java %%T%%/src/org/apache/tomcat/util/compat/Jdk11Compat.java %%T%%/src/org/apache/tomcat/util/compat/Jdk12Support.java %%T%%/src/org/apache/tomcat/util/WARUtil.java %%T%%/src/org/apache/tomcat/util/HexUtils.java %%T%%/src/org/apache/tomcat/util/RecycleBufferedInputStream.java %%T%%/src/org/apache/tomcat/util/MimeMap.java %%T%%/src/org/apache/tomcat/util/URLUtil.java %%T%%/src/org/apache/tomcat/util/Queue.java %%T%%/src/org/apache/tomcat/util/LocaleToCharsetMap.java %%T%%/src/org/apache/tomcat/util/FileUtil.java %%T%%/src/org/apache/tomcat/util/MessageChars.java %%T%%/src/org/apache/tomcat/util/SimpleHashtable.java %%T%%/src/org/apache/tomcat/util/DateTool.java %%T%%/src/org/apache/tomcat/util/LocalStrings.properties %%T%%/src/org/apache/tomcat/util/CookieTools.java %%T%%/src/org/apache/tomcat/util/Ascii.java %%T%%/src/org/apache/tomcat/util/BufferListener.java %%T%%/src/org/apache/tomcat/util/BufferEvent.java %%T%%/src/org/apache/tomcat/util/SessionIdGenerator.java %%T%%/src/org/apache/tomcat/util/ArrayEnumerator.java %%T%%/src/org/apache/tomcat/util/PrefixMapper.java %%T%%/src/org/apache/tomcat/util/RequestUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaderField.java %%T%%/src/org/apache/tomcat/util/ThreadPool.java %%T%%/src/org/apache/tomcat/util/ThreadPoolRunnable.java %%T%%/src/org/apache/tomcat/util/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/util/BuffTool.java %%T%%/src/org/apache/tomcat/util/SecurityTools.java %%T%%/src/org/apache/tomcat/util/SimplePrincipal.java %%T%%/src/org/apache/tomcat/util/ByteBuffer.java %%T%%/src/org/apache/tomcat/util/SimplePool.java %%T%%/src/org/apache/tomcat/util/StringManager.java %%T%%/src/org/apache/tomcat/util/EmptyEnumeration.java %%T%%/src/org/apache/tomcat/util/Reaper.java %%T%%/src/org/apache/tomcat/util/MessageBytes.java %%T%%/src/org/apache/tomcat/util/SessionUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaders.java %%T%%/src/org/apache/tomcat/util/DevNullOutputStream.java %%T%%/src/org/apache/tomcat/util/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/util/MessageString.java %%T%%/src/org/apache/tomcat/util/package.html %%T%%/src/org/apache/tomcat/adapter/HttpAdapter.java %%T%%/src/org/apache/tomcat/adapter/AdapterHandler.java %%T%%/src/org/apache/tomcat/resources/web.dtd %%T%%/src/org/apache/tomcat/resources/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_en.properties %%T%%/src/org/apache/tomcat/request/InvokerInterceptor.java %%T%%/src/org/apache/tomcat/request/SimpleMapper1.java %%T%%/src/org/apache/tomcat/request/SimpleRealm.java %%T%%/src/org/apache/tomcat/request/AccessInterceptor.java %%T%%/src/org/apache/tomcat/request/SessionInterceptor.java %%T%%/src/org/apache/tomcat/request/JspInterceptor.java %%T%%/src/org/apache/tomcat/request/LocalStrings.properties %%T%%/src/org/apache/tomcat/request/StaticInterceptor.java %%T%%/src/org/apache/tomcat/request/JDBCRealm.java %%T%%/src/org/apache/tomcat/request/AccountingInterceptor.java %%T%%/src/org/apache/tomcat/request/Jdk12Interceptor.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader.java %%T%%/src/org/apache/tomcat/loader/AdaptiveServletLoader.java %%T%%/src/org/apache/tomcat/loader/SimpleFileFilter.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java %%T%%/src/org/apache/tomcat/loader/ClassRepository.java %%T%%/src/org/apache/tomcat/task/StopTomcat.java %%T%%/src/org/apache/tomcat/task/ApacheConfig.java %%T%%/src/org/apache/tomcat/task/Expand.java %%T%%/src/org/apache/tomcat/task/IISConfig.java %%T%%/src/org/apache/tomcat/task/NSConfig.java %%T%%/src/org/apache/tomcat/task/GTest.java %%T%%/src/org/apache/tomcat/net/ServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/DefaultServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/SSLSocketFactory.java %%T%%/src/org/apache/tomcat/session/LocalStrings.properties %%T%%/src/org/apache/tomcat/session/StandardSessionInterceptor.java %%T%%/src/org/apache/tomcat/session/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/session/StandardManager.java %%T%%/src/org/apache/tomcat/session/StandardSession.java %%T%%/src/org/apache/tomcat/session/SessionSerializer.java %%T%%/src/org/apache/tomcat/protocol/war/Handler.java %%T%%/src/org/apache/tomcat/protocol/jar/Handler.java %%T%%/src/org/apache/tomcat/protocol/WARConnection.java %%T%%/src/org/apache/tomcat/protocol/WARManager.java %%T%%/src/org/apache/tomcat/startup/Tomcat.java %%T%%/src/org/apache/tomcat/startup/HostConfig.java %%T%%/src/org/apache/tomcat/startup/EmbededTomcat.java %%T%%/src/org/apache/jasper/resources/messages_fr.properties %%T%%/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd %%T%%/src/org/apache/jasper/resources/messages.properties %%T%%/src/org/apache/jasper/resources/messages_es.properties %%T%%/src/org/apache/jasper/resources/web.dtd %%T%%/src/org/apache/jasper/servlet/JasperLoader.java %%T%%/src/org/apache/jasper/servlet/TomcatServletEngine.java %%T%%/src/org/apache/jasper/servlet/JspServlet.java %%T%%/src/org/apache/jasper/servlet/ServletEngine.java %%T%%/src/org/apache/jasper/servlet/JasperLoader12.java %%T%%/src/org/apache/jasper/runtime/JspFactoryImpl.java %%T%%/src/org/apache/jasper/runtime/JspRuntimeLibrary.java %%T%%/src/org/apache/jasper/runtime/PageContextImpl.java %%T%%/src/org/apache/jasper/runtime/JspWriterImpl.java %%T%%/src/org/apache/jasper/runtime/BodyContentImpl.java %%T%%/src/org/apache/jasper/runtime/HttpJspBase.java %%T%%/src/org/apache/jasper/runtime/JspLoader.java %%T%%/src/org/apache/jasper/compiler/JspCompiler.java %%T%%/src/org/apache/jasper/compiler/BeanRepository.java %%T%%/src/org/apache/jasper/compiler/ForwardGenerator.java %%T%%/src/org/apache/jasper/compiler/DestroyMethodPhase.java %%T%%/src/org/apache/jasper/compiler/IncludeGenerator.java %%T%%/src/org/apache/jasper/compiler/TagGeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java %%T%%/src/org/apache/jasper/compiler/Mangler.java %%T%%/src/org/apache/jasper/compiler/StaticInitializerPhase.java %%T%%/src/org/apache/jasper/compiler/CommandLineCompiler.java %%T%%/src/org/apache/jasper/compiler/Mark.java %%T%%/src/org/apache/jasper/compiler/JikesJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/SunJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagBeginGenerator.java %%T%%/src/org/apache/jasper/compiler/ClassName.java %%T%%/src/org/apache/jasper/compiler/PluginGenerator.java %%T%%/src/org/apache/jasper/compiler/BeanGenerator.java %%T%%/src/org/apache/jasper/compiler/DelegatingListener.java %%T%%/src/org/apache/jasper/compiler/SetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/InfoGenerator.java %%T%%/src/org/apache/jasper/compiler/CommentGenerator.java %%T%%/src/org/apache/jasper/compiler/GetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/Parser.java %%T%%/src/org/apache/jasper/compiler/ScriptletGenerator.java %%T%%/src/org/apache/jasper/compiler/FileDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/GeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspUtil.java %%T%%/src/org/apache/jasper/compiler/BeanEndGenerator.java %%T%%/src/org/apache/jasper/compiler/Generator.java %%T%%/src/org/apache/jasper/compiler/ParseException.java %%T%%/src/org/apache/jasper/compiler/ExpressionGenerator.java %%T%%/src/org/apache/jasper/compiler/JspReader.java %%T%%/src/org/apache/jasper/compiler/InitMethodPhase.java %%T%%/src/org/apache/jasper/compiler/MappedCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/CompileException.java %%T%%/src/org/apache/jasper/compiler/DumbParseEventListener.java %%T%%/src/org/apache/jasper/compiler/Compiler.java %%T%%/src/org/apache/jasper/compiler/ServletWriter.java %%T%%/src/org/apache/jasper/compiler/ClassDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/CoreElement.java %%T%%/src/org/apache/jasper/compiler/ParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagEndGenerator.java %%T%%/src/org/apache/jasper/compiler/StoredCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/JavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagLibraries.java %%T%%/src/org/apache/jasper/compiler/ServiceMethodPhase.java %%T%%/src/org/apache/jasper/compiler/TagCache.java %%T%%/src/org/apache/jasper/compiler/JakartaCommentGenerator.java %%T%%/src/org/apache/jasper/compiler/DeclarationGenerator.java %%T%%/src/org/apache/jasper/compiler/CharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/BaseJspListener.java %%T%%/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java %%T%%/src/org/apache/jasper/CommandLineContext.java %%T%%/src/org/apache/jasper/EmbededServletOptions.java %%T%%/src/org/apache/jasper/JspC.java %%T%%/src/org/apache/jasper/JspEngineContext.java %%T%%/src/org/apache/jasper/Options.java %%T%%/src/org/apache/jasper/Constants.java %%T%%/src/org/apache/jasper/JasperException.java %%T%%/src/org/apache/jasper/JspCompilationContext.java %%T%%/webapps/ROOT.war %%T%%/webapps/admin.war %%T%%/webapps/examples.war %%T%%/webapps/test.war @dirrm %%T%%/webapps @dirrm %%T%%/src/org/apache/tomcat/util/xml @dirrm %%T%%/src/org/apache/tomcat/util/pattern @dirrm %%T%%/src/org/apache/tomcat/util/compat @dirrm %%T%%/src/org/apache/tomcat/util @dirrm %%T%%/src/org/apache/tomcat/task @dirrm %%T%%/src/org/apache/tomcat/startup @dirrm %%T%%/src/org/apache/tomcat/session @dirrm %%T%%/src/org/apache/tomcat/service/http @dirrm %%T%%/src/org/apache/tomcat/service/connector @dirrm %%T%%/src/org/apache/tomcat/service @dirrm %%T%%/src/org/apache/tomcat/resources @dirrm %%T%%/src/org/apache/tomcat/request @dirrm %%T%%/src/org/apache/tomcat/protocol/war @dirrm %%T%%/src/org/apache/tomcat/protocol/jar @dirrm %%T%%/src/org/apache/tomcat/protocol @dirrm %%T%%/src/org/apache/tomcat/net @dirrm %%T%%/src/org/apache/tomcat/loader @dirrm %%T%%/src/org/apache/tomcat/facade @dirrm %%T%%/src/org/apache/tomcat/adapter @dirrm %%T%%/src/org/apache/tomcat/core @dirrm %%T%%/src/org/apache/tomcat/context @dirrm %%T%%/src/org/apache/tomcat/logging @dirrm %%T%%/src/org/apache/tomcat @dirrm %%T%%/src/org/apache/jasper/servlet @dirrm %%T%%/src/org/apache/jasper/runtime @dirrm %%T%%/src/org/apache/jasper/resources @dirrm %%T%%/src/org/apache/jasper/compiler @dirrm %%T%%/src/org/apache/jasper @dirrm %%T%%/src/org/apache @dirrm %%T%%/src/org @dirrm %%T%%/src @dirrm %%T%%/logs @dirrm %%T%%/lib/test/Golden @dirrm %%T%%/lib/test @dirrm %%T%%/lib @dirrm %%T%%/doc/uguide/images @dirrm %%T%%/doc/uguide @dirrm %%T%%/doc/appdev/sample/web/images @dirrm %%T%%/doc/appdev/sample/web @dirrm %%T%%/doc/appdev/sample/src @dirrm %%T%%/doc/appdev/sample/etc @dirrm %%T%%/doc/appdev/sample @dirrm %%T%%/doc/appdev @dirrm %%T%%/doc @dirrm %%T%%/conf @dirrm %%T%%/bin @dirrm %%T%% @unexec pw groupdel tomcat || true @unexec pw userdel tomcat || true Property changes on: head/www/jakarta-tomcat4/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/www/jakarta-tomcat41/Makefile =================================================================== --- head/www/jakarta-tomcat41/Makefile (revision 54885) +++ head/www/jakarta-tomcat41/Makefile (revision 54886) @@ -1,131 +1,137 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.apache.org/dist/jakarta/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd DIST_SUBDIR= jakarta/tomcat/${PORTVERSION} 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 APPCTL_NAME= ${APP_SHORTNAME}ctl CTL_SCRIPT= ${PREFIX}/bin/${APPCTL_NAME} STARTUP_ORDER?= 020 -RC_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh -APP_TITLE= Jakarta Tomcat +STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME?= ${APP_SHORTNAME} GROUP_NAME?= ${USER_NAME} USER_ID?= 7103 GROUP_ID?= ${USER_ID} PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG?= ${LOG_DIR}/stdout.log STDERR_LOG?= ${LOG_DIR}/stderr.log -AUTO_START?= YES +AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CTL_SCRIPT}" - @${ECHO_CMD} " Startup script location: ${RC_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} (${USER_ID}:${GROUP_ID})" @${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: @# Add the group and the user if they do not exist ${PW} groupadd -n ${GROUP_NAME} -g ${GROUP_ID} || true ${PW} useradd -n ${USER_NAME} -u ${USER_ID} -g ${GROUP_NAME} -c "${APP_TITLE} account" -d ${APP_HOME} -s ${SH} -h - || true @# 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 control script ${CAT} ${FILESDIR}/${APPCTL_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%PORTVERSION%%/s//${PORTVERSION}/" \ | ${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} "/%%RC_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ + | ${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}/" \ > ${CTL_SCRIPT} - ${CHMOD} 755 ${CTL_SCRIPT} + ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CTL_SCRIPT} + ${CHMOD} 6554 ${CTL_SCRIPT} @# Install the startup script - ${LN} -sf ${CTL_SCRIPT} ${RC_SCRIPT} + ${CP} ${FILESDIR}/${PORTNAME}.sh ${STARTUP_SCRIPT} + ${CHMOD} 0554 ${STARTUP_SCRIPT} - @# Create the directories that the application will create it at the + @# Create the directories that the application will create at the @# first run - ${MKDIR} ${APP_HOME}/logs + ${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}/${APPCTL_NAME}.1 \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ > ${WRKDIR}/${APPCTL_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${APPCTL_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 ${APPCTL_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${APPCTL_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CTL_SCRIPT} start || true .endif .include Property changes on: head/www/jakarta-tomcat41/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/www/jakarta-tomcat41/files/tomcatctl =================================================================== --- head/www/jakarta-tomcat41/files/tomcatctl (revision 54885) +++ head/www/jakarta-tomcat41/files/tomcatctl (revision 54886) @@ -1,99 +1,146 @@ #!/bin/sh # Set some variables VERSION=%%PORTVERSION%% APP_HOME=%%APP_HOME%% -USER_NAME=%%USER_NAME%% STDOUT_LOG=%%STDOUT_LOG%% STDERR_LOG=%%STDERR_LOG%% JAR_FILE=${APP_HOME}/lib/webserver.jar MYSELF=`basename $0` # Set the CLASSPATH unset CLASSPATH for i in ${APP_HOME}/lib/* ; do if [ "$CLASSPATH" != "" ]; then CLASSPATH=${CLASSPATH}:$i else CLASSPATH=$i fi done if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar fi -# Check if we're being run as a shell script or as an rc script -if [ ${MYSELF} = "%%RC_SCRIPT_NAME%%" ]; then - AS_RC_SCRIPT=yes -else - AS_RC_SCRIPT=no -fi - # Check if the JAVA_HOME directory is defined, otherwise set it to the # fallback default if [ "${JAVA_HOME}a" = "a" ]; then JAVA_HOME=%%JAVA_HOME%% fi JAVA_CMD=${JAVA_HOME}/bin/java -# Function that starts the application -start() { + +############################################################################## +# Function that shows an error message +# +# This function is called by the 'checks' function +# +# Parameters: +# 1: The message to be displayed. + +error() { + echo -n "%%APP_SHORTNAME%%: ERROR: " + echo $1 +} + + +############################################################################## +# Function that performs all checks necessary for starting or stopping the +# application. +# +# This function is called by the 'start' and 'stop' functions +# +# This function expects no parameters + +checks() { # Make sure the application directory does exist if [ ! -d ${APP_HOME} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." + error "Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." exit 2 fi # Make sure the application JAR file exists if [ ! -r ${JAR_FILE} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." + error "Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." exit 3 fi # Make sure the Java VM can be found if [ ! -x ${JAVA_CMD} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find Java VM at ${JAVA_HOME}." + error "Unable to find Java VM at ${JAVA_HOME}." exit 4 fi +} - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + +############################################################################## +# Functions that calls the application with the specified parameter +# +# Parameters: +# 1: The argument to pass to the application (optional) + +app() { + (cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat $1) >> ${STDOUT_LOG} 2>> ${STDERR_LOG} } + +############################################################################## +# Function that starts the application +# +# This function is called from the main function +# +# This function expects no parameters + +start() { + # Perform the checks + checks + + # Stop the application + app +} + + +############################################################################## # Function that stops the application +# +# This function is called from the main function +# +# This function expects no parameters + stop() { - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat -stop) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + # Perform the checks + checks + + # Stop the application + app -stop } -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "" - echo "Usage: ${MYSELF} { start | stop | restart }" - echo "" - exit 64 - ;; -esac + +############################################################################## +# Main function. This function calls the 'start' and 'stop' functions. +# +# Parameters: +# 1: The argument to this shell script + +main() { + case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: ${MYSELF} { start | stop | restart }" + exit 64 + ;; + esac +} + + +# Call the main function and exit +main $1 +exit 0 Property changes on: head/www/jakarta-tomcat41/files/tomcatctl ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/www/jakarta-tomcat41/pkg-plist (revision 54885) +++ head/www/jakarta-tomcat41/pkg-plist (revision 54886) @@ -1,413 +1,414 @@ +bin/tomcatctl etc/rc.d/020.jakarta-tomcat.sh %%T%%/KEYS %%T%%/LICENSE %%T%%/RELEASE-NOTES %%T%%/bin/ant %%T%%/bin/antRun %%T%%/bin/jspc.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat.sh %%T%%/conf/build.xml %%T%%/conf/jni_server.xml %%T%%/conf/jni_workers.properties %%T%%/conf/manifest.servlet %%T%%/conf/mod_jk.conf %%T%%/conf/obj.conf %%T%%/conf/server.xml %%T%%/conf/test-tomcat.xml %%T%%/conf/tomcat-users.xml %%T%%/conf/tomcat.conf %%T%%/conf/tomcat.policy %%T%%/conf/tomcat.properties %%T%%/conf/uriworkermap.properties %%T%%/conf/web.dtd %%T%%/conf/web.xml %%T%%/conf/workers.properties %%T%%/conf/wrapper.properties %%T%%/doc/AJPv13.html %%T%%/doc/JDBCRealm.howto %%T%%/doc/NT-Service-howto.html %%T%%/doc/Tomcat-Workers-HowTo.html %%T%%/doc/Tomcat-on-NetWare-HowTo.html %%T%%/doc/appdev/build.xml.txt %%T%%/doc/appdev/contents.html %%T%%/doc/appdev/deployment.html %%T%%/doc/appdev/footer.html %%T%%/doc/appdev/header.html %%T%%/doc/appdev/index.html %%T%%/doc/appdev/installation.html %%T%%/doc/appdev/introduction.html %%T%%/doc/appdev/processes.html %%T%%/doc/appdev/sample/build.sh %%T%%/doc/appdev/sample/build.xml %%T%%/doc/appdev/sample/etc/web.xml %%T%%/doc/appdev/sample/src/Hello.java %%T%%/doc/appdev/sample/web/hello.jsp %%T%%/doc/appdev/sample/web/images/tomcat.gif %%T%%/doc/appdev/sample/web/index.html %%T%%/doc/appdev/source.html %%T%%/doc/appdev/tomcat.gif %%T%%/doc/appdev/web.xml.txt %%T%%/doc/faq %%T%%/doc/in-process-howto.html %%T%%/doc/index.html %%T%%/doc/mod_jk-howto.html %%T%%/doc/readme %%T%%/doc/tomcat-apache-howto.html %%T%%/doc/tomcat-iis-howto.html %%T%%/doc/tomcat-localization-howto.html %%T%%/doc/tomcat-netscape-howto.html %%T%%/doc/tomcat-ssl-howto.html %%T%%/doc/uguide/images/banner.gif %%T%%/doc/uguide/images/tomcat.gif %%T%%/doc/uguide/style.css %%T%%/doc/uguide/tomcat-security-unix.html %%T%%/doc/uguide/tomcat-security.html %%T%%/doc/uguide/tomcat_ug.html %%T%%/lib/ant.jar %%T%%/lib/jasper.jar %%T%%/lib/jaxp.jar %%T%%/lib/parser.jar %%T%%/lib/servlet.jar %%T%%/lib/webserver.jar %%T%%/lib/test/Golden/Err.txt %%T%%/lib/test/Golden/ForwardWithQuery.txt %%T%%/lib/test/Golden/HelloWorld.txt %%T%%/lib/test/Golden/Include.txt %%T%%/lib/test/Golden/IncludeFile.txt %%T%%/lib/test/Golden/Mismatch1.txt %%T%%/lib/test/Golden/Mismatch2.txt %%T%%/lib/test/Golden/MustFail.txt %%T%%/lib/test/Golden/PrintWriterTest.txt %%T%%/lib/test/Golden/ServletParam.txt %%T%%/lib/test/Golden/SimpleForward.txt %%T%%/lib/test/Golden/SimpleInclude.txt %%T%%/lib/test/Golden/beanSer.txt %%T%%/lib/test/Golden/beanTest.txt %%T%%/lib/test/Golden/buffer.txt %%T%%/lib/test/Golden/classTest.txt %%T%%/lib/test/Golden/image1.gif %%T%%/lib/test/Golden/implicitConfig.txt %%T%%/lib/test/Golden/implicitContext.txt %%T%%/lib/test/Golden/implicitException.txt %%T%%/lib/test/Golden/implicitOut.txt %%T%%/lib/test/Golden/implicitPage.txt %%T%%/lib/test/Golden/implicitPageContext.txt %%T%%/lib/test/Golden/implicitRequest.txt %%T%%/lib/test/Golden/implicitResponse.txt %%T%%/lib/test/Golden/implicitSession.txt %%T%%/lib/test/Golden/import.txt %%T%%/lib/test/Golden/index.txt %%T%%/lib/test/Golden/jsptoservlet.txt %%T%%/lib/test/Golden/movedindex.txt %%T%%/lib/test/Golden/movedwelcome.txt %%T%%/lib/test/Golden/pageImport.txt %%T%%/lib/test/Golden/parse.txt %%T%%/lib/test/Golden/servletParam1.txt %%T%%/lib/test/Golden/servletParam2.txt %%T%%/lib/test/Golden/welcome.txt %%T%%/src/org/apache/tomcat/facade/HttpServletRequestFacade.java %%T%%/src/org/apache/tomcat/facade/package.html %%T%%/src/org/apache/tomcat/facade/ServletInputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletWriterFacade.java %%T%%/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletContextFacade.java %%T%%/src/org/apache/tomcat/facade/SimpleFacadeManager.java %%T%%/src/org/apache/tomcat/facade/HttpServletResponseFacade.java %%T%%/src/org/apache/tomcat/facade/SessionContextImpl.java %%T%%/src/org/apache/tomcat/facade/ServletConfigImpl.java %%T%%/src/org/apache/tomcat/facade/HttpSessionFacade.java %%T%%/src/org/apache/tomcat/facade/RequestDispatcherImpl.java %%T%%/src/org/apache/tomcat/service/http/HttpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/http/HttpRequestAdapter.java %%T%%/src/org/apache/tomcat/service/http/HttpResponseAdapter.java %%T%%/src/org/apache/tomcat/service/http/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java %%T%%/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/MsgBuffer.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorResponse.java %%T%%/src/org/apache/tomcat/service/connector/MsgConnector.java %%T%%/src/org/apache/tomcat/service/connector/TcpConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings.properties %%T%%/src/org/apache/tomcat/service/SimpleTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpoint.java %%T%%/src/org/apache/tomcat/service/package.html %%T%%/src/org/apache/tomcat/service/PoolTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpointConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/service/TcpConnection.java %%T%%/src/org/apache/tomcat/service/SimpleTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/service/PoolTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/JNIEndpointConnector.java %%T%%/src/org/apache/tomcat/service/TcpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/JNIEndpoint.java %%T%%/src/org/apache/tomcat/core/ContextInterceptor.java %%T%%/src/org/apache/tomcat/core/RequestImpl.java %%T%%/src/org/apache/tomcat/core/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/core/ContextManager.java %%T%%/src/org/apache/tomcat/core/BufferedServletInputStream.java %%T%%/src/org/apache/tomcat/core/ResponseImpl.java %%T%%/src/org/apache/tomcat/core/BufferedServletOutputStream.java %%T%%/src/org/apache/tomcat/core/ServerConnector.java %%T%%/src/org/apache/tomcat/core/BaseInterceptor.java %%T%%/src/org/apache/tomcat/core/ServletLoader.java %%T%%/src/org/apache/tomcat/core/TomcatException.java %%T%%/src/org/apache/tomcat/core/Container.java %%T%%/src/org/apache/tomcat/core/ServletWrapper.java %%T%%/src/org/apache/tomcat/core/Response.java %%T%%/src/org/apache/tomcat/core/Context.java %%T%%/src/org/apache/tomcat/core/Constants.java %%T%%/src/org/apache/tomcat/core/Handler.java %%T%%/src/org/apache/tomcat/core/LocalStrings_se.properties %%T%%/src/org/apache/tomcat/core/package.html %%T%%/src/org/apache/tomcat/core/FacadeManager.java %%T%%/src/org/apache/tomcat/core/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/core/RequestInterceptor.java %%T%%/src/org/apache/tomcat/core/LocalStrings.properties %%T%%/src/org/apache/tomcat/core/Request.java %%T%%/src/org/apache/tomcat/context/AutoSetup.java %%T%%/src/org/apache/tomcat/context/DefaultCMSetter.java %%T%%/src/org/apache/tomcat/context/WebXmlReader.java %%T%%/src/org/apache/tomcat/context/LoaderInterceptor.java %%T%%/src/org/apache/tomcat/context/LogEvents.java %%T%%/src/org/apache/tomcat/context/WorkDirInterceptor.java %%T%%/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java %%T%%/src/org/apache/tomcat/context/PolicyInterceptor.java %%T%%/src/org/apache/tomcat/logging/Logger.java %%T%%/src/org/apache/tomcat/logging/LogHelper.java %%T%%/src/org/apache/tomcat/logging/TomcatLogger.java %%T%%/src/org/apache/tomcat/util/pattern/ImplicationTable.java %%T%%/src/org/apache/tomcat/util/pattern/WildcardPattern.java %%T%%/src/org/apache/tomcat/util/pattern/Implication.java %%T%%/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java %%T%%/src/org/apache/tomcat/util/pattern/PatternMatcher.java %%T%%/src/org/apache/tomcat/util/xml/XmlAction.java %%T%%/src/org/apache/tomcat/util/xml/XmlMapper.java %%T%%/src/org/apache/tomcat/util/xml/SaxContext.java %%T%%/src/org/apache/tomcat/util/xml/XmlMatch.java %%T%%/src/org/apache/tomcat/util/xml/PathMatch.java %%T%%/src/org/apache/tomcat/util/compat/SimpleClassLoader.java %%T%%/src/org/apache/tomcat/util/compat/Action.java %%T%%/src/org/apache/tomcat/util/compat/Jdk11Compat.java %%T%%/src/org/apache/tomcat/util/compat/Jdk12Support.java %%T%%/src/org/apache/tomcat/util/WARUtil.java %%T%%/src/org/apache/tomcat/util/HexUtils.java %%T%%/src/org/apache/tomcat/util/RecycleBufferedInputStream.java %%T%%/src/org/apache/tomcat/util/MimeMap.java %%T%%/src/org/apache/tomcat/util/URLUtil.java %%T%%/src/org/apache/tomcat/util/Queue.java %%T%%/src/org/apache/tomcat/util/LocaleToCharsetMap.java %%T%%/src/org/apache/tomcat/util/FileUtil.java %%T%%/src/org/apache/tomcat/util/MessageChars.java %%T%%/src/org/apache/tomcat/util/SimpleHashtable.java %%T%%/src/org/apache/tomcat/util/DateTool.java %%T%%/src/org/apache/tomcat/util/LocalStrings.properties %%T%%/src/org/apache/tomcat/util/CookieTools.java %%T%%/src/org/apache/tomcat/util/Ascii.java %%T%%/src/org/apache/tomcat/util/BufferListener.java %%T%%/src/org/apache/tomcat/util/BufferEvent.java %%T%%/src/org/apache/tomcat/util/SessionIdGenerator.java %%T%%/src/org/apache/tomcat/util/ArrayEnumerator.java %%T%%/src/org/apache/tomcat/util/PrefixMapper.java %%T%%/src/org/apache/tomcat/util/RequestUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaderField.java %%T%%/src/org/apache/tomcat/util/ThreadPool.java %%T%%/src/org/apache/tomcat/util/ThreadPoolRunnable.java %%T%%/src/org/apache/tomcat/util/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/util/BuffTool.java %%T%%/src/org/apache/tomcat/util/SecurityTools.java %%T%%/src/org/apache/tomcat/util/SimplePrincipal.java %%T%%/src/org/apache/tomcat/util/ByteBuffer.java %%T%%/src/org/apache/tomcat/util/SimplePool.java %%T%%/src/org/apache/tomcat/util/StringManager.java %%T%%/src/org/apache/tomcat/util/EmptyEnumeration.java %%T%%/src/org/apache/tomcat/util/Reaper.java %%T%%/src/org/apache/tomcat/util/MessageBytes.java %%T%%/src/org/apache/tomcat/util/SessionUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaders.java %%T%%/src/org/apache/tomcat/util/DevNullOutputStream.java %%T%%/src/org/apache/tomcat/util/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/util/MessageString.java %%T%%/src/org/apache/tomcat/util/package.html %%T%%/src/org/apache/tomcat/adapter/HttpAdapter.java %%T%%/src/org/apache/tomcat/adapter/AdapterHandler.java %%T%%/src/org/apache/tomcat/resources/web.dtd %%T%%/src/org/apache/tomcat/resources/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_en.properties %%T%%/src/org/apache/tomcat/request/InvokerInterceptor.java %%T%%/src/org/apache/tomcat/request/SimpleMapper1.java %%T%%/src/org/apache/tomcat/request/SimpleRealm.java %%T%%/src/org/apache/tomcat/request/AccessInterceptor.java %%T%%/src/org/apache/tomcat/request/SessionInterceptor.java %%T%%/src/org/apache/tomcat/request/JspInterceptor.java %%T%%/src/org/apache/tomcat/request/LocalStrings.properties %%T%%/src/org/apache/tomcat/request/StaticInterceptor.java %%T%%/src/org/apache/tomcat/request/JDBCRealm.java %%T%%/src/org/apache/tomcat/request/AccountingInterceptor.java %%T%%/src/org/apache/tomcat/request/Jdk12Interceptor.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader.java %%T%%/src/org/apache/tomcat/loader/AdaptiveServletLoader.java %%T%%/src/org/apache/tomcat/loader/SimpleFileFilter.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java %%T%%/src/org/apache/tomcat/loader/ClassRepository.java %%T%%/src/org/apache/tomcat/task/StopTomcat.java %%T%%/src/org/apache/tomcat/task/ApacheConfig.java %%T%%/src/org/apache/tomcat/task/Expand.java %%T%%/src/org/apache/tomcat/task/IISConfig.java %%T%%/src/org/apache/tomcat/task/NSConfig.java %%T%%/src/org/apache/tomcat/task/GTest.java %%T%%/src/org/apache/tomcat/net/ServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/DefaultServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/SSLSocketFactory.java %%T%%/src/org/apache/tomcat/session/LocalStrings.properties %%T%%/src/org/apache/tomcat/session/StandardSessionInterceptor.java %%T%%/src/org/apache/tomcat/session/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/session/StandardManager.java %%T%%/src/org/apache/tomcat/session/StandardSession.java %%T%%/src/org/apache/tomcat/session/SessionSerializer.java %%T%%/src/org/apache/tomcat/protocol/war/Handler.java %%T%%/src/org/apache/tomcat/protocol/jar/Handler.java %%T%%/src/org/apache/tomcat/protocol/WARConnection.java %%T%%/src/org/apache/tomcat/protocol/WARManager.java %%T%%/src/org/apache/tomcat/startup/Tomcat.java %%T%%/src/org/apache/tomcat/startup/HostConfig.java %%T%%/src/org/apache/tomcat/startup/EmbededTomcat.java %%T%%/src/org/apache/jasper/resources/messages_fr.properties %%T%%/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd %%T%%/src/org/apache/jasper/resources/messages.properties %%T%%/src/org/apache/jasper/resources/messages_es.properties %%T%%/src/org/apache/jasper/resources/web.dtd %%T%%/src/org/apache/jasper/servlet/JasperLoader.java %%T%%/src/org/apache/jasper/servlet/TomcatServletEngine.java %%T%%/src/org/apache/jasper/servlet/JspServlet.java %%T%%/src/org/apache/jasper/servlet/ServletEngine.java %%T%%/src/org/apache/jasper/servlet/JasperLoader12.java %%T%%/src/org/apache/jasper/runtime/JspFactoryImpl.java %%T%%/src/org/apache/jasper/runtime/JspRuntimeLibrary.java %%T%%/src/org/apache/jasper/runtime/PageContextImpl.java %%T%%/src/org/apache/jasper/runtime/JspWriterImpl.java %%T%%/src/org/apache/jasper/runtime/BodyContentImpl.java %%T%%/src/org/apache/jasper/runtime/HttpJspBase.java %%T%%/src/org/apache/jasper/runtime/JspLoader.java %%T%%/src/org/apache/jasper/compiler/JspCompiler.java %%T%%/src/org/apache/jasper/compiler/BeanRepository.java %%T%%/src/org/apache/jasper/compiler/ForwardGenerator.java %%T%%/src/org/apache/jasper/compiler/DestroyMethodPhase.java %%T%%/src/org/apache/jasper/compiler/IncludeGenerator.java %%T%%/src/org/apache/jasper/compiler/TagGeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java %%T%%/src/org/apache/jasper/compiler/Mangler.java %%T%%/src/org/apache/jasper/compiler/StaticInitializerPhase.java %%T%%/src/org/apache/jasper/compiler/CommandLineCompiler.java %%T%%/src/org/apache/jasper/compiler/Mark.java %%T%%/src/org/apache/jasper/compiler/JikesJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/SunJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagBeginGenerator.java %%T%%/src/org/apache/jasper/compiler/ClassName.java %%T%%/src/org/apache/jasper/compiler/PluginGenerator.java %%T%%/src/org/apache/jasper/compiler/BeanGenerator.java %%T%%/src/org/apache/jasper/compiler/DelegatingListener.java %%T%%/src/org/apache/jasper/compiler/SetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/InfoGenerator.java %%T%%/src/org/apache/jasper/compiler/CommentGenerator.java %%T%%/src/org/apache/jasper/compiler/GetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/Parser.java %%T%%/src/org/apache/jasper/compiler/ScriptletGenerator.java %%T%%/src/org/apache/jasper/compiler/FileDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/GeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspUtil.java %%T%%/src/org/apache/jasper/compiler/BeanEndGenerator.java %%T%%/src/org/apache/jasper/compiler/Generator.java %%T%%/src/org/apache/jasper/compiler/ParseException.java %%T%%/src/org/apache/jasper/compiler/ExpressionGenerator.java %%T%%/src/org/apache/jasper/compiler/JspReader.java %%T%%/src/org/apache/jasper/compiler/InitMethodPhase.java %%T%%/src/org/apache/jasper/compiler/MappedCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/CompileException.java %%T%%/src/org/apache/jasper/compiler/DumbParseEventListener.java %%T%%/src/org/apache/jasper/compiler/Compiler.java %%T%%/src/org/apache/jasper/compiler/ServletWriter.java %%T%%/src/org/apache/jasper/compiler/ClassDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/CoreElement.java %%T%%/src/org/apache/jasper/compiler/ParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagEndGenerator.java %%T%%/src/org/apache/jasper/compiler/StoredCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/JavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagLibraries.java %%T%%/src/org/apache/jasper/compiler/ServiceMethodPhase.java %%T%%/src/org/apache/jasper/compiler/TagCache.java %%T%%/src/org/apache/jasper/compiler/JakartaCommentGenerator.java %%T%%/src/org/apache/jasper/compiler/DeclarationGenerator.java %%T%%/src/org/apache/jasper/compiler/CharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/BaseJspListener.java %%T%%/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java %%T%%/src/org/apache/jasper/CommandLineContext.java %%T%%/src/org/apache/jasper/EmbededServletOptions.java %%T%%/src/org/apache/jasper/JspC.java %%T%%/src/org/apache/jasper/JspEngineContext.java %%T%%/src/org/apache/jasper/Options.java %%T%%/src/org/apache/jasper/Constants.java %%T%%/src/org/apache/jasper/JasperException.java %%T%%/src/org/apache/jasper/JspCompilationContext.java %%T%%/webapps/ROOT.war %%T%%/webapps/admin.war %%T%%/webapps/examples.war %%T%%/webapps/test.war @dirrm %%T%%/webapps @dirrm %%T%%/src/org/apache/tomcat/util/xml @dirrm %%T%%/src/org/apache/tomcat/util/pattern @dirrm %%T%%/src/org/apache/tomcat/util/compat @dirrm %%T%%/src/org/apache/tomcat/util @dirrm %%T%%/src/org/apache/tomcat/task @dirrm %%T%%/src/org/apache/tomcat/startup @dirrm %%T%%/src/org/apache/tomcat/session @dirrm %%T%%/src/org/apache/tomcat/service/http @dirrm %%T%%/src/org/apache/tomcat/service/connector @dirrm %%T%%/src/org/apache/tomcat/service @dirrm %%T%%/src/org/apache/tomcat/resources @dirrm %%T%%/src/org/apache/tomcat/request @dirrm %%T%%/src/org/apache/tomcat/protocol/war @dirrm %%T%%/src/org/apache/tomcat/protocol/jar @dirrm %%T%%/src/org/apache/tomcat/protocol @dirrm %%T%%/src/org/apache/tomcat/net @dirrm %%T%%/src/org/apache/tomcat/loader @dirrm %%T%%/src/org/apache/tomcat/facade @dirrm %%T%%/src/org/apache/tomcat/adapter @dirrm %%T%%/src/org/apache/tomcat/core @dirrm %%T%%/src/org/apache/tomcat/context @dirrm %%T%%/src/org/apache/tomcat/logging @dirrm %%T%%/src/org/apache/tomcat @dirrm %%T%%/src/org/apache/jasper/servlet @dirrm %%T%%/src/org/apache/jasper/runtime @dirrm %%T%%/src/org/apache/jasper/resources @dirrm %%T%%/src/org/apache/jasper/compiler @dirrm %%T%%/src/org/apache/jasper @dirrm %%T%%/src/org/apache @dirrm %%T%%/src/org @dirrm %%T%%/src @dirrm %%T%%/logs @dirrm %%T%%/lib/test/Golden @dirrm %%T%%/lib/test @dirrm %%T%%/lib @dirrm %%T%%/doc/uguide/images @dirrm %%T%%/doc/uguide @dirrm %%T%%/doc/appdev/sample/web/images @dirrm %%T%%/doc/appdev/sample/web @dirrm %%T%%/doc/appdev/sample/src @dirrm %%T%%/doc/appdev/sample/etc @dirrm %%T%%/doc/appdev/sample @dirrm %%T%%/doc/appdev @dirrm %%T%%/doc @dirrm %%T%%/conf @dirrm %%T%%/bin @dirrm %%T%% @unexec pw groupdel tomcat || true @unexec pw userdel tomcat || true Property changes on: head/www/jakarta-tomcat41/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/www/tomcat41/Makefile =================================================================== --- head/www/tomcat41/Makefile (revision 54885) +++ head/www/tomcat41/Makefile (revision 54886) @@ -1,131 +1,137 @@ # New ports collection makefile for: jakarta-tomcat # Date created: 20 Oct 2000 # Whom: des # # $FreeBSD$ # PORTNAME= jakarta-tomcat PORTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.apache.org/dist/jakarta/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= znerd DIST_SUBDIR= jakarta/tomcat/${PORTVERSION} 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 APPCTL_NAME= ${APP_SHORTNAME}ctl CTL_SCRIPT= ${PREFIX}/bin/${APPCTL_NAME} STARTUP_ORDER?= 020 -RC_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh -APP_TITLE= Jakarta Tomcat +STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${PORTNAME}.sh JAVA_HOME?= ${LOCALBASE}/jdk1.3.1 JAVA_PORT?= ${PORTSDIR}/java/jdk13 USER_NAME?= ${APP_SHORTNAME} GROUP_NAME?= ${USER_NAME} USER_ID?= 7103 GROUP_ID?= ${USER_ID} PW?= /usr/sbin/pw LISTEN_PORT?= 8080 STDOUT_LOG?= ${LOG_DIR}/stdout.log STDERR_LOG?= ${LOG_DIR}/stderr.log -AUTO_START?= YES +AUTO_START?= NO pre-install: @${ECHO_CMD} "Installation settings:" @${ECHO_CMD} " Destination directory: ${APP_HOME}" @${ECHO_CMD} " Control script location: ${CTL_SCRIPT}" - @${ECHO_CMD} " Startup script location: ${RC_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} (${USER_ID}:${GROUP_ID})" @${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: @# Add the group and the user if they do not exist ${PW} groupadd -n ${GROUP_NAME} -g ${GROUP_ID} || true ${PW} useradd -n ${USER_NAME} -u ${USER_ID} -g ${GROUP_NAME} -c "${APP_TITLE} account" -d ${APP_HOME} -s ${SH} -h - || true @# 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 control script ${CAT} ${FILESDIR}/${APPCTL_NAME} \ | ${SED} "/%%PORTNAME%%/s//${PORTNAME}/" \ | ${SED} "/%%PORTVERSION%%/s//${PORTVERSION}/" \ | ${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} "/%%RC_SCRIPT_NAME%%/s//${PORTNAME}.sh/" \ + | ${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}/" \ > ${CTL_SCRIPT} - ${CHMOD} 755 ${CTL_SCRIPT} + ${CHOWN} ${USER_NAME}:${GROUP_NAME} ${CTL_SCRIPT} + ${CHMOD} 6554 ${CTL_SCRIPT} @# Install the startup script - ${LN} -sf ${CTL_SCRIPT} ${RC_SCRIPT} + ${CP} ${FILESDIR}/${PORTNAME}.sh ${STARTUP_SCRIPT} + ${CHMOD} 0554 ${STARTUP_SCRIPT} - @# Create the directories that the application will create it at the + @# Create the directories that the application will create at the @# first run - ${MKDIR} ${APP_HOME}/logs + ${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}/${APPCTL_NAME}.1 \ | ${SED} "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/" \ > ${WRKDIR}/${APPCTL_NAME}.1 ${INSTALL_MAN} ${WRKDIR}/${APPCTL_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 ${APPCTL_NAME}, then put this user in the group ${GROUP_NAME}." .if !defined(NOPORTDOCS) @${ECHO_CMD} "Use 'man ${APPCTL_NAME}' for information about starting and stopping ${APP_TITLE}." .endif .if ${AUTO_START} == "YES" @${ECHO_CMD} "Starting ${APP_TITLE}..." @${CTL_SCRIPT} start || true .endif .include Property changes on: head/www/tomcat41/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/www/tomcat41/files/tomcatctl =================================================================== --- head/www/tomcat41/files/tomcatctl (revision 54885) +++ head/www/tomcat41/files/tomcatctl (revision 54886) @@ -1,99 +1,146 @@ #!/bin/sh # Set some variables VERSION=%%PORTVERSION%% APP_HOME=%%APP_HOME%% -USER_NAME=%%USER_NAME%% STDOUT_LOG=%%STDOUT_LOG%% STDERR_LOG=%%STDERR_LOG%% JAR_FILE=${APP_HOME}/lib/webserver.jar MYSELF=`basename $0` # Set the CLASSPATH unset CLASSPATH for i in ${APP_HOME}/lib/* ; do if [ "$CLASSPATH" != "" ]; then CLASSPATH=${CLASSPATH}:$i else CLASSPATH=$i fi done if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar fi -# Check if we're being run as a shell script or as an rc script -if [ ${MYSELF} = "%%RC_SCRIPT_NAME%%" ]; then - AS_RC_SCRIPT=yes -else - AS_RC_SCRIPT=no -fi - # Check if the JAVA_HOME directory is defined, otherwise set it to the # fallback default if [ "${JAVA_HOME}a" = "a" ]; then JAVA_HOME=%%JAVA_HOME%% fi JAVA_CMD=${JAVA_HOME}/bin/java -# Function that starts the application -start() { + +############################################################################## +# Function that shows an error message +# +# This function is called by the 'checks' function +# +# Parameters: +# 1: The message to be displayed. + +error() { + echo -n "%%APP_SHORTNAME%%: ERROR: " + echo $1 +} + + +############################################################################## +# Function that performs all checks necessary for starting or stopping the +# application. +# +# This function is called by the 'start' and 'stop' functions +# +# This function expects no parameters + +checks() { # Make sure the application directory does exist if [ ! -d ${APP_HOME} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." + error "Unable to find %%APP_TITLE%% home directory at ${APP_HOME}." exit 2 fi # Make sure the application JAR file exists if [ ! -r ${JAR_FILE} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." + error "Unable to find %%APP_TITLE%% JAR file at ${JAR_FILE}." exit 3 fi # Make sure the Java VM can be found if [ ! -x ${JAVA_CMD} ]; then - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo "" - fi - echo "%%APP_SHORTNAME%%: ERROR: Unable to find Java VM at ${JAVA_HOME}." + error "Unable to find Java VM at ${JAVA_HOME}." exit 4 fi +} - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + +############################################################################## +# Functions that calls the application with the specified parameter +# +# Parameters: +# 1: The argument to pass to the application (optional) + +app() { + (cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat $1) >> ${STDOUT_LOG} 2>> ${STDERR_LOG} } + +############################################################################## +# Function that starts the application +# +# This function is called from the main function +# +# This function expects no parameters + +start() { + # Perform the checks + checks + + # Stop the application + app +} + + +############################################################################## # Function that stops the application +# +# This function is called from the main function +# +# This function expects no parameters + stop() { - if [ "${AS_RC_SCRIPT}" = "yes" ]; then - echo -n " %%APP_SHORTNAME%%" - fi - su - ${USER_NAME} -c "(cd ${APP_HOME} && ${JAVA_CMD} -cp ${CLASSPATH} -Dtomcat.home=${APP_HOME} org.apache.tomcat.startup.Tomcat -stop) >> ${STDOUT_LOG} 2>> ${STDERR_LOG}" + # Perform the checks + checks + + # Stop the application + app -stop } -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "" - echo "Usage: ${MYSELF} { start | stop | restart }" - echo "" - exit 64 - ;; -esac + +############################################################################## +# Main function. This function calls the 'start' and 'stop' functions. +# +# Parameters: +# 1: The argument to this shell script + +main() { + case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: ${MYSELF} { start | stop | restart }" + exit 64 + ;; + esac +} + + +# Call the main function and exit +main $1 +exit 0 Property changes on: head/www/tomcat41/files/tomcatctl ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/www/tomcat41/pkg-plist (revision 54885) +++ head/www/tomcat41/pkg-plist (revision 54886) @@ -1,413 +1,414 @@ +bin/tomcatctl etc/rc.d/020.jakarta-tomcat.sh %%T%%/KEYS %%T%%/LICENSE %%T%%/RELEASE-NOTES %%T%%/bin/ant %%T%%/bin/antRun %%T%%/bin/jspc.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat.sh %%T%%/conf/build.xml %%T%%/conf/jni_server.xml %%T%%/conf/jni_workers.properties %%T%%/conf/manifest.servlet %%T%%/conf/mod_jk.conf %%T%%/conf/obj.conf %%T%%/conf/server.xml %%T%%/conf/test-tomcat.xml %%T%%/conf/tomcat-users.xml %%T%%/conf/tomcat.conf %%T%%/conf/tomcat.policy %%T%%/conf/tomcat.properties %%T%%/conf/uriworkermap.properties %%T%%/conf/web.dtd %%T%%/conf/web.xml %%T%%/conf/workers.properties %%T%%/conf/wrapper.properties %%T%%/doc/AJPv13.html %%T%%/doc/JDBCRealm.howto %%T%%/doc/NT-Service-howto.html %%T%%/doc/Tomcat-Workers-HowTo.html %%T%%/doc/Tomcat-on-NetWare-HowTo.html %%T%%/doc/appdev/build.xml.txt %%T%%/doc/appdev/contents.html %%T%%/doc/appdev/deployment.html %%T%%/doc/appdev/footer.html %%T%%/doc/appdev/header.html %%T%%/doc/appdev/index.html %%T%%/doc/appdev/installation.html %%T%%/doc/appdev/introduction.html %%T%%/doc/appdev/processes.html %%T%%/doc/appdev/sample/build.sh %%T%%/doc/appdev/sample/build.xml %%T%%/doc/appdev/sample/etc/web.xml %%T%%/doc/appdev/sample/src/Hello.java %%T%%/doc/appdev/sample/web/hello.jsp %%T%%/doc/appdev/sample/web/images/tomcat.gif %%T%%/doc/appdev/sample/web/index.html %%T%%/doc/appdev/source.html %%T%%/doc/appdev/tomcat.gif %%T%%/doc/appdev/web.xml.txt %%T%%/doc/faq %%T%%/doc/in-process-howto.html %%T%%/doc/index.html %%T%%/doc/mod_jk-howto.html %%T%%/doc/readme %%T%%/doc/tomcat-apache-howto.html %%T%%/doc/tomcat-iis-howto.html %%T%%/doc/tomcat-localization-howto.html %%T%%/doc/tomcat-netscape-howto.html %%T%%/doc/tomcat-ssl-howto.html %%T%%/doc/uguide/images/banner.gif %%T%%/doc/uguide/images/tomcat.gif %%T%%/doc/uguide/style.css %%T%%/doc/uguide/tomcat-security-unix.html %%T%%/doc/uguide/tomcat-security.html %%T%%/doc/uguide/tomcat_ug.html %%T%%/lib/ant.jar %%T%%/lib/jasper.jar %%T%%/lib/jaxp.jar %%T%%/lib/parser.jar %%T%%/lib/servlet.jar %%T%%/lib/webserver.jar %%T%%/lib/test/Golden/Err.txt %%T%%/lib/test/Golden/ForwardWithQuery.txt %%T%%/lib/test/Golden/HelloWorld.txt %%T%%/lib/test/Golden/Include.txt %%T%%/lib/test/Golden/IncludeFile.txt %%T%%/lib/test/Golden/Mismatch1.txt %%T%%/lib/test/Golden/Mismatch2.txt %%T%%/lib/test/Golden/MustFail.txt %%T%%/lib/test/Golden/PrintWriterTest.txt %%T%%/lib/test/Golden/ServletParam.txt %%T%%/lib/test/Golden/SimpleForward.txt %%T%%/lib/test/Golden/SimpleInclude.txt %%T%%/lib/test/Golden/beanSer.txt %%T%%/lib/test/Golden/beanTest.txt %%T%%/lib/test/Golden/buffer.txt %%T%%/lib/test/Golden/classTest.txt %%T%%/lib/test/Golden/image1.gif %%T%%/lib/test/Golden/implicitConfig.txt %%T%%/lib/test/Golden/implicitContext.txt %%T%%/lib/test/Golden/implicitException.txt %%T%%/lib/test/Golden/implicitOut.txt %%T%%/lib/test/Golden/implicitPage.txt %%T%%/lib/test/Golden/implicitPageContext.txt %%T%%/lib/test/Golden/implicitRequest.txt %%T%%/lib/test/Golden/implicitResponse.txt %%T%%/lib/test/Golden/implicitSession.txt %%T%%/lib/test/Golden/import.txt %%T%%/lib/test/Golden/index.txt %%T%%/lib/test/Golden/jsptoservlet.txt %%T%%/lib/test/Golden/movedindex.txt %%T%%/lib/test/Golden/movedwelcome.txt %%T%%/lib/test/Golden/pageImport.txt %%T%%/lib/test/Golden/parse.txt %%T%%/lib/test/Golden/servletParam1.txt %%T%%/lib/test/Golden/servletParam2.txt %%T%%/lib/test/Golden/welcome.txt %%T%%/src/org/apache/tomcat/facade/HttpServletRequestFacade.java %%T%%/src/org/apache/tomcat/facade/package.html %%T%%/src/org/apache/tomcat/facade/ServletInputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletWriterFacade.java %%T%%/src/org/apache/tomcat/facade/ServletOutputStreamFacade.java %%T%%/src/org/apache/tomcat/facade/ServletContextFacade.java %%T%%/src/org/apache/tomcat/facade/SimpleFacadeManager.java %%T%%/src/org/apache/tomcat/facade/HttpServletResponseFacade.java %%T%%/src/org/apache/tomcat/facade/SessionContextImpl.java %%T%%/src/org/apache/tomcat/facade/ServletConfigImpl.java %%T%%/src/org/apache/tomcat/facade/HttpSessionFacade.java %%T%%/src/org/apache/tomcat/facade/RequestDispatcherImpl.java %%T%%/src/org/apache/tomcat/service/http/HttpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/http/HttpRequestAdapter.java %%T%%/src/org/apache/tomcat/service/http/HttpResponseAdapter.java %%T%%/src/org/apache/tomcat/service/http/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java %%T%%/src/org/apache/tomcat/service/connector/JNIConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/package.html %%T%%/src/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/MsgBuffer.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectionHandler.java %%T%%/src/org/apache/tomcat/service/connector/Ajp13ConnectorResponse.java %%T%%/src/org/apache/tomcat/service/connector/MsgConnector.java %%T%%/src/org/apache/tomcat/service/connector/TcpConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings.properties %%T%%/src/org/apache/tomcat/service/SimpleTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpoint.java %%T%%/src/org/apache/tomcat/service/package.html %%T%%/src/org/apache/tomcat/service/PoolTcpConnector.java %%T%%/src/org/apache/tomcat/service/TcpEndpointConnector.java %%T%%/src/org/apache/tomcat/service/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/service/TcpConnection.java %%T%%/src/org/apache/tomcat/service/SimpleTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/service/PoolTcpEndpoint.java %%T%%/src/org/apache/tomcat/service/JNIEndpointConnector.java %%T%%/src/org/apache/tomcat/service/TcpConnectionHandler.java %%T%%/src/org/apache/tomcat/service/JNIEndpoint.java %%T%%/src/org/apache/tomcat/core/ContextInterceptor.java %%T%%/src/org/apache/tomcat/core/RequestImpl.java %%T%%/src/org/apache/tomcat/core/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/core/ContextManager.java %%T%%/src/org/apache/tomcat/core/BufferedServletInputStream.java %%T%%/src/org/apache/tomcat/core/ResponseImpl.java %%T%%/src/org/apache/tomcat/core/BufferedServletOutputStream.java %%T%%/src/org/apache/tomcat/core/ServerConnector.java %%T%%/src/org/apache/tomcat/core/BaseInterceptor.java %%T%%/src/org/apache/tomcat/core/ServletLoader.java %%T%%/src/org/apache/tomcat/core/TomcatException.java %%T%%/src/org/apache/tomcat/core/Container.java %%T%%/src/org/apache/tomcat/core/ServletWrapper.java %%T%%/src/org/apache/tomcat/core/Response.java %%T%%/src/org/apache/tomcat/core/Context.java %%T%%/src/org/apache/tomcat/core/Constants.java %%T%%/src/org/apache/tomcat/core/Handler.java %%T%%/src/org/apache/tomcat/core/LocalStrings_se.properties %%T%%/src/org/apache/tomcat/core/package.html %%T%%/src/org/apache/tomcat/core/FacadeManager.java %%T%%/src/org/apache/tomcat/core/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/core/RequestInterceptor.java %%T%%/src/org/apache/tomcat/core/LocalStrings.properties %%T%%/src/org/apache/tomcat/core/Request.java %%T%%/src/org/apache/tomcat/context/AutoSetup.java %%T%%/src/org/apache/tomcat/context/DefaultCMSetter.java %%T%%/src/org/apache/tomcat/context/WebXmlReader.java %%T%%/src/org/apache/tomcat/context/LoaderInterceptor.java %%T%%/src/org/apache/tomcat/context/LogEvents.java %%T%%/src/org/apache/tomcat/context/WorkDirInterceptor.java %%T%%/src/org/apache/tomcat/context/LoadOnStartupInterceptor.java %%T%%/src/org/apache/tomcat/context/PolicyInterceptor.java %%T%%/src/org/apache/tomcat/logging/Logger.java %%T%%/src/org/apache/tomcat/logging/LogHelper.java %%T%%/src/org/apache/tomcat/logging/TomcatLogger.java %%T%%/src/org/apache/tomcat/util/pattern/ImplicationTable.java %%T%%/src/org/apache/tomcat/util/pattern/WildcardPattern.java %%T%%/src/org/apache/tomcat/util/pattern/Implication.java %%T%%/src/org/apache/tomcat/util/pattern/URLPatternMatcher.java %%T%%/src/org/apache/tomcat/util/pattern/PatternMatcher.java %%T%%/src/org/apache/tomcat/util/xml/XmlAction.java %%T%%/src/org/apache/tomcat/util/xml/XmlMapper.java %%T%%/src/org/apache/tomcat/util/xml/SaxContext.java %%T%%/src/org/apache/tomcat/util/xml/XmlMatch.java %%T%%/src/org/apache/tomcat/util/xml/PathMatch.java %%T%%/src/org/apache/tomcat/util/compat/SimpleClassLoader.java %%T%%/src/org/apache/tomcat/util/compat/Action.java %%T%%/src/org/apache/tomcat/util/compat/Jdk11Compat.java %%T%%/src/org/apache/tomcat/util/compat/Jdk12Support.java %%T%%/src/org/apache/tomcat/util/WARUtil.java %%T%%/src/org/apache/tomcat/util/HexUtils.java %%T%%/src/org/apache/tomcat/util/RecycleBufferedInputStream.java %%T%%/src/org/apache/tomcat/util/MimeMap.java %%T%%/src/org/apache/tomcat/util/URLUtil.java %%T%%/src/org/apache/tomcat/util/Queue.java %%T%%/src/org/apache/tomcat/util/LocaleToCharsetMap.java %%T%%/src/org/apache/tomcat/util/FileUtil.java %%T%%/src/org/apache/tomcat/util/MessageChars.java %%T%%/src/org/apache/tomcat/util/SimpleHashtable.java %%T%%/src/org/apache/tomcat/util/DateTool.java %%T%%/src/org/apache/tomcat/util/LocalStrings.properties %%T%%/src/org/apache/tomcat/util/CookieTools.java %%T%%/src/org/apache/tomcat/util/Ascii.java %%T%%/src/org/apache/tomcat/util/BufferListener.java %%T%%/src/org/apache/tomcat/util/BufferEvent.java %%T%%/src/org/apache/tomcat/util/SessionIdGenerator.java %%T%%/src/org/apache/tomcat/util/ArrayEnumerator.java %%T%%/src/org/apache/tomcat/util/PrefixMapper.java %%T%%/src/org/apache/tomcat/util/RequestUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaderField.java %%T%%/src/org/apache/tomcat/util/ThreadPool.java %%T%%/src/org/apache/tomcat/util/ThreadPoolRunnable.java %%T%%/src/org/apache/tomcat/util/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/util/BuffTool.java %%T%%/src/org/apache/tomcat/util/SecurityTools.java %%T%%/src/org/apache/tomcat/util/SimplePrincipal.java %%T%%/src/org/apache/tomcat/util/ByteBuffer.java %%T%%/src/org/apache/tomcat/util/SimplePool.java %%T%%/src/org/apache/tomcat/util/StringManager.java %%T%%/src/org/apache/tomcat/util/EmptyEnumeration.java %%T%%/src/org/apache/tomcat/util/Reaper.java %%T%%/src/org/apache/tomcat/util/MessageBytes.java %%T%%/src/org/apache/tomcat/util/SessionUtil.java %%T%%/src/org/apache/tomcat/util/MimeHeaders.java %%T%%/src/org/apache/tomcat/util/DevNullOutputStream.java %%T%%/src/org/apache/tomcat/util/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/util/MessageString.java %%T%%/src/org/apache/tomcat/util/package.html %%T%%/src/org/apache/tomcat/adapter/HttpAdapter.java %%T%%/src/org/apache/tomcat/adapter/AdapterHandler.java %%T%%/src/org/apache/tomcat/resources/web.dtd %%T%%/src/org/apache/tomcat/resources/LocalStrings_fr.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings.properties %%T%%/src/org/apache/tomcat/resources/LocalStrings_en.properties %%T%%/src/org/apache/tomcat/request/InvokerInterceptor.java %%T%%/src/org/apache/tomcat/request/SimpleMapper1.java %%T%%/src/org/apache/tomcat/request/SimpleRealm.java %%T%%/src/org/apache/tomcat/request/AccessInterceptor.java %%T%%/src/org/apache/tomcat/request/SessionInterceptor.java %%T%%/src/org/apache/tomcat/request/JspInterceptor.java %%T%%/src/org/apache/tomcat/request/LocalStrings.properties %%T%%/src/org/apache/tomcat/request/StaticInterceptor.java %%T%%/src/org/apache/tomcat/request/JDBCRealm.java %%T%%/src/org/apache/tomcat/request/AccountingInterceptor.java %%T%%/src/org/apache/tomcat/request/Jdk12Interceptor.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader.java %%T%%/src/org/apache/tomcat/loader/AdaptiveServletLoader.java %%T%%/src/org/apache/tomcat/loader/SimpleFileFilter.java %%T%%/src/org/apache/tomcat/loader/AdaptiveClassLoader12.java %%T%%/src/org/apache/tomcat/loader/ClassRepository.java %%T%%/src/org/apache/tomcat/task/StopTomcat.java %%T%%/src/org/apache/tomcat/task/ApacheConfig.java %%T%%/src/org/apache/tomcat/task/Expand.java %%T%%/src/org/apache/tomcat/task/IISConfig.java %%T%%/src/org/apache/tomcat/task/NSConfig.java %%T%%/src/org/apache/tomcat/task/GTest.java %%T%%/src/org/apache/tomcat/net/ServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/DefaultServerSocketFactory.java %%T%%/src/org/apache/tomcat/net/SSLSocketFactory.java %%T%%/src/org/apache/tomcat/session/LocalStrings.properties %%T%%/src/org/apache/tomcat/session/StandardSessionInterceptor.java %%T%%/src/org/apache/tomcat/session/LocalStrings_es.properties %%T%%/src/org/apache/tomcat/session/StandardManager.java %%T%%/src/org/apache/tomcat/session/StandardSession.java %%T%%/src/org/apache/tomcat/session/SessionSerializer.java %%T%%/src/org/apache/tomcat/protocol/war/Handler.java %%T%%/src/org/apache/tomcat/protocol/jar/Handler.java %%T%%/src/org/apache/tomcat/protocol/WARConnection.java %%T%%/src/org/apache/tomcat/protocol/WARManager.java %%T%%/src/org/apache/tomcat/startup/Tomcat.java %%T%%/src/org/apache/tomcat/startup/HostConfig.java %%T%%/src/org/apache/tomcat/startup/EmbededTomcat.java %%T%%/src/org/apache/jasper/resources/messages_fr.properties %%T%%/src/org/apache/jasper/resources/web-jsptaglib_1_1.dtd %%T%%/src/org/apache/jasper/resources/messages.properties %%T%%/src/org/apache/jasper/resources/messages_es.properties %%T%%/src/org/apache/jasper/resources/web.dtd %%T%%/src/org/apache/jasper/servlet/JasperLoader.java %%T%%/src/org/apache/jasper/servlet/TomcatServletEngine.java %%T%%/src/org/apache/jasper/servlet/JspServlet.java %%T%%/src/org/apache/jasper/servlet/ServletEngine.java %%T%%/src/org/apache/jasper/servlet/JasperLoader12.java %%T%%/src/org/apache/jasper/runtime/JspFactoryImpl.java %%T%%/src/org/apache/jasper/runtime/JspRuntimeLibrary.java %%T%%/src/org/apache/jasper/runtime/PageContextImpl.java %%T%%/src/org/apache/jasper/runtime/JspWriterImpl.java %%T%%/src/org/apache/jasper/runtime/BodyContentImpl.java %%T%%/src/org/apache/jasper/runtime/HttpJspBase.java %%T%%/src/org/apache/jasper/runtime/JspLoader.java %%T%%/src/org/apache/jasper/compiler/JspCompiler.java %%T%%/src/org/apache/jasper/compiler/BeanRepository.java %%T%%/src/org/apache/jasper/compiler/ForwardGenerator.java %%T%%/src/org/apache/jasper/compiler/DestroyMethodPhase.java %%T%%/src/org/apache/jasper/compiler/IncludeGenerator.java %%T%%/src/org/apache/jasper/compiler/TagGeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagLibraryInfoImpl.java %%T%%/src/org/apache/jasper/compiler/Mangler.java %%T%%/src/org/apache/jasper/compiler/StaticInitializerPhase.java %%T%%/src/org/apache/jasper/compiler/CommandLineCompiler.java %%T%%/src/org/apache/jasper/compiler/Mark.java %%T%%/src/org/apache/jasper/compiler/JikesJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/SunJavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagBeginGenerator.java %%T%%/src/org/apache/jasper/compiler/ClassName.java %%T%%/src/org/apache/jasper/compiler/PluginGenerator.java %%T%%/src/org/apache/jasper/compiler/BeanGenerator.java %%T%%/src/org/apache/jasper/compiler/DelegatingListener.java %%T%%/src/org/apache/jasper/compiler/SetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/InfoGenerator.java %%T%%/src/org/apache/jasper/compiler/CommentGenerator.java %%T%%/src/org/apache/jasper/compiler/GetPropertyGenerator.java %%T%%/src/org/apache/jasper/compiler/Parser.java %%T%%/src/org/apache/jasper/compiler/ScriptletGenerator.java %%T%%/src/org/apache/jasper/compiler/FileDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/GeneratorBase.java %%T%%/src/org/apache/jasper/compiler/JspUtil.java %%T%%/src/org/apache/jasper/compiler/BeanEndGenerator.java %%T%%/src/org/apache/jasper/compiler/Generator.java %%T%%/src/org/apache/jasper/compiler/ParseException.java %%T%%/src/org/apache/jasper/compiler/ExpressionGenerator.java %%T%%/src/org/apache/jasper/compiler/JspReader.java %%T%%/src/org/apache/jasper/compiler/InitMethodPhase.java %%T%%/src/org/apache/jasper/compiler/MappedCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/CompileException.java %%T%%/src/org/apache/jasper/compiler/DumbParseEventListener.java %%T%%/src/org/apache/jasper/compiler/Compiler.java %%T%%/src/org/apache/jasper/compiler/ServletWriter.java %%T%%/src/org/apache/jasper/compiler/ClassDeclarationPhase.java %%T%%/src/org/apache/jasper/compiler/CoreElement.java %%T%%/src/org/apache/jasper/compiler/ParseEventListener.java %%T%%/src/org/apache/jasper/compiler/TagEndGenerator.java %%T%%/src/org/apache/jasper/compiler/StoredCharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/JavaCompiler.java %%T%%/src/org/apache/jasper/compiler/TagLibraries.java %%T%%/src/org/apache/jasper/compiler/ServiceMethodPhase.java %%T%%/src/org/apache/jasper/compiler/TagCache.java %%T%%/src/org/apache/jasper/compiler/JakartaCommentGenerator.java %%T%%/src/org/apache/jasper/compiler/DeclarationGenerator.java %%T%%/src/org/apache/jasper/compiler/CharDataGenerator.java %%T%%/src/org/apache/jasper/compiler/BaseJspListener.java %%T%%/src/org/apache/jasper/compiler/EscapeUnicodeWriter.java %%T%%/src/org/apache/jasper/CommandLineContext.java %%T%%/src/org/apache/jasper/EmbededServletOptions.java %%T%%/src/org/apache/jasper/JspC.java %%T%%/src/org/apache/jasper/JspEngineContext.java %%T%%/src/org/apache/jasper/Options.java %%T%%/src/org/apache/jasper/Constants.java %%T%%/src/org/apache/jasper/JasperException.java %%T%%/src/org/apache/jasper/JspCompilationContext.java %%T%%/webapps/ROOT.war %%T%%/webapps/admin.war %%T%%/webapps/examples.war %%T%%/webapps/test.war @dirrm %%T%%/webapps @dirrm %%T%%/src/org/apache/tomcat/util/xml @dirrm %%T%%/src/org/apache/tomcat/util/pattern @dirrm %%T%%/src/org/apache/tomcat/util/compat @dirrm %%T%%/src/org/apache/tomcat/util @dirrm %%T%%/src/org/apache/tomcat/task @dirrm %%T%%/src/org/apache/tomcat/startup @dirrm %%T%%/src/org/apache/tomcat/session @dirrm %%T%%/src/org/apache/tomcat/service/http @dirrm %%T%%/src/org/apache/tomcat/service/connector @dirrm %%T%%/src/org/apache/tomcat/service @dirrm %%T%%/src/org/apache/tomcat/resources @dirrm %%T%%/src/org/apache/tomcat/request @dirrm %%T%%/src/org/apache/tomcat/protocol/war @dirrm %%T%%/src/org/apache/tomcat/protocol/jar @dirrm %%T%%/src/org/apache/tomcat/protocol @dirrm %%T%%/src/org/apache/tomcat/net @dirrm %%T%%/src/org/apache/tomcat/loader @dirrm %%T%%/src/org/apache/tomcat/facade @dirrm %%T%%/src/org/apache/tomcat/adapter @dirrm %%T%%/src/org/apache/tomcat/core @dirrm %%T%%/src/org/apache/tomcat/context @dirrm %%T%%/src/org/apache/tomcat/logging @dirrm %%T%%/src/org/apache/tomcat @dirrm %%T%%/src/org/apache/jasper/servlet @dirrm %%T%%/src/org/apache/jasper/runtime @dirrm %%T%%/src/org/apache/jasper/resources @dirrm %%T%%/src/org/apache/jasper/compiler @dirrm %%T%%/src/org/apache/jasper @dirrm %%T%%/src/org/apache @dirrm %%T%%/src/org @dirrm %%T%%/src @dirrm %%T%%/logs @dirrm %%T%%/lib/test/Golden @dirrm %%T%%/lib/test @dirrm %%T%%/lib @dirrm %%T%%/doc/uguide/images @dirrm %%T%%/doc/uguide @dirrm %%T%%/doc/appdev/sample/web/images @dirrm %%T%%/doc/appdev/sample/web @dirrm %%T%%/doc/appdev/sample/src @dirrm %%T%%/doc/appdev/sample/etc @dirrm %%T%%/doc/appdev/sample @dirrm %%T%%/doc/appdev @dirrm %%T%%/doc @dirrm %%T%%/conf @dirrm %%T%%/bin @dirrm %%T%% @unexec pw groupdel tomcat || true @unexec pw userdel tomcat || true Property changes on: head/www/tomcat41/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property