pier 01/08/10 07:14:16 Modified: . RELEASE-NOTES-4.0-B7.txt RELEASE-NOTES-4.0-B8.txt catalina/src/conf server-noexamples.xml.config server.xml Log: You always find those after a release. WebAppMount doesn't exist since we moved the WebApp connector to jakarta-tomcat-connectors/webapp Revision Changes Path 1.4 +2 -2 jakarta-tomcat-4.0/RELEASE-NOTES-4.0-B7.txt Index: RELEASE-NOTES-4.0-B7.txt =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.0-B7.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RELEASE-NOTES-4.0-B7.txt 2001/08/10 05:01:34 1.3 +++ RELEASE-NOTES-4.0-B7.txt 2001/08/10 14:14:15 1.4 @@ -3,7 +3,7 @@ Release Notes ============= -$Id: RELEASE-NOTES-4.0-B7.txt,v 1.3 2001/08/10 05:01:34 craigmcc Exp $ +$Id: RELEASE-NOTES-4.0-B7.txt,v 1.4 2001/08/10 14:14:15 pier Exp $ ============ @@ -292,7 +292,7 @@ configuration information in your Apache 1.3 httpd.conf file is something like this: - WebAppMount examples warpConnection /examples/ + WebAppDeploy examples warpConnection /examples/ which causes mod_webapp to automatically recognize all of your servlet mappings, security constraints, and other configuration elements. 1.2 +2 -2 jakarta-tomcat-4.0/RELEASE-NOTES-4.0-B8.txt Index: RELEASE-NOTES-4.0-B8.txt =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.0-B8.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RELEASE-NOTES-4.0-B8.txt 2001/08/10 05:40:43 1.1 +++ RELEASE-NOTES-4.0-B8.txt 2001/08/10 14:14:15 1.2 @@ -3,7 +3,7 @@ Release Notes ============= -$Id: RELEASE-NOTES-4.0-B8.txt,v 1.1 2001/08/10 05:40:43 craigmcc Exp $ +$Id: RELEASE-NOTES-4.0-B8.txt,v 1.2 2001/08/10 14:14:15 pier Exp $ ============ @@ -143,7 +143,7 @@ configuration information in your Apache 1.3 httpd.conf file is something like this: - WebAppMount examples warpConnection /examples/ + WebAppDeploy examples warpConnection /examples/ which causes mod_webapp to automatically recognize all of your servlet mappings, security constraints, and other configuration elements. 1.2 +10 -19 jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config Index: server-noexamples.xml.config =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- server-noexamples.xml.config 2001/07/15 07:51:25 1.1 +++ server-noexamples.xml.config 2001/08/10 14:14:15 1.2 @@ -198,31 +198,22 @@ </Service> <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0 - as its servlet container. This is built by following these steps: + as its servlet container. Please read the README.txt file coming with + the WebApp Module distribution on how to build it. + (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository) - - cd {TOMCAT-SRC-HOME}/connectors - - make - - (Edit "Makedefs" as needed for your installation) - - make - - su root - - cp connectors/apache-1.3/mod_webapp.so {APACHE_HOME}/libexec - - exit + To configure the Apache side, you must ensure that you have the + "ServerName" and "Port" directives defined in "httpd.conf". Then, + lines like these to the bottom of your "httpd.conf" file: - To configure the Apache side, you must ensure that you have a - "ServerName" directive defined in "httpd.conf". Then, lines like - these to the bottom of your "httpd.conf" file: - LoadModule webapp_module libexec/mod_webapp.so WebAppConnection warpConnection warp localhost:8008 - WebAppMount examples warpConnection /examples/ + WebAppDeploy examples warpConnection /examples/ - Finally, modify the "defaultHost" attribute in the "Engine" directive - below to match the "ServerName" setting defined in "https.conf". The - next time you restart Apache (after restarting Tomcat, if needed) + The next time you restart Apache (after restarting Tomcat, if needed) the connection will be established, and all applications you make - visible via "WebAppMount" directives can be accessed through Apache. - --> - + visible via "WebAppDeploy" directives can be accessed through Apache. + --> <!-- Define an Apache-Connector Service --> <Service name="Tomcat-Apache"> 1.28 +1 -2 jakarta-tomcat-4.0/catalina/src/conf/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- server.xml 2001/08/02 20:33:10 1.27 +++ server.xml 2001/08/10 14:14:15 1.28 @@ -291,9 +291,8 @@ The next time you restart Apache (after restarting Tomcat, if needed) the connection will be established, and all applications you make - visible via "WebAppMount" directives can be accessed through Apache. + visible via "WebAppDeploy" directives can be accessed through Apache. --> - <!-- Define an Apache-Connector Service --> <Service name="Tomcat-Apache">