Re: cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkMain.java JkCoyoteHandler.java

2003-09-22 Thread Henri Gomez
Remy Maucherat a écrit :
[EMAIL PROTECTED] wrote:

hgomez  2003/09/18 09:21:02

  Modified:jk/java/org/apache/jk/common Shm.java JniHandler.java
MsgAjp.java ChannelShm.java WorkerDummy.java
ChannelUn.java ChannelJni.java
   jk/java/org/apache/ajp/tomcat4 Ajp13Processor.java
Ajp13Request.java Ajp13Connector.java
JkServlet.java
   jk/java/org/apache/ajp/tomcat33 Ajp14Interceptor.java
   jk/java/org/apache/jk/apr TomcatStarter.java
   jk/java/org/apache/jk/config GeneratorJk1.java
GeneratorApache2.java GeneratorJk2.java
WebXml2Jk.java
   jk/java/org/apache/ajp AjpHandler.java
NegociationHandler.java Ajp13Packet.java
RequestHandler.java Ajp13.java
   jk/java/org/apache/jk/core MsgContext.java Msg.java
   jk/java/org/apache/ajp/tomcat4/config ApacheConfig.java
   jk/java/org/apache/jk/server JkMain.java
JkCoyoteHandler.java
  Log:
  Last batch of clean import.
 
  More next week (if Remy didn't drop my commiter status before ;)


I'm not root, I can't do that ;-)
Anyway, it's weird, I thought I had done it already. Eclipse sucks (or I 
misconfigured it, which is likely) :)
I'm using Eclipse 2.1.1 and the settings is to :

Prefs/Java/Compiler :

Unused Locale Variables and Unused Imports should be set to Warning ;)



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


Re: cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.2.txt

2003-09-22 Thread Henri Gomez
Larry Isaacs a écrit :

+1,  Thanks.
Next batch for TC 3.3.2-dev is on the fly :)



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


cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common Shm14.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:14:19

  Modified:jk/java/org/apache/jk/common Shm14.java
  Log:
  Clean imports
  
  Revision  ChangesPath
  1.2   +6 -14 
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm14.java
  
  Index: Shm14.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm14.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Shm14.java9 May 2002 00:16:24 -   1.1
  +++ Shm14.java22 Sep 2003 09:14:19 -  1.2
  @@ -59,21 +59,13 @@
   
   package org.apache.jk.common;
   
  -import java.io.*;
  -import java.nio.*;
  -import java.nio.channels.*;
  -
  -import java.net.*;
  -import java.util.*;
  -
  -import org.apache.tomcat.util.buf.*;
  -import org.apache.tomcat.util.http.*;
  -
  -import org.apache.tomcat.util.threads.*;
  -
  -import org.apache.jk.core.*;
  -import org.apache.jk.apr.*;
  +import java.io.IOException;
  +import java.io.RandomAccessFile;
  +import java.nio.MappedByteBuffer;
  +import java.nio.channels.FileChannel;
   
  +import org.apache.jk.core.Msg;
  +import org.apache.jk.core.MsgContext;
   import org.apache.tomcat.util.IntrospectionUtils;
   
   /** Shm implementation using JDK1.4 nio.
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant SoTask.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:14:54

  Modified:jk/jkant/java/org/apache/jk/ant SoTask.java
  Log:
  Clean import and fix a bugounet
  
  Revision  ChangesPath
  1.24  +29 -9 
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
  
  Index: SoTask.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- SoTask.java   9 Jun 2002 00:10:02 -   1.23
  +++ SoTask.java   22 Sep 2003 09:14:54 -  1.24
  @@ -54,14 +54,34 @@
   
   package org.apache.jk.ant;
   
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.*;
  -import org.apache.jk.ant.compilers.*;
  -
  -import java.io.*;
  -import java.util.*;
  +import java.io.ByteArrayOutputStream;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.PrintStream;
  +import java.util.Enumeration;
  +import java.util.Vector;
  +
  +import org.apache.jk.ant.compilers.CcCompiler;
  +import org.apache.jk.ant.compilers.CompilerAdapter;
  +import org.apache.jk.ant.compilers.GcjCompiler;
  +import org.apache.jk.ant.compilers.GcjLinker;
  +import org.apache.jk.ant.compilers.LibtoolCompiler;
  +import org.apache.jk.ant.compilers.LibtoolLinker;
  +import org.apache.jk.ant.compilers.LinkerAdapter;
  +import org.apache.jk.ant.compilers.MsvcCompiler;
  +import org.apache.jk.ant.compilers.MsvcLinker;
  +import org.apache.jk.ant.compilers.MwccCompiler;
  +import org.apache.jk.ant.compilers.MwldLinker;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
  +import org.apache.tools.ant.taskdefs.PumpStreamHandler;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.PatternSet;
   
   /** Global properties
   
  @@ -364,7 +384,7 @@
* (XXX including extension - this should be automatically added )
*/
   public void setModule(String modName) {
  -this.module = module;
  +this.module = modName;   // Should be this ?
   }
   
   // XXX Add specific code for Netware, Windows and platforms where libtool
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant Source.java JniConfig.java ApacheConfig.java JkData.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:15:12

  Modified:jk/jkant/java/org/apache/jk/ant/compilers GcjLinker.java
MwccCompiler.java MwldLinker.java
LibtoolCompiler.java CompilerAdapter.java
GcjCompiler.java LibtoolLinker.java
MsvcCompiler.java CcCompiler.java MsvcLinker.java
   jk/jkant/java/org/apache/jk/ant Source.java JniConfig.java
ApacheConfig.java JkData.java
  Log:
  More clean import
  
  Revision  ChangesPath
  1.4   +9 -8  
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjLinker.java
  
  Index: GcjLinker.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjLinker.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GcjLinker.java7 May 2002 19:45:08 -   1.3
  +++ GcjLinker.java22 Sep 2003 09:15:12 -  1.4
  @@ -54,15 +54,16 @@
   
   package org.apache.jk.ant.compilers;
   
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.util.Enumeration;
  +import java.util.Vector;
   
  -import org.apache.jk.ant.*;
  -
  -import java.io.*;
  -import java.util.*;
  +import org.apache.jk.ant.JkData;
  +import org.apache.jk.ant.SoTask;
  +import org.apache.jk.ant.Source;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.util.GlobPatternMapper;
   
   /**
* Link java using gcj.
  
  
  
  1.9   +10 -7 
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java
  
  Index: MwccCompiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MwccCompiler.java 11 Apr 2002 21:46:57 -  1.8
  +++ MwccCompiler.java 22 Sep 2003 09:15:12 -  1.9
  @@ -54,14 +54,17 @@
   
   package org.apache.jk.ant.compilers;
   
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.*;
  -import org.apache.jk.ant.*;
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.util.Enumeration;
   
  -import java.io.*;
  -import java.util.*;
  +import org.apache.jk.ant.Def;
  +import org.apache.jk.ant.SoTask;
  +import org.apache.jk.ant.Source;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
*  Compile using MetroWerks.
  
  
  
  1.9   +12 -8 
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
  
  Index: MwldLinker.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MwldLinker.java   11 Apr 2002 21:46:57 -  1.8
  +++ MwldLinker.java   22 Sep 2003 09:15:12 -  1.9
  @@ -54,15 +54,19 @@
   
   package org.apache.jk.ant.compilers;
   
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.util.Enumeration;
  +import java.util.Vector;
   
  -import org.apache.jk.ant.*;
  -
  -import java.io.*;
  -import java.util.*;
  +import org.apache.jk.ant.JkData;
  +import org.apache.jk.ant.SoTask;
  +import org.apache.jk.ant.Source;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.util.GlobPatternMapper;
   
   /**
* Link using libtool.
  
  
  
  1.9   +6 -7  
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolCompiler.java
  
  Index: LibtoolCompiler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolCompiler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LibtoolCompiler.java  12 Jan 2002 05:33:03 -  1.8
  +++ LibtoolCompiler.java  22 Sep 2003 09:15:12 -  1.9
  @@ -54,14 +54,13 @@
   
   package org.apache.jk.ant.compilers;
   
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import 

DO NOT REPLY [Bug 22986] - Web apps with context XML file don't start if CATALINA_BASE is set and absolute path is used for appBase

2003-09-22 Thread 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=22986.
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=22986

Web apps with context XML file don't start if CATALINA_BASE is set and absolute path 
is used for appBase

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|VERIFIED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 09:18 ---
Confirmed that it is OK (tested with 5.0.12).

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



JTC - clean import finished

2003-09-22 Thread Henri Gomez
Ok, I finished to clean imports in JTC .

Now, I commit stuff for TC 3.3.2-dev

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


cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade ServletHandler.java Servlet22Interceptor.java ServletOutputStreamFacade.java ServletWriterFacade.java JspInterceptor.java SessionContextImpl.java HttpSessionFacade.java HttpServletRequestFacade.java WebXmlReader.java ServletInputStreamFacade.java LoadOnStartupInterceptor.java RequestDispatcherImpl.java ServletInfo.java CookieFacade.java ServletConfigImpl.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:17:18

  Modified:src/facade22/org/apache/tomcat/facade ServletHandler.java
Servlet22Interceptor.java
ServletOutputStreamFacade.java
ServletWriterFacade.java JspInterceptor.java
SessionContextImpl.java HttpSessionFacade.java
HttpServletRequestFacade.java WebXmlReader.java
ServletInputStreamFacade.java
LoadOnStartupInterceptor.java
RequestDispatcherImpl.java ServletInfo.java
CookieFacade.java ServletConfigImpl.java
  Log:
  First batch of imports cleanup in TC 3.3.2-dev
  
  Revision  ChangesPath
  1.21  +13 -7 
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletHandler.java
  
  Index: ServletHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletHandler.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ServletHandler.java   5 Jun 2002 03:52:50 -   1.20
  +++ ServletHandler.java   22 Sep 2003 09:17:17 -  1.21
  @@ -58,14 +58,20 @@
*/ 
   package org.apache.tomcat.facade;
   
  -import org.apache.tomcat.core.*;
  -import org.apache.tomcat.util.collections.*;
  +import javax.servlet.Servlet;
  +import javax.servlet.SingleThreadModel;
  +import javax.servlet.UnavailableException;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
  +import org.apache.tomcat.core.BaseInterceptor;
  +import org.apache.tomcat.core.Container;
  +import org.apache.tomcat.core.Context;
  +import org.apache.tomcat.core.Handler;
  +import org.apache.tomcat.core.Request;
  +import org.apache.tomcat.core.Response;
  +import org.apache.tomcat.core.TomcatException;
  +import org.apache.tomcat.util.collections.SimplePool;
   
   /**
* Handler for servlets. It'll implement all servlet-specific
  
  
  
  1.23  +18 -8 
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
  
  Index: Servlet22Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Servlet22Interceptor.java 15 Jan 2003 06:11:23 -  1.22
  +++ Servlet22Interceptor.java 22 Sep 2003 09:17:17 -  1.23
  @@ -60,16 +60,26 @@
   
   package org.apache.tomcat.facade;
   
  -import org.apache.tomcat.util.*;
  +import java.util.Enumeration;
  +import java.util.Vector;
  +
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import javax.servlet.http.HttpSession;
  +import javax.servlet.http.HttpSessionBindingEvent;
  +import javax.servlet.http.HttpSessionBindingListener;
  +
  +import org.apache.tomcat.core.BaseInterceptor;
  +import org.apache.tomcat.core.Container;
  +import org.apache.tomcat.core.Context;
  +import org.apache.tomcat.core.ContextManager;
  +import org.apache.tomcat.core.Handler;
  +import org.apache.tomcat.core.Request;
  +import org.apache.tomcat.core.Response;
  +import org.apache.tomcat.core.ServerSession;
  +import org.apache.tomcat.core.TomcatException;
   import org.apache.tomcat.util.collections.SimplePool;
   import org.apache.tomcat.util.compat.Jdk11Compat;
  -import org.apache.tomcat.core.*;
  -import java.io.*;
  -import java.net.*;
  -import java.security.*;
  -import java.util.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
   
   /**
*   Control class for facades - this is the only gate between servlets
  
  
  
  1.6   +5 -3  
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletOutputStreamFacade.java
  
  Index: ServletOutputStreamFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletOutputStreamFacade.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServletOutputStreamFacade.java3 Jun 2002 17:25:00 -   1.5
  +++ ServletOutputStreamFacade.java22 Sep 2003 09:17:17 -  1.6
  @@ -60,10 +60,12 @@
   
   package org.apache.tomcat.facade;
   
  -import org.apache.tomcat.core.*;
  -import org.apache.tomcat.util.*;
  -import java.io.*;
  +import java.io.IOException;
  +
   import javax.servlet.ServletOutputStream;
  +
  +import org.apache.tomcat.core.OutputBuffer;
  +import org.apache.tomcat.core.Response;
   
   /**
* 
  
  
  
  1.6   +5 -4  

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime JspLoader.java BodyContentImpl.java TagHandlerPoolImpl.java PageContextImpl.java JspRuntimeLibrary.java HttpJspBase.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:17:48

  Modified:src/share/org/apache/jasper JspC.java
CommandLineContext.java Constants.java Options.java
JspEngineContext.java JasperEngineContext.java
JspCompilationContext.java JasperOptionsImpl.java
   src/share/org/apache/jasper/servlet JasperLoader.java
JasperLoader12.java TomcatServletEngine.java
JspServlet.java ServletEngine.java
   src/share/org/apache/jasper/compiler
JspParseEventListener.java JasperMangler.java
GetPropertyGenerator.java BeanRepository.java
CommandLineCompiler.java CommentGenerator.java
TagBeginGenerator.java IncludeGenerator.java
ParseEventListener.java TagEndGenerator.java
JakartaCommentGenerator.java
TagLibraryInfoImpl.java JspCompiler.java
JspReader.java TagLibraries.java BeanGenerator.java
SetPropertyGenerator.java BaseJspListener.java
JspUtil.java DelegatingListener.java
   src/share/org/apache/jasper/runtime JspLoader.java
BodyContentImpl.java TagHandlerPoolImpl.java
PageContextImpl.java JspRuntimeLibrary.java
HttpJspBase.java
  Log:
  First batch of imports cleanup in TC 3.3.2-dev (jasper)
  
  Revision  ChangesPath
  1.26  +12 -11jakarta-tomcat/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JspC.java 13 Mar 2002 03:44:36 -  1.25
  +++ JspC.java 22 Sep 2003 09:17:46 -  1.26
  @@ -57,20 +57,21 @@
   
   package org.apache.jasper;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.CharArrayWriter;
  +import java.io.File;
  +import java.io.FileNotFoundException;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.PrintStream;
  +import java.io.Writer;
  +import java.util.Enumeration;
  +import java.util.Stack;
  +import java.util.Vector;
   
  -import org.apache.jasper.compiler.JspReader;
  -import org.apache.jasper.compiler.ServletWriter;
  -import org.apache.jasper.compiler.TagLibraries;
  -import org.apache.jasper.compiler.Compiler;
   import org.apache.jasper.compiler.CommandLineCompiler;
  -
  -//import org.apache.jasper.runtime.JspLoader;
   import org.apache.jasper.servlet.JasperLoader;
  -
  -import org.apache.tomcat.util.log.*;
  -import org.apache.tomcat.util.compat.*;
  +import org.apache.tomcat.util.compat.Jdk11Compat;
  +import org.apache.tomcat.util.log.Log;
   
   /**
* Shell for the jspc compiler.  Handles all options associated with the 
  
  
  
  1.9   +6 -7  
jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java
  
  Index: CommandLineContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CommandLineContext.java   27 Jun 2002 08:08:39 -  1.8
  +++ CommandLineContext.java   22 Sep 2003 09:17:46 -  1.9
  @@ -61,16 +61,15 @@
   
   package org.apache.jasper;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
   
  -import org.apache.jasper.compiler.JspReader;
  -import org.apache.jasper.compiler.ServletWriter;
  -import org.apache.jasper.compiler.TagLibraries;
   import org.apache.jasper.compiler.CommandLineCompiler;
   import org.apache.jasper.compiler.Compiler;
  -
  -//import org.apache.jasper.runtime.JspLoader;
  -// Use the jasper loader - the only function used is to add a jar
  +import org.apache.jasper.compiler.JspReader;
  +import org.apache.jasper.compiler.ServletWriter;
   import org.apache.jasper.servlet.JasperLoader;
   
   /**
  
  
  
  1.25  +0 -4  jakarta-tomcat/src/share/org/apache/jasper/Constants.java
  
  Index: Constants.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Constants.java21 Jun 2001 21:40:22 -  1.24
  +++ Constants.java22 Sep 2003 09:17:46 -  1.25
  @@ -57,10 +57,6 @@
   
   package org.apache.jasper;
   
  -import java.util.ResourceBundle;
  -import java.util.MissingResourceException;
  -import java.text.MessageFormat;
  -
   import org.apache.tomcat.util.log.Log;
   import 

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core OutputBuffer.java ServerSession.java Request.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:18:21

  Modified:src/share/org/apache/tomcat/core OutputBuffer.java
ServerSession.java Request.java
  Log:
  Third batch of imports cleanup in TC 3.3.2-dev (tc-core)
  
  Revision  ChangesPath
  1.21  +4 -6  
jakarta-tomcat/src/share/org/apache/tomcat/core/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/OutputBuffer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- OutputBuffer.java 17 Aug 2001 04:02:54 -  1.20
  +++ OutputBuffer.java 22 Sep 2003 09:18:21 -  1.21
  @@ -58,15 +58,13 @@
*/ 
   package org.apache.tomcat.core;
   
  -import java.io.Writer;
  -import java.io.OutputStream;
  -import java.io.OutputStreamWriter;
   import java.io.IOException;
  -import java.io.UnsupportedEncodingException;
  -
  +import java.io.Writer;
   import java.util.Hashtable;
   
  -import org.apache.tomcat.util.buf.*;
  +import org.apache.tomcat.util.buf.ByteChunk;
  +import org.apache.tomcat.util.buf.C2BConverter;
  +import org.apache.tomcat.util.buf.CharChunk;
   
   /**
* The buffer used by tomcat response. It allows writting chars and
  
  
  
  1.15  +0 -4  
jakarta-tomcat/src/share/org/apache/tomcat/core/ServerSession.java
  
  Index: ServerSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServerSession.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ServerSession.java10 Jan 2003 05:39:11 -  1.14
  +++ ServerSession.java22 Sep 2003 09:18:21 -  1.15
  @@ -58,12 +58,8 @@
*/ 
   package org.apache.tomcat.core;
   
  -import java.io.IOException;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
   import java.util.Enumeration;
   import java.util.Hashtable;
  -import java.util.Vector;
   
   import org.apache.tomcat.util.buf.MessageBytes;
   import org.apache.tomcat.util.buf.TimeStamp;
  
  
  
  1.117 +10 -14jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- Request.java  11 Jan 2003 03:00:06 -  1.116
  +++ Request.java  22 Sep 2003 09:18:21 -  1.117
  @@ -60,24 +60,20 @@
   
   package org.apache.tomcat.core;
   
  -import org.apache.tomcat.util.http.MimeHeaders;
  -import org.apache.tomcat.util.http.Parameters;
  -import org.apache.tomcat.util.http.ContentType;
  -import org.apache.tomcat.util.http.Cookies;
  -
  -import org.apache.tomcat.util.buf.*;
  -
  -
  -//import org.apache.tomcat.util.http.*;
  -
  -import java.security.Principal;
   import java.io.IOException;
  -import java.io.CharConversionException;
  +import java.security.Principal;
  +import java.text.DateFormat;
  +import java.text.SimpleDateFormat;
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Locale;
  -import java.text.DateFormat;
  -import java.text.SimpleDateFormat;
  +
  +import org.apache.tomcat.util.buf.DateTool;
  +import org.apache.tomcat.util.buf.MessageBytes;
  +import org.apache.tomcat.util.buf.UDecoder;
  +import org.apache.tomcat.util.http.Cookies;
  +import org.apache.tomcat.util.http.MimeHeaders;
  +import org.apache.tomcat.util.http.Parameters;
   
   /**
* This is a low-level, efficient representation of a server request. Most fields
  
  
  

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



cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers AccountingInterceptor.java LogEvents.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:18:39

  Modified:src/share/org/apache/tomcat/modules/config AutoDeploy.java
PathSetter.java AutoWebApp.java HookSetter.java
LogSetter.java ServerXmlReader.java
PolicyLoader.java ContextXmlReader.java
WorkDirSetup.java ProfileLoader.java
TrustedLoader.java LoaderInterceptor11.java
   src/share/org/apache/tomcat/modules/server Ajp13Packet.java
JNIRequestAdapter.java JNIConnectionHandler.java
Ajp12.java Ajp13Interceptor.java
JNIResponseAdapter.java Http10.java
Ajp12Interceptor.java Http10Interceptor.java
JNIEndpoint.java Ajp13.java PoolTcpConnector.java
   src/share/org/apache/tomcat/modules/mappers
ReloadInterceptor.java DecodeInterceptor.java
   src/share/org/apache/tomcat/modules/aaa
CredentialsInterceptor.java AccessInterceptor.java
SimpleRealm.java JDBCRealm.java
   src/share/org/apache/tomcat/modules/generators
Jdk12Interceptor.java InvokerInterceptor.java
StaticInterceptor.java ErrorHandler.java
   src/share/org/apache/tomcat/modules/session SessionId.java
SessionIdGenerator.java SessionExpirer.java
SimpleSessionStore.java
   src/share/org/apache/tomcat/modules/loggers
AccountingInterceptor.java LogEvents.java
  Log:
  Fourth batch of imports cleanup in TC 3.3.2-dev (tc-modules)
  
  Revision  ChangesPath
  1.7   +11 -7 
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java
  
  Index: AutoDeploy.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AutoDeploy.java   8 Sep 2001 20:14:11 -   1.6
  +++ AutoDeploy.java   22 Sep 2003 09:18:37 -  1.7
  @@ -59,14 +59,18 @@
   
   package org.apache.tomcat.modules.config;
   
  -import org.apache.tomcat.core.*;
  -import org.apache.tomcat.util.io.FileUtil;
  -import org.apache.tomcat.util.depend.*;
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Hashtable;
   
  -import org.apache.tomcat.util.xml.*;
  +import org.apache.tomcat.core.BaseInterceptor;
  +import org.apache.tomcat.core.Context;
  +import org.apache.tomcat.core.ContextManager;
  +import org.apache.tomcat.core.Request;
  +import org.apache.tomcat.core.TomcatException;
  +import org.apache.tomcat.util.depend.DependManager;
  +import org.apache.tomcat.util.depend.Dependency;
  +import org.apache.tomcat.util.io.FileUtil;
   
   /**
* Will manage a repository of .war files, expanding them automatically
  
  
  
  1.8   +9 -8  
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java
  
  Index: PathSetter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PathSetter.java   27 Jul 2001 01:07:34 -  1.7
  +++ PathSetter.java   22 Sep 2003 09:18:37 -  1.8
  @@ -59,16 +59,17 @@
   
   package org.apache.tomcat.modules.config;
   
  -import org.apache.tomcat.core.*;
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import java.security.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Enumeration;
   
  -import org.apache.tomcat.util.res.StringManager;
  -import org.apache.tomcat.util.log.Log;
  -import org.apache.tomcat.util.io.FileUtil;
  +import org.apache.tomcat.core.BaseInterceptor;
  +import org.apache.tomcat.core.Context;
  +import org.apache.tomcat.core.ContextManager;
  +import org.apache.tomcat.core.TomcatException;
   import org.apache.tomcat.util.IntrospectionUtils;
  +import org.apache.tomcat.util.io.FileUtil;
  +import org.apache.tomcat.util.res.StringManager;
   
   /**
* Set ( and guess ) the paths to absolute ( and canonical ) directories.
  
  
  
  1.13  +8 -6  
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java
  
  Index: AutoWebApp.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AutoWebApp.java   24 Feb 2002 03:46:06 -  1.12
  +++ AutoWebApp.java   22 Sep 2003 09:18:37 -  1.13
  @@ 

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EnableAdmin.java Main.java Tomcat.java Property.java EmbededTomcat.java Jspc.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:18:59

  Modified:src/share/org/apache/tomcat/startup EnableAdmin.java
Main.java Tomcat.java Property.java
EmbededTomcat.java Jspc.java
  Log:
  Fifth batch of imports cleanup in TC 3.3.2-dev (tc-startup)
  
  Revision  ChangesPath
  1.4   +4 -11 
jakarta-tomcat/src/share/org/apache/tomcat/startup/EnableAdmin.java
  
  Index: EnableAdmin.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EnableAdmin.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EnableAdmin.java  24 Jan 2002 11:16:35 -  1.3
  +++ EnableAdmin.java  22 Sep 2003 09:18:58 -  1.4
  @@ -1,17 +1,10 @@
   package org.apache.tomcat.startup;
   
  -import java.beans.*;
  -import java.io.*;
  -import java.io.IOException;
  -import java.lang.reflect.*;
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.PrintWriter;
   import java.util.Hashtable;
  -import java.util.*;
  -import java.net.*;
  -import org.apache.tomcat.util.res.StringManager;
  -import org.apache.tomcat.util.xml.*;
  -import org.apache.tomcat.util.log.*;
  -import org.xml.sax.*;
  -import org.apache.tomcat.util.collections.*;
  +
   import org.apache.tomcat.util.IntrospectionUtils;
   
   /**
  
  
  
  1.43  +6 -7  jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- Main.java 24 Jan 2002 11:16:03 -  1.42
  +++ Main.java 22 Sep 2003 09:18:58 -  1.43
  @@ -58,13 +58,12 @@
*/
   package org.apache.tomcat.startup;
   
  -import java.beans.*;
  -import java.io.*;
  -import java.io.IOException;
  -import java.lang.reflect.*;
  +import java.io.File;
  +import java.io.PrintStream;
  +import java.lang.reflect.InvocationTargetException;
  +import java.net.URL;
  +import java.util.Enumeration;
   import java.util.Hashtable;
  -import java.util.*;
  -import java.net.*;
   
   import org.apache.tomcat.util.IntrospectionUtils;
   import org.apache.tomcat.util.compat.Jdk11Compat;
  
  
  
  1.65  +3 -12 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
  
  Index: Tomcat.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Tomcat.java   21 Aug 2001 05:37:16 -  1.64
  +++ Tomcat.java   22 Sep 2003 09:18:58 -  1.65
  @@ -1,19 +1,10 @@
   package org.apache.tomcat.startup;
   
  -import java.beans.*;
  -import java.io.*;
  -import java.io.IOException;
  -import java.lang.reflect.*;
   import java.util.Hashtable;
  -import java.util.*;
  -import java.net.*;
  -import org.apache.tomcat.util.res.StringManager;
  -import org.apache.tomcat.modules.config.*;
  -import org.apache.tomcat.util.xml.*;
  -import org.apache.tomcat.core.*;
  -import org.xml.sax.*;
  -import org.apache.tomcat.util.collections.*;
  +
  +import org.apache.tomcat.core.TomcatException;
   import org.apache.tomcat.util.IntrospectionUtils;
  +import org.apache.tomcat.util.res.StringManager;
   
   /**
* Main entry point to several Tomcat functions. Uses EmbededTomcat to
  
  
  
  1.2   +0 -4  jakarta-tomcat/src/share/org/apache/tomcat/startup/Property.java
  
  Index: Property.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Property.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Property.java 21 Aug 2001 05:37:16 -  1.1
  +++ Property.java 22 Sep 2003 09:18:58 -  1.2
  @@ -1,9 +1,5 @@
   package org.apache.tomcat.startup;
   
  -import java.net.*;
  -import java.io.*;
  -
  -import java.util.*;
   
   /**
* 
  
  
  
  1.66  +16 -8 
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- EmbededTomcat.java6 May 2002 21:38:22 -   1.65
  +++ EmbededTomcat.java22 Sep 2003 09:18:58 -  1.66
  @@ -1,15 +1,23 @@
   package org.apache.tomcat.startup;
   
  -import java.net.*;
  -import java.io.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.PrintStream;
  +import java.lang.reflect.InvocationTargetException;
  +import 

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/qlog FastDateFormat.java

2003-09-22 Thread hgomez
hgomez  2003/09/22 02:19:27

  Modified:src/share/org/apache/tomcat/util/test HttpRequest.java
HttpResponse.java Parameter.java Properties.java
TestDefaults.java Cookie.java GTest.java
Header.java Attributes.java Matcher.java
HttpClient.java Body.java
   src/share/org/apache/tomcat/util/test/matchers
ResponseMatchFile.java HeaderMatch.java
GoldenMatch.java SessionMatch.java
ResponseMatch.java HttpStatusMatch.java
   src/share/org/apache/tomcat/util/depend
DependClassLoader.java DependManager.java
DependClassLoader12.java Dependency.java
   src/share/org/apache/tomcat/util/xml SaxContext.java
PathMatch.java XmlMatch.java XmlAction.java
XmlMapper.java
   src/share/org/apache/tomcat/util/io
RecycleBufferedInputStream.java
   src/share/org/apache/tomcat/util/compat
SimpleClassLoader.java
   src/share/org/apache/tomcat/util/compat/jar Handler.java
   src/share/org/apache/tomcat/util PrefixMapper.java
ObjectSerializer.java
   src/share/org/apache/tomcat/util/hooks Hooks.java
   src/share/org/apache/tomcat/util/qlog FastDateFormat.java
  Log:
  Sixth and latst batch of imports cleanup in TC 3.3.2-dev (tc-util)
  
  Revision  ChangesPath
  1.7   +4 -4  
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpRequest.java
  
  Index: HttpRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpRequest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpRequest.java  20 Sep 2002 23:58:05 -  1.6
  +++ HttpRequest.java  22 Sep 2003 09:19:25 -  1.7
  @@ -58,10 +58,10 @@
*/ 
   package org.apache.tomcat.util.test;
   
  -import java.net.*;
  -import java.io.*;
  -import java.util.*;
  -import java.net.*;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.StringTokenizer;
  +import java.util.Vector;
   
   import org.apache.tomcat.util.buf.Base64;
   
  
  
  
  1.2   +1 -4  
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpResponse.java
  
  Index: HttpResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpResponse.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HttpResponse.java 9 Feb 2001 03:48:15 -   1.1
  +++ HttpResponse.java 22 Sep 2003 09:19:25 -  1.2
  @@ -58,10 +58,7 @@
*/ 
   package org.apache.tomcat.util.test;
   
  -import java.net.*;
  -import java.io.*;
  -import java.util.*;
  -import java.net.*;
  +import java.util.Hashtable;
   
   
   /**
  
  
  
  1.4   +0 -4  
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Parameter.java
  
  Index: Parameter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Parameter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Parameter.java20 Sep 2002 23:58:05 -  1.3
  +++ Parameter.java22 Sep 2003 09:19:25 -  1.4
  @@ -58,10 +58,6 @@
*/ 
   package org.apache.tomcat.util.test;
   
  -import java.net.*;
  -import java.io.*;
  -import java.util.*;
  -import java.net.*;
   
   
   /**
  
  
  
  1.2   +1 -4  
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Properties.java
  
  Index: Properties.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Properties.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Properties.java   9 Feb 2001 03:48:15 -   1.1
  +++ Properties.java   22 Sep 2003 09:19:25 -  1.2
  @@ -58,10 +58,7 @@
*/ 
   package org.apache.tomcat.util.test;
   
  -import java.net.*;
  -import java.io.*;
  -import java.util.*;
  -import java.net.*;
  +import java.util.Hashtable;
   
   
   /**
  
  
  
  1.5   +1 -5  
jakarta-tomcat/src/share/org/apache/tomcat/util/test/TestDefaults.java
  
  Index: TestDefaults.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/TestDefaults.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestDefaults.java 22 Sep 2001 02:45:45 -  1.4
  +++ TestDefaults.java 22 Sep 2003 09:19:25 -  1.5
  @@ -58,11 +58,7 

TC 3.3.2-dev - clean import finished

2003-09-22 Thread Henri Gomez
Imports cleaned also for TC 3.3.2-dev.



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


Tomcat 5.0.12

2003-09-22 Thread Oxley, David
I did some testing of 5.0.12 over the weekend to make sure our webapp works
with it. I haven't found any problems yet, but I do have a couple of
comments (applicable to Win32):

1. Am I right in assuming that JK2 is the default connector for TC5. If so,
the last release was November last year! I think we need another release. I
compiled from source for Windows (which didn't compile). in_addr_t was not
defined. I had to add the following code to jk_channel_socket.c:
#if defined(WIN32)
typedef u_long in_addr_t;
#endif

2. procrun is currently very unfriendly for the end-user. I remember the
days of jk_nt_service and the wrapper.properties. This was very flexible and
easy to use. I needed to add several services for Tomcat using the same
TOMCAT_HOME, but with different TOMCAT_BASE's. I did finally get it working.
This is the command I ended up using (Urgh):

C:\Tomcat\Home\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat
--Description Apache Tomcat 5.1.12 Server -
http://jakarta.apache.org/tomcat/;  --Install
C:\Tomcat\Home\bin\tomcat.exe --ImagePath
C:\Tomcat\Home\bin\bootstrap.jar --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java auto --JavaOptions
-server#-Xms512m#-Xmx512m#-Xrs#-Djava.endorsed.dirs=C:\Tomcat\Home\bin;C:\T
omcat\Home\common\endorsed#-Dcatalina.base=C:\Tomcat\BaseServer1#-Dcatali
na.home=C:\Tomcat\Home#-Djava.io.tmpdir=C:\Tomcat\BaseServer1\temp
--Startup manual --StdOutputFile C:\Tomcat\BaseServer1\logs\jvm.stdout
--StdErrorFile C:\Tomcat\BaseServer1\logs\jvm.stderr --Arguments -config
C:\Tomcat\BaseServer1\conf\server.xml

Dave.



This e-mail has been scanned for all viruses by Star Internet. The
service is powered by MessageLabs. For more information on a proactive
anti-virus service working around the clock, around the globe, visit:
http://www.star.net.uk


Re: Tomcat 5.0.12

2003-09-22 Thread Remy Maucherat
Oxley, David wrote:

I did some testing of 5.0.12 over the weekend to make sure our webapp works
with it. I haven't found any problems yet, but I do have a couple of
comments (applicable to Win32):
1. Am I right in assuming that JK2 is the default connector for TC5. If so,
the last release was November last year! I think we need another release. I
compiled from source for Windows (which didn't compile). in_addr_t was not
defined. I had to add the following code to jk_channel_socket.c:
#if defined(WIN32)
typedef u_long in_addr_t;
#endif
No, you're cofusing mod_jk2 and JK 2 on the Tomcat side. JK 2 can work 
with either mod_jk or mod_jk2.

2. procrun is currently very unfriendly for the end-user. I remember the
days of jk_nt_service and the wrapper.properties. This was very flexible and
easy to use. I needed to add several services for Tomcat using the same
TOMCAT_HOME, but with different TOMCAT_BASE's. I did finally get it working.
This is the command I ended up using (Urgh):
Thanks, I usually appreciate unsubstatiated feedback, which proves you 
didn't look at the shortcuts or anything. Since you have decided you 
didn't like it and it wouldn't work for you, feel free to not use it 
(for your defense, the setup docs isn't there yet, but gvien point 1, 
I'm not sure you would have read it). The startup scripts are there as 
usual.

Remy



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


DO NOT REPLY [Bug 23312] - Bug in setclasspath.sh startup script

2003-09-22 Thread 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=23312.
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=23312

Bug in setclasspath.sh startup script





--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 11:01 ---
The 'if ! $os400; then' breaks on other OS's (solaris?) which was why this was
made the current way. 

Any crossplatform *nix gurus know the correct syntax to keep sh on all os's happy?

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



DO NOT REPLY [Bug 23325] New: - displaying data source for a context resource results in exception

2003-09-22 Thread 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=23325.
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=23325

displaying data source for a context resource results in exception 

   Summary: displaying data source for a context resource results in
exception
   Product: Tomcat 4
   Version: 4.1.27
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Webapps:Administration
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Hi,

in the tomcat administration frontend i get a null pointer exception when i
want to view the datasources of app context. To configure the datasource i am
using the context.xml file in the META-INF directory of my web application. 
THe context.xml looks like : 

Context path=/auftragserfassung docBase=auftragserfassung debug=3
 reloadable=true crossContext=true
  Logger className=org.apache.catalina.logger.FileLogger
  prefix=localhost_inetorder_log. suffix=.txt
  timestamp=false/

  Resource name=jdbc/mysql_inetorder_pk auth=Container
type=javax.sql.DataSource/

  ResourceParams name=jdbc/mysql_inetorder_pk
parameter
  nameusername/name
  valuedmp/value
/parameter
parameter
  namepassword/name
  valuedmp/value
/parameter
parameter
  namedriverClassName/name
  valuecom.mysql.jdbc.Driver/value
/parameter
parameter
  nameurl/name
  valuejdbc:mysql://localhost/inetorder_pk/value
/parameter
  /ResourceParams
  
/Context

the driver for the mysql database is in the webapps/WEB-INF/lib directory and
the $TOMCAT_HOEM/common/lib directory, so should always be found.

The exception that occurs in the manager is the following one : 

org.apache.jasper.JasperException: Exception retrieving attribute 'driverClassName'
at 
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:254)
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:295)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:241)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
at
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:684)
at
org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:432)
at
org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:356)
at 
org.apache.struts.action.RequestProcessor.doForward(RequestProcessor.java:1069)
at
org.apache.struts.action.RequestProcessor.processForwardConfig(RequestProcessor.java:455)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:279)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1482)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:507)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:740)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
at
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:684)
at
org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:432)
at
org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:356)
at 
org.apache.struts.action.RequestProcessor.doForward(RequestProcessor.java:1069)
at
org.apache.struts.action.RequestProcessor.processForwardConfig(RequestProcessor.java:455)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:279)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1482)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:507)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:740)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:247)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:193)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:256)
at
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643)
at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480)
at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
at

cvs commit: jakarta-tomcat-site/xdocs index.xml

2003-09-22 Thread remm
remm2003/09/22 04:05:31

  Modified:docs index.html
   xdocsindex.xml
  Log:
  - Tomcat 5.0.12 Beta.
  
  Revision  ChangesPath
  1.50  +1 -1  jakarta-tomcat-site/docs/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- index.html15 Sep 2003 22:12:07 -  1.49
  +++ index.html22 Sep 2003 11:05:31 -  1.50
  @@ -175,7 +175,7 @@
   /td
   td bgcolor=#a0ddf0 colspan= rowspan= 
valign=top align=left
   font color=#00 size=-1 face=arial,helvetica,sanserif
  -5.0.9 Beta
  +5.0.12 Beta
   /font
   /td
   /tr
  
  
  
  1.41  +1 -1  jakarta-tomcat-site/xdocs/index.xml
  
  Index: index.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-site/xdocs/index.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- index.xml 15 Sep 2003 22:12:08 -  1.40
  +++ index.xml 22 Sep 2003 11:05:31 -  1.41
  @@ -40,7 +40,7 @@
   
   tr
 td2.4/2.0/td
  -  td5.0.9 Beta/td
  +  td5.0.12 Beta/td
   /tr
   
   tr
  
  
  

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



DO NOT REPLY [Bug 23311] - Connections to tomcat left in CLOSE_WAIT

2003-09-22 Thread 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=23311.
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=23311

Connections to tomcat left in CLOSE_WAIT





--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 11:10 ---
Ok, I'll make a thread-dump and watch the logs next time it hangs.

Actually, I've been running the new ThreadPool code for a couple of days now
(fetched and compiled sources for 'org\apache\tomcat\util\threads' package from 
the CVS on the 15.09.03).

I'll post wether or not tomcat runs stably for ~3 weeks.

Thanks for your info.

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



DO NOT REPLY [Bug 23325] - displaying data source for a context resource results in exception

2003-09-22 Thread 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=23325.
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=23325

displaying data source for a context resource results in exception

[EMAIL PROTECTED] changed:

   What|Removed |Added

Summary|displaying data source for a|displaying data source for a
   |context resource results in |context resource results in
   |exception   |exception



--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 11:46 ---
Hi again,

one thing i forgot to metion : 
when i put the context configuration from the context.xml file to the 
$TOMCAT_HOME/conf/server.xml file and remove the context.xml file everything
works just fine. The error only occurs when i use the context.xml file in the
META-INF directory.

Thanks,

Andreas

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



RE: Tomcat 5.0.12

2003-09-22 Thread Oxley, David
Wo, hang on there Remy. I'm sorry, I really didn't mean to cause offence.

Point 1, Ok, fair enough, I'm a twat. But I did ask the question! When is
mod_jk2 going to replace mod_jk anyway?

On point 2. I downloaded the zip. I have just downloaded the exe to see what
shortcuts you are talking about and Ok, a nice screen to configure the
service. I did read the documentation. I also had to look in a readme file
in cvs Jakarta-commons/daemon to find out how procrun is run (which doesn't
even mention the //ES// parameter), but if you're telling me that adding a
service in the set up I described is user friendly then I have to disagree.
That's not to say, I don't think it's heading in the right direction,
because I think it is. But it took 5 minutes to get TC5 up and running with
jk_nt_service and about 2 hours to sort it out with procrun.

And I think maybe I worded it a bit harshly. We will be moving onto TC5 as
soon as its final (which we didn't do for TC4.0!).

I was going to look at writing some code tonight so that the Apache HTTP
Service Monitor picks up and controls TC5 services and also look at how
procrun (because it is mainly there) can be improved.

I know there are a lot of stupid questions asked on this list, but I did do
my research and I think you stamped on me a bit hard IMHO! Maybe it's
because it's a Monday morning!

Dave.


 -Original Message-
 From: Remy Maucherat [mailto:[EMAIL PROTECTED]
 Sent: Monday, September 22, 2003 11:42 AM
 To: Tomcat Developers List
 Subject: Re: Tomcat 5.0.12
 
 Oxley, David wrote:
 
  I did some testing of 5.0.12 over the weekend to make sure our webapp
 works
  with it. I haven't found any problems yet, but I do have a couple of
  comments (applicable to Win32):
 
  1. Am I right in assuming that JK2 is the default connector for TC5. If
 so,
  the last release was November last year! I think we need another
 release. I
  compiled from source for Windows (which didn't compile). in_addr_t was
 not
  defined. I had to add the following code to jk_channel_socket.c:
  #if defined(WIN32)
  typedef u_long in_addr_t;
  #endif
 
 No, you're cofusing mod_jk2 and JK 2 on the Tomcat side. JK 2 can work
 with either mod_jk or mod_jk2.
 
  2. procrun is currently very unfriendly for the end-user. I remember the
  days of jk_nt_service and the wrapper.properties. This was very flexible
 and
  easy to use. I needed to add several services for Tomcat using the same
  TOMCAT_HOME, but with different TOMCAT_BASE's. I did finally get it
 working.
  This is the command I ended up using (Urgh):
 
 Thanks, I usually appreciate unsubstatiated feedback, which proves you
 didn't look at the shortcuts or anything. Since you have decided you
 didn't like it and it wouldn't work for you, feel free to not use it
 (for your defense, the setup docs isn't there yet, but gvien point 1,
 I'm not sure you would have read it). The startup scripts are there as
 usual.
 
 Remy
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
 This e-mail has been scanned for all viruses by Star Internet. The
 service is powered by MessageLabs. For more information on a proactive
 anti-virus service working around the clock, around the globe, visit:
 http://www.star.net.uk
 



This e-mail has been scanned for all viruses by Star Internet. The
service is powered by MessageLabs. For more information on a proactive
anti-virus service working around the clock, around the globe, visit:
http://www.star.net.uk


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java

2003-09-22 Thread Remy Maucherat
[EMAIL PROTECTED] wrote:

amyroh  2003/09/21 16:11:17

  Modified:catalina/src/share/org/apache/catalina/session
ManagerBase.java
  Log:
  Fix to properly create Manager MBean at webapp restart - bugtraq 4924607.
-1 for the last two patches (they don't work). I look at the issues and 
will revert them.

Ex:
22 sept. 2003 13:55:50 org.apache.catalina.core.StandardHostDeployer remove
INFO: Retrait de l'application web pour le chemin de contexte /tomcat-docs
22 sept. 2003 13:55:50 org.apache.commons.modeler.Registry 
unregisterComponent
GRAVE: Error unregistering mbean
javax.management.RuntimeOperationsException: Object name cannot be null
at 
com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.isRegistered(DefaultMBeanServerInterceptor.java:552)
at 
com.sun.jmx.mbeanserver.JmxMBeanServer.isRegistered(JmxMBeanServer.java:626)
at 
org.apache.commons.modeler.Registry.unregisterComponent(Registry.java:642)
at 
org.apache.catalina.loader.WebappLoader.destroy(WebappLoader.java:675)
at 
org.apache.catalina.loader.WebappLoader.stop(WebappLoader.java:780)
at 
org.apache.catalina.core.StandardContext.stop(StandardContext.java:4306)
at 
org.apache.catalina.core.ContainerBase.removeChild(ContainerBase.java:995)
at 
org.apache.catalina.core.StandardHostDeployer.remove(StandardHostDeployer.java:598)
at 
org.apache.catalina.core.StandardHost.remove(StandardHost.java:915)
at 
org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:516)
at 
org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:468)
at 
org.apache.catalina.startup.HostConfig.check(HostConfig.java:1067)
at 
org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:371)
at 
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:166)
at 
org.apache.catalina.core.StandardHost.backgroundProcess(StandardHost.java:803)
at 
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1658)
at 
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1667)
at 
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1647)
at java.lang.Thread.run(Thread.java:534)
Caused by: java.lang.IllegalArgumentException: Object name cannot be null
... 19 more
22 sept. 2003 13:55:50 org.apache.catalina.core.StandardHostDeployer install
INFO: Processing Context configuration file URL 
file:L:\home\tomcat-5\jakarta-tomcat-5\build\conf\Catalina\localhost\tomcat-docs.xml
22 sept. 2003 13:55:50 org.apache.catalina.core.StandardHostDeployer remove
INFO: Retrait de l'application web pour le chemin de contexte /tomcat-docs
22 sept. 2003 13:55:50 org.apache.commons.modeler.Registry 
unregisterComponent
GRAVE: Error unregistering mbean
javax.management.RuntimeOperationsException: Object name cannot be null
at 
com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.isRegistered(DefaultMBeanServerInterceptor.java:552)
at 
com.sun.jmx.mbeanserver.JmxMBeanServer.isRegistered(JmxMBeanServer.java:626)
at 
org.apache.commons.modeler.Registry.unregisterComponent(Registry.java:642)
at 
org.apache.catalina.loader.WebappLoader.destroy(WebappLoader.java:675)
at 
org.apache.catalina.loader.WebappLoader.stop(WebappLoader.java:780)
at 
org.apache.catalina.core.StandardContext.stop(StandardContext.java:4306)
at 
org.apache.catalina.core.ContainerBase.removeChild(ContainerBase.java:995)
at 
org.apache.catalina.core.StandardHostDeployer.remove(StandardHostDeployer.java:598)
at 
org.apache.catalina.core.StandardHost.remove(StandardHost.java:915)
at 
org.apache.catalina.startup.HostConfig.checkContextLastModified(HostConfig.java:815)
at 
org.apache.catalina.startup.HostConfig.check(HostConfig.java:1069)
at 
org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:371)
at 
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:166)
at 
org.apache.catalina.core.StandardHost.backgroundProcess(StandardHost.java:803)
at 
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1658)
at 
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1667)
at 
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1647)
at java.lang.Thread.run(Thread.java:534)
Caused by: java.lang.IllegalArgumentException: Object name cannot be null
... 18 more

Remy



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


DO NOT REPLY [Bug 23312] - Bug in setclasspath.sh startup script

2003-09-22 Thread 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=23312.
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=23312

Bug in setclasspath.sh startup script





--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 12:11 ---
Maybe test explicitly for false?

if [ $os400 = false ]; then

This depends on having the 'test' utility (which '[' is an alias for), however, but I 
guess that's 
common enough.

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



Re: Tomcat 5.0.12

2003-09-22 Thread Remy Maucherat
Oxley, David wrote:

Wo, hang on there Remy. I'm sorry, I really didn't mean to cause offence.

Point 1, Ok, fair enough, I'm a twat. But I did ask the question! When is
mod_jk2 going to replace mod_jk anyway?
I don't know. It is not critical IMO, as mod_jk works fine.

On point 2. I downloaded the zip. I have just downloaded the exe to see what
shortcuts you are talking about and Ok, a nice screen to configure the
service. I did read the documentation. I also had to look in a readme file
in cvs Jakarta-commons/daemon to find out how procrun is run (which doesn't
even mention the //ES// parameter), but if you're telling me that adding a
service in the set up I described is user friendly then I have to disagree.
That's not to say, I don't think it's heading in the right direction,
because I think it is. But it took 5 minutes to get TC5 up and running with
jk_nt_service and about 2 hours to sort it out with procrun.
If you want the do-it-yourself experience, then use the .zip. Setting 
up Tomcat with the service is meant to be done through the installer, so 
the user experience is decent.

Besides, the wrapper tool is external to Tomcat. If you want to use the 
old JavaService or jk_nt_service, then you can.

And I think maybe I worded it a bit harshly. We will be moving onto TC5 as
soon as its final (which we didn't do for TC4.0!).
I was going to look at writing some code tonight so that the Apache HTTP
Service Monitor picks up and controls TC5 services and also look at how
procrun (because it is mainly there) can be improved.
Personally, I like the current syntax. Unlike you, I think it is 
complete, and rather intuitive. -1 to change it.

Remy



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


cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappLoader.java

2003-09-22 Thread remm
remm2003/09/22 05:31:41

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Fix destroy.
  
  Revision  ChangesPath
  1.23  +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WebappLoader.java 21 Sep 2003 23:11:01 -  1.22
  +++ WebappLoader.java 22 Sep 2003 12:31:41 -  1.23
  @@ -670,9 +670,9 @@
   
   public void destroy() {
   if( controller==oname ) {
  -oname = null;
   // Self-registration, undo it
   Registry.getRegistry().unregisterComponent(oname);
  +oname = null;
   }
   initialized = false;
   
  
  
  

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



Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java

2003-09-22 Thread Remy Maucherat
Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:

amyroh  2003/09/21 16:11:17

  Modified:catalina/src/share/org/apache/catalina/session
ManagerBase.java
  Log:
  Fix to properly create Manager MBean at webapp restart - bugtraq 
4924607.


-1 for the last two patches (they don't work). I look at the issues and 
will revert them.
Hmmm, forget it, I should have looked at the code before sending the 
email :-P

   oname = null;
   // Self-registration, undo it
   Registry.getRegistry().unregisterComponent(oname);
I guess I can see where the NPE is coming from :-D

Remy



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


cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager LocalStrings.properties ManagerServlet.java

2003-09-22 Thread remm
remm2003/09/22 05:34:45

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
LocalStrings.properties ManagerServlet.java
  Log:
  - Add save command (saves either the full config, or a context config).
  
  Revision  ChangesPath
  1.4   +3 -1  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalStrings.properties   28 Jul 2003 14:57:47 -  1.3
  +++ LocalStrings.properties   22 Sep 2003 12:34:45 -  1.4
  @@ -17,7 +17,7 @@
   htmlManagerServlet.deployPath=Context Path (optional):
   htmlManagerServlet.deployServer=Deploy directory or WAR file located on server
   htmlManagerServlet.deployTitle=Deploy
  -htmlManagerServlet.deployUpload=Upload a WAR file to deploy
  +htmlManagerServlet.deployUpload=WAR file to deploy
   htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
   htmlManagerServlet.deployUploadFile=Select WAR file to upload
   htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \{0}\ must be a .war
  @@ -63,6 +63,8 @@
   managerServlet.resourcesType=OK - Listed global resources of type {0}
   managerServlet.rolesList=OK - Listed security roles
   managerServlet.saveFail=FAIL - Configuration save failed: {0}
  +managerServlet.saved=OK - Server configuration saved
  +managerServlet.savedContext=OK - Context {0} configuration saved
   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}
  
  
  
  1.11  +62 -8 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ManagerServlet.java   19 Sep 2003 14:17:24 -  1.10
  +++ ManagerServlet.java   22 Sep 2003 12:34:45 -  1.11
  @@ -382,6 +382,8 @@
   resources(writer, type);
   } else if (command.equals(/roles)) {
   roles(writer);
  +} else if (command.equals(/save)) {
  +save(writer, path);
   } else if (command.equals(/serverinfo)) {
   serverinfo(writer);
   } else if (command.equals(/sessions)) {
  @@ -536,6 +538,55 @@
   
   
   /**
  + * Store server configuration.
  + * 
  + * @param path Optional context path to save
  + */
  +protected synchronized void save(PrintWriter writer, String path) {
  +
  +Server server = ServerFactory.getServer();
  +
  +if (!(server instanceof StandardServer)) {
  +writer.println(sm.getString(managerServlet.saveFail, server));
  +return;
  +}
  +
  +if ((path == null) || path.length() == 0 || !path.startsWith(/)) {
  +try {
  +((StandardServer) server).storeConfig();
  +writer.println(sm.getString(managerServlet.saved));
  +} catch (Exception e) {
  +log(managerServlet.storeConfig, e);
  +writer.println(sm.getString(managerServlet.exception,
  +e.toString()));
  +return;
  +}
  +} else {
  +String contextPath = path;
  +if (path.equals(/)) {
  +contextPath = ;
  +}
  +Context context =  deployer.findDeployedApp(contextPath);
  +if (context == null) {
  +writer.println(sm.getString(managerServlet.noContext, path));
  +return;
  +}
  +try {
  +((StandardServer) server).storeContext(context);
  +writer.println(sm.getString(managerServlet.savedContext, 
  +   path));
  +} catch (Exception e) {
  +log(managerServlet.save[ + path + ], e);
  +writer.println(sm.getString(managerServlet.exception,
  +e.toString()));
  +return;
  +}
  +}
  +
  +}
  +
  +
  +/**
* Deploy a web application archive (included in the current request)
* at the specified context path.
*
  @@ -957,15 +1008,17 @@
   try {
  

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF web.xml

2003-09-22 Thread remm
remm2003/09/22 05:35:21

  Modified:webapps/manager/WEB-INF web.xml
  Log:
  - Add save command (saves either the full config, or a context config).
  
  Revision  ChangesPath
  1.10  +5 -0  jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- web.xml   22 Jun 2003 17:32:44 -  1.9
  +++ web.xml   22 Sep 2003 12:35:21 -  1.10
  @@ -87,6 +87,10 @@
 /servlet-mapping
 servlet-mapping
   servlet-nameManager/servlet-name
  +  url-pattern/save/url-pattern
  +  /servlet-mapping
  +  servlet-mapping
  +servlet-nameManager/servlet-name
 url-pattern/serverinfo/url-pattern
 /servlet-mapping
 servlet-mapping
  @@ -139,6 +143,7 @@
 url-pattern/deploy/url-pattern
 url-pattern/undeploy/url-pattern
 url-pattern/reload/url-pattern
  +  url-pattern/save/url-pattern
 url-pattern/serverinfo/url-pattern
 url-pattern/status/*/url-pattern
 url-pattern/roles/url-pattern
  
  
  

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



RE: Tomcat 5.0.12

2003-09-22 Thread Oxley, David
Title: RE: Tomcat 5.0.12





Remy,


The service installed by the installer doesn't start. I think it is because it is missing the java.endorsed.dirs, catalina.base, catalina.home and the java.io.tmpdir parameters. See the attached diff. I can't build the installer so haven't tested this.

Ok. Rather than changing the syntax of adding a service maybe the installer could also add a template to the registry or a file (Like the wsdd of a web service) and tomcatw.exe could bring up a GUI to add a new service from the template.

To add a second Apache service is like this:
apache -k install -n Apache2_2 -f %APACHE2_HOME%\conf\httpd2.conf


To add a second Tomcat service is like this:
tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat --Description Apache Tomcat 5.1.12 Server - http://jakarta.apache.org/tomcat/ --Install C:\Tomcat\Home\bin\tomcat.exe --ImagePath C:\Tomcat\Home\bin\bootstrap.jar --StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass org.apache.catalina.startup.Bootstrap;main;stop --Java auto --JavaOptions -server#-Xms512m#-Xmx512m#-Xrs#-Djava.endorsed.dirs=C:\Tomcat\Home\bin;C:\T

omcat\Home\common\endorsed#-Dcatalina.base=C:\Tomcat\BaseServer1#-Dcatali
na.home=C:\Tomcat\Home#-Djava.io.tmpdir=C:\Tomcat\BaseServer1\temp
--Startup manual --StdOutputFile C:\Tomcat\BaseServer1\logs\jvm.stdout
--StdErrorFile C:\Tomcat\BaseServer1\logs\jvm.stderr --Arguments -config C:\Tomcat\BaseServer1\conf\server.xml


Dave.


 -Original Message-
 From: Remy Maucherat [mailto:[EMAIL PROTECTED]]
 Sent: Monday, September 22, 2003 1:21 PM
 To: Tomcat Developers List
 Subject: Re: Tomcat 5.0.12
 
 Oxley, David wrote:
 
  Wo, hang on there Remy. I'm sorry, I really didn't mean to cause
 offence.
 
  Point 1, Ok, fair enough, I'm a twat. But I did ask the question! When
 is
  mod_jk2 going to replace mod_jk anyway?
 
 I don't know. It is not critical IMO, as mod_jk works fine.
 
  On point 2. I downloaded the zip. I have just downloaded the exe to see
 what
  shortcuts you are talking about and Ok, a nice screen to configure the
  service. I did read the documentation. I also had to look in a readme
 file
  in cvs Jakarta-commons/daemon to find out how procrun is run (which
 doesn't
  even mention the //ES// parameter), but if you're telling me that adding
 a
  service in the set up I described is user friendly then I have to
 disagree.
  That's not to say, I don't think it's heading in the right direction,
  because I think it is. But it took 5 minutes to get TC5 up and running
 with
  jk_nt_service and about 2 hours to sort it out with procrun.
 
 If you want the do-it-yourself experience, then use the .zip. Setting
 up Tomcat with the service is meant to be done through the installer, so
 the user experience is decent.
 
 Besides, the wrapper tool is external to Tomcat. If you want to use the
 old JavaService or jk_nt_service, then you can.
 
  And I think maybe I worded it a bit harshly. We will be moving onto TC5
 as
  soon as its final (which we didn't do for TC4.0!).
 
  I was going to look at writing some code tonight so that the Apache HTTP
  Service Monitor picks up and controls TC5 services and also look at how
  procrun (because it is mainly there) can be improved.
 
 Personally, I like the current syntax. Unlike you, I think it is
 complete, and rather intuitive. -1 to change it.
 
 Remy
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
 This e-mail has been scanned for all viruses by Star Internet. The
 service is powered by MessageLabs. For more information on a proactive
 anti-virus service working around the clock, around the globe, visit:
 http://www.star.net.uk
 









This e-mail has been scanned for all viruses by Star Internet. The
service is powered by MessageLabs. For more information on a proactive
anti-virus service working around the clock, around the globe, visit:

http://www.star.net.uk


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

RE: Tomcat 5.0.12

2003-09-22 Thread Oxley, David
Sorry. The Patch didn't attach. Here it is:
Index: tomcat.nsi
===
RCS file: /home/cvspublic/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.34
diff -u -r1.34 tomcat.nsi
--- tomcat.nsi  16 Jun 2003 21:15:40 -  1.34
+++ tomcat.nsi  22 Sep 2003 13:15:33 -
@@ -130,7 +130,7 @@
 
   Call configure
 
-  ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache
Tomcat --Description Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/;  --Install $INSTDIR\bin\tomcat.exe
--ImagePath $INSTDIR\bin\bootstrap.jar --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions
-Xrs --Startup manual'
+  ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache
Tomcat --Description Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/;  --Install $INSTDIR\bin\tomcat.exe
--ImagePath $INSTDIR\bin\bootstrap.jar --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions
-Xrs#-Djava.endorsed.dirs=$INSTDIR\bin;$INSTDIR\common\endorsed#-Dcatalina
.base=$INSTDIR#-Dcatalina.home=$INSTDIR#-Djava.io.tmpdir=$INSTDIR\temp
--Startup manual'
 
 SectionEnd


-Original Message-
From: Oxley, David [mailto:[EMAIL PROTECTED] 
Sent: Monday, September 22, 2003 2:04 PM
To: 'Tomcat Developers List'
Subject: RE: Tomcat 5.0.12

Remy, 
The service installed by the installer doesn't start. I think it is because
it is missing the java.endorsed.dirs, catalina.base, catalina.home and the
java.io.tmpdir parameters. See the attached diff. I can't build the
installer so haven't tested this.
Ok. Rather than changing the syntax of adding a service maybe the installer
could also add a template to the registry or a file (Like the wsdd of a web
service) and tomcatw.exe could bring up a GUI to add a new service from the
template.
To add a second Apache service is like this: 
apache -k install -n Apache2_2 -f %APACHE2_HOME%\conf\httpd2.conf 
To add a second Tomcat service is like this: 
tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat --Description
Apache Tomcat 5.1.12 Server - http://jakarta.apache.org/tomcat/  --Install
C:\Tomcat\Home\bin\tomcat.exe --ImagePath
C:\Tomcat\Home\bin\bootstrap.jar --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java auto --JavaOptions
-server#-Xms512m#-Xmx512m#-Xrs#-Djava.endorsed.dirs=C:\Tomcat\Home\bin;C:\T
omcat\Home\common\endorsed#-Dcatalina.base=C:\Tomcat\BaseServer1#-Dcatali

na.home=C:\Tomcat\Home#-Djava.io.tmpdir=C:\Tomcat\BaseServer1\temp 
--Startup manual --StdOutputFile C:\Tomcat\BaseServer1\logs\jvm.stdout 
--StdErrorFile C:\Tomcat\BaseServer1\logs\jvm.stderr --Arguments -config
C:\Tomcat\BaseServer1\conf\server.xml 
Dave. 
 -Original Message- 
 From: Remy Maucherat [mailto:[EMAIL PROTECTED] 
 Sent: Monday, September 22, 2003 1:21 PM 
 To: Tomcat Developers List 
 Subject: Re: Tomcat 5.0.12 
 
 Oxley, David wrote: 
 
  Wo, hang on there Remy. I'm sorry, I really didn't mean to cause 
 offence. 
  
  Point 1, Ok, fair enough, I'm a twat. But I did ask the question! When 
 is 
  mod_jk2 going to replace mod_jk anyway? 
 
 I don't know. It is not critical IMO, as mod_jk works fine. 
 
  On point 2. I downloaded the zip. I have just downloaded the exe to see 
 what 
  shortcuts you are talking about and Ok, a nice screen to configure the 
  service. I did read the documentation. I also had to look in a readme 
 file 
  in cvs Jakarta-commons/daemon to find out how procrun is run (which 
 doesn't 
  even mention the //ES// parameter), but if you're telling me that adding

 a 
  service in the set up I described is user friendly then I have to 
 disagree. 
  That's not to say, I don't think it's heading in the right direction, 
  because I think it is. But it took 5 minutes to get TC5 up and running 
 with 
  jk_nt_service and about 2 hours to sort it out with procrun. 
 
 If you want the do-it-yourself experience, then use the .zip. Setting 
 up Tomcat with the service is meant to be done through the installer, so 
 the user experience is decent. 
 
 Besides, the wrapper tool is external to Tomcat. If you want to use the 
 old JavaService or jk_nt_service, then you can. 
 
  And I think maybe I worded it a bit harshly. We will be moving onto TC5 
 as 
  soon as its final (which we didn't do for TC4.0!). 
  
  I was going to look at writing some code tonight so that the Apache HTTP

  Service Monitor picks up and controls TC5 services and also look at how 
  procrun (because it is mainly there) can be improved. 
 
 Personally, I like the current syntax. Unlike you, I think it is 
 complete, and rather intuitive. -1 to change it. 
 
 Remy 
 
 
 
 

Re: Tomcat 5.0.12

2003-09-22 Thread Remy Maucherat
Oxley, David wrote:

Remy,

The service installed by the installer doesn't start. I think it is 
because it is missing the java.endorsed.dirs, catalina.base, 
catalina.home and the java.io.tmpdir parameters. See the attached diff. 
I can't build the installer so haven't tested this.
Both endorsed and catalina.home are correctly set after installation. I 
have no idea what you're doing or what you have hacked, but you're 
clearly not using this the way it's intended.

Obviously, -1 for your patch (of course, you didn't notice the //US 
thing in the -post section).

Remy



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


RE: Tomcat 5.0.12

2003-09-22 Thread Oxley, David
Ok. Yup. Didn't see that. Just found that my problem was that I had run an
early alpha and it left some 'Tomcat5' registry junk around which stopped
the service being installed properly.

Dave.

 -Original Message-
 From: Remy Maucherat [mailto:[EMAIL PROTECTED]
 Sent: Monday, September 22, 2003 2:27 PM
 To: Tomcat Developers List
 Subject: Re: Tomcat 5.0.12
 
 Oxley, David wrote:
 
  Remy,
 
  The service installed by the installer doesn't start. I think it is
  because it is missing the java.endorsed.dirs, catalina.base,
  catalina.home and the java.io.tmpdir parameters. See the attached diff.
  I can't build the installer so haven't tested this.
 
 Both endorsed and catalina.home are correctly set after installation. I
 have no idea what you're doing or what you have hacked, but you're
 clearly not using this the way it's intended.
 
 Obviously, -1 for your patch (of course, you didn't notice the //US
 thing in the -post section).
 
 Remy
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
 This e-mail has been scanned for all viruses by Star Internet. The
 service is powered by MessageLabs. For more information on a proactive
 anti-virus service working around the clock, around the globe, visit:
 http://www.star.net.uk
 



This e-mail has been scanned for all viruses by Star Internet. The
service is powered by MessageLabs. For more information on a proactive
anti-virus service working around the clock, around the globe, visit:
http://www.star.net.uk


Re: Tomcat 5.0.12

2003-09-22 Thread Remy Maucherat
Oxley, David wrote:
Ok. Yup. Didn't see that. Just found that my problem was that I had run an
early alpha and it left some 'Tomcat5' registry junk around which stopped
the service being installed properly.
No problem. What kind of bad configuration prevents the update of the 
service ?

Remy

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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java

2003-09-22 Thread Amy Roh
Remy Maucherat wrote:

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:

amyroh  2003/09/21 16:11:17

  Modified:catalina/src/share/org/apache/catalina/session
ManagerBase.java
  Log:
  Fix to properly create Manager MBean at webapp restart - bugtraq 
4924607.


-1 for the last two patches (they don't work). I look at the issues 
and will revert them.


Hmmm, forget it, I should have looked at the code before sending the 
email :-P

   oname = null;
   // Self-registration, undo it
   Registry.getRegistry().unregisterComponent(oname);
I guess I can see where the NPE is coming from :-D
Thanks.  X)

Amy

Remy



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


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


Re: Manager deploy when unpackWARs = false

2003-09-22 Thread Amy Roh
Remy Maucherat wrote:

Amy Roh wrote:

Local deploys do not copy the WAR over.


So local deploy is *not* persistant until we implement to save 
config.  This
is what I was referring to.


Fixing the bug is rather annoying, and the amount of stuff which should 
be automated is quite big, and seems not worth it.
Instead, I'd like to remove local deploy from the manager servlet (IMO, 
it's useless). If using the Ant tasks to do a local deploy, then it's up 
to you to persist the config later, upon the user's choice.
+0

I think we should also add some Ant tasks:
- a save config Ant task - with a context parameter allowing to save 
just one context (this task is also useful when using the JMX tasks to 
reconfigure Tomcat, and persisting the config is needed)
- maybe extend a bit the JMX tasks
+1

Amy

Comments ?

Remy



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




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


RE: Tomcat 5.0.12

2003-09-22 Thread Oxley, David
I think an early version of procrun left the registry key of Tomcat5 in the
'Process Runner 1.0' key but the service had been deleted. So when
installing Tomcat5 from the exe it failed to create the Tomcat5 service
completely. i.e. a configuration that will never happen now.

Dave.

 -Original Message-
 From: Remy Maucherat [mailto:[EMAIL PROTECTED]
 Sent: Monday, September 22, 2003 4:05 PM
 To: Tomcat Developers List
 Subject: Re: Tomcat 5.0.12
 
 Oxley, David wrote:
  Ok. Yup. Didn't see that. Just found that my problem was that I had run
 an
  early alpha and it left some 'Tomcat5' registry junk around which
 stopped
  the service being installed properly.
 
 No problem. What kind of bad configuration prevents the update of the
 service ?
 
 Remy
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
 This e-mail has been scanned for all viruses by Star Internet. The
 service is powered by MessageLabs. For more information on a proactive
 anti-virus service working around the clock, around the globe, visit:
 http://www.star.net.uk
 



This e-mail has been scanned for all viruses by Star Internet. The
service is powered by MessageLabs. For more information on a proactive
anti-virus service working around the clock, around the globe, visit:
http://www.star.net.uk


mod_jk does not detect a hung Tomcat

2003-09-22 Thread David Rees
I posted this to tomcat-users last week, but didn't get a reply...  I'm
hoping to get some feedback from the connectors developers on this issue I
occasionally run into...

I've got a setup where I've got two load balanced Tomcats running off of
Apache and mod_jk.

I've got a problem where one of the Tomcats will occasionally hang, but
not die.  This means that it will accept new connections, but will not
actually process anything.  This renders all clients using the hung Tomcat
completely stuck as they are not switched over to the other Tomcat.

mod_jk seems to assume that if it can connect to Tomcat, it must be ready
to respond to requests.

It seems that some sort of connection test (with a short socket timeout)
would be appropriate to validate that the connection is actually
responding.  While this would increase the latency of each request a bit,
it would improve the reliability.  Is there any provision in the AJP13
protocol to allow for testing of connections before sending a request over
it?

It's easy to simulate this behavior by sending a STOP signal to Tomcat.

I've also attached a log from mod_jk showing the problem.  I marked the
point at which processing in mod_jk stopped until I sent a CONT signal to
tomcat.

Does mod_jk2 have this same problem?  Is there any interest in fixing
this? Does anyone have a workaround for this issue?

Thanks,
Dave

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



Re: Manager deploy when unpackWARs = false

2003-09-22 Thread Remy Maucherat
Amy Roh wrote:
Remy Maucherat wrote:
Fixing the bug is rather annoying, and the amount of stuff which 
should be automated is quite big, and seems not worth it.
Instead, I'd like to remove local deploy from the manager servlet 
(IMO, it's useless). If using the Ant tasks to do a local deploy, then 
it's up to you to persist the config later, upon the user's choice.
+0
I can confirm it can't be done automatically, because when deploying 
from a configFile, there's no way to know what context is being 
deployed. And it wouldn't work anyway as the XML would be saved to the 
original config file location.

I'll have to add code in StandardContext to have it move its config file 
to the config base if there's one and it's outside the config base.

For the last case, (WAR file + no config file + unpackWAR == false), the 
config file will have to be saved automatically after deploying (which 
should work, as the context path is known).

I think we should also add some Ant tasks:
- a save config Ant task - with a context parameter allowing to save 
just one context (this task is also useful when using the JMX tasks to 
reconfigure Tomcat, and persisting the config is needed)
I've added the new /save mapping and code. Coding the corresponding 
action is trivial.

- maybe extend a bit the JMX tasks
+1
Remy



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


DO NOT REPLY [Bug 10912] - org.apache.catalina.INVOKER.process.queue_server is currently unavailable

2003-09-22 Thread 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=10912.
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=10912

org.apache.catalina.INVOKER.process.queue_server is currently unavailable





--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 17:33 ---
I have just upgraded from Tomcat 4.1.18 to Tomcat 4.1.27.
I have modified conf/server.xml with DefaultContext reloadable=true /
I have restarted Tomcat.
I have created a new context named cgs4825 with a minimal web.xml file.
I have created a servlet that displays Hello.
I can run the servlet.
I have made a modification to the .java file. I have only added some text: World.
I wait for the Tomcat console window to report that the servlet has been modified.
In Tomcat 4.1.18, I can now reload the servlet in the browser, and it works.
In Tomcat 4.1.27, I get the error
**
Servlet org.apache.catalina.INVOKER.hello is currently unavailable
**
In the error log I get the messages
**
2003-09-22 13:19:51 StandardContext[/cgs4825]: Reloading this Context has started
2003-09-22 13:19:51 WebappLoader[/cgs4825]: Reloading checks are enabled for
this Context
2003-09-22 13:19:51 StandardWrapper[/cgs4825:org.apache.catalina.INVOKER.hello]:
Marking servlet org.apache.catalina.INVOKER.hello as unavailable
**
If I restart Tomcat, then it works in 4.1.27.

I have gone through this process many times, with the same result. It works
in 4.1.18, but fails in 4.1.27. What has changed between 4.1.18 and 4.1.27
with the INVOKER servlet?

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



Default server.xml without examples?

2003-09-22 Thread Shapira, Yoav

Howdy,
We've been packaging tomcat with two server.xml files for a while now,
one with a bunch of examples and comments (connectors, realms, the
examples context, etc.), and a simpler one (server-noexamples.xml).

I recognize the value of the server.xml with examples and comments, and
realize it's one of the best resources for users, especially new users.

However, would it be better (especially for more experienced users), to
have the bare-minimum, very few comments, no examples server.xml be the
default (i.e. be extracted to $CATALINA_HOME/conf/server.xml when
installing), and call the other one server-withexamples.xml or something
like that?

My rationale is perhaps selfish, but every time I install tomcat I have
to either pare down the default server.xml a lot or copy the noexamples
one and pare that one down a bit.  Maybe it's just because I don't like
having extra/unused elements in server.xml (and other configuration
files) -- I find them confusing and distracting at times.

This is obviously a minor issue, a nitpick maybe, but I wanted to raise
it as tomcat 5 is nearing a final release and see what other developers
think?

Yoav Shapira
Millennium ChemInformatics





This e-mail, including any attachments, is a confidential business communication, and 
may contain information that is confidential, proprietary and/or privileged.  This 
e-mail is intended only for the individual(s) to whom it is addressed, and may not be 
saved, copied, printed, disclosed or used by anyone else.  If you are not the(an) 
intended recipient, please immediately delete this e-mail from your computer system 
and notify the sender.  Thank you.


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



cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java

2003-09-22 Thread remm
remm2003/09/22 12:30:17

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
ManagerServlet.java
  Log:
  - Code cleanup.
  - Fix for root context handling.
  
  Revision  ChangesPath
  1.12  +21 -17
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ManagerServlet.java   22 Sep 2003 12:34:45 -  1.11
  +++ ManagerServlet.java   22 Sep 2003 19:30:17 -  1.12
  @@ -611,12 +611,7 @@
   String displayPath = path;
   if( path.equals(/) )
   path = ;
  -String basename = null;
  -if (path.equals()) {
  -basename = _;
  -} else {
  -basename = path.substring(1).replace('/', '_');
  -}
  +String basename = getConfigFile(path);
   
   // Check if app already exists, or undeploy it if updating
   Context context =  deployer.findDeployedApp(path);
  @@ -724,12 +719,7 @@
   String displayPath = path;
   if( path.equals(/) )
   path = ;
  -String basename = null;
  -if (path.equals()) {
  -basename = _;
  -} else {
  -basename = path.substring(1).replace('/', '_');
  -}
  +String basename = getConfigFile(path);
   
   // Calculate the base path
   File deployedPath = versioned;
  @@ -902,7 +892,7 @@
   writer.println(sm.getString(managerServlet.invalidWar, war));
   return;
   }
  -path = / + war.substring(beg,end);
  +path = / + war.substring(beg, end);
   if (path.equals(/ROOT)) {
   path = /;
   }
  @@ -1485,6 +1475,20 @@
   
   
   //  Support Methods
  +
  +
  +/**
  + * Given a context path, get the config file name.
  + */
  +protected String getConfigFile(String path) {
  +String basename = null;
  +if (path.equals()) {
  +basename = ROOT;
  +} else {
  +basename = path.substring(1).replace('/', '_');
  +}
  +return (basename);
  +}
   
   
   /**
  
  
  

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



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

2003-09-22 Thread remm
remm2003/09/22 12:32:04

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
  Log:
  - Save the config file to the config base in situations where the context
would not be persistent after a restart.
  - I don't think I broke anything. Let me know ...
  
  Revision  ChangesPath
  1.94  +102 -17   
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- StandardContext.java  14 Sep 2003 12:19:42 -  1.93
  +++ StandardContext.java  22 Sep 2003 19:32:04 -  1.94
  @@ -64,6 +64,7 @@
   
   import java.io.BufferedReader;
   import java.io.File;
  +import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -108,6 +109,8 @@
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Loader;
  +import org.apache.catalina.Server;
  +import org.apache.catalina.ServerFactory;
   import org.apache.catalina.Wrapper;
   import org.apache.catalina.deploy.ApplicationParameter;
   import org.apache.catalina.deploy.ContextEjb;
  @@ -3903,16 +3906,43 @@
   
   // Set config file name
   File configBase = getConfigBase();
  -if ((getConfigFile() == null)  (configBase != null)) {
  -String name = getName();
  -if (name.equals()) {
  -name = ROOT;
  -}
  -if (name.startsWith(/)) {
  -name = name.substring(1);
  +if (configBase != null) {
  +if (getConfigFile() == null) {
  +File file = new File(configBase, getDefaultConfigFile());
  +setConfigFile(file.getPath());
  +// If the docbase is outside the appBase, we should save our
  +// config
  +try {
  +File appBaseFile = new File(getAppBase());
  +if (!appBaseFile.isAbsolute()) {
  +appBaseFile = new File(engineBase(), getAppBase());
  +}
  +String appBase = appBaseFile.getCanonicalPath();
  +String basePath = 
  +(new File(getBasePath())).getCanonicalPath();
  +if (!basePath.startsWith(appBase)) {
  +Server server = ServerFactory.getServer();
  +((StandardServer) server).storeContext(this);
  +}
  +} catch (Exception e) {
  +log.warn(Error storing config file, e);
  +}
  +} else {
  +try {
  +String canConfigFile = 
  +(new File(getConfigFile())).getCanonicalPath();
  +if (!canConfigFile.startsWith
  +(configBase.getCanonicalPath())) {
  +File file = 
  +new File(configBase, getDefaultConfigFile());
  +if (copy(new File(canConfigFile), file)) {
  +setConfigFile(file.getPath());
  +}
  +}
  +} catch (Exception e) {
  +log.warn(Error setting config file, e);
  +}
   }
  -File file = new File(configBase, name.replace('/', '_') + .xml);
  -setConfigFile(file.getPath());
   }
   
   // Add missing components as necessary
  @@ -4558,20 +4588,20 @@
   break;
   container = container.getParent();
   }
  -if (container == null) {
  -docBase = (new File(engineBase(), getDocBase())).getPath();
  -} else {
  -File file = new File(getDocBase());
  -if (!file.isAbsolute()) {
  +File file = new File(getDocBase());
  +if (!file.isAbsolute()) {
  +if (container == null) {
  +docBase = (new File(engineBase(), getDocBase())).getPath();
  +} else {
   // Use the appBase property of this container
   String appBase = ((Host) container).getAppBase();
   file = new File(appBase);
   if (!file.isAbsolute())
   file = new File(engineBase(), appBase);
   docBase = (new File(file, getDocBase())).getPath();
  -} else {
  -docBase = file.getPath();
   }
  +} else {
  +docBase = file.getPath();
   

[PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Jan Luehe
Currently, any JARs in the classloader delegation chain of a webapp's
classloader are scanned for packaged TLDs. This is convenient, as it
allows a JAR-packaged taglib to be simply dropped in common/lib and
shared by all webapps, rather than requiring each webapp to bundle the
taglib in its own WEB-INF/lib.
However, scanning all available JARs for TLDs is not very efficient,
especially if the names of the JAR-packaged taglibs are known in
advance.
The proposal is to add a configurable String property (tldJarNames)
on Context, which specifies the comma-separated list of JAR file names
(without any path info) that must be scanned for TLDs.
Catalina will continue to traverse the classloader delegation chain,
but only consider those JARs that match the names in the
comma-separated list.
If a JAR appears more than once in the classloader delegation chain,
we will pick its first occurrence.
If the tldJarNames property is not set, Catalina will continue to scan 
 all JARs in the classloader delegation chain for TLDs.

Comments?

Jan





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


RE: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Shapira, Yoav

Howdy,
Seems like too much work/complication for a small gain.  How inefficient
is the current mechanism and how much performance would we gain from
your approach?

Yoav Shapira
Millennium ChemInformatics


-Original Message-
From: Jan Luehe [mailto:[EMAIL PROTECTED]
Sent: Monday, September 22, 2003 3:40 PM
To: Tomcat Developers List
Subject: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

Currently, any JARs in the classloader delegation chain of a webapp's
classloader are scanned for packaged TLDs. This is convenient, as it
allows a JAR-packaged taglib to be simply dropped in common/lib and
shared by all webapps, rather than requiring each webapp to bundle the
taglib in its own WEB-INF/lib.

However, scanning all available JARs for TLDs is not very efficient,
especially if the names of the JAR-packaged taglibs are known in
advance.

The proposal is to add a configurable String property (tldJarNames)
on Context, which specifies the comma-separated list of JAR file names
(without any path info) that must be scanned for TLDs.

Catalina will continue to traverse the classloader delegation chain,
but only consider those JARs that match the names in the
comma-separated list.

If a JAR appears more than once in the classloader delegation chain,
we will pick its first occurrence.

If the tldJarNames property is not set, Catalina will continue to
scan
  all JARs in the classloader delegation chain for TLDs.

Comments?

Jan






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




This e-mail, including any attachments, is a confidential business communication, and 
may contain information that is confidential, proprietary and/or privileged.  This 
e-mail is intended only for the individual(s) to whom it is addressed, and may not be 
saved, copied, printed, disclosed or used by anyone else.  If you are not the(an) 
intended recipient, please immediately delete this e-mail from your computer system 
and notify the sender.  Thank you.


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



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

2003-09-22 Thread Kin-Man Chung
The actual mapping before we optimize the smap is

1:41
2:42
6:43
6:44
8:45
8:46

which looks OK to me.  But since we only do the smap at the beginnig of
the template text, and assume the the input line count is 1, the result is
what you have noticed.

I'll see if I can add some code to compute the input line ranges, but
it is going to be messy.  :(

But really, all this is more academic than useful in practice: who do
you think may need to single step over template text lines?  :-)

-Kin-man

 Date: Sat, 20 Sep 2003 00:18:14 -0700
 From: Eric Carmichael [EMAIL PROTECTED]
 Subject: Re: cvs commit: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler 
Generator.java Node.java SmapStratum.java SmapUtil.java
 X-Originating-IP: [64.203.49.21]
 To: Tomcat Developers List [EMAIL PROTECTED]
 X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
 X-Priority: 3
 X-MSMail-priority: Normal
 X-Originating-Email: [EMAIL PROTECTED]
 X-OriginalArrivalTime: 20 Sep 2003 07:18:18.0787 (UTC) 
FILETIME=[5DB22F30:01C37F47]
 
 cal/cal1.jsp from the jsp-examples webapp starts like this:
 
 HTML
 !-- 
   Copyright (c) 1999 The Apache Software Foundation. All rights 
   reserved.
 --
 HEADTITLE 
 
 Before this commit, cal1.jsp's SMAP started like this:
 
 *L
 1,2:41
 3:42
 4:42
 5:42
 6:43,2
 
 Now it starts like this:
 
 *L
 1,2:41
 6:43,2
 
 I think the reason lines 3, 4, and 5 aren't being SMAPped is that you only add 
LineInfos inside if (breakAtLF || count  0) {.  This adds LineInfos when the 
output line advances, but not when the input line alone advances.  To SMAP 
template text fully, you have to add a LineInfo every time the line number 
advances in the input file or the output file.
 
 Eric
 
 
 - Original Message - 
 From: [EMAIL PROTECTED]
 To: [EMAIL PROTECTED]
 Sent: Tuesday, September 16, 2003 10:46 AM
 Subject: cvs commit: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler 
Generator.java Node.java SmapStratum.java SmapUtil.java
 
 
  kinman  2003/09/16 10:46:44
  
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
  Node.java SmapStratum.java SmapUtil.java
Log:
- For template texts that generate multiple Java lines, addidtional 
mapping
  informantion are kept in the TemplateText node, to aide SMAP generation.

Revision  ChangesPath
1.208 +23 -14
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.jav
a

Index: Generator.java
===
RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Gen
erator.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- Generator.java 15 Sep 2003 13:43:54 - 1.207
+++ Generator.java 16 Sep 2003 17:46:43 - 1.208
@@ -1867,21 +1867,25 @@
 return;
 }
 
-if (ctxt.getOptions().genStringAsCharArray()) {
-if (textSize = 3) {
-   // Spcial case small text strings
-   n.setBeginJavaLine(out.getJavaLine());
-   out.printil(out.write( + quote(text.charAt(0)) + 
););
-   if (textSize  1) {
-   out.printil(out.write( + quote(text.charAt(1)) + 
););
+if (textSize = 3) {
+   // Special case small text strings
+   n.setBeginJavaLine(out.getJavaLine());
+   int lineInc = 0;
+   for (int i = 0; i  textSize; i++) {
+   char ch = text.charAt(i);
+   out.printil(out.write( + quote(ch) + ););
+   if (i  0) {
+   n.addSmap(lineInc);
}
-   if (textSize  2) {
-   out.printil(out.write( + quote(text.charAt(2)) + 
););
+   if (ch == '\n') {
+   lineInc++;
}
-   n.setEndJavaLine(out.getJavaLine());
-   return;
}
+   n.setEndJavaLine(out.getJavaLine());
+   return;
+   }
 
+if (ctxt.getOptions().genStringAsCharArray()) {
// Generate Strings as char arrays, for performance
 ServletWriter caOut;
 if (charArrayBuffer == null) {
@@ -1915,6 +1919,7 @@
 StringBuffer sb = new StringBuffer(out.write(\);
 int initLength = sb.length();
 int count = JspUtil.CHUNKSIZE;
+int srcLine = 0; // relative to starting srouce line
 for (int i = 0; i  text.length(); i++) {
 char ch = text.charAt(i);
 --count;
@@ -1930,6 +1935,7 @@

Re: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Jan Luehe
Shapira,

Seems like too much work/complication for a small gain.  How inefficient
is the current mechanism and how much performance would we gain from
your approach?
What do you mean by too much work? :)
I already have a patch ready to be committed. It's just a few line changes.
Just to give you an idea of the proposal's benefit. Currently, we're
scanning the following global JARs for TLDs (depending on your runtime, 
there may be even more!), none of which contain any TLDs:

/home/luehe/ws/jakarta-tomcat-5/build/common/lib/servlet-api.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/commons-dbcp.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/naming-common.jar
/net/koori.sfbay/a/v07/jdk/1.4/fcs/binaries/solsparc/jre/lib/ext/localedata.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/commons-modeler.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/servlets-invoker.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/tomcat-jk.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/naming-resources.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/servlets-webdav.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/jakarta-regexp-1.2.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/commons-beanutils.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina-cluster.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/jkshm.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/endorsed/xmlParserAPIs.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/jasper-compiler.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/tomcat-http11.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/ant.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/naming-factory.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/tomcat-jni.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/jmx-tools.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina-ant.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina-i18n-fr.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/tomcat-jk2.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/commons-logging.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/commons-el.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/jkconfig.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/servlets-default.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina-optional.jar
/net/koori.sfbay/a/v07/jdk/1.4/fcs/binaries/solsparc/jre/lib/ext/sunjce_provider.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/commons-logging-api.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/naming-java.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina.jar
/net/koori.sfbay/a/v07/jdk/1.4/fcs/binaries/solsparc/jre/lib/ext/ldapsec.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/tomcat-util.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/commons-pool.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/commons-digester.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina-i18n-ja.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/catalina-i18n-es.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/tomcat-coyote.jar
/net/koori.sfbay/a/v07/jdk/1.4/fcs/binaries/solsparc/lib/tools.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/commons-fileupload-1.0.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/endorsed/xercesImpl.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/commons-collections.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/jasper-runtime.jar
/net/koori.sfbay/a/v07/jdk/1.4/fcs/binaries/solsparc/jre/lib/ext/dnsns.jar
/home/luehe/ws/jakarta-tomcat-5/build/server/lib/servlets-common.jar
/home/luehe/ws/jakarta-tomcat-5/build/bin/bootstrap.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/jmx.jar
/home/luehe/ws/jakarta-tomcat-5/build/common/lib/jsp-api.jar
Notice that we're scanning this list twice: once for context listeners
(in TldConfig.java), and again in Jasper's TldLocationsCache for
taglibs.
Jan


Yoav Shapira
Millennium ChemInformatics


-Original Message-
From: Jan Luehe [mailto:[EMAIL PROTECTED]
Sent: Monday, September 22, 2003 3:40 PM
To: Tomcat Developers List
Subject: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs
Currently, any JARs in the classloader delegation chain of a webapp's
classloader are scanned for packaged TLDs. This is convenient, as it
allows a JAR-packaged taglib to be simply dropped in common/lib and
shared by all webapps, rather than requiring each webapp to bundle the
taglib in its own WEB-INF/lib.
However, scanning all available JARs for TLDs is not very efficient,
especially if the names of the JAR-packaged taglibs are known in
advance.
The proposal is to add a configurable String property (tldJarNames)
on Context, which specifies the comma-separated list of JAR file names
(without any path info) that must be scanned for TLDs.
Catalina will continue to traverse the classloader delegation chain,
but only consider those JARs that match the names in the

RE: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Shapira, Yoav

Howdy,

What do you mean by too much work? :)
I already have a patch ready to be committed. It's just a few line
changes.

I mean two things:
1 - the work you've done, implementing the patch;
2 - the work to debug/trace user questions about why their TLDs aren't
loading when they should or vice versa.

As long as it's well documented, I never have a problem with a
performance enhancement ;)

Yoav Shapira



This e-mail, including any attachments, is a confidential business communication, and 
may contain information that is confidential, proprietary and/or privileged.  This 
e-mail is intended only for the individual(s) to whom it is addressed, and may not be 
saved, copied, printed, disclosed or used by anyone else.  If you are not the(an) 
intended recipient, please immediately delete this e-mail from your computer system 
and notify the sender.  Thank you.


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



Re: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Amy Roh
 The proposal is to add a configurable String property (tldJarNames)
 on Context, which specifies the comma-separated list of JAR file names
 (without any path info) that must be scanned for TLDs.

+1 
Amy :-)

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



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

2003-09-22 Thread kinman
kinman  2003/09/22 14:01:21

  Modified:jasper2/src/share/org/apache/jasper/compiler
ELFunctionMapper.java Generator.java
  Log:
  - Fix some problem Eric reported in Smap.
TODO: remove duplications in smap.
  
  Revision  ChangesPath
  1.13  +2 -2  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ELFunctionMapper.java
  
  Index: ELFunctionMapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ELFunctionMapper.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ELFunctionMapper.java 1 May 2003 16:42:12 -   1.12
  +++ ELFunctionMapper.java 22 Sep 2003 21:01:20 -  1.13
  @@ -89,8 +89,8 @@
String ds = map.ds.toString();
if (ds.length()  0) {
Node root = page.getRoot();
  - new Node.Declaration(map.ss.toString(), root.getStart(), root);
  - new Node.Declaration(static {\n + ds + }\n, root.getStart(), root);
  + new Node.Declaration(map.ss.toString(), null, root);
  + new Node.Declaration(static {\n + ds + }\n, null, root);
}
   }
   
  
  
  
  1.212 +5 -6  
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.211
  retrieving revision 1.212
  diff -u -r1.211 -r1.212
  --- Generator.java19 Sep 2003 23:38:08 -  1.211
  +++ Generator.java22 Sep 2003 21:01:21 -  1.212
  @@ -1947,10 +1947,9 @@
   }
   sb.setLength(initLength);
   count = JspUtil.CHUNKSIZE;
  -
  -// add a Smap for this line
  -n.addSmap(srcLine);
   }
  +// add a Smap for this line
  +n.addSmap(srcLine);
   break;
   case '\t' : // Not sure we need this
   sb.append('\\').append('t');
  
  
  

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



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

2003-09-22 Thread Kin-Man Chung
Eric,

I forgot about those generated Declartions.  It good to have an extra
pair of eyes to keep one honest.  Thanks.  :)

I have committed a fix for this and the last you reported.  Please see if
it works better now.  I have noticed that smap now contains lots of
overlaps, because of duplications in the unoptimized smap.  I'll leave
to you as an exercise to remove them in smap optimizations  :-)  Enough
smap for me for the time being.

-Kin-man

 Date: Sat, 20 Sep 2003 00:45:21 -0700
 From: Eric Carmichael [EMAIL PROTECTED]
 Subject: Re: cvs commit: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler 
Generator.java
 X-Originating-IP: [64.203.49.21]
 To: Tomcat Developers List [EMAIL PROTECTED]
 X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
 X-Priority: 3
 X-MSMail-priority: Normal
 X-Originating-Email: [EMAIL PROTECTED]
 X-OriginalArrivalTime: 20 Sep 2003 07:45:25.0789 (UTC) 
FILETIME=[2776FCD0:01C37F4B]
 
 This SMAPs all declaration nodes, including the ones tacked on to the root 
node by ELFunctionMapper.java.  So for instance the SMAP for 
jsp2/el/functions.jsp from the jsp-examples webapp ends with
 
 43,6:120
 1,3:10
 1,5:13
 
 thus SMAPping 
 
   %@ taglib prefix=my 
uri=http://jakarta.apache.org/tomcat/jsp2-example-taglib%
 
 to
 
   static private org.apache.jasper.runtime.ProtectedFunctionMapper 
_jspx_fnmap_0;
   static private org.apache.jasper.runtime.ProtectedFunctionMapper 
_jspx_fnmap_1;
 
 and
 
   static {
 _jspx_fnmap_0= 
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction(my:reverse
, jsp2.examples.el.Functions.class, reverse, new Class[] 
{java.lang.String.class});
 _jspx_fnmap_1= 
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction(my:countVow
els, jsp2.examples.el.Functions.class, numVowels, new Class[] 
{java.lang.String.class});
   }
 
 which is clearly wrong.
 
 Eric
 
 - Original Message - 
 From: [EMAIL PROTECTED]
 To: [EMAIL PROTECTED]
 Sent: Friday, September 19, 2003 4:38 PM
 Subject: cvs commit: 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler 
Generator.java
 
 
  kinman  2003/09/19 16:38:09
  
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- Make sure scriptlet declarations get properly mapped.  This fixes 22833

Revision  ChangesPath
1.211 +7 -6  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.jav
a

Index: Generator.java
===
RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Gen
erator.java,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- Generator.java 19 Sep 2003 18:30:09 - 1.210
+++ Generator.java 19 Sep 2003 23:38:08 - 1.211
@@ -196,9 +196,7 @@
  */
 public void visit(Node.PageDirective n) throws 
JasperException {
 
-if (!getServletInfoGenerated) {
-getServletInfoGenerated = true;
-} else {
+if (getServletInfoGenerated) {
 return;
 }
 
@@ -206,6 +204,7 @@
 if (info == null)
 return;
 
+getServletInfoGenerated = true;
 out.printil(public String getServletInfo() {);
 out.pushIndent();
 out.printin(return );
@@ -217,8 +216,10 @@
 }
 
 public void visit(Node.Declaration n) throws JasperException 
{
+n.setBeginJavaLine(out.getJavaLine());
 out.printMultiLn(new String(n.getText()));
 out.println();
+n.setEndJavaLine(out.getJavaLine());
 }
 
 // Custom Tags may contain declarations from tag plugins.



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


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



Re: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Jan Luehe
Amy Roh wrote:
The proposal is to add a configurable String property (tldJarNames)
on Context, which specifies the comma-separated list of JAR file names
(without any path info) that must be scanned for TLDs.


+1 
Amy :-)
Yeah! Thanks! :)

Jan



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


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

2003-09-22 Thread luehe
luehe   2003/09/22 14:42:45

  Modified:catalina/src/share/org/apache/catalina/startup
TldConfig.java
  Log:
  Fixed javadocs for tldScanJar(File file)
  
  Revision  ChangesPath
  1.21  +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TldConfig.java2 Sep 2003 21:22:00 -   1.20
  +++ TldConfig.java22 Sep 2003 21:42:45 -  1.21
  @@ -496,8 +496,8 @@
   /**
* Scans all TLD entries in the given JAR for application listeners.
*
  - * @param conn URLConnection to the JAR file whose TLD entries are
  - * scanned for application listeners
  + * @param file JAR file whose TLD entries are scanned for application
  + * listeners
*/
   private void tldScanJar(File file) throws Exception {
   
  
  
  

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



DO NOT REPLY [Bug 23336] New: - Error including Hibernate libraries on JSP page

2003-09-22 Thread 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=23336.
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=23336

Error including Hibernate libraries on JSP page

   Summary: Error including Hibernate libraries on JSP page
   Product: Tomcat 4
   Version: 4.1.18
  Platform: PC
   URL: http://tonib.homeip.net:8080/jgroups/index-error.jsp
OS/Version: Linux
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet  JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I use Linux Mandrake 9.2, with Sun JDK 1.4.1.

Hibernate is a open source persistence layer (http://hibernate.bluemars.net/),
and I want to use it on my webapp.
Then, I have the following line to import the Hibernate libraries at my JSP page :
%@ page import = net.sf.hibernate.*  %

Also, I have the following line, to load a bean of my application :

jsp:useBean id=userSession scope=session class=jgroups.UserSession /

But, there is the following problem. When Tomcat compiles the JSP, give me the
following message :

Generated servlet error:
[javac] Compiling 1 source file

/usr/local/lib/jakarta-tomcat-4.1.18-LE-jdk14/work/Standalone/localhost/jgroups/menu_jsp.java:60:
reference to InstantiationException is ambiguous, both class
net.sf.hibernate.InstantiationException in net.sf.hibernate and class
java.lang.InstantiationException in java.lang match
throw new InstantiationException(exc.getMessage());

I see the .java generated for the JSP page, and contains the following code :

jgroups.UserSession userSession = null;
  synchronized (session) {
userSession = (jgroups.UserSession)
pageContext.getAttribute(userSession, PageContext.SESSION_SCOPE);
if (userSession == null){
  try {
userSession = (jgroups.UserSession)
java.beans.Beans.instantiate(this.getClass().getClassLoader(),
jgroups.UserSession);
  } catch (ClassNotFoundException exc) {
throw new InstantiationException(exc.getMessage());
  } catch (Exception exc) {
throw new ServletException(Cannot create bean of class  +
jgroups.UserSession, exc);
  }
  pageContext.setAttribute(userSession, userSession,
PageContext.SESSION_SCOPE);
}
  }

The problem is that there is a InstantiationException into the Hibernate package
and into the Java standard library, and the compiler dont know what must to use.

The solution is change the generated code new
InstantiationException(exc.getMessage()); to new
java.lang.InstantiationException(exc.getMessage());.

I think all the JSP generated code must be fully package qualified to avoid
these kind of problems.

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



DO NOT REPLY [Bug 23336] - Error including Hibernate libraries on JSP page

2003-09-22 Thread 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=23336.
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=23336

Error including Hibernate libraries on JSP page

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-09-22 22:00 ---
%@ page import = net.sf.hibernate.*  %

This is not a tomcat problem. You can easily fix this in your code
instead of doing an import net.sf.hibernate.*, just import the classes.
and if you need to catch an instantion exception, then do 

}catch ( net.sf.hibernate.InstantiationException x ){  }

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



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

2003-09-22 Thread luehe
luehe   2003/09/22 15:25:20

  Modified:catalina/src/share/org/apache/catalina/startup
TldConfig.java
  Log:
  Avoid TLD-scanning the JARs under WEB-INF lib twice per webapp.
  
  When navigating the webapp classloader delegation chain in search for
  global JARs, we are also adding the JARs under WEB-INF lib,
  duplicating the functionality of tldScanResourcePathsWebInfLibJars(),
  which has become redundant and has been removed.
  
  Revision  ChangesPath
  1.22  +23 -56
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TldConfig.java22 Sep 2003 21:42:45 -  1.21
  +++ TldConfig.java22 Sep 2003 22:25:20 -  1.22
  @@ -249,11 +249,11 @@
* files, to be processed
*/
   Set resourcePaths = tldScanResourcePaths();
  -Map globalJarPaths = getGlobalJarPaths();
  +Map jarPaths = getJarPaths();
   
   // Check to see if we can use cached listeners
   if (tldCache != null  tldCache.exists()) {
  -long lastModified = getLastModified(resourcePaths, globalJarPaths);
  +long lastModified = getLastModified(resourcePaths, jarPaths);
   if (lastModified  tldCache.lastModified()) {
   processCache(tldCache);
   return;
  @@ -270,8 +270,8 @@
   tldScanTld(path);
   }
   }
  -if (globalJarPaths != null) {
  -paths = globalJarPaths.values().iterator();
  +if (jarPaths != null) {
  +paths = jarPaths.values().iterator();
   while (paths.hasNext()) {
   tldScanJar((File) paths.next());
   }
  @@ -310,11 +310,11 @@
* Returns the last modification date of the given sets of resources.
*
* @param resourcePaths
  - * @param globalJarPaths
  + * @param jarPaths
*
* @return Last modification date
*/
  -private long getLastModified(Set resourcePaths, Map globalJarPaths)
  +private long getLastModified(Set resourcePaths, Map jarPaths)
   throws Exception {
   
   long lastModified = 0;
  @@ -334,8 +334,8 @@
   }
   }
   
  -if (globalJarPaths != null) {
  -paths = globalJarPaths.values().iterator();
  +if (jarPaths != null) {
  +paths = jarPaths.values().iterator();
   while (paths.hasNext()) {
   File jarFile = (File) paths.next();
   long lastM = jarFile.lastModified();
  @@ -650,7 +650,6 @@
   DirContext resources = context.getResources();
   if (resources != null) {
   tldScanResourcePathsWebInf(resources, /WEB-INF, resourcePaths);
  -tldScanResourcePathsWebInfLibJars(resources, resourcePaths);
   }
   
   // Return the completed set
  @@ -705,55 +704,23 @@
   }
   }
   
  -/*
  - * Adds any JARs in the /WEB-INF/lib subdirectory of the web application
  - * to the given set of resource paths.
  - *
  - * @param resources The web application's resources
  - * @param resourcePaths The set of resource paths to add to
  - */
  -private void tldScanResourcePathsWebInfLibJars(DirContext resources,
  -   Set resourcePaths)
  -throws IOException {
  -
  -if (log.isTraceEnabled()) {
  -log.trace(  Scanning JARs in /WEB-INF/lib subdirectory);
  -}
  -
  -try {
  -NamingEnumeration items = resources.list(/WEB-INF/lib);
  -while (items.hasMoreElements()) {
  -NameClassPair item = (NameClassPair) items.nextElement();
  -String resourcePath = /WEB-INF/lib/ + item.getName();
  -if (!resourcePath.endsWith(.jar)) {
  -continue;
  -}
  -if (log.isTraceEnabled()) {
  -log.trace(   Adding path ' + resourcePath + ');
  -}
  -resourcePaths.add(resourcePath);
  -}
  -} catch (NamingException e) {
  -; // Silent catch: it's valid that no /WEB-INF/lib directory exists
  -}
  -}
  -
   /**
  - * Returns the paths to all JAR files accessible to all parent
  - * classloaders of the web application class loader.
  + * Returns a map of the paths to all JAR files accessible to the webapp.
  + *
  + * The map includes the JARs under WEB-INF/lib as well as those in the
  + * classloader delegation chain of the 

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

2003-09-22 Thread luehe
luehe   2003/09/22 16:56:11

  Modified:catalina/src/share/org/apache/catalina/startup
TldConfig.java
  Log:
  Do not let the parsing error of a single TLD disrupt the parsing of remaining TLDs 
in the JAR
  
  Revision  ChangesPath
  1.23  +10 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- TldConfig.java22 Sep 2003 22:25:20 -  1.22
  +++ TldConfig.java22 Sep 2003 23:56:11 -  1.23
  @@ -503,7 +503,6 @@
   
   JarFile jarFile = null;
   String name = null;
  -InputSource inputSource = null;
   
   String jarPath = file.getAbsolutePath();
   
  @@ -522,21 +521,18 @@
   if (log.isTraceEnabled()) {
   log.trace(  Processing TLD at ' + name + ');
   }
  -inputSource = new InputSource(jarFile.getInputStream(entry));
  -tldScanStream(inputSource);
  -inputSource = null;
  -name = null;
  +try {
  +tldScanStream(new InputSource(jarFile.getInputStream(entry)));
  +} catch (Exception e) {
  +log.error(sm.getString(contextConfig.tldEntryException,
  +   name, jarPath, context.getPath()),
  +  e);
  +}
   }
   } catch (Exception e) {
  -if (name == null) {
  -log.error(sm.getString(contextConfig.tldJarException,
  -   jarPath, context.getPath()),
  -  e);
  -} else {
  -log.error(sm.getString(contextConfig.tldEntryException,
  -   name, jarPath, context.getPath()),
  -  e);
  -}
  +log.error(sm.getString(contextConfig.tldJarException,
  +   jarPath, context.getPath()),
  +  e);
   } finally {
   if (jarFile != null) {
   try {
  
  
  

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



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

2003-09-22 Thread kinman
kinman  2003/09/22 17:08:22

  Modified:jasper2/src/share/org/apache/jasper/compiler Parser.java
  Log:
  - Fix a bug in Parser.isTemplateText():
  
Since '%' is not a delimiter in JspReader.parseToken(), an expression
%String s;% after a template text would be treated as a template
text when mappedfile option is set to true, and got concatenated to
the template text.
  
  Revision  ChangesPath
  1.81  +4 -16 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- Parser.java   2 Sep 2003 21:39:59 -   1.80
  +++ Parser.java   23 Sep 2003 00:08:22 -  1.81
  @@ -1424,19 +1424,7 @@
   String tagIdentifier = reader.parseToken(false);
   reader.reset(m);
   
  -if (tagIdentifier.equals(%--)) {
  -return false;
  -}
  -if (tagIdentifier.equals(%@)) {
  -return false;
  -}
  -if (tagIdentifier.equals(%!)) {
  -return false;
  -}
  -if (tagIdentifier.equals(%=)) {
  -return false;
  -}
  -if (tagIdentifier.equals(%)) {
  +if (tagIdentifier.startsWith(%)) {
   return false;
   }
   if (tagIdentifier.startsWith(jsp:)) {
  
  
  

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



DO NOT REPLY [Bug 22942] - HTTP Status 500 - Error retrieving attribute liveDeploy

2003-09-22 Thread 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=22942.
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=22942

HTTP Status 500 - Error retrieving attribute liveDeploy





--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 00:11 ---
I did try installing the 5.0.12 and had the same problem. However, I did 
install over 5.0.9. Can you upgrade this way or is better to uninstall the 
previous version first? I will try uninstalling 5.0.9, clean the registry and 
then install 5.0.12.

It is weird that XP Professional works beautifully with 5.0.9 with no problems. 
Maybe I was just lucky.

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



DO NOT REPLY [Bug 23340] New: - Web Server starts and immediately stops within a few seconds.

2003-09-22 Thread 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=23340.
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=23340

Web Server starts and immediately stops within a few seconds.

   Summary: Web Server starts and immediately stops within a few
seconds.
   Product: Tomcat 5
   Version: 5.0.12
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Clean Installed 5.0.12 on Windows 2K Pro machine; PII 400 w/128 MB Ram. After 
installation kept both boxes checked to start Tomcat and read Readme file. 
Neither started. Opened up Services window under Admin Tools and tried 
restarting at that location. Service will start and within a few seconds stops. 
Tried four times.

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



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

2003-09-22 Thread Eric Carmichael
 But really, all this is more academic than useful in practice: who do
 you think may need to single step over template text lines?  :-)

No idea.  I'm just trying to make sure Bugzilla 22006 stays fixed.  On the
other hand if you want to WONTFIX that bad boy, I guess I don't have any
good grounds for objecting; the SMAP spec doesn't seem to say anywhere that
SMAPs need to be complete (or even non-empty?  Now there's a way to save
ourselves a bunch of work...).

I see from another message that you've committed a fix for this.  I'll test
your code when I get a chance.

Eric


- Original Message - 
From: Kin-Man Chung [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Monday, September 22, 2003 1:00 PM
Subject: Re: cvs commit:
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler
Generator.java Node.java SmapStratum.java SmapUtil.java


 The actual mapping before we optimize the smap is

 1:41
 2:42
 6:43
 6:44
 8:45
 8:46

 which looks OK to me.  But since we only do the smap at the beginnig of
 the template text, and assume the the input line count is 1, the result is
 what you have noticed.

 I'll see if I can add some code to compute the input line ranges, but
 it is going to be messy.  :(

 But really, all this is more academic than useful in practice: who do
 you think may need to single step over template text lines?  :-)

 -Kin-man

  Date: Sat, 20 Sep 2003 00:18:14 -0700
  From: Eric Carmichael [EMAIL PROTECTED]
  Subject: Re: cvs commit:
 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler
 Generator.java Node.java SmapStratum.java SmapUtil.java
  X-Originating-IP: [64.203.49.21]
  To: Tomcat Developers List [EMAIL PROTECTED]
  X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
  X-Priority: 3
  X-MSMail-priority: Normal
  X-Originating-Email: [EMAIL PROTECTED]
  X-OriginalArrivalTime: 20 Sep 2003 07:18:18.0787 (UTC)
 FILETIME=[5DB22F30:01C37F47]
 
  cal/cal1.jsp from the jsp-examples webapp starts like this:
 
  HTML
  !-- 
Copyright (c) 1999 The Apache Software Foundation. All rights
reserved.
  --
  HEADTITLE
 
  Before this commit, cal1.jsp's SMAP started like this:
 
  *L
  1,2:41
  3:42
  4:42
  5:42
  6:43,2
 
  Now it starts like this:
 
  *L
  1,2:41
  6:43,2
 
  I think the reason lines 3, 4, and 5 aren't being SMAPped is that you
only add
 LineInfos inside if (breakAtLF || count  0) {.  This adds LineInfos
when the
 output line advances, but not when the input line alone advances.  To SMAP
 template text fully, you have to add a LineInfo every time the line number
 advances in the input file or the output file.
 
  Eric
 
 
  - Original Message - 
  From: [EMAIL PROTECTED]
  To: [EMAIL PROTECTED]
  Sent: Tuesday, September 16, 2003 10:46 AM
  Subject: cvs commit:
 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler
 Generator.java Node.java SmapStratum.java SmapUtil.java
 
 
   kinman  2003/09/16 10:46:44
  
 Modified:jasper2/src/share/org/apache/jasper/compiler
Generator.java
   Node.java SmapStratum.java SmapUtil.java
 Log:
 - For template texts that generate multiple Java lines, addidtional
 mapping
   informantion are kept in the TemplateText node, to aide SMAP
generation.
  
 Revision  ChangesPath
 1.208 +23 -14

jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator
.jav
 a
  
 Index: Generator.java
 ===
 RCS file:

/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler
/Gen
 erator.java,v
 retrieving revision 1.207
 retrieving revision 1.208
 diff -u -r1.207 -r1.208
 --- Generator.java 15 Sep 2003 13:43:54 - 1.207
 +++ Generator.java 16 Sep 2003 17:46:43 - 1.208
 @@ -1867,21 +1867,25 @@
  return;
  }
  
 -if (ctxt.getOptions().genStringAsCharArray()) {
 -if (textSize = 3) {
 -   // Spcial case small text strings
 -   n.setBeginJavaLine(out.getJavaLine());
 -   out.printil(out.write( + quote(text.charAt(0))
+
 ););
 -   if (textSize  1) {
 -   out.printil(out.write( +
quote(text.charAt(1)) +
 ););
 +if (textSize = 3) {
 +   // Special case small text strings
 +   n.setBeginJavaLine(out.getJavaLine());
 +   int lineInc = 0;
 +   for (int i = 0; i  textSize; i++) {
 +   char ch = text.charAt(i);
 +   out.printil(out.write( + quote(ch) + ););
 +   if (i  0) {
 +   n.addSmap(lineInc);
 }
 -   if (textSize  2) {
 -   out.printil(out.write( +
quote(text.charAt(2)) +
 ););
 +   if (ch == 

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

2003-09-22 Thread luehe
luehe   2003/09/22 18:11:24

  Modified:jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
  Log:
  Fixed javadocs of parseTLD, which used to return boolean but was changed to void
  
  Revision  ChangesPath
  1.48  +4 -9  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- TagLibraryInfoImpl.java   2 Sep 2003 21:39:59 -   1.47
  +++ TagLibraryInfoImpl.java   23 Sep 2003 01:11:24 -  1.48
  @@ -243,13 +243,8 @@
* @param ctxt The JSP compilation context
* @param uri The TLD's uri
* @param in The TLD's input stream
  - * @param jarFile The JAR file containing the TLD, or null if the tag
  + * @param jarFileUrl The JAR file containing the TLD, or null if the tag
* library is not packaged in a JAR
  - *
  - * @return true if jarFile is different from null and the TLD represented
  - * by the given input stream contains one or more tag files packaged in the
  - * given JAR (that is, one or more tag files whose path element starts
  - * with /META-INF/tags), and false otherwise
*/
   private void parseTLD(JspCompilationContext ctxt,
  String uri, InputStream in, URL jarFileUrl) 
  
  
  

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



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

2003-09-22 Thread luehe
luehe   2003/09/22 18:19:53

  Modified:jasper2/src/share/org/apache/jasper/compiler
TldLocationsCache.java
  Log:
  Avoid scanning the JARs under WEB-INF/lib twice
  
  Revision  ChangesPath
  1.21  +18 -39
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
  
  Index: TldLocationsCache.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TldLocationsCache.java2 Sep 2003 21:39:59 -   1.20
  +++ TldLocationsCache.java23 Sep 2003 01:19:52 -  1.21
  @@ -203,9 +203,8 @@
   if (initialized) return;
   try {
   processWebDotXml();
  -processJars();
  +scanJars();
processTldsInFileSystem(/WEB-INF/);
  - processTldsInGlobalJars();
   initialized = true;
   } catch (Exception ex) {
   throw new 
JasperException(Localizer.getMessage(jsp.error.internal.tldinit,
  @@ -265,39 +264,15 @@
   }
   
   /**
  - * Processes any JAR files contained in this web application's
  - * WEB-INF/lib directory.
  - */
  -private void processJars() throws Exception {
  -
  -Set libSet = ctxt.getResourcePaths(/WEB-INF/lib);
  -if (libSet != null) {
  -Iterator it = libSet.iterator();
  -while (it.hasNext()) {
  -String resourcePath = (String) it.next();
  -if (resourcePath.endsWith(JAR_FILE_SUFFIX)) {
  - URL url = ctxt.getResource(resourcePath);
  - if (url == null)
  - return;
  - URL jarURL = new URL(jar: + url.toString() + !/);
  - processTldsInJar((JarURLConnection) jarURL.openConnection(),
  -  false);
  - }
  -}
  -}
  -}
  -
  -/**
  - * Parses any TLD files located in the META-INF directory (or any 
  - * subdirectory of it) of the JAR file at the given resource path, and adds
  - * an implicit map entry to the taglib map for any TLD that has a uri
  - * element.
  + * Scans the given JarURLConnection for TLD files located in META-INF
  + * (or a subdirectory of it), adding an implicit map entry to the taglib
  + * map for any TLD that has a uri element.
*
  - * @param conn The JarURLConnection to the JAR file containing the TLDs
  + * @param conn The JarURLConnection to the JAR file to scan
* @param ignore true if any exceptions raised when processing the given
* JAR should be ignored, false otherwise
*/
  -private void processTldsInJar(JarURLConnection conn, boolean ignore)
  +private void scanJar(JarURLConnection conn, boolean ignore)
throws JasperException {
   
   JarFile jarFile = null;
  @@ -421,16 +396,20 @@
   }
   
   /*
  - * Processes any TLDs in all JAR files accessible to all parent
  - * classloaders of the web application's classloader.
  + * Scans all JARs accessible to the webapp's classloader and its
  + * parent classloaders for TLDs.
  + * 
  + * The list of JARs always includes the JARs under WEB-INF/lib, as well as
  + * all shared JARs in the classloader delegation chain of the webapp's
  + * classloader.
*
  - * This is a Tomcat-specific extension to the TLD search order defined in
  - * the JSP spec, which will allow tag libraries packaged as JAR
  + * The latter constitutes a Tomcat-specific extension to the TLD search
  + * order defined in the JSP spec. It allows tag libraries packaged as JAR
* files to be shared by web applications by simply dropping them in a 
* location that all web applications have access to (e.g.,
* CATALINA_HOME/common/lib).
*/
  -private void processTldsInGlobalJars() throws Exception {
  +private void scanJars() throws Exception {
   
ClassLoader loader = Thread.currentThread().getContextClassLoader();
while (loader != null) {
  @@ -439,14 +418,14 @@
for (int i=0; iurls.length; i++) {
URLConnection conn = urls[i].openConnection();
if (conn instanceof JarURLConnection) {
  - processTldsInJar((JarURLConnection) conn, true);
  + scanJar((JarURLConnection) conn, true);
} else {
String urlStr = urls[i].toString();
if (urlStr.startsWith(FILE_PROTOCOL)
 urlStr.endsWith(JAR_FILE_SUFFIX)) {
URL jarURL = new URL(jar: + urlStr + !/);
  - 

DO NOT REPLY [Bug 23146] - Calling socket.setTcpNoDelay causes connector to disconnect

2003-09-22 Thread 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=23146.
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=23146

Calling socket.setTcpNoDelay causes connector to disconnect

[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]
   Severity|Normal  |Blocker
  Component|Connector:HTTP/1.1  |Connector:Coyote HTTP/1.1
   |(deprecated)|
   Priority|Other   |High



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 03:57 ---
At Around 100 user load, (sometimes even lower) Tomcat stops responding, when
viewed in console this exception is thrown.

bash-2.03# Sep 21 03:16:04 raffles sendmail[7390]: [ID 702911 mail.alert] unable
to qualify my own domain name (raffles) -- using short name
java.net.SocketException: Invalid argument
at java.net.PlainSocketImpl.socketSetOption(Native Method)
at java.net.PlainSocketImpl.setOption(PlainSocketImpl.java:240)
at java.net.Socket.setSoLinger(Socket.java:814)
at
org.apache.tomcat.util.net.PoolTcpEndpoint.setSocketOptions(PoolTcpEndpoint.java:434)
at
org.apache.tomcat.util.net.TcpWorkerThread.runIt(PoolTcpEndpoint.java:533)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:530)
at java.lang.Thread.run(Thread.java:534)


Note: We recently ported our product from Jigsaw2.2.1 to Tomcat. As this issue
has resulted in our RC build which is now going through Performance testing,
product's release is on a hold till issue is resolved.

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



Re: [PROPOSAL] Narrow down the list of JARs to be scanned for TLDs

2003-09-22 Thread Remy Maucherat
Jan Luehe wrote:
Currently, any JARs in the classloader delegation chain of a webapp's
classloader are scanned for packaged TLDs. This is convenient, as it
allows a JAR-packaged taglib to be simply dropped in common/lib and
shared by all webapps, rather than requiring each webapp to bundle the
taglib in its own WEB-INF/lib.
However, scanning all available JARs for TLDs is not very efficient,
especially if the names of the JAR-packaged taglibs are known in
advance.
The proposal is to add a configurable String property (tldJarNames)
on Context, which specifies the comma-separated list of JAR file names
(without any path info) that must be scanned for TLDs.
Catalina will continue to traverse the classloader delegation chain,
but only consider those JARs that match the names in the
comma-separated list.
If a JAR appears more than once in the classloader delegation chain,
we will pick its first occurrence.
If the tldJarNames property is not set, Catalina will continue to scan 
 all JARs in the classloader delegation chain for TLDs.

Comments?
Same as Yoav. -0. much pain, no gain.

Remy

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


DO NOT REPLY [Bug 23340] - Web Server starts and immediately stops within a few seconds.

2003-09-22 Thread 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=23340.
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=23340

Web Server starts and immediately stops within a few seconds.

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-09-23 05:51 ---
This works fine for me. You likely have a badly setup JDK.
Otherwise, indicate how to reproduce the problem.

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



dynamically reloading webapps

2003-09-22 Thread Jason Novotny
   Hi,

   I'm using Tomcat 4.1.27 and I'm interested in teh features of the 
manager webapp.
Specifically I have a suite of web applications. One web application, 
call it master is a webapplication that requires access to the 
ServletContext objects of the other web applications, so I have 
configured the server.xml with the following:

   Context path=/master docBase=gridsphere debug=0 
reloadable=true crossContext=true
 Logger className=org.apache.catalina.logger.FileLogger 
prefix=localhost_master_log. suffix=.txt timestamp=true/
   /Context

   OK, now my question is it possible to use the manager webapp, so 
that can I dynamically reload one of the slave applications. However, my 
master webappliation then needs to get the new servlet context of the 
redeployed slave webapplication-- does this mean I also have to reload 
my master webapplication as well? Any experience from others that have 
done this is much appreciated.

   Thanks, Jason

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


[ANN] Apache Tomcat 5.0.12 Beta released

2003-09-22 Thread Remy Maucherat
The Tomcat Team announces the immediate availability of Apache Tomcat 
5.0.12 Beta.

Tomcat 5.0 contains many enhancements over Tomcat 4.1, including:
* Performance optimizations and reduced garbage collection
* Refactored application deployer, with an optional standalone deployer 
allowing validation and compilation of a web application before putting 
it in production
* Complete server monitoring using JMX and the manager web application
* Scalability and reliability enhancements
* Improved Taglibs handling, including advanced pooling and tag plugins
* Improved platform integration, with native Windows and Unix wrappers
* Embedding of Tomcat using JMX
* Enhanced Security Manager support
* Integrated session clustering
* Expanded documentation

Apache Tomcat 5.0.12 is a beta release, and contains the following known 
issues:
* Possible crash of the Windows .exe wrapper when attempting to view its 
console (which can be done by double clicking on the tray icon). This 
will be addressed in the next release.

Downloads:
Binaries: http://jakarta.apache.org/site/binindex.cgi
Sources: http://jakarta.apache.org/site/sourceindex.cgi
The Apache Tomcat Team

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