0eddb52566
Tomcat 7.0.26 (markt)
Catalina
code Provide constants for commonly used Charset objects
and use these constants where appropriate. (markt)
Refactor the fix for 52184 to correct two issues (a
fix missing class and incorrect class/method names) when
using the extras logging packages. (markt)
52444: Only load classes during HandlesTypes
fix processing if the class is a match. Previously,
every class in the web application was loaded
regardless of whether it was a match or not. (markt)
fix 52488: Correct typo: exipre -> expire. (markt)
add Add a unit test for SSO authentication. Patch
provided by Brian Burch. (markt)
52511: Correct regression in the fix for 51741 that
fix caused a harmless exception to be logged when
scanning for annotations and WEB-INF/classes did not
exist. (markt)
code Refactor to remove a circular dependency between
org.apache.catalina and org.apache.naming. (markt)
Remove some initialisation code from the standard
code start process (i.e. via the scripts) that was
intended for embedding but is not required when
performing a standard start.(markt)
Add new method to MBeanFactory that allows any Valve
add to be created and deprecate the methods to create
specific Valves. (markt)
add Partial sync of MIME type mapping with mime.types
from the Apache web server. (rjung)
52577: Fix a regression in the fix for 52328.
fix Prevent output truncation when reset() is called on
a response. (mark)
52586: Remove an old and now unnecessary hack that
fix modified the path info reported via the
javax.servlet.forward.path_info request attribute
when forwarding to an error page. (markt)
52587: Ensure that if it is necessary to fall back
fix to the default NullRealm, the NullRealm instance is
created early enough for it to be correctly
initialised. (markt)
fix Fix millisecond output in AccessLogValve when using
a SimpleDateFormat based time pattern. (rjung)
52591: When dumping MBean data, skip attributes
fix where getters throw UnsupportedOperationException.
(markt)
52607: Ensure that the extension validator checks
fix the JARs in the shared and common class loaders for
extensions. (markt)
Correct a threading issue in the generation of the
list of standard authenticators during Context
fix initialization that could lead to a web application
failing to start if Contexts were started in
parallel. (markt)
52669: Correct regression that broke annotation
processing in /WEB-INF/classes for web applications
fix deployed as WARs, packageless classes and some
embedding scenarios. The regression was introduced
by the invalid assumptions made in the fix for
51741. (markt)
fix 52671: When dumping MBean data, skip attributes
where getters throw NullPointerException. (markt)
Javadocs
Coyote
51543: Provide a meaningful error message when
add writing more response headers than permitted.
(markt)
52547: Ensure that bytes written (which is used by
fix the access log) is correctly reset after an HTTP 1.0
request has been processed. (markt)
code Minor refactoring to reduce code duplication in the
HTTP connectors. (markt)
52606: Ensure that POST bodies are available for
fix reply after FORM authentication when using the AJP
connectors. (markt)
* Building
Jasper
52474: Ensure that leading and trailing white space
fix is removed from listener class names when parsing TLD
files. (markt)
52480: When converting class path entries from URLs
to files/directories, ensure that any URL encoded
fix characters are converted. Fixes JSP compilation with
javac when Tomcat is installed at a path that
includes spaces. (markt)
fix 52666: Correct coercion order in EL when processing
the equality and inequality operators. (markt)
Web applications
Improve BUILDING.txt. Update instructions for
update building. Add instructions for using Checkstyle
and running the tests. (kkolinko)
38216: Improve handling of null return values in
add the JMX proxy servlet which is part of the Manager
application. (kkolinko)
52515: Make it clear in the Realm how-to in the
fix documentation web application that digested
password storage when using DIGEST authentication
requires that MD5 digests are used. (markt)
fix 52634: Fix typos in JSP examples. Patch provided
by Felix Schumacher. (rjung)
fix 52641: Remove mentioning of ldap.jar from docs.
Patch provided by Felix Schumacher. (rjung)
jdbc-pool
Fix code style issues and enable Checkstyle checks
fix for jdbc-pool when it is built within Tomcat.
(kkolinko)
fix 51582 Correct set and reset the query cache to avoid
NPE (fhanik)
Other
Update Commons Daemon to 1.0.9 to resolve 52548 which
fix meant that services created with service.bat did not
set the catalina.home and catalina.base system
properties. (markt)
Implement check for correct end-of-line characters in
add the source files. It is run as separate target in
build.xml. (kkolinko)
105 lines
2.9 KiB
Makefile
105 lines
2.9 KiB
Makefile
# $NetBSD: Makefile,v 1.4 2012/03/05 11:18:17 abs Exp $
|
|
#
|
|
|
|
DISTNAME= apache-tomcat-${TOMCAT_VER}
|
|
CATEGORIES= www
|
|
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
|
|
|
|
MAINTAINER= pkgsrc-users@NetBSD.org
|
|
HOMEPAGE= http://tomcat.apache.org/
|
|
COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
|
|
LICENSE= apache-2.0
|
|
|
|
CONFLICTS+= jakarta-tomcat55-[0-9]*
|
|
CONFLICTS+= jakarta-tomcat-[0-9]*
|
|
|
|
NO_BUILD= yes
|
|
USE_LANGUAGES= # none
|
|
USE_JAVA= run
|
|
USE_JAVA2= 1.5
|
|
USE_TOOLS+= pax
|
|
|
|
PKG_DESTDIR_SUPPORT= destdir
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
TOMCAT_VER= 7.0.26
|
|
TOMCAT_HOME= ${PREFIX}/share/tomcat
|
|
EGDIR= ${PREFIX}/share/examples/tomcat
|
|
DOCDIR= ${PREFIX}/share/doc/tomcat
|
|
RCD_SCRIPTS= tomcat
|
|
TOMCAT_USER?= tomcat
|
|
TOMCAT_GROUP?= tomcat
|
|
USERGROUP_PHASE= pre-install
|
|
PKG_GROUPS= ${TOMCAT_GROUP}
|
|
PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
|
|
PKG_GROUPS_VARS+= TOMCAT_GROUP
|
|
PKG_USERS_VARS+= TOMCAT_USER
|
|
PKG_HOME.tomcat= ${TOMCAT_HOME}
|
|
PKG_SHELL.tomcat= ${SH}
|
|
PKG_SYSCONFDIR.tomcat= ${TOMCAT_HOME}/conf
|
|
OWN_DIRS+= ${PKG_SYSCONFDIR.tomcat}
|
|
FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_HOME=${TOMCAT_HOME} \
|
|
TOMCAT_USER=${TOMCAT_USER} TOMCAT_GROUP=${TOMCAT_GROUP}
|
|
|
|
PRIVATE_EGFILES= server.xml tomcat-users.xml
|
|
PUBLIC_EGFILES= catalina.policy catalina.properties \
|
|
context.xml logging.properties web.xml
|
|
DOCFILES= LICENSE NOTICE RELEASE-NOTES RUNNING.txt
|
|
WORK_DIRS= work temp logs
|
|
|
|
.for f in ${PRIVATE_EGFILES}
|
|
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
|
|
${TOMCAT_USER} ${TOMCAT_GROUP} 0640
|
|
.endfor
|
|
|
|
.for f in ${PUBLIC_EGFILES}
|
|
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
|
|
${TOMCAT_USER} ${TOMCAT_GROUP} 0644
|
|
.endfor
|
|
|
|
.for d in ${WORK_DIRS}
|
|
OWN_DIRS_PERMS+= ${TOMCAT_HOME}/${d} ${TOMCAT_USER} ${TOMCAT_GROUP} 0755
|
|
.endfor
|
|
|
|
INSTALLATION_DIRS+= ${TOMCAT_HOME} ${EGDIR} ${DOCDIR}
|
|
|
|
do-install:
|
|
.for d in ${WORK_DIRS}
|
|
${RM} -rf ${WRKSRC}/${d}
|
|
.endfor
|
|
|
|
.for f in ${DOCFILES}
|
|
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
|
|
${RM} -f ${WRKSRC}/${f}
|
|
.endfor
|
|
|
|
.for f in ${PRIVATE_EGFILES}
|
|
${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
|
|
${RM} -f ${WRKSRC}/conf/${f}
|
|
.endfor
|
|
|
|
.for f in ${PUBLIC_EGFILES}
|
|
${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
|
|
${RM} -f ${WRKSRC}/conf/${f}
|
|
.endfor
|
|
|
|
${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f
|
|
${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f
|
|
|
|
cd ${WRKSRC} && ${PAX} -rw -pm . ${DESTDIR}${TOMCAT_HOME}
|
|
|
|
${FIND} ${DESTDIR}${TOMCAT_HOME} -type d -print | \
|
|
${XARGS} ${CHMOD} ${PKGDIRMODE}
|
|
${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -print | \
|
|
${XARGS} ${CHMOD} ${SHAREMODE}
|
|
${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -name \*.sh -print | \
|
|
${XARGS} ${CHMOD} ${BINMODE}
|
|
|
|
${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} \
|
|
${DESTDIR}${TOMCAT_HOME}/webapps
|
|
${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} \
|
|
${DESTDIR}${TOMCAT_HOME}/conf
|
|
|
|
.include "../../mk/java-vm.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|