Update to 7.0.4 release.

This commit is contained in:
Alex Dupre 2010-10-26 08:20:15 +00:00
parent 3a0afc777d
commit 7a2f226323
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=263606
4 changed files with 17 additions and 9 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= tomcat
PORTVERSION= 7.0.2
PORTVERSION= 7.0.4
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-7/v${PORTVERSION}-beta/bin

View File

@ -1,3 +1,3 @@
MD5 (apache-tomcat-7.0.2.tar.gz) = 43b5ba6aec55dd9a30957e035d0aac5f
SHA256 (apache-tomcat-7.0.2.tar.gz) = 9f48fffa64b16f4bb65701c467d73a068b4598110a5db66ef0bf347b32c37667
SIZE (apache-tomcat-7.0.2.tar.gz) = 7022527
MD5 (apache-tomcat-7.0.4.tar.gz) = 340d45b6fb906f6c9a585c2a15167daf
SHA256 (apache-tomcat-7.0.4.tar.gz) = 000ca894359f41cfa15ba250ff440b78914ab88ab8cee59b4abc9e3d5fc63585
SIZE (apache-tomcat-7.0.4.tar.gz) = 7066612

View File

@ -136,19 +136,27 @@ tomcat_stop() {
tomcat_status() {
rc_pid=$(tomcat_check_pidfile $pidfile)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0
echo "${name} not running? (check $pidfile)."
if [ -n "$rc_pid" ]; then
echo "${name} is running as pid $rc_pid."
else
echo "${name} is not running."
return 1
fi
}
tomcat_poll() {
rc_pid=$(tomcat_check_pidfile $pidfile)
_prefix=
while (true) ; do
rc_pid=$(tomcat_check_pidfile $pidfile)
[ -z "$rc_pid" ] && break
echo -n ${_prefix:-"Waiting for PIDS: "}$rc_pid
_prefix=", "
sleep 2
done
if [ -n "$_prefix" ]; then
echo "."
fi
}
tomcat_check_pidfile() {

View File

@ -62,7 +62,7 @@
%%T%%/webapps/ROOT/asf-logo-wide.gif
%%T%%/webapps/ROOT/build.xml
%%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