cvs commit: jakarta-tomcat/src/share/org/apache/jasper/resources messages_fr.properties
hgomez 01/02/16 01:50:43
Modified:src/share/org/apache/jasper/resources messages_fr.properties
Log:
Corrections on my previous translation
Revision ChangesPath
1.4 +7 -7
jakarta-tomcat/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- messages_fr.properties2001/01/14 20:45:41 1.3
+++ messages_fr.properties2001/02/16 09:50:42 1.4
@@ -1,4 +1,4 @@
-# $Id: messages_fr.properties,v 1.3 2001/01/14 20:45:41 larryi Exp $
+# $Id: messages_fr.properties,v 1.4 2001/02/16 09:50:42 hgomez Exp $
#
# Default localized string information
# Localized this the Default Locale as is fr_FR
@@ -52,7 +52,7 @@
jsp.error.page.nomapping.language=Directive de page: Pas de correspondance pour
language:
jsp.error.page.multiple.extends=Directive de page: impossible d''avoir plusieurs
occurrences de extends
jsp.error.page.bad_b_and_a_combo=Directive de page: Combinaison illegale de
buffer=\"none\" autoFlush=\"false\"
-jsp.error.not.impl.taglib=Erreur interne: Extensions Tag non implementées
+jsp.error.not.impl.taglib=Erreur interne: Extensions Tag non implémentées
jsp.error.include.missing.file=Argument fichier manquant pour include
jsp.error.include.bad.file=Argument fichier incorrect pour include
jsp.error.include.exception=Incapable d'inclure {0}
@@ -85,19 +85,19 @@
jsp.error.beans.nomethod=Impossible de trouver une méthode pour lire la propriété
''{0}'' dans le bean de type ''{1}''
jsp.error.beans.nomethod.setproperty=Impossible de trouver une méthode pour écrire
la propriété ''{0}'' dans le bean de type ''{1}''
jsp.error.beans.noproperty=Impossible de trouver aucune information sur la
propriété ''{0}'' dans le bean de type ''{1}''
-jsp.error.beans.setproperty.noindexset=Impossible de renseigner la propriété indéxée
+jsp.error.beans.setproperty.noindexset=Impossible de renseigner la propriété indexée
jsp.error.include.tag=Tag jsp:include invalide
jsp.error.include.noflush=jsp:include doit avoir \"flush=true\"
jsp.error.include.badflush=jsp:include page=\"...\" flush=\"true\" est la seule
combinaison valide en JSP 1.0
jsp.error.attempt_to_clear_flushed_buffer=Erreur: Tentavie d''effacement d'un
buffer qui a déjà été purgé
jsp.error.overflow=Erreur: Débordement de buffer JSP (JSP Buffer overflow)
-jsp.error.paramexpected=Le tag \"param\" attendu avec \"name\" et \"value\" comme
attibuts après le tag \"params\".
+jsp.error.paramexpected=Le tag \"param\" attendu avec \"name\" et \"value\" comme
attributs après le tag \"params\".
jsp.error.closeindividualparam=Le tag param doit être fermé avec \"/\"
jsp.error.closeparams=Le tag param doit être fermé avec /params
jsp.error.plugin.notype=Type non déclaré dans jsp:plugin
jsp.error.plugin.nocode=Code non déclaré dans jsp:plugin
jsp.error.plugin.notclosed=jsp:plugin non fermé
-jsp.error.ise_on_clear=Il est interdit d''utiliser clear() quand le buffer est vide
+jsp.error.ise_on_clear=Il est interdit d''utiliser clear() quand le tampon est vide
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} introuvable
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} introuvable
jsp.error.setproperty.ClassNotFound=setProperty: Classe {0} introuvable
@@ -156,7 +156,7 @@
jspc.usage=Usage: jspc options [--] jsp files\n\
ou les fichiers jsp peuvent multiples et :\n\
\file Un fichier sera traitée comme une page jsp\n\
-\-webapp dir Un pertoire contentant une web-app, toutes les pages jsp\n\
+\-webapp dir Un répertoire contentant une web-app, toutes les pages jsp\n\
\ seront traitées de manière récursive\n\
avec des options comme:\n\
\-q Mode silencieux (comme pour -v0)\n\
@@ -183,7 +183,7 @@
\PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"\n\
\"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"\n\
!--\n\
-Automatically created by Tomcat JspC.\n\
+Automatiquement crée par Tomcat JspC.\n\
--\n\
web-app\n\
\n
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/resources LocalStrings_fr.properties
hgomez 01/02/16 01:52:32 Added: src/share/org/apache/tomcat/resources LocalStrings_fr.properties Log: Translation in french of core tomcat message It's the last of the serie. All messages are now fully in French and we wait for ro_RO Revision ChangesPath 1.2 +185 -0 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_fr.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 01/02/16 07:14:09 Modified:.Tag: tomcat_32 build.xml Log: Port Costin's change from Tomcat 3.3. Fix bug #482 ( build fails on certain JDKs, build.compiler is wrong ). There is no reason to force a compiler. Revision ChangesPath No revision No revision 1.53.2.6 +0 -1 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.53.2.5 retrieving revision 1.53.2.6 diff -u -r1.53.2.5 -r1.53.2.6 --- build.xml 2000/11/12 01:19:27 1.53.2.5 +++ build.xml 2001/02/16 15:14:08 1.53.2.6 @@ -3,7 +3,6 @@ !-- Initialization properties = -- property name="ant.home" value="../jakarta-ant"/ - property name="build.compiler" value="classic"/ property name="debug" value="on"/ property name="j2ee.home" value="../../j2ee/build/unix"/ property name="jaxp" value="../jaxp-1.0.1" / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/test GTest.java
larryi 01/02/16 13:54:26 Modified:src/share/org/apache/tomcat/util/test GTest.java Log: Retrieve failure message so it appears in the output Revision ChangesPath 1.11 +1 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java Index: GTest.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- GTest.java2001/02/09 03:48:15 1.10 +++ GTest.java2001/02/16 21:54:25 1.11 @@ -321,6 +321,7 @@ HttpResponse resp=httpRequest.getHttpResponse(); result=httpClient.getResult(); + failMessage=httpClient.getFailureMessage(); if( "text".equals(outType) ) textReport(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser TreeNode.java
craigmcc01/02/16 14:17:10
Modified:jasper/src/share/org/apache/jasper/compiler JspUtil.java
TagLibraryInfoImpl.java TldLocationsCache.java
jasper/src/share/org/apache/jasper/parser TreeNode.java
Log:
Stage 2 of making Jasper able to load an XML parser from a different class
loader.
* Modified TagLibraryInfoImpl (which parses TLDs) to use the new
parsing routines instead of the old ones in JspUtil.
* Added findChild("name") method to TreeNode, to optimize the very
common case where there is only one child with a given name.
* Updated TldLocationsCache (which scans web.xml files) to use the
new findChild() method.
* Deprecated the JspUtils.parseXMLDoc() method since nobody is now
using it.
Before going on to Stage 3 (parsing JSP pages in XML syntax), it is
necessary to go implement the special classloader stuff. That's next.
Revision ChangesPath
1.8 +7 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
Index: JspUtil.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JspUtil.java 2000/11/30 21:47:55 1.7
+++ JspUtil.java 2001/02/16 22:17:02 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
1.7 2000/11/30 21:47:55 pierred Exp $
- * $Revision: 1.7 $
- * $Date: 2000/11/30 21:47:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
1.8 2001/02/16 22:17:02 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/02/16 22:17:02 $
*
*
*
@@ -191,6 +191,8 @@
/**
* Parses the XML document contained in the InputStream.
+ *
+ * @deprecated Use ParserUtils.parseXMLDocument() instead
*/
public static Document parseXMLDoc(String uri, InputStream in)
throws JasperException
@@ -202,6 +204,8 @@
* Parses the XML document contained in the InputStream.
* This XML document is either web.xml or a tld.
* [The TLD has to be cached internally (see MyEntityResolver)]
+ *
+ * @deprecated Use ParserUtils.parseXMLDocument() instead
*/
public static Document parseXMLDocJaxp(String uri, InputStream in)
throws JasperException
1.19 +149 -155
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TagLibraryInfoImpl.java 2001/02/04 01:05:46 1.18
+++ TagLibraryInfoImpl.java 2001/02/16 22:17:04 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.18 2001/02/04 01:05:46 glenn Exp $
- * $Revision: 1.18 $
- * $Date: 2001/02/04 01:05:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.19 2001/02/16 22:17:04 craigmcc Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/02/16 22:17:04 $
*
* The Apache Software License, Version 1.1
*
@@ -62,6 +62,7 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.net.JarURLConnection;
+import java.util.Iterator;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipEntry;
import java.util.jar.*;
@@ -89,8 +90,8 @@
import javax.servlet.jsp.tagext.VariableInfo;
import javax.servlet.jsp.tagext.TagVariableInfo;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+// import org.w3c.dom.*;
+// import org.xml.sax.*;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.JasperException;
@@ -98,6 +99,10 @@
import org.apache.jasper.logging.Logger;
+import org.apache.jasper.parser.ParserUtils;
+import org.apache.jasper.parser.TreeNode;
+
+
/**
* Implementation of the TagLibraryInfo class from the JSP spec.
*
@@ -109,8 +114,6 @@
static private final String TAGLIB_TLD = "META-INF/taglib.tld";
static private final String WEB_XML = "/WEB-INF/web.xml";
-Document tld;
-
Hashtable jarEntries;
JspCompilationContext ctxt;
@@ -263,45 +266,50 @@
private void parseTLD(String uri, InputStream in)
throws JasperException
{
- tld = JspUtil.parseXMLDoc(uri, in);
+
Vector tagVector =
mod_webapp status??
What is the status of the warp connector? I am currently using catalina/jasper in a production environment. But I definitely have need for mod_webapp. Thanks, Dave __ Do You Yahoo!? Get personalized email addresses from Yahoo! Mail - only $35 a year! http://personal.mail.yahoo.com/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Problem running external applications
There seems to be a problem with Tomcat running
external programs. I'm trying to use the keytool that is distributed with JDK
1.2.2 through a Servlet running on Tomcat.
The Bean code snippet is as follows:
--
. . . . .
StringBuffer command = new
StringBuffer();
. . . . . .//get a
Runtime to interface with the environment in which the application is
runningRuntime rt =
Runtime.getRuntime();try
{//execute the keytool command and get the
returned Processp =
rt.exec(command.toString());}
catch(IOException ioe) {throw new
DigitalSignatureException(ioe.getMessage());}
catch (SecurityException se) {throw new
DigitalSignatureException(se.getMessage());}try
{//tell the database that the user
now haskeypairs for a digital
signature.DBEFDigitalSignature.newDigitalSignature(db,
keyAlias, userID);}
catch(SQLException sqle) {throw new
DigitalSignatureException(sqle.getMessage());}
---
As you can see, I get a Runtime instance and try to
execute a command.
A new keystore is supposed to be created if one
does not exists. However, no keystore is created and no exception is thrown. But
the exit value of the Process is not 0, indicating that the process did not execute correctly. However, the command works fine
from the command line. This leads me to believe that Tomcat has a problem
running external programs. Is this the
case?
Leon Bailey
Software Engineer
IRG, Inc : http://www.irgcorp.com
Problem with multiple forms handled by the same servlet
Hi, I am having an HTML page with multiple forms and all of them are handled by the same servlet. The forms are resolved using hidden field in the servlet. With catalina 4.0 beta (build) when I hit back in IE and submit second form in the page. I get blank page. If I recompile the servlet, then I get the response but again same thing repeats when I hit back again. Does anyone know why is it so? Any comments? Sorry if this bug has been reported. I could not find such entry in the mailing list archive. Chandra __ Do You Yahoo!? Get personalized email addresses from Yahoo! Mail - only $35 a year! http://personal.mail.yahoo.com/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [Bug 486] Changed - ????? instead of content of @include pages when contentType present in root page BugRat Report#817
I exchanged email with Ilyin in late January about this bug. I was able to duplicate the problem using tomcat_322_final, but the bug had already been fixed on the tip of the tomcat_32 branch. I didn't dig any deeper into the issue to see which commit actually fixed the problem. Attached are the samples files that he sent me to use for testing. I can also generate files in Japanese if that would help. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 15, 2001 11:30 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: [Bug 486] Changed - ? instead of content of @include pages when contentType present in root page BugRat Report#817 http://nagoya.apache.org/bugzilla/show_bug.cgi?id=486 *** shadow/486Sat Feb 3 11:43:09 2001 --- shadow/486.tmp.7159 Thu Feb 15 21:29:52 2001 *** *** 2,13 | ? instead of content of @include pages when contentType present in roo | +- ---+ |Bug #: 486 Product: Tomcat 3 | ! | Status: NEW Version: 3.2.1 Final | | Resolution:Platform: All | | Severity: Normal OS/Version: All | | Priority: High Component: Encoding | +- ---+ ! | Assigned To: [EMAIL PROTECTED] | | Reported By: [EMAIL PROTECTED] | | CC list: Cc: | +- ---+ --- 2,13 | ? instead of content of @include pages when contentType present in roo | +- ---+ |Bug #: 486 Product: Tomcat 3 | ! | Status: UNCONFIRMED Version: 3.2.1 Final | | Resolution:Platform: All | | Severity: Normal OS/Version: All | | Priority: High Component: Encoding | +- ---+ ! | Assigned To: [EMAIL PROTECTED] | | Reported By: [EMAIL PROTECTED] | | CC list: Cc: | +- ---+ *** *** 19,21 --- 19,25 in root jsp page and use @include I see instead of russian characters - ? in included files. When I remove contentType='text/html; charset=Windows-1251' all include OK. Can you make default encoding property in web.xml (or somewhere) to change default encoding from ISO to my prefered one. + + + --- Additional Comments From [EMAIL PROTECTED] 2001-02-15 21:29 --- + Can't reproduce - please include 2 jsp files with russian characters. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] include.zip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Problem with multiple forms handled by the same servlet
Hi, I am having an HTML page with multiple forms and all of them are handled by the same servlet. The forms are resolved using hidden field in the servlet. With catalina 4.0 beta (build) when I hit back in IE and submit second form in the page. I get blank page. If I recompile the servlet, then I get the response but again same thing repeats when I hit back again. Does anyone know why is it so? Any comments? Sorry if this bug has been reported. I could not find such entry in the mailing list archive. The problem looks similar to bug #233, which should be fixed in beta 2. Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Any plan to support status 304 ?
The Tomcat 3.2 standalone does not seem to support http status code 304
('if-modified-since', code SC_NOT_MODIFIED) and is always sending back the
entire file, even it has not been modified.
Is it going to be supported by versions '3.3' or 4.0 ?
Should I file a request for it in the bug system ?
Thanks,
Tal
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: [Bug 486] Changed - ????? instead of content of @include pageswhen contentType present in root page BugRat Report#817
Thanks Marc, Ilyin, I can reproduce the bug, it's very strange ( most of the time I see normal cyrilic characters, but some times I do see ). I'll start working, I hope to have patch in few days. Costin On Fri, 16 Feb 2001, Marc Saegesser wrote: I exchanged email with Ilyin in late January about this bug. I was able to duplicate the problem using tomcat_322_final, but the bug had already been fixed on the tip of the tomcat_32 branch. I didn't dig any deeper into the issue to see which commit actually fixed the problem. Attached are the samples files that he sent me to use for testing. I can also generate files in Japanese if that would help. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 15, 2001 11:30 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: [Bug 486] Changed - ? instead of content of @include pages when contentType present in root page BugRat Report#817 http://nagoya.apache.org/bugzilla/show_bug.cgi?id=486 *** shadow/486 Sat Feb 3 11:43:09 2001 --- shadow/486.tmp.7159 Thu Feb 15 21:29:52 2001 *** *** 2,13 | ? instead of content of @include pages when contentType present in roo | +- ---+ |Bug #: 486 Product: Tomcat 3 | ! | Status: NEW Version: 3.2.1 Final | | Resolution:Platform: All | | Severity: Normal OS/Version: All | | Priority: High Component: Encoding | +- ---+ ! | Assigned To: [EMAIL PROTECTED] | | Reported By: [EMAIL PROTECTED] | | CC list: Cc: | +- ---+ --- 2,13 | ? instead of content of @include pages when contentType present in roo | +- ---+ |Bug #: 486 Product: Tomcat 3 | ! | Status: UNCONFIRMED Version: 3.2.1 Final | | Resolution:Platform: All | | Severity: Normal OS/Version: All | | Priority: High Component: Encoding | +- ---+ ! | Assigned To: [EMAIL PROTECTED] | | Reported By: [EMAIL PROTECTED] | | CC list: Cc: | +- ---+ *** *** 19,21 --- 19,25 in root jsp page and use @include I see instead of russian characters - ? in included files. When I remove contentType='text/html; charset=Windows-1251' all include OK. Can you make default encoding property in web.xml (or somewhere) to change default encoding from ISO to my prefered one. + + + --- Additional Comments From [EMAIL PROTECTED] 2001-02-15 21:29 --- + Can't reproduce - please include 2 jsp files with russian characters. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] -- Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Any plan to support status 304 ?
The Tomcat 3.2 standalone does not seem to support http status code 304
('if-modified-since', code SC_NOT_MODIFIED) and is always sending back the
entire file, even it has not been modified.
Is it going to be supported by versions '3.3' or 4.0 ?
All HTTP/1.1 ifs headers should be supported in 4.0, as well as ranged
requests (for resuming), and many other things.
If you're using TC in standalone mode, I would recommend upgrading to 4.0
beta 2 when it's released.
Remy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: Any plan to support status 304 ?
Sounds great.
Will 4.0 beta 2.0 be production worthy ?
Tal
-Original Message-
From: Remy Maucherat [mailto:[EMAIL PROTECTED]]
Sent: Friday, February 16, 2001 8:22 PM
To: [EMAIL PROTECTED]
Subject: Re: Any plan to support status 304 ?
The Tomcat 3.2 standalone does not seem to support http status code 304
('if-modified-since', code SC_NOT_MODIFIED) and is always
sending back the
entire file, even it has not been modified.
Is it going to be supported by versions '3.3' or 4.0 ?
All HTTP/1.1 ifs headers should be supported in 4.0, as well as ranged
requests (for resuming), and many other things.
If you're using TC in standalone mode, I would recommend upgrading to 4.0
beta 2 when it's released.
Remy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade Servlet22Interceptor.java
costin 01/02/16 23:08:18
Modified:src/facade22/org/apache/tomcat/facade
Servlet22Interceptor.java
Log:
Fix for the destroy() bug reported by [EMAIL PROTECTED]
Now both jspDestroy() and destroy() should work ( please check the next
nigthly build ).
The fix is specific to 3.3.
( BTW, I can try to do a fix in 3.2.x, but if the bug is present in 3.2.1
and it's not a regression I would rather fix other bugs in 3.3 )
The problem was that the servlet was removed from context, and then
destroy() did nothing ( it checks if the servlet is initialized - when
it's removed from the context the servlet is no longer in a "stable"
state, it's orphan )
Revision ChangesPath
1.11 +8 -2
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Servlet22Interceptor.java 2001/01/01 00:17:22 1.10
+++ Servlet22Interceptor.java 2001/02/17 07:08:18 1.11
@@ -116,14 +116,20 @@
while (enum.hasMoreElements()) {
String key = (String)enum.nextElement();
Handler wrapper = ctx.getServletByName( key );
- if( ! (wrapper instanceof ServletHandler) )
+
+ if( ! (wrapper instanceof ServletHandler) )
continue;
- ctx.removeServletByName( key );
+
try {
((ServletHandler)wrapper).destroy();
} catch(Exception ex ) {
ctx.log( "Error in destroy ", ex);
}
+ // remove the context after it is destroyed.
+ // remove will "un-declare" the servlet
+ // After this the servlet will be in STATE_NEW, and can
+ // be reused.
+ ctx.removeServletByName( key );
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
costin 01/02/16 23:09:02
Modified:src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Remove log messages.
Revision ChangesPath
1.7 +3 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PoolTcpEndpoint.java 2000/12/07 19:52:56 1.6
+++ PoolTcpEndpoint.java 2001/02/17 07:09:02 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
1.6 2000/12/07 19:52:56 costin Exp $
- * $Revision: 1.6 $
- * $Date: 2000/12/07 19:52:56 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
1.7 2001/02/17 07:09:02 costin Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/02/17 07:09:02 $
*
*
*
@@ -258,9 +258,7 @@
}
public void stopEndpoint() {
- log("Stopping endpoint");
if (running) {
- log("Stack trace that called stopEndpoint():", new Throwable("trace"),
Logger.DEBUG);
tp.shutdown();
running = false;
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/life - New directory
costin 01/02/16 23:10:55 jakarta-tomcat/src/tests/webpages/life - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF/classes/life - New directory
costin 01/02/16 23:11:46 jakarta-tomcat/src/tests/webpages/WEB-INF/classes/life - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/enc - New directory
costin 01/02/16 23:12:01 jakarta-tomcat/src/tests/webpages/enc - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/tests/webpages/life destroy.jsp
costin 01/02/16 23:15:15
Added: src/tests/webpages manual-tests.html
src/tests/webpages/WEB-INF/classes/life destroy.java
src/tests/webpages/enc incTest.inc test.jsp testError.jsp
src/tests/webpages/life destroy.jsp
Log:
Added the new contributed tests. Not automated yet, destroy is not easy
to automate and I'm still figuring how to type KOI8 in xemacs.
( I'll add more tests in 8859-2 - Central/East European charset )
Submitted by: Jason Novotny [EMAIL PROTECTED], [EMAIL PROTECTED]
Revision ChangesPath
1.1 jakarta-tomcat/src/tests/webpages/manual-tests.html
Index: manual-tests.html
===
h2Not Yet Automated Tests/h2
h3Destroy/h3
You need to check the logs for the messages:
h3foo/h3
1.1
jakarta-tomcat/src/tests/webpages/WEB-INF/classes/life/destroy.java
Index: destroy.java
===
package life;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
public class destroy extends HttpServlet {
public void init() throws ServletException {
System.out.println("GPDK init");
}
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("html");
out.println("head");
out.println("titleHello, World!/title");
out.println("/head");
out.println("body bgcolor=\"white\"");
out.println("h1Hello World!/h1");
out.println("body");
out.println("/html");
}
public void destroy() {
System.out.println("GPDK destroy");
}
}
1.1 jakarta-tomcat/src/tests/webpages/enc/incTest.inc
Binary file
1.1 jakarta-tomcat/src/tests/webpages/enc/test.jsp
Index: test.jsp
===
%@ page import="java.util.*" %
html
headtitleôÅÓÔ ÉÎËÌÕÄÁ/title/head
%= new Date() %br
üÔÏ × ÒÕÔÅ ÔÅËÓÔbr
-br
%@ include file="incTest.inc"%
br-
ÓÎÏ×Á × ÒÕÔÅ
/body
/html
1.1 jakarta-tomcat/src/tests/webpages/enc/testError.jsp
Index: testError.jsp
===
%@ page import="java.util.*" contentType="text/html; charset=KOI8-r"%
html
headtitleôÅÓÔ ÉÎËÌÕÄÁ/title/head
%= new Date() %br
üÔÏ × ÒÕÔÅ ÔÅËÓÔbr
-br
%@ include file="incTest.inc"%
br-
ÓÎÏ×Á × ÒÕÔÅ
/body
/html
1.1 jakarta-tomcat/src/tests/webpages/life/destroy.jsp
Index: destroy.jsp
===
%! public void jspDestroy() {
System.out.println("JSP destroy");
}
%
Hello World
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
