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

2003-10-27 Thread remm
remm2003/10/26 23:39:20

  Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
  Log:
  - Port patch.
  
  Revision  ChangesPath
  1.11  +16 -5 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
  
  Index: StandardDefaultContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StandardDefaultContext.java   21 Oct 2003 00:22:57 -  1.10
  +++ StandardDefaultContext.java   27 Oct 2003 07:39:19 -  1.11
  @@ -1341,7 +1341,14 @@
   }
   listener.addResource(contextEntry);
   }
  -String [] envRefs = findResourceEnvRefs();
  +ContextResourceLink [] resourceLinks = findResourceLinks();
  +for (int i = 0; i  resourceLinks.length; i++) {
  +ContextResourceLink contextEntry = resourceLinks[i];
  +if (contextResources.exists(contextEntry.getName())) {
  +listener.removeResourceLink(contextEntry.getName());
  +}
  +listener.addResourceLink(contextEntry);
  +}String [] envRefs = findResourceEnvRefs();
   for (int i = 0; i  envRefs.length; i++) {
   if (contextResources.exists(envRefs[i])) {
   listener.removeResourceEnvRef(envRefs[i]);
  @@ -1468,6 +1475,10 @@
   ContextResource [] resources = findResources();
   for( int i = 0; i  resources.length; i++ ) {
   context.addResource(resources[i]);
  +}
  +ContextResourceLink [] resourceLinks = findResourceLinks();
  +for( int i = 0; i  resourceLinks.length; i++ ) {
  +context.addResourceLink(resourceLinks[i]);
   }
   String [] envRefs = findResourceEnvRefs();
   for( int i = 0; i  envRefs.length; i++ ) {
  
  
  

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



cvs commit: jakarta-tomcat-4.0 build.properties.sample

2003-10-27 Thread remm
remm2003/10/27 00:03:35

  Modified:.build.properties.sample
  Log:
  - Upgrade to pool 1.1 and DBCP 1.1.
  
  Revision  ChangesPath
  1.71  +5 -5  jakarta-tomcat-4.0/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- build.properties.sample   23 Oct 2003 15:32:09 -  1.70
  +++ build.properties.sample   27 Oct 2003 08:03:35 -  1.71
  @@ -161,17 +161,17 @@
   
   
   # - Commons DBCP, version 1.0 or later -
  -commons-dbcp.home=${base.path}/commons-dbcp-1.0
  +commons-dbcp.home=${base.path}/commons-dbcp-1.1
   commons-dbcp.lib=${commons-dbcp.home}
  -commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
  -commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.0.tar.gz
  +commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.1.jar
  
+commons-dbcp.loc=http://archive.apache.org/dist/jakarta/commons/dbcp/binaries/commons-dbcp-1.1.tar.gz
   
   
   # - Commons Pool, version 1.0 or later -
   commons-pool.home=${base.path}/commons-pool-1.1
   commons-pool.lib=${commons-pool.home}
   commons-pool.jar=${commons-pool.lib}/commons-pool-1.1.jar
  -commons-pool.loc=${base-jakarta.loc}/commons/pool/binaries/commons-pool-1.1.tar.gz
  
+commons-pool.loc=http://archive.apache.org/dist/jakarta/commons/pool/binaries/commons-pool-1.1.tar.gz
   
   
   # - JavaService, version 1.2.0 or later -
  
  
  

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



Re: cvs commit: jakarta-tomcat-4.0 build.properties.sample

2003-10-27 Thread jean-frederic clere
[EMAIL PROTECTED] wrote:
remm2003/10/27 00:03:35

  Modified:.build.properties.sample
  Log:
  - Upgrade to pool 1.1 and DBCP 1.1.
  
  Revision  ChangesPath
  1.71  +5 -5  jakarta-tomcat-4.0/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- build.properties.sample	23 Oct 2003 15:32:09 -	1.70
  +++ build.properties.sample	27 Oct 2003 08:03:35 -	1.71
  @@ -161,17 +161,17 @@
   
   
   # - Commons DBCP, version 1.0 or later -
  -commons-dbcp.home=${base.path}/commons-dbcp-1.0
  +commons-dbcp.home=${base.path}/commons-dbcp-1.1
   commons-dbcp.lib=${commons-dbcp.home}
  -commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
  -commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.0.tar.gz
  +commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.1.jar
  +commons-dbcp.loc=http://archive.apache.org/dist/jakarta/commons/dbcp/binaries/commons-dbcp-1.1.tar.gz
${base-jakarta.loc} is http://archive.apache.org/dist/jakarta, why don't you use it?

   
   
   # - Commons Pool, version 1.0 or later -
   commons-pool.home=${base.path}/commons-pool-1.1
   commons-pool.lib=${commons-pool.home}
   commons-pool.jar=${commons-pool.lib}/commons-pool-1.1.jar
  -commons-pool.loc=${base-jakarta.loc}/commons/pool/binaries/commons-pool-1.1.tar.gz
  +commons-pool.loc=http://archive.apache.org/dist/jakarta/commons/pool/binaries/commons-pool-1.1.tar.gz
   
   
   # - JavaService, version 1.2.0 or later -
  
  
  

-
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]


jk binaries and new mirorring

2003-10-27 Thread Henri Gomez
Hi to all,

Some people ask me for jk 1.2.5 iSeries binaries.

I will build it but where should I upload it to make it later
replicated on mirrors site ?
Regards

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


Re: mod_jk timeout?

2003-10-27 Thread Henri Gomez
Brian Maher a écrit :

I noticed this message from Glenn Nielsen recently on this mailing list:

http://www.mail-archive.com/[EMAIL PROTECTED]/msg47341.html

It appears that hgomez submitted a bunch of code that allows you to 
configure a ping/pong mechanism that helps it detect hung tomcats.  I'm 
very much interested in this code, but wonder if it could also detect an 
aborted apache process?

Here is a simple test I performed recently with my server configured 
like this: (Apache (1.3.x)  ---(mod_jk)--  Tomcat 4.1).  On all my 
apache requests, I set a hard_timeout() using mod_perl.  It is pretty 
easy to see that this hard_timeout works fine by looking at apache's 
/server-status page.  My next test was to see if this hard_timeout() 
worked for Tomcat.  So, I wrote a simple JSP page as such:

%
   while(1) {
  Thread.sleep(10);
  System.out.println(hi\n);
  }
%
When I request this page and tail my log file, I see hi printed over 
and over as I would expect to see.  However, the disturbing part is that 
even after the hard_timeout() has expired, this thread is still 
executing (since I see a bunch of hi\n in my log file).  I check 
apache's /server-status page and the process that was servicing the 
request is long gone.

Could this recently submitted ping/pong code also be used from the java 
side to detect when the Apache side is no longer servicing the request?

I'd be willing to help make this happen if someone could give me some 
guidance.
The timeout support help the native side detect a problem on the java
side, for exemple a HUNG tomcat.
If the thread on java side is a long running task or a blocking task,
it should be handled by the servlet engine and sus some watchdog support
should be added in Tomcat.
In you're exemple I didn't know how the thread could be ever finished !!!

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


Re: mod_jk timeout?

2003-10-27 Thread matthias.ernst
On Mon, 27 Oct 2003, Henri Gomez wrote:

 If the thread on java side is a long running task or a blocking task,
 it should be handled by the servlet engine and sus some watchdog support
 should be added in Tomcat.

 In you're exemple I didn't know how the thread could be ever finished !!!

In theory, that's what Thread#interrupt is for. It asks the thread to shut
down, resulting in setting the #interrupted flag / an InterruptedException
on potentially blocking calls such as wait() or sleep(). One could
interrupt named jsp like that.

However, dealing correctly with InterruptedExceptions is hard (you should
leave your objects in a meaningful state) and since InterruptedException
also is a checked exception, many people choose to
catch(InterruptedException ie) {}, even(?) Sun ORB code does so (not to
speak of my own).

Those threads are inevitably lost.


Matthias
-- 
Matthias Ernst
Software Engineer

CoreMedia - Smart Content Technology


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



Re: jk binaries and new mirorring

2003-10-27 Thread jean-frederic clere
Henri Gomez wrote:
Hi to all,

Some people ask me for jk 1.2.5 iSeries binaries.

I will build it but where should I upload it to make it later
replicated on mirrors site ?
Things in /www/www.apache.org/dist/jakarta get mirrored.

Regards

-
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]


cvs commit: jakarta-tomcat-4.0 build.properties.sample

2003-10-27 Thread remm
remm2003/10/27 05:35:23

  Modified:.build.properties.sample
  Log:
  - Fix locations. Thanks JF.
  
  Revision  ChangesPath
  1.72  +3 -3  jakarta-tomcat-4.0/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- build.properties.sample   27 Oct 2003 08:03:35 -  1.71
  +++ build.properties.sample   27 Oct 2003 13:35:23 -  1.72
  @@ -164,14 +164,14 @@
   commons-dbcp.home=${base.path}/commons-dbcp-1.1
   commons-dbcp.lib=${commons-dbcp.home}
   commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.1.jar
  
-commons-dbcp.loc=http://archive.apache.org/dist/jakarta/commons/dbcp/binaries/commons-dbcp-1.1.tar.gz
  +commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.1.tar.gz
   
   
   # - Commons Pool, version 1.0 or later -
   commons-pool.home=${base.path}/commons-pool-1.1
   commons-pool.lib=${commons-pool.home}
   commons-pool.jar=${commons-pool.lib}/commons-pool-1.1.jar
  
-commons-pool.loc=http://archive.apache.org/dist/jakarta/commons/pool/binaries/commons-pool-1.1.tar.gz
  +commons-pool.loc=${base-jakarta.loc}/commons/pool/binaries/commons-pool-1.1.tar.gz
   
   
   # - JavaService, version 1.2.0 or later -
  
  
  

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



cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.1.txt

2003-10-27 Thread remm
remm2003/10/27 05:40:27

  Modified:.RELEASE-NOTES-4.1.txt
  Log:
  - Update release notes.
  
  Revision  ChangesPath
  1.81  +18 -5 jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt
  
  Index: RELEASE-NOTES-4.1.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- RELEASE-NOTES-4.1.txt 7 Oct 2003 13:27:38 -   1.80
  +++ RELEASE-NOTES-4.1.txt 27 Oct 2003 13:40:27 -  1.81
  @@ -70,6 +70,9 @@
Coyote 1.1, which is the one used by Tomcat 5.0.x. Please refer to the
Tomcat 5.0 changelog for the list of changes.
   
  +[4.1.29] DBCP:
  + Upgrade to DBCP 1.1.
  +
   
   -
   Catalina New Features:
  @@ -140,6 +143,10 @@
http://www.w3.org/TR/WD-logfile.html for more information
about the format. 
   
  +[4.1.29] DefaultContext:
  + Added support for nesting a Context Listener and a Webapp Loader 
  + within a DefaultContext.
  +
   
   ---
   Jasper New Features:
  @@ -827,6 +834,9 @@
   [4.1.28] MemoryUser:
XML-escape the values when writing out the tomcat-users.xml file.
   
  +[4.1.29] StandardDefaultContext:
  + Fix support for defining ResourceLink.
  +
   
   
   Coyote Bug Fixes:
  @@ -1384,7 +1394,7 @@
   * Tomcat 4.1 Standard APIs Available
   * Tomcat 4.1 and XML Parsers
   * Web application reloading and static fields in shared libraries
  -* Linux and Sun JDK 1.2.x - 1.3.x
  +* Tomcat on Linux
   * Enabling SSI and CGI Support
   * Security manager URLs
   * Symlinking static resources
  @@ -1469,9 +1479,9 @@
   lib folder, and classes should be put in the classes folder).
   
   
  
  -Linux and Sun JDK 1.2.x - 1.3.x:
  
  +---
  +Tomcat on Linux:
  +---
   
   Virtual machine crashes can be experienced when using certain combinations of
   kernel / glibc under Linux with Sun Hotspot 1.2 to 1.3. The crashes were 
  @@ -1483,6 +1493,9 @@
   
   GLIBC 2.2 / Linux 2.4 users should also define an environment variable:
   export LD_ASSUME_KERNEL=2.2.5
  +
  +Additionally, Redhat 9.0 users should use the same setting, to avoid stability
  +problems.
   
   
   
  
  
  

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



DO NOT REPLY [Bug 24147] New: - No way to safely retrieve session attributes

2003-10-27 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=24147.
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=24147

No way to safely retrieve session attributes

   Summary: No way to safely retrieve session attributes
   Product: Tomcat 4
   Version: 4.1.12
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I've got an intermittent bug in a web application due to the fact that it uses 
HttpSession.getAttributeNames to iterate over session attributes.  If another 
servlet request in the session sets or removes an attribute during this time, 
then a ConcurrentModificationException is thrown.  There seems to be no other 
safe means of safely retrieving the attributes of the session, however.  So 
I'm stuck with an ugly retry strategy where I keep trying until I don't get a 
ConcurrentModificationException.

Perhaps this should be taken into account when determining whether to use fail-
fast iteration for implementing this method.

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



DO NOT REPLY [Bug 24147] - No way to safely retrieve session attributes

2003-10-27 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=24147.
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=24147

No way to safely retrieve session attributes

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-10-27 14:16 ---
This was fixed in a 4.1.24 (or better).

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



Re: jk binaries and new mirorring

2003-10-27 Thread Glenn Nielsen
Henri Gomez wrote:
Hi to all,

Some people ask me for jk 1.2.5 iSeries binaries.

I will build it but where should I upload it to make it later
replicated on mirrors site ?
Look in CVS at j-t-c/jk/HOW-TO-RELEASE

Glenn

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


Re: jk binaries and new mirorring

2003-10-27 Thread Henri Gomez
Glenn Nielsen a écrit :
Henri Gomez wrote:

Hi to all,

Some people ask me for jk 1.2.5 iSeries binaries.

I will build it but where should I upload it to make it later
replicated on mirrors site ?
Look in CVS at j-t-c/jk/HOW-TO-RELEASE

Thanks, upload done

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


how to commit the change?

2003-10-27 Thread liu ji
I have changed some source file,but I don't know how to commit the change.I 
have no write access to CVS.How can I do that?

_
 MSN Explorer:   http://explorer.msn.com/lccn/  

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


RE: how to commit the change?

2003-10-27 Thread Shapira, Yoav

Howdy,
You do a diff and enter the diff as a bug fix in bugzilla.

Yoav Shapira
Millennium ChemInformatics


-Original Message-
From: liu ji [mailto:[EMAIL PROTECTED]
Sent: Monday, October 27, 2003 11:59 AM
To: [EMAIL PROTECTED]
Subject: how to commit the change?

I have changed some source file,but I don't know how to commit the change.I
have no write access to CVS.How can I do that?

_
 MSN Explorer:   http://explorer.msn.com/lccn/


-
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]



DO NOT REPLY [Bug 24163] New: - Tomcat installed as a Window NT service can loose -path parameter

2003-10-27 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=24163.
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=24163

Tomcat installed as a Window NT service can loose -path parameter

   Summary: Tomcat installed as a Window NT service can loose -
path parameter
   Product: Tomcat 4
   Version: 4.1.24
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Installable Packages
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


When Tomcat is installed as a Windows NT service the following parameters are 
passed to tomcat.exe:

-install service_name jvm_library (jvm_option)*
-start start_class [-method start_method] [-params (start_parameter)+]
[-stop start_class [-method stop_method] [-params (stop_parameter)+]]
[-out out_log_file] [-err err_log_file]
[-current current_dir]
[-path extra_path]

If -out, -err, and -current keys are not used, tomcat.exe does not 
recognize -path as a next key. Instead, it considered -path to be the 
second paramter of the stop method and updates registry correspondingly. In 
this case library.path is never passed to JVM when service starts.

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



DO NOT REPLY [Bug 24163] - Tomcat installed as a Window NT service can lose -path parameter

2003-10-27 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=24163.
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=24163

Tomcat installed as a Window NT service can lose -path parameter

[EMAIL PROTECTED] changed:

   What|Removed |Added

Summary|Tomcat installed as a Window|Tomcat installed as a Window
   |NT service can loose -path|NT service can lose -path
   |parameter   |parameter

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



Re: cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.1.txt

2003-10-27 Thread Pedro Morais
GLIBC 2.2 / Linux 2.4 users should also define an environment variable:
export LD_ASSUME_KERNEL=2.2.5
   +
   +Additionally, Redhat 9.0 users should use the same setting, to avoid
 stability +problems.

Being a bit pedantic: it's not Redhat 9.0, it's Red Hat Linux 9.

-- 
Pedro Morais - [EMAIL PROTECTED] - http://www.rnl.ist.utl.pt/~pmmm/


-
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 DigesterFactory.java TldConfig.java ContextConfig.java

2003-10-27 Thread jfarcand
jfarcand2003/10/27 12:49:00

  Modified:catalina/src/share/org/apache/catalina/startup
TldConfig.java ContextConfig.java
  Added:   catalina/src/share/org/apache/catalina/startup
DigesterFactory.java
  Log:
  Merge digester's initialization logic into 1 class and add schema supports for 
parser other that Xerces ( someday I will find one ).
  
  Please review.
  
  Revision  ChangesPath
  1.33  +4 -107
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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- TldConfig.java6 Oct 2003 23:51:46 -   1.32
  +++ TldConfig.java27 Oct 2003 20:48:59 -  1.33
  @@ -86,7 +86,6 @@
   import javax.naming.NamingException;
   import javax.naming.directory.DirContext;
   import javax.servlet.ServletException;
  -import javax.xml.parsers.ParserConfigurationException;
   
   import org.apache.catalina.Context;
   import org.apache.catalina.Globals;
  @@ -95,8 +94,6 @@
   import org.apache.catalina.util.StringManager;
   import org.apache.commons.digester.Digester;
   import org.xml.sax.InputSource;
  -import org.xml.sax.SAXNotRecognizedException;
  -import org.xml.sax.SAXNotSupportedException;
   
   /**
* Startup event listener for a bContext/b that configures the properties
  @@ -452,112 +449,12 @@
*/
   private static Digester createTldDigester() {
   
  -URL url = null;
  -Digester tldDigester = new Digester();
  -tldDigester.setNamespaceAware(xmlNamespaceAware);
  -tldDigester.setValidating(xmlValidation);
  -
  -if (tldDigester.getFactory().getClass()
  -.getName().indexOf(xerces)!=-1) {
  -tldDigester = patchXerces(tldDigester);
  -}
  -// Set the schemaLocation
  -SchemaResolver tldEntityResolver = new SchemaResolver( tldDigester);
  -
  -if (xmlValidation) {
  -if (tldDigester.getFactory().getClass()
  -.getName().indexOf(xerces)!=-1) {
  -try{
  -tldDigester.setFeature(
  -http://apache.org/xml/features/validation/dynamic;,
  -true);
  -tldDigester.setFeature(
  -http://apache.org/xml/features/validation/schema;,
  -true);
  -} catch(ParserConfigurationException e){
  -// log(contextConfig.registerLocalSchema, e);
  -} catch(SAXNotRecognizedException e){
  -// log(contextConfig.registerLocalSchema, e);
  -} catch(SAXNotSupportedException e){
  -// log(contextConfig.registerLocalSchema, e);
  -}
  +return DigesterFactory.newDigester(xmlValidation, 
  +   xmlNamespaceAware, 
  +   new TldRuleSet());
   
  -}
  -}
  -
  -url = TldConfig.class.getResource(Constants.TldDtdResourcePath_11);
  -tldEntityResolver.register(Constants.TldDtdPublicId_11,
  -   url.toString());
  -
  -url = TldConfig.class.getResource(Constants.TldDtdResourcePath_12);
  -tldEntityResolver.register(Constants.TldDtdPublicId_12,
  -   url.toString());
  -
  -tldEntityResolver = registerLocalSchema(tldEntityResolver);
  -
  -tldDigester.setEntityResolver(tldEntityResolver);
  -tldDigester.addRuleSet(new TldRuleSet());
  -return (tldDigester);
  -
  -}
  -
  -
  -private static Digester patchXerces(Digester digester){
  -// This feature is needed for backward compatibility with old DDs
  -// which used Java encoding names such as ISO8859_1 etc.
  -// with Crimson (bug 4701993). By default, Xerces does not
  -// support ISO8859_1.
  -try{
  -digester.setFeature(
  -http://apache.org/xml/features/allow-java-encodings;, true);
  -} catch(ParserConfigurationException e){
  -// log(contextConfig.registerLocalSchema, e);
  -} catch(SAXNotRecognizedException e){
  -// log(contextConfig.registerLocalSchema, e);
  -} catch(SAXNotSupportedException e){
  -// log(contextConfig.registerLocalSchema, e);
  -}
  -return digester;
  -}
  -
  -/**
  - * Utilities used to force the parser to use local schema, when available,
  - * instead of the 

Re: New builds ?

2003-10-27 Thread David Rees
On Fri, October 24, 2003 1at 1:27 am, Remy Maucherat wrote:
 Remy Maucherat wrote:

 OTOH, there has been a few useful fixes and tweaks since 5.0.13 in the
 5.0 branch, so I'll tag a new 5.0.14 at the end of the week (these .13
 builds are all cursed :-D).

 Ok, tomorrow or Sunday :) (I've been a bit sick this week, so I'm slow)

Any word?  ;-)

-Dave

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



New builds available

2003-10-27 Thread Remy Maucherat
4.1.29 Alpha and 5.0.14 Alpha are now available for testing. 4.1.29 
should be mirrored later today, but 5.0.14 should be already replicated.

http://www.apache.org/dist/jakarta/tomcat-4/v4.1.29-alpha/
http://www.apache.org/dist/jakarta/tomcat-5/v5.0.14-alpha/
(or replace with the closest mirror)
Remy



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


Re: New builds available

2003-10-27 Thread Mauricio Nuñez
Hi,

From the RELEASE NOTES

--
Tomcat 4.1 Standard APIs Available:
--


* commons-dbcp.jar (Commons DBCP 1.0)
* commons-logging-api.jar (Commons Logging 1.0.2)
* commons-pool.jar (Commons Pool 1.0)

Must be

* commons-dbcp.jar (Commons DBCP 1.1)
* commons-logging-api.jar (Commons Logging 1.0.2)
* commons-pool.jar (Commons Pool 1.1)

Att

MNM
[EMAIL PROTECTED]

El Lunes 27 Octubre 2003 19:08, Remy Maucherat escribió:
 4.1.29 Alpha and 5.0.14 Alpha are now available for testing. 4.1.29
 should be mirrored later today, but 5.0.14 should be already replicated.

 http://www.apache.org/dist/jakarta/tomcat-4/v4.1.29-alpha/
 http://www.apache.org/dist/jakarta/tomcat-5/v5.0.14-alpha/
 (or replace with the closest mirror)

 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]