From girgen@partitur.se  Sun Jan  2 14:02:55 2000
Return-Path: <girgen@partitur.se>
Received: from mailc.telia.com (mailc.telia.com [194.22.190.4])
	by hub.freebsd.org (Postfix) with ESMTP id 0A9BC14BCE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 Jan 2000 14:02:54 -0800 (PST)
	(envelope-from girgen@partitur.se)
Received: from d1o90.telia.com (d1o90.telia.com [195.67.216.241])
	by mailc.telia.com (8.9.3/8.9.3) with ESMTP id XAA12367
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 2 Jan 2000 23:02:52 +0100 (CET)
Received: from stordatan.telia.com (t2o90p11.telia.com [195.67.216.131])
	by d1o90.telia.com (8.8.8/8.8.8) with ESMTP id XAA23996
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 2 Jan 2000 23:02:50 +0100 (CET)
Received: (from girgen@localhost)
	by stordatan.telia.com (8.9.3/8.9.1) id XAA40815;
	Sun, 2 Jan 2000 23:02:31 +0100 (CET)
	(envelope-from girgen@partitur.se)
Message-Id: <200001022202.XAA40815@stordatan.telia.com>
Date: Sun, 2 Jan 2000 23:02:31 +0100 (CET)
From: girgen@partitur.se
Reply-To: girgen@partitur.se
To: FreeBSD-gnats-submit@freebsd.org
Subject: www/gnujsp update -> 1.0
X-Send-Pr-Version: 3.2

>Number:         15850
>Category:       ports
>Synopsis:       www/gnujsp update -> 1.0
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan  2 14:10:00 PST 2000
>Closed-Date:    Tue Jan 4 17:40:49 PST 2000
>Last-Modified:  Thu Jan  6 07:20:02 PST 2000
>Originator:     Palle Girgensohn
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
Partitur
>Environment:

	

>Description:
This is an update of gnujsp to 1.0.0.

Since they might not be completely comaptible, and the gnujsp was just
committed, I suggest committing this patch asap.
	

>How-To-Repeat:

	

>Fix:
diff -urN gnujsp/Makefile gnujsp.new/Makefile
--- gnujsp/Makefile	Fri Dec 31 21:27:06 1999
+++ gnujsp.new/Makefile	Sun Jan  2 22:53:47 2000
@@ -6,34 +6,33 @@
 # $FreeBSD: ports/www/gnujsp/Makefile,v 1.2 1999/12/31 20:27:06 steve Exp $
 #
 
-DISTNAME=	gnujsp-0.9.10
+DISTNAME=	gnujsp-1.0.0
 CATEGORIES=	www java
-MASTER_SITES=	http://www.klomp.org/gnujsp/09x/
+MASTER_SITES=	http://www.klomp.org/gnujsp/
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	${PREFIX}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
+RUN_DEPENDS=	${LOCALBASE}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
 
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
+NO_BUILD=	yes  # use the prebuilt jar files
+
 do-install:
 		${MKDIR} ${PREFIX}/share/java/classes
-		${INSTALL_DATA} ${WRKSRC}/lib/gnujsp.jar ${PREFIX}/share/java/classes
+		${INSTALL_DATA} ${WRKSRC}/lib/gnujsp10.jar ${WRKSRC}/lib/servlet-2.0-plus.jar \
+			${PREFIX}/share/java/classes
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/examples/gnujsp/org/gjt/vinny/beans
-.for file in date.jsp mailform.html sendmail.jsp \
-		session.jsp snoop.jsp \
-		org/gjt/vinny/beans/MailBean.java \
-		org/gjt/vinny/beans/MailBean.class
+		${MKDIR} ${PREFIX}/share/examples/gnujsp
 		@ cd ${WRKSRC}/examples ;\
-		 ${INSTALL_DATA} ${file} \
-		 ${PREFIX}/share/examples/gnujsp/`dirname ${file}`
-.endfor
+			${INSTALL_DATA} date.jsp snoop.jsp hello.jsp ${PREFIX}/share/examples/gnujsp
 		${MKDIR} ${PREFIX}/share/doc/gnujsp
-.for file in CHANGES INSTALL README
+.for file in CHANGES FAQ INSTALL.apache INSTALL.vqserver INSTALL.jigsaw README install.html
 		${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gnujsp
 .endfor
+		@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/gnujsp.properties.in > \
+			${PREFIX}/share/doc/gnujsp/gnujsp.properties
 .endif
 
 post-install:
diff -urN gnujsp/files/gnujsp.properties.in gnujsp.new/files/gnujsp.properties.in
--- gnujsp/files/gnujsp.properties.in	Thu Jan  1 01:00:00 1970
+++ gnujsp.new/files/gnujsp.properties.in	Sun Jan  2 22:47:46 2000
@@ -0,0 +1,47 @@
+# This is an example gnujsp properties file
+#
+# It's origin is with the INSTALL.apache document in the gnujsp-1.0.0
+# distribution, but is hacked for automagic installation on FreeBSD by
+# girgen@partitur.se
+#
+# To get started, first set up apache with jserv to function properly,
+# then add the following to your apache.conf:
+#
+#   ApJServAction .jsp /gnujsp/gnujsp
+#   ApJServMount /gnujsp /gnujsp
+#
+# and add the zone gnujsp to your jserv configuration:
+#   zones=gnujsp
+#   gnujsp.properties=%%PREFIX%%/etc/apache/gnujsp.properties
+#
+# Last, create a scratch directory for gnujsp, writable by your web
+# server userid (usually 'nobody'). The default directory path is
+# %%PREFIX%%/www/gnujsp
+
+# List of Repositories
+#######################
+
+repositories=%%PREFIX%%/share/java/classes/gnujsp10.jar
+repositories=%%PREFIX%%/share/java/classes/servlet-2.0-plus.jar
+#repositories=/home/heyl/lib/java/Acme.jar
+#repositories=/usr/local/webl-3.0/lib/WebL.jar
+
+# Classloader parameters
+#########################
+
+autoreload.classes=true
+
+# Enable servlet resourced autoreloading (properties and other 
+# loaded resources)
+autoreload.file=true
+
+
+# Servlet Aliases
+##################
+# Note: if using webl or Acme stuff, add the jars here too
+# if you added them to the repositories above (alph)
+# In my real settings I added: usepackages=true,language=de,country=de
+# but I guess you may prefer the default locale :-) (alph)
+
+servlet.gnujsp.code=org.gjt.jsp.JspServlet
+servlet.gnujsp.initArgs=checkclass=true,pagebase=%%PREFIX%%/www/data,scratchdir=%%PREFIX%%/www/gnujsp,debug=true,compiler=builtin-javac -classpath %classpath%:%scratchdir%:%%PREFIX%%/gnujsp10.jar:%%PREFIX%%/servlet-2.0-plus.jar -d %scratchdir% -deprecation %source%
diff -urN gnujsp/files/md5 gnujsp.new/files/md5
--- gnujsp/files/md5	Fri Dec 31 21:26:26 1999
+++ gnujsp.new/files/md5	Sun Jan  2 02:14:53 2000
@@ -1 +1 @@
-MD5 (gnujsp-0.9.10.tar.gz) = 2e36ac855929668d85131df1ce6cd3fc
+MD5 (gnujsp-1.0.0.tar.gz) = cb643c7acf24eeef7f9ce303e954314b
diff -urN gnujsp/pkg/COMMENT gnujsp.new/pkg/COMMENT
--- gnujsp/pkg/COMMENT	Fri Dec 31 21:26:27 1999
+++ gnujsp.new/pkg/COMMENT	Sun Jan  2 22:36:28 2000
@@ -1 +1 @@
-Implementation of Sun's Java Server Pages
+GNU implementation of Sun's Java Server Pages
diff -urN gnujsp/pkg/MESSAGE gnujsp.new/pkg/MESSAGE
--- gnujsp/pkg/MESSAGE	Fri Dec 31 21:26:27 1999
+++ gnujsp.new/pkg/MESSAGE	Sun Jan  2 22:43:39 2000
@@ -2,8 +2,26 @@
 
 GNUJSP has been installed in %%PREFIX%%/share/java/classes.
 
-Please read the INSTALL document in %%PREFIX%%/share/doc/gnujsp for
-info on how to get started.
+To get started, first set up apache with jserv to function properly,
+then add the following to your apache.conf:
+
+  ApJServAction .jsp /gnujsp/gnujsp
+  ApJServMount /gnujsp /gnujsp
+
+and add the zone gnujsp to your jserv configuration:
+  zones=gnujsp
+  gnujsp.properties=%%PREFIX%%/etc/apache/gnujsp.properties
+
+Then copy the gnujsp.properties to your apache config dir:
+cp %%PREFIX%%/share/doc/gnujsp/gnujsp.properties \
+   %%PREFIX%%/etc/apache
+
+Last, create a scratch directory for gnujsp, writable by your web
+server userid (usually 'nobody'). The default directory path is
+%%PREFIX%%/www/gnujsp
+
+If you run into problems, read the INSTALL.apache document in
+%%PREFIX%%/share/doc/gnujsp for info more info.
 
 Some examples can be found in %%PREFIX%%/share/examples/gnujsp.
 
diff -urN gnujsp/pkg/PLIST gnujsp.new/pkg/PLIST
--- gnujsp/pkg/PLIST	Fri Dec 31 21:26:28 1999
+++ gnujsp.new/pkg/PLIST	Sun Jan  2 22:00:26 2000
@@ -1,19 +1,17 @@
-share/java/classes/gnujsp.jar
+share/java/classes/gnujsp10.jar
+share/java/classes/servlet-2.0-plus.jar
 @unexec rmdir %D/share/java/classes > /dev/null 2>&1 || true
 @unexec rmdir %D/share/java > /dev/null 2>&1 || true
 share/examples/gnujsp/date.jsp
-share/examples/gnujsp/mailform.html
-share/examples/gnujsp/org/gjt/vinny/beans/MailBean.class
-share/examples/gnujsp/org/gjt/vinny/beans/MailBean.java
-share/examples/gnujsp/sendmail.jsp
-share/examples/gnujsp/session.jsp
+share/examples/gnujsp/hello.jsp
 share/examples/gnujsp/snoop.jsp
-@dirrm share/examples/gnujsp/org/gjt/vinny/beans
-@dirrm share/examples/gnujsp/org/gjt/vinny
-@dirrm share/examples/gnujsp/org/gjt
-@dirrm share/examples/gnujsp/org
 @dirrm share/examples/gnujsp
 share/doc/gnujsp/CHANGES
-share/doc/gnujsp/INSTALL
+share/doc/gnujsp/FAQ
+share/doc/gnujsp/INSTALL.apache
+share/doc/gnujsp/INSTALL.jigsaw
+share/doc/gnujsp/INSTALL.vqserver
 share/doc/gnujsp/README
+share/doc/gnujsp/install.html
+share/doc/gnujsp/gnujsp.properties
 @dirrm share/doc/gnujsp

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: steve 
Responsible-Changed-When: Sun Jan 2 17:32:24 PST 2000 
Responsible-Changed-Why:  
Misfiled PR. 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Tue Jan 4 17:40:49 PST 2000 
State-Changed-Why:  
Update committed, thanks! 

From: Palle Girgensohn <girgen@partitur.se>
To: freebsd-gnats-submit@freebsd.org, girgen@partitur.se
Cc: steve@freebsd.org, Brad Clawsie <brad@yahoo-inc.com>
Subject: Re: ports/15850: www/gnujsp update -> 1.0
Date: Thu, 06 Jan 2000 16:12:50 +0100

 Hi!
 
 This PR is closed, but the gnujsp/files/gnujsp.properties.in was never added to cvs, which breaks the port. Can someone please add it?
 
 Thanks
 Palle
 
>Unformatted:
