cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/util SystemLogHandler.java

[remm]

remm02/05/22 23:53:23

  Modified:jasper2/src/share/org/apache/jasper/compiler Compiler.java
  Added:   jasper2/src/share/org/apache/jasper/util
SystemLogHandler.java
  Log:
  - Add the System.err capture class, as well as the new Ant based compiler.
  - Appears to be working, including compilation error reports, and fixes
problems with JSTL (at least on JDK 1.3 and 1.4; on JDK 1.2, some compiler
other than javac will have to be used).
  - Using something other than the Ant default Java compiler is not
implemented yet.
  - Known issue: will refuse to compile JSPs (even valid ones) if one JSP failed
to compile before, until it is corrected.
To fix this, the generated Java file should be moved to a separate
directory before compiling, as Jasper is unable to compile
individual files.
  
  Revision  ChangesPath
  1.5   +148 -61   
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Compiler.java 6 May 2002 04:33:15 -   1.4
  +++ Compiler.java 23 May 2002 06:53:23 -  1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.4 2002/05/06 04:33:15 glenn Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/05/06 04:33:15 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.5 2002/05/23 06:53:23 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/05/23 06:53:23 $
*
* 
* 
  @@ -63,44 +63,93 @@
   import java.util.*;
   import java.io.*;
   import javax.servlet.jsp.tagext.TagInfo;
  +
   import org.xml.sax.Attributes;
  +
  +import org.apache.tools.ant.BuildEvent;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.BuildListener;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.taskdefs.Javac;
  +import org.apache.tools.ant.types.Path;
  +
   import org.apache.jasper.JspCompilationContext;
   import org.apache.jasper.Constants;
   import org.apache.jasper.JasperException;
   import org.apache.jasper.logging.Logger;
  +import org.apache.jasper.util.SystemLogHandler;
   
   /**
  - * If you want to customize JSP compilation aspects, this class is
  - * something you should take a look at. 
  - * 
  - * Hope is that people can just extend Compiler and override things
  - * like isOutDated() but inherit things like compile(). This might
  - * change. 
  + * Main JSP compiler class. This class uses Ant for compiling.
*
* @author Anil K. Vijendran
* @author Mandar Raje
* @author Pierre Delisle
* @author Kin-man Chung
  + * @author Remy Maucherat
*/
   public class Compiler {
   
  -protected JavaCompiler javac;
  +
  +// - Static
  +
  +
  +protected static Project project;
  +protected static Javac javac;
  +protected static Path path;
  +protected static Path srcPath;
  +
  +protected static CompilerBuildListener listener;
  +
  +static {
  +
  +System.setErr(new SystemLogHandler(System.err));
  +
  +// Initializing project
  +project = new Project();
  +project.init();
  +
  +// Initializing javac task
  +javac = (Javac) project.createTask(javac);
  +
  +// Initializing paths
  +path = new Path(project);
  +srcPath = new Path(project);
  +
  +// Initializing listener
  +listener = new CompilerBuildListener();
  +project.addBuildListener(listener);
  +
  +}
  +
  +
  +// - Instance Variables
  +
  +
   protected Mangler mangler;
   protected JspCompilationContext ctxt;
   
   private ErrorDispatcher errDispatcher;
   private PageInfo pageInfo;
   
  +
  +//  Constructor
  +
  +
   public Compiler(JspCompilationContext ctxt) {
   this.ctxt = ctxt;
this.errDispatcher = new ErrorDispatcher();
   }
  -
  +
  +
  +// - Public Methods
  +
  +
   /** 
* Compile the jsp file from the current engine context
*/
   public void compile()
  - throws FileNotFoundException, JasperException, Exception {
  +throws FileNotFoundException, JasperException, Exception {
   
// Setup page info area
pageInfo = new PageInfo(new BeanRepository(ctxt.getClassLoader()));
  @@ -158,57 +207,42 @@

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets InvokerHttpRequest.java

[remm]

remm02/05/23 00:13:46

  Modified:catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
ApplicationHttpResponse.java
   catalina/src/share/org/apache/catalina/servlets
InvokerHttpRequest.java
  Log:
  - Remove unused imports.
  
  Revision  ChangesPath
  1.12  +4 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
  
  Index: ApplicationHttpRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApplicationHttpRequest.java   17 Apr 2002 05:49:59 -  1.11
  +++ ApplicationHttpRequest.java   23 May 2002 07:13:45 -  1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
 1.11 2002/04/17 05:49:59 billbarker Exp $
  - * $Revision: 1.11 $
  - * $Date: 2002/04/17 05:49:59 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
 1.12 2002/05/23 07:13:45 remm Exp $
  + * $Revision: 1.12 $
  + * $Date: 2002/05/23 07:13:45 $
*
* 
*
  @@ -75,7 +75,6 @@
   import javax.servlet.http.HttpServletRequestWrapper;
   import org.apache.catalina.Globals;
   import org.apache.catalina.HttpRequest;
  -import org.apache.catalina.connector.HttpRequestFacade;
   import org.apache.catalina.util.Enumerator;
   import org.apache.catalina.util.RequestUtil;
   import org.apache.catalina.util.StringManager;
  @@ -94,7 +93,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.11 $ $Date: 2002/04/17 05:49:59 $
  + * @version $Revision: 1.12 $ $Date: 2002/05/23 07:13:45 $
*/
   
   class ApplicationHttpRequest extends HttpServletRequestWrapper {
  
  
  
  1.7   +4 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java
  
  Index: ApplicationHttpResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationHttpResponse.java  22 Jul 2001 20:25:08 -  1.6
  +++ ApplicationHttpResponse.java  23 May 2002 07:13:45 -  1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
 1.6 2001/07/22 20:25:08 pier Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/07/22 20:25:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
 1.7 2002/05/23 07:13:45 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2002/05/23 07:13:45 $
*
* 
*
  @@ -70,7 +70,6 @@
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpServletResponseWrapper;
   import org.apache.catalina.HttpResponse;
  -import org.apache.catalina.connector.HttpResponseFacade;
   import org.apache.catalina.util.StringManager;
   
   
  @@ -87,7 +86,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.6 $ $Date: 2001/07/22 20:25:08 $
  + * @version $Revision: 1.7 $ $Date: 2002/05/23 07:13:45 $
*/
   
   class ApplicationHttpResponse extends HttpServletResponseWrapper {
  
  
  
  1.5   +4 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerHttpRequest.java
  
  Index: InvokerHttpRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerHttpRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InvokerHttpRequest.java   16 Feb 2002 01:07:11 -  1.4
  +++ InvokerHttpRequest.java   23 May 2002 07:13:45 -  1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerHttpRequest.java,v
 1.4 2002/02/16 01:07:11 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/02/16 01:07:11 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerHttpRequest.java,v
 1.5 2002/05/23 07:13:45 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/05/23 07:13:45 $
*
* 

RE: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 Makefile.apxs.in

[GOMEZ Henri]

In my JK2 works I renamed APXSCFLAGS/APXSLDFLAGS
to APXS_CFLAGS and APXS_LDFLAGS :)

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 22, 2002 6:27 PM
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0
Makefile.apxs.in


jfclere 02/05/22 09:26:44

  Modified:jk/native/apache-2.0 Makefile.apxs.in
  Log:
  Typo.
  
  Revision  ChangesPath
  1.4   +1 -1  
jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.apxs.in
  
  Index: Makefile.apxs.in
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefi
le.apxs.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.apxs.in 29 Jun 2001 20:47:01 -  1.3
  +++ Makefile.apxs.in 22 May 2002 16:26:44 -  1.4
  @@ -6,7 +6,7 @@
   APXSLDFLAGS=@APXSLDFLAGS@
   APXSCFLAGS=@APXSCFLAGS@
   
  -JK=../common
  +JK=../common/
   JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
   JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
   JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L 
${JAVA_HOME}/lib/${ARCH}/native_threads
  
  
  

--
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 buildconf.sh

[jfclere]

jfclere 02/05/23 02:00:45

  Modified:jk/native2 buildconf.sh
  Log:
  Remove automake as we do not use it any more.
  
  Revision  ChangesPath
  1.4   +2 -4  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildconf.sh  16 May 2002 08:47:23 -  1.3
  +++ buildconf.sh  23 May 2002 09:00:45 -  1.4
  @@ -1,9 +1,7 @@
   #!/bin/sh
   
  -echo libtoolize --force --automake
  -libtoolize --force --automake
  -echo automake --copy --add-missing
  -automake --copy --add-missing
  +echo libtoolize --force --copy
  +libtoolize --force --copy
   echo aclocal
   aclocal
   echo autoconf
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 Makefile.apxs.in

[jean-frederic clere]

GOMEZ Henri wrote:
 
 In my JK2 works I renamed APXSCFLAGS/APXSLDFLAGS
 to APXS_CFLAGS and APXS_LDFLAGS :)

Ok, I will care if I copy+paste things for native/native2 ;-))

 
 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
 -Original Message-
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, May 22, 2002 6:27 PM
 To: [EMAIL PROTECTED]
 Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0
 Makefile.apxs.in
 
 
 jfclere 02/05/22 09:26:44
 
   Modified:jk/native/apache-2.0 Makefile.apxs.in
   Log:
   Typo.
 
   Revision  ChangesPath
   1.4   +1 -1
 jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.apxs.in
 
   Index: Makefile.apxs.in
   ===
   RCS file:
 /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefi
 le.apxs.in,v
   retrieving revision 1.3
   retrieving revision 1.4
   diff -u -r1.3 -r1.4
   --- Makefile.apxs.in 29 Jun 2001 20:47:01 -  1.3
   +++ Makefile.apxs.in 22 May 2002 16:26:44 -  1.4
   @@ -6,7 +6,7 @@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
 
   -JK=../common
   +JK=../common/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L
 ${JAVA_HOME}/lib/${ARCH}/native_threads
 
 
 
 
 --
 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]

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util CookieToolsTestCase.java

[larryi]

larryi  02/05/23 03:35:55

  Modified:catalina/src/test/org/apache/catalina/util Tag:
tomcat_40_branch CookieToolsTestCase.java
  Log:
  Port change from HEAD branch to test for current behavior with respect to
  Cookies.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.3.2.1   +6 -6  
jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
  
  Index: CookieToolsTestCase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- CookieToolsTestCase.java  5 Sep 2001 18:35:32 -   1.3
  +++ CookieToolsTestCase.java  23 May 2002 10:35:55 -  1.3.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java,v
 1.3 2001/09/05 18:35:32 craigmcc Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/09/05 18:35:32 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java,v
 1.3.2.1 2002/05/23 10:35:55 larryi Exp $
  + * $Revision: 1.3.2.1 $
  + * $Date: 2002/05/23 10:35:55 $
*
* 
*
  @@ -74,7 +74,7 @@
* Unit tests for the codeCookieTools/code class.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.3 $ $Date: 2001/09/05 18:35:32 $
  + * @version $Revision: 1.3.2.1 $ $Date: 2002/05/23 10:35:55 $
*/
   
   public class CookieToolsTestCase extends TestCase {
  @@ -185,13 +185,13 @@
   sb = new StringBuffer();
   CookieTools.getCookieHeaderValue(version0, sb);
   assertEquals(Version 0 cookie header value,
  - 
Version+0+Name=Version+0+Value;Domain=localhost;Path=/version0,
  + Version 0 Name=Version 0 
Value;Domain=localhost;Path=/version0,
sb.toString());
   
   sb = new StringBuffer();
   CookieTools.getCookieHeaderValue(version1, sb);
   assertEquals(Version 1 cookie header value,
  - 
Version+1+Name=Version+1+Value;Version=1;Comment=Version+1+Comment;Domain=localhost;Discard;Path=\/version1\,
  + Version 1 Name=\Version 1 
Value\;Version=1;Comment=\Version 1 
Comment\;Domain=localhost;Discard;Path=\/version1\,
sb.toString());
   
   }
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c

[Ignacio J. Ortega]

   Added few #ifdefs to make it compile with my version of 
 MSVC ( probably
   an old one ).

It's not a new MSVC version, You need to download the Microsoft Platform
SDK, to get the includes and libs needed to compile an
isapi_redirector2.dll with all the later developments, mainly to be able
to specify tomcatAuthentication=false on iis5, that is to be able to
use Native IIS Auth on tomcat, so i would prefer very much to add the
needed info to some readme, than to permit to build a non Complete
i_r2.dll

Saludos ,
Ignacio J. Ortega

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp

[Ignacio J. Ortega]

 De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
 Enviado el: jueves 23 de mayo de 2002 1:47

   +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I 
 ..\..\include /I $(JAVA_HOME)\include /I 
 $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I 
 $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D 
 _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /D 
 HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c

I'll do that change myself, it seems you've not saved before committing
:))), so i continue getteing a dsp with apache20_home, instead of
apache2_home..

Saludos ,
Ignacio J. Ortega

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp

[nacho]

nacho   02/05/23 05:05:53

  Modified:jk/native2/server/isapi isapi.dsp
  Log:
  * Changed apache20_home to apache2_home to mimic mod_jk2 and jk1 builds
  
  Revision  ChangesPath
  1.11  +328 -328  jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
  
  Index: isapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- isapi.dsp 22 May 2002 23:47:14 -  1.10
  +++ isapi.dsp 23 May 2002 12:05:52 -  1.11
  @@ -1,328 +1,328 @@
  -# Microsoft Developer Studio Project File - Name=isapi - Package Owner=4
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  -# ** DO NOT EDIT **
  -
  -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102
  -
  -CFG=isapi - Win32 Debug
  -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
  -!MESSAGE use the Export Makefile command and run
  -!MESSAGE 
  -!MESSAGE NMAKE /f isapi.mak.
  -!MESSAGE 
  -!MESSAGE You can specify a configuration when running NMAKE
  -!MESSAGE by defining the macro CFG on the command line. For example:
  -!MESSAGE 
  -!MESSAGE NMAKE /f isapi.mak CFG=isapi - Win32 Debug
  -!MESSAGE 
  -!MESSAGE Possible choices for configuration are:
  -!MESSAGE 
  -!MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library)
  -!MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library)
  -!MESSAGE 
  -
  -# Begin Project
  -# PROP AllowPerConfigDependencies 0
  -# PROP Scc_ProjName 
  -# PROP Scc_LocalPath 
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
  -!IF  $(CFG) == isapi - Win32 Release
  -
  -# PROP BASE Use_MFC 0
  -# PROP BASE Use_Debug_Libraries 0
  -# PROP BASE Output_Dir Release
  -# PROP BASE Intermediate_Dir Release
  -# PROP BASE Target_Dir 
  -# PROP Use_MFC 0
  -# PROP Use_Debug_Libraries 0
  -# PROP Output_Dir Release
  -# PROP Intermediate_Dir Release
  -# PROP Ignore_Export_Lib 0
  -# PROP Target_Dir 
  -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D 
_MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I 
$(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D ISAPI_EXPORTS /YX /FD /c
  -# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
  -# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
  -# ADD BASE RSC /l 0xc0a /d NDEBUG
  -# ADD RSC /l 0x409 /d NDEBUG
  -BSC32=bscmake.exe
  -# ADD BASE BSC32 /nologo
  -# ADD BSC32 /nologo
  -LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
  -# ADD LINK32 libapr.lib libaprutil.lib kernel32.lib user32.lib advapi32.lib 
wsock32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll 
/libpath:$(APACHE20_HOME)\lib
  -
  -!ELSEIF  $(CFG) == isapi - Win32 Debug
  -
  -# PROP BASE Use_MFC 0
  -# PROP BASE Use_Debug_Libraries 1
  -# PROP BASE Output_Dir Debug
  -# PROP BASE Intermediate_Dir Debug
  -# PROP BASE Target_Dir 
  -# PROP Use_MFC 0
  -# PROP Use_Debug_Libraries 1
  -# PROP Output_Dir Debug
  -# PROP Intermediate_Dir Debug
  -# PROP Ignore_Export_Lib 0
  -# PROP Target_Dir 
  -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\include /I 
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include 
/I $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D ISAPI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c
  -# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32
  -# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32
  -# ADD BASE RSC /l 0xc0a /d _DEBUG
  -# ADD RSC /l 0x409 /d _DEBUG
  -BSC32=bscmake.exe
  -# ADD BASE BSC32 /nologo
  -# ADD BSC32 /nologo
  -LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug 
/machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept 
/libpath:$(APACHE20_HOME)\lib
  -# SUBTRACT LINK32 /nodefaultlib
  -
  -!ENDIF 
  -
  -# Begin Target
  -
  -# Name isapi - Win32 Release
  -# Name isapi - Win32 Debug
  -# Begin Group Source Files
  -
  -# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
  -# Begin Source File
  -
  -SOURCE=.\isapi.def
  -# End Source File
  -# Begin Source File
  -
  

DO NOT REPLY [Bug 9344] New: - Security risk at HttpSessionEvent Source

[bugzilla]

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=9344.
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=9344

Security risk at HttpSessionEvent Source

   Summary: Security risk at HttpSessionEvent Source
   Product: Tomcat 4
   Version: 4.0.4 Beta 3
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Found at StandardSession following that at passivate and activate
not the StandardSessionFacade are the event source !

orginal:
--- L642-679
public void passivate() {

// Notify ActivationListeners
HttpSessionEvent event = null;
String keys[] = keys();
for (int i = 0; i  keys.length; i++) {
Object attribute = getAttribute(keys[i]);
if (attribute instanceof HttpSessionActivationListener) {
if (event == null)
event = new HttpSessionEvent(this);
// FIXME: Should we catch throwables?
((HttpSessionActivationListener)attribute).sessionWillPassivate
(event);
}
}

}


/**
 * Perform internal processing required to activate this
 * session.
 */
public void activate() {

// Notify ActivationListeners
HttpSessionEvent event = null;
String keys[] = keys();
for (int i = 0; i  keys.length; i++) {
Object attribute = getAttribute(keys[i]);
if (attribute instanceof HttpSessionActivationListener) {
if (event == null)
event = new HttpSessionEvent(this);
// FIXME: Should we catch throwables?
((HttpSessionActivationListener)attribute).sessionDidActivate
(event);
}
}

}

better are ::

public void passivate() {

// Notify ActivationListeners
HttpSessionEvent event = new HttpSessionEvent(getSession);
String keys[] = keys();
for (int i = 0; i  keys.length; i++) {
Object attribute = getAttribute(keys[i]);
if (attribute instanceof HttpSessionActivationListener) {
// FIXME: Should we catch throwables?
((HttpSessionActivationListener)attribute).sessionWillPassivate
(event);
}
}

}


/**
 * Perform internal processing required to activate this
 * session.
 */
public void activate() {

// Notify ActivationListeners
HttpSessionEvent event = new HttpSessionEvent(getSession());
String keys[] = keys();
for (int i = 0; i  keys.length; i++) {
Object attribute = getAttribute(keys[i]);
if (attribute instanceof HttpSessionActivationListener) {
// FIXME: Should we catch throwables?
((HttpSessionActivationListener)attribute).sessionDidActivate
(event);
}
}

}

Also I thing the throwables better catch!


Other Risk is that getServletContext() not give the ServletContextFacade at 
StandardSessionFacade.

Also the risky implemtation at ApplicationContext! All Event have the Orignal 
StandardContext Object and not the ApplicationContextFacade at source.

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

keep up the great work!

[Takaoglu, Uzay]

Hi All,

Below is an article I got from Washington Post. Interesting enough microsoft
is lobbying all the government agencies to quit using open source S/W. Guess
what the government agencies said. 

Simply the translation is  f.. off :). 

Keep up the great work people!

Thank you all,

Article is below:

-
Microsoft Corp. is aggressively lobbying the Pentagon to squelch its growing
use of freely distributed computer software and switch to proprietary
systems such as those sold by the software giant, according to officials
familiar with the campaign.

 In what one military source called a barrage of contacts with officials
at the Defense Information Systems Agency and the office of Defense
Secretary Donald H. Rumsfeld over the past few months, the company said
open source software threatens  security and its intellectual property.

 But the effort may have backfired. A May 10 report prepared for the Defense
Department concluded that open source often results in more secure, less
expensive applications and that, if anything, its use should be expanded.

 Banning open source would have immediate, broad, and strongly negative
impacts on the ability of many sensitive and security-focused DOD groups to
protect themselves against cyberattacks, said the report, by Mitre Corp.

 A Microsoft Corp. spokesman acknowledged discussions between the company
and the Pentagon but denied urging a ban on open-source software. He also
said Microsoft did not focus on potential security flaws.

 Spokesman Jon Murchinson said Microsoft has been talking about how to allow
open-source and proprietary software to coexist. Our goal is to resolve
difficult issues that are driving a wedge between the commercial and free
software models, he said.

 John Stenbit, an assistant secretary of defense and the Defense
Department's chief information officer, said Microsoft has said using free
software with commercial software might violate the intellectual-property
rights of companies such as Microsoft. Stenbit said the issue is legally
murky.

 The company also complained that the Pentagon is funding research on making
free software more secure, which in effect subsidizes Microsoft's
open-source competitors, Stenbit said.

 Microsoft's push is a new front in a long-running company assault on the
open-source movement, which company officials have called a cancer and
un-American.

 Software is designated open source when its underlying computer code is
available for anyone to license, enhance or customize, often at no cost. The
theory is that by putting source code in the public domain, programmers
worldwide can improve software by sharing one another's work. 

 Vendors of the proprietary systems, such as Microsoft and Oracle Corp.,
keep their source codes secret, control changes to programs and collect all
licensing fees for their use.

 Government agencies use a patchwork of systems and software,  and
proprietary software is still the most widely used. But open source has
become more popular with businesses and government. 

 The Mitre Corp. report said open-source software plays a more critical
role in the DOD than has been generally recognized.

 The report identified 249 uses of open-source systems and tools, including
running a Web portal for the Defense Intelligence Agency, running network
security for the Army command in Europe and support for numerous Air Force
Computer Network Defense tools.

 Among the most high-profile efforts is research funded by the National
Security Agency to develop a more secure version of the open-source Linux
operating system, which competes with Microsoft's Windows.

 The report said banning open-source software would drive up costs, though
it offered no specifics. Some government agencies have saved significantly
by using open source.

 At the Census Bureau, programmers used open-source software to launch  a
Web site for obtaining federal statistics for $47,000, bureau officials
said. It would have cost $358,000 if proprietary software were used, they
said.

 Microsoft has argued that some free-licensing regimes are antithetical to
the government's stated policy that moneymaking applications should develop
from government-funded research, and that intellectual property should be
protected.

 Microsoft also said open-source software is inherently less secure because
the code is available for the world to examine for flaws, making it possible
for hackers or criminals to exploit them. Proprietary software, the company
argued, is more secure because of its closed nature.

 I've never seen a systematic study that showed open source to be more
secure, said Dorothy Denning, a professor of computer science at Georgetown
University who specializes in information warfare.

 Others argue that the flexibility provided by open-source software is
essential, enabling users to respond quickly to flaws that are found.

 With open source, 

RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c

[costinm]

On Thu, 23 May 2002, Ignacio J. Ortega wrote:

Added few #ifdefs to make it compile with my version of 
  MSVC ( probably
an old one ).
 
 It's not a new MSVC version, You need to download the Microsoft Platform
 SDK, to get the includes and libs needed to compile an
 isapi_redirector2.dll with all the later developments, mainly to be able
 to specify tomcatAuthentication=false on iis5, that is to be able to
 use Native IIS Auth on tomcat, so i would prefer very much to add the
 needed info to some readme, than to permit to build a non Complete
 i_r2.dll

Well, I don't think it hurts too much to allow a build with the 'plain' 
MSVC ( just 3 #ifdefs, the code is reasonably clean ). I'll try to
get the SDK, but if it requires me to signon ( to passport :-) - I'll
give up.

I assume some ISAPI servers ( and PWS ) do not support the new stuff 
anyway.

I'm fine with requiring the MP SDK if it's easy to download, but at 
least for now I would prefer beeing able to compile with a plain MSVC.

Costin


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9340] - Tomcat Service problem

[bugzilla]

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=9340.
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=9340

Tomcat Service problem





--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 14:30 ---
I will need a lot more details like this to be able to look into it. This works 
for me.

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9344] - Security risk at HttpSessionEvent Source

[bugzilla]

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=9344.
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=9344

Security risk at HttpSessionEvent Source

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 14:36 ---
Actually, this is not a security risk, as the security manager will prevent 
access to anything which is specific to the o.a.catalina class (it will only 
allow access to the methods in the shared interface).
The facades prevent keeping pointers to the real objects if these can be used 
in another webapp, but in this case it's ok, as the servlet context and the 
sessions are associated with the webapp.

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9351] New: - IPv6 HTTP/1.1 requests not working

[bugzilla]

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=9351.
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=9351

IPv6 HTTP/1.1 requests not working

   Summary: IPv6 HTTP/1.1 requests not working
   Product: Tomcat 4
   Version: 4.0.3 Final
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The problem is in org.apache.catalina.connector.http.HttpProcessor the parsing 
of the Host header assumes that its format is:

host_name[:port]

where host_name mustn't contain any ':' character.

But with IPv6 addresses (RFC 2736 - Format for literal IPv6 addresses in URL), 
a valid address could be:

[3ffe:3328:6:3::2]:80

and so the code:

---

} else if (header.equals(DefaultHeaders.HOST_NAME)) {
  int n = value.indexOf(':');



which assumes ':' only as port separator is not working.

Additional parsing must be added to this class in order to take into account 
IPv6 Addresses.

Jorge Serna

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c jk_env.c jk_handler_logon.c jk_requtil.c jk_uriEnv.c jk_worker_ajp13.c

[jfclere]

jfclere 02/05/23 07:54:07

  Modified:jk/native2/common jk_channel_socket.c jk_config.c jk_env.c
jk_handler_logon.c jk_requtil.c jk_uriEnv.c
jk_worker_ajp13.c
  Log:
  Arrange comments for Solaris8 native compiler.
  
  Revision  ChangesPath
  1.28  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
  
  Index: jk_channel_socket.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_channel_socket.c   16 May 2002 21:03:44 -  1.27
  +++ jk_channel_socket.c   23 May 2002 14:54:07 -  1.28
  @@ -250,7 +250,7 @@
   jk_channel_t *ch,
   jk_endpoint_t *endpoint)
   {
  -//int err;
  +/*int err; */
   jk_channel_socket_private_t *socketInfo=
(jk_channel_socket_private_t *)(ch-_privatePtr);
   
  @@ -588,7 +588,7 @@
   
   result-setAttribute= jk2_channel_socket_setAttribute; 
   
  -//result-getAttributeInfo=jk2_channel_socket_getAttributeInfo;
  +/*result-getAttributeInfo=jk2_channel_socket_getAttributeInfo;*/
   result-multiValueInfo=jk2_channel_socket_multiValueInfo;
   result-setAttributeInfo=jk2_channel_socket_setAttributeInfo;
   
  
  
  
  1.21  +5 -5  jakarta-tomcat-connectors/jk/native2/common/jk_config.c
  
  Index: jk_config.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jk_config.c   22 May 2002 23:40:36 -  1.20
  +++ jk_config.c   23 May 2002 14:54:07 -  1.21
  @@ -58,7 +58,7 @@
   /***
* Description: General purpose config object *
* Author:  Gal Shachor [EMAIL PROTECTED]   *
  - * Version: $Revision: 1.20 $   *
  + * Version: $Revision: 1.21 $   *
***/
   
   #include jk_global.h
  @@ -96,7 +96,7 @@
 char *workerFile)
   {
   FILE *fp;
  -//char buf[LENGTH_OF_LINE + 1];
  +/*char buf[LENGTH_OF_LINE + 1];*/
   int i,j;
   
   if( workerFile==NULL )
  @@ -168,9 +168,9 @@
   jk_bean_t *w = NULL;
   char *type=NULL;
   char *dot=0;
  -//int i;
  -//char **comp;
  -//int nrComp;
  +/*int i; */
  +/*char **comp; */
  +/*int nrComp; */
   char *lastDot;
   char *lastDot1;
   
  
  
  
  1.27  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_env.c
  
  Index: jk_env.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- jk_env.c  16 May 2002 23:48:27 -  1.26
  +++ jk_env.c  23 May 2002 14:54:07 -  1.27
  @@ -154,7 +154,7 @@
   static jk_bean_t *jk2_env_createBean( jk_env_t *env, jk_pool_t *pool, char *objName 
)
   {
   char *type=NULL;
  -//void *obj;
  +/*void *obj; */
   char *localName;
   
   localName=strchr( objName, ':' );
  @@ -406,7 +406,7 @@
  const char *fmt, ... )
   {
   va_list args;
  -//char *buf;
  +/*char *buf; */
   
   va_start(args, fmt);
   env-l-jkVLog(env, env-l, file, line, JK_LOG_ERROR_LEVEL, fmt, args );
  
  
  
  1.17  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
  
  Index: jk_handler_logon.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jk_handler_logon.c15 May 2002 19:45:45 -  1.16
  +++ jk_handler_logon.c23 May 2002 14:54:07 -  1.17
  @@ -58,7 +58,7 @@
   /**
* Description: AJP14 Login handler
* Author:  Henri Gomez [EMAIL PROTECTED]
  - * Version: $Revision: 1.16 $  
  + * Version: $Revision: 1.17 $  
*/
   
   #include jk_global.h
  @@ -173,7 +173,7 @@
   {
   unsigned long nego;
   char *sname;
  -//int rc;
  +/*int rc; */
   
   nego = msg-getLong(env, msg);
   
  
  
  
  1.19  +3 -3  

DO NOT REPLY [Bug 9353] New: - Transfer-Encoding: chunked (on Request fails)

[bugzilla]

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=9353.
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=9353

Transfer-Encoding: chunked (on Request fails)

   Summary: Transfer-Encoding: chunked (on Request fails)
   Product: Tomcat 4
   Version: 4.0.4 Beta 3
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Connector:Coyote HTTP/1.1
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Below is the output from a Servlet that receives a POST with Transfer-
Encoding: chunked header.  getReader is called from the request object and a 
for loop prints each character to stdout.  The output shows data being 
repeated.  This doesn't happen in Tomcat 4.0.1 release Connector:HTTP/1.1 as 
shown with the next output with the same servlet.

Keep up the good work on Coyote everything else for me is working.

Will

[INFO] Http11Protocol - -setAttribute port 8080
[INFO] Http11Protocol - -setAttribute maxThreads 75
[INFO] Http11Protocol - -setAttribute backlog 10
[INFO] Http11Protocol - -setAttribute tcpNoDelay true
[INFO] Http11Protocol - -setAttribute soTimeout 2
[INFO] Http11Protocol - -setAttribute secure false
[INFO] Http11Protocol - -Starting on 8080
Starting service Tomcat-Standalone
Apache Tomcat/4.0.4-b3
Logging Path: /localhost/medical/WEB-INF/log4j.properties
UnicodeLittle
?xml version=1.0 encoding=UnicodeLittle?methodCallmethodNamecom.moment
a.domain.medical.employee.EmployeeManager.syncFilter/methodNameparamsparam
s(EmName==*)/s/paramparamscom.momenta.domain.medical.employee.Employee
/s/paramparamarraystruct class=com.momenta.sync.SyncBaseObjectmn
Id/nint1/int/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m
/structstruct class=com.momenta.sync.SyncBaseObjectmnId/nint2/in
t/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruc
t class=com.momenta.sync.SyncBaseObjectmnId/nint3/int/m?xml versi
on=1.0 encoding=UnicodeLittle?methodCallmethodNamecom.momenta.domain.me
dical.employee.EmployeeManager.syncFilter/methodNameparamsparams(EmName=
=*)/s/paramparamscom.momenta.domain.medical.employee.Employee/s/param
paramarraystruct class=com.momenta.sync.SyncBaseObjectmnId/nint
1/int/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m/struct
struct class=com.momenta.sync.SyncBaseObjectmnId/nint2/int/mmn
BaseObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruct class=co
m.momenta.sync.SyncBaseObjectmnId/nint3/int/m?xml version=1.0 en
coding=UnicodeLittle?methodCallmethodNamecom.momenta.domain.medical.emplo
yee.EmployeeManager.syncFilter/methodNameparamsparams(EmName==*)/s/pa
ramparamscom.momenta.domain.medical.employee.Employee/s/paramparamar
raystruct class=com.momenta.sync.SyncBaseObjectmnId/nint1/int/m
mnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruct clas
s=com.momenta.sync.SyncBaseObjectmnId/nint2/int/mmnBaseObject
Timestamp/ndt20010715T15:39:36/dt/m/structstruct class=com.momenta.s
ync.SyncBaseObjectmnId/nint3/int/m?xml version=1.0 encoding=Uni
codeLittle?methodCallmethodNamecom.momenta.domain.medical.employee.Employe
eManager.syncFilter/methodNameparamsparam


Starting service Tomcat-Standalone
Apache Tomcat/4.0.1
Logging Path: /localhost/medical/WEB-INF/log4j.properties
UnicodeLittle
?xml version=1.0 encoding=UnicodeLittle?methodCallmethodNamecom.moment
a.domain.medical.employee.EmployeeManager.syncFilter/methodNameparamsparam
s(EmName==*)/s/paramparamscom.momenta.domain.medical.employee.Employee
/s/paramparamarraystruct class=com.momenta.sync.SyncBaseObjectmn
Id/nint1/int/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m
/structstruct class=com.momenta.sync.SyncBaseObjectmnId/nint2/in
t/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruc
t class=com.momenta.sync.SyncBaseObjectmnId/nint3/int/mmnBase
ObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruct class=com.mom
enta.sync.SyncBaseObjectmnId/nint4/int/mmnBaseObjectTimestamp
/ndt20010715T15:39:36/dt/m/structstruct class=com.momenta.sync.SyncBa
seObjectmnId/nint5/int/mmnBaseObjectTimestamp/ndt20010715T
15:39:36/dt/m/structstruct class=com.momenta.sync.SyncBaseObjectmn
Id/nint6/int/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m
/structstruct class=com.momenta.sync.SyncBaseObjectmnId/nint7/in
t/mmnBaseObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruc
t class=com.momenta.sync.SyncBaseObjectmnId/nint8/int/mmnBase
ObjectTimestamp/ndt20010715T15:39:36/dt/m/structstruct class=com.mom
enta.sync.SyncBaseObjectmnId/nint10/int/mmnBaseObjectTimestamp
/ndt20010716T00:00:00/dt/m/structstruct class=com.momenta.sync.SyncB
aseObjectmnId/nint11/int/mmnBaseObjectTimestamp/ndt2001120
7T14:12:11/dt/m/structstruct class=com.momenta.sync.SyncBaseObjectm

DO NOT REPLY [Bug 9356] New: - getResource

[bugzilla]

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=9356.
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=9356

getResource

   Summary: getResource
   Product: Tomcat 4
   Version: 4.0.4 Beta 3
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet  JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9356] - ServletContext.getResourcePaths does not return null value

[bugzilla]

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=9356.
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=9356

ServletContext.getResourcePaths does not return null value

[EMAIL PROTECTED] changed:

   What|Removed |Added

Summary|getResource |ServletContext.getResourcePa
   ||ths does not return null
   ||value



--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 15:49 ---
According to the servlet spec (2.3 Final)

  getResourcePaths(String)
  ...
  Returns: a Set containing the directory listing, or null if there are no
  resources in the web application whose path begins with the supplied path.

However, Catalina returns an empty Set (rather than a null value) for
paths that do not exist in the WAR.  Here is my test JSP page:

%!
  public void checkPath(String path, ServletContext context, JspWriter out)
throws java.io.IOException {

out.println(CHECKING PATH:  + path);
java.util.Set resources = context.getResourcePaths(path);
out.println(  Null return value?  + (resources==null));

if (resources!=null) {
  out.println(  EMPTY?  + resources.isEmpty());
  java.util.Iterator iter = resources.iterator();
  while (iter.hasNext())
out.println(   + iter.next());
}
out.println();
  }
%

pre
%
  checkPath(/, application, out);
  checkPath(/WEB-INF, application, out);
  checkPath(/WEB-INF/, application, out);
  checkPath(/ShOuLd_NoT_eXiST, application, out);
  checkPath(/ShOuLd_NoT_eXiST/, application, out);
%
/pre

And here is part of the sample output:

CHECKING PATH: /WEB-INF/
  Null return value? false
  EMPTY? false
  /WEB-INF//web.xml

CHECKING PATH: /ShOuLd_NoT_eXiST
  Null return value? false
  EMPTY? true

CHECKING PATH: /ShOuLd_NoT_eXiST/
  Null return value? false
  EMPTY? true

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9360] New: - Method never get invoked / Object never gets instantiated

[bugzilla]

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=9360.
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=9360

Method never get invoked / Object never gets instantiated

   Summary: Method never get invoked / Object never gets
instantiated
   Product: Tomcat 4
   Version: 4.0.3 Final
  Platform: PC
OS/Version: Other
Status: NEW
  Severity: Blocker
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I have a couple of classes that have static methods that are invoked for XSL 
transformation. This works fine with Tomcat 4.0.1. In 4.0.3, the method is 
never invoked and no exceptions are thrown at that statement, and the flow just 
stops there. I created another class that can be instantiated with no static 
methods, the Object does not get instantiated, all other Object and method 
calls work fine.

some code from that part 

//*
System.out.println(came after Null in  DB before transform ); 
htmlData = com.pulsar.players.xml.XMLUtilitiesNew.transform(this.getXSLPath
(),currentXML);

//*

The print statement is executed , even this.getXSLPath() is executed but it 
does not go into the method!!

It baffled me a whole day, in a debugger this code works fine, but when it is 
executed through Tomcat 4.0.3, it failed again and again and ...

The quandry I am in is that the app I am developing works fine, but do not have 
the source or an executable for verion 4.0.1, which I would need for any 
deployment!!!

I will try reinstalling 4.0.3 and see if there is any difference. I hope this 
helps.

Thanks,

Ravi

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9351] - IPv6 HTTP/1.1 requests not working

[bugzilla]

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=9351.
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=9351

IPv6 HTTP/1.1 requests not working





--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 16:31 ---
Can you submit a patch on that topic, of course tested with J2SE 1.4, to 
see if it actually works?
A current workaround would be to use a host name resolving as an IPv6 
address (for example, I use localhost_ipv6 , which resolves to ::1), but I 
never tested it on Tomcat...

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 4023] - exceptions that terminate engine should be saved in a log

[bugzilla]

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=4023.
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=4023

exceptions that terminate engine should be saved in a log

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Normal  |Minor
 OS/Version|Windows 9x  |Windows NT/2K
Version|4.0.1 Beta 1|4.1.0



--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 16:34 ---
Updated OS and Version fields, and changed Severity to Minor.

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp/docs warp1.xml

[pier]

pier02/05/23 09:50:31

  Modified:webapp/docs warp1.xml
  Log:
  My Japanese is getting rusty... Fixed now.
  
  Revision  ChangesPath
  1.3   +4 -2  jakarta-tomcat-connectors/webapp/docs/warp1.xml
  
  Index: warp1.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/warp1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- warp1.xml 20 May 2002 18:35:28 -  1.2
  +++ warp1.xml 23 May 2002 16:50:31 -  1.3
  @@ -200,8 +200,10 @@
   to a href=http://www.rfc-editor.org/rfc/rfc2047.txt;RFC-2047/a
   (Message Header Extension for Non-ASCII Text). Thus (for example)
   the string I love Japan with the word Japan translated in Japanese
  -and encoded in Shift_JIS would be represented as: bI love 
  -=?Shift_JIS?q?=e6=97=a5=e6=9c=ac?=/b (field identifier bMIME/b).
  +(Nihon) written in Kanji (in Unicode characters this would look like
  +U65E5 + U672C) and encoded in Shift_JIS would be represented
  +as: bI love =?Shift_JIS?q?=93=fa=96=7b?=/b
  +(field identifier bMIME/b).
 /li
   /ul
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml

[costin]

costin  02/05/23 09:50:35

  Modified:jk/native2 build.xml
  Log:
  Added a target that will build mod_jk using cpptasks from sourceforge.
  
  This is for experimental purpose only - and to facilitate an integration.
  At this moment thare are major bugs in cpptasks ( libtool doesn't work,
  you have to remove history.xml, etc ), and it won't work with ant1.4
  unless the .jar is in ant/lib. It won't work in ant1.5 unless my patch
  is accepted.
  
  However it's worth adding it - it's clearly good to have at least a common
  dtd and semantics for compiling the c code, and cpptasks has some usefull
  features.
  
  Don't use the target unless you know what you're doing :-)
  
  Revision  ChangesPath
  1.29  +121 -3jakarta-tomcat-connectors/jk/native2/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml 22 May 2002 23:40:02 -  1.28
  +++ build.xml 23 May 2002 16:50:35 -  1.29
  @@ -56,9 +56,11 @@
 property name=native.dir location=${jk.src}/native2 /
   
 property name=build.dir location=${jk.build}/jk2 /
  +  property name=cpptask.jar location=${jk.src}/../lib/cpptasks.jar /
   
 path id=jkant 
   pathelement location=${jk.build}/lib/jkant.jar/
  +pathelement location=${cpptask.jar}/
 /path
   
 !--  Targets  --
  @@ -69,12 +71,14 @@
 target name=all depends=jkant,init,apache20,apache13,jni
 /target
   
  -  target name=guess.env 
  +  target name=init.taskdef 
   taskdef resource=META-INF/ant.tasks 
 classpathref=jkant /
   
  -echo message=build.properties ${os.arch}.${os.name} /
  +  /target
   
  +  target name=guess.env 
  +echo message=build.properties ${os.arch}.${os.name} /
   !-- What servers do we have ? --
   available property=apache13.detect 
  file=${apache13.home}/bin/htpasswd /
  @@ -110,6 +114,7 @@
   /condition
   
   echo message=Linux:${linux} Win32:${win32} Netware:${netware} 
Solaris:${solaris} HPUX:${hpux} /
  +
 /target
   
 target name=init.win32 if=win32 
  @@ -128,7 +133,7 @@
   echo message=NDK: ${novellndk.home} /
 /target
   
  -  target name=init depends=guess.env,init.win32,init.netware 
  +  target name=init depends=init.taskdef,guess.env,init.win32,init.netware 
   mkdir dir=${build.dir} /
 /target
   
  @@ -136,6 +141,119 @@
   ant dir=${jk.src} target=jkant/
 /target
   
  +  target name=apache20-cpptask depends=init if=apache2.detect
  +property name=ant.reuse.loader  value=true /
  +
  +taskdef resource=cpptasks.tasks classpathref=jkant /
  +typedef resource=cpptasks.types classpathref=jkant /
  +  
  +property name=apr.include location=${apache2.home}/include /
  +mkdir dir=${build.dir}/apache2 /
  +
  +defineset id=jk2-defs
  +   define name=_REENTRANT /
  +   define name=CHUNK_SIZE value=4096 /
  +   define name=USE_APACHE_MD5 /
  +   define name=HAS_APR /
  +   define name=HAVE_JNI /
  +
  +   define name=HPUX11 if=hpux /
  +   define name=WIN32 if=win32 /
  +   define name=_WINDOWS if=win32 /
  +   define name=_MBCS if=win32 /
  +   define name=_USRDLL if=win32 /
  +   define name=MOD_JK2_EXPORTS if=win32 /
  +/defineset
  +
  +cc outtype=shared
  +subsystem=console
  +runtime=dynamic
  +objdir=${build.dir}/apache2 
  +outfile=${build.dir}/apache2/mod_jk2.so 
  +
  +compiler name=msvc if=use.msvc 
  +/compiler
  +
  +compiler name=gcc  
  +  warnings=diagnostic 
  +  debug=true /
  +
  +!-- Do we need this ? 
  +linker name=gcc  
  +debug=true
  +/linker
  +--
  +
  +fileset dir=. 
  +  include name=server/apache2/*.c /
  +   include name=common/*.c /
  +   include name=jni/*.c /
  +/fileset
  +
  +includepath location=${native.dir}/common /
  +includepath location=${native.dir}/include /
  +
  +sysincludepath location=${apache2.include} /
  + sysincludepath location=${apr.include} /
  + sysincludepath location=${apr-util.include} /
  +
  + sysincludepath location=${java.home}/../include /
  +sysincludepath location=${java.home}/../include/linux if=linux /
  +sysincludepath location=${java.home}/../include/hp-ux if=hpux /   
 
  +sysincludepath location=${java.home}/../include/win32 if=win32 /  
  
  +sysincludepath location=${java.home}/../include/solaris if=solaris /  
  
  +sysincludepath location=quot;${mssdk.home}/includequot; if=win32/
  +
  

DO NOT REPLY [Bug 9361] New: - jsp:param calls URLEncoder.encode() without null check

[bugzilla]

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=9361.
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=9361

jsp:param calls URLEncoder.encode() without null check

   Summary: jsp:param calls URLEncoder.encode() without null check
   Product: Tomcat 4
   Version: 4.1.2
  Platform: All
OS/Version: All
Status: NEW
  Severity: Major
  Priority: Other
 Component: Servlet  JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


JSP pages previously had been able to use jsp:param ala:
  jsp:param name=foo value=%=bar%/
without regard for whether the variable 'bar' is non-null.

Due to the use of URLEncoder.encode() on the value attribute in the generated 
code, such JSP pages now error out with NullPointerExceptions.  This may or may 
not be more correct, but is certainly harmful to existing pages!

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9351] - IPv6 HTTP/1.1 requests not working

[bugzilla]

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=9351.
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=9351

IPv6 HTTP/1.1 requests not working





--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 17:18 ---
I have developed no bug fix yet, but it shouldn't be very difficult to do it 
(it's a simple String parsing). As of now we're using a little workaround which 
is using names instead of IPv6 addresses, and it works fine.

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log SystemLogHandler.java CaptureLog.java

[glenn]

glenn   02/05/23 10:21:09

  Added:   util/java/org/apache/tomcat/util/log SystemLogHandler.java
CaptureLog.java
  Log:
  Custome logger which can be used to capture System.out and
  System.err to a buffer for later use.  Used by Tomcat 4
  to capture this output when handling a request so any
  output can be sent to the webapp context log instead of
  catalina.out.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/SystemLogHandler.java
  
  Index: SystemLogHandler.java
  ===
  /*
   * 
   * 
   * 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.tomcat.util.log;
  
  import java.io.ByteArrayOutputStream;
  import java.io.Writer;
  import java.io.PrintStream;
  import java.io.PrintWriter;
  import java.io.FileWriter;
  import java.io.File;
  import java.io.OutputStreamWriter;
  import java.io.IOException;
  import java.io.StringWriter;
  
  import java.util.Hashtable;
  import java.util.Stack;
  
  /**
   * This helper class may be used to do sophisticated redirection of 
   * System.out and System.err on a per Thread basis.
   * 
   * A stack is implemented per Thread so that nested startCapture
   * and stopCapture can be used.
   *
   * @author Remy Maucherat
   * @author Glenn L. Nielsen
   */
  public class SystemLogHandler extends PrintStream {
  
  
  // --- Constructors
  
  
  /**
   * Construct the handler to capture the output of the given steam.
   */
  public SystemLogHandler(PrintStream wrapped) {
  super(wrapped);
  out = wrapped;
  }
  
  
  // - Instance Variables
  
  
  /**
   * Wrapped PrintStream.
   */
  protected PrintStream out = null;
  
  
  /**
   * Thread - CaptureLog associations.
   */
  protected static Hashtable logs = new Hashtable();
  
  
  /**
   * Spare CaptureLog ready for reuse.
   */
  protected static Stack reuse = new Stack();
  
  
  // - Public Methods
  
  
  /**
   * Start capturing 

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java

[glenn]

glenn   02/05/23 10:22:37

  Modified:catalina/src/share/org/apache/catalina/connector
RequestBase.java
   catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Implement custom logger which can be used to capture System.out and
  System.err to a buffer for later use.  Used by Tomcat 4
  to capture this output when handling a request so any
  output can be sent to the webapp context log instead of
  catalina.out.
  
  Revision  ChangesPath
  1.19  +10 -4 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java
  
  Index: RequestBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- RequestBase.java  18 Mar 2002 07:15:39 -  1.18
  +++ RequestBase.java  23 May 2002 17:22:37 -  1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
 1.18 2002/03/18 07:15:39 remm Exp $
  - * $Revision: 1.18 $
  - * $Date: 2002/03/18 07:15:39 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
 1.19 2002/05/23 17:22:37 glenn Exp $
  + * $Revision: 1.19 $
  + * $Date: 2002/05/23 17:22:37 $
*
* 
*
  @@ -91,6 +91,7 @@
   import org.apache.catalina.util.Enumerator;
   import org.apache.catalina.util.RequestUtil;
   import org.apache.catalina.util.StringManager;
  +import org.apache.tomcat.util.log.SystemLogHandler;
   
   
   /**
  @@ -99,7 +100,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.18 $ $Date: 2002/03/18 07:15:39 $
  + * @version $Revision: 1.19 $ $Date: 2002/05/23 17:22:37 $
* @deprecated
*/
   
  @@ -339,6 +340,7 @@
   
   this.context = context;
   
  +SystemLogHandler.startCapture();
   }
   
   
  @@ -557,6 +559,10 @@
*/
   public void recycle() {
   
  +String log = SystemLogHandler.stopCapture();
  +if (log != null) {
  +context.getServletContext().log(log);
  +}
   attributes.clear();
   authorization = null;
   characterEncoding = null;
  
  
  
  1.48  +10 -4 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Catalina.java 22 Apr 2002 19:04:01 -  1.47
  +++ Catalina.java 23 May 2002 17:22:37 -  1.48
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
 1.47 2002/04/22 19:04:01 craigmcc Exp $
  - * $Revision: 1.47 $
  - * $Date: 2002/04/22 19:04:01 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
 1.48 2002/05/23 17:22:37 glenn Exp $
  + * $Revision: 1.48 $
  + * $Date: 2002/05/23 17:22:37 $
*
* 
*
  @@ -82,6 +82,7 @@
   import org.apache.catalina.Loader;
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
  +import org.apache.tomcat.util.log.SystemLogHandler;
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
   
  @@ -99,7 +100,7 @@
* /u
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.47 $ $Date: 2002/04/22 19:04:01 $
  + * @version $Revision: 1.48 $ $Date: 2002/05/23 17:22:37 $
*/
   
   public class Catalina {
  @@ -494,6 +495,11 @@
   // fatal internal errors
   definition + java.,org.apache.catalina.,org.apache.jasper.);
   }
  +
  +// Replace System.out and System.err with a custom PrintStream
  +SystemLogHandler log = new SystemLogHandler(System.out);
  +System.setOut(log);
  +System.setErr(log);
   
   Thread shutdownHook = new CatalinaShutdownHook();
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp/docs/images japan.gif

[pier]

pier02/05/23 11:05:29

  Modified:webapp/docs warp1.xml
  Added:   webapp/docs/images japan.gif
  Log:
  Little nag on a double b.
  
  Revision  ChangesPath
  1.5   +3 -1  jakarta-tomcat-connectors/webapp/docs/warp1.xml
  
  Index: warp1.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/warp1.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- warp1.xml 23 May 2002 16:58:21 -  1.4
  +++ warp1.xml 23 May 2002 18:05:28 -  1.5
  @@ -203,10 +203,12 @@
   (Nihon) written in Kanji (in Unicode characters this would look like
   U65E5 + U672C) and encoded in Shift_JIS would be represented
   as bI love =?Shift_JIS?q?=93=fa=96=7b?=/b or if encoded in UTF-8
  -would look like bbI love =?UTF-8?q?=e6=97=a5=e6=9c=ac?=/b.
  +would look like bI love =?UTF-8?q?=e6=97=a5=e6=9c=ac?=/b.
   (field identifier bMIME/b).
 /li
   /ul
  +
  +img src=images/japan.gif/
   
   p
 For semplicity's sake, this is how one of the three above mentioned
  
  
  
  1.1  jakarta-tomcat-connectors/webapp/docs/images/japan.gif
  
Binary file
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9362] New: - compiilation of JSP that includes a non-existant file dies without error message

[bugzilla]

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=9362.
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=9362

compiilation of JSP that includes a non-existant file dies without error message

   Summary: compiilation of JSP that includes a non-existant file
dies without error message
   Product: Tomcat 3
   Version: 3.3 Final
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I don't know if this qualifies as a bug or an RFE, but if one attempts to
compile a JSP that includes a file that doesn't exist, Jasper just dies.  It is
most noticeable (and perplexing) when combined with the ant 1.5b1 JspC task,
since Jasper apparently dies in such a way that ant also cannot continue (and
also does not throw any error).
Thanks,
Jason

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

RE: keep up the great work!

[JM]

I never believe news that people put in e-mails.
So I had to find it myself.and here it is...
http://www.washingtonpost.com/wp-dyn/articles/A60050-2002May22.html


I found this beauty also
http://www.washingtonpost.com/wp-srv/WPcap/2000-02/13/090r-021300-idx.html

and this
http://www.washingtonpost.com/ac2/wp-dyn?pagename=articlenode=contentId=A4
988-2002Apr6


JM

 -Original Message-
 From: Takaoglu, Uzay [mailto:[EMAIL PROTECTED]]
 Sent: Thursday, May 23, 2002 10:03 AM
 To: '[EMAIL PROTECTED]'
 Subject: keep up the great work!


 Hi All,

 Below is an article I got from Washington Post. Interesting
 enough microsoft
 is lobbying all the government agencies to quit using open source
 S/W. Guess
 what the government agencies said.

   Simply the translation is  f.. off :).

 Keep up the great work people!

 Thank you all,

 Article is below:
 --
 --
 -
 Microsoft Corp. is aggressively lobbying the Pentagon to squelch
 its growing
 use of freely distributed computer software and switch to proprietary
 systems such as those sold by the software giant, according to officials
 familiar with the campaign.

  In what one military source called a barrage of contacts with officials
 at the Defense Information Systems Agency and the office of Defense
 Secretary Donald H. Rumsfeld over the past few months, the company said
 open source software threatens  security and its intellectual property.

  But the effort may have backfired. A May 10 report prepared for
 the Defense
 Department concluded that open source often results in more secure, less
 expensive applications and that, if anything, its use should be expanded.

  Banning open source would have immediate, broad, and strongly negative
 impacts on the ability of many sensitive and security-focused DOD
 groups to
 protect themselves against cyberattacks, said the report, by Mitre Corp.

  A Microsoft Corp. spokesman acknowledged discussions between the company
 and the Pentagon but denied urging a ban on open-source software. He also
 said Microsoft did not focus on potential security flaws.

  Spokesman Jon Murchinson said Microsoft has been talking about
 how to allow
 open-source and proprietary software to coexist. Our goal is to resolve
 difficult issues that are driving a wedge between the commercial and free
 software models, he said.

  John Stenbit, an assistant secretary of defense and the Defense
 Department's chief information officer, said Microsoft has said using free
 software with commercial software might violate the intellectual-property
 rights of companies such as Microsoft. Stenbit said the issue is legally
 murky.

  The company also complained that the Pentagon is funding
 research on making
 free software more secure, which in effect subsidizes Microsoft's
 open-source competitors, Stenbit said.

  Microsoft's push is a new front in a long-running company assault on the
 open-source movement, which company officials have called a cancer and
 un-American.

  Software is designated open source when its underlying computer code is
 available for anyone to license, enhance or customize, often at
 no cost. The
 theory is that by putting source code in the public domain, programmers
 worldwide can improve software by sharing one another's work.

  Vendors of the proprietary systems, such as Microsoft and Oracle Corp.,
 keep their source codes secret, control changes to programs and
 collect all
 licensing fees for their use.

  Government agencies use a patchwork of systems and software,  and
 proprietary software is still the most widely used. But open source has
 become more popular with businesses and government.

  The Mitre Corp. report said open-source software plays a more critical
 role in the DOD than has been generally recognized.

  The report identified 249 uses of open-source systems and tools,
 including
 running a Web portal for the Defense Intelligence Agency, running network
 security for the Army command in Europe and support for numerous Air Force
 Computer Network Defense tools.

  Among the most high-profile efforts is research funded by the National
 Security Agency to develop a more secure version of the open-source Linux
 operating system, which competes with Microsoft's Windows.

  The report said banning open-source software would drive up costs, though
 it offered no specifics. Some government agencies have saved significantly
 by using open source.

  At the Census Bureau, programmers used open-source software to launch  a
 Web site for obtaining federal statistics for $47,000, bureau officials
 said. It would have cost $358,000 if proprietary software were used, they
 said.

  Microsoft has argued that some free-licensing regimes are antithetical to
 the government's stated policy that moneymaking applications
 should develop
 from government-funded research, and that intellectual property should be
 protected.

  

Re: [PROPOSAL] Tomcat 4 System.err/System.out logging

[Remy Maucherat]

 I have taken the org.apache.jasper.util.SystemLogHandler Remy wrote
 and put it in org.apache.tomcat.util.log.SystemLogHandler.

 I refactored it so that the PrintStreams and Byte arrays are recycle.
 Plus implemented a stack so that there can be nested usage.

 Finally, I implemented it in Tomcat 4 so that any System.out or System.err
 output generated when handling a request is sent to the appropriate
 web application context log.

 Remy, you may want to switch jasper2 over to using this, then remove
 org.apache.jasper.util.SystemLogHandler.

This looks good. Originally, I had put it in j-t-c/util/log as you did, but
at the moment Jasper 2 can't depend on stuff from j-t-c/util. (Jasper JARs
are
in common/lib, while j-t-c/util is in server/lib)
Given that there's a lot of unprotected static methods in there, I would see
it
as a possible security risk to move it to common/lib.

Remy


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp/docs warp1.xml

[pier]

pier02/05/23 12:00:15

  Modified:webapp/docs warp1.xml
  Log:
  Fixed typo: semplicity - simplicity :)
  Submitted by: Steve McCarthy [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.6   +1 -1  jakarta-tomcat-connectors/webapp/docs/warp1.xml
  
  Index: warp1.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/docs/warp1.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- warp1.xml 23 May 2002 18:05:28 -  1.5
  +++ warp1.xml 23 May 2002 19:00:15 -  1.6
  @@ -211,7 +211,7 @@
   img src=images/japan.gif/
   
   p
  -  For semplicity's sake, this is how one of the three above mentioned
  +  For simplicity's sake, this is how one of the three above mentioned
 variable-length packet payload fields should be transfered (given that
 the three characters F, o and X have the same value in ISO-8859-1 and
 US-ASCII, and their hexadecimal value is respectively 0x46, 0x6f and
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

FW: bad build.xml file.

[Pier Fumagalli]

Rejected posting to general@jakarta, but FYI, easy to fix.


Pier

-- Forwarded Message
 From: Ryan Christianson [EMAIL PROTECTED]
 Date: Thu, 23 May 2002 11:31:12 -0700
 To: [EMAIL PROTECTED]
 Subject: bad build.xml file.
 
 Just a friendly note.
 
 If you install tomcat 4.01, and go to this page:
 http://localhost:8080/tomcat-docs/appdev/source.html
 
 Then go to the example build.xml file:
 http://localhost:8080/tomcat-docs/appdev/build.xml.txt
 
 There is a xml error in the file:
 On line 300, the javadoc node, is terminated incorectly.
 
 It comes like this:
 target name=javadoc depends=compile
  description=Create Javadoc API documentation
 
   mkdir  dir=${dist.home}/docs/api/
   javadoc sourcepath=src
   destdir=${dist.home}/docs/api
  packagenames=*/
 classpath refid=compile.classpath/
   /javadoc
 
 /target
 
 It should be like this:
 target name=javadoc depends=compile
  description=Create Javadoc API documentation
 
   mkdir  dir=${dist.home}/docs/api/
   javadoc sourcepath=src
   destdir=${dist.home}/docs/api
  packagenames=*
 classpath refid=compile.classpath/
   /javadoc
 
 /target
 
 

-- End of Forwarded Message


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [PROPOSAL] Tomcat 4 System.err/System.out logging

[Andrew Houghton]

Wouldn't this introduce a dependency on Tomcat JARs for Jasper 2?  I can 
think of at least one project off hand that uses Jasper standalone; it 
seems a shame to change this, since Jasper 2 is currently engine-agnostic.

- a.

Glenn Nielsen wrote:
 I have taken the org.apache.jasper.util.SystemLogHandler Remy wrote
 and put it in org.apache.tomcat.util.log.SystemLogHandler.
 
 I refactored it so that the PrintStreams and Byte arrays are recycle.
 Plus implemented a stack so that there can be nested usage.
 
 Finally, I implemented it in Tomcat 4 so that any System.out or System.err
 output generated when handling a request is sent to the appropriate
 web application context log.
 
 Remy, you may want to switch jasper2 over to using this, then remove
 org.apache.jasper.util.SystemLogHandler.
 
 Glenn
 
 Remy Maucherat wrote:
 
Remy Maucherat wrote:

How is Ant implemented within Tomcat for doing JSP compiles?

I am concerned about Ant running within the same JVM and having to capture
the JVM's System.out and System.err.  Other output from catalina could get
intermixed with the Ant output.  Also I saw something about synchronizing
of compiles being required.

If the compiler is run within the same thread as the request, then the
filtering can be done.
I presume all out of process compilers would suffer from that problem.

However, I'd like to point out that there's no other choice but to upgrade.
In many situations, the current Jasper 2 generated servlets don't compile to
valid bytecode when using the classic compiler (and you get a VerifyError
when loading the class; this happens esp when using JSTL). The J2SE team
hasn't touched the old compiler code for more than 2 years, and refuse to
fix bugs :-(

Remy

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
 
 


-- 
Andrew Houghton
[EMAIL PROTECTED]


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11 FileTester.java

[remm]

remm02/05/23 12:42:47

  Modified:http11/src/test/java/org/apache/coyote/http11
FileTester.java
  Log:
  - Update the test to follow the small API modifications.
  - Will use a fake socket connected to port 8080 on localhost.
  
  Revision  ChangesPath
  1.4   +5 -1  
jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11/FileTester.java
  
  Index: FileTester.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11/FileTester.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileTester.java   15 Jan 2002 16:00:10 -  1.3
  +++ FileTester.java   23 May 2002 19:42:47 -  1.4
  @@ -64,9 +64,11 @@
   import java.io.InputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  +import java.net.Socket;
   import java.util.Locale;
   
   import org.apache.coyote.Adapter;
  +import org.apache.coyote.ActionCode;
   import org.apache.coyote.Processor;
   
   /**
  @@ -134,7 +136,9 @@
   File outputFile = new File(args[1]);
   
   Adapter testAdapter = new RandomAdapter();
  -Processor http11Processor = new Http11Processor();
  +Http11Processor http11Processor = new Http11Processor();
  +http11Processor.setSocket(new Socket(127.0.0.1, 8080));
  +http11Processor.action(ActionCode.ACTION_START, null);
   
   FileTester tester = new FileTester(testAdapter, http11Processor,
  inputFile, outputFile);
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/http11/src/test test.bat

[remm]

remm02/05/23 12:43:05

  Modified:http11/src/test test.bat
  Log:
  - Update classpath used.
  
  Revision  ChangesPath
  1.2   +1 -1  jakarta-tomcat-connectors/http11/src/test/test.bat
  
  Index: test.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/test/test.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test.bat  2 Jan 2002 15:06:35 -   1.1
  +++ test.bat  23 May 2002 19:43:04 -  1.2
  @@ -1,4 +1,4 @@
   
   
  -java -cp 
.;../lib/tomcat-util.jar;../lib/tomcat-coyote.jar;../lib/tomcat-coyote-http11.jar 
org.apache.coyote.http11.FileTester tests/test1.txt tests/test1.out
  +java -cp 
.;../../../lib/commons-logging.jar;../lib/tomcat-util.jar;../lib/tomcat-coyote.jar;../lib/tomcat-http11.jar
 org.apache.coyote.http11.FileTester tests/test1.txt tests/test1.out
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/http11/src/test/tests test1.txt

[remm]

remm02/05/23 12:44:01

  Modified:http11/src/test/tests test1.txt
  Log:
  - Add a (nasty) test case for bug 9353. I think the request is valid.
  
  Revision  ChangesPath
  1.4   +129 -3jakarta-tomcat-connectors/http11/src/test/tests/test1.txt
  
  Index: test1.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/test/tests/test1.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- test1.txt 14 Jan 2002 00:23:26 -  1.3
  +++ test1.txt 23 May 2002 19:44:01 -  1.4
  @@ -18,15 +18,141 @@
   Transfer-Encoding: chunked
   
   cc
  
-01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
  
+
   
   
   cc
  
-01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
  
+
   
   
   cc
  
-01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  
+
  +
  +
  +cc
  

DO NOT REPLY [Bug 6621] - mod_webapp hangs when transmitting binary (eg. image) files

[bugzilla]

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=6621.
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=6621

mod_webapp hangs when transmitting binary (eg. image) files





--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 20:00 ---
I get this same error, except it says Invalid Packet 6, not 16
Also, it only seems to happen on small (15k) gifs (haven't tried other types 
of data, but larger gifs, i have no problem.)

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/http11/src/test/tests test1.txt

[remm]

remm02/05/23 13:23:52

  Modified:http11/src/test/tests test1.txt
  Log:
  - Fix test case (invalid chunk lengths).
  
  Revision  ChangesPath
  1.5   +9 -1  jakarta-tomcat-connectors/http11/src/test/tests/test1.txt
  
  Index: test1.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/test/tests/test1.txt,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- test1.txt 23 May 2002 19:44:01 -  1.4
  +++ test1.txt 23 May 2002 20:23:52 -  1.5
  @@ -143,12 +143,20 @@
   Host:foobar
   Transfer-Encoding: chunked
   
  -17e8
  +1774
   

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters ChunkedInputFilter.java

[remm]

remm02/05/23 13:30:49

  Modified:http11/src/java/org/apache/coyote/http11/filters
ChunkedInputFilter.java
  Log:
  - In the case where the amount of data read was smaller than the total length
of the chunk, the position in the buffer was not updated, thus causing the same 
data
to be read again (however, the correct amount of bytes would be read).
  - This could fix bug 9353.
  
  Revision  ChangesPath
  1.4   +2 -1  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
  
  Index: ChunkedInputFilter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ChunkedInputFilter.java   9 Apr 2002 18:35:54 -   1.3
  +++ ChunkedInputFilter.java   23 May 2002 20:30:49 -  1.4
  @@ -178,6 +178,7 @@
   result = lastValid - pos;
   remaining = remaining - result;
   chunk.setBytes(buf, pos, result);
  +pos = lastValid;
   } else {
   result = remaining;
   chunk.setBytes(buf, pos, remaining);
  @@ -256,7 +257,7 @@
   
   int nRead = buffer.doRead(readChunk, null);
   pos = readChunk.getStart();
  -lastValid = readChunk.getEnd();
  +lastValid = pos + nRead;
   buf = readChunk.getBytes();
   
   return nRead;
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0 build.xml

[remm]

remm02/05/23 13:35:59

  Modified:.build.xml
  Log:
  - Disable downloading Tyrex.
  
  Revision  ChangesPath
  1.69  +2 -0  jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- build.xml 8 May 2002 20:54:46 -   1.68
  +++ build.xml 23 May 2002 20:35:59 -  1.69
  @@ -540,11 +540,13 @@
 param name=sourcefile value=${struts.loc}/
 param name=destfile value=${struts.jar}/
   /antcall
  +!--
   antcall target=downloadfile
 param name=sourcefile value=${tyrex.loc}/
 param name=destfile value=${tyrex.jar}/
 param name=destdir value=${tyrex.home}/
   /antcall
  +--
 /target
   
 target name=proxyflags
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Tomcat 3 serving wrong pages under load?

[Aidan Fitzpatrick]

What's my problem?

I'm encountering a problem with Tomcat 3 that I'm finding quite hard to describe and 
search for succinctly. I'll outline it below, in the hope that someone on the list can 
point me in the right direction. I'll assemble some more information and raise a bug 
if that's the case.

I've got a web application running under 3.3a that is running under a fairly low load 
of around five pages per second. (There's a mechanism which sits on top of this to 
cache the output of the pages, so this load is irregular.) When Tomcat is receiving 
these concurrent requests, the pages it serves are occasionally incorrect. The higher 
the load I put it under -- up to ten concurrent requests at any one time for a 
prolonged period -- the less accurate it's responses are.

For instance:
http://servername/contextname/servletname?argument=1

...will not always return me the same page. If the webapp is being loaded with 
requests for argument=2, or argument=3, I might get one of those instead.

What have I done about it?

Very little so far, as it's taken me a while to isolate the problem to this level. 
I've not been able to find any other report of this problem on the 'net, so I'll be 
looking further into my application. I've tried turning most of the pooling and 
caching off, and I'll ensure I get it all off. I'll try to provide a demonstrable 
test-case, and I'll also look towards testing this on Tomcat 4, too, if no one tells 
me I'm wildly off-course.

What do I think it could be?

I've replicated the problem with Apache 1.3.22 using the mod_jk that comes with 3.3a, 
and also directly with Tomcat. I believe it could be:

* My worker configuration. (I can't imagine it's not thread-safe. I've not changed it 
from the default.)
* My web application. (I think this is unlikely, but I would say that! :) )
* Tomcat 3.

I've seen this behaviour under Linux and Solaris 2.6 and 5.8. I've also seen it with 
Tomcat 3.2.1.

Any pointers would be very appreciated!

Aidan Fitzpatrick

--

Aidan Fitzpatrick, Software Engineer, EU Tech Team
Tel: +44 (0) 207 903 6074 Fax: +44 (0) 207 903 6000 YIM: aidan_fitzpatrick
ZDNet, International House, 1 St. Katharine's Way, London, E1W 1UN

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9367] New: - HttpSessionBindingEvent not thrown for HttpSessionBindingListener objects when session expires

[bugzilla]

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=9367.
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=9367

HttpSessionBindingEvent not thrown for HttpSessionBindingListener objects when session 
expires

   Summary: HttpSessionBindingEvent not thrown for
HttpSessionBindingListener objects when session expires
   Product: Tomcat 3
   Version: 3.2.3 Final
  Platform: HP
OS/Version: HP-UX
Status: NEW
  Severity: Major
  Priority: Other
 Component: Servlet
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


This was reported by a user for TC 3.3. I have found it on 3.2.3 on HPUX as 
well. The attached code works perfectly on TC 3.2.3 on Win NT 4 SP 6. Fails 
always (i.e. HttpSessionBindingListener objects never get an unbound event) 
when sessions expire on HPUX. 

The following two JSP's demonstrate the bug. Install them in any web-
application. Open Monitor.jsp in a browser (it refreshes every 5 secs). Open 
SessionTest.jsp in another (Monitor should now show the new session) and then 
close the SessionTest browser window. After session-timeout minutes, the 
row should vanish in the Monitor browser. It does on Windows. It does not on 
HPUX.

Thank you.

--- Begin Monitor.jsp --
%@ page import=java.util.Map, java.util.Iterator %
htmlhead
titleTest Monitor/title
META http-equiv=Refresh content=5
/head
body
h1Monitor/h1
Current time is %= new java.util.Date().toString() %
h2Bound objects/h2
table border = 1
trthSession ID/ththObject Info/th/tr
%
ServletContext context = this.getServletConfig().getServletContext();
Map map = (Map)context.getAttribute(VALID_SESSIONS);
if (map != null) {
  for (Iterator iter = map.keySet().iterator(); iter.hasNext() ; ) {
Object key = iter.next();
Object val = map.get(key);
%
trtd%= key %/tdtd%= val %/td/tr
%
  }
}
%
/table
/body
--- End Monitor.jsp --
--- Begin SessionTest.jsp --
%@ page import=java.util.Map, java.util.Date, java.util.Hashtable, 
java.util.Iterator %
html
headtitleSession Test/title/head
body
h1Session Test/h1
%!
class SessionSquatter implements HttpSessionBindingListener {
  private Date myDate;
  private String myId;
  SessionSquatter(String id) {
this.myDate = new Date();
this.myId = id;
  }
  public String toString() {
return  Squatter for session  + myId +  created at  + myDate.toString();
  }
  public void valueBound(HttpSessionBindingEvent event) {
bound(myId, this);
  }
  public void valueUnbound(HttpSessionBindingEvent event) {
unbound(myId);
  }
}
%
%!
private void bound(String id, SessionSquatter squatter) {
  ServletContext context = this.getServletConfig().getServletContext();
  Map map = (Map)context.getAttribute(VALID_SESSIONS);
  if (map == null) {
map = new Hashtable(10);
context.setAttribute(VALID_SESSIONS, map);
  }
  map.put(id, squatter);
  System.out.println(+++   Bound!  + toString());
}
%
%!
private void unbound(String id) {
  ServletContext context = this.getServletConfig().getServletContext();
  Map map = (Map)context.getAttribute(VALID_SESSIONS);
  if (map == null) { return; }
  map.remove(id);
  System.out.println(--- Unbound!  + toString());
}
%
%
ServletContext context = this.getServletConfig().getServletContext();
Map map = (Map)context.getAttribute(VALID_SESSIONS);
if (map == null) {
  map = new Hashtable(10);
  context.setAttribute(VALID_SESSIONS, map);
}
String sessionId = session.getId();
SessionSquatter squatter = new SessionSquatter(sessionId);
session.setAttribute(SQUATTER, squatter);
%
Session %= sessionId % contains %= squatter.toString() %.
br/a href=javascript:window.close()Close this window./abr/
/body
/html
--- End SessionTest.jsp --

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9204] - Can't run Tomcat on IBM JRE 1.3.1

[bugzilla]

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=9204.
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=9204

Can't run Tomcat on IBM JRE 1.3.1





--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 21:15 ---
Created an attachment (id=1923)
Add try/catch blocks around addRepositoryInternal() calls

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9204] - Can't run Tomcat on IBM JRE 1.3.1

[bugzilla]

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=9204.
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=9204

Can't run Tomcat on IBM JRE 1.3.1

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Major   |Blocker
  Component|Unknown |Catalina



--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 21:16 ---
I'm bumping up the severity of this defect since Tomcat will not even start.

The easiest fix is to wrap the calls to addRepositoryInternal() within the 
StandardClassLoader constructor in a try/catch block. I've patched the 05/23 
source download with this fix and have attached it to this bug.

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Node.java Validator.java

[kinman]

kinman  02/05/23 14:29:38

  Modified:jasper2/src/share/org/apache/jasper/compiler Node.java
Validator.java
  Log:
  - Set the default content type only after all page directives are processed.
Also, the top level page sets the default, i.e. if a non-xml page includes
a xml page, the default content type is text/html and not text/xml.
  
  Revision  ChangesPath
  1.9   +5 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
  
  Index: Node.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Node.java 15 May 2002 20:42:03 -  1.8
  +++ Node.java 23 May 2002 21:29:38 -  1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
 1.8 2002/05/15 20:42:03 kinman Exp $
  - * $Revision: 1.8 $
  - * $Date: 2002/05/15 20:42:03 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
 1.9 2002/05/23 21:29:38 kinman Exp $
  + * $Revision: 1.9 $
  + * $Date: 2002/05/23 21:29:38 $
*
* 
* 
  @@ -793,7 +793,7 @@
   public static class Nodes {
   
private List list;
  - private Node.Root root;
  + private Node.Root root; // null if this is not a page
   
public Nodes() {
list = new Vector();
  @@ -811,6 +811,7 @@
 */
public void add(Node n) {
list.add(n);
  + root = null;
}
   
/**
  
  
  
  1.8   +15 -13
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
  
  Index: Validator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Validator.java18 May 2002 00:29:24 -  1.7
  +++ Validator.java23 May 2002 21:29:38 -  1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
 1.7 2002/05/18 00:29:24 kinman Exp $
  - * $Revision: 1.7 $
  - * $Date: 2002/05/18 00:29:24 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
 1.8 2002/05/23 21:29:38 kinman Exp $
  + * $Revision: 1.8 $
  + * $Date: 2002/05/23 21:29:38 $
*
* 
* 
  @@ -244,16 +244,6 @@
// Attributes for imports for this node have been processed by
// the parsers, just add them to pageInfo.
pageInfo.addImports(n.getImports());
  -
  - // Determine the output context type, per errata_a
  - // 
http://jcp.org/aboutJava/communityprocess/maintenance/jsr053/errata_1_2_a_20020321.html
  - if (pageInfo.getContentType() == null) {
  - String defaultType = n.isXmlSyntax()? text/xml;: text/html;;
  - String charset = pageInfo.getPageEncoding();
  - if (charset == null)
  - charset = n.isXmlSyntax()? UTF-8: ISO-8859-1;
  - pageInfo.setContentType(defaultType + charset);
  - }
}
   }
   
  @@ -613,6 +603,18 @@
 * and are position independent.
 */
page.visit(new PageDirectiveVisitor(compiler));
  +
  + // Determine the default output content type, per errata_a
  + // 
http://jcp.org/aboutJava/communityprocess/maintenance/jsr053/errata_1_2_a_20020321.html
  + PageInfo pageInfo = compiler.getPageInfo();
  + if (pageInfo.getContentType() == null) {
  + boolean isXml = page.getRoot().isXmlSyntax();
  + String defaultType = isXml? text/xml;: text/html;;
  + String charset = pageInfo.getPageEncoding();
  + if (charset == null)
  + charset = isXml? UTF-8: ISO-8859-1;
  + pageInfo.setContentType(defaultType + charset);
  + }
   
/*
 * Validate all other nodes.
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9353] - Transfer-Encoding: chunked (on Request fails)

[bugzilla]

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=9353.
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=9353

Transfer-Encoding: chunked (on Request fails)





--- Additional Comments From [EMAIL PROTECTED]  2002-05-23 21:43 ---
Sorry we are taking down our network and it won't be back up until Wed. of next 
week because of a move, but I'll see what I can do.

Will

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core NamingContextListener.java

[remm]

remm02/05/23 15:27:46

  Modified:catalina/src/share/org/apache/catalina/core
NamingContextListener.java
  Log:
  - Bind resource links first.
  
  Revision  ChangesPath
  1.15  +22 -23
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
  
  Index: NamingContextListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- NamingContextListener.java17 May 2002 01:56:40 -  1.14
  +++ NamingContextListener.java23 May 2002 22:27:46 -  1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
 1.14 2002/05/17 01:56:40 remm Exp $
  - * $Revision: 1.14 $
  - * $Date: 2002/05/17 01:56:40 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
 1.15 2002/05/23 22:27:46 remm Exp $
  + * $Revision: 1.15 $
  + * $Date: 2002/05/23 22:27:46 $
*
* 
*
  @@ -118,7 +118,7 @@
* with each context and server.
*
* @author Remy Maucherat
  - * @version $Revision: 1.14 $ $Date: 2002/05/17 01:56:40 $
  + * @version $Revision: 1.15 $ $Date: 2002/05/23 22:27:46 $
*/
   
   public class NamingContextListener
  @@ -682,17 +682,11 @@
   if (namingResources == null)
   namingResources = new NamingResources();
   
  -// Environment entries
  -ContextEnvironment[] contextEnvironments = 
  -namingResources.findEnvironments();
  -for (i = 0; i  contextEnvironments.length; i++) {
  -addEnvironment(contextEnvironments[i]);
  -}
  -
  -// EJB references
  -ContextEjb[] ejbs = namingResources.findEjbs();
  -for (i = 0; i  ejbs.length; i++) {
  -addEjb(ejbs[i]);
  +// Resource links
  +ContextResourceLink[] resourceLinks = 
  +namingResources.findResourceLinks();
  +for (i = 0; i  resourceLinks.length; i++) {
  +addResourceLink(resourceLinks[i]);
   }
   
   // Resources
  @@ -701,13 +695,6 @@
   addResource(resources[i]);
   }
   
  -// Resource links
  -ContextResourceLink[] resourceLinks = 
  -namingResources.findResourceLinks();
  -for (i = 0; i  resourceLinks.length; i++) {
  -addResourceLink(resourceLinks[i]);
  -}
  -
   // Resources Env
   String[] resourceEnvRefs = namingResources.findResourceEnvRefs();
   for (i = 0; i  resourceEnvRefs.length; i++) {
  @@ -716,6 +703,19 @@
   addResourceEnvRef(key, type);
   }
   
  +// Environment entries
  +ContextEnvironment[] contextEnvironments = 
  +namingResources.findEnvironments();
  +for (i = 0; i  contextEnvironments.length; i++) {
  +addEnvironment(contextEnvironments[i]);
  +}
  +
  +// EJB references
  +ContextEjb[] ejbs = namingResources.findEjbs();
  +for (i = 0; i  ejbs.length; i++) {
  +addEjb(ejbs[i]);
  +}
  +
   // Binding a User Transaction reference
   if (container instanceof Context) {
   try {
  @@ -873,7 +873,6 @@
   createSubcontexts(envCtx, resource.getName());
   envCtx.bind(resource.getName(), ref);
   } catch (NamingException e) {
  -e.printStackTrace();
   log(sm.getString(naming.bindFailed, e));
   }
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_msg.h

[costin]

costin  02/05/23 16:33:19

  Modified:jk/native2/common jk_msg_ajp.c jk_requtil.c
   jk/native2/include jk_msg.h
  Log:
  Reduce the warnings. There are more signed/unsigned char problems,
  I'll do another pass.
  
  Revision  ChangesPath
  1.15  +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
  
  Index: jk_msg_ajp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_msg_ajp.c  16 May 2002 21:03:44 -  1.14
  +++ jk_msg_ajp.c  23 May 2002 23:33:18 -  1.15
  @@ -356,7 +356,7 @@
   return rc;
   }
   
  -static unsigned char *jk2_msg_ajp_getString(jk_env_t *env, jk_msg_t *msg) 
  +static char *jk2_msg_ajp_getString(jk_env_t *env, jk_msg_t *msg) 
   {
   int size = jk2_msg_ajp_getInt(env, msg);
   int start = msg-pos;
  
  
  
  1.20  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
  
  Index: jk_requtil.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- jk_requtil.c  23 May 2002 14:54:07 -  1.19
  +++ jk_requtil.c  23 May 2002 23:33:19 -  1.20
  @@ -773,8 +773,8 @@
   {
   const unsigned char *s = (const unsigned char *)path;
   unsigned char *d = (unsigned char *)dest;
  -unsigned char *e = dest + destsize - 1;
  -unsigned char *ee = dest + destsize - 3;
  +unsigned char *e = (unsigned char *)(dest + destsize - 1);
  +unsigned char *ee = (unsigned char *)(dest + destsize - 3);
   unsigned c;
   
   while ((c = *s)) {
  
  
  
  1.9   +1 -1  jakarta-tomcat-connectors/jk/native2/include/jk_msg.h
  
  Index: jk_msg.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_msg.h  16 May 2002 20:49:53 -  1.8
  +++ jk_msg.h  23 May 2002 23:33:19 -  1.9
  @@ -159,7 +159,7 @@
   The buffer is internal to the message, you must save
   or make sure the message lives long enough.
*/ 
  -unsigned char *(*getString)(struct jk_env *env, struct jk_msg *_this);
  +char *(*getString)(struct jk_env *env, struct jk_msg *_this);
   
   /** Return a byte[] and it's length.
*  The buffer is internal to the message, you must save
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 jk_service_apache13.c

[costin]

costin  02/05/23 16:33:50

  Modified:jk/native2/server/apache13 jk_service_apache13.c
  Log:
  Add the JK_METHOD and include to make it compile on win32.
  
  Revision  ChangesPath
  1.6   +3 -2  
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
  
  Index: jk_service_apache13.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_service_apache13.c 16 May 2002 20:56:08 -  1.5
  +++ jk_service_apache13.c 23 May 2002 23:33:50 -  1.6
  @@ -68,6 +68,7 @@
   #include http_log.h
   
   #include util_script.h
  +#include util_date.h
   /*
* Jakarta (jk_) include files
*/
  @@ -278,7 +279,7 @@
   return 0;
   }
   
  -static int jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
  +static int JK_METHOD jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
  jk_worker_t *worker, void *serverObj)
   {
   /* ap_port_t port; */
  @@ -462,7 +463,7 @@
*  jk shouldn't do it instead, and the user should get the
*  error message !
*/
  -static void jk2_service_apache13_afterRequest(jk_env_t *env, jk_ws_service_t *s )
  +static void JK_METHOD jk2_service_apache13_afterRequest(jk_env_t *env, 
jk_ws_service_t *s )
   {
   
   if (s-content_read  s-content_length ||
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java

[remm]

remm02/05/23 16:34:45

  Modified:jasper2/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  - Misc improvements (non static, no sync).
  
  Revision  ChangesPath
  1.6   +35 -95
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Compiler.java 23 May 2002 06:53:23 -  1.5
  +++ Compiler.java 23 May 2002 23:34:45 -  1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.5 2002/05/23 06:53:23 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/05/23 06:53:23 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.6 2002/05/23 23:34:45 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/05/23 23:34:45 $
*
* 
* 
  @@ -94,32 +94,10 @@
   // - Static
   
   
  -protected static Project project;
  -protected static Javac javac;
  -protected static Path path;
  -protected static Path srcPath;
  -
  -protected static CompilerBuildListener listener;
  -
   static {
   
   System.setErr(new SystemLogHandler(System.err));
   
  -// Initializing project
  -project = new Project();
  -project.init();
  -
  -// Initializing javac task
  -javac = (Javac) project.createTask(javac);
  -
  -// Initializing paths
  -path = new Path(project);
  -srcPath = new Path(project);
  -
  -// Initializing listener
  -listener = new CompilerBuildListener();
  -project.addBuildListener(listener);
  -
   }
   
   
  @@ -132,6 +110,8 @@
   private ErrorDispatcher errDispatcher;
   private PageInfo pageInfo;
   
  +protected Project project;
  +
   
   //  Constructor
   
  @@ -139,6 +119,9 @@
   public Compiler(JspCompilationContext ctxt) {
   this.ctxt = ctxt;
this.errDispatcher = new ErrorDispatcher();
  +// Initializing project
  +project = new Project();
  +project.init();
   }
   
   
  @@ -212,43 +195,43 @@
   String errorReport = null;
   boolean success = true;
   
  -// Call the actual Java compiler
  -synchronized (project) {
  -
  -path.setPath(System.getProperty(java.class.path) + sep
  - + classpath);
  -srcPath.setPath(ctxt.getOutputDir());
  -
  -/*
  - * Configure the compiler object
  - */
  -javac.setEncoding(javaEncoding);
  -javac.setClasspath(path);
  -if (ctxt.getJavacOutputDir() != null) {
  -javac.setDestdir(new File(ctxt.getJavacOutputDir()));
  -}
  -javac.setDebug(ctxt.getOptions().getClassDebugInfo());
  -javac.setSrcdir(srcPath);
  -
  -listener.clear();
  +// Initializing javac task
  +Javac javac = (Javac) project.createTask(javac);
   
  -SystemLogHandler.setThread();
  +// Initializing paths
  +Path path = new Path(project);
  +Path srcPath = new Path(project);
   
  -try {
  -javac.execute();
  -} catch (BuildException e) {
  -success = false;
  -}
  +path.setPath(System.getProperty(java.class.path) + sep
  + + classpath);
  +srcPath.setPath(ctxt.getOutputDir());
  +
  +/*
  + * Configure the compiler object
  + */
  +javac.setEncoding(javaEncoding);
  +javac.setClasspath(path);
  +if (ctxt.getJavacOutputDir() != null) {
  +javac.setDestdir(new File(ctxt.getJavacOutputDir()));
  +}
  +javac.setDebug(ctxt.getOptions().getClassDebugInfo());
  +javac.setSrcdir(srcPath);
   
  -errorReport = SystemLogHandler.unsetThread();
  +SystemLogHandler.setThread();
   
  +try {
  +javac.execute();
  +} catch (BuildException e) {
  +success = false;
   }
   
  +errorReport = SystemLogHandler.unsetThread();
  +
   if (!ctxt.keepGenerated()) {
   File javaFile = new File(javaFileName);
   javaFile.delete();
   }
  -
  +
   if (!success) {
   errDispatcher.javacError(errorReport, javaFileName, pageNodes);
   }
  @@ -363,49 +346,6 @@

cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c

[costin]

costin  02/05/23 16:45:08

  Modified:jk/native2/jni jk_jni_aprImpl.c
  Log:
  Add support for setuid() - to change the user if run as root.
  
  Revision  ChangesPath
  1.22  +46 -2 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
  
  Index: jk_jni_aprImpl.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jk_jni_aprImpl.c  15 May 2002 19:46:46 -  1.21
  +++ jk_jni_aprImpl.c  23 May 2002 23:45:07 -  1.22
  @@ -78,6 +78,10 @@
   #include jk_map.h
   #include jk_pool.h
   
  +#ifndef WIN32
  +#include unistd.h
  +#include pwd.h
  +#endif
   
   #if APR_HAVE_SYS_TYPES_H
   #include sys/types.h
  @@ -107,7 +111,6 @@
   
   if( jk_env_globalEnv == NULL ) {
   jk_pool_t *globalPool;
  -jk_bean_t *jkb;
   
   if( jniAprPool==NULL ) {
   return 0;
  @@ -212,10 +215,51 @@
   /*  User related functions  */
   
   JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_userId(JNIEnv *jniEnv, jobject _jthis, jlong pool)
  +Java_org_apache_jk_apr_AprImpl_userId(JNIEnv *jniEnv, jobject _jthis)
   {
   
   return 0;
  +}
  +
  +JNIEXPORT jlong JNICALL 
  +Java_org_apache_jk_apr_AprImpl_getPid(JNIEnv *jniEnv, jobject _jthis)
  +{
  +  return (jlong) getpid();
  +}
  +
  +
  +JNIEXPORT jlong JNICALL 
  +Java_org_apache_jk_apr_AprImpl_setUser(JNIEnv *jniEnv, jobject _jthis,
  +   jstring userJ, jstring groupJ)
  +{
  +int rc=0;
  +#ifndef WIN32
  +const char *user;
  +char *group;
  +struct passwd *passwd;
  +int uid;
  +int gid;
  +
  +user = (*jniEnv)-GetStringUTFChars(jniEnv, userJ, 0);
  +
  +passwd = getpwnam(user);
  +
  +(*jniEnv)-ReleaseStringUTFChars(jniEnv, userJ, user);
  +
  +if (passwd == NULL ) {
  +return -1;
  +}
  +uid = passwd-pw_uid;
  +gid = passwd-pw_gid;
  +
  +if (uid  0 || gid  0 ) 
  +return -2;
  +
  +rc = setuid(uid);
  +
  +#endif
  +
  +return rc;
   }
   
   /*  interprocess mutexes  */
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 9360] - Method never get invoked / Object never gets instantiated

[bugzilla]

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=9360.
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=9360

Method never get invoked / Object never gets instantiated

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2002-05-24 00:23 ---
This is caused by another bug. Use 4.0.4 bX to fix it.

*** This bug has been marked as a duplicate of 6374 ***

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

DO NOT REPLY [Bug 6374] - class not find for:org/w3c/dom/range/Range

[bugzilla]

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=6374.
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=6374

class not find for:org/w3c/dom/range/Range

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]



--- Additional Comments From [EMAIL PROTECTED]  2002-05-24 00:23 ---
*** Bug 9360 has been marked as a duplicate of this bug. ***

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java

[kinman]

kinman  02/05/23 17:35:42

  Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  - Applied the patch by Denis Benoit, with the following changes.
1. Setting the state back to RELEASE in the if branch.
2. Move the tag stack cleanup from the catch to the finally block.
  
The reason for 2. is to handle the case where the doAfterBody returns
a SKIP_BODY, and the when the stack needs to be properly clean up.
  
There may still be problems when exceptions ouccur, and the catch block
would be executed before the finally block.  The out referenced in
in the catch block may be the wrong one.  But I can image anyone can do
anything with out when this happen, so i left the code the way it is now.
  
  Revision  ChangesPath
  1.15  +53 -137   
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Generator.java15 May 2002 20:42:03 -  1.14
  +++ Generator.java24 May 2002 00:35:41 -  1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
 1.14 2002/05/15 20:42:03 kinman Exp $
  - * $Revision: 1.14 $
  - * $Date: 2002/05/15 20:42:03 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
 1.15 2002/05/24 00:35:41 kinman Exp $
  + * $Revision: 1.15 $
  + * $Date: 2002/05/24 00:35:41 $
*
* 
* 
  @@ -94,9 +94,7 @@
   private JspCompilationContext ctxt;
   private boolean breakAtLF;
   private PageInfo pageInfo;
  -private FinallyApplyer finallies;
  -private int tryBit;
  -private Stack tryStack;
  +private int maxTagNesting;
   
   /**
* @param s the input string
  @@ -201,7 +199,7 @@
generateDeclarations(page);
out.println();
   
  - // Static initializations (none yet) here
  + // Static initializations here
   
   // Static data for getIncludes()
   out.printil(private static java.util.Vector _jspx_includes;);
  @@ -227,8 +225,20 @@
   out.println();
   }
   
  + // Class fields declarations
  + 
  +maxTagNesting = pageInfo.getMaxTagNesting();
  +if (maxTagNesting = 0) {
  +out.printil(private static final int RELEASE_ACTION = 0;);
  +out.printil(private static final int POP_AND_RELEASE_ACTION = 1;);
  +out.println();
  +out.println();
  +}
  +
// Constructor (empty so far) here
   
  + // Methods here
  +
// Method used to get compile time include file dependencies
   out.printil(public java.util.List getIncludes() {);
   out.pushIndent();
  @@ -238,18 +248,6 @@
   out.println();
   out.println();
   
  -out.printil(private void addTagToVector(java.util.Vector tags, int index, 
Object tag) {);
  -out.pushIndent();
  -out.printil(if (index + 1  tags.size()));
  -out.pushIndent();
  -out.printil(tags.setSize(index + 1););
  -out.popIndent();
  -out.printil(tags.setElementAt(tag, index););
  -out.popIndent();
  -out.printil(});
  -out.println();
  -out.println();
  -
// Now the service method
out.printin(public void );
out.print  (serviceMethodName);
  @@ -272,8 +270,19 @@
out.printil(ServletConfig config = null;);
out.printil(JspWriter out = null;);
out.printil(Object page = this;);
  -out.printil(java.util.BitSet bitmask = new java.util.BitSet(););
  -out.printil(java.util.Vector tags = new java.util.Vector(););
  +
  + // pseudo Finally state stack objects
  +if (maxTagNesting = 0) {
  +String depth = Integer.toString(maxTagNesting + 1);
  +out.printil(int   tagStackIndex = -1;);
  +out.printin(int[] tagStackActions = new int[);
  +out.print(depth);
  +out.println(];);
  +out.printin(javax.servlet.jsp.tagext.Tag[] tagStack = new 
javax.servlet.jsp.tagext.Tag[);
  +out.print(depth);
  +out.println(];);
  +out.println();
  +}
   
out.printil(try {);
out.pushIndent();
  @@ -981,17 +990,10 @@
   out.printil(try {);
   out.pushIndent();
   } else {
  -out.printil(// try {);
  -out.printin(bitmask.set();
  -Integer tryBitVal = new Integer(tryBit++);
  -

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java

[remm]

remm02/05/23 18:15:27

  Modified:jasper2/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  - Use Ant includes to only select one JSP file at a time for compilation.
  
  Revision  ChangesPath
  1.7   +31 -19
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Compiler.java 23 May 2002 23:34:45 -  1.6
  +++ Compiler.java 24 May 2002 01:15:27 -  1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.6 2002/05/23 23:34:45 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2002/05/23 23:34:45 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.7 2002/05/24 01:15:27 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2002/05/24 01:15:27 $
*
* 
* 
  @@ -76,6 +76,7 @@
   import org.apache.jasper.JspCompilationContext;
   import org.apache.jasper.Constants;
   import org.apache.jasper.JasperException;
  +import org.apache.jasper.Options;
   import org.apache.jasper.logging.Logger;
   import org.apache.jasper.util.SystemLogHandler;
   
  @@ -112,6 +113,8 @@
   
   protected Project project;
   
  +protected Options options;
  +
   
   //  Constructor
   
  @@ -119,6 +122,7 @@
   public Compiler(JspCompilationContext ctxt) {
   this.ctxt = ctxt;
this.errDispatcher = new ErrorDispatcher();
  +this.options = ctxt.getOptions();
   // Initializing project
   project = new Project();
   project.init();
  @@ -139,10 +143,6 @@
   
   String javaFileName = ctxt.getServletJavaFileName();
   
  -Constants.message(jsp.message.java_file_name_is,
  -  new Object[] { javaFileName },
  -  Logger.DEBUG);
  -
   // Setup the ServletWriter
// We try UTF8 by default. If it fails, we use the java encoding 
// specified for JspServlet init parameter javaEncoding.
  @@ -158,8 +158,8 @@
javaEncoding = ctxt.getOptions().getJavaEncoding();
if (javaEncoding != null) {
try {
  - osw = new OutputStreamWriter(
  -   new FileOutputStream(javaFileName),javaEncoding);
  + osw = new OutputStreamWriter
  +(new FileOutputStream(javaFileName),javaEncoding);
} catch (UnsupportedEncodingException ex2) {
// no luck :-(
errDispatcher.jspError(jsp.error.invalid.javaEncoding,
  @@ -198,25 +198,36 @@
   // Initializing javac task
   Javac javac = (Javac) project.createTask(javac);
   
  -// Initializing paths
  +// Initializing classpath
   Path path = new Path(project);
  -Path srcPath = new Path(project);
  -
   path.setPath(System.getProperty(java.class.path) + sep
+ classpath);
  -srcPath.setPath(ctxt.getOutputDir());
   
  -/*
  - * Configure the compiler object
  - */
  +// Initializing sourcepath
  +Path srcPath = new Path(project);
  +srcPath.setPath(options.getScratchDir().getAbsolutePath());
  +
  +// Configure the compiler object
   javac.setEncoding(javaEncoding);
   javac.setClasspath(path);
  -if (ctxt.getJavacOutputDir() != null) {
  -javac.setDestdir(new File(ctxt.getJavacOutputDir()));
  -}
   javac.setDebug(ctxt.getOptions().getClassDebugInfo());
   javac.setSrcdir(srcPath);
   
  +// Build includes path
  +String dirName = ctxt.getJspFile();
  +int pos = dirName.lastIndexOf('/');
  +if (pos  0) {
  +dirName = dirName.substring(0, pos + 1);
  +} else {
  +dirName = ;
  +}
  +String includePath = dirName + ctxt.getServletClassName() + .java;
  +if (includePath.startsWith(/)) {
  +includePath = includePath.substring(1);
  +}
  +javac.setIncludes(includePath);
  +
  +// Start capturing the System.err output for this thread
   SystemLogHandler.setThread();
   
   try {
  @@ -225,6 +236,7 @@
   success = false;
   }
   
  +// Stop capturing the System.err output for this thread
   errorReport = SystemLogHandler.unsetThread();
   
   if (!ctxt.keepGenerated()) {
  
  
  

--
To unsubscribe, e-mail:   

[PATCH] improved HTMLManagerServlet

[Malcolm Edgar]

Hi all,

Please see the proposed patch for HTMLManagerServlet. This provides an 
improved UI, memory and server reporting information, gc command, supports 
4.1 manager install command and internationalization.

This is almost a rewrite of HTMLManagerServlet, so the diff is not 
particularly informative.

Please see the attached files:
* list.html - example HTML output of list command
* HTMLManagerServlet.java - source code
* LocalStrings.properties - localization strings

Regards Malcolm Edgar



_
Join the world’s largest e-mail service with MSN Hotmail. 
http://www.hotmail.com



HTMLManagerServlet.java
Description: JavaScript source

defaultservlet.directorylistingfor=Directory Listing for:
defaultservlet.upto=Up to:
defaultservlet.subdirectories=Subdirectories:
defaultservlet.files=Files:
htmlManagerServlet.appsTitle=Applications
htmlManagerServlet.appsPath=Path
htmlManagerServlet.appsName=Display Name
htmlManagerServlet.appsAvailable=Running
htmlManagerServlet.appsSessions=Sessions
htmlManagerServlet.appsStart=Start
htmlManagerServlet.appsStop=Stop
htmlManagerServlet.appsReload=Reload
htmlManagerServlet.appsRemove=Remove
htmlManagerServlet.installTitle=Install
htmlManagerServlet.installPath=Path:
htmlManagerServlet.installConfig=Config URL:
htmlManagerServlet.installWar=WAR URL:
htmlManagerServlet.installButton=Install
htmlManagerServlet.memoryTitle=Memory Status
htmlManagerServlet.memoryTotal=Total
htmlManagerServlet.memoryAvailable=Availabe
htmlManagerServlet.memoryUsed=Percentage Used
htmlManagerServlet.memoryTime=Time
htmlManagerServlet.memoryRefresh=Refresh
htmlManagerServlet.memoryRunGC=Run GC
htmlManagerServlet.messageLabel=Message:
htmlManagerServlet.serverTitle=Server
htmlManagerServlet.serverVersion=Server Version
htmlManagerServlet.serverJVMVersion=JVM Version
htmlManagerServlet.serverJVMVendor=JVM Vendor
htmlManagerServlet.serverOSName=OS Name
htmlManagerServlet.serverOSVersion=OS Version
htmlManagerServlet.serverOSArch=OS Arch
htmlManagerServlet.title=Tomcat Manager
invokerServlet.allocate=Cannot allocate servlet instance for path {0}
invokerServlet.cannotCreate=Cannot create servlet wrapper for path {0}
invokerServlet.deallocate=Cannot deallocate servlet instance for path {0}
invokerServlet.invalidPath=No servlet name or class was specified in path 
{0}
invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher
invokerServlet.noWrapper=Container has not called setWrapper() for this 
servlet
managerServlet.alreadyContext=FAIL - Application already exists at path {0}
managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use
managerServlet.cannotInvoke=Cannot invoke manager servlet through invoker
managerServlet.configured=OK - Installed application from context file {0}
managerServlet.deployed=OK - Deployed application at context path {0}
managerServlet.exception=FAIL - Encountered exception {0}
managerServlet.installed=OK - Installed application at context path {0}
managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
managerServlet.listed=OK - Listed applications for virtual host {0}
managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.noAppBase=FAIL - Cannot identify application base for context 
path {0}
managerServlet.noCommand=FAIL - No command was specified
managerServlet.noContext=FAIL - No context exists for path {0}
managerServlet.noDirectory=FAIL - Non-directory document base for path {0}
managerServlet.noDocBase=FAIL - Cannot remove document base for path {0}
managerServlet.noGlobal=FAIL - No global JNDI resources are available
managerServlet.noPath=FAIL - No context path was specified
managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path 
{0}
managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0}
managerServlet.noRole=FAIL - User does not possess role {0}
managerServlet.noWrapper=Container has not called setWrapper() for this 
servlet
managerServlet.reloaded=OK - Reloaded application at context path {0}
managerServlet.removed=OK - Removed application at context path {0}
managerServlet.resourcesAll=OK - Listed global resources of all types
managerServlet.resourcesType=OK - Listed global resources of type {0}
managerServlet.rolesList=OK - Listed security roles
managerServlet.saveFail=FAIL - Configuration save failed: {0}
managerServlet.sessiondefaultmax=Default maximum session inactive interval 
{0} minutes
managerServlet.sessiontimeout={0} minutes:{1} sessions
managerServlet.sessions=OK - Session information for application at context 
path {0}
managerServlet.started=OK - Started application at context path {0}
managerServlet.startFailed=FAIL - Application at context path {0} could not 
be started
managerServlet.stopped=OK - Stopped application at context path {0}
managerServlet.undeployed=OK - Undeployed application at context path {0}

Re: [PATCH] improved HTMLManagerServlet

[Malcolm Edgar]

Glenn Nielsen wrote:

I have a number of comments.  First thanks for working on improving the
HTMLManagerServlet.

1.  GC should not be user initiated, it should be left to the JVM.
 In addition, when virtual hosting web sites, those who have permission
 to manage applications for a particluar host may not be the
 system admin for Tomcat.  I wouldn't want them to be able to trigger a 
GC.
 The GC option needs to be removed.

I agree the GC should not generally be run by users, however the access to 
the manager app should limited to admins and developers, so I dont believe 
this would be an problem.

I had the experience of developing/profiling Tomcat apps located in the US 
while working in Australia for Avaya. To do this we developed a performance 
monitoring app, doing this sort of thing which was extremely useful.

2.  The js which you added for onClick really isn't necessary.  The
 HTMLManagerServlet should be usable w/o JavaScript enabled
 in the browser. It should be removed.

How would you do this in a POST request? I could use GET request but params 
url string is exposed, though I suppose this doesn't really matter for this 
application.

3.  The listing of memory usage isn't really needed if GC is removed.
 It doesn't provide info that is of benefit to someone
 who just manages web applications and is not the Tomcat sysad.
 A Tomcat sysad would be better off using the -verbose:gc arg to
 java when starting Tomcat so that they collect GC data which they
 can later graph to profile the Tomcat JVM memory usage.


I think it is handy to have a non-intrusive (although limited) way of 
examining memory status of servers in production or undergoing UAT.

That said I am not married to it, so I can remove it if required.

These comments are just from a quick review of the code, I haven't
compiled it and tried it out.


list.html wasn't attached.

Please see attached file, not sure what happend the first time. Thanks for 
the feed back.

Regards Malcolm Edgar

_
Get your FREE download of MSN Explorer at http://explorer.msn.com/intl.asp.



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [PATCH] improved HTMLManagerServlet

[Malcolm Edgar]

Glenn Nielsen wrote:

list.html wasn't attached.

Please cut  paste the HTML below.

Their is a virus on this PC jumping on the list.html file stopping it from 
being sent.

Regards Malcolm Edgar



html
head
style
  table { width: 100%; }
  td.page-title {
text-align: center;
vertical-align: top;
font-family:verdana,sans-serif;
font-weight: bold;
background: white;
color: black;
  }
  td.title {
text-align: left;
vertical-align: top;
font-family:verdana,sans-serif;
font-style:italic;
font-weight: bold;
background: #D2A41C;
  }
  td.header-left {
text-align: left;
vertical-align: top;
font-family:verdana,sans-serif;
font-weight: bold;
background: #FFDC75;
  }
  td.header-center {
text-align: center;
vertical-align: top;
font-family:verdana,sans-serif;
font-weight: bold;
background: #FFDC75;
  }
  td.row-left {
text-align: left;
vertical-align: middle;
font-family:verdana,sans-serif;
color: black;
background: white;
  }
  td.row-center {
text-align: center;
vertical-align: middle;
font-family:verdana,sans-serif;
color: black;
background: white;
  }
  td.row-right {
text-align: right;
vertical-align: middle;
font-family:verdana,sans-serif;
color: black;
background: white;
  }
/style
titleTomcat Manager/title
/head

body bgcolor=#FF
form method=post
input type=hidden name=path

table border=2 cellspacing=0 cellpadding=3 bordercolor=#00
tr
td class=page-title bordercolor=#00 align=left nowrap
  font size=+2Tomcat Manager/font
/td
/tr
/table
br

table border=1 cellspacing=0 cellpadding=3
tr
td colspan=10 class=titleApplications/td
/tr
tr
td class=header-leftsmallPath/small/td
td class=header-leftsmallDisplay Name/small/td
td class=header-centersmallRunning/small/td
td class=header-centersmallSessions/small/td
td class=header-centernbsp;/td
/tr
tr
td class=row-leftsmalla href=///a/small/td
td class=row-leftsmallROOT/small/td
td class=row-centersmalltrue/small/td
td class=row-centersmall-/small/td
td class=row-rightnbsp;/td
/tr
tr
td class=row-leftsmalla href=/admin/admin/a/small/td
td class=row-leftsmallnbsp;/small/td
td class=row-centersmallfalse/small/td
td class=row-centersmalla 
href=sessions?path=/admin0/a/small/td
td class=row-right
  input type=button value=Start
 onClick=this.form.action='start'; this.form.path.value='/admin'; 
this.form.submit(); 
  input type=button value=Stop
 onClick=this.form.action='stop';  this.form.path.value='/admin'; 
this.form.submit(); 
  input type=button value=Reload
 onClick=this.form.action='reload'; this.form.path.value='/admin'; 
this.form.submit(); 
  input type=button value=Remove
 onClick=this.form.action='remove'; this.form.path.value='/admin'; 
this.form.submit(); 
/td
/tr
tr
td class=row-leftsmalla href=/examples/examples/a/small/td
td class=row-leftsmallnbsp;/small/td
td class=row-centersmalltrue/small/td
td class=row-centersmalla 
href=sessions?path=/examples0/a/small/td
td class=row-right
  input type=button value=Start
 onClick=this.form.action='start'; 
this.form.path.value='/examples'; this.form.submit(); 
  input type=button value=Stop
 onClick=this.form.action='stop';  
this.form.path.value='/examples'; this.form.submit(); 
  input type=button value=Reload
 onClick=this.form.action='reload'; 
this.form.path.value='/examples'; this.form.submit(); 
  input type=button value=Remove
 onClick=this.form.action='remove'; 
this.form.path.value='/examples'; this.form.submit(); 
/td
/tr
tr
td class=row-leftsmalla href=/manager/manager/a/small/td
td class=row-leftsmallnbsp;/small/td
td class=row-centersmalltrue/small/td
td class=row-centersmalla 
href=sessions?path=/manager0/a/small/td
td class=row-right
  input type=button value=Start
 onClick=this.form.action='start'; this.form.path.value='/manager'; 
this.form.submit(); 
  input type=button value=Stop
 onClick=this.form.action='stop';  this.form.path.value='/manager'; 
this.form.submit(); 
  input type=button value=Reload
 onClick=this.form.action='reload'; 
this.form.path.value='/manager'; this.form.submit(); 
  input type=button value=Remove
 onClick=this.form.action='remove'; 
this.form.path.value='/manager'; this.form.submit(); 
/td
/tr
tr
td class=row-leftsmalla 
href=/tomcat-docs/tomcat-docs/a/small/td
td class=row-leftsmallnbsp;/small/td
td class=row-centersmalltrue/small/td
td class=row-centersmalla 
href=sessions?path=/tomcat-docs0/a/small/td
td class=row-right
  input type=button value=Start
 onClick=this.form.action='start'; 
this.form.path.value='/tomcat-docs'; this.form.submit(); 
  input type=button value=Stop
 onClick=this.form.action='stop';  
this.form.path.value='/tomcat-docs'; this.form.submit(); 
  input type=button value=Reload
 

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_mutex.c

[costin]

costin  02/05/23 21:24:51

  Added:   jk/native2/include jk_mutex.h
   jk/native2/common jk_mutex.c
  Log:
  Moved the mutex code from jni to it's own separate component.
  
  JNI can call it using 'normal' dispatch.
  
  This looks more and more like (XP)COM/XPConnect/blackwood - that may
  only mean that we are on the good path :-)
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/jk/native2/include/jk_mutex.h
  
  Index: jk_mutex.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_env.h

[costin]

costin  02/05/23 21:26:00

  Modified:jk/native2/common jk_env.c jk_shm.c
   jk/native2/include jk_env.h
  Log:
  Moved the common code in jk_env. Many components need an aprPool, and assuming
  that jk_pool wraps an aprPool is not the cleanest solution.
  
  Revision  ChangesPath
  1.28  +29 -2 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
  
  Index: jk_env.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_env.c  23 May 2002 14:54:07 -  1.27
  +++ jk_env.c  24 May 2002 04:26:00 -  1.28
  @@ -55,10 +55,12 @@
*   *
* = */

  +#include jk_global.h
   #include jk_env.h
   #include jk_objCache.h
   
   jk_env_t *jk_env_globalEnv;
  +void *jkGlobalAprPool;
   
   /* Private methods 
   */
  @@ -70,6 +72,29 @@
   
   /*  Env management  */
   
  +static void JK_METHOD *jk2_env_getAprPool( jk_env_t *env ) {
  +#ifdef HAS_APR
  +/* We don't want to have to recreate the scoreboard after
  + * restarts, so we'll create a global pool and never clean it.
  + */
  +if( jkGlobalAprPool==NULL ) {
  +int rc;
  +
  +/* Make sure apr is initialized */
  +apr_initialize(); 
  +rc = apr_pool_create(( apr_pool_t **)jkGlobalAprPool, NULL);
  +if (rc != APR_SUCCESS || jkGlobalAprPool==NULL ) {
  +env-l-jkLog(env, env-l, JK_LOG_ERROR, 
  +  Unable to create global apr pool\n);
  +return NULL;
  +}
  +}
  +return jkGlobalAprPool;
  +#else
  +return NULL;
  +#endif
  +}
  +
   /** Public method, creates/get the global env
*/
   jk_env_t* JK_METHOD jk2_env_getEnv( char *id, jk_pool_t *pool ) {
  @@ -109,7 +134,8 @@
   env-releaseEnv= parentEnv-releaseEnv; 
   env-jkClearException=parentEnv-jkClearException;
   env-jkException=parentEnv-jkException;
  -
  +env-getAprPool=parentEnv-getAprPool;
  +
   env-_registry=parentEnv-_registry;
   env-_objects=parentEnv-_objects;
   env-l=parentEnv-l;
  @@ -393,7 +419,7 @@
 env.registerFactory(): NullPointerException\n);
   return;
   }
  -env-_registry-put( env, env-_registry, type, fact, NULL );
  +env-_registry-put( env, env-_registry, (char *)type, (void *)fact, NULL );
   }
   
   /*  Exceptions  */
  @@ -457,6 +483,7 @@
   env-debug = 0;
   env-jkClearException=jk_env_jkClearException;
   env-jkException=jk_env_jkException;
  +env-getAprPool=jk2_env_getAprPool;
   
   env-id=0;
   
  
  
  
  1.19  +11 -14jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_shm.c  19 May 2002 17:37:08 -  1.18
  +++ jk_shm.c  24 May 2002 04:26:00 -  1.19
  @@ -81,7 +81,6 @@
   #include apr_file_io.h
   #include apr_file_info.h
   #include apr_general.h
  -static apr_pool_t *globalShmPool;
   
   #elif defined(HAVE_MMAP)  !defined(WIN32)
   
  @@ -117,20 +116,13 @@
   apr_file_t *file;
   apr_finfo_t finfo;
   apr_mmap_t *aprMmap;
  +apr_pool_t *globalShmPool;
  +
  +globalShmPool= (apr_pool_t *)env-getAprPool( env );
  +
  +if( globalShmPool==NULL )
  +return JK_FALSE;
   
  -/* We don't want to have to recreate the scoreboard after
  - * restarts, so we'll create a global pool and never clean it.
  - */
  -if( globalShmPool==NULL ) {
  -/* Make sure apr is initialized */
  -apr_initialize(); 
  -rc = apr_pool_create(globalShmPool, NULL);
  -if (rc != APR_SUCCESS || globalShmPool==NULL ) {
  -env-l-jkLog(env, env-l, JK_LOG_ERROR, 
  -  Unable to create global pool for jk_shm\n);
  -return rc;
  -}
  -}
   
   /* First make sure the file exists and is big enough
*/
  @@ -331,6 +323,11 @@
   
   if( shm-size == 0  ) {
   shm-size = shm-slotSize * shm-slotMaxCount;
  +}
  +
  +if( shm-mbean-debug  0 ) {
  +env-l-jkLog(env, env-l, JK_LOG_INFO, shm.init(): file=%s size=%d\n,
  +  shm-fname, shm-size);
   }
   
   if( shm-size = 0 ) {
  
  
  
  1.16  +5 -2  jakarta-tomcat-connectors/jk/native2/include/jk_env.h
  
  Index: jk_env.h
  

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_vm_default.c

[costin]

costin  02/05/23 21:29:22

  Modified:jk/native2/common jk_vm_default.c
  Log:
  Use APR to load the DLL ( rather than adding another case for hpux ).
  
  The major problem is Netware - the code in APR for dlopen is _very_
  different from what we have in jk. If someone who uses that platform
  can check if apr dlopen works fine, we can remove the commented code.
  
  I assume the windows and standard dlopen cases are well tested, so
  we'll get rid of all this platform-specific code soon.
  
  Revision  ChangesPath
  1.15  +128 -64   jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
  
  Index: jk_vm_default.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_vm_default.c   16 May 2002 23:48:27 -  1.14
  +++ jk_vm_default.c   24 May 2002 04:29:22 -  1.15
  @@ -85,15 +85,15 @@
   #include jk_config.h
   
   
  -#if !defined(WIN32)  !defined(NETWARE)
  -#include dlfcn.h
  -#endif
   #if defined LINUX  defined APACHE2_SIGHACK
   #include pthread.h
   #include signal.h
   #include bits/signum.h
   #endif
   
  +#if !defined(WIN32)  !defined(NETWARE)
  +#include dlfcn.h
  +#endif
   #ifdef NETWARE
   #include nwthread.h
   #include nwadv.h
  @@ -101,6 +101,11 @@
   
   #include jni.h
   
  +#ifdef APR_HAS_DSO
  +#include apr_dso.h
  +#endif
  +
  +
   #ifndef JNI_VERSION_1_2
   
   #warning ---
  @@ -184,72 +189,41 @@
   static int jk2_vm_loadJvm(jk_env_t *env, jk_vm_t *jkvm)
   {
   
  -
  -#ifdef WIN32
  -HINSTANCE hInst = LoadLibrary(jkvm-jvm_dll_path);
  -if(hInst) {
  -(FARPROC)jni_create_java_vm = 
  -GetProcAddress(hInst, JNI_CreateJavaVM);
  -
  -(FARPROC)jni_get_created_java_vms = 
  -GetProcAddress(hInst, JNI_GetCreatedJavaVMs);
  -
  -(FARPROC)jni_get_default_java_vm_init_args = 
  -GetProcAddress(hInst, JNI_GetDefaultJavaVMInitArgs);
  -
  -env-l-jkLog(env, env-l, JK_LOG_INFO, 
  -  jni.loadJvmDll()\n);
  -
  -if(jni_create_java_vm 
  -   jni_get_default_java_vm_init_args 
  -   jni_get_created_java_vms) {
  -return JK_OK;
  -}
  +#if defined(HAS_APR)  defined(APR_HAS_DSO)
  +apr_dso_handle_t *dsoHandle;
  +apr_status_t rc;
  +apr_pool_t *aprPool;
   
  -FreeLibrary(hInst);
  -}
  -return JK_OK;
  -#elif defined(NETWARE)
  -int javaNlmHandle = FindNLMHandle(JVM);
  -if (0 == javaNlmHandle) {
  -/* if we didn't get a handle, try to load java and retry getting the */
  -/* handle */
  -spawnlp(P_NOWAIT, JVM.NLM, NULL);
  -ThreadSwitchWithDelay();
  -javaNlmHandle = FindNLMHandle(JVM);
  -if (0 == javaNlmHandle)
  -printf(Error loading Java.);
  +aprPool= (apr_pool_t *)env-getAprPool( env );
  +
  +if( aprPool==NULL )
  +return JK_FALSE;
   
  +/* XXX How do I specify RTLD_NOW and RTLD_GLOBAL ? */
  +rc=apr_dso_load( dsoHandle, jkvm-jvm_dll_path, aprPool );
  +
  +if(rc == APR_SUCCESS ) {
  +rc= apr_dso_sym( (apr_dso_handle_sym_t *)jni_create_java_vm, dsoHandle, 
JNI_CreateJavaVM);
   }
  -if (0 != javaNlmHandle) {
  -jni_create_java_vm = ImportSymbol(GetNLMHandle(), JNI_CreateJavaVM);
  -jni_get_created_java_vms = ImportSymbol(GetNLMHandle(),
  -JNI_GetCreatedJavaVMs);
  -jni_get_default_java_vm_init_args =
  -ImportSymbol(GetNLMHandle(), JNI_GetDefaultJavaVMInitArgs);
  +
  +if( rc == APR_SUCCESS ) {
  +rc=apr_dso_sym( (apr_dso_handle_sym_t *)jni_get_default_java_vm_init_args, 
dsoHandle,
  +JNI_GetDefaultJavaVMInitArgs);
   }
  -if(jni_create_java_vm 
  -   jni_get_default_java_vm_init_args 
  -   jni_get_created_java_vms) {
  -return JK_OK;
  +
  +if( rc == APR_SUCCESS ) {
  +rc=apr_dso_sym( (apr_dso_handle_sym_t *)jni_get_created_java_vms,
  +dsoHandle, JNI_GetCreatedJavaVMs);
   }
  -return JK_OK;
  -#else 
  -void *handle;
  -handle = dlopen(jkvm-jvm_dll_path, RTLD_NOW | RTLD_GLOBAL);
  -
  -if(handle == NULL ) {
  -env-l-jkLog(env, env-l, JK_LOG_EMERG, 
  +
  +if( rc!= APR_SUCCESS ) {
  +char buf[256];
  +env-l-jkLog(env, env-l, JK_LOG_ERROR, 
 Can't load native library %s : %s\n, jkvm-jvm_dll_path,
  -  dlerror());
  +  apr_dso_error(dsoHandle, buf, 256));
   return JK_ERR;
   }
  -
  -jni_create_java_vm = dlsym(handle, JNI_CreateJavaVM);
  -jni_get_default_java_vm_init_args =
  -dlsym(handle, 

cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c

[costin]

costin  02/05/23 21:30:07

  Modified:jk/native2/jni jk_jni_aprImpl.c
  Log:
  Remove the mutex code ( move to a separate jk component ).
  
  Add few extra checks.
  
  Revision  ChangesPath
  1.23  +21 -85jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
  
  Index: jk_jni_aprImpl.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jk_jni_aprImpl.c  23 May 2002 23:45:07 -  1.22
  +++ jk_jni_aprImpl.c  24 May 2002 04:30:07 -  1.23
  @@ -93,8 +93,6 @@
   
   #include signal.h
   
  -#include apr_proc_mutex.h
  -
   static apr_pool_t *jniAprPool;
   static jk_workerEnv_t *workerEnv;
   static int jniDebug=0;
  @@ -182,6 +180,9 @@
   
   static void jk2_SigAction(int sig) {
   fprintf(stderr, Signal %d\n, sig );
  +
  +/* Make a callback using the jni channel */
  +
   signal( sig, jk2_SigAction );
   }
   #endif
  @@ -193,13 +194,12 @@
   */
   
   JNIEXPORT jint JNICALL 
  -Java_org_apache_jk_apr_AprImpl_signal(JNIEnv *jniEnv, jobject _jthis, jint bitMask,
  -  jobject func)
  +Java_org_apache_jk_apr_AprImpl_signal(JNIEnv *jniEnv, jobject _jthis, jint signalNr 
)
   {
   #ifdef HAVE_SIGNALS
   memset( jkAction, 0, sizeof(jkAction));
   jkAction.sa_handler=jk2_SigAction;
  -sigaction((int)bitMask, jkAction, (void *) NULL);
  +sigaction((int)signalNr, jkAction, (void *) NULL);
   #endif
   return 0;
   }
  @@ -214,21 +214,14 @@
   
   /*  User related functions  */
   
  -JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_userId(JNIEnv *jniEnv, jobject _jthis)
  -{
  -
  -return 0;
  -}
  -
  -JNIEXPORT jlong JNICALL 
  +JNIEXPORT jint JNICALL 
   Java_org_apache_jk_apr_AprImpl_getPid(JNIEnv *jniEnv, jobject _jthis)
   {
  -  return (jlong) getpid();
  +  return (jint) getpid();
   }
   
   
  -JNIEXPORT jlong JNICALL 
  +JNIEXPORT jint JNICALL 
   Java_org_apache_jk_apr_AprImpl_setUser(JNIEnv *jniEnv, jobject _jthis,
  jstring userJ, jstring groupJ)
   {
  @@ -259,78 +252,11 @@
   
   #endif
   
  -return rc;
  +return (jint)rc;
   }
   
   /*  interprocess mutexes  */
   
  -JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_mutexCreate(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  -   jstring fileJ,
  -   jint mechJ )
  -{
  -apr_proc_mutex_t *mutex;
  -apr_lockmech_e mech=(apr_lockmech_e)mechJ;
  -apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolP;
  -apr_status_t  st;
  -char *fname=(char *)(*jniEnv)-GetStringUTFChars(jniEnv, fileJ, 0);
  -
  -st=apr_proc_mutex_create( mutex, fname, mech, pool );
  -
  -(*jniEnv)-ReleaseStringUTFChars(jniEnv, fileJ, fname);
  -
  -return (jlong)(long)(void *)mutex;
  -}
  -
  -JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_mutexLock(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  - jlong mutexP )
  -{
  -apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)(void *)(long)mutexP;
  -apr_status_t  st;
  -
  -st=apr_proc_mutex_lock( mutex );
  -
  -return (jlong)(long)st;
  -}
  -
  -JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_mutexTryLock(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  - jlong mutexP )
  -{
  -apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)(void *)(long)mutexP;
  -apr_status_t  st;
  -
  -st=apr_proc_mutex_trylock( mutex );
  -
  -return (jlong)(long)st;
  -}
  -
  -JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_mutexUnLock(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  - jlong mutexP )
  -{
  -apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)(void *)(long)mutexP;
  -apr_status_t  st;
  -
  -st=apr_proc_mutex_unlock( mutex );
  -
  -return (jlong)(long)st;
  -}
  -
  -JNIEXPORT jlong JNICALL 
  -Java_org_apache_jk_apr_AprImpl_mutexDestroy(JNIEnv *jniEnv, jobject _jthis, jlong 
poolP,
  -jlong mutexP )
  -{
  -apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)(void *)(long)mutexP;
  -apr_status_t  st;
  -
  -st=apr_proc_mutex_destroy( mutex );
  -
  -return (jlong)(long)st;
  -}
  -
  -
   /*  Unix sockets  */
   /* It seems apr doesn't support them yet, so this code will use the
  'native' calls. For 'tcp' sockets we just use what java provides.
  @@ -765,7 +691,7 @@
   jk_env_t *env = (jk_env_t *)(void *)(long)envJ;
   jk_bean_t *compCtx=(jk_bean_t *)(void 

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi - New directory

[billbarker]

billbarker02/05/23 21:30:18

  jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi - 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]

costin  02/05/23 21:35:17

  Modified:jk/native2/include jk_workerEnv.h
  Log:
  Added the dispatch code for mutex.
  
  As mentioned in the comment, a dynamic mechanism to handle IDs and
  allow use of names must be added ( someday ). Unless we switch to
  XPCOM or a similar object model first.
  
  At this moment I don't have any urge to compile IDLs, and the
  overhead seems too big, we can still keep it simple.
  
  Revision  ChangesPath
  1.23  +6 -3  jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
  
  Index: jk_workerEnv.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jk_workerEnv.h16 May 2002 20:49:53 -  1.22
  +++ jk_workerEnv.h24 May 2002 04:35:17 -  1.23
  @@ -58,7 +58,7 @@
   /***
* Description: Workers controller header file *
* Author:  Gal Shachor [EMAIL PROTECTED]   * 
  - * Version: $Revision: 1.22 $   *
  + * Version: $Revision: 1.23 $   *
***/
   
   #ifndef JK_WORKERENV_H
  @@ -118,11 +118,14 @@
   /* Dispatcher for jni channel ( JNI - web server ) */
   #define JK_HANDLE_JNI_DISPATCH 0x15
   
  -/* Dispatcher for shm ( JNI - web server ) */
  +/* Dispatcher for shm object ( java-C) */
   #define JK_HANDLE_SHM_DISPATCH 0x16
   
  -/* Dispatcher for unix socket channel ( JNI - web server ) */
  +/* Dispatcher for unix socket channel ( java-C )*/
   #define JK_HANDLE_UN_DISPATCH 0x17
  +
  +/* Dispatcher for mutex object  ( java-C ) */
  +#define JK_HANDLE_MUTEX_DISPATCH 0x18
   
   
   /*
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ssi AbstractSsiCommand.java ExpressionParseTree.java ExpressionTokenizer.java FileReference.java ResponseIncludeWrapper.java ServletOutputStreamWrapper.java SsiCommand.java SsiCommandException.java SsiConditional.java SsiConfig.java SsiDispatcher.java SsiEcho.java SsiEnvironment.java SsiExec.java SsiFlastmod.java SsiFsize.java SsiInclude.java SsiSet.java package.html

[billbarker]

billbarker02/05/23 21:36:38

  Removed: catalina/src/share/org/apache/catalina/util/ssi
AbstractSsiCommand.java ExpressionParseTree.java
ExpressionTokenizer.java FileReference.java
ResponseIncludeWrapper.java
ServletOutputStreamWrapper.java SsiCommand.java
SsiCommandException.java SsiConditional.java
SsiConfig.java SsiDispatcher.java SsiEcho.java
SsiEnvironment.java SsiExec.java SsiFlastmod.java
SsiFsize.java SsiInclude.java SsiSet.java
package.html
  Log:
  Removal of the old SSI support classes.
  
  Submitted by: Dan Sandberg [EMAIL PROTECTED]

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets SsiServlet.java SsiInvokerServlet.java

[billbarker]

billbarker02/05/23 21:37:36

  Added:   catalina/src/share/org/apache/catalina/servlets
SsiServlet.java
  Removed: catalina/src/share/org/apache/catalina/servlets
SsiInvokerServlet.java
  Log:
  Replacing the SsiServlet Class
  
  Submitted by: Dan Sandberg [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SsiServlet.java
  
  Index: SsiServlet.java
  ===
  /*
   * SSIServlet.java
   * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SsiServlet.java,v
 1.1 2002/05/24 04:37:36 billbarker Exp $
   * $Revision: 1.1 $
   * $Date: 2002/05/24 04:37:36 $
   *
   * 
   *
   * 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/.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  package org.apache.catalina.servlets;
  
  import java.io.IOException;
  import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.io.OutputStream;
  import java.io.OutputStreamWriter;
  import java.io.BufferedInputStream;
  import java.io.BufferedReader;
  import java.io.ByteArrayOutputStream;
  import java.io.PrintWriter;
  import java.io.Reader;
  import java.io.StringWriter;
  import java.io.Writer;
  import java.net.URL;
  import java.net.URLConnection;
  import java.net.URLDecoder;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Date;
  import java.util.Enumeration;
  import java.util.HashMap;
  import java.util.Locale;
  import java.text.SimpleDateFormat;
  import java.util.StringTokenizer;
  import java.util.TimeZone;
  import javax.naming.directory.DirContext;
  import javax.naming.directory.Attribute;
  import javax.naming.directory.Attributes;
  import javax.naming.NamingException;
  import javax.naming.InitialContext;
  import javax.servlet.RequestDispatcher;
  import javax.servlet.ServletException;
  import javax.servlet.ServletContext;
  import javax.servlet.ServletOutputStream;
  import javax.servlet.http.HttpServlet;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  import org.apache.catalina.Globals;
  import 

cvs commit: jakarta-tomcat-4.0/catalina build.xml

[billbarker]

billbarker02/05/23 21:39:34

  Modified:catalina build.xml
  Log:
  Fix for the new locations of the SSI classes.
  
  Revision  ChangesPath
  1.118 +4 -4  jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- build.xml 14 May 2002 00:52:02 -  1.117
  +++ build.xml 24 May 2002 04:39:34 -  1.118
  @@ -808,9 +808,9 @@
  unless=compile.jaas/
 exclude name=org/apache/catalina/startup/BootstrapService.java
  unless=compile.daemon/
  -  exclude name=org/apache/catalina/servlets/SsiInvokerServlet.java
  +  exclude name=org/apache/catalina/servlets/SsiServlet.java
  unless=compile.ssi/
  -  exclude name=org/apache/catalina/util/ssi/**
  +  exclude name=org/apache/catalina/ssi/**
  unless=compile.ssi/
 exclude name=org/apache/catalina/valves/CertificatesValve.java
  unless=compile.jsse/
  @@ -1091,7 +1091,7 @@
   exclude name=org/apache/catalina/loader/Reloader.class /
   exclude name=org/apache/catalina/startup/SecurityClassLoad.class /
   exclude name=org/apache/catalina/servlets/** /
  -exclude name=org/apache/catalina/util/ssi/** /
  +exclude name=org/apache/catalina/ssi/** /
 /fileset
   /jar
   
  @@ -1170,7 +1170,7 @@
   jar jarfile=${catalina.deploy}/server/lib/servlets-ssi.renametojar
 fileset dir=${catalina.build}/server/classes
   include name=org/apache/catalina/servlets/Ssi* /
  -include name=org/apache/catalina/util/ssi/** /
  +include name=org/apache/catalina/ssi/** /
 /fileset
   /jar
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/conf web.xml

[billbarker]

billbarker02/05/23 21:44:29

  Modified:catalina/src/conf web.xml
  Log:
  Update for new SSIServlet.
  
  Revision  ChangesPath
  1.35  +1 -9  jakarta-tomcat-4.0/catalina/src/conf/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- web.xml   11 May 2002 05:08:49 -  1.34
  +++ web.xml   24 May 2002 04:44:29 -  1.35
  @@ -168,10 +168,6 @@
 !--   relative to the context root, instead of   --
 !--   the server root?  (0=false, 1=true) [0]--
 !--  --
  -  !--   ignoreUnsupportedDirective --
  -  !--   Should unknown or misspelled Ssi directives--
  -  !--   be ignored and no errors shown?--
  -  !--   (0=false, 1=true) [1]  --
 !--  --
 !-- IMPORTANT: To use the SSI servlet, you also need to rename the   --
 !--$CATALINA_HOME/server/lib/servlets-ssi.renametojar file   --
  @@ -181,7 +177,7 @@
   servlet
   servlet-namessi/servlet-name
   servlet-class
  -  org.apache.catalina.servlets.SsiInvokerServlet
  +  org.apache.catalina.servlets.SsiServlet
   /servlet-class
   init-param
 param-namebuffered/param-name
  @@ -198,10 +194,6 @@
   init-param
 param-nameisVirtualWebappRelative/param-name
 param-value0/param-value
  -/init-param
  -init-param
  -  param-nameignoreUnsupportedDirective/param-name
  -  param-value1/param-value
   /init-param
   load-on-startup4/load-on-startup
   /servlet
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[VOTE] New Committer Dan Sandberg

[Bill Barker]

I'd like to propose Dan Sandberg (x at cs.stanford.edu) as a new Tomcat
committer.  He has already put in a great deal of work in re-factoring the
SSIServlet in Tomcat 4.x, and seems to be willing to further contribute to
working on this.


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [VOTE] New Committer Dan Sandberg

[Remy Maucherat]

 I'd like to propose Dan Sandberg (x at cs.stanford.edu) as a new Tomcat
 committer.  He has already put in a great deal of work in re-factoring the
 SSIServlet in Tomcat 4.x, and seems to be willing to further contribute to
 working on this.

+1

Remy


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [VOTE] New Committer Dan Sandberg

[Bojan Smojver]

+1

Bojan

On Fri, 2002-05-24 at 14:56, Bill Barker wrote:
 I'd like to propose Dan Sandberg (x at cs.stanford.edu) as a new Tomcat
 committer.  He has already put in a great deal of work in re-factoring the
 SSIServlet in Tomcat 4.x, and seems to be willing to further contribute to
 working on this.


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [VOTE] New Committer Dan Sandberg

[costinm]

+1

Costin

On Thu, 23 May 2002, Bill Barker wrote:

 I'd like to propose Dan Sandberg (x at cs.stanford.edu) as a new Tomcat
 committer.  He has already put in a great deal of work in re-factoring the
 SSIServlet in Tomcat 4.x, and seems to be willing to further contribute to
 working on this.
 
 
 --
 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]