Date: Wed, 29 Mar 2017 19:31:54 +0000 (UTC) From: Matthew Rezny <rezny@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437225 - in head/www: . tomcat85 tomcat85/files Message-ID: <201703291931.v2TJVsKc038899@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rezny Date: Wed Mar 29 19:31:53 2017 New Revision: 437225 URL: https://svnweb.freebsd.org/changeset/ports/437225 Log: Add Apache Tomcat 8.5 port Apache Tomcat version 8.5 implements the Servlet 3.1, JavaServer Pages 2.3, Java Unified Expression Language 3.0 and Java WebSocket 1.1 specifications from the Java Community Process, and includes many additional features that make it a useful platform for developing and deploying web applications and web services. Tomcat 8.5 is aligned with Java EE 7. PR: 215290 Submitted by: vvd@unislabs.com Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D10127 Added: head/www/tomcat85/ - copied from r436707, head/www/tomcat8/ head/www/tomcat85/files/tomcat85.in - copied, changed from r436707, head/www/tomcat8/files/tomcat8.in Deleted: head/www/tomcat85/files/tomcat8.in Modified: head/www/Makefile head/www/tomcat85/Makefile head/www/tomcat85/distinfo head/www/tomcat85/pkg-descr head/www/tomcat85/pkg-plist Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Wed Mar 29 19:18:34 2017 (r437224) +++ head/www/Makefile Wed Mar 29 19:31:53 2017 (r437225) @@ -2207,6 +2207,7 @@ SUBDIR += tomcat6 SUBDIR += tomcat7 SUBDIR += tomcat8 + SUBDIR += tomcat85 SUBDIR += tomee SUBDIR += trac SUBDIR += trac-OhlohWidgetsMacro Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat8/Makefile Wed Mar 22 16:07:53 2017 (r436707) +++ head/www/tomcat85/Makefile Wed Mar 29 19:31:53 2017 (r437225) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.0.41 +PORTVERSION= 8.5.12 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin -PKGNAMESUFFIX= 8 +PKGNAMESUFFIX= 85 DISTNAME= apache-${PORTNAME}-${PORTVERSION} -MAINTAINER= ale@FreeBSD.org -COMMENT= Open-source Java web server by Apache, 8.x branch +MAINTAINER= vvd@unislabs.com +COMMENT= Open-source Java web server by Apache, 8.5.x branch LICENSE= APACHE20 @@ -29,7 +29,8 @@ TOMCAT_SUBDIR?= ${DISTNAME:R} TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} TOMCAT_CONF_FILES= \ catalina.policy catalina.properties context.xml logging.properties \ - server.xml tomcat-users.xml tomcat-users.xsd web.xml + server.xml tomcat-users.xml tomcat-users.xsd web.xml \ + jaspic-providers.xml jaspic-providers.xsd PLIST_SUB= T=${TOMCAT_SUBDIR} \ WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} Modified: head/www/tomcat85/distinfo ============================================================================== --- head/www/tomcat8/distinfo Wed Mar 22 16:07:53 2017 (r436707) +++ head/www/tomcat85/distinfo Wed Mar 29 19:31:53 2017 (r437225) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487233810 -SHA256 (apache-tomcat-8.0.41.tar.gz) = a57204b5434755b5767299bbcd32e3afd2d6327cafa6b8372077f824aa7176d7 -SIZE (apache-tomcat-8.0.41.tar.gz) = 9254743 +TIMESTAMP = 1490321344 +SHA256 (apache-tomcat-8.5.12.tar.gz) = 6d2cad1b595d0cc8083f9bbbb73c359d611249c7eaf283c40cb4ae4ca9c4644a +SIZE (apache-tomcat-8.5.12.tar.gz) = 9353658 Copied and modified: head/www/tomcat85/files/tomcat85.in (from r436707, head/www/tomcat8/files/tomcat8.in) ============================================================================== --- head/www/tomcat8/files/tomcat8.in Wed Mar 22 16:07:53 2017 (r436707, copy source) +++ head/www/tomcat85/files/tomcat85.in Wed Mar 29 19:31:53 2017 (r437225) @@ -3,63 +3,63 @@ # $FreeBSD$ # -# PROVIDE: tomcat8 +# PROVIDE: tomcat85 # REQUIRE: LOGIN # KEYWORD: shutdown # -# Configuration settings for tomcat8 in /etc/rc.conf: +# Configuration settings for tomcat85 in /etc/rc.conf: # -# tomcat8_enable (bool): +# tomcat85_enable (bool): # Set to "NO" by default. -# Set it to "YES" to enable tomcat8 +# Set it to "YES" to enable tomcat85 # -# tomcat8_catalina_base (str) +# tomcat85_catalina_base (str) # Set to "%%TOMCAT_HOME%%" by default. # Set the CATALINA_BASE variable for the Tomcat process # -# tomcat8_catalina_tmpdir (str) +# tomcat85_catalina_tmpdir (str) # Set to "${catalina.base}/temp" by default. # Set the CATALINA_TMPDIR variable for the Tomcat process # -# tomcat8_stdout (str) +# tomcat85_stdout (str) # Set to "${catalina.base}/logs/catalina.out" by default. # Set the stdout redirection. It may also be '/dev/null', '&1' or '&2' # -# tomcat8_stderr (str) +# tomcat85_stderr (str) # Set to "&1" by default. # Set the stderr redirection. It may also be '/dev/null', '&1' or '&2' # -# tomcat8_pipe_cmd (str): +# tomcat85_pipe_cmd (str): # Set to "" by default. # Set a piped command to process stdout/stderr when passthru # -# tomcat8_logging_manager (str): +# tomcat85_logging_manager (str): # Set to "org.apache.juli.ClassLoaderLogManager" by default. # Set the JUL log manager # -# tomcat8_logging_config (str): +# tomcat85_logging_config (str): # Set to "${catalina.base}/conf/logging.properties" by default. # Set the JUL config file # -# tomcat8_java_home (str): +# tomcat85_java_home (str): # Set to "%%JAVA_HOME%%" by default. # Specify the Java VM to use. # -# tomcat8_classpath (str): +# tomcat85_classpath (str): # Set to "" by default. # Addtional classes to add to the CLASSPATH. If set, must start with ':' # -# tomcat8_java_opts (str): +# tomcat85_java_opts (str): # Set to "" by default. # Java VM args to use. # -# tomcat8_wait (int): +# tomcat85_wait (int): # Set to "30" by default. # Set the wait time (in seconds) for Tomcat process startup # # You may symlink this script with other names to run multiple -# instances of tomcat8 with different configurations. +# instances of tomcat85 with different configurations. # . /etc/rc.subr Modified: head/www/tomcat85/pkg-descr ============================================================================== --- head/www/tomcat8/pkg-descr Wed Mar 22 16:07:53 2017 (r436707) +++ head/www/tomcat85/pkg-descr Wed Mar 29 19:31:53 2017 (r437225) @@ -1,9 +1,9 @@ Apache Tomcat is a web server written in 100% Pure Java. -Apache Tomcat version 8.0 implements the Servlet 3.1, JavaServer Pages 2.3, -Java Unified Expression Language 3.0 and Java WebSocket 1.0 specifications +Apache Tomcat version 8.5 implements the Servlet 3.1, JavaServer Pages 2.3, +Java Unified Expression Language 3.0 and Java WebSocket 1.1 specifications from the Java Community Process, and includes many additional features that make it a useful platform for developing and deploying web applications and -web services. Tomcat 8 is aligned with Java EE 7. +web services. Tomcat 8.5 is aligned with Java EE 7. WWW: http://tomcat.apache.org/ Modified: head/www/tomcat85/pkg-plist ============================================================================== --- head/www/tomcat8/pkg-plist Wed Mar 22 16:07:53 2017 (r436707) +++ head/www/tomcat85/pkg-plist Wed Mar 29 19:31:53 2017 (r437225) @@ -22,6 +22,8 @@ @sample %%T%%/conf/catalina.policy.sample @sample %%T%%/conf/catalina.properties.sample @sample %%T%%/conf/context.xml.sample +@sample %%T%%/conf/jaspic-providers.xml.sample +@sample %%T%%/conf/jaspic-providers.xsd.sample @sample %%T%%/conf/logging.properties.sample @sample %%T%%/conf/server.xml.sample @sample %%T%%/conf/tomcat-users.xml.sample @@ -37,10 +39,11 @@ %%T%%/lib/catalina-storeconfig.jar %%T%%/lib/catalina-tribes.jar %%T%%/lib/catalina.jar -%%T%%/lib/ecj-4.5.1.jar +%%T%%/lib/ecj-4.6.1.jar %%T%%/lib/el-api.jar %%T%%/lib/jasper-el.jar %%T%%/lib/jasper.jar +%%T%%/lib/jaspic-api.jar %%T%%/lib/jsp-api.jar %%T%%/lib/servlet-api.jar %%T%%/lib/tomcat-api.jar @@ -135,9 +138,11 @@ %%T%%/webapps/docs/config/globalresources.html %%T%%/webapps/docs/config/host.html %%T%%/webapps/docs/config/http.html +%%T%%/webapps/docs/config/http2.html %%T%%/webapps/docs/config/index.html %%T%%/webapps/docs/config/jar-scan-filter.html %%T%%/webapps/docs/config/jar-scanner.html +%%T%%/webapps/docs/config/jaspic.html %%T%%/webapps/docs/config/listeners.html %%T%%/webapps/docs/config/loader.html %%T%%/webapps/docs/config/manager.html @@ -263,9 +268,6 @@ %%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 @@ -296,6 +298,8 @@ %%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.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/http2/SimpleImagePush.class +%%T%%/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.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 @@ -580,12 +584,6 @@ %%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/chat/index.jsp -%%T%%/webapps/examples/servlets/chat/index.jsp.html -%%T%%/webapps/examples/servlets/chat/login.jsp -%%T%%/webapps/examples/servlets/chat/login.jsp.html -%%T%%/webapps/examples/servlets/chat/post.jsp -%%T%%/webapps/examples/servlets/chat/post.jsp.html %%T%%/webapps/examples/servlets/cookies.html %%T%%/webapps/examples/servlets/helloworld.html %%T%%/webapps/examples/servlets/images/code.gif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703291931.v2TJVsKc038899>