From jhelfman@experts-exchange.com  Fri Dec 10 01:27:16 2010
Return-Path: <jhelfman@experts-exchange.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51B771065696
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Dec 2010 01:27:16 +0000 (UTC)
	(envelope-from jhelfman@experts-exchange.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 30F3D8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Dec 2010 01:27:15 +0000 (UTC)
Received: from mail.experts-exchange.com (localhost [127.0.0.1])
	by mail.experts-exchange.com (Postfix) with ESMTP id D7BCB8583D3
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Dec 2010 17:27:15 -0800 (PST)
Received: from mail.experts-exchange.com ([127.0.0.1])
	by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id gOGzDiU6Rtbf for <FreeBSD-gnats-submit@freebsd.org>;
	Thu,  9 Dec 2010 17:27:15 -0800 (PST)
Received: from experts-exchange.com (unknown [192.168.103.122])
	by mail.experts-exchange.com (Postfix) with SMTP id 9C1368583D2
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Dec 2010 17:27:15 -0800 (PST)
Received: (nullmailer pid 58120 invoked by uid 1001);
	Fri, 10 Dec 2010 01:24:13 -0000
Message-Id: <1291944253.992001.58119.nullmailer@experts-exchange.com>
Date: Thu, 09 Dec 2010 17:24:13 -0800
From: Jason Helfman <jhelfman@experts-exchange.com>
Reply-To: Jason Helfman <jhelfman@experts-exchange.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [maintainer-update] www/tomcat55: add cronolog as optional log processor for tomcat logs
X-Send-Pr-Version: 3.113
X-GNATS-Notify: jgh@experts-exchange.com

>Number:         152975
>Category:       ports
>Synopsis:       [maintainer-update] www/tomcat55: add cronolog as optional log processor for tomcat logs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 10 01:30:09 UTC 2010
>Closed-Date:    Sun Dec 12 01:09:33 UTC 2010
>Last-Modified:  Sun Dec 12 01:10:20 UTC 2010
>Originator:     Jason Helfman
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD eggman.experts-exchange.com 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
This patch adds the ability to use cronolog as an optional log processor.
Other can be added as needed.

I also changed the maintainer address. jgh is a alias to jhelfman.

>How-To-Repeat:
	
>Fix:
diff -rduN /usr/ports/www/tomcat55/Makefile tomcat55.my/Makefile
--- tomcat55/Makefile	2010-10-07 14:17:36.000000000 -0700
+++ tomcat55/Makefile	2010-12-09 10:30:54.000000000 -0800
@@ -12,9 +12,11 @@
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
-MAINTAINER=	jgh@experts-exchange.com
+MAINTAINER=	jhelfman@experts-exchange.com
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
+OPTIONS=	CRONOLOG "Use Cronolog for Tomcat Log Processing" Off
+
 USE_JAVA=	yes
 JAVA_VERSION?=	1.4+
 JAVA_VENDOR?=	freebsd
@@ -38,7 +40,8 @@
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${WRKSRC}/conf/server.xml
+REPLACE_FILES=	${WRKSRC}/bin/catalina.sh \
+		${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
@@ -77,6 +80,18 @@
 PLIST_SUB+=	JAVA14="@comment "
 .endif
 
+.if defined(WITH_CRONOLOG)
+REDIRECT?=     "2\>\&1"
+SUB_LIST+=     LOG_PROCESSOR=${LOG_PROCESSOR} \
+	       LOG_PROCESSOR_DIRECTIVES=${LOG_PROCESSOR_DIRECTIVES} \
+	       LOG_PROCESSOR_OPTS=${LOG_PROCESSOR_OPTS} \
+	       REDIRECT=${REDIRECT}
+RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog
+LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out"
+LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog 
+LOG_PROCESSOR_OPTS?= --link
+.endif
+
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
@@ -90,6 +105,10 @@
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
+.if defined(WITH_CRONOLOG)
+	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/logprocessor-cronolog
+.endif
+
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
 	@${RMDIR} ${WRKSRC}/bin/[i,x]64
@@ -109,6 +128,7 @@
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
+	@${CP} ${WRKDIR}/catalina.sh ${WRKSRC}/bin/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
diff -rduN /usr/ports/www/tomcat55/files/logprocessor-cronolog tomcat55.my/files/logprocessor-cronolog
--- /dev/null	1969-12-31 16:00:00.000000000 -0800
+++ tomcat55/files/logprocessor-cronolog	2010-12-08 18:00:40.000000000 -0800
@@ -0,0 +1,74 @@
+--- bin/catalina.sh.orig	2010-09-04 12:53:47.000000000 -0700
++++ bin/catalina.sh	2010-12-08 16:10:30.000000000 -0800
+@@ -245,7 +245,9 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-        org.apache.catalina.startup.Bootstrap "$@" start
++	org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++	| "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
++
+     else
+       exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+@@ -253,7 +255,8 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-        org.apache.catalina.startup.Bootstrap "$@" start
++	org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++	| "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+     fi
+   fi
+ 
+@@ -272,14 +275,16 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+   else
+     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+   fi
+ 
+ elif [ "$1" = "start" ] ; then
+@@ -298,8 +303,8 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start \
+-      >> "$CATALINA_OUT" 2>&1 &
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+ 
+       if [ ! -z "$CATALINA_PID" ]; then
+         echo $! > $CATALINA_PID
+@@ -310,8 +315,8 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start \
+-      >> "$CATALINA_OUT" 2>&1 &
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+ 
+       if [ ! -z "$CATALINA_PID" ]; then
+         echo $! > $CATALINA_PID
+@@ -332,7 +337,8 @@
+     -Dcatalina.base="$CATALINA_BASE" \
+     -Dcatalina.home="$CATALINA_HOME" \
+     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-    org.apache.catalina.startup.Bootstrap "$@" stop
++    org.apache.catalina.startup.Bootstrap "$@" stop %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+ 
+   if [ $FORCE -eq 1 ]; then
+     if [ ! -z "$CATALINA_PID" ]; then
>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Fri Dec 10 01:30:17 UTC 2010 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152975 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Dec 10 01:30:25 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152975 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jgh@experts-exchange.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/152975: [maintainer-update] www/tomcat55: add cronolog as optional log processor for tomcat logs
Date: Fri, 10 Dec 2010 01:30:22 UT

 Maintainer of www/tomcat55,
 
 Please note that PR ports/152975 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/152975
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Jason Helfman <jhelfman@e-e.com>
To: edwin@FreeBSD.org
Cc: jhelfman@experts-exchange.com, freebsd-ports-bugs@FreeBSD.org, bug-followup@freebsd.org
Subject: Re: ports/152975: [maintainer-update] www/tomcat55: add cronolog as
 optional log processor for tomcat logs
Date: Thu, 9 Dec 2010 17:42:18 -0800

 I'm good with this. I sent this from my other email address.
 jgh = jhelfman
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Fri Dec 10 02:21:19 UTC 2010 
State-Changed-Why:  
Submitter is maintainer from another address. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152975 
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Sat Dec 11 00:05:43 UTC 2010 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152975 

From: Jason Helfman <jhelfman@e-e.com>
To: pgollucci@FreeBSD.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/152975: [maintainer-update] www/tomcat55: add cronolog as
 optional log processor for tomcat logs
Date: Fri, 10 Dec 2010 17:56:41 -0800

 My apologies. This should receive a bump.
 
 +PORTREVISION= 1
 
 -jgh
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Sun Dec 12 01:09:32 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152975 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152975: commit references a PR
Date: Sun, 12 Dec 2010 01:09:33 +0000 (UTC)

 pgollucci    2010-12-12 01:09:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/tomcat55         Makefile distinfo 
   Log:
   - Allow cronolog
   - Update MAINTAINER email
   - Remove MD5
   - Bump PORTREVISION
   
   PR:             ports/152975
   Submitted by:   Jason Helfman <jhelfman@experts-exchange.com> (maintainer)
   
   Revision  Changes    Path
   1.56      +23 -2     ports/www/tomcat55/Makefile
   1.26      +0 -4      ports/www/tomcat55/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
