head	1.5;
access;
symbols
	RELEASE_5_0_DP1:1.4
	RELEASE_4_5_0:1.1
	RELEASE_4_4_0:1.1;
locks; strict;
comment	@# @;


1.5
date	2002.04.09.19.00.54;	author znerd;	state dead;
branches;
next	1.4;

1.4
date	2002.04.01.22.01.22;	author znerd;	state Exp;
branches;
next	1.3;

1.3
date	2002.03.30.14.51.12;	author znerd;	state dead;
branches;
next	1.2;

1.2
date	2002.02.04.13.38.25;	author znerd;	state Exp;
branches;
next	1.1;

1.1
date	2001.05.20.16.08.15;	author dirk;	state Exp;
branches;
next	;


desc
@@


1.5
log
@This port moved to www/jakarta-tomcat4.
@
text
@--- conf/server.xml.orig	Sat Mar 30 18:58:31 2002
+++ conf/server.xml	Sat Mar 30 19:00:01 2002
@@@@ -10,7 +10,7 @@@@
      define subcomponents such as "Valves" or "Loggers" at this level.
  -->
 
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
+<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN" debug="0">
 
 
   <!-- A "Service" is a collection of one or more "Connectors" that share
@@@@ -51,9 +51,9 @@@@
          IP address of the remote client.
     -->
 
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
+    <!-- Define a non-SSL HTTP/1.1 Connector -->
     <Connector className="org.apache.catalina.connector.http.HttpConnector"
-               port="8080" minProcessors="5" maxProcessors="75"
+               port="%%HTTP_PORT%%" minProcessors="5" maxProcessors="75"
                enableLookups="true" redirectPort="8443"
                acceptCount="10" debug="0" connectionTimeout="60000"/>
     <!-- Note : To disable connection timeouts, set connectionTimeout value 
@@@@ -70,9 +70,9 @@@@
     </Connector>
     -->
 
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- Define an AJP 1.3 Connector -->
     <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
-               port="8009" minProcessors="5" maxProcessors="75"
+               port="%%AJP_1_3_PORT%%" minProcessors="5" maxProcessors="75"
                acceptCount="10" debug="0"/>
 
     <!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
@@@@ -310,7 +310,7 @@@@
   <Service name="Tomcat-Apache">
 
     <Connector className="org.apache.catalina.connector.warp.WarpConnector"
-     port="8008" minProcessors="5" maxProcessors="75"
+     port="%%WARP_PORT%%" minProcessors="5" maxProcessors="75"
      enableLookups="true" appBase="webapps"
      acceptCount="10" debug="0"/>
 
@


1.4
log
@Upgrade to Jakarta Tomcat 4.0.3. The Jakarta Tomcat 3
branch has moved to www/jakarta-tomcat3.

PR:	31096, 32022
@
text
@@


1.3
log
@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.
@
text
@d1 43
a43 42
--- conf/workers.properties.orig	Tue Dec 12 22:36:26 2000
+++ conf/workers.properties	Sun May 20 16:06:33 2001
@@@@ -40,20 +40,20 @@@@
 # installed tomcat. This is where you have your conf, webapps and lib
 # directories.
 #
-workers.tomcat_home=c:\jakarta-tomcat
+workers.tomcat_home=%%TOMCAT_HOME%%
 
 #
 # workers.java_home should point to your Java installation. Normally
 # you should have a bin and lib directories beneath it.
 #
-workers.java_home=c:\jdk1.2.2
+workers.java_home=%%JAVA_HOME%%
 
 #
 # You should configure your environment slash... ps=\ on NT and / on UNIX
 # and maybe something different elsewhere.
 #
-ps=\
-# ps=/
+#ps=\
+ps=/
 
 #
 #------ ADVANCED MODE ------------------------------------------------
@@@@ -166,7 +166,7 @@@@
 #
 # Javac as available from Java2SE
 #
-worker.inprocess.class_path=$(workers.java_home)$(ps)lib$(ps)tools.jar
+#worker.inprocess.class_path=$(workers.java_home)$(ps)lib$(ps)tools.jar
 
 #
 # Setting the command line for tomcat
@@@@ -182,7 +182,7 @@@@
 #
 # This is for Java2
 #
-worker.inprocess.jvm_lib=$(workers.java_home)$(ps)jre$(ps)bin$(ps)classic$(ps)jvm.dll
+#worker.inprocess.jvm_lib=$(workers.java_home)$(ps)jre$(ps)bin$(ps)classic$(ps)jvm.dll
a44 2
 #
 # And this is for jdk1.1.X
@


1.2
log
@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)
@
text
@@


1.1
log
@Give jakarta-tomcat a chance of working with mod_jk.
@
text
@d8 1
a8 1
+workers.tomcat_home=%%PREFIX%%/tomcat
d15 1
a15 1
+workers.java_home=%%PREFIX%%/jdk1.1.8
@

