Index: branches/2017Q1/www/tomcat6/Makefile =================================================================== --- branches/2017Q1/www/tomcat6/Makefile (revision 436372) +++ branches/2017Q1/www/tomcat6/Makefile (revision 436373) @@ -1,97 +1,97 @@ # Created by: Nemo Liu # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 6.0.48 +PORTVERSION= 6.0.51 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-6/v${PORTVERSION}/bin DISTNAME= apache-${PORTNAME}-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= Open-source Java web server by Apache, 6.x branch LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe CPE_VENDOR= apache USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= YES NO_ARCH= YES USE_RC_SUBR= tomcat6 SUB_FILES= pkg-install MAJOR_VER= ${PORTVERSION:R} APP_HOME?= ${PREFIX}/${DISTNAME:R} LOG_DIR= ${APP_HOME}/logs APP_SHORTNAME= ${PORTNAME}${MAJOR_VER:S/.//} TOMCAT_USER?= www TOMCAT_GROUP?= www HTTP_PORT?= 8180 SHUTDOWN_PORT?= 8005 AJP_1_3_PORT?= 8009 STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log JAR_FILE= bin/bootstrap.jar TOMCAT_CONF_FILES= catalina.policy catalina.properties context.xml \ logging.properties server.xml tomcat-users.xml web.xml CONF_EXT= sample PLIST_SUB= T=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \ WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP} SUB_LIST= AJP_1_3_PORT=${AJP_1_3_PORT} \ APP_HOME=${APP_HOME} \ APP_SHORTNAME=${APP_SHORTNAME} \ GROUP=${TOMCAT_GROUP} \ HTTP_PORT=${HTTP_PORT} \ JAR_FILE=${JAR_FILE} \ SHUTDOWN_PORT=${SHUTDOWN_PORT} \ STDERR_LOG=${STDERR_LOG} \ STDOUT_LOG=${STDOUT_LOG} \ TOMCAT_HOME=${APP_HOME} \ TOMCAT_VERSION=${MAJOR_VER:S/.//} \ USER=${TOMCAT_USER} .include pre-patch: @${ECHO_MSG} "Installation settings:" @${ECHO_MSG} " Destination directory: ${APP_HOME}" @${ECHO_MSG} " Location of JDK: ${JAVA_HOME}" @${ECHO_MSG} " Location of Java port: ${JAVA_PORT}" @${ECHO_MSG} " Running as (user/group): ${TOMCAT_USER}/${TOMCAT_GROUP}" @${ECHO_MSG} " HTTP port: ${HTTP_PORT}" @${ECHO_MSG} " Shutdown listener port: ${SHUTDOWN_PORT}" @${ECHO_MSG} " AJP 1.3 connector port: ${AJP_1_3_PORT}" @${ECHO_MSG} " Logfile stdout: ${STDOUT_LOG}" @${ECHO_MSG} " Logfile stderr: ${STDERR_LOG}" post-patch: @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete .for f in ${TOMCAT_CONF_FILES} @${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT} .endfor pre-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: @${ECHO_MSG} -n ">> Creating destination directory..." @${MKDIR} ${STAGEDIR}${APP_HOME} @${MKDIR} ${STAGEDIR}${LOG_DIR} @${MKDIR} ${STAGEDIR}${APP_HOME}/endorsed @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Copying files to destination directory..." @${CP} -R ${WRKSRC}/* ${STAGEDIR}${APP_HOME} @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Fixing permissions..." @${FIND} ${STAGEDIR}${APP_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_MSG} " [ DONE ]" .include Index: branches/2017Q1/www/tomcat6/distinfo =================================================================== --- branches/2017Q1/www/tomcat6/distinfo (revision 436372) +++ branches/2017Q1/www/tomcat6/distinfo (revision 436373) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479347277 -SHA256 (apache-tomcat-6.0.48.tar.gz) = 6c2db06620e36f08921dfe94bcb3f04f511c055886f7286375455cf4907092f0 -SIZE (apache-tomcat-6.0.48.tar.gz) = 7085510 +TIMESTAMP = 1489799677 +SHA256 (apache-tomcat-6.0.51.tar.gz) = 8fe88622ba099110a5f6b85856af262a55f79e31700525fe0d2e961433b3a6b9 +SIZE (apache-tomcat-6.0.51.tar.gz) = 7105938 Index: branches/2017Q1/www/tomcat6/pkg-plist =================================================================== --- branches/2017Q1/www/tomcat6/pkg-plist (revision 436372) +++ branches/2017Q1/www/tomcat6/pkg-plist (revision 436373) @@ -1,491 +1,491 @@ %%T%%/LICENSE %%T%%/NOTICE %%T%%/RELEASE-NOTES %%T%%/RUNNING.txt %%T%%/bin/bootstrap.jar %%T%%/bin/catalina-tasks.xml %%T%%/bin/catalina.sh %%T%%/bin/commons-daemon.jar %%T%%/bin/commons-daemon-native.tar.gz %%T%%/bin/daemon.sh %%T%%/bin/digest.sh %%T%%/bin/setclasspath.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat-juli.jar %%T%%/bin/tomcat-native.tar.gz %%T%%/bin/tool-wrapper.sh %%T%%/bin/version.sh @sample %%T%%/conf/catalina.policy.%%CONF_EXT%% %%T%%/conf/catalina.policy @sample %%T%%/conf/catalina.properties.%%CONF_EXT%% %%T%%/conf/catalina.properties @sample %%T%%/conf/context.xml.%%CONF_EXT%% %%T%%/conf/context.xml @sample %%T%%/conf/logging.properties.%%CONF_EXT%% %%T%%/conf/logging.properties @sample %%T%%/conf/server.xml.%%CONF_EXT%% %%T%%/conf/server.xml @sample %%T%%/conf/tomcat-users.xml.%%CONF_EXT%% %%T%%/conf/tomcat-users.xml @sample %%T%%/conf/web.xml.%%CONF_EXT%% %%T%%/conf/web.xml %%T%%/lib/annotations-api.jar %%T%%/lib/catalina-ant.jar %%T%%/lib/catalina-ha.jar %%T%%/lib/catalina-tribes.jar %%T%%/lib/catalina.jar %%T%%/lib/ecj-4.3.1.jar %%T%%/lib/el-api.jar %%T%%/lib/jasper-el.jar %%T%%/lib/jasper.jar %%T%%/lib/jsp-api.jar %%T%%/lib/servlet-api.jar %%T%%/lib/tomcat-coyote.jar %%T%%/lib/tomcat-dbcp.jar %%T%%/lib/tomcat-i18n-es.jar %%T%%/lib/tomcat-i18n-fr.jar %%T%%/lib/tomcat-i18n-ja.jar %%T%%/temp/safeToDelete.tmp %%T%%/webapps/ROOT/RELEASE-NOTES.txt %%T%%/webapps/ROOT/WEB-INF/web.xml -%%T%%/webapps/ROOT/asf-logo-wide.gif -%%T%%/webapps/ROOT/build.xml +%%T%%/webapps/ROOT/asf-logo-wide.svg %%T%%/webapps/ROOT/favicon.ico %%T%%/webapps/ROOT/index.html %%T%%/webapps/ROOT/index.jsp %%T%%/webapps/ROOT/tomcat-power.gif %%T%%/webapps/ROOT/tomcat.gif %%T%%/webapps/ROOT/tomcat.svg %%T%%/webapps/docs/BUILDING.txt %%T%%/webapps/docs/RELEASE-NOTES.txt %%T%%/webapps/docs/RUNNING.txt %%T%%/webapps/docs/WEB-INF/web.xml %%T%%/webapps/docs/aio.html %%T%%/webapps/docs/api/index.html %%T%%/webapps/docs/appdev/build.xml.txt %%T%%/webapps/docs/appdev/deployment.html %%T%%/webapps/docs/appdev/index.html %%T%%/webapps/docs/appdev/installation.html %%T%%/webapps/docs/appdev/introduction.html %%T%%/webapps/docs/appdev/processes.html %%T%%/webapps/docs/appdev/sample/build.xml %%T%%/webapps/docs/appdev/sample/docs/README.txt %%T%%/webapps/docs/appdev/sample/index.html %%T%%/webapps/docs/appdev/sample/sample.war %%T%%/webapps/docs/appdev/sample/src/mypackage/Hello.java %%T%%/webapps/docs/appdev/sample/web/WEB-INF/web.xml %%T%%/webapps/docs/appdev/sample/web/hello.jsp %%T%%/webapps/docs/appdev/sample/web/images/tomcat.gif %%T%%/webapps/docs/appdev/sample/web/index.html %%T%%/webapps/docs/appdev/source.html %%T%%/webapps/docs/appdev/web.xml.txt %%T%%/webapps/docs/apr.html %%T%%/webapps/docs/architecture/index.html %%T%%/webapps/docs/architecture/overview.html %%T%%/webapps/docs/architecture/requestProcess/requestProcess.pdf %%T%%/webapps/docs/architecture/requestProcess/roseModel.mdl %%T%%/webapps/docs/architecture/requestProcess.html %%T%%/webapps/docs/architecture/startup/serverStartup.pdf %%T%%/webapps/docs/architecture/startup/serverStartup.txt %%T%%/webapps/docs/architecture/startup.html %%T%%/webapps/docs/balancer-howto.html %%T%%/webapps/docs/building.html %%T%%/webapps/docs/cgi-howto.html %%T%%/webapps/docs/changelog.html %%T%%/webapps/docs/class-loader-howto.html %%T%%/webapps/docs/cluster-howto.html %%T%%/webapps/docs/config/ajp.html %%T%%/webapps/docs/config/cluster-channel.html %%T%%/webapps/docs/config/cluster-deployer.html %%T%%/webapps/docs/config/cluster-interceptor.html %%T%%/webapps/docs/config/cluster-listener.html %%T%%/webapps/docs/config/cluster-manager.html %%T%%/webapps/docs/config/cluster-membership.html %%T%%/webapps/docs/config/cluster-receiver.html %%T%%/webapps/docs/config/cluster-sender.html %%T%%/webapps/docs/config/cluster-valve.html %%T%%/webapps/docs/config/cluster.html %%T%%/webapps/docs/config/context.html %%T%%/webapps/docs/config/engine.html %%T%%/webapps/docs/config/executor.html %%T%%/webapps/docs/config/filter.html %%T%%/webapps/docs/config/globalresources.html %%T%%/webapps/docs/config/host.html %%T%%/webapps/docs/config/http.html %%T%%/webapps/docs/config/index.html %%T%%/webapps/docs/config/listeners.html %%T%%/webapps/docs/config/loader.html %%T%%/webapps/docs/config/manager.html %%T%%/webapps/docs/config/realm.html %%T%%/webapps/docs/config/resources.html %%T%%/webapps/docs/config/server.html %%T%%/webapps/docs/config/service.html %%T%%/webapps/docs/config/systemprops.html %%T%%/webapps/docs/config/valve.html %%T%%/webapps/docs/connectors.html %%T%%/webapps/docs/default-servlet.html %%T%%/webapps/docs/deployer-howto.html %%T%%/webapps/docs/developers.html %%T%%/webapps/docs/extras.html %%T%%/webapps/docs/funcspecs/fs-admin-apps.html %%T%%/webapps/docs/funcspecs/fs-admin-objects.html %%T%%/webapps/docs/funcspecs/fs-admin-opers.html %%T%%/webapps/docs/funcspecs/fs-default.html %%T%%/webapps/docs/funcspecs/fs-invoker.html %%T%%/webapps/docs/funcspecs/fs-jdbc-realm.html %%T%%/webapps/docs/funcspecs/fs-jndi-realm.html %%T%%/webapps/docs/funcspecs/fs-memory-realm.html %%T%%/webapps/docs/funcspecs/index.html %%T%%/webapps/docs/funcspecs/mbean-names.html %%T%%/webapps/docs/html-manager-howto.html %%T%%/webapps/docs/images/add.gif -%%T%%/webapps/docs/images/asf-logo.gif +%%T%%/webapps/docs/images/asf-logo.svg %%T%%/webapps/docs/images/code.gif %%T%%/webapps/docs/images/design.gif %%T%%/webapps/docs/images/docs.gif %%T%%/webapps/docs/images/fix.gif %%T%%/webapps/docs/images/printer.gif %%T%%/webapps/docs/images/tomcat.gif +%%T%%/webapps/docs/images/tomcat.png %%T%%/webapps/docs/images/tomcat.svg %%T%%/webapps/docs/images/update.gif %%T%%/webapps/docs/images/void.gif %%T%%/webapps/docs/index.html %%T%%/webapps/docs/introduction.html %%T%%/webapps/docs/jasper-howto.html %%T%%/webapps/docs/jndi-datasource-examples-howto.html %%T%%/webapps/docs/jndi-resources-howto.html %%T%%/webapps/docs/logging.html %%T%%/webapps/docs/manager-howto.html %%T%%/webapps/docs/maven-jars.html %%T%%/webapps/docs/mbeans-descriptor-howto.html %%T%%/webapps/docs/monitoring.html %%T%%/webapps/docs/proxy-howto.html %%T%%/webapps/docs/realm-howto.html %%T%%/webapps/docs/security-manager-howto.html %%T%%/webapps/docs/setup.html %%T%%/webapps/docs/ssi-howto.html %%T%%/webapps/docs/ssl-howto.html %%T%%/webapps/docs/tribes/developers.html %%T%%/webapps/docs/tribes/faq.html %%T%%/webapps/docs/tribes/interceptors.html %%T%%/webapps/docs/tribes/introduction.html %%T%%/webapps/docs/tribes/membership.html %%T%%/webapps/docs/tribes/setup.html %%T%%/webapps/docs/tribes/status.html %%T%%/webapps/docs/tribes/transport.html %%T%%/webapps/docs/virtual-hosting-howto.html %%T%%/webapps/docs/windows-service-howto.html %%T%%/webapps/examples/WEB-INF/classes/CookieExample.class %%T%%/webapps/examples/WEB-INF/classes/CookieExample.java %%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class %%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.java %%T%%/webapps/examples/WEB-INF/classes/LocalStrings.properties %%T%%/webapps/examples/WEB-INF/classes/LocalStrings_en.properties %%T%%/webapps/examples/WEB-INF/classes/LocalStrings_es.properties %%T%%/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties %%T%%/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties %%T%%/webapps/examples/WEB-INF/classes/RequestHeaderExample.class %%T%%/webapps/examples/WEB-INF/classes/RequestHeaderExample.java %%T%%/webapps/examples/WEB-INF/classes/RequestInfoExample.class %%T%%/webapps/examples/WEB-INF/classes/RequestInfoExample.java %%T%%/webapps/examples/WEB-INF/classes/RequestParamExample.class %%T%%/webapps/examples/WEB-INF/classes/RequestParamExample.java %%T%%/webapps/examples/WEB-INF/classes/SessionExample.class %%T%%/webapps/examples/WEB-INF/classes/SessionExample.java %%T%%/webapps/examples/WEB-INF/classes/cal/Entries.class %%T%%/webapps/examples/WEB-INF/classes/cal/Entries.java %%T%%/webapps/examples/WEB-INF/classes/cal/Entry.class %%T%%/webapps/examples/WEB-INF/classes/cal/Entry.java %%T%%/webapps/examples/WEB-INF/classes/cal/JspCalendar.class %%T%%/webapps/examples/WEB-INF/classes/cal/JspCalendar.java %%T%%/webapps/examples/WEB-INF/classes/cal/TableBean.class %%T%%/webapps/examples/WEB-INF/classes/cal/TableBean.java %%T%%/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class %%T%%/webapps/examples/WEB-INF/classes/chat/ChatServlet.class %%T%%/webapps/examples/WEB-INF/classes/chat/ChatServlet.java %%T%%/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class %%T%%/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java %%T%%/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class %%T%%/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class %%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java %%T%%/webapps/examples/WEB-INF/classes/dates/JspCalendar.class %%T%%/webapps/examples/WEB-INF/classes/dates/JspCalendar.java %%T%%/webapps/examples/WEB-INF/classes/error/Smart.class %%T%%/webapps/examples/WEB-INF/classes/error/Smart.java %%T%%/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class %%T%%/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java %%T%%/webapps/examples/WEB-INF/classes/examples/FooTag.class %%T%%/webapps/examples/WEB-INF/classes/examples/FooTag.java %%T%%/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class %%T%%/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java %%T%%/webapps/examples/WEB-INF/classes/examples/LogTag.class %%T%%/webapps/examples/WEB-INF/classes/examples/LogTag.java %%T%%/webapps/examples/WEB-INF/classes/examples/ShowSource.class %%T%%/webapps/examples/WEB-INF/classes/examples/ShowSource.java %%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class %%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java %%T%%/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class %%T%%/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java %%T%%/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class %%T%%/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java %%T%%/webapps/examples/WEB-INF/classes/listeners/ContextListener.class %%T%%/webapps/examples/WEB-INF/classes/listeners/ContextListener.java %%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.class %%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.java %%T%%/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class %%T%%/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java %%T%%/webapps/examples/WEB-INF/classes/servletToJsp.class %%T%%/webapps/examples/WEB-INF/classes/servletToJsp.java %%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.class %%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.java %%T%%/webapps/examples/WEB-INF/classes/util/HTMLFilter.class %%T%%/webapps/examples/WEB-INF/classes/util/HTMLFilter.java %%T%%/webapps/examples/WEB-INF/classes/validators/DebugValidator.class %%T%%/webapps/examples/WEB-INF/classes/validators/DebugValidator.java %%T%%/webapps/examples/WEB-INF/jsp/applet/Clock2.java %%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld %%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld %%T%%/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld %%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar %%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar %%T%%/webapps/examples/WEB-INF/tags/displayProducts.tag %%T%%/webapps/examples/WEB-INF/tags/helloWorld.tag %%T%%/webapps/examples/WEB-INF/tags/panel.tag %%T%%/webapps/examples/WEB-INF/tags/xhtmlbasic.tag %%T%%/webapps/examples/WEB-INF/web.xml %%T%%/webapps/examples/index.html %%T%%/webapps/examples/jsp/cal/Entries.java.html %%T%%/webapps/examples/jsp/cal/Entry.java.html %%T%%/webapps/examples/jsp/cal/JspCalendar.java.html %%T%%/webapps/examples/jsp/cal/TableBean.java.html %%T%%/webapps/examples/jsp/cal/cal1.jsp %%T%%/webapps/examples/jsp/cal/cal1.jsp.html %%T%%/webapps/examples/jsp/cal/cal2.jsp %%T%%/webapps/examples/jsp/cal/cal2.jsp.html %%T%%/webapps/examples/jsp/cal/calendar.html %%T%%/webapps/examples/jsp/cal/login.html %%T%%/webapps/examples/jsp/chat/index.jsp %%T%%/webapps/examples/jsp/chat/index.jsp.html %%T%%/webapps/examples/jsp/chat/login.jsp %%T%%/webapps/examples/jsp/chat/login.jsp.html %%T%%/webapps/examples/jsp/chat/post.jsp %%T%%/webapps/examples/jsp/chat/post.jsp.html %%T%%/webapps/examples/jsp/checkbox/CheckTest.html %%T%%/webapps/examples/jsp/checkbox/check.html %%T%%/webapps/examples/jsp/checkbox/checkresult.jsp %%T%%/webapps/examples/jsp/checkbox/checkresult.jsp.html %%T%%/webapps/examples/jsp/checkbox/cresult.html %%T%%/webapps/examples/jsp/colors/ColorGameBean.html %%T%%/webapps/examples/jsp/colors/clr.html %%T%%/webapps/examples/jsp/colors/colors.html %%T%%/webapps/examples/jsp/colors/colrs.jsp %%T%%/webapps/examples/jsp/colors/colrs.jsp.html %%T%%/webapps/examples/jsp/dates/date.html %%T%%/webapps/examples/jsp/dates/date.jsp %%T%%/webapps/examples/jsp/dates/date.jsp.html %%T%%/webapps/examples/jsp/error/er.html %%T%%/webapps/examples/jsp/error/err.jsp %%T%%/webapps/examples/jsp/error/err.jsp.html %%T%%/webapps/examples/jsp/error/error.html %%T%%/webapps/examples/jsp/error/errorpge.jsp %%T%%/webapps/examples/jsp/error/errorpge.jsp.html %%T%%/webapps/examples/jsp/forward/forward.jsp %%T%%/webapps/examples/jsp/forward/forward.jsp.html %%T%%/webapps/examples/jsp/forward/fwd.html %%T%%/webapps/examples/jsp/forward/one.jsp %%T%%/webapps/examples/jsp/forward/one.jsp.html %%T%%/webapps/examples/jsp/forward/two.html %%T%%/webapps/examples/jsp/images/code.gif %%T%%/webapps/examples/jsp/images/execute.gif %%T%%/webapps/examples/jsp/images/read.gif %%T%%/webapps/examples/jsp/images/return.gif %%T%%/webapps/examples/jsp/include/foo.html %%T%%/webapps/examples/jsp/include/foo.jsp %%T%%/webapps/examples/jsp/include/foo.jsp.html %%T%%/webapps/examples/jsp/include/inc.html %%T%%/webapps/examples/jsp/include/include.jsp %%T%%/webapps/examples/jsp/include/include.jsp.html %%T%%/webapps/examples/jsp/index.html %%T%%/webapps/examples/jsp/jsp2/el/Functions.java.html %%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.html %%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp %%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html %%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.html %%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp %%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html %%T%%/webapps/examples/jsp/jsp2/el/functions.html %%T%%/webapps/examples/jsp/jsp2/el/functions.jsp %%T%%/webapps/examples/jsp/jsp2/el/functions.jsp.html %%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.html %%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.jsp %%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp %%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.html %%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp %%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html %%T%%/webapps/examples/jsp/jsp2/jspx/basic.html %%T%%/webapps/examples/jsp/jsp2/jspx/basic.jspx %%T%%/webapps/examples/jsp/jsp2/jspx/basic.jspx.html %%T%%/webapps/examples/jsp/jsp2/jspx/svgexample.html %%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.html %%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jpg %%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jspx %%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html %%T%%/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html %%T%%/webapps/examples/jsp/jsp2/misc/coda.jspf %%T%%/webapps/examples/jsp/jsp2/misc/coda.jspf.html %%T%%/webapps/examples/jsp/jsp2/misc/config.html %%T%%/webapps/examples/jsp/jsp2/misc/config.jsp %%T%%/webapps/examples/jsp/jsp2/misc/config.jsp.html %%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.html %%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp %%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html %%T%%/webapps/examples/jsp/jsp2/misc/prelude.jspf %%T%%/webapps/examples/jsp/jsp2/misc/prelude.jspf.html %%T%%/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html %%T%%/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html %%T%%/webapps/examples/jsp/jsp2/simpletag/Functions.java.html %%T%%/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html %%T%%/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html %%T%%/webapps/examples/jsp/jsp2/simpletag/book.html %%T%%/webapps/examples/jsp/jsp2/simpletag/book.jsp %%T%%/webapps/examples/jsp/jsp2/simpletag/book.jsp.html %%T%%/webapps/examples/jsp/jsp2/simpletag/hello.html %%T%%/webapps/examples/jsp/jsp2/simpletag/hello.jsp %%T%%/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html %%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.html %%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.jsp %%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.jsp %%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.jsp %%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/products.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp %%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html %%T%%/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html %%T%%/webapps/examples/jsp/jsptoserv/hello.jsp %%T%%/webapps/examples/jsp/jsptoserv/hello.jsp.html %%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp %%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html %%T%%/webapps/examples/jsp/jsptoserv/jts.html %%T%%/webapps/examples/jsp/jsptoserv/servletToJsp.java.html %%T%%/webapps/examples/jsp/num/numguess.html %%T%%/webapps/examples/jsp/num/numguess.jsp %%T%%/webapps/examples/jsp/num/numguess.jsp.html %%T%%/webapps/examples/jsp/plugin/applet/Clock2.class %%T%%/webapps/examples/jsp/plugin/applet/Clock2.java %%T%%/webapps/examples/jsp/plugin/plugin.html %%T%%/webapps/examples/jsp/plugin/plugin.jsp %%T%%/webapps/examples/jsp/plugin/plugin.jsp.html %%T%%/webapps/examples/jsp/security/protected/error.jsp %%T%%/webapps/examples/jsp/security/protected/error.jsp.html %%T%%/webapps/examples/jsp/security/protected/index.jsp %%T%%/webapps/examples/jsp/security/protected/index.jsp.html %%T%%/webapps/examples/jsp/security/protected/login.jsp %%T%%/webapps/examples/jsp/security/protected/login.jsp.html %%T%%/webapps/examples/jsp/sessions/DummyCart.html %%T%%/webapps/examples/jsp/sessions/carts.html %%T%%/webapps/examples/jsp/sessions/carts.jsp %%T%%/webapps/examples/jsp/sessions/carts.jsp.html %%T%%/webapps/examples/jsp/sessions/crt.html %%T%%/webapps/examples/jsp/simpletag/foo.html %%T%%/webapps/examples/jsp/simpletag/foo.jsp %%T%%/webapps/examples/jsp/simpletag/foo.jsp.html %%T%%/webapps/examples/jsp/snp/snoop.html %%T%%/webapps/examples/jsp/snp/snoop.jsp %%T%%/webapps/examples/jsp/snp/snoop.jsp.html %%T%%/webapps/examples/jsp/source.jsp %%T%%/webapps/examples/jsp/source.jsp.html %%T%%/webapps/examples/jsp/tagplugin/choose.html %%T%%/webapps/examples/jsp/tagplugin/choose.jsp %%T%%/webapps/examples/jsp/tagplugin/choose.jsp.html %%T%%/webapps/examples/jsp/tagplugin/foreach.html %%T%%/webapps/examples/jsp/tagplugin/foreach.jsp %%T%%/webapps/examples/jsp/tagplugin/foreach.jsp.html %%T%%/webapps/examples/jsp/tagplugin/howto.html %%T%%/webapps/examples/jsp/tagplugin/if.html %%T%%/webapps/examples/jsp/tagplugin/if.jsp %%T%%/webapps/examples/jsp/tagplugin/if.jsp.html %%T%%/webapps/examples/jsp/tagplugin/notes.html %%T%%/webapps/examples/jsp/xml/xml.html %%T%%/webapps/examples/jsp/xml/xml.jsp %%T%%/webapps/examples/jsp/xml/xml.jsp.html %%T%%/webapps/examples/servlets/cookies.html %%T%%/webapps/examples/servlets/helloworld.html %%T%%/webapps/examples/servlets/images/code.gif %%T%%/webapps/examples/servlets/images/execute.gif %%T%%/webapps/examples/servlets/images/return.gif %%T%%/webapps/examples/servlets/index.html %%T%%/webapps/examples/servlets/reqheaders.html %%T%%/webapps/examples/servlets/reqinfo.html %%T%%/webapps/examples/servlets/reqparams.html %%T%%/webapps/examples/servlets/sessions.html %%T%%/webapps/host-manager/META-INF/context.xml %%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp %%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp %%T%%/webapps/host-manager/WEB-INF/web.xml %%T%%/webapps/host-manager/images/add.gif -%%T%%/webapps/host-manager/images/asf-logo.gif +%%T%%/webapps/host-manager/images/asf-logo.svg %%T%%/webapps/host-manager/images/code.gif %%T%%/webapps/host-manager/images/design.gif %%T%%/webapps/host-manager/images/docs.gif %%T%%/webapps/host-manager/images/fix.gif %%T%%/webapps/host-manager/images/tomcat.gif %%T%%/webapps/host-manager/images/update.gif %%T%%/webapps/host-manager/images/void.gif %%T%%/webapps/host-manager/index.jsp %%T%%/webapps/host-manager/manager.xml %%T%%/webapps/manager/META-INF/context.xml %%T%%/webapps/manager/WEB-INF/jsp/401.jsp %%T%%/webapps/manager/WEB-INF/jsp/403.jsp %%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp %%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp %%T%%/webapps/manager/WEB-INF/web.xml %%T%%/webapps/manager/images/add.gif -%%T%%/webapps/manager/images/asf-logo.gif +%%T%%/webapps/manager/images/asf-logo.svg %%T%%/webapps/manager/images/code.gif %%T%%/webapps/manager/images/design.gif %%T%%/webapps/manager/images/docs.gif %%T%%/webapps/manager/images/fix.gif %%T%%/webapps/manager/images/tomcat.gif %%T%%/webapps/manager/images/update.gif %%T%%/webapps/manager/images/void.gif %%T%%/webapps/manager/index.jsp %%T%%/webapps/manager/status.xsd %%T%%/webapps/manager/xform.xsl @dir %%T%%/endorsed @dir %%T%%/logs @dir %%T%%/work @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work @unexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 436372) +++ branches/2017Q1 (revision 436373) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r436372