cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
hgomez 2002/10/18 03:23:16 Modified:jk/native/apache-2.0 mod_jk.c jk/native/apache-1.3 mod_jk.c Log: make sure that servername/serverport will works with VirtualHost with or without UseCanonicalName. Providd by [EMAIL PROTECTED], and validated by Mladen which does it the same way in jk2... Revision ChangesPath 1.57 +8 -6 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- mod_jk.c 10 Sep 2002 15:08:13 - 1.56 +++ mod_jk.c 18 Oct 2002 10:23:15 - 1.57 @@ -479,13 +479,15 @@ ); /* get server name */ -s-server_name= (char *)(r-hostname ? r-hostname : - r-server-server_hostname); - +/* s-server_name= (char *)(r-hostname ? r-hostname : r-server-server_hostname); */ +/* XXX : à la jk2 */ + s-server_name = ap_get_server_name(r); /* get the real port (otherwise redirect failed) */ -apr_sockaddr_port_get(port,r-connection-local_addr); -s-server_port = port; +/* apr_sockaddr_port_get(port,r-connection-local_addr); */ +/* s-server_port = port; */ +/* XXX : à la jk2 */ + s-server_port = ap_get_server_port(r); s-server_software = (char *)ap_get_server_version(); 1.30 +11 -3 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mod_jk.c 30 Jul 2002 02:13:04 - 1.29 +++ mod_jk.c 18 Oct 2002 10:23:15 - 1.30 @@ -466,9 +466,17 @@ s-remote_host = NULL_FOR_EMPTY(s-remote_host); s-remote_addr = NULL_FOR_EMPTY(r-connection-remote_ip); -s-server_name = (char *)(r-hostname ? r-hostname : r-server-server_hostname); + +/* get server name */ +/* s-server_name = (char *)(r-hostname ? r-hostname : r-server-server_hostname); */ +/* XXX : à la jk2 */ + s-server_name = ap_get_server_name(r); -s-server_port = htons( r-connection-local_addr.sin_port ); +/* get the real port (otherwise redirect failed) */ +/* s-server_port = htons( r-connection-local_addr.sin_port ); */ +/* XXX : à la jk2 */ + s-server_port = ap_get_server_port(r); + s-server_software = (char *)ap_get_server_version(); s-method = (char *)r-method; -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh
hgomez 2002/10/15 03:31:21 Modified:catalina/src/bin catalina.sh Log: Fix $CATALINA_TMPDIR in Cygwin, submitted by Peter Romianowski Revision ChangesPath 1.32 +2 -1 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh Index: catalina.sh === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- catalina.sh 18 Jul 2002 07:44:22 - 1.31 +++ catalina.sh 15 Oct 2002 10:31:21 - 1.32 @@ -100,6 +100,7 @@ JAVA_HOME=`cygpath --path --windows $JAVA_HOME` CATALINA_HOME=`cygpath --path --windows $CATALINA_HOME` CATALINA_BASE=`cygpath --path --windows $CATALINA_BASE` + CATALINA_TMPDIR=`cygpath --path --windows $CATALINA_TMPDIR` CLASSPATH=`cygpath --path --windows $CLASSPATH` JSSE_HOME=`cygpath --path --windows $JSSE_HOME` fi -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java
hgomez 2002/10/08 23:58:31 Modified:jk/java/org/apache/jk/common ChannelSocket.java Log: tcpnodelay to true by default, but could be turned off by setting tcpnodelay=false from outside (howto in server.xml ?) Revision ChangesPath 1.23 +3 -3 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java Index: ChannelSocket.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ChannelSocket.java4 Oct 2002 23:33:14 - 1.22 +++ ChannelSocket.java9 Oct 2002 06:58:31 - 1.23 @@ -105,7 +105,7 @@ int port=startPort; InetAddress inet; int serverTimeout; -boolean tcpNoDelay=false; +boolean tcpNoDelay=true; // nodelay to true by default int linger=100; int socketTimeout; @@ -259,8 +259,8 @@ s.setSoLinger( true, linger); if( socketTimeout 0 ) s.setSoTimeout( socketTimeout ); -if( tcpNoDelay ) -s.setTcpNoDelay( true ); + +s.setTcpNoDelay( tcpNoDelay ); // set socket tcpnodelay state requestCount++; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/common AJPv13-extensions-proposal.xml AJPv14-proposal.xml
hgomez 2002/10/07 00:47:49 Added: jk/xdocs/common AJPv13-extensions-proposal.xml Removed: jk/xdocs/common AJPv14-proposal.xml Log: Change ajp14 ref to ajp13 extensions Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/common/AJPv13-extensions-proposal.xml Index: AJPv13-extensions-proposal.xml === ?xml version=1.0? document properties titleAJPv13 extensions Proposal/title author email=[EMAIL PROTECTED]Henri Gomez/author date$Date: 2002/09/20 21:35:31 $/date /properties section name=Introduction p This document is a proposal of evolution of the current Apache JServ Protocol version 1.3, also known as ajp13. I'll not cover here the full protocol but only the add-on from ajp13. This nth pass include comments from the tomcat-dev list and misses discovered during developpment. /p subsection name=Missing features in AJP13 p ajp13 is a good protocol to link a servlet engine like tomcat to a web server like Apache: ul li use persistants connections to avoid reconnect time at each request /li li encode many http commands to reduce stream size /li li send to servlet engine many info from web server (like SSL certs) /li /ul p But ajp13 lacks support for : /p ul li security between web server and servlet engine. Anybody can connect to an ajp13 port (no login mecanism used) You could connect, for example with telnet, and keep the remote thread up by not sending any data (no timeout in connection) /li li context information passed from servlet engine to web server. Part of the configuration of JK, the web server connector, is to indicate to the web server which URI to handle. The mod_jk JkMount directive, told to web server which URI must be forwarded to servlet engine. A servlet engine allready knows which URI it handle and TC 3.3 is allready capable to generate a config file for JK from the list of available contexts. /li li state update of contexts from servlet engine to web server. Big site with farm of Tomcat, like ISP and virtuals hosters, may need to stop a context for admin purposes. In that case the front web server must know that the context is currently down, to eventually relay the request to another Tomcat /li li verify state of connection before sending request. Actually JK send the request to the servlet engine and next wait for the answer. But one of the beauty of the socket API, is you that you could write() to a closed connection without any error reporting, but a read() to a closed connection return you the error code. /li /ul /p /subsection subsection name=Proposed add-ons to AJP13 p Let's descrive here the features and add-on that could be added to AJP13. Since this document is a proposal, a reasonable level of chaos must be expected at first. Be sure that discussion on tomcat list will help clarify points, add features but the current list seems to be a 'minimun vital' ul li Advanced login features at connect time /li li Basic authorisation system, where a shared secret key is present in web server and servlet engine. /li li Basic protocol negociation, just to be sure that if functionnalities are added to AJP13 in the future, current implementations will still works. /li li Clean handling of 'Unknown packets' /li li Extended env vars passed from web-server to servlet engine. /li li Add extra SSL informations needed by Servlet 2.3 API (like SSL_KEY_SIZE) /li /ul /p /subsection subsection name=Advanced login p ol li WEB-SERVER send LOGIN INIT CMD + NEGOCIATION DATA + WEB SERVER INFO /li li TOMCAT respond with LOGIN SEED CMD + RANDOM DATA /li li WEB-SERVER calculted the MD5 of RANDOM DATA+SECRET DATA /li li WEB-SERVER send LOGIN COMP CMD + MD5 (SECRET DATA + RANDOM DATA) /li li TOMCAT respond with LOGIN STATUS CMD + NEGOCIED DATA + SERVLET ENGINE INFO /li /ol To prevent DOS attack, the servlet engine will wait the LOGIN CMD only 15/30 seconds and reports the timeout exception for admins investigation. The login command will contains basic protocol negociation information like compressing ability, crypto, context info (at start up), context update at run-time (up/down), level of SSL env vars, AJP protocol level supported (level1/level2/level3...) The Web server info will contain web server info and connector name (ie Apache 1.3.26 + mod_ssl 2.8.8 + mod_jk 1.2.0 + mod_perl 1.25). The servlet engine will mask the negociation mask with it's own mask (what it can do) and return it when loggin is accepted. This will help having a basic AJP13 implementation (level 1) on a web-server working
cvs commit: jakarta-tomcat-connectors/jk/xdocs menu.idx.in
hgomez 2002/10/07 00:47:59 Modified:jk/xdocs menu.idx.in Log: Change ajp14 ref to ajp13 extensions Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-connectors/jk/xdocs/menu.idx.in Index: menu.idx.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/menu.idx.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menu.idx.in 20 Sep 2002 15:43:01 - 1.1 +++ menu.idx.in 7 Oct 2002 07:47:59 - 1.2 @@ -12,7 +12,7 @@ section name=Commons document href=common/AJPv13.xml/ - document href=common/AJPv14-proposal.xml/ + document href=common/AJPv13-extensions-proposal.xml/ document href=faq.xml/ /section -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 installhowto.xml
hgomez 2002/10/07 00:48:42 Modified:jk/xdocs/jk2 installhowto.xml Log: Update documentation for jk2 and apache 1.3 Revision ChangesPath 1.4 +43 -4 jakarta-tomcat-connectors/jk/xdocs/jk2/installhowto.xml Index: installhowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/installhowto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- installhowto.xml 26 Sep 2002 08:29:25 - 1.3 +++ installhowto.xml 7 Oct 2002 07:48:42 - 1.4 @@ -1,7 +1,7 @@ ?xml version=1.0? document properties -titleInstallation of mod_jk2 in the Web Server/title +titleInstallation of jk2 in the Web Server/title author email=[EMAIL PROTECTED]Jean-Frederic Clere/author date$Date$/date /properties @@ -13,16 +13,55 @@ These files have to be copied in the right location of the web server installation. /p -subsection name=Apache 1/ +p + JNI support in JK2 require APR, which is provded in Apache 2.0, and is + available for many platforms, so Apache 1.3, IIS and NES/iPlanet should be + able to use it +/p +subsection name=Apache 1.3 + p +In the following example Apache-1.3 is installed in +/home/apache13/ and the commands are executed in +the jakarta-tomcat-connectors directory. + /p + p +Apache 1.3 require APR, and if APR has been built with pthread support +and your Apache 1.3 wasn't (general case in Unix platforms) you should : +ul +li +Rebuild Apache 1.3 with pthread support (recommanded) +/li +li +Add the LoadFile /usr/lib/pthread.so in beginning of your httpd.conf +/li +/ul + /p + p +You should also ensure that the linker will be able to locate the apr shared libraries, +codelibapr.so/code, and codelibaprutil.so/code, make sure they have been installed +in linker search locations. + /p + screen +noteCopy the dso files in the modules location:/note +typecp jk/build/jk2/apache13/mod_jk2.so /home/apache13/modules/type +noteCopy jkjni.so if you're using JNI/note +typecp jk/build/jk2/apache13/jkjni.so /home/apache13/modules/type +noteYou may have to add pthread library in the httpd.conf:/note +readLoadFile /usr/lib/pthread.so/read +noteAdd mod_jk2 loading in the httpd.conf/note +readLoadModule jk2_module modules/mod_jk2.so/read + /screen +/subsection subsection name=Apache 2 p In the following example Apache-2.0 is installed in -/home/apache20/apache40 and the commands are excuted in +/home/apache20/apache40 and the commands are executed in the jakarta-tomcat-connectors directory. /p screen noteCopy the dso files in the modules location:/note typecp jk/build/jk2/apache2/mod_jk2.so /home/apache20/apache40/modules/type +noteCopy jkjni.so if you're using JNI/note typecp jk/build/jk2/apache2/jkjni.so /home/apache20/apache40/modules/type noteAdd mod_jk2 loading in the httpd.conf:/note readLoadModule jk2_module modules/mod_jk2.so/read -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qcsrc
hgomez 2002/10/01 03:35:10
Modified:jk/native/apache-2.0 bldjk.qcsrc
Log:
Fix misc errors CL
Revision ChangesPath
1.3 +4 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qcsrc
Index: bldjk.qcsrc
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qcsrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bldjk.qcsrc 30 Sep 2002 15:43:37 - 1.2
+++ bldjk.qcsrc 1 Oct 2002 10:35:10 - 1.3
@@ -97,7 +97,7 @@
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include')
-CRTCMOD MODULE(MOD_JK/JNI_WORKER) +
+CRTCMOD MODULE(MOD_JK/JK_JNI_WOR) +
SRCSTMF('/home/apache/jk/native/common/jk_jni_worker.c') +
DEFINE('AS400' 'HAVE_JNI' 'OS400_JVM_12' 'USE_APACHE_MD5') +
TEXT('jk_jni_worker.c') +
@@ -105,8 +105,9 @@
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG )+
-INCDIR('/home/apache/jk/native/common')
-
+INCDIR('/home/apache/jk/native/common' +
+ '/QIBM/ProdData/HTTPA/Include')
+
CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
SRCSTMF('/home/apache/jk/native/common/jk_lb_worker.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5') +
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
hgomez 2002/10/01 03:41:50 Modified:jk/native/common jk_global.h Log: iSeries need USE_VSPRINTF and USE_SPRINTF Revision ChangesPath 1.24 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_global.h 30 Sep 2002 15:40:18 - 1.23 +++ jk_global.h 1 Oct 2002 10:41:49 - 1.24 @@ -213,7 +213,7 @@ #define vsnprintf _vsnprintf #endif -#ifdef NETWARE +#if defined(NETWARE) || defined(AS400) #define USE_SPRINTF #define USE_VSPRINTF #endif -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_version.h
hgomez 2002/10/01 03:45:57 Modified:jk/native/common jk_version.h Log: Set version to mod_jk 1.2.1 beta Revision ChangesPath 1.4 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_version.h Index: jk_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_version.h 13 Oct 2001 17:36:36 - 1.3 +++ jk_version.h 1 Oct 2002 10:45:57 - 1.4 @@ -68,13 +68,13 @@ #define JK_VERMAJOR 1 #define JK_VERMINOR 2 #define JK_VERFIX 0 -#define JK_VERSTRING1.2.0 +#define JK_VERSTRING1.2.1 /* Beta number */ #define JK_VERBETA 1 #define JK_BETASTRING 1 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 /** END OF AREA TO MODIFY BEFORE RELEASING */ #define PACKAGE mod_jk/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qcsrc
hgomez 2002/10/01 04:01:30 Modified:jk/native/apache-2.0 bldjk.qcsrc Log: mod_jk module missing in CRTSRVPGM Revision ChangesPath 1.4 +2 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qcsrc Index: bldjk.qcsrc === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qcsrc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bldjk.qcsrc 1 Oct 2002 10:35:10 - 1.3 +++ bldjk.qcsrc 1 Oct 2002 11:01:30 - 1.4 @@ -208,7 +208,8 @@ '/QIBM/ProdData/HTTPA/Include') CRTSRVPGM SRVPGM(MOD_JK/MOD_JK) + - MODULE(MOD_JK/JK_AJP_COM MOD_JK/JK_AJP12_W + + MODULE(MOD_JK/MOD_JK + + MOD_JK/JK_AJP_COM MOD_JK/JK_AJP12_W + MOD_JK/JK_AJP13 MOD_JK/JK_AJP13_W + MOD_JK/JK_AJP14 MOD_JK/JK_AJP14_W + MOD_JK/JK_CONNECT MOD_JK/JK_CONTEXT + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 KEYS
hgomez 2002/09/30 02:43:46 Modified:.KEYS Log: Remove my obsolete PGP key Revision ChangesPath 1.2 +0 -16 jakarta-tomcat-5/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-5/KEYS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- KEYS 18 Sep 2002 07:19:35 - 1.1 +++ KEYS 30 Sep 2002 09:43:46 - 1.2 @@ -14,22 +14,6 @@ Type Bits/KeyIDDate User ID -pub 1024/697ECEDD 2000/04/06 Henri Gomez [EMAIL PROTECTED] - *** RPM SIGNING KEY *** --BEGIN PGP PUBLIC KEY BLOCK- -Version: 2.6.3i - -mQCNAzjsydwAAAEEAMpwFU/ci3/wR3ryCGp9Exr+Rx/hTQ7hWAJcVw8ejlBXlT4T -yITlRUs0HGfRWxME2J55PuXXsIEPZzjfozNtvOyq8WlLlJ7iaiyWxVRoPJ25sSEj -C9etm6wjj4E66ZgzuElZkm1m69uEsCHPPNuz1oQ/g1O+SmIVxIYirlxpfs7dAAUR -tBxIZW5yaSBHb21leiA8aGdvbWV6QHNsaWIuZnI+iQCVAwUQOOzJ3IYirlxpfs7d -AQFQyQQAj0D9G0hEL7SQGaSCkkoXwvamQw42N8+tNm+jfWHWdE4HAiVlhJmI2GyD -sdcXVAcR8R7ILIRB5AY7a3bF+qMk0r+vO6oR878RKKn9AvtaAIOnrh6tr0tiPwf5 -XDUMySxIWJEF3SmJAy9Lq3bAl5GMzZCFHiS0NW2gtWgmr/u1RuM= -=6l+I --END PGP PUBLIC KEY BLOCK- - -Type Bits/KeyIDDate User ID pub 2048/F22C4FED 2001/07/02 Andy Armstrong [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 KEYS
hgomez 2002/09/30 02:45:38 Modified:.KEYS Log: Remove my obsolete PGP key Revision ChangesPath 1.2 +2 -17 jakarta-tomcat-4.0/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-4.0/KEYS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- KEYS 18 Sep 2002 07:18:55 - 1.1 +++ KEYS 30 Sep 2002 09:45:38 - 1.2 @@ -14,22 +14,6 @@ Type Bits/KeyIDDate User ID -pub 1024/697ECEDD 2000/04/06 Henri Gomez [EMAIL PROTECTED] - *** RPM SIGNING KEY *** --BEGIN PGP PUBLIC KEY BLOCK- -Version: 2.6.3i - -mQCNAzjsydwAAAEEAMpwFU/ci3/wR3ryCGp9Exr+Rx/hTQ7hWAJcVw8ejlBXlT4T -yITlRUs0HGfRWxME2J55PuXXsIEPZzjfozNtvOyq8WlLlJ7iaiyWxVRoPJ25sSEj -C9etm6wjj4E66ZgzuElZkm1m69uEsCHPPNuz1oQ/g1O+SmIVxIYirlxpfs7dAAUR -tBxIZW5yaSBHb21leiA8aGdvbWV6QHNsaWIuZnI+iQCVAwUQOOzJ3IYirlxpfs7d -AQFQyQQAj0D9G0hEL7SQGaSCkkoXwvamQw42N8+tNm+jfWHWdE4HAiVlhJmI2GyD -sdcXVAcR8R7ILIRB5AY7a3bF+qMk0r+vO6oR878RKKn9AvtaAIOnrh6tr0tiPwf5 -XDUMySxIWJEF3SmJAy9Lq3bAl5GMzZCFHiS0NW2gtWgmr/u1RuM= -=6l+I --END PGP PUBLIC KEY BLOCK- - -Type Bits/KeyIDDate User ID pub 2048/F22C4FED 2001/07/02 Andy Armstrong [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- @@ -124,7 +108,8 @@ Type bits keyID Date User ID -pub 1024D/307A10A5 2002-07-18 Henri Gomez [EMAIL PROTECTED] +pub 1024D/307A10A5 2002-07-18 Henri Gomez *** RPM SIGNING KEY *** + [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.0.6 (GNU/Linux) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 KEYS
hgomez 2002/09/30 02:56:40 Modified:.KEYS Log: Indicate the RPM signing key Revision ChangesPath 1.3 +2 -1 jakarta-tomcat-5/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-5/KEYS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- KEYS 30 Sep 2002 09:43:46 - 1.2 +++ KEYS 30 Sep 2002 09:56:40 - 1.3 @@ -108,7 +108,8 @@ Type bits keyID Date User ID -pub 1024D/307A10A5 2002-07-18 Henri Gomez [EMAIL PROTECTED] +pub 1024D/307A10A5 2002-07-18 Henri Gomez *** RPM SIGNING KEY *** + [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.0.6 (GNU/Linux) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors KEYS
hgomez 2002/09/30 02:58:45 Modified:.KEYS Log: Remove obsolete (revoked) key and indicate the RPM signing key Revision ChangesPath 1.7 +2 -17 jakarta-tomcat-connectors/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-connectors/KEYS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- KEYS 18 Sep 2002 07:18:25 - 1.6 +++ KEYS 30 Sep 2002 09:58:45 - 1.7 @@ -14,22 +14,6 @@ Type Bits/KeyIDDate User ID -pub 1024/697ECEDD 2000/04/06 Henri Gomez [EMAIL PROTECTED] - *** RPM SIGNING KEY *** --BEGIN PGP PUBLIC KEY BLOCK- -Version: 2.6.3i - -mQCNAzjsydwAAAEEAMpwFU/ci3/wR3ryCGp9Exr+Rx/hTQ7hWAJcVw8ejlBXlT4T -yITlRUs0HGfRWxME2J55PuXXsIEPZzjfozNtvOyq8WlLlJ7iaiyWxVRoPJ25sSEj -C9etm6wjj4E66ZgzuElZkm1m69uEsCHPPNuz1oQ/g1O+SmIVxIYirlxpfs7dAAUR -tBxIZW5yaSBHb21leiA8aGdvbWV6QHNsaWIuZnI+iQCVAwUQOOzJ3IYirlxpfs7d -AQFQyQQAj0D9G0hEL7SQGaSCkkoXwvamQw42N8+tNm+jfWHWdE4HAiVlhJmI2GyD -sdcXVAcR8R7ILIRB5AY7a3bF+qMk0r+vO6oR878RKKn9AvtaAIOnrh6tr0tiPwf5 -XDUMySxIWJEF3SmJAy9Lq3bAl5GMzZCFHiS0NW2gtWgmr/u1RuM= -=6l+I --END PGP PUBLIC KEY BLOCK- - -Type Bits/KeyIDDate User ID pub 2048/F22C4FED 2001/07/02 Andy Armstrong [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- @@ -124,7 +108,8 @@ Type bits keyID Date User ID -pub 1024D/307A10A5 2002-07-18 Henri Gomez [EMAIL PROTECTED] +pub 1024D/307A10A5 2002-07-18 Henri Gomez *** RPM SIGNING KEY *** + [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.0.6 (GNU/Linux) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 build.xml
hgomez 2002/09/30 03:46:06
Modified:.build.xml
Log:
Set servlet.doc, usefull when building with api/docs in custom location, ie
rpm packaging
Revision ChangesPath
1.76 +2 -1 jakarta-tomcat-4.0/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- build.xml 21 Sep 2002 16:24:17 - 1.75
+++ build.xml 30 Sep 2002 10:46:06 - 1.76
@@ -18,6 +18,7 @@
property name=jtc.project value=jakarta-tomcat-connectors /
property name=jtc.final.namevalue=${jtc.project}-${version} /
property name=jtc.final-src.namevalue=${jtc.project}-${version}-src /
+ property name=servlet.docvalue=${servlet.home}/docs/api /
!-- Build Defaults --
property name=catalina.build value=${basedir}/catalina/build/
@@ -212,7 +213,7 @@
/copy
mkdir dir=${tomcat.dist}/webapps/tomcat-docs/servletapi/
copy todir=${tomcat.dist}/webapps/tomcat-docs/servletapi
- fileset dir=${servlet.home}/docs/api /
+ fileset dir=${servlet.doc} /
/copy
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c jk_global.h
hgomez 2002/09/30 08:40:18 Modified:jk/native/common jk_jni_worker.c jk_global.h Log: Just got my iSeries V5R1 loaded with apache 2.0.39, and hunting for remaining bugs Revision ChangesPath 1.22 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c Index: jk_jni_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_jni_worker.c 25 Sep 2002 08:33:04 - 1.21 +++ jk_jni_worker.c 30 Sep 2002 15:40:17 - 1.22 @@ -62,7 +62,7 @@ * Version: $Revision$ * ***/ -#if !defined(WIN32) !defined(NETWARE) +#if !defined(WIN32) !defined(NETWARE) !defined(AS400) #include dlfcn.h #endif 1.23 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_global.h 24 Sep 2002 22:34:08 - 1.22 +++ jk_global.h 30 Sep 2002 15:40:18 - 1.23 @@ -178,6 +178,8 @@ /* Check for Apache 2.0 running on an EBCDIC system */ #if APR_CHARSET_EBCDIC +#include util_ebcdic.h + #define USE_CHARSET_EBCDIC #define jk_xlate_to_ascii(b, l) ap_xlate_proto_to_ascii(b, l) #define jk_xlate_from_ascii(b, l) ap_xlate_proto_from_ascii(b, l) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
hgomez 2002/09/30 09:00:04
Modified:jk/native/common jk_jni_worker.c
Log:
More update to JNI support for iSeries.
OS400 compiler is more strict with pointers and there is many assumption
here (like gcc like this pointer - int - jlong) which make me think that
the code here should be seriously studied (in jk2 ;)
Revision ChangesPath
1.23 +28 -14jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_jni_worker.c 30 Sep 2002 15:40:17 - 1.22
+++ jk_jni_worker.c 30 Sep 2002 16:00:04 - 1.23
@@ -107,7 +107,11 @@
jint (JNICALL *jni_get_default_java_vm_init_args)(void *) = NULL;
jint (JNICALL *jni_create_java_vm)(JavaVM **, JNIEnv **, void *) = NULL;
+#ifdef AS400
+jint (JNICALL *jni_get_created_java_vms)(JavaVM **, long, long *) = NULL;
+#else
jint (JNICALL *jni_get_created_java_vms)(JavaVM **, int, int *) = NULL;
+#endif
#define TC33_JAVA_BRIDGE_CLASS_NAME (org/apache/tomcat/modules/server/JNIEndpoint)
#define TC32_JAVA_BRIDGE_CLASS_NAME (org/apache/tomcat/service/JNIEndpoint)
@@ -337,8 +341,14 @@
p-worker-jk_service_method,
/* [V] For some reason gcc likes this pointer - int - jlong conversion, */
/* but not the direct pointer - jlong conversion. I hope it's okay. */
+#ifdef AS400
+s,
+l
+#else
(jlong)(int)s,
-(jlong)(int)l);
+(jlong)(int)l
+#endif
+);
/* [V] Righ now JNIEndpoint::service() only returns 1 or 0 */
if(rc) {
@@ -533,9 +543,9 @@
/* if(env = attach_to_jvm(p,l)) { */
if((env = p-tmp_env)) {
-jstring cmd_line = NULL;
-jstring stdout_name = NULL;
-jstring stderr_name = NULL;
+jstring cmd_line = (jstring)NULL;
+jstring stdout_name = (jstring)NULL;
+jstring stderr_name = (jstring)NULL;
jint rc = 0;
/* AS400/BS2000 need EBCDIC to ASCII conversion for JNI */
@@ -699,11 +709,11 @@
private_data-was_initialized = JK_FALSE;
private_data-jvm = NULL;
private_data-tmp_env = NULL;
-private_data-jk_java_bridge_object = NULL;
-private_data-jk_java_bridge_class = NULL;
-private_data-jk_startup_method = NULL;
-private_data-jk_service_method = NULL;
-private_data-jk_shutdown_method= NULL;
+private_data-jk_java_bridge_object = (jobject)NULL;
+private_data-jk_java_bridge_class = (jclass)NULL;
+private_data-jk_startup_method = (jmethodID)NULL;
+private_data-jk_service_method = (jmethodID)NULL;
+private_data-jk_shutdown_method= (jmethodID)NULL;
private_data-tomcat_cmd_line = NULL;
private_data-tomcat_classpath = NULL;
private_data-bridge_type= TC33_BRIDGE_TYPE;
@@ -1045,7 +1055,11 @@
err=jni_create_java_vm((p-jvm), penv, vm_args);
if (JNI_EEXIST == err) {
-int vmCount;
+#ifdef AS400
+long vmCount;
+#else
+int vmCount;
+#endif
jk_log(l, JK_LOG_DEBUG, JVM alread instantiated.
Trying to attach instead.\n);
@@ -1118,7 +1132,7 @@
strdup_ascii(p-p, ()V)); /*
method sign */
if(!constructor_method_id) {
- p-jk_java_bridge_class = NULL;
+ p-jk_java_bridge_class = (jclass)NULL;
jk_log(l, JK_LOG_EMERG,
Can't find constructor\n);
return JK_FALSE;
@@ -1128,7 +1142,7 @@
p-jk_java_bridge_class,
constructor_method_id);
if(! p-jk_java_bridge_object) {
- p-jk_java_bridge_class = NULL;
+ p-jk_java_bridge_class = (jclass)NULL;
jk_log(l, JK_LOG_EMERG,
Can't create new bridge object\n);
return JK_FALSE;
@@ -1137,8 +1151,8 @@
p-jk_java_bridge_object = (jobject)(*env)-NewGlobalRef(env,
p-jk_java_bridge_object);
if(! p-jk_java_bridge_object) {
jk_log(l, JK_LOG_EMERG, Can't create global ref to bridge object\n);
- p-jk_java_bridge_class = NULL;
-p-jk_java_bridge_object = NULL;
+ p-jk_java_bridge_class = (jclass)NULL;
+p-jk_java_bridge_object = (jobject)NULL;
return JK_FALSE;
}
--
To unsubscribe, e-mail: mailto:[EMAIL
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl.in
hgomez 2002/09/27 23:06:37
Modified:jk/xdocs style.xsl.in
Added: jk/xdocs/images mod_jk.jpg
Removed: jk/xdocs/images mod_jk.jpeg
Log:
Change from .jpeg to .jpg to avoid problem with misconfigured CVS
clients which broke the .jpeg in at least TC 4.1.12 release tarball
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/xdocs/images/mod_jk.jpg
Binary file
1.14 +1 -1 jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- style.xsl.in 26 Sep 2002 12:50:49 - 1.13
+++ style.xsl.in 28 Sep 2002 06:06:37 - 1.14
@@ -102,7 +102,7 @@
img src={$images}/jakarta.gif border=0 width=270
height=75 align=left/
/td
td align=right
-img src={$images}/mod_jk.jpeg border=0 align=right/
+img src={$images}/mod_jk.jpg border=0 align=right/
/td
/tr
/table
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c
hgomez 2002/09/26 02:26:20
Modified:jk/native2/common jk_uriEnv.c
Log:
First pass to try to fix jk2_uriEnv_parserName in non APR case
Revision ChangesPath
1.31 +3 -0 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_uriEnv.c 24 Sep 2002 07:58:22 - 1.30
+++ jk_uriEnv.c 26 Sep 2002 09:26:20 - 1.31
@@ -135,6 +135,9 @@
}
else
uri = strchr(host, '/');
+
+uriEnv-uri = uri;
+
if (!uri) {
/* That's a virtual host definition ( no actual mapping, just global
* settings like aliases, etc
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl.in
hgomez 2002/09/26 05:50:49 Modified:jk/xdocs style.xsl.in Log: Developpers documentation link will be added only if build.xml set gen-dev-doc Revision ChangesPath 1.13 +4 -0 jakarta-tomcat-connectors/jk/xdocs/style.xsl.in Index: style.xsl.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- style.xsl.in 20 Sep 2002 21:35:31 - 1.12 +++ style.xsl.in 26 Sep 2002 12:50:49 - 1.13 @@ -26,6 +26,7 @@ xsl:variable name=sub-banner-fg select='@sub-banner-fg@'/ xsl:variable name=table-th-bg select='@table-th-bg@'/ xsl:variable name=table-td-bg select='@table-td-bg@'/ + xsl:variable name=gen-dev-doc select='@gen-dev-doc@'/ !-- Match the ROOT of the source document and process its document element. @@ -201,6 +202,7 @@ tr height=6/ /xsl:for-each + xsl:if test=$gen-dev-doc = true !-- The last thing to put down in the index are the API docs, both for C and for Java @@ -224,6 +226,8 @@ /nobr /td /tr + /xsl:if + /table /td -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/26 05:54:56
Modified:jk build.xml
Log:
native docs for developpers, need to be generated and for now
scandoc didn't find good tags in jk (unsure for jk2).
links to api-c and api-java disabled by default
Revision ChangesPath
1.57 +5 -6 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- build.xml 23 Sep 2002 10:04:24 - 1.56
+++ build.xml 26 Sep 2002 12:54:56 - 1.57
@@ -13,6 +13,7 @@
property name=jk.build location=${basedir}/build/
property name=build.docs location=${basedir}/build/docs/
property name=source.docs location=./xdocs/
+property name=gen.dev.doc value=false/
!-- Compile options --
property name=optimize value=off /
@@ -397,14 +398,12 @@
replace file=${destfile} token=@body-link@ value=${body-link}/
replace file=${destfile} token=@banner-bg@ value=${banner-bg}/
replace file=${destfile} token=@banner-fg@ value=${banner-fg}/
-replace file=${destfile} token=@sub-banner-bg@
- value=${sub-banner-bg}/
-replace file=${destfile} token=@sub-banner-fg@
- value=${sub-banner-fg}/
+replace file=${destfile} token=@sub-banner-bg@ value=${sub-banner-bg}/
+replace file=${destfile} token=@sub-banner-fg@ value=${sub-banner-fg}/
replace file=${destfile} token=@table-th-bg@ value=${table-th-bg}/
replace file=${destfile} token=@table-td-bg@ value=${table-td-bg}/
-replace file=${destfile} token=@source-color@
- value=${source-color}/
+replace file=${destfile} token=@source-color@ value=${source-color}/
+replace file=${destfile} token=@gen-dev-doc@ value=${gen.dev.doc}/
/target
!--
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/26 06:08:38 Modified:jk build.xml Log: Don't copy .idx.in to generated doc dir Revision ChangesPath 1.58 +1 -0 jakarta-tomcat-connectors/jk/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- build.xml 26 Sep 2002 12:54:56 - 1.57 +++ build.xml 26 Sep 2002 13:08:38 - 1.58 @@ -453,6 +453,7 @@ exclude name=**/*.samples/ exclude name=**/*.xsl/ exclude name=**/*.idx/ +exclude name=**/*.idx.in/ exclude name=**/images/originals/**/ /fileset /copy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c jk_config_file.c jk_channel_jni.c
hgomez 2002/09/25 00:42:29
Modified:jk/native2/common jk_pool.c jk_config_file.c
jk_channel_jni.c
Log:
More AS/400/BS2000 back ports, notably to help JNI on EBCDIC systems
Revision ChangesPath
1.12 +28 -2 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_pool.c 24 Sep 2002 22:40:02 - 1.11
+++ jk_pool.c 25 Sep 2002 07:42:29 - 1.12
@@ -103,6 +103,10 @@
static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
+static void *jk2_pool_strdup2ascii(jk_env_t *env, jk_pool_t *p, const char *s);
+
+static void *jk2_pool_strdup2ebcdic(jk_env_t *env, jk_pool_t *p, const char *s);
+
static void *jk2_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void
*old,
size_t old_sz);
@@ -139,6 +143,8 @@
_this-alloc=jk2_pool_alloc;
_this-calloc=jk2_pool_calloc;
_this-pstrdup=jk2_pool_strdup;
+_this-pstrdup2ascii=jk2_pool_strdup2ascii;
+_this-pstrdup2ebcdic=jk2_pool_strdup2ebcdic;
_this-realloc=jk2_pool_realloc;
*newPool = _this;
@@ -255,7 +261,7 @@
return rc;
}
-static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
+static void *jk2_pool_a_strdup(jk_env_t *env, jk_pool_t *p, const char *s, int
convmode)
{
char *rc = NULL;
if(s p) {
@@ -270,9 +276,29 @@
memcpy(rc, s, size);
}
rc[size]='\0';
+
+if (convmode == 1)
+ jk_xlate_to_ascii(rc, size);
+else if (convmode == 2)
+ jk_xlate_from_ascii(rc, size);
}
return rc;
+}
+
+static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
+{
+ return (jk2_pool_a_strdup(env, p, s, 0);
+}
+
+static void *jk2_pool_strdup2ascii(jk_env_t *env, jk_pool_t *p, const char *s)
+{
+ return (jk2_pool_a_strdup(env, p, s, 1);
+}
+
+static void *jk2_pool_strdup2ebcdic(jk_env_t *env, jk_pool_t *p, const char *s)
+{
+ return (jk2_pool_a_strdup(env, p, s, 2);
}
/*
1.6 +10 -0 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Index: jk_config_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_config_file.c 24 Sep 2002 22:37:13 - 1.5
+++ jk_config_file.c 25 Sep 2002 07:42:29 - 1.6
@@ -62,6 +62,10 @@
* @author: Costin Manolache
*/
+#ifdef AS400
+#include apr_xlate.h
+#endif
+
#include jk_global.h
#include jk_map.h
#include jk_pool.h
@@ -136,7 +140,13 @@
static void jk2_trim_prp_comment(char *prp)
{
+#ifdef AS400
+char *comment;
+ /* lots of lines that translate a '#' realtime deleted */
+comment = strchr(prp, *APR_NUMBERSIGN);
+#else
char *comment = strchr(prp, '#');
+#endif
if(comment) {
*comment = '\0';
}
1.34 +28 -7 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_channel_jni.c 14 Jul 2002 13:36:03 - 1.33
+++ jk_channel_jni.c 25 Sep 2002 07:42:29 - 1.34
@@ -78,6 +78,7 @@
#include jni.h
/* default only, is configurable now */
+
#define JAVA_BRIDGE_CLASS_NAME (org/apache/jk/apr/AprImpl)
#define JNI_TOMCAT_STARTED 2
@@ -108,6 +109,19 @@
} jk_ch_jni_ep_private_t;
+/*
+ Duplicate string and convert it to ASCII on EBDIC based systems
+ Needed for at least AS/400 and BS2000 but what about other EBDIC systems ?
+*/
+static void *strdup_ascii(jk_env_t *env,
+ char *s)
+{
+#if defined(AS400) || defined(_OSD_POSIX)
+ return (env-tmpPool-pstrdup2ascii(env, env-tmpPool, s));
+#else
+ return (env-tmpPool-pstrdup(env, env-tmpPool, s));
+#endif
+}
static int JK_METHOD jk2_channel_jni_init(jk_env_t *env,
jk_bean_t *jniWB)
@@ -188,7 +202,8 @@
endpoint-channelData=epData;
-jniCh-jniBridge = (*jniEnv)-FindClass(jniEnv, jniCh-className );
+/* AS400/BS2000 need EBCDIC to ASCII conversion for JNI */
+jniCh-jniBridge = (*jniEnv)-FindClass(jniEnv
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_pool.h
hgomez 2002/09/25 00:42:36 Modified:jk/native2/include jk_pool.h Log: More AS/400/BS2000 back ports, notably to help JNI on EBCDIC systems Revision ChangesPath 1.8 +7 -1 jakarta-tomcat-connectors/jk/native2/include/jk_pool.h Index: jk_pool.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_pool.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_pool.h 22 May 2002 23:42:32 - 1.7 +++ jk_pool.h 25 Sep 2002 07:42:36 - 1.8 @@ -105,6 +105,8 @@ typedef long long jk_pool_atom_t; #elif defined(IRIX) typedef long long jk_pool_atom_t; +#elif defined(AS400) +typedef void * jk_pool_atom_t; #else typedef long long jk_pool_atom_t; #endif @@ -148,6 +150,10 @@ void *(*calloc)(struct jk_env *env, jk_pool_t *_this, size_t size); void *(*pstrdup)(struct jk_env *env, jk_pool_t *_this, const char *s); + +void *(*pstrdup2ascii)(struct jk_env *env, jk_pool_t *_this, const char *s); + +void *(*pstrdup2ebcdic)(struct jk_env *env, jk_pool_t *_this, const char *s); /** Points to the private data. In the case of APR, it's a apr_pool you can use directly */ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
hgomez 2002/09/25 01:33:04
Modified:jk/native/common jk_jni_worker.c
Log:
remove use of #pragma and use dynamic ebcdic-ascii conversion, make
it less iSeries specific
Revision ChangesPath
1.21 +14 -41jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_jni_worker.c 20 Sep 2002 23:17:47 - 1.20
+++ jk_jni_worker.c 25 Sep 2002 08:33:04 - 1.21
@@ -249,8 +249,8 @@
/*
- Duplicate string and convert it to ASCII on EBDIC based system
- Needed for at least AS/400, BS2000 and what about other EBDIC systems ?
+ Duplicate string and convert it to ASCII on EBDIC based systems
+ Needed for at least AS/400 and BS2000 but what about other EBDIC systems ?
*/
static void *strdup_ascii(jk_pool_t *p,
char *s)
@@ -538,7 +538,7 @@
jstring stderr_name = NULL;
jint rc = 0;
- /* AS400 need EBCDIC to ASCII conversion for JNI */
+ /* AS400/BS2000 need EBCDIC to ASCII conversion for JNI */
if(p-tomcat_cmd_line) {
cmd_line = (*env)-NewStringUTF(env, strdup_ascii(p-p,
p-tomcat_cmd_line));
@@ -1098,7 +1098,7 @@
return JK_FALSE;
}
-/* OS400 need conversion from EBCDIC to ASCII before passing to JNI */
+/* AS400/BS2000 need conversion from EBCDIC to ASCII before passing to JNI */
/* for others, strdup_ascii is just jk_pool_strdup */
ctype = strdup_ascii(p-p, btype);
@@ -1112,17 +1112,10 @@
jk_log(l, JK_LOG_DEBUG,
In get_bridge_object, loaded %s bridge class\n, btype);
-#ifdef AS400
-#pragma convert(819)
-#endif
-
constructor_method_id = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
-init, /* method name */
-()V); /* method sign */
-#ifdef AS400
-#pragma convert(0)
-#endif
+strdup_ascii(p-p, init), /*
method name */
+strdup_ascii(p-p, ()V)); /*
method sign */
if(!constructor_method_id) {
p-jk_java_bridge_class = NULL;
@@ -1159,52 +1152,32 @@
jk_logger_t *l)
{
-#ifdef AS400
-#pragma convert(819)
-#endif
+/* AS400/BS2000 need conversion from EBCDIC to ASCII before passing to JNI */
p-jk_startup_method = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
- startup,
-
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I);
-
-#ifdef AS400
-#pragma convert(0)
-#endif
+ strdup_ascii(p-p, startup),
+ strdup_ascii(p-p,
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I));
if(!p-jk_startup_method) {
jk_log(l, JK_LOG_EMERG, Can't find startup()\n);
return JK_FALSE;
}
-#ifdef AS400
-#pragma convert(819)
-#endif
-
p-jk_service_method = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
- service,
- (JJ)I);
-#ifdef AS400
-#pragma convert(0)
-#endif
+ strdup_ascii(p-p, service),
+ strdup_ascii(p-p, (JJ)I));
if(!p-jk_service_method) {
jk_log(l, JK_LOG_EMERG, Can't find service()\n);
return JK_FALSE;
}
-#ifdef AS400
-#pragma convert(819)
-#endif
-
p-jk_shutdown_method = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
-shutdown,
-()V);
-#ifdef AS400
-#pragma convert(0)
-#endif
+strdup_ascii(p-p, shutdown),
+strdup_ascii(p-p, ()V));
if(!p-jk_shutdown_method) {
jk_log(l, JK_LOG_EMERG, Can't find shutdown()\n);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c
hgomez 2002/09/25 01:44:20
Modified:jk/native2/common jk_pool.c
Log:
Correct typos before Mladen or Bojan detect them ;)
Revision ChangesPath
1.13 +4 -4 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_pool.c 25 Sep 2002 07:42:29 - 1.12
+++ jk_pool.c 25 Sep 2002 08:44:20 - 1.13
@@ -288,17 +288,17 @@
static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
{
- return (jk2_pool_a_strdup(env, p, s, 0);
+ return (jk2_pool_a_strdup(env, p, s, 0));
}
static void *jk2_pool_strdup2ascii(jk_env_t *env, jk_pool_t *p, const char *s)
{
- return (jk2_pool_a_strdup(env, p, s, 1);
+ return (jk2_pool_a_strdup(env, p, s, 1));
}
static void *jk2_pool_strdup2ebcdic(jk_env_t *env, jk_pool_t *p, const char *s)
{
- return (jk2_pool_a_strdup(env, p, s, 2);
+ return (jk2_pool_a_strdup(env, p, s, 2));
}
/*
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs faq.xml
hgomez 2002/09/24 03:23:51 Modified:jk/xdocs faq.xml Log: Add information about MMNB (Magic Module Number bump) of Apache 2.0 Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-connectors/jk/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/faq.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- faq.xml 20 Sep 2002 21:35:31 - 1.3 +++ faq.xml 24 Sep 2002 10:23:51 - 1.4 @@ -220,7 +220,7 @@ subsection name=Apache 2.0 complains about incorrect module version p Since Apache 2.0 API still change often, the Apache 2.0 teams decide to put in headers of compiled modules the -Apache 2.0 version used to compile the module. +Apache 2.0 version used to compile the module. This check is called Magic Module Number bump. /p p At start time Apache 2.0 check that version in modules headers and stop if it detect that a module was compiled -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk aphowto.xml
hgomez 2002/09/24 03:49:03 Modified:jk/xdocs/jk aphowto.xml Log: Use MOD_JK SVRPGM as mod_jk module for iSeries when rebuilding it from Apache sources (IBM use QZTCJK). Revision ChangesPath 1.11 +1 -1 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- aphowto.xml 20 Sep 2002 21:35:30 - 1.10 +++ aphowto.xml 24 Sep 2002 10:49:03 - 1.11 @@ -858,7 +858,7 @@ note5250Launch the build/note5250 type5250CALL MOD_JK/BLDJK/type5250br/ note5250If the build if successfull, copy the new mod_jk module/note5250 -type5250CRTDUPOBJ OBJ(MOD_JK) FROMLIB(MOD_JK) OBJTYPE(*SRVPGM) TOLIB(QHTTPSVR) NEWOBJ(MODJK)/type5250 +type5250CRTDUPOBJ OBJ(MOD_JK) FROMLIB(MOD_JK) OBJTYPE(*SRVPGM) TOLIB(QHTTPSVR) NEWOBJ(MOD_JK)/type5250 /screen5250 p Next, you should restart your Apache 2.0 server and enjoy this piece of OpenSource on iSeries. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
hgomez 2002/09/24 15:34:08 Modified:jk/native/common jk_global.h Log: no socketvars.h on CYGWIN Revision ChangesPath 1.22 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_global.h 4 Sep 2002 11:31:33 - 1.21 +++ jk_global.h 24 Sep 2002 22:34:08 - 1.22 @@ -98,7 +98,7 @@ #include netinet/tcp.h #include arpa/inet.h #include sys/un.h -#if !defined(_OSD_POSIX) !defined(AS400) +#if !defined(_OSD_POSIX) !defined(AS400) !defined(CYGWIN) #include sys/socketvar.h #endif #if !defined(HPUX11) !defined(AS400) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
hgomez 2002/09/24 15:36:28
Modified:jk/native2/common jk_channel_socket.c
Log:
AS/400 back port from 1.2.0.
notice here that we should use gethostbyname_r for multi-thread support
Revision ChangesPath
1.40 +17 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jk_channel_socket.c 24 Sep 2002 09:05:50 - 1.39
+++ jk_channel_socket.c 24 Sep 2002 22:36:28 - 1.40
@@ -207,6 +207,10 @@
int x;
u_long laddr;
+#ifdef AS400
+memset(rc, 0, sizeof(struct sockaddr_in));
+#endif
+
rc-sin_port = htons((short)port);
rc-sin_family = AF_INET;
@@ -218,11 +222,23 @@
}
if(host[x] != '\0') {
-/* If we found also characters we use gethostbyname()*/
+#ifdef AS400
+ /* If we found also characters we use gethostbyname_r()*/
+ struct hostent hostentry;
+ struct hostent *hoste = hostentry;
+ struct hostent_data hd;
+ memset( hd, 0, sizeof(struct hostent_data) );
+ if ( (gethostbyname_r( host, hoste, hd )) != 0 ) {
+return JK_ERR;
+ }
+#else /* If we found also characters we use gethostbyname()*/
+ /* XXX : WARNING : We should really use gethostbyname_r in multi-threaded env
*/
+ /* take a look at APR which handle gethostbyname in
apr/network_io/unix/sa_common.c */
struct hostent *hoste = gethostbyname(host);
if(!hoste) {
return JK_ERR;
}
+#endif
laddr = ((struct in_addr *)hoste-h_addr_list[0])-s_addr;
} else {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config_file.c jk_logger_file.c
hgomez 2002/09/24 15:37:13
Modified:jk/native2/common jk_config_file.c jk_logger_file.c
Log:
AS/400 back port from 1.2.0.
Revision ChangesPath
1.5 +11 -3 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Index: jk_config_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_config_file.c 8 Jul 2002 13:40:41 - 1.4
+++ jk_config_file.c 24 Sep 2002 22:37:13 - 1.5
@@ -83,7 +83,11 @@
if( workerFile== NULL )
return JK_ERR;
-fp= fopen(workerFile, w);
+#ifdef AS400
+ fp = fopen(workerFile, w, o_ccsid=0);
+#else
+ fp = fopen(workerFile, w);
+#endif
if(fp==NULL)
return JK_ERR;
@@ -226,8 +230,12 @@
if(m==NULL || file==NULL )
return JK_ERR;
-fp= fopen(file, r);
-
+#ifdef AS400
+fp = fopen(file, r, o_ccsid=0);
+#else
+fp = fopen(file, r);
+#endif
+
if(fp==NULL)
return JK_ERR;
1.33 +8 -2 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_logger_file.c 10 Sep 2002 13:40:08 - 1.32
+++ jk_logger_file.c 24 Sep 2002 22:37:13 - 1.33
@@ -160,7 +160,13 @@
if( strcmp( stderr, _this-name )==0 ) {
_this-logger_private = stderr;
} else {
-f = fopen(_this-name, a+);
+
+#ifdef AS400
+ f = fopen(_this-name, a+, o_ccsid=0);
+#else
+ f = fopen(_this-name, a+);
+#endif
+
if(f==NULL) {
_this-jkLog(env, _this,JK_LOG_ERROR,
Can't open log file %s\n, _this-name );
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_msg_ajp.c
hgomez 2002/09/24 15:39:21
Modified:jk/native2/common jk_msg_ajp.c
Log:
AS/400 / BS2000 back port from 1.2.0.
Revision ChangesPath
1.19 +22 -3 jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
Index: jk_msg_ajp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_msg_ajp.c 23 Jun 2002 15:54:13 - 1.18
+++ jk_msg_ajp.c 24 Sep 2002 22:39:21 - 1.19
@@ -253,8 +253,8 @@
}
-static int jk2_msg_ajp_appendString(jk_env_t *env, jk_msg_t *msg,
-const char *param)
+static int jk2_msg_ajp_appendAString(jk_env_t *env, jk_msg_t *msg,
+ const char *param, int convert)
{
int len;
@@ -273,13 +273,31 @@
/* We checked for space !! */
strncpy((char *)msg-buf + msg-len , param, len+1);/* including \0 */
-jk_xlate_to_ascii((char *)msg-buf + msg-len, len+1); /* convert from EBCDIC
if needed */
+#if defined(AS400) || defined(_OSD_POSIX)
+if (convert)
+ jk_xlate_to_ascii((char *)msg-buf + msg-len, len+1); /* convert from EBCDIC
if needed */
+#endif
msg-len += len + 1;
return JK_OK;
}
+
+static int jk2_msg_ajp_appendString(jk_env_t *env, jk_msg_t *msg,
+const char *param)
+{
+return jk2_msg_ajp_appendAString(env, msg, param, 1);
+}
+
+
+static int jk2_msg_ajp_appendAsciiString(jk_env_t *env, jk_msg_t *msg,
+ const char *param)
+{
+return jk2_msg_ajp_appendAString(env, msg, param, 0);
+}
+
+
static int jk2_msg_ajp_appendBytes(jk_env_t *env, jk_msg_t *msg,
const unsigned char *param,
const int len)
@@ -516,6 +534,7 @@
msg-appendInt=jk2_msg_ajp_appendInt;
msg-appendLong=jk2_msg_ajp_appendLong;
msg-appendString=jk2_msg_ajp_appendString;
+msg-appendAsciiString=jk2_msg_ajp_appendAsciiString;
msg-appendMap=jk2_msg_ajp_appendMap;
msg-appendFromServer=jk2_msg_ajp_appendFromServer;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c
hgomez 2002/09/24 15:40:02
Modified:jk/native2/common jk_pool.c
Log:
AS/400 back port from 1.2.0.
Revision ChangesPath
1.11 +10 -5 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_pool.c 10 Jun 2002 21:55:06 - 1.10
+++ jk_pool.c 24 Sep 2002 22:40:02 - 1.11
@@ -215,10 +215,15 @@
pp=(jk_pool_private_t *)p-_private;
-/* Round size to the upper mult of 8. */
-size -= 1;
-size /= 8;
-size = (size + 1) * 8;
+/* Round size to the upper mult of 8 (or 16 on iSeries) */
+ size--;
+#ifdef AS400
+size /= 16;
+size = (size + 1) * 16;
+#else
+size /= 8;
+size = (size + 1) * 8;
+#endif
if((pp-size - pp-pos) = (int)size) {
/* We have space */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_requtil.c
hgomez 2002/09/24 15:40:38
Modified:jk/native2/common jk_requtil.c
Log:
AS/400 back port from 1.2.0.
Revision ChangesPath
1.25 +8 -0 jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Index: jk_requtil.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_requtil.c 26 Aug 2002 09:54:34 - 1.24
+++ jk_requtil.c 24 Sep 2002 22:40:38 - 1.25
@@ -71,6 +71,10 @@
#include jk_env.h
#include jk_requtil.h
+#ifdef AS400
+#include util_ebcdic.h
+#endif
+
#define CHUNK_BUFFER_PAD (12)
static const char *response_trans_headers[] = {
@@ -622,7 +626,11 @@
}
if (s-query_string) {
if (msg-appendByte(env, msg, SC_A_QUERY_STRING) ||
+#idef AS400
+msg-appendAsciiString(env, msg, s-query_string)) {
+#else
msg-appendString(env, msg, s-query_string)) {
+#endif
env-l-jkLog(env, env-l, JK_LOG_ERROR,
handle.request() Error serializing query string\n);
return JK_ERR;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
hgomez 2002/09/24 15:41:48 Modified:jk/native2/common jk_shm.c Log: AS/400 back port from 1.2.0. BTW, the AS/400 code should be checked later, since we should know if we have to convert from EBCDIC to ASCII here... Revision ChangesPath 1.29 +13 -1 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c Index: jk_shm.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- jk_shm.c 8 Jul 2002 13:37:10 - 1.28 +++ jk_shm.c 24 Sep 2002 22:41:48 - 1.29 @@ -417,7 +417,19 @@ if( name==NULL ) return JK_ERR; -f=fopen(name, a+); +/* + * XXX + * To be checked later, AS400 may need no ccsid + * conversions applied if pure binary, for now + * I assume stream is EBCDIC and need to be converted + * in standard ASCII using codepage 819 + */ +#ifdef AS400 +f = fopen(name, a+, o_ccsid=819); +#else +f = fopen(name, a+); +#endif + fwrite( shm-head, 1, shm-size, f ); fclose( f ); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_msg.h jk_global.h
hgomez 2002/09/24 15:45:18 Modified:jk/native2/include jk_msg.h jk_global.h Log: AS/400 back port from 1.2.0. Revision ChangesPath 1.14 +3 -0 jakarta-tomcat-connectors/jk/native2/include/jk_msg.h Index: jk_msg.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jk_msg.h 2 Jul 2002 16:53:59 - 1.13 +++ jk_msg.h 24 Sep 2002 22:45:18 - 1.14 @@ -142,6 +142,9 @@ int (*appendString)(struct jk_env *env, struct jk_msg *_this, const char *param); +int (*appendAsciiString)(struct jk_env *env, struct jk_msg *_this, + const char *param); + int (*appendMap)(struct jk_env *env, struct jk_msg *_this, struct jk_map *map); 1.14 +10 -3 jakarta-tomcat-connectors/jk/native2/include/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jk_global.h 10 Jun 2002 23:58:52 - 1.13 +++ jk_global.h 24 Sep 2002 22:45:18 - 1.14 @@ -73,6 +73,13 @@ #include time.h #include ctype.h +#ifdef AS400 +#include ap_config.h +#include apr_strings.h +#include apr_lib.h +extern char *strdup (const char *str); +#endif + #include sys/types.h #include sys/stat.h @@ -119,10 +126,10 @@ #include netinet/tcp.h #include arpa/inet.h #include sys/un.h -#ifndef _OSD_POSIX +#if !defined(_OSD_POSIX) !defined(AS400) !defined(CYGWIN) #include sys/socketvar.h #endif -#ifndef HPUX11 +#if !defined(HPUX11) !defined(AS400) #include sys/select.h #endif #endif -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/23 03:04:24
Modified:jk build.xml
Log:
Remove unneeded stuff
Revision ChangesPath
1.56 +0 -8 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- build.xml 20 Sep 2002 21:34:18 - 1.55
+++ build.xml 23 Sep 2002 10:04:24 - 1.56
@@ -384,14 +384,6 @@
/not
/condition
-condition property=jkmenu.present
- equals arg1=${jkmenu} arg2=amp;JK; /
-/condition
-
-condition property=jk2menu.present
- equals arg1=${jk2menu} arg2=amp;JK2; /
-/condition
-
copy file=${source.docs}/menu.idx.in tofile=${source.docs}/menu.idx/
replace file=${source.docs}/menu.idx token=@JK@ value=${jkmenu}/
replace file=${source.docs}/menu.idx token=@JK2@ value=${jk2menu}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
hgomez 2002/09/23 07:59:39 Modified:jk/xdocs index.xml Log: APR is Apache Portable Runtime, not Library (reported by Anthony Milbourne) Revision ChangesPath 1.10 +2 -2 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- index.xml 20 Sep 2002 21:35:31 - 1.9 +++ index.xml 23 Sep 2002 14:59:39 - 1.10 @@ -108,7 +108,7 @@ bJK2/b ;-)) /p p -The disadvantage is that it requires the bApache Portable Library/b +The disadvantage is that it requires the bApache Portable Runtime/b which is still only easily available via Apache 2.0 and that it didn't support webservers like IIS, NES/iPlanet or Domino. /p -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs menu.jk2.idx menu.jk.idx menu.idx.in
hgomez 2002/09/20 08:43:01 Added: jk/xdocs menu.jk2.idx menu.jk.idx menu.idx.in Log: New menu.idx system to allow us to exclude jk or jk2 from being generated Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/menu.jk2.idx Index: menu.jk2.idx === ?xml version=1.0 encoding=ISO-8859-1? section name=JK2 document href=jk2/configtc.xml/ document href=jk2/configweb.xml/ /section 1.1 jakarta-tomcat-connectors/jk/xdocs/menu.jk.idx Index: menu.jk.idx === ?xml version=1.0 encoding=ISO-8859-1? section name=JK document href=jk/aphowto.xml/ document href=jk/domhowto.xml/ document href=jk/iishowto.xml/ document href=jk/neshowto.xml/ document href=jk/workershowto.xml/ /section 1.1 jakarta-tomcat-connectors/jk/xdocs/menu.idx.in Index: menu.idx.in === ?xml version=1.0 encoding=ISO-8859-1? !DOCTYPE index [ !ENTITY JK SYSTEM menu.jk.idx !ENTITY JK2 SYSTEM menu.jk2.idx ] index section name=Presentation document href=index.xml/ /section section name=Commons document href=common/AJPv13.xml/ document href=common/AJPv14-proposal.xml/ document href=faq.xml/ /section @JK@ @JK2@ /index -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/20 09:00:12
Modified:jk build.xml
Log:
Added conditional jk/jk2 doc generation.
use -Dnojkdoc to avoid jk documentation from being generated
use -Dnojk2doc to avoid jk2 documentation from being generated
Revision ChangesPath
1.54 +37 -5 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 19 Sep 2002 11:18:30 - 1.53
+++ build.xml 20 Sep 2002 16:00:11 - 1.54
@@ -371,6 +371,31 @@
param name=sourcefile value=${source.docs}/style.xsl.in/
param name=destfile value=${source.docs}/style.xsl/
/antcall
+
+condition property=jkmenu value=amp;JK;
+ not
+isset property=nojkdoc/
+ /not
+/condition
+
+condition property=jk2menu value=amp;JK2;
+ not
+isset property=nojk2doc/
+ /not
+/condition
+
+condition property=jkmenu.present
+ equals arg1=${jkmenu} arg2=amp;JK; /
+/condition
+
+condition property=jk2menu.present
+ equals arg1=${jk2menu} arg2=amp;JK2; /
+/condition
+
+copy file=${source.docs}/menu.idx.in tofile=${source.docs}/menu.idx/
+replace file=${source.docs}/menu.idx token=@JK@ value=${jkmenu}/
+replace file=${source.docs}/menu.idx token=@JK2@ value=${jk2menu}/
+
/target
target name=docs.color
@@ -405,16 +430,20 @@
style
basedir=${source.docs}
destdir=${build.docs}
-style=${source.docs}/style.xsl
-includes=*/**.xml
-excludes=index.xml
+style=${source.docs}/style.xsl
+
+include name=*/**.xml /
+exclude name=index.xml /
+exclude name=jk/** if=nojkdoc/
+exclude name=jk2/** if=nojk2doc/
param name=styles expression=..//
/style
+
style
basedir=${source.docs}
destdir=${build.docs}
-style=${source.docs}/style.xsl
-includes=index.xml, faq.xml
+style=${source.docs}/style.xsl
+include name=index.xml, faq.xml /
param name=images expression=images/
param name=styles expression=./
param name=homedoc expression=/
@@ -424,6 +453,8 @@
copy
todir=${build.docs}
fileset dir=${source.docs}
+exclude name=jk/** if=nojkdoc/
+exclude name=jk2/** if=nojk2doc/
exclude name=**/*.xml/
exclude name=**/*.css.in/
exclude name=**/*.xsl.in/
@@ -433,6 +464,7 @@
exclude name=**/images/originals/**/
/fileset
/copy
+
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs menu.idx
hgomez 2002/09/20 09:04:14 Removed: jk/xdocs menu.idx Log: Remove it since it will be regenerated with correct entities -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/20 14:34:18
Modified:jk build.xml
Log:
Fix incorrect include tags
Revision ChangesPath
1.55 +2 -1 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 20 Sep 2002 16:00:11 - 1.54
+++ build.xml 20 Sep 2002 21:34:18 - 1.55
@@ -443,7 +443,8 @@
basedir=${source.docs}
destdir=${build.docs}
style=${source.docs}/style.xsl
-include name=index.xml, faq.xml /
+include name=index.xml /
+include name=faq.xml /
param name=images expression=images/
param name=styles expression=./
param name=homedoc expression=/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl.in faq.xml index.xml
hgomez 2002/09/20 14:35:31 Modified:jk/xdocs/jk workershowto.xml iishowto.xml aphowto.xml neshowto.xml domhowto.xml jk/xdocs/jk2 configweb.xml configtc.xml installhowto.xml jk/xdocs/common AJPv14-proposal.xml AJPv13.xml jk/xdocs style.xsl.in faq.xml index.xml Log: Commited JF-Clere idea on putting date in generated HTML (from XML modification date) Revision ChangesPath 1.8 +1 -0 jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml Index: workershowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- workershowto.xml 16 Sep 2002 09:18:53 - 1.7 +++ workershowto.xml 20 Sep 2002 21:35:30 - 1.8 @@ -4,6 +4,7 @@ titleWorkers HowTo/title author email=[EMAIL PROTECTED]Henri Gomez/author author email=[EMAIL PROTECTED]Gal Shachor/author +date$Date$/date /properties section name=Introduction 1.5 +1 -0 jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml Index: iishowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iishowto.xml 12 Sep 2002 07:54:16 - 1.4 +++ iishowto.xml 20 Sep 2002 21:35:30 - 1.5 @@ -4,6 +4,7 @@ titleIIS HowTo/title author email=[EMAIL PROTECTED]Henri Gomez/author author email=[EMAIL PROTECTED]Gal Shachor/author +date$Date$/date /properties section name=Introduction 1.10 +1 -0 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- aphowto.xml 12 Sep 2002 07:53:09 - 1.9 +++ aphowto.xml 20 Sep 2002 21:35:30 - 1.10 @@ -4,6 +4,7 @@ titleApache HowTo/title author email=[EMAIL PROTECTED]Henri Gomez/author author email=[EMAIL PROTECTED]Gal Shachor/author +date$Date$/date /properties section name=Introduction 1.5 +1 -0 jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml Index: neshowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- neshowto.xml 12 Sep 2002 07:54:16 - 1.4 +++ neshowto.xml 20 Sep 2002 21:35:30 - 1.5 @@ -4,6 +4,7 @@ titleNetscape/iPlanet HowTo/title author email=[EMAIL PROTECTED]Henri Gomez/author author email=[EMAIL PROTECTED]Gal Shachor/author +date$Date$/date /properties section name=Introduction 1.6 +1 -0 jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml Index: domhowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- domhowto.xml 13 Sep 2002 17:12:43 - 1.5 +++ domhowto.xml 20 Sep 2002 21:35:30 - 1.6 @@ -4,6 +4,7 @@ titleDomino HowTo/title author email=[EMAIL PROTECTED]Andy Armstrong/author author email=[EMAIL PROTECTED]Henri Gomez/author +date$Date$/date /properties section name=Introduction 1.6 +6 -5 jakarta-tomcat-connectors/jk/xdocs/jk2/configweb.xml Index: configweb.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configweb.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configweb.xml 13 Sep 2002 13:57:17 - 1.5 +++ configweb.xml 20 Sep 2002 21:35:31 - 1.6 @@ -1,10 +1,11 @@ ?xml version=1.0? document -properties -titleConfiguration in the Web Server/title -author email=[EMAIL PROTECTED]Costin Manolache/author -author email=[EMAIL PROTECTED]Jean-Frederic Clere/author -/properties +properties +titleConfiguration in the Web Server/title +author email=[EMAIL PROTECTED]Costin Manolache/author +author email=[EMAIL PROTECTED]Jean-Frederic Clere/author +date$Date$/date +/properties section name=Intro pJk2 uses a config file ( workers2.properties ) in the style of a .properties or ini file. It can be configured to use any other backend that provides similar 1.3 +5 -4 jakarta-tomcat-connectors
cvs commit: jakarta-tomcat/src/doc serverxml.html
hgomez 2002/09/19 00:57:07
Modified:src/doc serverxml.html
Log:
Add information about MXInterceptor
Revision ChangesPath
1.27 +62 -1 jakarta-tomcat/src/doc/serverxml.html
Index: serverxml.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- serverxml.html11 Sep 2002 17:35:26 - 1.26
+++ serverxml.html19 Sep 2002 07:57:06 - 1.27
@@ -228,6 +228,7 @@
lia href=#JservConfigJservConfig/a/li
lia href=#LoaderInterceptor11LoaderInterceptor11/a/li
lia href=#LogSetterLogSetter/a/li
+ lia href=#MXInterceptorMXInterceptor/a/li
lia href=#NSConfigNSConfig/a/li
lia href=#PolicyLoaderPolicyLoader/a/li
lia href=#TrustedLoaderTrustedLoader/a/li
@@ -2146,6 +2147,66 @@
lt;LogSetter name=quot;tc_logquot; verbosityLevel=quot;DEBUGquot; /gt;
lt;LogSetter name=quot;servlet_logquot; timestamps=quot;truequot;
verbosityLevel=quot;INFORMATIONquot;
path=quot;logs/servlet-${MMdd}.logquot; /gt;
+/pre
+
+hr size=5
+
+!-- --
+
+h3a name=MXInterceptorMXInterceptor/a/h3
+
+pbType:/b Configuration/p
+
+h4Description/h4
+
+pJMX MBeans support has been added to Tomcat 3.3.2, which allow you to manage
+Tomcat from any JMX console or via a simple browser by the build in HTTP Adaptor/p
+pTo enable JMX, you should add the lt;MxInterceptor /gt; in server.xml/p
+pTo also activate the HTTP Adaptor you should at least define the listen port/p
+
+h4Attributes/h4
+
+table border=1 cellpadding=2 cellspacing=0
+ tr valign=top
+thAttribute/th
+thDescription/th
+thDefault/th
+ /tr
+ tr valign=top
+tdport/td
+tdport where the JMX HTTP Adaptor will listen to, HTTP Adaptor will only be
loaded if the port is set/td
+td-1, no http adaptor loaded/td
+ /tr
+ tr valign=top
+tdhost/td
+tdhost/ip where the JMX HTTP Adaptor will listen to, only available when
using codeMX4J/code HTTP Adaptor/td
+tdnull/td
+ /tr
+ tr valign=top
+tdauthentication/td
+tdauthentication used by the JMX HTTP Adaptor, only available when using
codeMX4J/code HTTP Adaptor,
+it could be codenone/code, codebasic/code, codedigest/code/td
+tdnone/td
+ /tr
+ tr valign=top
+tduser/td
+tdthe user account which to be used with authentication/td
+tdnone, should be set to enable authentication/td
+ /tr
+ tr valign=top
+tdpassword/td
+tdthe password which to be used with authentication/td
+tdnone, should be set to enable authentication/td
+ /tr
+/table
+
+
+
+h4Example(s)/h4
+
+pre
+lt;MxInterceptor port=quot;8999quot; host=quot;mysystemquot;
authentication=quot;basicquot; user=quot;adminquot;
password=quot;changeillicoquot;/gt;
+lt;MxInterceptor /gt;
/pre
hr size=5
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config MxInterceptor.java
hgomez 2002/09/19 00:58:07
Modified:src/share/org/apache/tomcat/modules/config
MxInterceptor.java
Log:
Add authentification method to MXInterceptor, need now to pass the
user/password to HTTP adaptor
Revision ChangesPath
1.4 +25 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/MxInterceptor.java
Index: MxInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/MxInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MxInterceptor.java18 Sep 2002 07:57:09 - 1.3
+++ MxInterceptor.java19 Sep 2002 07:58:07 - 1.4
@@ -76,6 +76,9 @@
MBeanServer mserver;
private int port=-1;
private String host;
+private String auth;
+private String user;
+private String password;
// Tomcat callbacks
@@ -118,6 +121,23 @@
return host;
}
+public void setAuthentification( String auth ) {
+ if (none.equals(auth) || basic.equals(auth) || digest.equals(auth))
+ this.auth=auth;
+}
+
+public String getAuthentification() {
+return auth;
+}
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
/* Start/stop */
ObjectName serverName=null;
@@ -133,7 +153,10 @@
mserver.setAttribute(serverName, new Attribute(Host, host));
mserver.setAttribute(serverName, new Attribute(Port, new
Integer(port)));
-
+
+if( auth!=null user!=null password!=null)
+mserver.setAttribute(serverName, new
Attribute(AuthenticationMethod, auth));
+
ObjectName processorName = new ObjectName(Http:name=XSLTProcessor);
mserver.createMBean(mx4j.adaptor.http.XSLTProcessor, processorName,
null);
mserver.setAttribute(serverName, new
Attribute(ProcessorName, processorName));
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/etc server.xml
hgomez 2002/09/19 01:02:27 Modified:src/etc server.xml Log: Add example MXInterceptor (still not enabled by default) Revision ChangesPath 1.98 +28 -0 jakarta-tomcat/src/etc/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- server.xml9 Apr 2002 19:43:27 - 1.97 +++ server.xml19 Sep 2002 08:02:27 - 1.98 @@ -69,6 +69,34 @@ Jdk12Interceptor / + !-- UnComment the following and comment out the +above to enable JMX monitoring. + +options are : + +port : http adaptor will listen to this port + +If you're using the MX4J HTTP Adaptor, you could also +set host and authentication : + +host : the MX4J http adaptor will listen to this IP/host + +authentication: the MX4J http adaptor will use HTTP authentification +method which could be (none, basic, digest) + +user: set the user to be entered when asking for user/password in + HTTP authentification. + +password : define the password for HTTP authentification + +Note, if you're using a JMX console, you don't have to +use the http adaptor + +MXInterceptor port=8999 authentification=basic + user=admin password=changeillico/ + + -- + !-- Non-standard invoker, for backward compat. ( /servlet/* ) -- InvokerInterceptor / -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
hgomez 2002/09/19 01:12:59
Modified:.build.xml
Log:
Majors modifications in build.xml :
- make it works from Eclipse IDE
- fix problems when building from non 'apache' layout (tc/jtc in same dir)
- add support for xerces2 parser or external parsers (usefull for
packagers like jpackage.org)
Revision ChangesPath
1.188 +145 -46 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- build.xml 11 Sep 2002 17:23:07 - 1.187
+++ build.xml 19 Sep 2002 08:12:59 - 1.188
@@ -28,8 +28,9 @@
--
property name=work.dir value=. /
- property name=tomcat.build value=${work.dir}/build/tomcat/
- property name=tomcat.dist value=${work.dir}/dist/tomcat/
+ !-- append basedir since jtc will need a full path for tomcat33.home --
+ property name=tomcat.build value=${basedir}/${work.dir}/build/tomcat/
+ property name=tomcat.dist value=${basedir}/${work.dir}/dist/tomcat/
!-- Location where various binaries are installed.
It can be c:\Program Files or /usr/share/java or
@@ -58,6 +59,9 @@
property name=ant.home location=${install.dir}/jakarta-ant/
property name=ant.bin location=${ant.home}/bin/
property name=ant.lib location=${ant.home}/lib/
+ property name=ant.jar location=${ant.home}/lib/ant.jar/
+ property name=optional.jar location=${ant.home}/lib/optional.jar/
+ property name=ant-optional.jar location=${ant.home}/lib/ant-optional.jar/
property name=jaxp.home location=bin /
@@ -96,6 +100,13 @@
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
+ property name=jmxtools.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-tools.jar/
+
+ !-- xalan is required by MX4J HTTP adaptor --
+ property name=xalan.home location=${install.dir}/xalan/
+ property name=xalan.lib location=${xalan.home}/bin/
+ property name=xalan.jar location=${xalan.lib}/xalan.jar/
+ property name=xml-apis.jar location=${xalan.lib}/xml-apis.jar/
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
@@ -120,12 +131,28 @@
file=${jaxp.home}/jaxp.jar /
available property=jmx-present
file=${jmx.jar} /
+available property=jmxtools-present
+ file=${jmxtools.jar} /
+available property=xalan-present
+ file=${xalan.jar} /
available property=jaxp10-present
file=${jaxp.home}/parser.jar /
available property=jaxp11-present
file=${jaxp.home}/crimson.jar /
available property=xerces-present
file=${jaxp.home}/xerces.jar /
+condition property=xerces2-present
+ and
+available file=${xerces2.home}/xercesImpl.jar /
+available file=${xerces2.home}/xmlParserAPIs.jar /
+ /and
+/condition
+condition property=xml-parser-present
+ and
+available file=${xml-parser-impl.jar} /
+available file=${xml-parser-apis.jar} /
+ /and
+/condition
available property=jtc-present
file=${jakarta-tomcat-connectors} /
condition property=commons-dbcp.complete
@@ -135,6 +162,54 @@
available file=${commons-collections.jar} /
/and
/condition
+
+ !-- Some IDE like Eclipse didn't export ant and xml api --
+ !-- jars so javac will faild at compile time --
+ !-- To fix that, create some path ref which will be used --
+
+ path id=ant.class.path
+pathelement location=${ant.jar}//
+pathelement location=${optional.jar}/
+pathelement location=${ant-optional.jar}/
+ /path
+
+ path id=xml-apis.class.path
+pathelement location=${jaxp.home}/jaxp.jar/
+pathelement location=${xerces2.home}/xmlParserAPIs.jar/
+pathelement location=${xml-parser-apis.jar}/
+ /path
+
+ path id=tomcat_util.class.path
+pathelement location=${tomcat-util.jar}/
+ pathelement location=${commons-logging.jar} /
+ /path
+
+ path id=crypto.class.path
+pathelement location=${jcert.jar}/
+pathelement location=${jnet.jar}/
+pathelement location=${jsse.jar}/
+pathelement location=${puretls.jar}/
+ /path
+
+ path id=jdk.class.path
+fileset dir=${java.home}/..
+ include name=lib/tools.jar/
+/fileset
+fileset dir=${java.home}
+ include name=lib/classes.zip/
+/fileset
+ /path
+
+ path id=javadoc.classpath
+pathelement location=${servlet22.jar}/
+pathelement location=${jmx.jar}/
+path refid=ant.class.path/
+path
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/19 01:19:01
Modified:jk build.xml
Log:
make it works from Eclipse IDE (which didn't export ant jars like
ant, ant-optional and xmls)
Revision ChangesPath
1.52 +15 -4 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- build.xml 5 Sep 2002 15:08:36 - 1.51
+++ build.xml 19 Sep 2002 08:19:01 - 1.52
@@ -108,6 +108,13 @@
copy tofile=${jk.build}/lib/tomcat-coyote.jar
file=../coyote/build/lib/tomcat-coyote.jar /
+ !-- Fix build via ECLIPSE which didn't export ant's jars --
+path id=xml-apis.classpath
+ pathelement path=${jaxp.home}/jaxp.jar/
+ pathelement path=${xerces2.home}/xmlParserAPIs.jar/
+ pathelement path=${xml-parser-apis.jar}/
+/path
+
path id=build-main.classpath
fileset dir=../lib includes=*.jar /
pathelement location=../util/build/classes/
@@ -126,9 +133,9 @@
to nowhere, and tomcat_util will no longer be visible, nor
3.3 classes. --
pathelement
- location=${tomcat33.home}/lib/container/tomcat_util.jar/
- pathelement
- location=${tomcat33.home}/lib/common/servlet.jar/
+ location=${tomcat33.home}/lib/container/tomcat_util.jar/
+ pathelement
+location=${tomcat33.home}/lib/common/servlet.jar/
pathelement location=${coyote.home}/lib/tomcat-coyote.jar/
/path
@@ -161,7 +168,11 @@
unless=tomcat33.detect/
exclude name=org/apache/jk/common/JkMX.java unless=jmx.detect/
exclude name=org/apache/jk/common/Shm14.java unless=jdk14.detect/
- classpath refid=build-main.classpath/
+ classpath
+path refid=xml-apis.classpath/
+path refid=build-main.classpath/
+ /classpath
+
/javac
!-- Copy static resource files --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config MxInterceptor.java
hgomez 2002/09/19 02:03:15
Modified:src/share/org/apache/tomcat/modules/config
MxInterceptor.java
Log:
Set the user/pwd for authentification
Revision ChangesPath
1.5 +7 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/MxInterceptor.java
Index: MxInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/MxInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MxInterceptor.java19 Sep 2002 07:58:07 - 1.4
+++ MxInterceptor.java19 Sep 2002 09:03:15 - 1.5
@@ -154,9 +154,14 @@
mserver.setAttribute(serverName, new Attribute(Port, new
Integer(port)));
+ // use authentication if user/password set
if( auth!=null user!=null password!=null)
mserver.setAttribute(serverName, new
Attribute(AuthenticationMethod, auth));
-
+
+ // add user names
+ mserver.invoke(serverName, addAuthorization, new Object[]
{user, password},
+new String[] {java.lang.String,
java.lang.String});
+
ObjectName processorName = new ObjectName(Http:name=XSLTProcessor);
mserver.createMBean(mx4j.adaptor.http.XSLTProcessor, processorName,
null);
mserver.setAttribute(serverName, new
Attribute(ProcessorName, processorName));
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc serverxml.html
hgomez 2002/09/19 04:13:18 Modified:src/doc serverxml.html Log: typo, it's MxInterceptor and not MXInterceptor Revision ChangesPath 1.28 +4 -4 jakarta-tomcat/src/doc/serverxml.html Index: serverxml.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- serverxml.html19 Sep 2002 07:57:06 - 1.27 +++ serverxml.html19 Sep 2002 11:13:18 - 1.28 @@ -228,7 +228,7 @@ lia href=#JservConfigJservConfig/a/li lia href=#LoaderInterceptor11LoaderInterceptor11/a/li lia href=#LogSetterLogSetter/a/li - lia href=#MXInterceptorMXInterceptor/a/li + lia href=#MxInterceptorMxInterceptor/a/li lia href=#NSConfigNSConfig/a/li lia href=#PolicyLoaderPolicyLoader/a/li lia href=#TrustedLoaderTrustedLoader/a/li @@ -2153,7 +2153,7 @@ !-- -- -h3a name=MXInterceptorMXInterceptor/a/h3 +h3a name=MxInterceptorMxInterceptor/a/h3 pbType:/b Configuration/p @@ -2206,7 +2206,7 @@ pre lt;MxInterceptor port=quot;8999quot; host=quot;mysystemquot; authentication=quot;basicquot; user=quot;adminquot; password=quot;changeillicoquot;/gt; -lt;MxInterceptor /gt; +lt;erceptor /gt; /pre hr size=5 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/etc server.xml
hgomez 2002/09/19 04:14:30 Modified:src/etc server.xml Log: typo, it's MxInterceptor and not MXInterceptor Revision ChangesPath 1.99 +2 -3 jakarta-tomcat/src/etc/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- server.xml19 Sep 2002 08:02:27 - 1.98 +++ server.xml19 Sep 2002 11:14:30 - 1.99 @@ -69,8 +69,7 @@ Jdk12Interceptor / - !-- UnComment the following and comment out the -above to enable JMX monitoring. + !-- Use MxInterceptor to enable JMX monitoring. options are : @@ -92,7 +91,7 @@ Note, if you're using a JMX console, you don't have to use the http adaptor -MXInterceptor port=8999 authentification=basic +MxInterceptor port=8999 authentification=basic user=admin password=changeillico/ -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/19 04:18:30
Modified:jk build.xml
Log:
Update xml apis path refid
Revision ChangesPath
1.53 +1 -0 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.xml 19 Sep 2002 08:19:01 - 1.52
+++ build.xml 19 Sep 2002 11:18:30 - 1.53
@@ -111,6 +111,7 @@
!-- Fix build via ECLIPSE which didn't export ant's jars --
path id=xml-apis.classpath
pathelement path=${jaxp.home}/jaxp.jar/
+ pathelement path=${jaxp.home}/crimson.jar/
pathelement path=${xerces2.home}/xmlParserAPIs.jar/
pathelement path=${xml-parser-apis.jar}/
/path
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config MxInterceptor.java
hgomez 2002/09/18 00:57:09
Modified:src/share/org/apache/tomcat/modules/config
MxInterceptor.java
Log:
Fix JMX support for Tomcat 3.3.2-dev due to change in JTC.
add port/host attribute which will try, when port is set, to load the http adaptor
Revision ChangesPath
1.3 +100 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/MxInterceptor.java
Index: MxInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/MxInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MxInterceptor.java30 Jul 2002 17:27:25 - 1.2
+++ MxInterceptor.java18 Sep 2002 07:57:09 - 1.3
@@ -63,6 +63,8 @@
import java.io.*;
import java.util.*;
+import javax.management.*;
+
import org.apache.tomcat.util.mx.*;
/**
@@ -71,6 +73,10 @@
*/
public class MxInterceptor extends BaseInterceptor {
+ MBeanServer mserver;
+private int port=-1;
+private String host;
+
// Tomcat callbacks
private void createMBean( String domain, Object proxy, String name ) {
@@ -78,15 +84,97 @@
DynamicMBeanProxy mbean=new DynamicMBeanProxy();
mbean.setReal( proxy );
if( name!=null ) {
-mbean.setName( name );
+mbean.setName( name= + name );
}
mbean.registerMBean( domain );
+
+// Set mserver once
+if (mserver == null)
+ mserver = mbean.getMBeanServer();
+
} catch( Throwable t ) {
log( Error creating mbean , t );
}
}
+/* Public methods */
+
+/** Enable the MX4J internal adapter
+ */
+public void setPort( int i ) {
+port=i;
+}
+
+public int getPort() {
+return port;
+}
+
+public void setHost(String host ) {
+this.host=host;
+}
+
+public String getHost() {
+return host;
+}
+
+/* Start/stop */
+ObjectName serverName=null;
+
+/** Initialize the worker. After this call the worker will be
+ * ready to accept new requests.
+ */
+public void loadAdapter() throws IOException {
+try {
+serverName = new ObjectName(Http:name=HttpAdaptor);
+mserver.createMBean(mx4j.adaptor.http.HttpAdaptor, serverName, null);
+
+if( host!=null )
+mserver.setAttribute(serverName, new Attribute(Host, host));
+
+mserver.setAttribute(serverName, new Attribute(Port, new
Integer(port)));
+
+ ObjectName processorName = new ObjectName(Http:name=XSLTProcessor);
+mserver.createMBean(mx4j.adaptor.http.XSLTProcessor, processorName,
null);
+ mserver.setAttribute(serverName, new
Attribute(ProcessorName, processorName));
+
+mserver.invoke(serverName, start, null, null);
+ log( Started mx4j http adaptor + ((host != null) ? for
host + host : ) + at port + port);
+return;
+} catch( Throwable t ) {
+log( Can't load the MX4J http adapter + t.toString() );
+}
+
+try {
+Class c=Class.forName( com.sun.jdmk.comm.HtmlAdaptorServer );
+Object o=c.newInstance();
+serverName=new ObjectName(Adaptor:name=html,port= + port);
+log(Registering the JMX_RI html adapter + serverName);
+mserver.registerMBean(o, serverName);
+
+mserver.setAttribute(serverName,
+ new Attribute(Port, new Integer(port)));
+
+mserver.invoke(serverName, start, null, null);
+ log( Start JMX_RI http adaptor at port + port);
+
+} catch( Throwable t ) {
+log( Can't load the JMX_RI http adapter + t.toString() );
+}
+}
+
+public void destroy() {
+try {
+log(Stoping JMX );
+
+if( serverName!=null ) {
+mserver.invoke(serverName, stop, null, null);
+}
+} catch( Throwable t ) {
+log( Destroy error, t );
+}
+}
+
public void addContext( ContextManager cm,
Context ctx )
throws TomcatException
@@ -105,6 +193,16 @@
if( bi==this ) {
// Adding myself and on-time things
createMBean( tomcat3, cm
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx DynamicMBeanProxy.java
hgomez 2002/09/18 04:03:06 Modified:util/java/org/apache/tomcat/util/mx DynamicMBeanProxy.java Log: Remove unused import Revision ChangesPath 1.6 +0 -2 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx/DynamicMBeanProxy.java Index: DynamicMBeanProxy.java === RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx/DynamicMBeanProxy.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DynamicMBeanProxy.java9 Aug 2002 20:50:38 - 1.5 +++ DynamicMBeanProxy.java18 Sep 2002 11:03:06 - 1.6 @@ -65,8 +65,6 @@ import java.util.*; import javax.management.*; -import org.apache.tomcat.util.IntrospectionUtils; - /** * DynamicMBean implementation using introspection to manage any * component that follows the bean/ant/Interceptor/Valve/Jk2 patterns. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors KEYS
hgomez 2002/09/13 02:33:12 Modified:.KEYS Log: Update KEYS notice and add my gpg signing key (for rpm) Revision ChangesPath 1.5 +45 -2 jakarta-tomcat-connectors/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-connectors/KEYS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- KEYS 13 Feb 2002 19:45:11 - 1.4 +++ KEYS 13 Sep 2002 09:33:12 - 1.5 @@ -1,9 +1,16 @@ -This file contains the PGP keys of various Apache developers. +This file contains the PGPGPG keys of various Apache developers. Please don't use them for email unless you have to. Their main purpose is code signing. Apache users: pgp KEYS -Apache developers: pgp -kxa your name and append it to this file. +Apache developers: +(pgpk -ll your name pgpk -xa your name) this file. + or +(gpg --fingerprint --list-sigs your name + gpg --armor --export your name) this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). Type Bits/KeyIDDate User ID @@ -113,4 +120,40 @@ iEYEGBECAAYFAjxqtSQACgkQrLd/wuhuKazl7QCfQkz5t/3T6EtXZCcXz/hlswyI z30AoLr/7hwXgedEepBk/Gm9HUsbMnM8 =S1mb +-END PGP PUBLIC KEY BLOCK- + + +Type bits keyID Date User ID +pub 1024D/307A10A5 2002-07-18 Henri Gomez [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.0.6 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBD02vbERBAC1v8fR6gjERpaz4UMfdy0hRVWCPSbOdF+Swm/IenjVzErco6zb +MTa13umUNrDPBy/tTWiCCZrOnqi7fgDzWqPEqrXJjKAFVLEWE6MmKylPPEPG1/bm +idkNGERSAZduvhKv777PzvEJJ/8eGe3wy/O8NbgIjCPtr4UklwCZS8cFuwCg8oMO +UdT8qZRtzdxdAyu1m5fUb+MD/3IKJYWXsdtb6iBphCU4f/BoyjVC9EZJ1ywLuiVM +siKbuaDUaXU9nWcbNKv+fx8uZ1NaadpfLokqqhnWcpnSiqw8HNR7SwsF1D33rkXK +O4FSuVss/tIoqGdWFcJyPkP4yP5shxqR335narVw2vDa0+BiWkALbA2qVsSIdZDB +LeFZA/47AMBS0U2BRk2rQT8LmMuFl7mR+wNBM4n7FUGdxsGn3TcYd4pXTNrEQPrV +YNdooKlikgGk4hgFnIFX09Spmimqgq0goFue81rttVdZZ4uep8dTghY6gwmvcOxX +jATbhWStBhdu9B35kzfHc+1QihD5Z94u4uyWIVBIzikcdiY8LbQqSGVucmkgR29t +ZXogPGhnb21lekB1c2Vycy5zb3VyY2Vmb3JnZS5uZXQ+iFcEExECABcFAj02vbEF +CwcKAwQDFQMCAxYCAQIXgAAKCRAZMdaEMHoQpYijAKCCP68ndU/kTXR9XAKLvibC +3S8+1QCfUFQYte3Jo+MHKaWjsu9JGptRzo+5Ag0EPTa93RAIAKlsRJ5gOGTFsmaR +W9k6MIh4c/MCy7J7HUxT5xTdHROa+3zUh+FAE/JaOx9ZtZtH863DFHA8cP4L+tpi +PjBT6g2E94dwGcuH/OiSSCT4JSBukbGbOuLLdmFXqUl8+4gsL90Xal67FtNLwyLG +1n7geLir0byD+OT7VLA5w+6G0NOpJEveV/FIa2qLgdRZ8vz73ybgMh18hBUrUmro +jncp0rln2VU7VCH1C2aClKm7kK4mGAjIFIzKbguK+kM3b8NDHmXKpT6syyCtIM3h +prkV1TUCAFqLI32aSdlTN79lpeA2zDga9k4/4X/RDHsFpRN2neRFGTNUtuUgYpQQ +E5zWBmMAAwUH/RiGxyeBsad923IwE1+GAjxFl2tqF9xWk0J6yTnSK4nfhYAE9evV +jwDEok9jRl4ILCcXx6YN/d/lWNuSbARKHz/3hLiTouPpwd3SSJ8is2x9PgpJz5JX +cD0y1SkbPLvs3jH3ZmdcxZpuAmJeI/typqFKK5pWP44oXIH+XH/8nWDtmLEBkgKQ +/ATQWenMTmZ6MIJ6aWKWGkO9QS6iYRz3PPPGQ1O8W02CeprM2wBtlb8J1Z3RxNhM +rZcg/1Qi3V3D1HI4zw6tAFmDeBb8J4PaBQzqlhzx2EBTbfwNPhV8AlPvpxHEeGGn +v+O1yhZr33SnyZdINNoNDn+owVMdmkobe9GIRgQYEQIABgUCPTa93QAKCRAZMdaE +MHoQpRsTAJ4qst3MhLm48fBAEnzuzi/BIKr+AgCfYaCB/AvPoncQbHc8BcNGRimR +P9A= +=hQhz -END PGP PUBLIC KEY BLOCK- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat KEYS
hgomez 2002/09/13 02:38:06 Modified:.KEYS Log: Update KEYS notice and add my gpg signing key (for rpm) Revision ChangesPath 1.6 +42 -1 jakarta-tomcat/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat/KEYS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- KEYS 23 Jul 2001 23:24:46 - 1.5 +++ KEYS 13 Sep 2002 09:38:06 - 1.6 @@ -3,7 +3,14 @@ purpose is code signing. Apache users: pgp KEYS -Apache developers: pgp -kxa your name and append it to this file. +Apache developers: +(pgpk -ll your name pgpk -xa your name) this file. + or +(gpg --fingerprint --list-sigs your name + gpg --armor --export your name) this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). Type bits keyID Date User ID @@ -124,3 +131,37 @@ =waB/ -END PGP PUBLIC KEY BLOCK- +Type bits keyID Date User ID +pub 1024D/307A10A5 2002-07-18 Henri Gomez [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.0.6 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBD02vbERBAC1v8fR6gjERpaz4UMfdy0hRVWCPSbOdF+Swm/IenjVzErco6zb +MTa13umUNrDPBy/tTWiCCZrOnqi7fgDzWqPEqrXJjKAFVLEWE6MmKylPPEPG1/bm +idkNGERSAZduvhKv777PzvEJJ/8eGe3wy/O8NbgIjCPtr4UklwCZS8cFuwCg8oMO +UdT8qZRtzdxdAyu1m5fUb+MD/3IKJYWXsdtb6iBphCU4f/BoyjVC9EZJ1ywLuiVM +siKbuaDUaXU9nWcbNKv+fx8uZ1NaadpfLokqqhnWcpnSiqw8HNR7SwsF1D33rkXK +O4FSuVss/tIoqGdWFcJyPkP4yP5shxqR335narVw2vDa0+BiWkALbA2qVsSIdZDB +LeFZA/47AMBS0U2BRk2rQT8LmMuFl7mR+wNBM4n7FUGdxsGn3TcYd4pXTNrEQPrV +YNdooKlikgGk4hgFnIFX09Spmimqgq0goFue81rttVdZZ4uep8dTghY6gwmvcOxX +jATbhWStBhdu9B35kzfHc+1QihD5Z94u4uyWIVBIzikcdiY8LbQqSGVucmkgR29t +ZXogPGhnb21lekB1c2Vycy5zb3VyY2Vmb3JnZS5uZXQ+iFcEExECABcFAj02vbEF +CwcKAwQDFQMCAxYCAQIXgAAKCRAZMdaEMHoQpYijAKCCP68ndU/kTXR9XAKLvibC +3S8+1QCfUFQYte3Jo+MHKaWjsu9JGptRzo+5Ag0EPTa93RAIAKlsRJ5gOGTFsmaR +W9k6MIh4c/MCy7J7HUxT5xTdHROa+3zUh+FAE/JaOx9ZtZtH863DFHA8cP4L+tpi +PjBT6g2E94dwGcuH/OiSSCT4JSBukbGbOuLLdmFXqUl8+4gsL90Xal67FtNLwyLG +1n7geLir0byD+OT7VLA5w+6G0NOpJEveV/FIa2qLgdRZ8vz73ybgMh18hBUrUmro +jncp0rln2VU7VCH1C2aClKm7kK4mGAjIFIzKbguK+kM3b8NDHmXKpT6syyCtIM3h +prkV1TUCAFqLI32aSdlTN79lpeA2zDga9k4/4X/RDHsFpRN2neRFGTNUtuUgYpQQ +E5zWBmMAAwUH/RiGxyeBsad923IwE1+GAjxFl2tqF9xWk0J6yTnSK4nfhYAE9evV +jwDEok9jRl4ILCcXx6YN/d/lWNuSbARKHz/3hLiTouPpwd3SSJ8is2x9PgpJz5JX +cD0y1SkbPLvs3jH3ZmdcxZpuAmJeI/typqFKK5pWP44oXIH+XH/8nWDtmLEBkgKQ +/ATQWenMTmZ6MIJ6aWKWGkO9QS6iYRz3PPPGQ1O8W02CeprM2wBtlb8J1Z3RxNhM +rZcg/1Qi3V3D1HI4zw6tAFmDeBb8J4PaBQzqlhzx2EBTbfwNPhV8AlPvpxHEeGGn +v+O1yhZr33SnyZdINNoNDn+owVMdmkobe9GIRgQYEQIABgUCPTa93QAKCRAZMdaE +MHoQpRsTAJ4qst3MhLm48fBAEnzuzi/BIKr+AgCfYaCB/AvPoncQbHc8BcNGRimR +P9A= +=hQhz +-END PGP PUBLIC KEY BLOCK- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk aphowto.xml
hgomez 2002/09/12 00:53:09 Modified:jk/xdocs/jk aphowto.xml Log: Updates provided by IBM fellow Walt Krapohl Revision ChangesPath 1.9 +28 -21jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aphowto.xml 10 Sep 2002 11:35:20 - 1.8 +++ aphowto.xml 12 Sep 2002 07:53:09 - 1.9 @@ -9,12 +9,12 @@ section name=Introduction p This document explains how to connect Tomcat to the popular open source web server, Apache. -There is actually to version of Apache, 1.3 and 2.0 and both could used mod_jk, the Tomcat redirector +There is actually two version of Apache, 1.3 and 2.0 and both can be used with mod_jk, the Tomcat redirector module. /p p -We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a document +It is recommanded that you also read the a href=jk/workershowto.htmlWorkers HowTo/a document to learn how to setup the working entities between your WebServer and Tomcat Engines. /p @@ -161,7 +161,7 @@ /p p -For example JK 1.2.0 could be find a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/; +For example JK 1.2.0 can be found a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/; here/a and contains the following: /p @@ -287,7 +287,7 @@ note# JkRequestLogFormat set the request format /note readJkRequestLogFormat %w %V %T/read note# Send servlet for context /examples to worker named worker1/note -readJkMout /examples/servlet/* worker1/read +readJkMount /examples/servlet/* worker1/read note# Send JSPs for context /examples to worker named worker1/note readJkMount /examples/*.jsp worker1/read /screen @@ -297,7 +297,7 @@ section name=mod_jk Directives p -We'll discuss here about mod_jk directives and details them +We'll discuss here the mod_jk directives and details behind them /p subsection name=Define workers @@ -371,9 +371,9 @@ Request logging is configured and enabled on a per virtual host basis. To enable request logging for a virtual host just add a JkRequestLogFormat config. The syntax of the format string is similiar to the Apache LogFormat command, -here is a list of the avaialbe request log format options: +here is a list of the available request log format options: /p - + p table trthOptions/ththDescription/th/tr @@ -618,7 +618,7 @@ /subsection subsection name=Using configure to build mod_jk -pHere's how to use configure to prepare mod_jk building, just type: +pHere's how to use configure to prepare mod_jk for building, just type: source ./configure [autoconf arguments] [jakarta-tomcat-connectors arguments] /source @@ -793,14 +793,21 @@ section name=Building mod_jk for Apache on iSeries/OS400 p -Since OS400 V4R5, iSeries (AS/400) use Apache 2.0 as their primary web server, replacing the old IBM webserver. -It's now possible to build mod_jk on iSeries thanks to the help of IBM Rochester Labs who provided informations and patches -to adapt mod_jk to their Operating System. +Since OS400 V4R5, iSeries (AS/400) has used Apache 2.0 as their primary web server, +replacing the old IBM webserver. +It's now possible to build mod_jk on iSeries thanks to the help of the IBM +Rochester Labs which has provided information and patches +to adapt mod_jk to OS400. +/p +p +You should have at least Apache 2.0.39, a C Compiler and IFS. +Apache 2.0.39 is provided with the most recent set of PTFs for the iSeries Apache +server, which can be found at a href=http://www.ibm.com/servers/eserver/iseries/software/http/; +http://www.ibm.com/servers/eserver/iseries/software/http//a /p + p -You should have at least Apache 2.0.39 which is provided in recent PTFs, a C Compiler and IFS. -Since there's still no configure stuff on iSeries, you'll have to use the good command line or use a CL with is present -in mod_jk source. +To configure mod_jk on iSeries use the CL source provided with the mod_jk source. /p ul li @@ -813,7 +820,7 @@ Send the whole jk source directory to iSeries directory via FTP. /li li -Then go to iSeries command line : +Then go to the iSeries command line : /li /ul screen5250 @@ -901,9 +908,9 @@ typemake install/typebr/ note Configure in the Apache sources: /note typecd /home/apache/apache_1.3.26/type -typeconfigure ... --enable-module=dir --disable-shared=dir \ /type -type --activate-module=src/modules/jk/libjk.a \ /type -type --disable-shared=jk/type
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk domhowto.xml neshowto.xml iishowto.xml
hgomez 2002/09/12 00:54:16 Modified:jk/xdocs/jk domhowto.xml neshowto.xml iishowto.xml Log: Correct english sentences Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml Index: domhowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- domhowto.xml 10 Sep 2002 08:02:49 - 1.3 +++ domhowto.xml 12 Sep 2002 07:54:16 - 1.4 @@ -12,7 +12,7 @@ /p p -We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a document +It is recommanded that you also read the a href=jk/workershowto.htmlWorkers HowTo/a document to learn how to setup the working entities between your WebServer and Tomcat Engines. /p 1.4 +1 -1 jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml Index: neshowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- neshowto.xml 10 Sep 2002 08:02:49 - 1.3 +++ neshowto.xml 12 Sep 2002 07:54:16 - 1.4 @@ -18,7 +18,7 @@ /p p -We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a document +It is recommanded that you also read the a href=jk/workershowto.htmlWorkers HowTo/a document to learn how to setup the working entities between your WebServer and Tomcat Engines. /p 1.4 +1 -1 jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml Index: iishowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iishowto.xml 10 Sep 2002 08:02:49 - 1.3 +++ iishowto.xml 12 Sep 2002 07:54:16 - 1.4 @@ -18,7 +18,7 @@ /p p -We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a document +It is recommanded that you also read the a href=jk/workershowto.htmlWorkers HowTo/a document to learn how to setup the working entities between your WebServer and Tomcat Engines. /p -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/resources LocalStrings_fr.properties
hgomez 2002/09/12 07:27:16 Modified:src/share/org/apache/tomcat/resources LocalStrings_fr.properties Log: Correct typo Revision ChangesPath 1.5 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_fr.properties Index: LocalStrings_fr.properties === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_fr.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LocalStrings_fr.properties3 Nov 2001 03:50:50 - 1.4 +++ LocalStrings_fr.properties12 Sep 2002 14:27:16 - 1.5 @@ -15,7 +15,7 @@ defaulterrorpage.includedservlet=Erreur de Servlet incluse: defaulterrorpage.location=Location: defaulterrorpage.errorlocation=Erreur de Location: -defaulterrorpage.notfound404=Introuvabble(404) +defaulterrorpage.notfound404=Introuvable(404) defaulterrorpage.rootcause=Raison principale: defaulterrorpage.documentmoved=Le document a été déplacé defaulterrorpage.thisdocumenthasmoved=Ce document a été déplacé -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/resources messages_fr.properties
hgomez 2002/09/12 07:32:52
Modified:src/share/org/apache/jasper/resources messages_fr.properties
Log:
Add missing fr translations
Revision ChangesPath
1.6 +4 -1
jakarta-tomcat/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages_fr.properties30 Nov 2001 22:20:07 - 1.5
+++ messages_fr.properties12 Sep 2002 14:32:52 - 1.6
@@ -208,3 +208,6 @@
jspc.error.emptyWebApp=-webapp nécessite un argument suivant de type fichier
jsp.error.no.more.content=Fin de contenu atteinte alors que plus d''analyse est
nécessaire: Un tag non terminé ou une erreur de tag imbriqué?
jsp.error.unterminated.user.tag=Tag utilisateur non terminé: Le tag de fermeture
{0} est introuvable ou incorrectement imbriqué
+jsp.error.invalid.javaEncoding=Encodage java invalide. Les essais avec {0} puis
avec {1} ont échoués.
+jsp.error.needAlternateJavaEncoding=L'encodage java par défaut {0} n'est pas valide
sur votre environnement java. Une alternative peut être spécifiée via le paramêtre
'javaEncoding' de JspServlet.
+jsp.error.badcount=Erreur Interne. Tentative de décrément du compteur de reference
sur une JSP non référencéess.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
hgomez 2002/09/12 09:29:19
Modified:jk/native/common jk_jni_worker.c
Log:
OS400 JNI need strings to be converted from EBCDIC to ASCII
Revision ChangesPath
1.14 +46 -1 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_jni_worker.c 4 Sep 2002 11:41:20 - 1.13
+++ jk_jni_worker.c 12 Sep 2002 16:29:19 - 1.14
@@ -1045,7 +1045,18 @@
jk_log(l, JK_LOG_DEBUG,
Into get_bridge_object\n);
+/* OS400 need conversion from EBCDIC to ASCII before passing to JNI*/
+
+#ifdef AS400
+#pragma convert(819)
+#endif
+
p-jk_java_bridge_class = (*env)-FindClass(env, JAVA_BRIDGE_CLASS_NAME);
+
+#ifdef AS400
+#pragma convert(0)
+#endif
+
if(!p-jk_java_bridge_class) {
jk_log(l, JK_LOG_EMERG, Can't find class %s\n, JAVA_BRIDGE_CLASS_NAME);
return JK_FALSE;
@@ -1053,10 +1064,18 @@
jk_log(l, JK_LOG_DEBUG,
In get_bridge_object, loaded %s bridge class\n,
JAVA_BRIDGE_CLASS_NAME);
+#ifdef AS400
+#pragma convert(819)
+#endif
+
constructor_method_id = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
init, /* method name */
()V); /* method sign */
+#ifdef AS400
+#pragma convert(0)
+#endif
+
if(!constructor_method_id) {
p-jk_java_bridge_class = NULL;
jk_log(l, JK_LOG_EMERG,
@@ -1091,28 +1110,54 @@
JNIEnv *env,
jk_logger_t *l)
{
+
+#ifdef AS400
+#pragma convert(819)
+#endif
+
p-jk_startup_method = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
startup,
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I);
+
+#ifdef AS400
+#pragma convert(0)
+#endif
+
if(!p-jk_startup_method) {
jk_log(l, JK_LOG_EMERG, Can't find startup()\n);
return JK_FALSE;
}
+#ifdef AS400
+#pragma convert(819)
+#endif
+
p-jk_service_method = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
service,
(JJ)I);
+#ifdef AS400
+#pragma convert(0)
+#endif
+
if(!p-jk_service_method) {
jk_log(l, JK_LOG_EMERG, Can't find service()\n);
return JK_FALSE;
}
+#ifdef AS400
+#pragma convert(819)
+#endif
+
p-jk_shutdown_method = (*env)-GetMethodID(env,
p-jk_java_bridge_class,
shutdown,
()V);
+#ifdef AS400
+#pragma convert(0)
+#endif
+
if(!p-jk_shutdown_method) {
jk_log(l, JK_LOG_EMERG, Can't find shutdown()\n);
return JK_FALSE;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs menu.idx style.xsl.in
hgomez 2002/09/10 01:02:13
Modified:jk/xdocs menu.idx style.xsl.in
Log:
Add section in document, allowing spacing in final HTML.
Still behind JF for XSL but ...
Revision ChangesPath
1.9 +14 -5 jakarta-tomcat-connectors/jk/xdocs/menu.idx
Index: menu.idx
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/menu.idx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- menu.idx 9 Sep 2002 15:00:57 - 1.8
+++ menu.idx 10 Sep 2002 08:02:13 - 1.9
@@ -1,18 +1,27 @@
?xml version=1.0?
index
+ section name=Presentation
document href=index.xml/
+ /section
+
+ section name=Commons
document href=common/AJPv13.xml/
document href=common/AJPv14-proposal.xml/
- document/
+ document href=faq.xml/
+ /section
+
+ section name=JK
document href=jk/aphowto.xml/
+ document href=jk/domhowto.xml/
document href=jk/iishowto.xml/
document href=jk/neshowto.xml/
- document href=jk/domhowto.xml/
document href=jk/workershowto.xml/
- document/
+ /section
+
+ section name=JK2
document href=jk2/configtc.xml/
document href=jk2/configweb.xml/
- document/
- document href=faq.xml/
+ /section
+
/index
1.10 +46 -36jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- style.xsl.in 9 Sep 2002 15:00:57 - 1.9
+++ style.xsl.in 10 Sep 2002 08:02:13 - 1.10
@@ -150,50 +150,60 @@
within the index.
--
xsl:variable name=root select=//
-xsl:for-each select=document('menu.idx')/index/document
- xsl:variable name=href select=@href/
- xsl:if test=string-length($href) = 0
-tr height=6/
- /xsl:if
- tr
-td bgcolor=#cc width=150 colspan=2
- nobr
-a class=menu
- xsl:call-template name=converturi
-xsl:with-param name=href select=@href/
- /xsl:call-template
-/a
- /nobr
-/td
- /tr
- tr height=2
+xsl:for-each select=document('menu.idx')/index/section
+ tr height=6
+ td bgcolor=#cc width=150 colspan=2
+ xsl:value-of select=@name/
+ /td
/tr
+ xsl:for-each select=./document
+ xsl:variable name=href select=@href/
+ tr
+ td bgcolor=#cc width=150 colspan=2
+ nobr
+ a class=menu
+ xsl:call-template name=converturi
+ xsl:with-param name=href select=@href/
+ /xsl:call-template
+ /a
+ /nobr
+ /td
+ /tr
+ tr height=2
+ /tr
- !--
-Slightly more complicated, we use the document-location function
-and compare against it to see whether we are in the same file or
-not. If we actually are, we expand to the section level.
- --
- xsl:if test=$root/document/properties/title =
document(@href)/document/properties/title
-xsl:for-each select=document(@href)/document/section
- tr
-td bgcolor=#cc width=10/
-td bgcolor=#cc width=140
- a class=menu href=#{@name}
-xsl:value-of select=@name/
- /a
-/td
- /tr
- tr height=1
- /tr
-/xsl:for-each
- /xsl:if
+ !--
+ Slightly more complicated, we use the document-location
function
+ and compare against it to see whether we are in the same
file or
+ not. If we actually are, we expand to the section level.
+ --
+ xsl:if test
cvs commit: jakarta-tomcat-connectors/jk/xdocs faq.xml index.xml
hgomez 2002/09/10 01:02:50 Modified:jk/xdocs/jk workershowto.xml iishowto.xml aphowto.xml neshowto.xml domhowto.xml jk/xdocs/common AJPv14-proposal.xml AJPv13.xml jk/xdocs faq.xml index.xml Log: Fixes typos and styles Revision ChangesPath 1.3 +12 -10jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml Index: workershowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workershowto.xml 9 Sep 2002 09:56:35 - 1.2 +++ workershowto.xml 10 Sep 2002 08:02:49 - 1.3 @@ -73,7 +73,7 @@ p Each named worker should also have a few entries to provide additional information on his behalf. This information includes the worker's type and other related worker information. -Currently the following worker types that exists are (jk 1.2.0): +Currently the following worker types that exists are (JK 1.2.0): /p table @@ -203,13 +203,13 @@ /p p -bcachesize/b property is usefull when you're using jk in multithreaded +bcachesize/b property is usefull when you're using JK in multithreaded web servers such as Apache 2.0, IIS and Netscape. They will benefit the most by setting this value to a higher level (such as the estimated average concurrent users for Tomcat). /p p -bcache_timeout/b property should be used with bcachesize/b to specify how to time jk should keep +bcache_timeout/b property should be used with bcachesize/b to specify how to time JK should keep an open socket in cache before closing it. This property should be used to reduce the number of threads on the Tomcat WebServer. /p @@ -244,9 +244,11 @@ /p p -bsocket_timeout/b property told webserver to cut an ajp13 connection after some time of use. -It's a good way to ensure that there won't be any unused threads living on Tomcat side, with the -extra cost of reopening sockets next time a request be forwarded. +bsocket_timeout/b property told webserver to cut an ajp13 connection after some time of +inactivity. When choosing an endpoint for a request and the assigned socket is open, it will be +closed if it was not used for the configured time. +It's a good way to ensure that there won't too old threads living on Tomcat side, +with the extra cost you need to reopen the socket next time a request be forwarded. This property is very similar to bcache_timeout/b but works also in non-cache mode. /p @@ -323,7 +325,7 @@ Note: Since the JVM is multithreaded; the jni worker should be used only within multithreaded servers such as AOLServer, IIS, Netscape and Apache 2.0.br/ You should also make sure that the threading scheme used by the web servers match the one -used to build the jk web server plugin. +used to build the JK web server plugin. /p p @@ -344,7 +346,7 @@ p The bclass_path/b property can be given in multiple lines. -In this case the jk environment will concatenate all the classpath entries together +In this case the JK environment will concatenate all the classpath entries together by putting path delimiter (:/;) between the entries. /p @@ -361,7 +363,7 @@ p The cmd_line property can be given in multiple lines. -In this case the jk environment will concatenate all the cmd_line entries together by putting spaces +In this case the JK environment will concatenate all the cmd_line entries together by putting spaces between the entries. /p @@ -458,7 +460,7 @@ section name=A sample worker.properties p Since coping with worker.properties on your own is not an easy thing to do, -a sample worker.properties file is bundled along jk. +a sample worker.properties file is bundled along JK. /p p 1.3 +1 -1 jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml Index: iishowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- iishowto.xml 9 Sep 2002 09:57:10 - 1.2 +++ iishowto.xml 10 Sep 2002 08:02:49 - 1.3 @@ -13,7 +13,7 @@ p Normally IIS can not execute Servlets and Java Server Pages (JSPs), -configuring IIS to use the mod_jk redirector plugin will let IIS send servlet and +configuring IIS to use the JK ISAPI redirector plugin will let IIS send servlet and JSP requests to Tomcat (and this way, serve them to clients). /p 1.5 +4 -4 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk workershowto.xml
hgomez 2002/09/10 01:36:30 Modified:jk/xdocs/jk workershowto.xml Log: Added the documentation on advanced lb ie, local_worker and local_worker_only Revision ChangesPath 1.4 +81 -0 jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml Index: workershowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- workershowto.xml 10 Sep 2002 08:02:49 - 1.3 +++ workershowto.xml 10 Sep 2002 08:36:30 - 1.4 @@ -313,6 +313,87 @@ /subsection +subsection name=Advanced lb Worker properties +p +With JK 1.2.x, new load-balancing and fault-tolerant support has been added via +2 new properties, blocal_worker_only/b and blocal_worker/b. +/p + +p +Let's take an example environment: +/p + +p +A cluster with two nodes (worker1+worker2), running a webserver + tomcat tandem on each node and +a loadbalancer in front of the nodes. +/p + +screen +noteThe advanced router LB worker/note +readworker.list=router/read +note# Define a 'local_worker' worker using ajp13/note +readworker.worker1.port=8009/read +readworker.worker1.host=node1.domain.org/read +readworker.worker1.type=ajp13/read +readworker.worker1.lbfactor=1/read +readworker.worker1.local_worker=1/read +note# Define another 'local_worker' worker using ajp13/note +readworker.worker2.port=8009/read +readworker.worker2.host=node2.domain.org/read +readworker.worker2.type=ajp13/read +readworker.worker2.lbfactor=1/read +readworker.worker2.local_worker=0/read +note# Define the LB worker/note +readworker.router.type=lb/read +readworker.router.balanced_workers=worker1,worker2/read +readworker.router.local_worker_only=1/read +/screen + +p +The blocal_worker/b flag on worker1 and worker2 tells the blb_worker/b which connections are going +to the local worker. +/p + +p +If local_worker is an int and is not 0 it is set to JK_TRUE and marked as local worker, JK_FALSE otherwise. +If in minimum one worker is marked as local worker, lb_worker is in local worker mode. +All local workers are moved to the beginning of the internal worker list in lb_worker during validation. +/p + +p +This means that if a request with a session id comes in it would be routed to the appropriate worker. +If this worker is down it will be send to the first local worker which is not in error state. +/p + +p +If a request without a session comes in, it would be routed to the first local worker. +If all local worker are in error state, then the 'local_worker_only' flag is important. +If it was set to an int and this wasn't 0 it is set to JK_TRUE, JK_FALSE otherwise. With set to JK_TRUE, this request gets an error response. If set to JK_FALSE lb_worker tries to route the request to another balanced worker. +/p + +p +If one of the worker was in error state and has recovered nothing changes. +The local worker will be check for requests without a session id (and with a session on himself) and +the other worker will only be checked if a request with a session id of this worker comes in. +/p + +p +Why do we need souch a complex behavior ? +/p + +p +We need a graceful shut down of a node for maintenance. The balancer in front asks a special port on each +node periodically. If we want to remove a node from the cluster, we switch off this port. +The loadbalancer can't connect to it and marks the node as down. +But we don't move the sessions to another node. In this environment it is an error if the balancer sends a request without a session to an apache+mod_jk+tomcat which port is switched off. And if the load balancer determines that a node is down no other node is allowed to send a request without a session to it. Only requests with old sessions on the switched off node would be routed to this node. After some time nobody uses the old sessions and the sessions will time out. Then nobody uses this node, because all session are gone and the node is unreachable without a session-id in the request. If someone uses a session which timed out, our servlet system sends a redirect response without a session id to the browser. This is necessary for me, because on a switched off node apache and tomcat can still be up and running, but they are in an old state and should only be asked for valid old sessions. After the last session timed out, I could update the node etc. without killing sessions or moving them to another node. Sometimes we have a lot of big objects in our sessions, so it would be really time consuming to move them. +/p + +p +The defaults are still local_worker: 0 and local_worker_only:0 +/p + +/subsection + subsection name=jni Worker properties p The jni
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk aphowto.xml
hgomez 2002/09/10 01:38:27 Modified:jk/xdocs/jk aphowto.xml Log: Changed the name of iSeries SRVPGM (shared lib) from QCZTC to MODJK to avoid clash with original SRVPGM Revision ChangesPath 1.6 +1 -1 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aphowto.xml 10 Sep 2002 08:02:49 - 1.5 +++ aphowto.xml 10 Sep 2002 08:38:27 - 1.6 @@ -850,7 +850,7 @@ note5250Launch the build/note5250 type5250CALL MOD_JK/BLDJK/type5250br/ note5250If the build if successfull, copy the new mod_jk module/note5250 -type5250CRTDUPOBJ OBJ(MOD_JK) FROMLIB(MOD_JK) OBJTYPE(*SRVPGM) TOLIB(QHTTPSVR) NEWOBJ(QZTCJK)/type5250 +type5250CRTDUPOBJ OBJ(MOD_JK) FROMLIB(MOD_JK) OBJTYPE(*SRVPGM) TOLIB(QHTTPSVR) NEWOBJ(MODJK)/type5250 /screen5250 p Next, you should restart your Apache 2.0 server and enjoy this piece of OpenSource on iSeries. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl.in
hgomez 2002/09/10 02:08:18
Modified:jk/xdocs style.xsl.in
Log:
Change color for section
Revision ChangesPath
1.11 +2 -2 jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- style.xsl.in 10 Sep 2002 08:02:13 - 1.10
+++ style.xsl.in 10 Sep 2002 09:08:18 - 1.11
@@ -152,7 +152,7 @@
xsl:variable name=root select=//
xsl:for-each select=document('menu.idx')/index/section
tr height=6
- td bgcolor=#cc width=150 colspan=2
+ td bgcolor=#d0d0d0 width=150 colspan=2
xsl:value-of select=@name/
/td
/tr
@@ -200,7 +200,7 @@
both for C and for Java
--
tr height=6
-td bgcolor=#cc width=150 colspan=2
+td bgcolor=#d0d0d0 width=150 colspan=2
Developpers
/td
/tr
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk aphowto.xml
hgomez 2002/09/10 04:35:20 Modified:jk/xdocs/jk aphowto.xml Log: Fixes typos :) Revision ChangesPath 1.8 +2 -2 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aphowto.xml 10 Sep 2002 11:15:15 - 1.7 +++ aphowto.xml 10 Sep 2002 11:35:20 - 1.8 @@ -857,9 +857,9 @@ /p /section -section name=Getting mod_jk linked staticly with Apache +section name=Getting mod_jk linked statically with Apache p -mod_jk allows to install mod_jk in the Apache source tree to get a staticly +mod_jk allows to install mod_jk in the Apache source tree to get a statically linked mod_jk. Having mod_jk in the httpd executable brings some performance improvements. The configure option --with-apache prepare mod_jk to install it in the Apache source tree. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
hgomez 2002/09/09 02:14:00 Modified:jk/xdocs index.xml Log: More updates on index (fix jk/mod_jk names) Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.xml 6 Sep 2002 12:24:03 - 1.6 +++ index.xml 9 Sep 2002 09:13:59 - 1.7 @@ -12,7 +12,7 @@ It was a completely new Tomcat-Apache plug-in that handles the communication between Tomcat and Apache. /p p -The newest bjk2/b is a rewrite of bmod_jk/b. +The newest bjk2/b is a rewrite of bjk/b. The native part has been completly restructured and the configuration has been simplified a lot. /p -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl.in
hgomez 2002/09/09 02:15:15
Modified:jk/xdocs style.xsl.in
Log:
Fixe left align with IE 6.x
Revision ChangesPath
1.8 +5 -5 jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- style.xsl.in 5 Sep 2002 08:39:26 - 1.7
+++ style.xsl.in 9 Sep 2002 09:15:15 - 1.8
@@ -85,7 +85,7 @@
/tr
!--
-Our first row contains the Jakarta and the WebApp logos.
+Our first row contains the Jakarta and the JK logos.
--
tr
td bgcolor={$body-bg} class=logo colspan=2 width=*
@@ -324,7 +324,7 @@
/xsl:template
xsl:template match=th
-td bgcolor={$table-th-bg} valign=top
+td bgcolor={$table-th-bg} valign=top align=middle
xsl:if test=@colspan
xsl:attribute name=colspan
xsl:value-of select=@colspan/
@@ -359,7 +359,7 @@
div align=center
table width=80% border=1 cellspacing=0 cellpadding=2
bgcolor=#cc
tr
-td bgcolor=#cc
+td bgcolor=#cc align=left
xsl:apply-templates select=note|wait|type|typenext|read/
/td
/tr
@@ -373,7 +373,7 @@
div align=center
table width=80% border=1 cellspacing=0 cellpadding=2
bgcolor=#00
tr
-td bgcolor=#00
+td bgcolor=#00 align=left
xsl:apply-templates
select=notedos|waitdos|typedos|typedosnext|readdos/
/td
/tr
@@ -387,7 +387,7 @@
div align=center
table width=80% border=1 cellspacing=0 cellpadding=2
bgcolor=#00
tr
-td bgcolor=#00
+td bgcolor=#00 align=left
xsl:apply-templates
select=note5250|wait5250|type5250|type5250next|read5250/
/td
/tr
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk aphowto.xml
hgomez 2002/09/09 02:15:36 Modified:jk/xdocs/jk aphowto.xml Log: Updates and complete Apache HowTo Revision ChangesPath 1.3 +112 -23 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aphowto.xml 6 Sep 2002 12:24:32 - 1.2 +++ aphowto.xml 9 Sep 2002 09:15:36 - 1.3 @@ -281,9 +281,9 @@ note# JkRequestLogFormat set the request format /note readJkRequestLogFormat %w %V %T/read note# Send servlet for context /examples to worker named worker1/note -readJkMout /examples/servlet/* /read +readJkMout /examples/servlet/* worker1/read note# Send JSPs for context /examples to worker named worker1/note -readJkMount /examples/*.jsp/read +readJkMount /examples/*.jsp worker1/read /screen /subsection @@ -294,6 +294,19 @@ We'll discuss here about mod_jk directives and details them /p +subsection name=Define workers +p +bJkWorkersFile/b specify the location where mod_jk will find the workers definitions. + +screen +readJkWorkersFile /etc/httpd/conf/workers.properties/read +/screen + +br/ +br/ +/p +/subsection + subsection name=Logging p bJkLogFile/b specify the location where mod_jk is going to place its log file. @@ -302,12 +315,18 @@ readJkLogFile /var/log/httpd/mod_jk.log/read /screen +br/ +br/ /p + p -bJkLogLevel/b set the log level between : +bJkLogLevel/b +set the log level between : +/p + ul li -binfo/b log will contains standard mod_jk activity. +binfo/b log will contains standard mod_jk activity (default). /li li berror/b log will contains also error reports. @@ -317,25 +336,28 @@ /li /ul -p -binfo/b should be your default selection for normal operations. -/p - screen readJkLogLevelinfo/read /screen +p +codeinfo/code should be your default selection for normal operations. +br/ +br/ /p - p bJkLogStampFormat/b will configure the date/time format found on mod_jk logfile. Using the strftime() format string it's set by default to b[%a %b %d %H:%M:%S %Y]/b +/p screen readJkLogStampFormat [%a %b %d %H:%M:%S %Y] /read /screen +p +br/ +br/ /p p @@ -371,59 +393,119 @@ readJkRequestLogFormat %w %V %T/read /screen +br/ +br/ /p /subsection subsection name=Forwarding p -The directive JkOptions allow you to set many forwarding options : +The directive JkOptions allow you to set many forwarding options which will enable (+) +or disable (-) following option. +br/ +br/ /p p -With bForwardKeySize/b, you ask mod_jk, when using ajp13, to forward also the SSL Key Size as +JkOptions bForwardKeySize/b, you ask mod_jk, when using ajp13, to forward also the SSL Key Size as required by Servlet API 2.3. This flag shouldn't be set when servlet engine is Tomcat 3.2.x (on by default). + +screen +readJkOptions +ForwardKeySize/read +/screen + +br/ +br/ /p p -With bForwardURICompat/b, you told mod_jk to send the URI to Tomcat normally, +JkOptions bForwardURICompat/b, you told mod_jk to send the URI to Tomcat normally, which is less spec compliant but mod_rewrite compatible, use it for compatibility with Tomcat 3.2.x engines (on by default). + +screen +readJkOptions +ForwardURICompat/read +/screen + +br/ +br/ +/p + +p +JkOptions bForwardURICompatUnparsed/b, the forwarded URI +is unparsed, it's spec compliant but broke mod_rewrite. + +screen +readJkOptions +ForwardURICompatUnparsed/read +/screen + +br/ +br/ /p p -With bForwardURICompatUnparsed/b, the forwarded URI is unparsed, it's spec compliant but broke mod_rewrite. +JkOptions bForwardURIEscaped/b, the forwarded URI is escaped and +Tomcat (since 3.3 rc2) will do the decoding part. + +screen +readJkOptions +ForwardURIEscaped/read +/screen + +br/ +br/ /p p -With bForwardURIEscaped/b, the forwarded URI is escaped and Tomcat (since 3.3 rc2) will do the decoding part. +JkOptions bForwardDirectories/b is used in conjunction with bDirectoryIndex/b +directive of Apache web server. As such mod_dir should be available to Apache, +statically or dynamically (DSO) +br/ +br/ /p p -With bForwardDirectories/b, This option is used in conjunction with DirectoryIndex directive of Apache web -server. When DirectoryIndex is configured, Apache will create sub-requests for +When DirectoryIndex is configured, Apache will create sub-requests for each of the local-url's specified in the directive, to determine
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk workershowto.xml
hgomez 2002/09/09 02:16:42 Added: jk/xdocs/jk workershowto.xml Log: Add WorkersHowTo (still need works and review). I'd like to see commiters check cache_timeout and socket_timeout. Also I'll need informations of load balancing settings for error mode only (failover) Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml Index: workershowto.xml === ?xml version=1.0 encoding=ISO-8859-1 ? document properties titleWorkers HowTo/title author email=[EMAIL PROTECTED]Henri Gomez/author author email=[EMAIL PROTECTED]Gal Shachor/author /properties section name=Introduction p A Tomcat worker is a Tomcat instance that is waiting to execute servlets on behalf of some web server. For example, we can have a web server such as Apache forwarding servlet requests to a Tomcat process (the worker) running behind it. /p p The scenario described above is a very simple one; in fact one can configure multiple Tomcat workers to serve servlets on behalf of a certain web server. The reasons for such configuration can be: /p ul li We want different contexts to be served by different Tomcat workers to provide a development environment where all the developers share the same web server but own a Tomcat worker of their own. /li li We want different virtual hosts served by different Tomcat processes to provide a clear separation between sites belonging to different companies. /li li We want to provide load balancing, meaning run multiple Tomcat workers each on a machine of its own and distribute the requests between them. /li /ul p There are probably more reasons for having multiple workers but I guess that this list is enough... Tomcat workers are defined in a properties file dubbed workers.properties and this tutorial explains how to work with it. /p p This document was originally part of bTomcat: A Minimalistic User's Guide/b written by Gal Shachor, but has been split off for organizational reasons. /p /section section name=Defining Workers p Defining workers to the Tomcat web server plugin can be done using a properties file (a sample file named workers.properties is available in the conf/ directory). /p p the file contains entries of the following form: /p p bworker.list/b=lt;a comma separated list of worker namesgt; /p screen notethe list of workers/note readworker.list= worker1, worker2/read /screen p When starting up, the web server plugin will instantiate the workers whose name appears in the bworker.list/b property, these are also the workers to whom you can map requests. /p subsection name=Workers Type p Each named worker should also have a few entries to provide additional information on his behalf. This information includes the worker's type and other related worker information. Currently the following worker types that exists are (jk 1.2.0): /p table trthType/ththDescription/th/tr trtdajp12/tdtdThis worker knows how to forward requests to out-of-process Tomcat workers using the ajpv12 protocol./td/tr trtdajp13/tdtdThis worker knows how to forward requests to out-of-process Tomcat workers using the ajpv13 protocol./td/tr trtdjni/tdtdThis worker knows how to forward requests to in-process Tomcat workers using JNI./td/tr trtdlb/tdtdThis is a load-balancing worker; it knows how to provide round-robin based sticky load balancing with a certain level of fault-tolerance./td/tr /table p Defining workers of a certain type should be done with the following property format: /p p bworker/b. bworker name/b.btype/b=lt;worker typegt; Where worker name is the name assigned to the worker and the worker type is one of the four types defined in the table (a worker name may not contain any space (a good naming convention for queue named should follow the Java variable naming rules). /p screen noteDefines a worker named local that uses the ajpv12 protocol to forward requests to a Tomcat process./note readworker.local.type=ajp12/read noteDefines a worker named remote that uses the ajpv13 protocol to forward requests to a Tomcat process./note readworker.remote.type=ajp13/read noteDefines a worker named fast that uses JNI to forward requests to a Tomcat process./note readworker.fast.type=jni/read noteDefines a worker named loadbalancer that loadbalances several Tomcat processes transparently./note readworker.loadbalancer.type=lb/read /screen /subsection /section section name=Setting Worker Properties p After defining the workers you can also specify properties for them. Properties can be specified in the following manner: /p p worker.lt;worker namegt;.lt;propertygt;=lt;property valuegt; /p
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk workershowto.xml
hgomez 2002/09/09 02:56:35 Modified:jk/xdocs/jk workershowto.xml Log: Added JNI informations Revision ChangesPath 1.2 +87 -1 jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml Index: workershowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/workershowto.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workershowto.xml 9 Sep 2002 09:16:42 - 1.1 +++ workershowto.xml 9 Sep 2002 09:56:35 - 1.2 @@ -306,7 +306,7 @@ screen note The worker balance1 while use real workers worker1 and worker2/note -readworker.balance1.balanced_workers= worker1, worker2/read +readworker.balance1.balanced_workers=worker1, worker2/read /screen /subsection @@ -432,6 +432,92 @@ /subsection +subsection name=Property file macros +p +You can define macros in the property files. +These macros let you define properties and later on use them while +constructing other properties and it's very usefull when you want to +change your Java Home, Tomcat Home or OS path separator +/p + +screen +noteproperty example, don't hardcode path separator/note +ps=\ +readworkers.tomcat_home=d:\tomcat/read +readworkers.java_home=d:\sdk\jdk1.2.2/read +noteUsing macros we'll have : worker.inprocess.class_path=d:\tomcat\classes/note +readworker.inprocess.class_path=$(workers.tomcat_home)$(ps)classes/read +noteUsing macros we'll have : worker.inprocess.class_path=d:\sdk\jdk1.2.2\lib\tools.jar/note +readworker.inprocess.class_path=$(workers.java_home)$(ps)lib$(ps)tools.jar/read +/screen + +/subsection + +/section + +section name=A sample worker.properties +p +Since coping with worker.properties on your own is not an easy thing to do, +a sample worker.properties file is bundled along jk. +/p + +p +You could also find here a sample workers.properties defining : +/p + +ul +li +An ajp12 worker that used the host localhost and the port 8007 +/li +li +An ajp13 worker that used the host localhost and the port 8008 +/li +li +A jni worker +/li +li +A lb worker that load balance the ajp12 and ajp13 workers +/li +/ul + +screen +note# Define some properties/note +readworkers.apache_log=/var/log/httpd//read +readworkers.tomcat_home=/var/tomcat3/read +readworkers.java_home=/opt/IBMJava2-131//read +readps=//read +note# Define 4 workers, 3 real workers using ajp12, ajp13, jni, the last one being a loadbalancing worker/note +readworker.list=worker1, worker2, worker3, worker4/read +note# Set properties for worker1 (ajp12)/note +readworker.worker1.type=ajp12/read +readworker.worker1.host=locahost/read +readworker.worker1.port=8007/read +readworker.worker1.lbfactor=5/read +note# Set properties for worker2 (ajp13)/note +readworker.worker2.type=ajp13/read +readworker.worker2.host=locahost/read +readworker.worker2.port=8009/read +readworker.worker2.lbfactor=50/read +readworker.worker2.cachesize=10/read +readworker.worker2.cache_timeout=600/read +readworker.worker2.socket_keepalive=1/read +readworker.worker2.socket_timeout=300/read +note# Set properties for worker3 (jni)/note +readworker.worker3.type=jni/read +note# Set worker3 classpath/note +readworker.worker3.class_path=$(workers.tomcat_home)$(ps)classes/read +readworker.worker3.class_path=$(workers.tomcat_home)$(ps)lib$(ps)tomcat.jar/read +note# Set worker3 tomcat command line/note +readworker.worker3.cmd_line=-home/read +readworker.worker3.cmd_line=$(workers.tomcat_home)/read +note# Set worker3 Tomcat/JVM settings/note +readworker.worker3.jvm_lib=$(workers.java_home)$(ps)jre$(ps)bin$(ps)classic$(ps)libjvm.so/read +readworker.worker3.stdout=$(workers.apache_log)$(ps)inprocess.stdout/read +readworker.worker3.stderr=$(workers.apache_log)$(ps)inprocess.stderr/read +readworker.worker3.sysprops=tomcat.home=$(workers.tomcat_home)/read +note# Set properties for worker4 (lb) which use worker1 and worker2/note +readworker.worker4.balanced_workers=worker1,worker2/read +/screen /section -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk domhowto.xml neshowto.xml aphowto.xml iishowto.xml
hgomez 2002/09/09 02:57:10
Modified:jk/xdocs/jk domhowto.xml neshowto.xml aphowto.xml
iishowto.xml
Log:
Add references to WorkersHowTo, a must read ;)
Revision ChangesPath
1.2 +5 -0 jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml
Index: domhowto.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domhowto.xml 5 Sep 2002 12:51:26 - 1.1
+++ domhowto.xml 9 Sep 2002 09:57:10 - 1.2
@@ -12,6 +12,11 @@
/p
p
+We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a
document
+to learn how to setup the working entities between your WebServer and Tomcat
Engines.
+/p
+
+p
Recent version of the Lotus Domino web server have had the ability to host Java
servlets,
but at the time of writing the Domino servlet container uses JDK 1.2.2 and it is
not (apparently)
possible to replace this with JDK 1.3.
1.2 +7 -0 jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml
Index: neshowto.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- neshowto.xml 5 Sep 2002 08:38:50 - 1.1
+++ neshowto.xml 9 Sep 2002 09:57:10 - 1.2
@@ -10,11 +10,18 @@
p
This document explains how to set up Netscape web servers to cooperate with Tomcat.
/p
+
p
Normally the Netscape web servers come with their own Servlet engine,
but you can also configure them to send servlet and JSP requests to Tomcat
using the Tomcat redirector plugin.
/p
+
+p
+We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a
document
+to learn how to setup the working entities between your WebServer and Tomcat
Engines.
+/p
+
subsection name=Document Conventions and Assumptions
p
1.4 +8 -2 jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml
Index: aphowto.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aphowto.xml 9 Sep 2002 09:15:36 - 1.3
+++ aphowto.xml 9 Sep 2002 09:57:10 - 1.4
@@ -10,8 +10,14 @@
p
This document explains how to connect Tomcat to the popular open source web server,
Apache.
There is actually to version of Apache, 1.3 and 2.0 and both could used mod_jk, the
Tomcat redirector
-module
+module.
/p
+
+p
+We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a
document
+to learn how to setup the working entities between your WebServer and Tomcat
Engines.
+/p
+
p
This document was originally part of bTomcat: A Minimalistic User's Guide/b
written by Gal Shachor,
but has been split off for organizational reasons.
@@ -36,7 +42,7 @@
/p
p
In all the examples in this document ${tomcat_home} will be b/var/tomcat3/b.
-A worker is defined to be a tomcat process that accepts work from the IIS server.
+A a href=jk/workershowto.htmlworker/a is defined to be a tomcat process that
accepts work from the IIS server.
/p
/subsection
1.2 +7 -0 jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml
Index: iishowto.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iishowto.xml 5 Sep 2002 08:38:50 - 1.1
+++ iishowto.xml 9 Sep 2002 09:57:10 - 1.2
@@ -10,11 +10,18 @@
p
This document explains how to set up IIS to cooperate with Tomcat.
/p
+
p
Normally IIS can not execute Servlets and Java Server Pages (JSPs),
configuring IIS to use the mod_jk redirector plugin will let IIS send servlet and
JSP requests to Tomcat (and this way, serve them to clients).
/p
+
+p
+We recommand you to read also the a href=jk/workershowto.htmlWorkers HowTo/a
document
+to learn how to setup the working entities between your WebServer and Tomcat
Engines.
+/p
+
subsection name=Document Conventions and Assumptions
p
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
hgomez 2002/09/06 05:24:03 Modified:jk/xdocs index.xml Log: More informations about jk pro/cons Revision ChangesPath 1.6 +65 -50jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 5 Sep 2002 08:39:26 - 1.5 +++ index.xml 6 Sep 2002 12:24:03 - 1.6 @@ -23,16 +23,16 @@ ul li -a href=jk/aphowto.htmlmod_jk/a is an Apache module to be used with bApache 1.3 and 2.0 Webservers/b. +a href=jk/aphowto.htmlmod_jk/a is an Apache module to be used with bApache 1.3/b and b2.0/b Webservers. /li li -a href=jk/iishowto.htmlisapi/a is a redirector to be used with bIIS Webservers/b. +a href=jk/iishowto.htmlisapi/a is a redirector to be used with bIIS/b. /li li -a href=jk/neshowto.htmlnsapi/a is a redirector to be used with bNetscape/iPlanet WebServers/b. +a href=jk/neshowto.htmlnsapi/a is a redirector to be used with bNetscape/iPlanet/b. /li li -a href=jk/domhowto.htmldsapi/a was also ported to bDomino/b but there is no more active support on it. +a href=jk/domhowto.htmldsapi/a is a redirector to to be used with bDomino/b but there is less active support on it. /li /ul @@ -40,61 +40,76 @@ section name=Why should I use the jk ? p -Several reasons: -ul -li -mod_jserv was too complex. Because it was ported from Apache/JServ, it brought with it lots of JServ specific bits that aren't needed by Apache. -/li -li -mod_jserv supported only Apache. Tomcat supports many web servers through a compatibility layer named the jk library. -Supporting two different modes of work became problematic in terms of support, documentation and bug fixes. -mod_jk should fix that. -The layered approach provided by the jk library makes it easier to support both Apache1.3.x and Apache2.xx. -/li -li -Better support for SSL. mod_jserv couldn't reliably identify whether a request was made via HTTP or HTTPS. mod_jk can, using the newer Ajpv13 protocol. -/li -li -mod_jk offers a lot of different and flexible communications between a Web Server -and the Tomcat Servlet Engine and could be used today by all of the ASF Tomcat Engine, -3.2.x, 3.3.x, 4.0.x, 4.1.x and 5.x -/li -/ul +jk was develop to overcome many limitations of its ancestor, bmod_jserv/b. +/p + +p +bmod_jserv/b was too complex and because it was ported from Apache/JServ, +it brought with it lots of JServ specific bits that aren't needed by Apache. /p -/section -section name=What's the difference between mod_jk and mod_jk2 modules ? p -mod_jk2 is a full rewrite of mod_jk and is much more powerfull +Where bmod_jserv/b supported only Apache webservers on Unix OS, +bjk/b supports much more web servers and operating systems through +via a compatibility layer named the bjk library/b. +The layered approach provided by the jk library makes it easier to +support many different webservers and OS. +/p -ul -li -Even if it works with Apache 1.3, mod_jk2 has been developed with Apache 2.0 in mind, -and sus is better suited for multi-threaded servers. -/li -li -mod_jk2 has a better separation between protocol and physical layer. -As such mod_jk2 add support to the fast unix-socket, and could be extended to support others communications -channels. More it's better suited for JNI and JDK 1.4 fast IO APIs/li -li -mod_jk2 could be monitored via special URLs -/li -/ul +p +jk offer better support for SSL, that's was a problem with mod_jserv which couldn't +reliably identify whether a request was made via HTTP or HTTPS. +/p +p +jk can, using the newer Ajpv13 protocol which relay many SSL informations required by servlet 2.2 and 2.3 specs. +/p + +p +jk offers a lot of different and flexible communications between a Web Server +and the Tomcat Servlet Engine and could be used today with all of the ASF Tomcat Engines, +b3.2.x/b, b3.3.x/b, b4.0.x/b, b4.1.x/b and b5.x/b +/p + +/section + +section name=What's the difference between jk and jk2 ? +p +jk2 is a full rewrite of jk and is much more powerfull. +/p +p +Even if it works with Apache 1.3, jk2 has been developed with Apache 2.0 in mind, +and sus is better suited for multi-threaded servers like IIS, NES/iPlanet. +/p +p +jk2 has a better separation between protocol and physical layer. +As such jk2 support fast unix-socket, and could be extended to support others communications +channels. Better it's suited for JNI and JDK 1.4 fast IO APIs +/p +p +jk2 could be monitored via special URLs (like mod_status) /p -br/ /section section name=Are there alternative ways to connect Apache and Tomcat
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk aphowto.xml
hgomez 2002/09/06 05:24:32
Modified:jk/xdocs/jk aphowto.xml
Log:
Udate apache-howto (still in works)
Revision ChangesPath
1.2 +371 -1jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml
Index: aphowto.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aphowto.xml 5 Sep 2002 08:38:50 - 1.1
+++ aphowto.xml 6 Sep 2002 12:24:32 - 1.2
@@ -35,7 +35,7 @@
/ul
/p
p
-In all the examples in this document ${tomcat_home} will be
bc:\jakarta-tomcat/b.
+In all the examples in this document ${tomcat_home} will be b/var/tomcat3/b.
A worker is defined to be a tomcat process that accepts work from the IIS server.
/p
/subsection
@@ -127,6 +127,376 @@
/subsection
+/section
+
+section name=Obtaining mod_jk
+p
+mod_jk can be obtained in two formats - binary and source.
+Depending on the platform you are running your web server on, a binary version of
mod_jk may be available.
+/p
+
+p
+It is recommended to use the binary version if one is available.
+If the binary is not available, follow the instructions for building mod_jk from
source.
+/p
+
+p
+The binaries for mod_jk are now available, for several platforms, in a separate
area as the Tomcat Binary Release.
+The binaries are located in subdirectories by platform.
+/p
+
+p
+For some platforms, such as Windows, this is the typical way of obtaining mod_jk
+since most Windows systems do not have C compilers.
+/p
+
+p
+For others, the binary distribution of mod_jk offers simpler installation.
+/p
+
+p
+For example mod_jk 1.2.0 could be find a
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/;
+here/a and contains the following:
+/p
+
+p
+table
+ trthLocation/ththContents/th/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/iseries/;iseries/a/tdtdSAVF
including mod_jk for Apache 2.0 for iSeries V5R1/V5R2/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/linux/;linux/a/tdtdmod_jk.so
(Apache 1.3 standard API and EAPI and Apache 2.0) for some Linux Archs/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/macosx/;macosx/a/tdtdContains
the mod_jk.so for MacOS X/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/netware/;netware/a/tdtdmod_jk.nlm
and nsapi.nlm for Netware/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/rpms/;rpms/a/tdtdContains
the rpms (including sources and i386/ppc architectures)/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/solaris6/;solaris6/a/tdtdContains
the mod_jk.so for Solaris 6/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/solaris8/;solaris8/a/tdtdContains
the mod_jk.so for Solaris 8/td/tr
+ trtda
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/win32/;win32/a/tdtdContains
the mod_jk.dll for Windows as well as other useful binaries./td/tr
+/table
+/p
+
+p
+If you don't see your Operating System here, the doc may be outdated so just go
+a
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/;
+here/a and check if one of the directory didn't cover your os
+/p
+
+/section
+
+section name=Installation
+p
+mod_jk requires two entities:
+
+ul
+li
+bmod_jk.xxx/b - The Apache module, depending on your operating system, it will
be mod_jk.so, mod_jk.dll, mod_jk,nlm or
+or QZTCJK.SRVPGM (see the build section).
+/li
+li
+bworkers.properties/b - A file that describes the host(s) and port(s) used by
the workers (Tomcat processes).
+A sample workers.properties can be found under the conf directory.
+/li
+/ul
+/p
+
+p
+Also as with other Apache modules, mod_jk should be first installed on the modules
directory of your
+Apache webserver, ie : /usr/lib/apache and you should update your bhttpd.conf/b
file.
+/p
+
+
+subsection name=Disabling old mod_jserv
+p
+If you've previously configured Apache to use bmod_jserv/b, remove any
bApJServMount/b directives
+from your httpd.conf.
+/p
+
+pIf you're including btomcat-apache.conf/b or btomcat.conf/b, you'll want
to remove them as well -
+they are specific to bmod_jserv/b.
+/p
+
+p
+The mod_jserv configuration directives are not compatible with mod_jk!
+/p
+/subsection
+
+subsection name=Using Tomcat auto-configure
+p
+The simplest way to configure Apache
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk buildjk.xml configjk.xml
hgomez 2002/09/05 01:37:43 Removed: jk/xdocs/jk buildjk.xml configjk.xml Log: Remove build and config for apache, will be present in a same file, aphowto.xml PS: first time commiting from eclipse IDE... -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk neshowto.xml aphowto.xml iishowto.xml
hgomez 2002/09/05 01:38:50
Added: jk/xdocs/jk neshowto.xml aphowto.xml iishowto.xml
Log:
Reworked documents for Apache, IIS, NES
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/xdocs/jk/neshowto.xml
Index: neshowto.xml
===
?xml version=1.0 encoding=ISO-8859-1 ?
document
properties
titleNetscape/iPlanet HowTo/title
author email=[EMAIL PROTECTED]Henri Gomez/author
author email=[EMAIL PROTECTED]Gal Shachor/author
/properties
section name=Introduction
p
This document explains how to set up Netscape web servers to cooperate with Tomcat.
/p
p
Normally the Netscape web servers come with their own Servlet engine,
but you can also configure them to send servlet and JSP requests to Tomcat
using the Tomcat redirector plugin.
/p
subsection name=Document Conventions and Assumptions
p
${tomcat_home} is the root directory of tomcat.
Your Tomcat installation should have the following subdirectories:
ul
li
${tomcat_home}\conf - Where you can place various configuration files
/li
li
${tomcat_home}\webapps - Containing example applications
/li
li
${tomcat_home}\bin - Where you place web server plugins
/li
/ul
/p
p
In all the examples in this document ${tomcat_home} will be bc:\jakarta-tomcat/b.
A worker is defined to be a tomcat process that accepts work from the IIS server.
/p
/subsection
subsection name=Supported Configuration
p
The Netscape-Tomcat redirector was developed and tested on:
ul
li
WinNT4.0-i386 SP4/SP5/SP6a (should be able to work with other service packs) and
some Unixes
/li
li
Netscape Enterprise 3.0 and 3.61
/li
li
Tomcat 3.2.x, 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x and Tomcat 5
/li
/ul
/p
p
The redirector uses bajp12/b and bajp13/b to send requests to the Tomcat
containers.
There is also an option to use Tomcat in process,
more about the in-process mode can be found in the in process howto.
/p
/subsection
subsection name=Who support ajp protocols ?
p
The ajp12 protocol is only available in Tomcat 3.2.x and 3.3.x.
/p
p
The bajp12/b has been bdeprecated/b with Tomcat 3.3.x and you should use
instead
bajp13/b which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x and 5.
/p
p
Of course Tomcat 3.2.x and 3.3.x also support ajp13 protocol.
/p
p
Others servlet engines such as bjetty/b have support for ajp13 protocol
/p
/subsection
subsection name=How does it work ?
p
ol
li
The Netscape-Tomcat redirector is an Netscape service step plugin,
Netscape load the redirector plugin and calls its service handler
function for request that are assigned to the servlet configuration object.
/li
li
For each in-coming request Netscape will execute the set of NameTrans directives
that we added to obj.conf, the assign-name function will check if it's from
parameter matches the request URL.
/li
li
If a match is found, assign-name will assign the servlet object name to the request.
This will cause Netscape to send the request to the servlet configuration object.
/li
li
Netscape will execute our jk_service extension. The extension collects the
request parameters and forwards them to the appropriate worker using the ajp13
protocol
(the worker=defworker parameter in jk_service inform it that the worker for this
request is named bdefworker/b).
the workers properties files, bworkers.properties/b, will indicate that
defworker use ajp13 protocol.
/li
li
The extension collects the response from the worker and returns it to the browser.
/li
/ol
/p
/subsection
/section
section name=Installation
p
A pre-built version of the Netscape redirector, nsapi_redirect.dll, may be available
under
the win32/i386 directory of jakarta-tomcat-connectors distribution.
For those using Netscape as your browser, try downloading a zip version of the file,
if available.
There can be problems using Netscape to download DLL files.
You can also build a copy locally from the source present in
jakarta-tomcat-connectors distribution.
The Tomcat redirector requires two entities:
ul
li
nsapi_redirect.dll - The Netscape server plugin, either obtain a pre-built DLL or
build it yourself
(see the build section).
/li
li
workers.properties - A file that describes the host(s) and port(s) used by the
workers (Tomcat processes).
A sample workers.properties can be found under the conf directory.
/li
/ul
The installation includes the following parts:
ul
li
Configuring the NSAPI redirector with a default /examples context and checking that
you can serve servlets
with Netscape.
/li
li
Adding more contexts to the configuration.
/li
/ul
/p
/section
section name=Configuring the NSAPI Redirector
p
cvs commit: jakarta-tomcat-connectors/jk/xdocs menu.idx style.xsl.in style.css.in index.xml
hgomez 2002/09/05 01:39:26
Modified:jk/xdocs menu.idx style.xsl.in style.css.in index.xml
Log:
Update to new jk docs layout, colors and entries
Revision ChangesPath
1.5 +3 -1 jakarta-tomcat-connectors/jk/xdocs/menu.idx
Index: menu.idx
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/menu.idx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menu.idx 2 Sep 2002 10:53:36 - 1.4
+++ menu.idx 5 Sep 2002 08:39:26 - 1.5
@@ -4,7 +4,9 @@
document href=index.xml/
document href=common/AJPv13.xml/
document href=common/AJPv14-proposal.xml/
- document href=jk/buildjk.xml/
+ document href=jk/aphowto.xml/
+ document href=jk/iishowto.xml/
+ document href=jk/neshowto.xml/
document href=jk/configjk.xml/
document href=jk2/configtc.xml/
document href=jk2/configweb.xml/
1.7 +13 -9 jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- style.xsl.in 2 Sep 2002 10:55:30 - 1.6
+++ style.xsl.in 5 Sep 2002 08:39:26 - 1.7
@@ -95,7 +95,7 @@
img src={$images}/jakarta.gif border=0 width=270
height=75 align=left/
/td
td align=right
-img src={$images}/mod_jk.jpeg border=0 width=400
height=75 align=right/
+img src={$images}/mod_jk.jpeg border=0 align=right/
/td
/tr
/table
@@ -249,7 +249,7 @@
/tr
/table
/a
-xsl:apply-templates
select=subsection|p|ul|img|screen|screendos|screen5250|todo/
+xsl:apply-templates
select=subsection|p|ul|ol|img|screen|screendos|screen5250|todo/
br/
/xsl:template
@@ -267,7 +267,7 @@
/tr
/table
/a
-xsl:apply-templates
select=subsection|p|ul|img|screen|screendos|screen5250|todo/
+xsl:apply-templates
select=subsection|p|ul|ol|img|screen|screendos|screen5250|todo/
br/
/xsl:template
@@ -282,7 +282,7 @@
/xsl:template
xsl:template match=p
-p class=sectionxsl:apply-templates
select=author|code|source|screen|screendos|screen5250|table|ul|br|b|a|text()//p
+p class=sectionxsl:apply-templates
select=author|code|source|screen|screendos|screen5250|table|ul|ol|br|b|a|text()//p
/xsl:template
xsl:template match=b
@@ -303,11 +303,15 @@
/xsl:template
xsl:template match=ul
-ulxsl:apply-templates select=li//ul
+ulxsl:apply-templates select=li|ul|ol//ul
+ /xsl:template
+
+ xsl:template match=ol
+olxsl:apply-templates select=li|ul|ol//ol
/xsl:template
xsl:template match=li
-lixsl:apply-templates select=br|b|a|text()//li
+lixsl:apply-templates select=br|b|a|ul|ol|text()//li
/xsl:template
!-- JFC added --
@@ -438,7 +442,7 @@
/xsl:template
xsl:template match=read
-code
+code class=screen
nobr
xsl:apply-templates select=text()|enter/
/nobr
@@ -463,7 +467,7 @@
/xsl:template
xsl:template match=readdos
-code
+code class=screendos
nobr
xsl:apply-templates select=text()|enterdos/
/nobr
@@ -521,7 +525,7 @@
/xsl:template
xsl:template match=read5250
-code
+code class=screen5250
nobr
xsl:apply-templates select=text()|enter5250/
/nobr
1.5 +27 -0 jakarta-tomcat-connectors/jk/xdocs/style.css.in
Index: style.css.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.css.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- style.css.in 2 Sep 2002 16:02:10 - 1.4
+++ style.css.in 5 Sep 2002 08:39:26 - 1.5
@@ -147,6 +147,15 @@
text-align: left;
}
+code.screen {
+ background-color: #cc;
+ border-style: none;
+ color: #00;
+ margin-left: 10px;
+ margin-right: 0px;
+ text-align: left;
+}
+
p.screendos {
background-color: #00;
border-style: none;
@@ -156,7 +165,25 @@
text-align: left;
}
+code.screendos {
+ background-color: #00;
+ border-style: none;
+ color: #c0c0c0;
+ margin-left: 10px;
+ margin-right: 0px;
+ text-align: left;
+}
+
p.screen5250 {
+ background-color: #00;
+ border-style: none;
+ color: #00ff00;
+ margin-left: 10px;
+ margin-right: 0px;
+ text-align: left
cvs commit: jakarta-tomcat-connectors/jk/xdocs/images mod_jk.jpeg
hgomez 2002/09/05 02:24:43 Modified:jk/xdocs/images mod_jk.jpeg Log: New logo, candidate #1 for mod_jk logo ? Revision ChangesPath 1.2 +20 -20jakarta-tomcat-connectors/jk/xdocs/images/mod_jk.jpeg Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk domhowto.xml
hgomez 2002/09/05 05:51:26
Added: jk/xdocs/jk domhowto.xml
Log:
Domino/JK initial documentation
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/xdocs/jk/domhowto.xml
Index: domhowto.xml
===
?xml version=1.0 encoding=ISO-8859-1 ?
document
properties
titleDomino HowTo/title
author email=[EMAIL PROTECTED]Andy Armstrong/author
author email=[EMAIL PROTECTED]Henri Gomez/author
/properties
section name=Introduction
p
This document explains how to set up Domino to cooperate with Tomcat.
/p
p
Recent version of the Lotus Domino web server have had the ability to host Java
servlets,
but at the time of writing the Domino servlet container uses JDK 1.2.2 and it is not
(apparently)
possible to replace this with JDK 1.3.
/p
p
That means if you want to use JAAS or any other API
that is JDK 1.3 only in your servlets you're stuck.
/p
subsection name=Document Conventions and Assumptions
p
${tomcat_home} is the root directory of tomcat.
Your Tomcat installation should have the following subdirectories:
ul
li
${tomcat_home}\conf - Where you can place various configuration files
/li
li
${tomcat_home}\webapps - Containing example applications
/li
li
${tomcat_home}\bin - Where you place web server plugins
/li
/ul
/p
p
In all the examples in this document ${tomcat_home} will be bc:\jakarta-tomcat/b.
A worker is defined to be a tomcat process that accepts work from the IIS server.
/p
/subsection
subsection name=Supported Configuration
p
The Domino Tomcat redirector was developed and tested on:
ul
li
WinNT4.0-i386 SP6a (it should be able to work on other versions of the NT service
pack.) and Win2K Professional
/li
li
RedHat Linux 7
/li
li
Lotus Domino 5.0.6a
/li
li
Tomcat 3.2.x, Tomcat 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x and Tomcat 5
/li
/ul
/p
p
The redirector uses bajp12/b and bajp13/b to send requests to the Tomcat
containers.
It probably also works with Tomcat in process, but that hasn't been tested.
/p
/subsection
subsection name=Who support ajp protocols ?
p
The ajp12 protocol is only available in Tomcat 3.2.x and 3.3.x.
/p
p
The bajp12/b has been bdeprecated/b with Tomcat 3.3.x and you should use
instead
bajp13/b which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x and 5.
/p
p
Of course Tomcat 3.2.x and 3.3.x also support ajp13 protocol.
/p
p
Others servlet engines such as bjetty/b have support for ajp13 protocol
/p
/subsection
/section
section name=Installation on Windows
p
The Tomcat redirector requires 3 entities:
/p
ul
li
tomcat_redirect.dll - The Domino plugin, either obtain a pre-built DLL or build it
yourself
(see the build section).
/li
li
workers.properties - A file that describes the host(s) and port(s) used by the
workers (Tomcat processes).
A sample workers.properties can be found under the conf directory.
/li
li
tomcat_redirector.reg - Registry entries
/li
/ul
p
We'll assume that tomcat redirector is placed in
bc:\jk\lib\tomcat_redirector.dll/b,
the properties file is inbc:\jk\conf/b
and you created a log directory bc:\jk\logs/b
/p
p
Copy the file btomcat_redirector.dll/b to the Domino program directory
(this is the directory, which may be called something like bc:\Lotus\Domino/b,
that contains a file called
bnlnotes.exe/b).
/p
screendos
notedosCopy redirector dll to Domino program directory/notedos
typedoscopy c:\jk\lib\tomcat_redirector.dll c:\Lotus\Domino/typedos
/screendos
p
Shortly we will tell Domino where to find this file, but before we do that we need
to make some registry entries.
The simplest way is to edit the supplied file btomcat_redirector.reg/b, which
initially will look like this :
/p
screen
readREGEDIT4/read
read/
read[HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Dsapi
Redirector\1.0]/read
readlog_file=c:\\jk\\logs\\domino.log/read
readlog_level=debug/read
readworker_file=c:\\jk\\conf\\workers.properties/read
readworker_mount_file=c:\\jk\\conf\\uriworkermap.properties/read
readtomcat_start=c:\\jakarta-tomcat\\bin\\tomcat.bat start/read
readtomcat_stop=c:\\jakarta-tomcat\\bin\\tomcat.bat stop/read
/screen
p
Edit this file to reflect the location where Tomcat has been installed, i.e. replace
the instances
of bc:\\jakarta-tomcat/b and bc:\\jk/b with the appropriate path remembering
to bretain the double backslashes/b.
/p
p
Once you've made the necessary changes save this file and double click on it to
enter it into the registry.
/p
p
Note that the files referred to by the worker_file and worker_mount_file keys need
to exist and contain sane values.
Default Tomcat installations
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/05 08:08:36
Modified:jk build.xml
Log:
Do not copy xdocs stuffs present also in subdirs
Revision ChangesPath
1.51 +6 -6 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- build.xml 2 Sep 2002 10:58:22 - 1.50
+++ build.xml 5 Sep 2002 15:08:36 - 1.51
@@ -412,12 +412,12 @@
copy
todir=${build.docs}
fileset dir=${source.docs}
-exclude name=**.xml/
-exclude name=**.css.in/
-exclude name=**.xsl.in/
-exclude name=**.samples/
-exclude name=**.xsl/
-exclude name=**.idx/
+exclude name=**/*.xml/
+exclude name=**/*.css.in/
+exclude name=**/*.xsl.in/
+exclude name=**/*.samples/
+exclude name=**/*.xsl/
+exclude name=**/*.idx/
exclude name=**/images/originals/**/
/fileset
/copy
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_ajp_common.c jk_ajp_common.h jk_connect.c jk_global.h jk_map.c jk_msg_buff.c jk_msg_buff.h jk_pool.c jk_pool.h jk_util.c
hgomez 2002/09/04 04:31:33
Modified:jk/native/apache-2.0 mod_jk.c
jk/native/common jk_ajp12_worker.c jk_ajp_common.c
jk_ajp_common.h jk_connect.c jk_global.h jk_map.c
jk_msg_buff.c jk_msg_buff.h jk_pool.c jk_pool.h
jk_util.c
Log:
Patches to make mod_jk works on iSeries (AS/400) and Apache 2.0.
These patches have been provided by IBM Rochester labs.
Nota:
You'll need an OS400 V5R1 or V5R2, both with latest PTF containing
Apache 2.0.39
Apache 2.0.39 PTFs for V5R1 are scheduled in mid-september.
Many thanks to IBMers, Walt, Jim and Brian.
Revision ChangesPath
1.55 +41 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_jk.c 24 Jul 2002 04:48:52 - 1.54
+++ mod_jk.c 4 Sep 2002 11:31:32 - 1.55
@@ -79,6 +79,10 @@
#include http_main.h
#include http_log.h
#include util_script.h
+#ifdef AS400
+#include ap_charset.h
+#include util_charset.h /* ap_hdrs_from_ascii */
+#endif
/* moved to apr since http-2.0.19-dev */
#if (MODULE_MAGIC_NUMBER_MAJOR 20010523)
@@ -230,6 +234,11 @@
ap_content_type_tolower(tmp);
r-content_type = tmp;
} else if(!strcasecmp(header_names[h], Location)) {
+#ifdef AS400
+/* Fix escapes in Location Header URL*/
+ap_fixup_escapes((char *)header_values[h],
+strlen(header_values[h]), ap_hdrs_from_ascii);
+#endif
apr_table_set(r-headers_out,
header_names[h], header_values[h]);
} else if(!strcasecmp(header_names[h], Content-Length)) {
@@ -283,7 +292,18 @@
}
if(p-read_body_started) {
-long rv;
+#ifdef AS400
+int long rv = OK;
+if (rv = ap_change_request_body_xlate(p-r, 65535, 65535)) /* turn off request
body translation*/
+{
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
+ NULL, mod_jk: Error on ap_change_request_body_xlate, rc=%d
\n, rv);
+return JK_FALSE;
+}
+#else
+long rv;
+#endif
+
if ((rv = ap_get_client_block(p-r, b, len)) 0) {
*actually_read = 0;
} else {
@@ -315,6 +335,10 @@
const void *b,
unsigned l)
{
+#ifdef AS400
+int rc;
+#endif
+
if(s s-ws_private b) {
apache_private_data_t *p = s-ws_private;
@@ -332,6 +356,14 @@
return JK_FALSE;
}
}
+#ifdef AS400
+rc = ap_change_response_body_xlate(p-r, 65535, 65535); /* turn off
response body translation*/
+ if(rc){
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
+ NULL, mod_jk: Error on ap_change_response_body_xlate,
rc=%d \n, rc);
+ return JK_FALSE;
+}
+#endif
/* Debug - try to get around rwrite */
while( ll 0 ) {
@@ -351,11 +383,13 @@
/*
* To allow server push. After writing full buffers
*/
+#ifndef AS400
if(ap_rflush(p-r) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
NULL, mod_jk: Error flushing \n );
return JK_FALSE;
}
+#endif
}
@@ -459,7 +493,12 @@
s-content_length = get_content_length(r);
s-is_chunked = r-read_chunked;
s-no_more_chunks = 0;
+#ifdef AS400
+/* Get the query string that is not translated to EBCDIC */
+s-query_string = ap_get_original_query_string(r);
+#else
s-query_string = r-args;
+#endif
/*
* The 2.2 servlet spec errata says the uri from
1.8 +65 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_ajp12_worker.c 25 Jun 2002 07:08:47 - 1.7
+++ jk_ajp12_worker.c 4 Sep 2002 11:31:32 - 1.8
@@ -67,6 +67,10 @@
#include jk_connect.h
#include jk_util.h
#include jk_sockbuf.h
+#ifdef AS400
+#include util_ebcdic.h
+#include string.h
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
hgomez 2002/09/04 04:35:13
Modified:jk/native/common jk_jni_worker.c
Log:
First try to make use of JNI of iSeries (AS/400).
We don't dynamically load the JVM libraries (dll/shared) but instead
use it directly (mod_jk should be compiled with JVM SRVPGM).
I'll have to find dlopen/dlsym equivalent on OS/400 and hope I won't have
to do MI programming on mod_jk ;)
Revision ChangesPath
1.12 +8 -2 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_jni_worker.c 11 Apr 2002 21:48:19 - 1.11
+++ jk_jni_worker.c 4 Sep 2002 11:35:12 - 1.12
@@ -746,7 +746,13 @@
if(jni_create_java_vm jni_get_default_java_vm_init_args
jni_get_created_java_vms) {
return JK_TRUE;
}
-#else
+#elif defined(AS400)
+jk_log(l, JK_LOG_DEBUG,
+ Direct reference to JNI entry points (no SRVPGM)\n);
+jni_create_java_vm = JNI_CreateJavaVM
+jni_get_default_java_vm_init_args = JNI_GetDefaultJavaVMInitArgs;
+jni_get_created_java_vms = JNI_GetCreatedJavaVMs;
+#else
void *handle;
jk_log(l, JK_LOG_DEBUG,
Into load_jvm_dll, load %s\n, p-jvm_dll_path);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
hgomez 2002/09/04 04:41:20 Modified:jk/native/common jk_jni_worker.c Log: Corrected typo (missing ;) Revision ChangesPath 1.13 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c Index: jk_jni_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_jni_worker.c 4 Sep 2002 11:35:12 - 1.12 +++ jk_jni_worker.c 4 Sep 2002 11:41:20 - 1.13 @@ -749,7 +749,7 @@ #elif defined(AS400) jk_log(l, JK_LOG_DEBUG, Direct reference to JNI entry points (no SRVPGM)\n); -jni_create_java_vm = JNI_CreateJavaVM +jni_create_java_vm = JNI_CreateJavaVM; jni_get_default_java_vm_init_args = JNI_GetDefaultJavaVMInitArgs; jni_get_created_java_vms = JNI_GetCreatedJavaVMs; #else -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 bldjk.qcsrc
hgomez 2002/09/02 03:48:23
Added: jk/native/apache-2.0 bldjk.qcsrc
Log:
Initial build file (CL) for the iSeries (AS/400)
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/native/apache-2.0/bldjk.qcsrc
Index: bldjk.qcsrc
===
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5') +
TEXT('mod_jk.c')+
SYSIFCOPT(*IFSIO) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG )+
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include' +
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_AJP_COM)+
SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5') +
TEXT('jk_ajp_common.c') +
SYSIFCOPT(*IFSIO) +
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG ) +
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include'+
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5')+
TEXT('jk_ajp12_worker.c') +
SYSIFCOPT(*IFSIO) +
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG ) +
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include' +
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_AJP13) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5') +
TEXT('jk_ajp13.c') +
SYSIFCOPT(*IFSIO) +
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG )+
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include' +
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5')+
TEXT('jk_ajp13_worker.c') +
SYSIFCOPT(*IFSIO) +
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG ) +
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include' +
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_AJP14) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5') +
TEXT('jk_ajp14.c') +
SYSIFCOPT(*IFSIO) +
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG )+
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include' +
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
DEFINE('AS400' 'HAVE_JNI' 'USE_APACHE_MD5')+
TEXT('jk_ajp14_worker.c') +
SYSIFCOPT(*IFSIO) +
LANGLVL(*ANSI) +
TGTCCSID(*JOB) +
OPTION(*LOGMSG ) +
INCDIR('/home/apache/jk/native/common' +
'/QIBM/ProdData/HTTPA/Include' +
'/QIBM/ProdData/Java/Include')
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF
cvs commit: jakarta-tomcat-connectors/jk/xdocs/common AJPv14-proposal.xml
hgomez 2002/09/02 03:49:38 Added: jk/xdocs/common AJPv14-proposal.xml Log: Add the AJPv14 proposal Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/common/AJPv14-proposal.xml Index: AJPv14-proposal.xml === ?xml version=1.0? document properties titleAJPv14 Proposal/title author email=[EMAIL PROTECTED]Henri Gomez/author /properties section name=Introduction p This document is a proposal of evolution of the current Apache JServ Protocol version 1.3, also known as ajp13. I'll not cover here the full protocol but only the add-on from ajp13. This nth pass include comments from the tomcat-dev list and misses discovered during developpment. /p subsection name=Missing features in AJPv13 p ajp13 is a good protocol to link a servlet engine like tomcat to a web server like Apache: ul li use persistants connections to avoid reconnect time at each request /li li encode many http commands to reduce stream size /li li send to servlet engine many info from web server (like SSL certs) /li /ul p But ajp13 lacks support for : /p ul li security between web server and servlet engine. Anybody can connect to an ajp13 port (no login mecanism used) You could connect, for example with telnet, and keep the remote thread up by not sending any data (no timeout in connection) /li li context information passed from servlet engine to web server. Part of the configuration of mod_jk, the web server connector, is to indicate to the web server which URI to handle. The mod_jk JkMount directive, told to web server which URI must be forwarded to servlet engine. A servlet engine allready knows which URI it handle and TC 3.3 is allready capable to generate a config file for mod_jk from the list of available contexts. /li li state update of contexts from servlet engine to web server. Big site with farm of Tomcat, like ISP and virtuals hosters, may need to stop a context for admin purposes. In that case the front web server must know that the context is currently down, to eventually relay the request to another Tomcat /li li verify state of connection before sending request. Actually mod_jk send the request to the servlet engine and next wait for the answer. But one of the beauty of the socket API, is you that you could write() to a closed connection without any error reporting, but a read() to a closed connection return you the error code. /li /ul /p /subsection subsection name=AJPv14 add-ons to AJPv13 p Let's descrive here the features and add-on that will be added to AJP13, which will became AJP14. Since this document is a proposal, a resonable level of chaos must be expected at start. Be sure that discussion on tomcat list will help clarify points, add features but the current list seems to be a 'minimun vital' ul li Advanced login features at connect time /li li Basic authorisation system, where a shared secret key is present in web server and servlet engine. /li li Basic protocol negociation, just to be sure that if functionnalities are added to AJP14 in the future, current implementations will still works. /li li Clean handling of 'Unknown packets' /li li Extended env vars passed from web-server to servlet engine. /li li Add extra SSL informations needed by Servlet 2.3 API (like SSL_KEY_SIZE) /li /ul /p /subsection subsection name=Advanced login p ol li WEB-SERVER send LOGIN INIT CMD + NEGOCIATION DATA + WEB SERVER INFO /li li TOMCAT respond with LOGIN SEED CMD + RANDOM DATA /li li WEB-SERVER calculted the MD5 of RANDOM DATA+SECRET DATA /li li WEB-SERVER send LOGIN COMP CMD + MD5 (SECRET DATA + RANDOM DATA) /li li TOMCAT respond with LOGIN STATUS CMD + NEGOCIED DATA + SERVLET ENGINE INFO /li /ol To prevent DOS attack, the servlet engine will wait the LOGIN CMD only 15/30 seconds and reports the timeout exception for admins investigation. The login command will contains basic protocol negociation information like compressing ability, crypto, context info (at start up), context update at run-time (up/down), level of SSL env vars, AJP protocol supported (AJP14/AJP15/AJP16...) The Web server info will contain web server info and connector name (ie Apache 1.3.20 + mod_ssl 2.8.4 + mod_jk 1.2a1 + mod_perl 1.25). The servlet engine will mask the negociation mask with it's own mask (what it can do) and return it when loggin is accepted. This will help having a basic ajp14 implementation on a web
cvs commit: jakarta-tomcat-connectors/jk/xdocs faq.xml
hgomez 2002/09/02 03:50:23 Added: jk/xdocs faq.xml Log: The long awaited FAQ is now on it's own file Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/faq.xml Index: faq.xml === ?xml version=1.0? document properties titleFAQ/title author email=[EMAIL PROTECTED]Henri Gomez/author /properties section name=General p General Informations and FAQ about mod_jk /p subsection name=Where can I get help/support for mod_jk? p The primary mechanism for support is through the mod_jk documentation included in the doc directory. Documentation is also available on the Apache Jakarta web site devoted to the a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/index.html; Jakarta Tomcat Connectors Project/a For additional help, the best resource is the Tomcat Users Discussion list. You should start by searching a href=http://mikal.org/interests/java/tomcat/index.html; the mail list archive/a before you post questions to the list. If you are unable to locate the answer to your question in the archive, you can post questions about mod_jk to the user list for assistance. Make sure that you include the version of your Webserver, that you are using as well as the platform you are running on and go a href=http://jakarta.apache.org/site/mail.html; here/a to determine how to subscribe to tomcat mailing list. /p /subsection subsection name=I can't find mod_jk anywhere. Where is it? p Now that mod_jk moved to the jakarta-tomcat-connectors repository, the source and binaries for mod_jk are present in the a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/; jakarta-tomcat-connectors directory/a /p /subsection subsection name=Where can I get more information ? p For mod_jk 1.2.x the a href=jk/config-howto.html mod_jk-config howto document/a has considerably more in-depth information. For mod_jk 2.0.x the a href=jk2/configtc.html config tomcat/a and a href=jk2/configweb.htmlconfig webserver/a documents have considerably more in-depth information. It's worth a look. You could also try searching the mailing list archives for mod_jk or look at the source. /p /subsection subsection name=Which protocol should I use? Ajp12 or Ajp13? p a href=common/AJPv13.htmlAjp13/a is a newer protocol, it's faster, and it works better with SSL. You almost certainly want to use it. There is more information in the workers.properties howto document, ajp12 is now deprecated. Also ajp13 is supported by all Apache Tomcat including 3.2.x , 3.3.x, 4.0.x, 4.1.x and the new tomcat 5. Others Servlet engine like jetty have support for Ajp13. /p /subsection subsection name=I've got a firewall between my WebServer and Tomcat who drop ajp13 connections after some times p Ajp13 use persistant connections where the traffic could be null if there is no request to be sent to Tomcat. Firewall used to drop inactive connections and will make your WebServer and Tomcat think the connection is valid. Since mod_jk 1.2.0 a socket_keepalive property as been added to ajp13 settings, and you should take a look at it in workers.properties howto /p /subsection subsection name=Under heavy load, I've got many threads in Tomcat even if my Apache Web Server handle much of the load p Under heavy load, Apache WebServer create many childs to handle the load, which will in turn create many connections to Tomcat to forward the requests they should handle. Apache WebServer will normally kill the childs/threads when the load decrease. But if the load is still there and even if only Apache handle the requests, ie static contents, the childs are kept and with them the ajp13 connections, even if they are no more used. Since mod_jk 1.2.0 cache_timeout and socket_timeout properties as been added to close connections after some time, for more informations refer to workers.properties howto /p /subsection /section section name=Apache p Informations and FAQ about mod_jk and Apache Web Servers. /p subsection name=Whenever I restart Tomcat, Apache locks up! p The Ajp13 protocol keeps an open socket between Tomcat and Apache. Release of mod_jk present in J-T-C handle the network failure. But with previous release of mod_jk, you may have to restart Apache as well. /p /subsection subsection name=Why did exist two files mod_jk.so (-eapi ad -noeapi) in download dir for Linux ? p Many versions of Apache use of modified API, known at Extended API. For example, Apache using mod_ssl or Apache present in certains recent Linux distributions. So if you got such 'Extended Apache', you need
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
hgomez 2002/09/02 03:51:10 Modified:jk/xdocs index.xml Log: Updated index.xml, more informations on jk/jk2 Revision ChangesPath 1.4 +55 -18jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.xml 30 Jun 2002 03:32:01 - 1.3 +++ index.xml 2 Sep 2002 10:51:09 - 1.4 @@ -1,31 +1,68 @@ ?xml version=1.0? -!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Ba-k (ZonaWarez.com) -- document properties titleOverview/title author email=[EMAIL PROTECTED]Jean-Frederic Clere/author /properties -section name=What is the mod_jk Module +section name=What's mod_jk ? p -bmod_jk2/b is originated back to the old bmod_jserv/b. - bmod_jk2/b is a rewrite of bmod_jk/b. - The native part has been completly - restructured and the configuration has been simplified a lot. -/p +bmod_jk/b is a replacement to the elderly mod_jserv. +It was a completely new Tomcat-Apache plug-in that handles the communication between Tomcat and Apache. +/p +p +The newest bmod_jk2/b is a rewrite of bmod_jk/b. +The native part has been completly +restructured and the configuration has been simplified a lot. +/p +/section + +section name=Why should I use the mod_jk's Modules ? +p +Several reasons: +ul +li +mod_jserv was too complex. Because it was ported from Apache/JServ, it brought with it lots of JServ specific bits that aren't needed by Apache. +/li +li +mod_jserv supported only Apache. Tomcat supports many web servers through a compatibility layer named the jk library. +Supporting two different modes of work became problematic in terms of support, documentation and bug fixes. +mod_jk should fix that. +The layered approach provided by the jk library makes it easier to support both Apache1.3.x and Apache2.xx. +/li +li +Better support for SSL. mod_jserv couldn't reliably identify whether a request was made via HTTP or HTTPS. mod_jk can, using the newer Ajpv13 protocol. +/li +li +mod_jk offers a lot of different and flexible communications between a Web Server +and the Tomcat Servlet Engine and could be used today by all of the ASF Tomcat Engine, +3.2.x, 3.3.x, 4.0.x, 4.1.x and 5.x +/li +/ul +/p /section -section name=Why should I use the mod_jk2 Module? + +section name=What's the difference between mod_jk and mod_jk2 modules ? p - Because it offers a lot of different and flexible communications - between a Web Server and the Tomcat Servlet Engine. -/p -!-- Pier's mod_webapp text we need our building.xml -p - If instead you're an adventurous geek who's up for a challenge, skip - the rest of this document and go to the a href=building.xml/ - section, there's where the fun starts. -/p - -- +mod_jk2 is a full rewrite of mod_jk and is much more powerfull + +ul +li +Even if it works with Apache 1.3, mod_jk2 has been developed with Apache 2.0 in mind, +and sus is better suited for multi-threaded servers. +/li +li +mod_jk2 has a better separation between protocol and physical layer. +As such mod_jk2 add support to the fast unix-socket, and could be extended to support others communications +channels. More it's better suited for JNI and JDK 1.4 fast IO APIs/li +li +mod_jk2 could be monitored via special URLs +/li +/ul +/p +br/ /section + + section name=Are there alternative ways to connect Apache and Tomcat? p The alternative ways are better described in bmod_webapp/b -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs menu.idx
hgomez 2002/09/02 03:53:36 Modified:jk/xdocs menu.idx Log: Update menu.idx, add buildjk and confjk (to be released) Revision ChangesPath 1.4 +4 -0 jakarta-tomcat-connectors/jk/xdocs/menu.idx Index: menu.idx === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/menu.idx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- menu.idx 29 Aug 2002 11:04:34 - 1.3 +++ menu.idx 2 Sep 2002 10:53:36 - 1.4 @@ -3,6 +3,10 @@ index document href=index.xml/ document href=common/AJPv13.xml/ + document href=common/AJPv14-proposal.xml/ + document href=jk/buildjk.xml/ + document href=jk/configjk.xml/ document href=jk2/configtc.xml/ document href=jk2/configweb.xml/ + document href=faq.xml/ /index -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.css.in
hgomez 2002/09/02 03:54:33
Modified:jk/xdocs style.css.in
Log:
Updated style.css, use smallest fonts and use less flashy colors for
tables
Revision ChangesPath
1.3 +60 -1 jakarta-tomcat-connectors/jk/xdocs/style.css.in
Index: style.css.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.css.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- style.css.in 30 Jun 2002 03:32:01 - 1.2
+++ style.css.in 2 Sep 2002 10:54:33 - 1.3
@@ -1,6 +1,7 @@
body {
margin: 0;
font-family: verdana, tahoma, arial, helvetica, sans-serif;
+ font-size: 9pt;
}
td.logo {
@@ -12,7 +13,6 @@
font-size: 1px;
}
-
td.head {
background-color: #99;
border-style: solid;
@@ -114,6 +114,10 @@
text-align: justify;
}
+pre.section {
+ margin-left: 20px;
+}
+
td.section {
background-color: @sub-banner-bg@;
border-style: none;
@@ -143,26 +147,81 @@
text-align: left;
}
+p.screendos {
+ background-color: #00;
+ border-style: none;
+ color: #ff;
+ margin-left: 10px;
+ margin-right: 0px;
+ text-align: left;
+}
+
+p.screen5250 {
+ background-color: #00;
+ border-style: none;
+ color: #00ff00;
+ margin-left: 10px;
+ margin-right: 0px;
+ text-align: left;
+}
+
div.screen {
margin: 10px 0px 10px 20px;
font-size: smaller;
color: #66;
}
+div.screendos {
+ margin: 10px 0px 10px 20px;
+ font-size: smaller;
+ color: #ff66ff;
+}
+
+div.screen5250 {
+ margin: 10px 0px 10px 20px;
+ font-size: smaller;
+ color: #66ff66;
+}
+
em.screen {
font-weight: normal;
font-style: normal;
color: #66;
}
+em.screendos {
+ font-weight: normal;
+ font-style: normal;
+ color: #ff;
+}
+
+em.screen5250 {
+ font-weight: normal;
+ font-style: normal;
+ color: #00ff00;
+}
+
b.screen {
font-weight: normal;
font-style: normal;
color: #ff;
}
+b.screendos {
+ font-weight: normal;
+ font-style: normal;
+ color: #ff;
+}
+
+b.screen5250 {
+ font-weight: normal;
+ font-style: normal;
+ color: #00ff00;
+}
+
b.code {
font-weight: normal;
font-style: normal;
color: @source-color@;
}
+
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs style.xsl.in
hgomez 2002/09/02 03:55:31
Modified:jk/xdocs style.xsl.in
Log:
Updated style.xsl.in, which fix some problems and add screen support
for DOS/WIN and iSeries/5250
Revision ChangesPath
1.6 +166 -7jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.xsl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- style.xsl.in 29 Aug 2002 15:52:07 - 1.5
+++ style.xsl.in 2 Sep 2002 10:55:30 - 1.6
@@ -12,6 +12,7 @@
doctype-system=http://www.w3.org/TR/html4/strict.dtd/
!-- Define default values for parameters --
+ xsl:param name=styles select=''/
xsl:param name=images select='../images'/
xsl:param name=homedoc select='../'/
@@ -59,7 +60,7 @@
meta name=author content={$name}/
meta name=email content={$email}/
/xsl:for-each
-link rel=stylesheet type=text/css href=style.css/
+link rel=stylesheet type=text/css href={$styles}/style.css/
link rel=shortcut icon href={$images}/tomcat.ico/
/head
@@ -161,6 +162,8 @@
/nobr
/td
/tr
+ tr height=2
+ /tr
!--
Slightly more complicated, we use the document-location function
@@ -176,6 +179,8 @@
xsl:value-of select=@name/
/a
/td
+ /tr
+ tr height=1
/tr
/xsl:for-each
/xsl:if
@@ -244,7 +249,7 @@
/tr
/table
/a
-xsl:apply-templates select=subsection|p|ul|img|screen|todo/
+xsl:apply-templates
select=subsection|p|ul|img|screen|screendos|screen5250|todo/
br/
/xsl:template
@@ -262,7 +267,7 @@
/tr
/table
/a
-xsl:apply-templates select=subsection|p|ul|img|screen|todo/
+xsl:apply-templates
select=subsection|p|ul|img|screen|screendos|screen5250|todo/
br/
/xsl:template
@@ -277,7 +282,7 @@
/xsl:template
xsl:template match=p
-p class=sectionxsl:apply-templates
select=author|code|source|table|ul|br|b|a|text()//p
+p class=sectionxsl:apply-templates
select=author|code|source|screen|screendos|screen5250|table|ul|br|b|a|text()//p
/xsl:template
xsl:template match=b
@@ -337,7 +342,7 @@
/xsl:template
xsl:template match=source
-prexsl:apply-templates select=text()//pre
+pre class=sectionxsl:apply-templates select=text()//pre
/xsl:template
xsl:template match=code
@@ -351,7 +356,21 @@
table width=80% border=1 cellspacing=0 cellpadding=2
bgcolor=#cc
tr
td bgcolor=#cc
- xsl:apply-templates select=note|wait|type|read/
+ xsl:apply-templates select=note|wait|type|typenext|read/
+/td
+ /tr
+/table
+ /div
+/p
+ /xsl:template
+
+ xsl:template match=screendos
+p class=screendos
+ div align=center
+table width=80% border=1 cellspacing=0 cellpadding=2
bgcolor=#00
+ tr
+td bgcolor=#00
+ xsl:apply-templates
select=notedos|waitdos|typedos|typedosnext|readdos/
/td
/tr
/table
@@ -359,6 +378,22 @@
/p
/xsl:template
+ xsl:template match=screen5250
+p class=screen5250
+ div align=center
+table width=80% border=1 cellspacing=0 cellpadding=2
bgcolor=#00
+ tr
+td bgcolor=#00
+ xsl:apply-templates
select=note5250|wait5250|type5250|type5250next|read5250/
+/td
+ /tr
+/table
+ /div
+/p
+ /xsl:template
+
+ !-- Unix look --
+
xsl:template match=note
div class=screen
xsl:value-of select=text()/
@@ -388,6 +423,20 @@
br/
/xsl:template
+ xsl:template match=typenext
+code
+ nobr
+em class=screen
+ xsl:text /xsl:text
+/em
+xsl:if test=string-length(text()) 0
+ b class=screenxsl:value-of select=text()//b
+/xsl:if
+ /nobr
+/code
+br/
+ /xsl:template
+
xsl:template match=read
code
nobr
@@ -401,6 +450,117 @@
b class=screenxsl:value-of select=text()//b
/xsl:template
+ !-- DOS/Windows look --
+
+ xsl:template match=notedos
+div class=screendos
+ xsl:value-of select=text()/
+/div
+ /xsl:template
+
+ xsl:template
cvs commit: jakarta-tomcat-connectors/jk build.xml
hgomez 2002/09/02 03:58:22
Modified:jk build.xml
Log:
Fix style.css location in build, added faq.xml to be generated
Revision ChangesPath
1.50 +3 -1 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- build.xml 29 Aug 2002 16:12:01 - 1.49
+++ build.xml 2 Sep 2002 10:58:22 - 1.50
@@ -396,13 +396,15 @@
style=${source.docs}/style.xsl
includes=*/**.xml
excludes=index.xml
+param name=styles expression=..//
/style
style
basedir=${source.docs}
destdir=${build.docs}
style=${source.docs}/style.xsl
-includes=index.xml
+includes=index.xml, faq.xml
param name=images expression=images/
+param name=styles expression=./
param name=homedoc expression=/
/style
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk configjk.xml
hgomez 2002/09/02 04:02:06 Added: jk/xdocs/jk configjk.xml Log: Configuration informations on jk will be located here, covering httpd.conf, iis, netscape and workers.properties. To be released soon Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/xdocs/jk/configjk.xml Index: configjk.xml === ?xml version=1.0? document properties titleConfiguring mod_jk/title author email=[EMAIL PROTECTED]Henri Gomez/author /properties section name=Introduction p Here's how to configure mod_jk /p todo More informations to be added, Mike ? /todo /section /document -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk buildjk.xml
hgomez 2002/09/02 09:02:10
Modified:jk/xdocs style.css.in
jk/xdocs/jk buildjk.xml
Log:
Fix DOS colors and update builddoc.
Included building instruction for IIS which will certainly be moved
in a separate file
Revision ChangesPath
1.4 +4 -4 jakarta-tomcat-connectors/jk/xdocs/style.css.in
Index: style.css.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.css.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- style.css.in 2 Sep 2002 10:54:33 - 1.3
+++ style.css.in 2 Sep 2002 16:02:10 - 1.4
@@ -150,7 +150,7 @@
p.screendos {
background-color: #00;
border-style: none;
- color: #ff;
+ color: #c0c0c0;
margin-left: 10px;
margin-right: 0px;
text-align: left;
@@ -174,7 +174,7 @@
div.screendos {
margin: 10px 0px 10px 20px;
font-size: smaller;
- color: #ff66ff;
+ color: #ff;
}
div.screen5250 {
@@ -192,7 +192,7 @@
em.screendos {
font-weight: normal;
font-style: normal;
- color: #ff;
+ color: #c0c0c0;
}
em.screen5250 {
@@ -210,7 +210,7 @@
b.screendos {
font-weight: normal;
font-style: normal;
- color: #ff;
+ color: #c0c0c0;
}
b.screen5250 {
1.2 +71 -20jakarta-tomcat-connectors/jk/xdocs/jk/buildjk.xml
Index: buildjk.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/buildjk.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildjk.xml 2 Sep 2002 10:52:17 - 1.1
+++ buildjk.xml 2 Sep 2002 16:02:10 - 1.2
@@ -36,7 +36,7 @@
/p
p
-You could set CFLAGS and LDFLAGS to add some platform specifics:
+You could set bCFLAGS/b and bLDFLAGS/b to add some platform specifics:
/p
screen
@@ -156,23 +156,47 @@
Change directory to the apache 1.3 or apache 2.0 source directory depending on your
version of Apache.
/li
li
-Set an APACHE1_HOME environment variable which points to where your Apache is
installed.
+If you want to build mod_jk for Apache 1.3, set an bAPACHE1_HOME/b environment
variable which points
+to where your Apache 1.3 is installed.
+A mod_jk module for Apache 2.0 build will require bAPACHE2_HOME/b environment
variable to be set.
/li
li
-Execute the following command:
+Copy mod_jk.dll to Apache's modules directory.
/li
/ul
+p
+An example on how to build mod_jk for Apache 1.3:
+/p
screendos
+notedosSet location for Apache 1.3 sources/notedos
+typedosset APACHE1_HOME=c:\apache13/typedos
+notedosChange directory to the mod_jk module for Apache 1.3/notedos
+typedoscd c:\home\apache\jk\native\apache-1.3/typedos
+notedosBuild the sources using MSDEV/notedos
typedosMSDEV mod_jk.dsp /MAKE ALL/typedos
+notedosCopy the dll to your apache modules directory/notedos
+typedoscp release\mod_jk.dll c:\apache13\modules\/typedos
+/screendos
+
+p
+An example on how to build mod_jk for Apache 2.0:
+/p
+screendos
+notedosSet location for Apache 2.0 sources/notedos
+typedosset APACHE2_HOME=c:\apache20/typedos
+notedosChange directory to the mod_jk module for Apache 2.0/notedos
+typedoscd c:\home\apache\jk\native\apache-2.0/typedos
+notedosBuild the sources using MSDEV/notedos
+typedosMSDEV mod_jk.dsp /MAKE ALL/typedos
+notedosCopy the dll to your apache modules directory/notedos
+typedoscp release\mod_jk.dll c:\apache20\modules\/typedos
/screendos
-If msdev is not in your path, enter the full path to msdev.exe. Also,
ApacheCore.lib is expected to exist in the APACHE1_HOME\src\CoreD and
APACHE1_HOME\src\CoreR directories before linking will succeed. You will need to build
enough of the Apache source to create these libraries.
-ul
-li
-Copy mod_jk.dll to Apache's modules directory.
-/li
-/ul
p
+If msdev is not in your path, enter the full path to msdev.exe.
+Also, ApacheCore.lib is expected to exist in the b${APACHEX_HOME}\src\CoreD/b
and
+b${APACHEX_HOME}\src\CoreR/b directories before linking will succeed.
+You will need to build enough of the Apache source to create these libraries.
This will build both release and debug versions of the redirector plug-in (mod_jk).
An alternative will be to open mod_jk.dsp in msdev and build it using the build
menu.
/p
@@ -211,15 +235,19 @@
note5250Create the CL build program source file/note5250
type5250CRTSRCPF FILE(MOD_JK/QCLSRC) TEXT(Build program source file)/type5250
note5250Edit the service program source file/note5250
-type5250STRSEU MOD_JK/QSRVSRC MOD_GZIP/type5250
+type5250STRSEU MOD_JK/QSRVSRC MOD_JK/type5250
cvs commit: jakarta-tomcat-connectors/jk/doc/images - New directory
hgomez 2002/08/29 01:33:43 jakarta-tomcat-connectors/jk/doc/images - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/doc/images banner.gif tomcat.gif tomcat.ico
hgomez 2002/08/29 01:34:38 Added: jk/doc/images banner.gif tomcat.gif tomcat.ico Log: Added images Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/doc/images/banner.gif Binary file 1.1 jakarta-tomcat-connectors/jk/doc/images/tomcat.gif Binary file 1.1 jakarta-tomcat-connectors/jk/doc/images/tomcat.ico Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
hgomez 2002/08/28 02:55:11 Modified:jk/native/common jk_global.h Log: First fixes for iSeries (AS/400) Revision ChangesPath 1.20 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jk_global.h 24 Jul 2002 02:36:36 - 1.19 +++ jk_global.h 28 Aug 2002 09:55:11 - 1.20 @@ -92,10 +92,10 @@ #include netinet/tcp.h #include arpa/inet.h #include sys/un.h -#ifndef _OSD_POSIX +#if !defined(_OSD_POSIX) !defined(AS400) #include sys/socketvar.h #endif -#ifndef HPUX11 +#if !defined(HPUX11) !defined(AS400) #include sys/select.h #endif #endif -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_mutex.h
hgomez 2002/07/25 03:02:21 Modified:jk/native2/include jk_mutex.h Log: Correct preprocessor use of APR_HAS_THREADS, since APR make use of #define APR_HAS_THREADS 0 when no threads support (Reported by Dev Zero Ltd) Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-connectors/jk/native2/include/jk_mutex.h Index: jk_mutex.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_mutex.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_mutex.h6 Jun 2002 13:32:25 - 1.3 +++ jk_mutex.h25 Jul 2002 10:02:21 - 1.4 @@ -72,7 +72,7 @@ struct jk_env; struct jk_mutex; -#ifdef HAS_APR +#if APR_HAS_THREADS #include apr_thread_mutex.h #elif defined( WIN32 ) #include windows.h @@ -118,7 +118,7 @@ /* Private data */ void *privateData; -#ifdef APR_HAS_THREADS +#if APR_HAS_THREADS apr_thread_mutex_t *threadMutex; #elif defined( WIN32 ) CRITICAL_SECTION threadMutex; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.am
hgomez 2002/07/25 03:31:30
Modified:jk/native/apache-1.3 Makefile.am
Log:
Make sure that apxs flags will be passed to libtool when building
mod_jk.c (if not mod_jk.c will not be compiled with -DEAPI for example)
Revision ChangesPath
1.7 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.am
Index: Makefile.am
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 5 Nov 2001 23:04:06 - 1.6
+++ Makefile.am 25 Jul 2002 10:31:30 - 1.7
@@ -16,7 +16,7 @@
JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
-AM_CFLAGS=@apache_include@ -I../common
+AM_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I../common
include ../common/list.mk.in
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native BUILDING
hgomez 2002/07/01 04:01:24
Added: jk/native BUILDING
Log:
Updated build documentation for mod_jk, replace README.configure
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/native/BUILDING
Index: BUILDING
===
Building from the cvs tree: (for developers only).
---
When using a cvs tree buildconf.sh must be run before configure.
The today version of buildconf.sh build the following files:
libtool files in scripts/build/unix (should copy them?).
Makefile.in from Makefile.am
aclocal.m4 from different m4 files located in the local machine.
configure from configure.in and aclocal.m4.
If you see error message from automake, don't care about them.
Building using configure
It is possible to use autoconf for configuration and installation.
To create jakarta-tomcat-connectors's autoconf script, you will need libtool
1.3.3 or higher, and autoconf 2.13 or newer.
Those tools will not be required if you are just
using a package downloaded from apache.org, they are only required for
developers.
To configure jakarta-tomcat-connectors run the following commands.
./buildconf.sh (not required unless you are a developer)
./configure [autoconf arguments] [jakarta-tomcat-connectors arguments]
make
It is possible to set CFLAGS and LDFLAGS to add some platform specifics:
LDFLAGS=-lc \
./configure -with-apxs=/home2/local/apache/bin/apxs
Build for both Apache 1.3 and 2.0
-
If you want to build mod_jk for Apache 1.3 and 2.0, you should :
use configure and indicate Apache 1.3 apxs location (--with-apxs)
use make
copy the mod_jk binary to the apache modules location
make clean (to remove all previously compiled modules)
use configure and indicate Apache 2.0 apxs location,
then make.
./configure --with-apxs=/usr/sbin/apxs
make
cp ./apache-1.3/mod_jk.so /usr/lib/apache
make clean
./configure --with-apxs=/usr/sbin/apxs2
make
cp ./apache-2.0/mod_jk.so /usr/lib/apache2
Examples
Apache2.0, JNI support:
./configure --with-apxs=/opt/apache2/bin/apxs --with-java-home=${JAVA_HOME}
--with-java-platform=2 -enable-jni
Apache 1.3, no JNI support:
./configure --with-apxs=/usr/sbin/apxs
jakarta-tomcat-connectors arguments
---
JVM related parameters:
--with-java-home=DIR
DIR is the patch to the JDK root directory. Something like: /opt/java/jdk12
--with-os-type[=SUBDIR]
SUBDIR is the os-type subdirectory, normaly configure should guess it
correctly.
--with-arch-type[=SUBDIR]
SUBDIR is the arch subdirectory, normaly configure should guess it correctly.
--with-java-platform=VAL
VAL is the Java platform 1 is 1.1.x and 2 is 1.2.x. It is guessed correctly.
Apache related parameters:
--with-apxs[=FILE]
FILE is the location of the apxs tool. Default is finding apxs in PATH.
It builds a shared Apache module. It detects automaticly the Apache version.
(2.0 and 1.3)
* --with-apache=DIR
DIR is the path where apache sources are located.
The apache sources should have been configured before configuring mod_jk.
DIR is something like: /home/apache/apache_1.3.19
It builds a static Apache module.
--enable-EAPI
This parameter is needed when using Apache-1.3 and mod_ssl, otherwise you
will get the error message: this module might crash under EAPI! when
loading libjk.so in httpd.
JNI support:
--enable-jni
Build the jni_connect.so and the JNI worker.
* Static build need more tests, and we strongly recommand dynamic build
using DSO/APXS.
Installation
The mod_jk binary will be in :
./apache-1.3/mod_jk.so if you select to build mod_jk for apache 1.3
./apache-2.0/mod_jk.so if you select to build mod_jk for apache 2.0
Misc notes
--
HP-UX build notes :
If you plan to use GCC on HP-UX to build mod_jk, be sure to
have -DHPUX11GCC defined (usually by setting CLAGS before configure)
Reports are that the stripped down cc version that ships with
HP-UX won't be able to works, you should habe the HP add-on ANSI C
Compiler package.
A good repository for HP-UX gnu tools is :
http://gatekeep.cs.utah.edu/
Solaris build notes :
the build should works with the GNU gcc compiler, on both
SPARC and x86 architecture systems.
A good repository for Solaris gnu tools is :
http://www.sunfreeware.com/
Be carefull when mixing native compiler and gnu compiler, and
ensure that apache and mod_jk
