Commit graph

48 commits

Author SHA1 Message Date
Ernst de Haan
156b71b59f Changed daemonctl program to check if the JAR file exists before
trying to start the JVM. This is a serious usability improvement.
Bumped PORTREVISION.
2002-05-08 22:00:04 +00:00
Ernst de Haan
15db7d6349 Improved the startup script. Always displaying a space first
before the name of the application being started/stopped. The
advantage is that if there is an error, then the message will
have a space prepended instead of being appended to the previous
application name.
When the application is 'stop'ped, the error messages, if any,
are now hidden. Instead the name of the application is just
shown.
Bumped PORTREVISION.
2002-05-08 21:54:06 +00:00
Ernst de Haan
98af9f9735 Now using generic startup.sh and daemonctl.c that will be
shared among other ports, like www/orion, www/jboss2 and
www/jakarta-tomcat3.

Now displaying installation settings in pre-patch phase.
Customizing files using ${SED} in post-patch phase.

Furthermore some small changes to promote consistency and
genericity. I'm attempting to make the result of

   $ diff -ruN --exclude=CVS jakarta-tomcat3 jakarta-tomcat4

as small as possible.

Bumped PORTREVISION to help portupgrade in doing what it
does best ;)
2002-04-15 21:34:42 +00:00
Ernst de Haan
d0d77b1ada Daemon control program now checks if process is really
terminated. If not, it will send the process a SIGKILL
after a certain time-out period. The time-out can be
passed to the port Makefile as a parameter.

Improved documentation a bit here and there.

Added some explicit casts to make lint(1) a bit
happier :-)

Applied some refactoring here and there. Moved some
functionality into a new function 'existsProcess'.

Slightly changed the output of the program.

Bumped PORTREVISION.
2002-04-08 21:50:23 +00:00
Ernst de Haan
f50f786a29 Made the daemon control program less verbose.
Bumped PORTREVISION.

Prompted by:	Kees Jan Koster <K.J.Koster@kpn.com>
2002-04-08 19:19:32 +00:00
Ernst de Haan
77a1003364 Now installs the shell scripts as well. They were previously
not installed because there was the control program tomcat4ctl
already. For some instances, however, tomcat4ctl is not
powerful enough. For instance when setting up multiple
instances of Tomcat, see
http://jakarta.apache.org/tomcat/tomcat-4.0-doc/RUNNING.txt.

Also added tools.jar to pkg-plist. It should have been added
previously.

Bumped PORTREVISION.

Prompted by:	Gavin Cameron <gavin@itworks.com.au>
2002-04-06 20:16:21 +00:00
Ernst de Haan
f8bd9d89d3 Improved package comment (IMO). 2002-04-04 22:52:30 +00:00
Ernst de Haan
411b78699b Fixed a problem where the extracted files would
sometimes (?) be looked for in the directory
'work/work' instead of just 'work'.
Bumped PORTREVISION.
2002-04-04 22:48:18 +00:00
Ernst de Haan
92502db7fc Creating symlink to tools.jar. Bumped PORTREVISION.
Prompted by:	Calvin NG <calvinng@brel.com>
2002-04-04 22:03:26 +00:00
Ernst de Haan
2684781e36 Minor cleanup. 2002-04-03 21:28:50 +00:00
Ernst de Haan
d0f2cbece8 Now checking for the Java VM too in the control
program. Bumped PORTREVISION.
2002-04-03 20:42:07 +00:00
Ernst de Haan
144c6b62ca Little generalization and cleanup. Nothing
spectacular. Not bumped PORTREVISION.
2002-04-03 19:49:27 +00:00
Ernst de Haan
2297db65d5 Upgrade to Jakarta Tomcat 4.0.3. The Jakarta Tomcat 3
branch has moved to www/jakarta-tomcat3.

PR:	31096, 32022
2002-04-01 22:01:22 +00:00
Ernst de Haan
91dae29ec0 Changed a message to make it more generic. 2002-03-30 21:08:55 +00:00
Ernst de Haan
9380d814ea Replacing the man page title (in capitals) in order
to make the man page fully generic for jakarta-tomcat,
jakarta-tomcat4, orion and possibly others.

PORTREVISION is not bumped, since the resulting man
page is exactly the same.
2002-03-30 19:53:18 +00:00
Ernst de Haan
f8b311d639 Now replacing STARTUP_SCRIPT in man page. Bumped PORTREVISION again. 2002-03-30 18:51:01 +00:00
Ernst de Haan
fb6cc4416b Stopping the server from pkg-deinstall. Applying
replacements to server.xml. Bumped PORTREVISION.
2002-03-30 18:42:23 +00:00
Ernst de Haan
784972ffc4 Removed reference to workers.properties since it no
longer exists. Bumped PORTREVISION.
2002-03-30 18:15:21 +00:00
Ernst de Haan
5542a04479 Removed reference to non-existent ${FILESDIR}/MANIFEST.MF.
Bumped PORTREVISION.
2002-03-30 16:45:40 +00:00
Ernst de Haan
00af56ae88 Lot of changes: Using USE_JAVA infrastructure. Upgraded port
to 3.3.1. Using HTTP_PORT i.s.o. LISTEN_PORT. Using
daemonctl.c i.s.o. tomcatctl shell script. Displaying steps
i.s.o. commands being executed. Synced man page.
2002-03-30 14:51:12 +00:00
Ernst de Haan
81068d260f Now sets the CLASSPATH *after* JAVA_HOME is determined.
Reported by: Clive Lin <clive@tongi.org>
2002-02-25 08:02:51 +00:00
Ernst de Haan
b1b733982c Fixed the man page for tomcatctl. 2002-02-21 20:31:20 +00:00
Ernst de Haan
dfdf0d65e0 Checks for the existence of a 'www' user and group. Forgot to add
this file during the last commit. :-\
2002-02-21 20:08:30 +00:00
Ernst de Haan
229c3f67eb Cleaned things up. Made things working :-) Both the startup script
in ${PREFIX}/etc/rc.d and the control script in ${PREFIX}/bin have
been refactored and now actually work very well.

Using the 'www' user and group, creating them if they don't exist.
I've used the same approach as www/apache13.

STDOUT_LOG and STDERR_LOG are now fixed (no ?= anymore) since the
package deinstall does not support a different location.

This fixes the first half of PR 28624.
See: http://www.freebsd.org/cgi/query-pr.cgi?pr=34931

Reported by:	Kees Jan Koster <k.j.koster@kpn.com>
2002-02-21 20:06:55 +00:00
Ernst de Haan
02e7b57e58 Upgraded from Jakarta 3.2.3 to 3.2.4.
Not using DIST_SUBDIR anymore.
2002-02-21 11:03:08 +00:00
Ernst de Haan
715750fbb4 Added bin/tomcatctl. 2002-02-21 09:23:29 +00:00
Ernst de Haan
a7d50013bc Startup script to be installed in ${PREFIX}/etc/rc.d/. 2002-02-21 08:59:45 +00:00
Ernst de Haan
2eb2f9877a Reverting changes. Accidentally committed *all* changes in my working copy, instead of only removing the second APP_TITLE from the Makefile. 2002-02-19 13:53:41 +00:00
Ernst de Haan
7995f8fd5d Reverting changes. Accidentally committed *all* changes in my working copy, instead of only removing the second APP_TITLE. Bumped the PORTREVISION. 2002-02-19 13:52:30 +00:00
Ernst de Haan
5416e71b19 APP_TITLE was set twice.
Reported by: Kimura Fuyuki <fuyuki@mj.0038.net>
2002-02-19 08:20:39 +00:00
Ernst de Haan
0312f191f2 Fixed control script name. It's 020.jakarta-tomcat.sh.
Reported by: Yoichi NAKAYAMA <yoichi@FreeBSD.org>
2002-02-04 14:11:06 +00:00
Ernst de Haan
bafcc62545 Run when deinstalling Tomcat. It will stop Tomcat, if it is running. 2002-02-04 13:40:56 +00:00
Ernst de Haan
5a6112469e Now using tomcatctl instead of tomcat.sh 2002-02-04 13:40:10 +00:00
Ernst de Haan
1fbe096f64 A new tomcatctl control script, installed in /bin. 2002-02-04 13:39:20 +00:00
Ernst de Haan
f62ea0b0a3 A lot of changes:
* Bumped PORTREVISION
* Now displays installation settings
* Now possible to choose JDK. By default uses FreeBSD JDK 1.3.1 (instead of FreeBSD JDK 1.1.8)
* Does not depend on pinstall anymore
* Now possible to change TOMCAT_HOME. By default uses /jakarta-tomcat-3.2.3 (instead of /tomcat)
* Now possible to change LISTEN_PORT. Default is 8080 (unchanged)
* Added support for running Tomcat as a different user/group. By default a new user 'tomcat' and a new group 'tomcat' are created and used
* A 'tomcatctl' script is installed in /usr/local/bin/, which uses interprocess communication to start/stop/restart Tomcat
* Option is added for automatically starting Tomcat after install (AUTO_START). By default Tomcat is started right away
* Appends stdout and stderr to log files
* Uses a numeric prefix for the script in /etc/rc.d (now by default 020.jakarta-tomcat.sh instead of tomcat.sh)
2002-02-04 13:38:25 +00:00
Akinori MUSHA
4adc5a8a71 Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command;
the ECHO macro is set to "echo" by default, but it is set to "true" if
make(1) is invoked with the -s option while ECHO_CMD is always set to
the echo command.
2002-01-29 12:08:37 +00:00
Dirk Froemberg
a47260d708 Give maintainership to znerd. 2001-11-23 17:08:42 +00:00
Michael Haro
e278fc13a2 MASTER_SITE moved
Approved by: maintainer
2001-10-01 21:01:46 +00:00
Dirk Froemberg
8fc93c2651 Upgrade to 3.2.3. 2001-08-05 09:37:23 +00:00
Dirk Froemberg
71e52831aa - provide startup script
- log tomcat messages to a file (logs/tomcat.log)
- fix plist
2001-05-21 08:05:38 +00:00
Dirk Froemberg
a63fee938c Give jakarta-tomcat a chance of working with mod_jk. 2001-05-20 17:10:56 +00:00
Dirk Froemberg
e457de7f78 Give jakarta-tomcat a chance of working with mod_jk. 2001-05-20 16:08:15 +00:00
Dirk Froemberg
4ca853343c Upgrade to 3.2.1.
PR:		ports/26027
Submitted by:	Michael Lyngbøl <michael@lyngbol.dk>
2001-04-08 13:09:03 +00:00
Dirk Froemberg
ca70f4b736 Overtake maintainership. 2001-04-08 12:00:16 +00:00
Dag-Erling Smørgrav
ad828e3f3c It ain't me. 2001-04-07 17:05:22 +00:00
Satoshi Asami
616454aa41 javac is in a jdk version specific directory, not ${LOCALBASE}/bin, so
spell it out.

Submitted by:	bento
2000-11-14 00:07:47 +00:00
Dag-Erling Smørgrav
c6986263ef Remove some .bat files from packing list 2000-10-21 19:12:12 +00:00
Dag-Erling Smørgrav
cfd3cc7695 The Apache Project's Jakarta Tomcat web server. 2000-10-21 14:44:26 +00:00