Re: JK versions
There is an important issue to discuss - labeling mod_jk. As you know, we are trying to make some improvements in jk, start using APR, etc. That will involve few significant changes - and some people may want to have a more 'stable' jk. There are 4 versions of jk: Let's call 1.0 what is present in tomcat3.2.x repository. Let's call 1.1 what is present in 3.3 repository. It is backward compatible with Jk1.0, has many fixes, etc. 1.2 - what is in jakarta-tomcat-connectors/jk, the same as 1.1 plus support for Apache2.0 ( Jk1.1 doesn't support apache2.0 since it wasn't available at that time ). This version also have support for tomcat4.0 and initial code for ajp14. I would call '1.2' the version that was in CVS around Oct 15 ( i.e. after both 3.3 and 4.0.1 were released, before any refactoring was started ). So far all the changes in the main tree were small. However some biger changes are needed and are already in progress. We'll have a simpler build system, support for APR, lot more flexibility, simpler configuration. I would like to call the next version of jk 2.0, as a number of internal APIs will change. ( all those numbers are made up - we can call them 1, 2, 3, 4 instead of 1.0, 1.1, ... ). What I would like to do is make a branch for mod_jk 1.2, and eventually build a snapshot. Eventually we should start a release plan and have a vote on the names and such. Since names/labels/versions are allways fun thing to discuss, I'm open to any other naming scheme - but we need to have one, it's extremely confusing otherwise. I will not check anything else into mod_jk until this is decided ( since my next commit is pretty big and likely to brake things, I did a lot of changes in uri_map, etc. - I need a stable branch labeled before doing the commit ). +1. Tag it (or branch it) ! Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5181] - HttpConnector [8080] No processor available, rejecting this connection
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5181. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5181 HttpConnector [8080] No processor available, rejecting this connection [EMAIL PROTECTED] changed: What|Removed |Added Summary||HttpConnector [8080] No ||processor available, ||rejecting this connection -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] mod_jk for Apache 2.0 minor fixes
On Fri, Nov 30, 2001 at 07:25:40PM -0500, GAWLAS,JULIUS (HP-Cupertino,ex1) wrote: This patch contains minor fixes for mod_jk for Apache 2.0; Most important is the change in prototype of jk_post_config which used to be void but now needs to return success code, also changes to types of some variables to better confirm to Apache 2.0 types. Let me know if you have any comments. FWIW, +1 (non-binding) from the httpd-2.0 peanut gallery. =) -- justin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] about kjc
Hi, tomcat users and developrs! /* I have post this patch twice. This is third time. */ Do you know kjc which is one of the completely opensource Java compiler? If not, you can see detail at http://www.dms.at/kopi. Accoding to Edouard G. Parmelan's report (http://rpmfind.net/tools/Kaffe/messages/1291.html), KJC HAVE BEATEN SUN'S JAVA COMPILER since version 1.5 about JLS compatibility. It was a grate news for Java open source community;) I and teik-san (san means Mr. in Japanese) wrote two kjc plugin for tomcat. One is for 3.3.x, and the other is for 4.0.x. If you take kjc plugin, it's good advertisement and help for kjc. Do you respect opensource? If so, could you take them? BTW, kjc is distributed under GPL. But you can take these patch in legal. Because you don't need to include kjc in tomcat. When you want to use kjc, only then you have to include it. In the fact, I wrote kjc plugin for Ant and it's really in it. So, you can also use kjc with Ant fine:) PS. usage for tomcat 4.0.x: download kjc.jar from http://www.dms.at/kopi and include it in common/lib. add specify jspCompilerPlugin at web.xml. For examples. servlet servlet-namejsp/servlet-name servlet-classorg.apache.jasper.servlet.JspServlet/servlet-class init-param param-namelogVerbosityLevel/param-name param-valueWARNING/param-value /init-param init-param param-namejspCompilerPlugin/param-name param-valueorg.apache.jasper.compiler.KjcJavaCompiler/param-value /init-param load-on-startup3/load-on-startup /servlet Cheers for opensource!! - Takashi OkamotoDebian Project: http://www.debian.org/ [EMAIL PROTECTED]Ja-Jakarta Project: http://www.ingrid.org/jajakarta/ GnuPG: 8B37 1FE6 76B2 7BA6 D59A 9BF7 E7F4 46C8 5293 6E17 KjcJavaCompiler.java.3.3 Description: Binary data KjcJavaCompiler.java.4.0 Description: Binary data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.0.2-B1.txt
larryi 01/12/01 05:26:12 Modified:.Tag: tomcat_40_branch RELEASE-NOTES-4.0.2-B1.txt Log: Add info about the classdebuginfo init parameter added to Jasper Revision ChangesPath No revision No revision 1.1.2.2 +5 -1 jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.2-B1.txt Index: RELEASE-NOTES-4.0.2-B1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.2-B1.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- RELEASE-NOTES-4.0.2-B1.txt2001/10/26 19:06:58 1.1.2.1 +++ RELEASE-NOTES-4.0.2-B1.txt2001/12/01 13:26:12 1.1.2.2 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-4.0.2-B1.txt,v 1.1.2.1 2001/10/26 19:06:58 remm Exp $ +$Id: RELEASE-NOTES-4.0.2-B1.txt,v 1.1.2.2 2001/12/01 13:26:12 larryi Exp $ @@ -47,6 +47,10 @@ Jasper New Features: --- +Compiling JSP servlets with class debugging information is now possible +by adding a classdebuginfo init parameter set to true in the JspSerlvet +configuration. This may be done in conf/web.xml, or in the web.xml of +a specific web application by adding a JspServlet configuration. Webapps New Features: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Submission: Portable SSL Support
[EMAIL PROTECTED] writes: What remains to be done is getting jk to reuse the same abstractions for ssl support - that would make the code cleaner. But it can wait a while, there are bigger changes going on there. That's what I figured. I took a look at that and it doesn't look very difficult so if someone just pings me when it's ready to be adapted :) -Ekr -- [Eric Rescorla [EMAIL PROTECTED]] http://www.rtfm.com/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] about kjc
Hi Takashi-san, +1 for the patch, but there's something that bothers me - we are starting to duplicate what's already present in ant. Next we'll have gcj support, etc. How difficult would it be to add an 'ant' compiler adapter, that will just use the ant javac task ? And also use the same ant mechansim, a global property - it's possible other tools will need a compiler ( what is cocoon doing ? ) ? Given the current ant dependecy checking ( that use class bytecode to detect dependencies ) we could simplify and generalize most of what's ugly in jasper. This would also allow to automatically compile servlets ( the same as jsps are compiled ), and even to automatically recompile a webapp ( that has a build.xml in WEB-INF ). Costin On Sat, 1 Dec 2001, Takashi Okamoto wrote: Hi, tomcat users and developrs! /* I have post this patch twice. This is third time. */ Do you know kjc which is one of the completely opensource Java compiler? If not, you can see detail at http://www.dms.at/kopi. Accoding to Edouard G. Parmelan's report (http://rpmfind.net/tools/Kaffe/messages/1291.html), KJC HAVE BEATEN SUN'S JAVA COMPILER since version 1.5 about JLS compatibility. It was a grate news for Java open source community;) I and teik-san (san means Mr. in Japanese) wrote two kjc plugin for tomcat. One is for 3.3.x, and the other is for 4.0.x. If you take kjc plugin, it's good advertisement and help for kjc. Do you respect opensource? If so, could you take them? BTW, kjc is distributed under GPL. But you can take these patch in legal. Because you don't need to include kjc in tomcat. When you want to use kjc, only then you have to include it. In the fact, I wrote kjc plugin for Ant and it's really in it. So, you can also use kjc with Ant fine:) PS. usage for tomcat 4.0.x: download kjc.jar from http://www.dms.at/kopi and include it in common/lib. add specify jspCompilerPlugin at web.xml. For examples. servlet servlet-namejsp/servlet-name servlet-classorg.apache.jasper.servlet.JspServlet/servlet-class init-param param-namelogVerbosityLevel/param-name param-valueWARNING/param-value /init-param init-param param-namejspCompilerPlugin/param-name param-valueorg.apache.jasper.compiler.KjcJavaCompiler/param-value /init-param load-on-startup3/load-on-startup /servlet Cheers for opensource!! - Takashi OkamotoDebian Project: http://www.debian.org/ [EMAIL PROTECTED]Ja-Jakarta Project: http://www.ingrid.org/jajakarta/ GnuPG: 8B37 1FE6 76B2 7BA6 D59A 9BF7 E7F4 46C8 5293 6E17 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5222] New: - Catalina startup
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5222. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5222 Catalina startup Summary: Catalina startup Product: Tomcat 4 Version: Unknown Platform: PC OS/Version: Windows NT/2K Status: UNCONFIRMED Severity: Minor Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] On initial startup cagalina servlet boots up and immediately goes away. At this point need to reboot catalina. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 4966] - request.getParameter(String) SOMETIMES fail to parse the querystring
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4966. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4966 request.getParameter(String) SOMETIMES fail to parse the querystring --- Additional Comments From [EMAIL PROTECTED] 2001-12-01 09:55 --- That's great, but if I can't reproduce the problem, I can't fix it. Do you see anything which would make my test case different than your situation ? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] about kjc
Hi, tomcat users and developrs! /* I have post this patch twice. This is third time. */ Do you know kjc which is one of the completely opensource Java compiler? If not, you can see detail at http://www.dms.at/kopi. Accoding to Edouard G. Parmelan's report (http://rpmfind.net/tools/Kaffe/messages/1291.html), KJC HAVE BEATEN SUN'S JAVA COMPILER since version 1.5 about JLS compatibility. It was a grate news for Java open source community;) I and teik-san (san means Mr. in Japanese) wrote two kjc plugin for tomcat. One is for 3.3.x, and the other is for 4.0.x. If you take kjc plugin, it's good advertisement and help for kjc. Do you respect opensource? If so, could you take them? BTW, kjc is distributed under GPL. But you can take these patch in legal. Because you don't need to include kjc in tomcat. When you want to use kjc, only then you have to include it. In the fact, I wrote kjc plugin for Ant and it's really in it. So, you can also use kjc with Ant fine:) +1 for this patch as it is legal since it uses reflection. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler KjcJavaCompiler.java
remm01/12/01 09:50:53 Added: jasper/src/share/org/apache/jasper/compiler KjcJavaCompiler.java Log: - Add support for the KJC Java compiler. Patch submitted Takashi Okamoto toraneko at kun.ne.jp - Note: maybe the compiler support should be refactored to use Ant, as Costin suggested, since it would avoid having lots of different wrappers and duplicating functionality. Revision ChangesPath 1.1 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java Index: KjcJavaCompiler.java === /* * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java,v 1.1 2001/12/01 17:50:53 remm Exp $ * $Revision: 1.1 $ * $Date: 2001/12/01 17:50:53 $ * * * * The Apache Software License, Version 1.1 * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. The end-user documentation included with the redistribution, if *any, must include the following acknowlegement: * This product includes software developed by the *Apache Software Foundation (http://www.apache.org/). *Alternately, this acknowlegement may appear in the software itself, *if and wherever such third-party acknowlegements normally appear. * * 4. The names The Jakarta Project, Tomcat, and Apache Software *Foundation must not be used to endorse or promote products derived *from this software without prior written permission. For written *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * http://www.apache.org/. * */ package org.apache.jasper.compiler; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; import org.apache.jasper.Constants; /** * A Plug-in class for specifying a 'kjc' compiler. * * Please link $CATALINA_HOME/jasper/jasper-compiler.jar and kjc.jar * (or kopi.jar) to $CATALINA_HOME/lib before use. + * Most of code in this class is copied from SunJavaCompiler.java. * * @author Anil K. Vijendran * @author Takashi Okamoto [EMAIL PROTECTED] * @author teik [EMAIL PROTECTED] */ public class KjcJavaCompiler implements JavaCompiler { String encoding; String classpath; // ignored String compilerPath; String outdir; // ignored OutputStream out; /** * Specify where the compiler can be found */ public void setCompilerPath(String compilerPath) { // not used by the KjcJavaCompiler this.compilerPath = compilerPath; } /** * Set the encoding (character set) of the source */ public void setEncoding(String encoding) { this.encoding = encoding; } /** * Set the class path for
DO NOT REPLY [Bug 5222] - Catalina startup
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5222. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5222 Catalina startup --- Additional Comments From [EMAIL PROTECTED] 2001-12-01 10:10 --- Any error messages reported somewhere ? (in the logs, on the command line) Are you using TC as a system service ? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/include - New directory
costin 01/12/01 10:32:59 jakarta-tomcat-connectors/jk/native/include - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/doc/jk2 - New directory
costin 01/12/01 10:33:42 jakarta-tomcat-connectors/jk/doc/jk2 - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] about kjc
on 12/1/01 10:08 AM, Remy Maucherat [EMAIL PROTECTED] wrote: Hi, tomcat users and developrs! /* I have post this patch twice. This is third time. */ Do you know kjc which is one of the completely opensource Java compiler? If not, you can see detail at http://www.dms.at/kopi. Accoding to Edouard G. Parmelan's report (http://rpmfind.net/tools/Kaffe/messages/1291.html), KJC HAVE BEATEN SUN'S JAVA COMPILER since version 1.5 about JLS compatibility. It was a grate news for Java open source community;) I and teik-san (san means Mr. in Japanese) wrote two kjc plugin for tomcat. One is for 3.3.x, and the other is for 4.0.x. If you take kjc plugin, it's good advertisement and help for kjc. Do you respect opensource? If so, could you take them? BTW, kjc is distributed under GPL. But you can take these patch in legal. Because you don't need to include kjc in tomcat. When you want to use kjc, only then you have to include it. In the fact, I wrote kjc plugin for Ant and it's really in it. So, you can also use kjc with Ant fine:) +1 for this patch as it is legal since it uses reflection. Remy I thought that using reflection to work with GPL code was still considered illegal by the FSF. -jon -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 5224] New: - Can't declare listeners in web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5224. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5224 Can't declare listeners in web.xml Summary: Can't declare listeners in web.xml Product: Tomcat 4 Version: 4.0 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Major Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] According to the Servlet 2.3 SPEC, this is a correct specification for a listener: web-app display-nameMyListeningApplication/display-name listener listener-classcom.acme.MyConnectionManager/listener-class /listener listener listener-classcom.acme.MyLoggingModule/listener-class /listener servlet display-nameRegistrationServlet/display-name ...etc /servlet /web-app However, when I do this in my web.xml, I get this error on startup: Starting service Tomcat-Standalone Apache Tomcat/4.0 PARSE error at line 11 column -1 org.xml.sax.SAXParseException: Element web-app does not allow listener here. Starting service Tomcat-Apache Apache Tomcat/4.0 What is the correct way to declare a listener? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] about kjc
On Sat, 1 Dec 2001, Jon Stevens wrote: +1 for this patch as it is legal since it uses reflection. Remy I thought that using reflection to work with GPL code was still considered illegal by the FSF. As long ASF/jakarta doesn't have a list of 'accepted licences' that we can include/bundle with our code, and most jakarta projects already depend/bundle lots of proprietary code, I don't see why this patch would be a problem. It doesn't require us to distribute GPL code. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 - New directory
costin 01/12/01 13:54:13 jakarta-tomcat-connectors/jk/native2 - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.properties.sample build.xml
costin 01/12/01 13:57:47 Added: jk/native2 build.properties.sample build.xml Log: Since the new code might break a lot ( I've got it to compile with apache2, but it's still not working ), I created a new directory. It can be considered 'experimental', use it only if you want to play/review the new jk. Please review the files in include - getting them right is the most important thing. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/build.properties.sample Index: build.properties.sample === # Location where Apache2.0 is installed. # We assume include and lib are below this apache2.home=/opt/apache2 # Same for Apache1.3 apache13.home=/usr # Same for Netscape netscape.home=d:/tools/sdk/netscape # Compile-time options so.debug=true so.optimize=false so.profile=false # Settings for building NetWare binaries. Uncomment these and modify for your # environment to build NetWare binaries. # # novellndk.dir=d:/tools/nwsdk # build.compiler.base=d:/tools/mw/6.0 # build.compiler.cc=${build.compiler.base}/bin/mwccnlm # build.compiler.ld=${build.compiler.base}/bin/mwldnlm # Settings for building Windows binaries. Uncomment these and modify for your # environment to build Windows binaries. # # build.compiler.base=c:/Program Files/Microsoft Visual Studio/VC98 # build.compiler.cc=${build.compiler.base}/bin/cl # build.compiler.ld=${build.compiler.base}/bin/link 1.1 jakarta-tomcat-connectors/jk/native2/build.xml Index: build.xml === ?xml version=1.0 ? project name=jk_native2 default=main basedir=. descriptionBuild the native component of jk./description property file=${user.home}/.ant.properties / property file=${user.home}/build.properties / property file=../build.properties / property file=build.properties / !-- == Local paths, overriden in build.properties == -- property name=apxs13 value=/usr/sbin/apxs / property name=apxs20 value=/opt/apache2/bin/apxs / property name=netscape.home location=/opt/iplanet/plugins / property name=apache2.home location=/opt/apache2 / property name=apache13.home location=/usr / property name=apache2.include location=${apache2.home}/include / property name=apr.include location=${apache2.home}/include / property name=apache13.include location=${apache13.home}/include / !-- == Build options == -- property name=so.debug value=true / property name=so.optimize value=false / property name=so.profile value=false / !-- == local properties == -- !-- Base dir for jk sources -- property name=jk.src location=.. / !-- Dependency: Ant Cc task -- property name=jkant.home location=${jk.src}/jkant/build / property name=native.dir location=${jk.src}/native2 / property name=build.dir location=${jk.src}/build/obj / path id=jkant pathelement location=${jkant.home}/classes/ pathelement location=${jkant.home}/jkant.jar/ /path !-- Targets -- target name=main depends=init,apache20,jni /target target name=init taskdef resource=META-INF/ant.tasks classpathref=jkant / available property=HAVE_APR file=${apr.include}/apr.h / mkdir dir=${build.dir} / /target target name=apache20 depends=init mkdir dir=${build.dir}/apache2 / so sofile=mod_jk buildDir=${build.dir}/apache2 optimize=${so.optimize} debug=${so.debug} taskDebug=0 profile=${so.profile} def name=_REENTRANT / def name=CHANNEL if=use.channel info=Use the new (experimental) channel interface / def name=CHUNK_SIZE value=4096 info=Read/Write buffer size / def name=REUSE_WORKER unless=option_no_reuse_worker info=Reuse the worker endpoint, using per thread data / def name=USE_APACHE_MD5 info=Use the MD5 implementation that is part of apache2 / src dir=. include name=server/apache-2.0/mod_jk.c / include name=common/*.c / include name=apr/*.c / /src includes include name=${native.dir}/common / include name=${apache2.include} / include name=${native.dir}/include / include name=${java.home}/../include / /includes depends fileset dir=${native.dir}/common includes=*.h / fileset dir=${native.dir}/include includes=*.h / /depends /so /target target name=jni depends=init mkdir dir=${build.dir}/jni / so sofile=jni_connect
cvs commit: jakarta-tomcat-connectors/jk/native2/apr - New directory
costin 01/12/01 13:57:56 jakarta-tomcat-connectors/jk/native2/apr - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common - New directory
costin 01/12/01 13:57:59 jakarta-tomcat-connectors/jk/native2/common - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include - New directory
costin 01/12/01 13:58:20 jakarta-tomcat-connectors/jk/native2/include - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni - New directory
costin 01/12/01 13:58:24 jakarta-tomcat-connectors/jk/native2/jni - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server - New directory
costin 01/12/01 13:58:27 jakarta-tomcat-connectors/jk/native2/server - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 - New directory
costin 01/12/01 13:58:52 jakarta-tomcat-connectors/jk/native2/server/apache2 - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_workerEnv.h
costin 01/12/01 14:01:02 Added: jk/native2/include jk_workerEnv.h Log: WorkerEnv interface. It'll manage most configuration options for jk2. It's the result of moving jk_worker_env out of jk_service.h, plus most of the options that are duplicated in most server adapters. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h Index: jk_workerEnv.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * *
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_uriEnv.h
costin 01/12/01 14:03:20 Added: jk/native2/include jk_uriEnv.h Log: UriEnv is contain properties associated with a mapping. It used to be private in jk_uri_map, plus extra options that could be specified per location ( moved from the server adapter ) This also replaces/enhances the private structure used for autoconfiguration. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h Index: jk_uriEnv.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * *
DO NOT REPLY [Bug 5224] - Can't declare listeners in web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5224. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5224 Can't declare listeners in web.xml [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2001-12-01 14:24 --- USER ERROR. web.xml referenced 2.2 dtd. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_uriMap.h
costin 01/12/01 14:06:29 Added: jk/native2/include jk_uriMap.h Log: UriMap is the uri-worker mapper. It is based on jk_uri_map, with some important changes. - mapUri() now returns a jk_uriEnv. From that you can extract the worker name ( for old style mapping ) or the worker ( and avoid another lookup in the handler ). - addMapping, mapUri now take a host parameter, for better support of virtual hosts. ( the old solution was based on some config tricks ) Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h Index: jk_uriMap.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache
Re: [PATCH] about kjc
On Sat, 1 Dec 2001, Jon Stevens wrote: +1 for this patch as it is legal since it uses reflection. Remy I thought that using reflection to work with GPL code was still considered illegal by the FSF. As long ASF/jakarta doesn't have a list of 'accepted licences' that we can include/bundle with our code, and most jakarta projects already depend/bundle lots of proprietary code, I don't see why this patch would be a problem. It doesn't require us to distribute GPL code. Yes, I don't really see any problem here. If the ASF feels it's still not OK, then I'll remove the file (it's fully independent from the rest). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config ajp.xml
remm01/12/01 14:16:24 Modified:webapps/tomcat-docs/config Tag: tomcat_40_branch ajp.xml Log: - Port the AJP docs updates. Revision ChangesPath No revision No revision 1.2.2.2 +229 -2jakarta-tomcat-4.0/webapps/tomcat-docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/ajp.xml,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- ajp.xml 2001/11/30 07:03:04 1.2.2.1 +++ ajp.xml 2001/12/01 22:16:24 1.2.2.2 @@ -144,12 +144,239 @@ section name=Configuration HOWTOs + subsection name=Apache + + subsection name=Introduction + +pThis section explains how to connect Tomcat 4 to the popular +open source web server, Apache. It was originally part of +iTomcat: A Minimalistic User's Guide/i by Gal Shachor, but +has been split off for organizational reasons. It should be +considered a bwork in progress/b. Since the Tomcat source +tree is constantly changing, the information herein may be out +of date. The only definitive reference at this point is the a +href=http://jakarta.apache.org/site/sourceindex.html;source +code/a./p + + /subsection + + subsection name=Installation + +subsection name=Needed Components + + pIn a nutshell a web server is waiting for client HTTP requests. + When these requests arrive the server does whatever is needed to + serve the requests by providing the necessary content. Adding a + servlet container may somewhat change this behavior. Now the web + server needs also to perform the following:/p + + ul +liLoad the servlet container adapter library +and initialize it (prior to serving requests). /li +liWhen a request arrives, it needs to check and see if a certain +request belongs to a servlet, if so it needs to let the adapter +take the request and handle it./li + /ul + + pThe adapter on the other hand needs to know what requests it is + going to serve, usually based on some pattern in the request URL, + and to where to direct these requests./p + + pThings are even more complex when the user wants to set + a configuration that uses virtual hosts, or when they want multiple + developers to work on the same web server but on different servlet + container JVMs. We will cover these two cases + in the advanced sections./p + +/subsection + +subsection name=mod_jk Terminology + + pThe following terms are used in this section:/p + + ul + listrongWorker process/strong - A worker is a Tomcat + instance that is running to serve servlet requests coming + from the web server. In most cases there is only a single worker + (the one and only Tomcat process) but sometimes you will run + multiple workers to achieve load balancing or site partitioning. + Each worker is identified to the web server by the host were + it is located, the port where it listens and the communication + protocol used to exchange messages./li + listrongIn-Process Worker/strong - This is a special + worker. Instead of working with a Tomcat process residing on + another process, the web server opens a JVM and executes + Tomcat inside the web server process address space. + Our discussion in this document is not going to get into this + special worker. Note: Tomcat 4 can't be run as this type of + worker at the moment./li + listrongWeb Server Plug-in/Tomcat Redirector/strong - + For Tomcat to cooperate with any web server it needs an agent + to reside in the web server and send him servlet requests. + This is the web server plug-in, and in our case the web server + plug-in is mod_jk. The redirector usually comes in the shape of + a DLL or shared object module that you plug into + the web server./li + listrongPlug-in Configuration/strong - We need to + configure the web server plug-in so that it knows where + the different Tomcat workers are and to which of them + it should forward requests. This information, accompanied with + some internal parameter, such as the log level, comprises + the plug-in
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_logger.h
costin 01/12/01 14:29:23 Added: jk/native2/include jk_logger.h Log: Logger interface, modified to make jk_log a virtual method ( so we're not statically bound to file logger ) Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/include/jk_logger.h Index: jk_logger.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_pool.h
costin 01/12/01 14:30:20 Added: jk/native2/include jk_pool.h Log: The old jk_pool interface, with virtual methods. If mod_jk will be used with APR, apr pools can be used instead. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/include/jk_pool.h Index: jk_pool.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_channel.h jk_env.h jk_global.h jk_map.h jk_msg.h jk_service.h jk_worker.h
costin 01/12/01 14:30:58 Added: jk/native2/include jk_channel.h jk_env.h jk_global.h jk_map.h jk_msg.h jk_service.h jk_worker.h Log: The other interfaces from jk. Small changes only. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/include/jk_channel.h Index: jk_channel.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ #ifndef JK_CHANNEL_H #define JK_CHANNEL_H
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c
costin 01/12/01 14:34:38 Added: jk/native2/common jk_uriMap.c Log: The old jk_uri_map, with a lot of changes in code organization. It seems we had a number of bugs ( 'best_match' was completely broken, plus some other issues ). The current code still seems slightly different from what the servlet spec requires, that must be fixed. I also moved some computing out of loop ( extension, etc ), etc. This is one of the most important pieces of JK, review is most needed here. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c Index: jk_uriMap.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
costin 01/12/01 14:36:49 Added: jk/native2/common jk_logger_file.c Log: The logger - using virtual functions. l-jkLog(l, ... ) should be used instead of jk_log( l, ... ). Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c Index: jk_logger_file.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_ajp14_worker.c jk_jni_worker.c jk_lb_worker.c
costin 01/12/01 14:37:29 Added: jk/native2/common jk_ajp14_worker.c jk_jni_worker.c jk_lb_worker.c Log: Workers - updated to use the new factory style. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/common/jk_ajp14_worker.c Index: jk_ajp14_worker.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ /** * Description: AJP14 next generation Bi-directional
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_ajp14.h jk_ajp_common.h jk_connect.h jk_context.h jk_endpoint.h jk_md5.h jk_msg_buff.h jk_mt.h jk_util.h jk_version.h
costin 01/12/01 14:40:10 Added: jk/native2/common jk_ajp14.h jk_ajp_common.h jk_connect.h jk_context.h jk_endpoint.h jk_md5.h jk_msg_buff.h jk_mt.h jk_util.h jk_version.h Log: Remaining .h files. They will be moved to include as we update them. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/common/jk_ajp14.h Index: jk_ajp14.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * *
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk.c
costin 01/12/01 14:41:41 Added: jk/native2/server/apache2 mod_jk.c Log: First server adapter to compile with the new classes. It probably doesn't work, but it's close :-) For now I'll just play with this one, after the interfaces are stable I'll start updating the other 3-4 server adapters. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c Index: mod_jk.c === /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil-*- */ /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * *
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jnicb.c jk_jnicb.exp jk_jnicb.h
costin 01/12/01 14:42:33 Added: jk/native2/jni jk_jnicb.c jk_jnicb.exp jk_jnicb.h Log: The jni code, imported from native/ Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/jni/jk_jnicb.c Index: jk_jnicb.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ /*** * Description: JNI callbacks implementation for the JNI
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_ajp_common.c
costin 01/12/01 14:52:06 Modified:jk/native2/common jk_ajp_common.c Log: Removed the old jk_connect based code, use jk_channel interfaces. Revision ChangesPath 1.2 +79 -182 jakarta-tomcat-connectors/jk/native2/common/jk_ajp_common.c Index: jk_ajp_common.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_ajp_common.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_ajp_common.c 2001/12/01 22:38:39 1.1 +++ jk_ajp_common.c 2001/12/01 22:52:06 1.2 @@ -59,7 +59,7 @@ * Description: common stuff for bi-directional protocols ajp13/ajp14. * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ @@ -273,15 +273,15 @@ static int ajp_marshal_into_msgb(jk_msg_buf_t*msg, jk_ws_service_t *s, jk_logger_t *l, - ajp_endpoint_t *ae) + ajp_endpoint_t *ae) { unsigned char method; unsigned i; -jk_log(l, JK_LOG_DEBUG, Into ajp_marshal_into_msgb\n); +l-jkLog(l, JK_LOG_DEBUG, Into ajp_marshal_into_msgb\n); if (!sc_for_req_method(s-method, method)) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - No such method %s\n, s-method); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - No such method %s\n, s-method); return JK_FALSE; } @@ -296,7 +296,7 @@ jk_b_append_byte(msg, (unsigned char)(s-is_ssl)) || jk_b_append_int(msg, (unsigned short)(s-num_headers))) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the message begining\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the message begining\n); return JK_FALSE; } @@ -305,18 +305,18 @@ if (sc_for_req_header(s-headers_names[i], sc)) { if (jk_b_append_int(msg, sc)) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the header name\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the header name\n); return JK_FALSE; } } else { if (jk_b_append_string(msg, s-headers_names[i])) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the header name\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the header name\n); return JK_FALSE; } } if (jk_b_append_string(msg, s-headers_values[i])) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the header value\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the header value\n); return JK_FALSE; } } @@ -324,35 +324,35 @@ if (s-remote_user) { if (jk_b_append_byte(msg, SC_A_REMOTE_USER) || jk_b_append_string(msg, s-remote_user)) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the remote user\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the remote user\n); return JK_FALSE; } } if (s-auth_type) { if (jk_b_append_byte(msg, SC_A_AUTH_TYPE) || jk_b_append_string(msg, s-auth_type)) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the auth type\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the auth type\n); return JK_FALSE; } } if (s-query_string) { if (jk_b_append_byte(msg, SC_A_QUERY_STRING) || jk_b_append_string(msg, s-query_string)) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the query string\n); +l-jkLog(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the query string\n); return JK_FALSE; } } if (s-jvm_route) { if (jk_b_append_byte(msg, SC_A_JVM_ROUTE) || jk_b_append_string(msg, s-jvm_route)) { -jk_log(l, JK_LOG_ERROR, Error ajp_marshal_into_msgb - Error appending the jvm route\n); +l-jkLog(l,
Re: [PATCH] about kjc
Hi, Costin. At Sat, 1 Dec 2001 09:24:59 -0800 (PST), [EMAIL PROTECTED] wrote: +1 for the patch, but there's something that bothers me - we are starting to duplicate what's already present in ant. Next we'll have gcj support, etc. How difficult would it be to add an 'ant' compiler adapter, that will just use the ant javac task ? Of cource, using ant is better:) It's good idea. It seems not so difficult. You can use Javac or CompilerAdapterFactory (and Compiler Adapter) class for it. And also use the same ant mechansim, a global property - it's possible other tools will need a compiler ( what is cocoon doing ? ) ? I don't know recent Cocoon. But cocoon 1.8.x was using just tomcat's JavaCompiler;) This would also allow to automatically compile servlets ( the same as jsps are compiled ), Resin has it already. It's very useful:) thanks. Takashi Okamoto -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
AJP Todo
Hi, On the TODO list for AJP, there is: - Implementing jvmroute. - Adding a mechanism like there is in Tomcat 3.3 to automatically generate a configuration file. That should be relatively easy to do using a server listener (or a host listener). I'm not going to do either of these. I have no clue how to do the first one, and no time to do the second one. So I'm counting on all the guys who voted +1 for supporting AJP 1.3+ on Tomcat 4. I did bootstrap the porting of the docs already, and I've also fixed the problems with compiling against the CVS HEAD, so I think I've done my part :) If you want to see full support for AJP in TC 4.0.2, it's up to you guys :) If people are willing to actively support it, and if the risk for creating a security vulnerability is low, we could also enable the AJP 1.3 connector and the server listener by default (and declare it officially supported), so that 4.0.2 behaves almost like 3.3 for AJP 1.3 related stuff. Thanks, Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: AJP Todo
I have no objection to help porting ${Server}Config to 4.x, but I'm still a Catalina novice. The 3.3 API is more command and control, so it is easier to get to the information. It will take me a little time to find out how to get the servlet-mappings in Catalina. - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Saturday, December 01, 2001 4:40 PM Subject: AJP Todo Hi, On the TODO list for AJP, there is: - Implementing jvmroute. - Adding a mechanism like there is in Tomcat 3.3 to automatically generate a configuration file. That should be relatively easy to do using a server listener (or a host listener). I'm not going to do either of these. I have no clue how to do the first one, and no time to do the second one. So I'm counting on all the guys who voted +1 for supporting AJP 1.3+ on Tomcat 4. I did bootstrap the porting of the docs already, and I've also fixed the problems with compiling against the CVS HEAD, so I think I've done my part :) If you want to see full support for AJP in TC 4.0.2, it's up to you guys :) If people are willing to actively support it, and if the risk for creating a security vulnerability is low, we could also enable the AJP 1.3 connector and the server listener by default (and declare it officially supported), so that 4.0.2 behaves almost like 3.3 for AJP 1.3 related stuff. Thanks, Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] ** This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_ajp_common.c jk_ajp_common.h jk_ajp14.c
costin 01/12/01 17:00:00 Modified:jk/native2/common jk_ajp_common.c jk_ajp_common.h jk_ajp14.c Log: Update jk_log. Few more fixes to complete the move to jk_channel. Changed ajp_worker_t worker to a pointer ( it was very confusing ) Revision ChangesPath 1.3 +8 -9 jakarta-tomcat-connectors/jk/native2/common/jk_ajp_common.c Index: jk_ajp_common.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_ajp_common.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_ajp_common.c 2001/12/01 22:52:06 1.2 +++ jk_ajp_common.c 2001/12/02 01:00:00 1.3 @@ -59,7 +59,7 @@ * Description: common stuff for bi-directional protocols ajp13/ajp14. * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.2 $ * + * Version: $Revision: 1.3 $ * ***/ @@ -67,7 +67,6 @@ #include jk_util.h #include jk_ajp_common.h #include jk_ajp14.h -#include jk_connect.h #include jk_channel.h #include jk_env.h @@ -553,7 +552,7 @@ jk_close_pool((ae-pool)); { - jk_channel_t *channel=ae-worker-worker.channel; + jk_channel_t *channel=ae-worker-worker-channel; int err=channel-close( channel, ae-endpoint ); } free(ae); @@ -565,7 +564,7 @@ unsigned attempt; for(attempt = 0 ; attempt ae-worker-connect_retry_attempts ; attempt++) { - jk_channel_t *channel=ae-worker-worker.channel; + jk_channel_t *channel=ae-worker-worker-channel; int err=channel-open( channel, ae-endpoint ); l-jkLog(l, JK_LOG_DEBUG, ajp_connect_to_endpoint: connected %lx\n, ae-endpoint ); if( err == JK_TRUE ) { @@ -593,7 +592,7 @@ jk_dump_buff(l, JK_LOG_DEBUG, sending to ajp13, msg); { int err; - jk_channel_t *channel=ae-worker-worker.channel; + jk_channel_t *channel=ae-worker-worker-channel; err=channel-send( channel, ae-endpoint, jk_b_get_buff(msg), jk_b_get_len(msg) ); @@ -624,7 +623,7 @@ return JK_FALSE; } { - jk_channel_t *channel=ae-worker-worker.channel; + jk_channel_t *channel=ae-worker-worker-channel; rc=channel-recv( channel, ae-endpoint, head, AJP_HEADER_LEN ); @@ -655,7 +654,7 @@ jk_b_set_pos(msg, 0); { - jk_channel_t *channel=ae-worker-worker.channel; + jk_channel_t *channel=ae-worker-worker-channel; rc=channel-recv( channel, ae-endpoint, jk_b_get_buff(msg), msglen); @@ -793,7 +792,7 @@ * First try to reuse open connections... */ { - jk_channel_t *channel=ae-worker-worker.channel; + jk_channel_t *channel=ae-worker-worker-channel; err=ajp_connection_tcp_send_message(ae, op-request, l); if( err != JK_TRUE ) { l-jkLog(l, JK_LOG_ERROR, Error sending request, close endpoint\n); @@ -1138,7 +1137,7 @@ } /* Try again to connect */ { - jk_channel_t *channel=p-worker-worker.channel; + jk_channel_t *channel=p-worker-worker-channel; l-jkLog(l, JK_LOG_ERROR, Error sending request, reconnect\n); err=channel-close( channel, p-endpoint ); 1.2 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_ajp_common.h Index: jk_ajp_common.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_ajp_common.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_ajp_common.h 2001/12/01 22:40:10 1.1 +++ jk_ajp_common.h 2001/12/02 01:00:00 1.2 @@ -59,7 +59,7 @@ * Description: common stuff for bi-directional protocol ajp13/ajp14. * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ #ifndef JK_AJP_COMMON_H @@ -323,8 +323,8 @@ jk_login_service_t *login; -jk_worker_t worker; - +jk_worker_t *worker; + /* * Post physical connect handler. * AJP14 will set here its login handler 1.2 +8 -8
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
costin 01/12/01 17:01:42 Modified:jk/native2/common jk_logger_file.c Log: The logger will print messages to stdout if it is not opened. This is usefull for debugging what happens before jk_init() ( the configuration stage ). ( visible with httpd -X ) As soon as we add jk_logger_apache and log to the normal apache log this can go away. Revision ChangesPath 1.2 +26 -26jakarta-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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_logger_file.c 2001/12/01 22:36:49 1.1 +++ jk_logger_file.c 2001/12/02 01:01:42 1.2 @@ -59,7 +59,7 @@ * Description: Utility functions (mainly configuration) * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ #include jk_util.h @@ -73,6 +73,10 @@ #define HUGE_BUFFER_SIZE (8*1024) #define LOG_LINE_SIZE(1024) +int JK_METHOD jk_logger_file_factory(jk_env_t *env, void **result, + char *type, char *name); + + /* * define the log format, we're using by default the one from error.log * @@ -103,9 +107,16 @@ unsigned sz = strlen(what); if(sz) { FILE *f = (FILE *)l-logger_private; -fwrite(what, 1, sz, f); - /* [V] Flush the dam' thing! */ - fflush(f); + +if( f==NULL ) { +/* This is usefull to debug what happens before logger is set. + On apache you need -X option ( no detach, single process ) */ +printf(%s, what ); +} else { +fwrite(what, 1, sz, f); +/* [V] Flush the dam' thing! */ +fflush(f); +} } return JK_TRUE; @@ -116,6 +127,8 @@ static int jk_logger_file_parseLogLevel(const char *level) { +if( level == NULL ) return JK_LOG_ERROR_LEVEL; + if(0 == strcasecmp(level, JK_LOG_INFO_VERB)) { return JK_LOG_INFO_LEVEL; } @@ -135,17 +148,18 @@ jk_map_t *properties ) { char *file=map_getStrProp(properties,logger,file, - file,mod_jk.log); -int level=map_getIntProp(properties,logger,file, - level, 0); + name,mod_jk.log); +int level; +char *levelS=map_getIntProp(properties,logger,file, +level, ERROR); char *logformat=map_getIntProp(properties,logger,file, timeFormat, JK_TIME_FORMAT); FILE *f; +_this-level = jk_logger_file_parseLogLevel(levelS); + jk_logger_file_logFmt = logformat; -_this-level = level; - f = fopen(file, a+); if(!f) { return JK_FALSE; @@ -229,13 +243,8 @@ rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args); #endif va_end(args); -if( l!=NULL ) { -l-log(l, level, buf); -} else { -/* This is usefull to debug what happens before logger is set. - On apache you need -X option ( no detach, single process ) */ -printf(%s, buf ); -} + +l-log(l, level, buf); #ifdef NETWARE free(buf); #endif @@ -245,17 +254,6 @@ } -static int jk_logger_file_fileExists(const char *f) -{ -if(f) { -struct stat st; -if((0 == stat(f, st)) (st.st_mode S_IFREG)) { -return JK_TRUE; -} -} -return JK_FALSE; -} - int jk_logger_file_factory(jk_env_t *env, void **result, char *type, @@ -269,6 +267,8 @@ l-log = jk_logger_file_log; l-logger_private = NULL; +l-open = jk_logger_file_open; +l-jkLog = jk_logger_file_jkLog; *result=(void *)l; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_connect.c jk_connect.h
costin 01/12/01 17:02:40 Removed: jk/native2/common jk_connect.c jk_connect.h Log: Removed the old socket code. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_workerEnv.h
costin 01/12/01 17:04:51 Modified:jk/native2/common jk_workerEnv.c jk/native2/include jk_workerEnv.h Log: Added a 'perThreadWorker' option to replace the #ifdef REUSE_WORKER. This is the experimental option that uses per thread data instead of object pool to recycle connections. It's usually better to use runtime options instead of compile preprocessing. Revision ChangesPath 1.2 +30 -23jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c Index: jk_workerEnv.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_workerEnv.c2001/12/01 22:35:27 1.1 +++ jk_workerEnv.c2001/12/02 01:04:51 1.2 @@ -59,7 +59,7 @@ * Description: Workers controller * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ #include jk_workerEnv.h @@ -77,6 +77,7 @@ { jk_map_t *init_data=_this-init_data; char **worker_list = NULL; +jk_logger_t *l=_this-l; unsigned i; int err; @@ -91,10 +92,12 @@ for(i = 0 ; i _this-num_of_workers ; i++) { jk_worker_t *w = NULL; jk_worker_t *oldw = NULL; +const char *name=(const char*)worker_list[i]; -w=_this-createWorker(_this, worker_list[i], init_data); +w=_this-createWorker(_this, name, init_data); +w-channel=NULL; if( w==NULL ) { -jk_log(_this-l, JK_LOG_ERROR, +l-jkLog(_this-l, JK_LOG_ERROR, init failed to create worker %s\n, worker_list[i]); /* Ignore it, other workers may be ok. @@ -103,7 +106,7 @@ map_put(_this-worker_map, worker_list[i], w, (void *)oldw); if(oldw!=NULL) { -jk_log(_this-l, JK_LOG_DEBUG, +l-jkLog(_this-l, JK_LOG_DEBUG, build_worker_map, removing old %s worker \n, worker_list[i]); oldw-destroy(oldw, _this-l); @@ -113,9 +116,9 @@ } } -jk_log(_this-l, JK_LOG_DEBUG, build_worker_map, done\n); +l-jkLog(_this-l, JK_LOG_DEBUG, build_worker_map, done\n); -jk_log(_this-l, JK_LOG_DEBUG, +l-jkLog(_this-l, JK_LOG_DEBUG, workerEnv.init() done: %d %s\n, _this-num_of_workers, worker_list[0]); return JK_TRUE; } @@ -136,13 +139,13 @@ for(i = 0 ; i sz ; i++) { jk_worker_t *w = map_value_at(_this-worker_map, i); if(w) { -jk_log(l, JK_LOG_DEBUG, +l-jkLog(l, JK_LOG_DEBUG, destroy worker %s\n, map_name_at(_this-worker_map, i)); w-destroy(w, l); } } -jk_log(_this-l, JK_LOG_DEBUG, workerEnv.close() done %d\n, sz); +l-jkLog(_this-l, JK_LOG_DEBUG, workerEnv.close() done %d\n, sz); map_free(_this-worker_map); } @@ -150,16 +153,17 @@ const char *name ) { jk_worker_t * rc; - +jk_logger_t *l=_this-l; + if(!name) { -jk_log(_this-l, JK_LOG_ERROR, wc_get_worker_for_name NULL name\n); +l-jkLog(l, JK_LOG_ERROR, wc_get_worker_for_name NULL name\n); return NULL; } rc = map_get(_this-worker_map, name, NULL); if( rc==NULL ) { -jk_log(_this-l, JK_LOG_ERROR, getWorkerForName: no worker found for %s \n, name); +l-jkLog(l, JK_LOG_ERROR, getWorkerForName: no worker found for %s \n, name); } return rc; } @@ -171,6 +175,7 @@ int err; char *type; jk_env_objectFactory_t fac; +jk_logger_t *l=_this-l; jk_worker_t *w = NULL; type=map_getStrProp( init_data,worker,name,type,NULL ); @@ -178,7 +183,7 @@ w=(jk_worker_t *)_this-env-getInstance(_this-env, worker, type ); if( w == NULL ) { -jk_log(_this-l, JK_LOG_ERROR, +l-jkLog(l, JK_LOG_ERROR, workerEnv.createWorker(): factory can't create worker %s:%s\n, type, name); return JK_FALSE; @@ -187,24 +192,24 @@ w-name=(char *)name; w-workerEnv=_this; -err=w-validate(w, init_data, _this, _this-l); +err=w-validate(w, init_data, _this, l); if( err!=JK_TRUE )
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk.c
costin 01/12/01 17:06:52 Modified:jk/native2/server/apache2 mod_jk.c Log: Update mod_jk. Apache now starts without any core dump ( :-) ), I haven't tried to use it yet, probably tommorow. Revision ChangesPath 1.2 +117 -116 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_jk.c 2001/12/01 22:41:40 1.1 +++ mod_jk.c 2001/12/02 01:06:52 1.2 @@ -60,7 +60,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * * Author: Gal Shachor [EMAIL PROTECTED] * * Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ /* @@ -103,7 +103,7 @@ #define JK_MAGIC_TYPE (application/x-jakarta-servlet) #define NULL_FOR_EMPTY(x) ((x !strlen(x)) ? NULL : x) -AP_DECLARE_DATA module jk_module; +AP_MODULE_DECLARE_DATA module jk_module; struct apache_private_data { jk_pool_t p; @@ -248,6 +248,8 @@ const void *b, unsigned l) { +jk_logger_t *l=s-workerEnv-l; + if(s s-ws_private b) { apache_private_data_t *p = s-ws_private; @@ -259,7 +261,7 @@ char *bb=(char *)b; if(!p-response_started) { -jk_log(s-workerEnv-l, JK_LOG_DEBUG, +l-jkLog(l, JK_LOG_DEBUG, Write without start, starting with defaults\n); if(!s-start_response(s, 200, NULL, NULL, NULL, 0)) { return JK_FALSE; @@ -270,7 +272,7 @@ while( ll 0 ) { unsigned long toSend=(llCHUNK_SIZE) ? CHUNK_SIZE : ll; r = ap_rwrite((const char *)bb, toSend, p-r ); -jk_log(s-workerEnv-l, JK_LOG_DEBUG, +l-jkLog(l, JK_LOG_DEBUG, writing %ld (%ld) out of %ld \n,toSend, r, ll ); ll-=CHUNK_SIZE; bb+=CHUNK_SIZE; @@ -346,6 +348,7 @@ jk_workerEnv_t *workerEnv) { request_rec *r = private_data-r; +jk_logger_t *l=s-workerEnv-l; apr_port_t port; @@ -367,8 +370,8 @@ s-remote_host = NULL_FOR_EMPTY(s-remote_host); s-remote_addr = NULL_FOR_EMPTY(r-connection-remote_ip); -if( s-workerEnv-l-level = JK_LOG_DEBUG_LEVEL ) { -jk_log(s-workerEnv-l, JK_LOG_DEBUG, +if( l-level = JK_LOG_DEBUG_LEVEL ) { +l-jkLog(l, JK_LOG_DEBUG, agsp=%u agsn=%s hostn=%s shostn=%s cbsport=%d sport=%d \n, ap_get_server_port( r ), ap_get_server_name( r ), @@ -635,19 +638,39 @@ { server_rec *s = cmd-server; struct stat statbuf; +jk_logger_t *l; jk_workerEnv_t *workerEnv = (jk_workerEnv_t *)ap_get_module_config(s-module_config, jk_module); - +l=workerEnv-l; + /* we need an absolut path (ap_server_root_relative does the ap_pstrdup) */ workerEnv-worker_file = ap_server_root_relative(cmd-pool,worker_file); - + if (workerEnv-worker_file == NULL) return JkWorkersFile file_name invalid; if (stat(workerEnv-worker_file, statbuf) == -1) return Can't find the workers file specified; +/** Read worker files + */ +l-jkLog(l, JK_LOG_DEBUG, Reading map %s %d\n, + workerEnv-worker_file, map_size( workerEnv-init_data ) ); + +if( workerEnv-worker_file != NULL ) { +int err=map_read_properties(workerEnv-init_data, +workerEnv-worker_file); +if( err==JK_TRUE ) { +l-jkLog(l, JK_LOG_DEBUG, + Read map %s %d\n, workerEnv-worker_file, + map_size( workerEnv-init_data ) ); +} else { +l-jkLog(l, JK_LOG_ERROR, Error reading map %s %d\n, + workerEnv-worker_file, map_size( workerEnv-init_data ) ); +} +} + return NULL; } @@ -667,7 +690,7 @@ jk_workerEnv_t *workerEnv = (jk_workerEnv_t *)ap_get_module_config(s-module_config, jk_module); -jk_map_t *m=workerEnv-worker_properties; +jk_map_t *m=workerEnv-init_data; value = map_replace_properties(value, m ); @@ -714,13 +737,16 @@ server_rec *s =
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jnicb.c
costin 01/12/01 17:07:12 Modified:jk/native2 build.xml jk/native2/jni jk_jnicb.c Log: Fix build.xml, update jni. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-connectors/jk/native2/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 2001/12/01 21:57:47 1.1 +++ build.xml 2001/12/02 01:07:12 1.2 @@ -76,7 +76,7 @@ def name=USE_APACHE_MD5 info=Use the MD5 implementation that is part of apache2 / src dir=. - include name=server/apache-2.0/mod_jk.c / + include name=server/apache2/mod_jk.c / include name=common/*.c / include name=apr/*.c / /src 1.2 +46 -46jakarta-tomcat-connectors/jk/native2/jni/jk_jnicb.c Index: jk_jnicb.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jnicb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_jnicb.c2001/12/01 22:42:33 1.1 +++ jk_jnicb.c2001/12/02 01:07:12 1.2 @@ -58,7 +58,7 @@ /*** * Description: JNI callbacks implementation for the JNI in process adapter* * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.1 $ * + * Version: $Revision: 1.2 $ * ***/ #include jk_jnicb.h @@ -80,16 +80,16 @@ jk_ws_service_t *ps = (jk_ws_service_t *)(int)s; jk_logger_t *pl = (jk_logger_t *)(int)l; -jk_log(pl, JK_LOG_DEBUG, Into JNIConnectionHandler::getNumberOfHeaders\n); +pl-jkLog(pl, JK_LOG_DEBUG, Into JNIConnectionHandler::getNumberOfHeaders\n); if(!ps) { - jk_log(pl, JK_LOG_ERROR, + pl-jkLog(pl, JK_LOG_ERROR, In JNIConnectionHandler::getNumberOfHeaders, NULL ws service object\n); /* [V] JNIConnectionHandler doesn't handle this */ return -1; } -jk_log(pl, JK_LOG_DEBUG, +pl-jkLog(pl, JK_LOG_DEBUG, Done JNIConnectionHandler::getNumberOfHeaders, found %d headers\n, ps-num_headers); return (jint)ps-num_headers; @@ -113,10 +113,10 @@ unsigned ncnt = (unsigned)cnt; unsigned acc = 0; -jk_log(pl, JK_LOG_DEBUG, Into JNIConnectionHandler::read\n); +pl-jkLog(pl, JK_LOG_DEBUG, Into JNIConnectionHandler::read\n); if(!ps) { -jk_log(pl, JK_LOG_ERROR, +pl-jkLog(pl, JK_LOG_ERROR, In JNIConnectionHandler::read, NULL ws service object\n); return -1; } @@ -124,13 +124,13 @@ nbuf = (*env)-GetByteArrayElements(env, buf, iscommit); if(!nbuf) { -jk_log(pl, JK_LOG_ERROR, +pl-jkLog(pl, JK_LOG_ERROR, In JNIConnectionHandler::read, GetByteArrayElements error\n); return -1; } if(!ps-read(ps, nbuf + nfrom, ncnt, acc)) { -jk_log(pl, JK_LOG_ERROR, +pl-jkLog(pl, JK_LOG_ERROR, In JNIConnectionHandler::read, failed to read from web server\n); } else { rc = (jint)acc; @@ -138,7 +138,7 @@ (*env)-ReleaseByteArrayElements(env, buf, nbuf, 0); -jk_log(pl, JK_LOG_DEBUG, Done JNIConnectionHandler::read\n); +pl-jkLog(pl, JK_LOG_DEBUG, Done JNIConnectionHandler::read\n); return rc; } @@ -155,11 +155,11 @@ jk_logger_t *pl = (jk_logger_t *)(int)l; char port[10]; -jk_log(pl, JK_LOG_DEBUG, +pl-jkLog(pl, JK_LOG_DEBUG, Into JNIConnectionHandler::readEnvironment. Environment follows ---\n); if(!ps) { -jk_log(pl, JK_LOG_ERROR, +pl-jkLog(pl, JK_LOG_ERROR, In JNIConnectionHandler::readEnvironment, NULL ws service object\n); return JK_FALSE; } @@ -171,63 +171,63 @@ envbuf, 0, (*env)-NewStringUTF(env, ps-method)); - jk_log(pl, JK_LOG_DEBUG, --- method: %s\n, ps-method); + pl-jkLog(pl, JK_LOG_DEBUG, --- method: %s\n, ps-method); } if(ps-req_uri) { (*env)-SetObjectArrayElement(env, envbuf, 1, (*env)-NewStringUTF(env, ps-req_uri)); - jk_log(pl, JK_LOG_DEBUG, --- req_uri: %s\n, ps-req_uri); +
Re: AJP Todo
On Sat, 1 Dec 2001, Remy Maucherat wrote: Hi, On the TODO list for AJP, there is: - Implementing jvmroute. Unfortunately that's not that easy. Manager has no way to access the Request, and that means no way to get the jvmRoute. The only possible hack is to 'intercept' the cookie header in jk and rewrite it in both directions ( to extract and insert the jvmroute ). Pretty ugly, but I see no other way with the current API. I'll try to do the hack, but I want to first finish the refactoring. - Adding a mechanism like there is in Tomcat 3.3 to automatically generate a configuration file. That should be relatively easy to do using a server listener (or a host listener). Hmmm. That shouldn't be difficult, but I would wait with it too. There are some major simplifications in jk2 configuration, and I think it is possible to have a much cleaner solution to synchronize web.xml/server.xml and httpd.conf/urimap.properties. Porting the 3.3 config generator would be great as a temporary solution, if anyone has the time. I'm not going to do either of these. I have no clue how to do the first one, To be honest, I have no clue either ( except for the hack - which is what I'll probably do if nobody find a better solution ). Tomcat 4. I did bootstrap the porting of the docs already, and I've also fixed the problems with compiling against the CVS HEAD, so I think I've done Great, many thanks ! my part :) If you want to see full support for AJP in TC 4.0.2, it's up to you guys :) Well, if you can also port the 'trusted app' - it would be really great. For 3.3 jk will be packaged as a 'trusted web application' ( i.e. a WAR with an extra interceptors.xml ), so users can deploy it / update it / etc as simple as with any other application. For 4.0 we create the jar that will be put in lib/catalina/..., but it would be nice to be able to use the same .WAR file. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: AJP Todo
On Sat, 1 Dec 2001, Bill Barker wrote: I have no objection to help porting ${Server}Config to 4.x, but I'm still a Catalina novice. The 3.3 API is more command and control, so it is easier to get to the information. It will take me a little time to find out how to get the servlet-mappings in Catalina. I'm a bit unhappy with the config generator in 3.3 - I think we can do better. If you want to work on this, it would be great to make it a bit more independent of the container. Right now it is very tightly coupled, in order for it to work you need to start tomcat, it doesn't work very well with context reloads, etc. Of course, we don't have any way to change the mappings without restarting apache, but that can be fixed as we add more ajp14 features ( jk_uriMap can be changed at run time, we just need the protocol support to send update requests ). One idea was to generate a .properties file for each webapp, following the same style with webapps/ directory. If a webapp is reloaded we can regenerate the app's mappings and get jk to reload only that file. We could also use a bit of XSLT or a xmlmapper to do that from web.xml, without starting the server. This would allow the configuration to be done 'off line'. Costin - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Saturday, December 01, 2001 4:40 PM Subject: AJP Todo Hi, On the TODO list for AJP, there is: - Implementing jvmroute. - Adding a mechanism like there is in Tomcat 3.3 to automatically generate a configuration file. That should be relatively easy to do using a server listener (or a host listener). I'm not going to do either of these. I have no clue how to do the first one, and no time to do the second one. So I'm counting on all the guys who voted +1 for supporting AJP 1.3+ on Tomcat 4. I did bootstrap the porting of the docs already, and I've also fixed the problems with compiling against the CVS HEAD, so I think I've done my part :) If you want to see full support for AJP in TC 4.0.2, it's up to you guys :) If people are willing to actively support it, and if the risk for creating a security vulnerability is low, we could also enable the AJP 1.3 connector and the server listener by default (and declare it officially supported), so that 4.0.2 behaves almost like 3.3 for AJP 1.3 related stuff. Thanks, Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] ** This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk.c
costin 01/12/01 18:09:45 Modified:jk/native2/common jk_logger_file.c jk_uriMap.c jk/native2/include jk_logger.h jk/native2/server/apache2 mod_jk.c Log: More fixes, now it seems the startup sequence is ok. The support for urimappings.properties ( used right now only for IIS ) is now available to all servers, and can be specified in workers.properties as well. ( next step is to have an easy way to specify and load multiple files ). Note that worker.properties settings can be replaced with JkWorker name value in httpd.conf ( i.e. you can do all the settings in httpd.conf, no need for a real worker.properties if you prefer to use a single file ) Revision ChangesPath 1.3 +24 -18jakarta-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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_logger_file.c 2001/12/02 01:01:42 1.2 +++ jk_logger_file.c 2001/12/02 02:09:44 1.3 @@ -59,7 +59,7 @@ * Description: Utility functions (mainly configuration) * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.2 $ * + * Version: $Revision: 1.3 $ * ***/ #include jk_util.h @@ -103,20 +103,20 @@ int level, const char *what) { +FILE *f = (FILE *)l-logger_private; + +if( f==NULL ) { +/* This is usefull to debug what happens before logger is set. + On apache you need -X option ( no detach, single process ) */ +printf(%s, what ); +return JK_TRUE; +} if(l l-level = level l-logger_private what) { unsigned sz = strlen(what); if(sz) { -FILE *f = (FILE *)l-logger_private; - -if( f==NULL ) { -/* This is usefull to debug what happens before logger is set. - On apache you need -X option ( no detach, single process ) */ -printf(%s, what ); -} else { -fwrite(what, 1, sz, f); -/* [V] Flush the dam' thing! */ -fflush(f); -} +fwrite(what, 1, sz, f); +/* [V] Flush the dam' thing! */ +fflush(f); } return JK_TRUE; @@ -150,18 +150,24 @@ char *file=map_getStrProp(properties,logger,file, name,mod_jk.log); int level; -char *levelS=map_getIntProp(properties,logger,file, +char *levelS=map_getStrProp(properties,logger,file, level, ERROR); -char *logformat=map_getIntProp(properties,logger,file, +char *logformat=map_getStrProp(properties,logger,file, timeFormat, JK_TIME_FORMAT); FILE *f; _this-level = jk_logger_file_parseLogLevel(levelS); - +if( _this-level == 0 ) +_this-jkLog( _this, JK_LOG_ERROR, Level %s %d \n, levelS, _this-level ); */ + +if( logformat==NULL ) { +logformat=JK_TIME_FORMAT; +} jk_logger_file_logFmt = logformat; f = fopen(file, a+); -if(!f) { +if(f==NULL) { +_this-jkLog(_this,JK_LOG_ERROR,Can't open log file %s\n, file ); return JK_FALSE; } _this-logger_private = f; @@ -193,7 +199,7 @@ return -1; } -if(l==NULL || +if(l-logger_private==NULL || l-level = level) { #ifdef NETWARE /* On NetWare, this can get called on a thread that has a limited stack so */ @@ -267,7 +273,7 @@ l-log = jk_logger_file_log; l-logger_private = NULL; -l-open = jk_logger_file_open; +l-open =jk_logger_file_open; l-jkLog = jk_logger_file_jkLog; *result=(void *)l; 1.3 +19 -9 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c Index: jk_uriMap.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_uriMap.c 2001/12/02 01:05:25 1.2 +++ jk_uriMap.c 2001/12/02 02:09:44 1.3 @@ -67,7 +67,7 @@ * servlet container. * *
PATCH: LocalStrings_ja.properties
I found the following differences between original messages and japanese translations. 1, I forgot to translate Craig's changes in catalina/src/share/org/apache/catalina/core/LocalStrings.properties. 2, I translated addition of messages in catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties and post it, but it isn't merged. Would you merge this patch? Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation Laboratories Index: catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties === RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties,v retrieving revision 1.4 diff -c -u -r1.4 LocalStrings_ja.properties --- catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties 2001/12/01 04:46:27 1.4 +++ catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties +2001/12/02 03:14:26 @@ -80,6 +80,7 @@ standardEngine.alreadyStarted=\u30a8\u30f3\u30b8\u30f3\u306f\u3001\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 standardEngine.mappingError=\u30b5\u30fc\u30d0\u540d {0} \u306e\u30de\u30c3\u30d4\u30f3\u30b0\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059 standardEngine.noHost=\u30b5\u30fc\u30d0\u540d {0} \u306b\u4e00\u81f4\u3059\u308b\u30db\u30b9\u30c8\u304c\u5b58\u5728\u3057\u307e\u305b\u3093 +standardEngine.noHostHeader=Host: \u30d8\u30c3\u30c0\u3092\u6301\u305f\u306a\u3044 +HTTP/1.1 \u30ea\u30af\u30a8\u30b9\u30c8\u3067\u3059 standardEngine.notHost=\u30a8\u30f3\u30b8\u30f3\u306e\u5b50\u4f9b\u306f\u30db\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 standardEngine.notParent=\u30a8\u30f3\u30b8\u30f3\u306f\u89aa\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 standardEngine.notStarted=\u30a8\u30f3\u30b8\u30f3\u306f\u3001\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 Index: catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties === RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties,v retrieving revision 1.2 diff -c -u -r1.2 LocalStrings_ja.properties --- catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties 2001/09/17 23:14:43 1.2 +++ catalina/src/share/org/apache/catalina/realm/LocalStrings_ja.properties +2001/12/02 03:15:09 @@ -4,6 +4,11 @@ # package org.apache.catalina.realm +jaasRealm.accountExpired=\u30e6\u30fc\u30b6\u540d {0} +\u306f\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f +jaasRealm.authenticatedSuccess=\u30e6\u30fc\u30b6\u540d {0} +\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f +jaasRealm.credentialExpired=\u30e6\u30fc\u30b6\u540d {0} +\u306f\u8a3c\u660e\u66f8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f +jaasRealm.failedLogin=\u30e6\u30fc\u30b6\u540d {0} +\u306f\u30ed\u30b0\u30a4\u30f3\u306b\u5931\u6557\u3057\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f +jaasRealm.loginException=\u30e6\u30fc\u30b6\u540d {0} +\u306e\u8a8d\u8a3c\u4e2d\u306b\u30ed\u30b0\u30a4\u30f3\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f jdbcRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f jdbcRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f jdbcRealm.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30af\u30ed\u30fc\u30ba\u6642\u306e\u4f8b\u5916 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: AJP Todo
On Sat, 1 Dec 2001, Bill Barker wrote: I have no objection to help porting ${Server}Config to 4.x, but I'm still a Catalina novice. The 3.3 API is more command and control, so it is easier to get to the information. It will take me a little time to find out how to get the servlet-mappings in Catalina. I'm a bit unhappy with the config generator in 3.3 - I think we can do better. If you want to work on this, it would be great to make it a bit more independent of the container. Right now it is very tightly coupled, in order for it to work you need to start tomcat, it doesn't work very well with context reloads, etc. I'd leave it being tied to the container, and getting the lifecycle / container events. It's (at least it should be) a simple piece of code, and although most of the code could be static utility methods, I'd implement the wrapper as a listener, instead of a webapp. Of course, we don't have any way to change the mappings without restarting apache, but that can be fixed as we add more ajp14 features ( jk_uriMap can be changed at run time, we just need the protocol support to send update requests ). One idea was to generate a .properties file for each webapp, following the same style with webapps/ directory. If a webapp is reloaded we can regenerate the app's mappings and get jk to reload only that file. We could also use a bit of XSLT or a xmlmapper to do that from web.xml, without starting the server. This would allow the configuration to be done 'off line'. Tomcat 4. I did bootstrap the porting of the docs already, and I've also fixed the problems with compiling against the CVS HEAD, so I think I've done Great, many thanks ! my part :) If you want to see full support for AJP in TC 4.0.2, it's up to you guys :) Well, if you can also port the 'trusted app' - it would be really great. I said I would, but it will require adding a few method to the Context interface (so please, no screaming over API breakage ;-)). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]