Commit graph

33 commits

Author SHA1 Message Date
Sam Lawrance
7593163249 Unbreak jakarta-tomcat3 by re-adding a file it requires from
the tomcat4 port.

Approved by:	portmgr (erwin)
2006-10-22 03:56:14 +00:00
Pav Lucistnik
898335a4e5 - Work around an inability of rc.subr's _find_processes() to work with
processes that show as [java] on ps output.  This should fix the rc script
  stop action for all folks.
2006-09-08 09:31:07 +00:00
Doug Barton
c49d1a3273 Remove the FreeBSD KEYWORD from all rc.d scripts where it appears.
We have not checked for this KEYWORD for a long time now, so this
is a complete noop, and thus no PORTREVISION bump. Removing it at
this point is mostly for pedantic reasons, and partly to avoid
perpetuating this anachronism by copy and paste to future scripts.
2006-02-20 20:47:50 +00:00
Sam Lawrance
b79dc1999f - Make sure the rc script creates and chowns the PID file before running
'daemon'.  No need for the port to create a PID file at install time
  (it would just be eaten by rc.d/cleanvar anyway).
- Use 'ps -o comm' to grab a suitable procname.  'ps -o command' is not
  reliable enough.
- Bump PORTREVISION since these changes fix broken rc script operation.

Approved by:	maintainer timeout (as part of previous update)
2006-02-08 13:35:17 +00:00
Sam Lawrance
314fa7a3d9 Since the procname of tomcat processes may vary due to javavmwrapper,
subvert the 'check_pid_file' procname check by setting it from the output
of 'ps'.

Remove the previous attempt at handling this problem, which was to put
a wildcard in procname.  I'll wear my pointy hat for that bogus hack.

Reported by:	Fritz Heinrichmeyer <Fritz.Heinrichmeyer@FernUni-Hagen.de>
2006-02-07 13:41:00 +00:00
Sam Lawrance
a0156c5c5b Clean up Tomcat 4, 4.1, 5, and 5.5 ports.
These changes apply to all ports, unless mentioned otherwise:

- Move jakarta-tomcat55 to tomcat55 (it is no longer a Jakarta project). [6]
- Improve the tomcat55 rc script.  Fix PID handling.  Improve the
  shutdown process.  Use USE_RC_SUBR to its full potential. [2]
- Backport tomcat55 rc script to the other tomcat ports.  This allows
  us to pass command line arguments to the JVM.  Noted in UPDATING.
  [1], [3], [4]
- Change ownership of installed files.  All files are now installed
  with default uid/gid (root:wheel) except for those in the conf/, logs/,
  temp/ and work/ directories. [5]
- No longer install tomcatXXctl binary.  rc scripts are more flexible
  and can be reconfigured without recompiling.
- Remove AUTO_START and STOP_TIMEOUT (replaced with rc tomcatXX_stop_timeout).
- Remove a long list of sed expressions in favour of SUB_LIST.
- Move pkg_{,de}install to files/pkg_{,de}install.in.  Add them to
  SUB_FILES.  Tidy up substitutions and remove hardcoded values.
- Some nonfunctional tidying and removal of Makefile cruft.

PR:		ports/38018 [1], ports/38020 [2], ports/74344 [3],
		ports/75143 [4], ports/83434 [5], ports/92692 [6]
Submitted by:	Ari Suutari <ari.suutari@syncrontech.com> [1] [2],
		SimpleRezo Team <freebsd@simplerezo.com> [3],
		Anton Yudin <toha@toha.org.ua> [4],
		Jan Grant <jan.grant@bristol.ac.uk> [5],
		lawrance [6]
Approved by:	Kang Liu <liukang@cn.freebsd.org> (maintainer) [6]
		Maintainer timeouts on [1], [2], [3], [4], [5]
Big thanks to:	hq for the initial tomcat55 script
		jasonb on FreeNode #tomcat for packaging advice
2006-02-07 08:50:09 +00:00
Herve Quiroz
ae8618d863 - Update to bsd.java.mk 2.0
- Backup config files during deinstall [1]
- Use MAN1 in Makefile [1]
- Fix pkg_add permission problem [2]
- ECHO_CMD -> ECHO_MSG [1]
- Bump PORTREVISION [1]
- Mark as DEPRECATED [1]
- Fix MASTER_SITE [1]
- Add $FreeBSD$ tags where missing [1]

PR:		75604 [1], 57235 [2]
Submitted by:	maintainer [1] [2]
2004-12-29 13:25:09 +00:00
Ernst de Haan
aa1f22138c Fixed daemonctl control program to work with the FreeBSD JDK 1.3.1.
The fix consists of 2 lines at the beginning of the program:

	setuid(geteuid());
	setgid(getegid());

Bumped PORTREVISION of Orion, Tomcat and JBoss ports.

PR:		40470, 43679
Submitted by:	Ari Suutari <ari.suutari@syncrontech.com>
Reviewed by:	audit
Approved by:	Silence on -audit (since Sept 13, 2002)
2002-10-09 23:10:32 +00:00
Ernst de Haan
8960bcb67e Reverting to revision 1.7. This change should first be audited by
audit@ since it may be bypassing security restrictions.

Pointed out by:	kris
2002-08-28 22:54:21 +00:00
Ernst de Haan
a23e6ab5b9 Executing setuid(geteuid()) to fix SUID. At the moment SUID does
not work.

Submitted by:	Ari Suutari <ari.suutari@syncrontech.com>
See:		http://www.geocrawler.com/mail/msg.php3?msg_id=9029840&list=162
2002-08-28 09:29:59 +00:00
Ernst de Haan
97f02f513a Fixed a typo. Replaced %%PORTREVISION%% with %%PORTVERSION%%.
Submitted by: Dan Hulme <dan_256@yahoo.com>
2002-08-28 09:22:01 +00:00
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
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
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
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
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
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
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
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
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
e457de7f78 Give jakarta-tomcat a chance of working with mod_jk. 2001-05-20 16:08:15 +00:00