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

2003-02-03 Thread Bill Barker

- Original Message -
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Monday, February 03, 2003 11:24 PM
Subject: cvs commit:
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java


> billbarker2003/02/03 23:24:22
>
>   Modified:catalina/src/share/org/apache/catalina/loader
> WebappClassLoader.java
>   Log:
>   Finally regain the ability to build under 1.3.x
>
>   Submitted By: Tim Funk [EMAIL PROTECTED]

Sorry for the typo:  It should be [EMAIL PROTECTED]



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




cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c jk_isapi_plugin.c jk_iis_thread_pool.c jk_iis.h

2003-02-03 Thread mturk
mturk   2003/02/03 23:44:23

  Modified:jk/native2/server/isapi jk_service_iis.c jk_isapi_plugin.c
jk_iis_thread_pool.c jk_iis.h
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.24  +1 -1  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_service_iis.c  1 Feb 2003 22:28:39 -   1.23
  +++ jk_service_iis.c  4 Feb 2003 07:44:23 -   1.24
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.53  +2 -2  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- jk_isapi_plugin.c 1 Feb 2003 22:17:16 -   1.52
  +++ jk_isapi_plugin.c 4 Feb 2003 07:44:23 -   1.53
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.4   +2 -2  
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c
  
  Index: jk_iis_thread_pool.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_iis_thread_pool.c  16 Jul 2002 17:27:21 -  1.3
  +++ jk_iis_thread_pool.c  4 Feb 2003 07:44:23 -   1.4
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.12  +1 -1  jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
  
  Index: jk_iis.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_iis.h  16 Jul 2002 17:30:15 -  1.11
  +++ jk_iis.h  4 Feb 2003 07:44:23 -   1.12
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  

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

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

2003-02-03 Thread mturk
mturk   2003/02/03 23:42:05

  Modified:jk/native2/server/apache13 mod_jk2.c jk_service_apache13.c
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.26  +2 -2  jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
  
  Index: mod_jk2.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_jk2.c 9 Oct 2002 17:10:24 -   1.25
  +++ mod_jk2.c 4 Feb 2003 07:42:05 -   1.26
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.10  +1 -1  
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
  
  Index: jk_service_apache13.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_service_apache13.c 22 Nov 2002 16:04:05 -  1.9
  +++ jk_service_apache13.c 4 Feb 2003 07:42:05 -   1.10
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c jk_map_aprtable.c jk_logger_apache2.c jk_apache2.h

2003-02-03 Thread mturk
mturk   2003/02/03 23:41:42

  Modified:jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
jk_map_aprtable.c jk_logger_apache2.c jk_apache2.h
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.58  +2 -2  jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
  
  Index: mod_jk2.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_jk2.c 23 Jan 2003 12:11:54 -  1.57
  +++ mod_jk2.c 4 Feb 2003 07:41:41 -   1.58
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.34  +2 -2  
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
  
  Index: jk_service_apache2.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- jk_service_apache2.c  9 Dec 2002 13:23:19 -   1.33
  +++ jk_service_apache2.c  4 Feb 2003 07:41:41 -   1.34
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.11  +1 -1  
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c
  
  Index: jk_map_aprtable.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_map_aprtable.c 14 May 2002 20:44:21 -  1.10
  +++ jk_map_aprtable.c 4 Feb 2003 07:41:41 -   1.11
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.28  +1 -1  
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
  
  Index: jk_logger_apache2.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_logger_apache2.c   8 Jul 2002 12:13:51 -   1.27
  +++ jk_logger_apache2.c   4 Feb 2003 07:41:41 -   1.28
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.11  +2 -2  jakarta-tomcat-connectors/jk/native2/se

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

2003-02-03 Thread mturk
mturk   2003/02/03 23:40:51

  Modified:jk/native2/jni jk_jni_aprImpl.c
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.44  +1 -1  jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
  
  Index: jk_jni_aprImpl.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- jk_jni_aprImpl.c  20 Nov 2002 16:40:10 -  1.43
  +++ jk_jni_aprImpl.c  4 Feb 2003 07:40:51 -   1.44
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  

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




cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_workerEnv.h jk_worker.h jk_vm.h jk_uriMap.h jk_uriEnv.h jk_shm.h jk_service.h jk_requtil.h jk_pool.h jk_objCache.h jk_mutex.h jk_map.h jk_logger.h jk_handler.h jk_global.h jk_env.h jk_endpoint.h jk_config.h jk_channel.h jk_bean.h

2003-02-03 Thread mturk
mturk   2003/02/03 23:40:33

  Modified:jk/native2/include jk_workerEnv.h jk_worker.h jk_vm.h
jk_uriMap.h jk_uriEnv.h jk_shm.h jk_service.h
jk_requtil.h jk_pool.h jk_objCache.h jk_mutex.h
jk_map.h jk_logger.h jk_handler.h jk_global.h
jk_env.h jk_endpoint.h jk_config.h jk_channel.h
jk_bean.h
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.28  +2 -2  jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
  
  Index: jk_workerEnv.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_workerEnv.h26 Oct 2002 12:41:29 -  1.27
  +++ jk_workerEnv.h4 Feb 2003 07:40:32 -   1.28
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.29  +2 -2  jakarta-tomcat-connectors/jk/native2/include/jk_worker.h
  
  Index: jk_worker.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jk_worker.h   18 Oct 2002 15:21:01 -  1.28
  +++ jk_worker.h   4 Feb 2003 07:40:32 -   1.29
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.6   +1 -1  jakarta-tomcat-connectors/jk/native2/include/jk_vm.h
  
  Index: jk_vm.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_vm.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_vm.h   15 Oct 2002 13:59:28 -  1.5
  +++ jk_vm.h   4 Feb 2003 07:40:32 -   1.6
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.18  +1 -1  jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h
  
  Index: jk_uriMap.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jk_uriMap.h   15 Oct 2002 12:15:51 -  1.17
  +++ jk_uriMap.h   4 Feb 2003 07:40:32 -   1.18
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* =

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c jk_worker_status.c jk_worker_run.c jk_worker_lb.c jk_worker_jni.c jk_worker_ajp13.c jk_vm_default.c jk_user.c jk_uriMap.c jk_uriEnv.c jk_signal.c jk_shm.c jk_requtil.c jk_registry.h jk_registry.c jk_pool_apr.c jk_pool.c jk_objCache.c jk_nwmain.c jk_mutex_thread.c jk_mutex_proc.c jk_mutex.c jk_msg_ajp.c jk_map.c jk_logger_win32.c jk_logger_file.c jk_handler_response.c jk_handler_logon.c jk_env.c jk_endpoint.c jk_config_file.c jk_config.c jk_channel_un.c jk_channel_socket.c jk_channel_jni.c jk_channel_apr_socket.c jk_channel.c

2003-02-03 Thread mturk
mturk   2003/02/03 23:40:01

  Modified:jk/native2/common jk_workerEnv.c jk_worker_status.c
jk_worker_run.c jk_worker_lb.c jk_worker_jni.c
jk_worker_ajp13.c jk_vm_default.c jk_user.c
jk_uriMap.c jk_uriEnv.c jk_signal.c jk_shm.c
jk_requtil.c jk_registry.h jk_registry.c
jk_pool_apr.c jk_pool.c jk_objCache.c jk_nwmain.c
jk_mutex_thread.c jk_mutex_proc.c jk_mutex.c
jk_msg_ajp.c jk_map.c jk_logger_win32.c
jk_logger_file.c jk_handler_response.c
jk_handler_logon.c jk_env.c jk_endpoint.c
jk_config_file.c jk_config.c jk_channel_un.c
jk_channel_socket.c jk_channel_jni.c
jk_channel_apr_socket.c jk_channel.c
  Log:
  Update license to 2003.
  
  Revision  ChangesPath
  1.61  +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
  
  Index: jk_workerEnv.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- jk_workerEnv.c23 Jan 2003 12:18:13 -  1.60
  +++ jk_workerEnv.c4 Feb 2003 07:39:58 -   1.61
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.32  +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
  
  Index: jk_worker_status.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- jk_worker_status.c27 Sep 2002 13:07:28 -  1.31
  +++ jk_worker_status.c4 Feb 2003 07:39:58 -   1.32
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.9   +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c
  
  Index: jk_worker_run.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_worker_run.c   10 Jun 2002 21:55:06 -  1.8
  +++ jk_worker_run.c   4 Feb 2003 07:39:58 -   1.9
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2003 The Apache Software Foundation.  *
*   All rights reserved.*
*   *
* = *
  
  
  
  1.30  +1 -1  jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
  
  Index: jk_worker_lb.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jk_worker_lb.c3 Jan 2003 13:52:38 -   1.29
  +++ jk_worker_lb.c4 Feb 2003 07:39:58 -   1.30
  @@ -2,7 +2,7 @@
*   *
*

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

2003-02-03 Thread billbarker
billbarker2003/02/03 23:24:22

  Modified:catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
  Log:
  Finally regain the ability to build under 1.3.x
  
  Submitted By: Tim Funk [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.14  +7 -8  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WebappClassLoader.java13 Nov 2002 00:36:25 -  1.13
  +++ WebappClassLoader.java4 Feb 2003 07:24:22 -   1.14
  @@ -97,6 +97,7 @@
   import javax.naming.NamingEnumeration;
   import javax.naming.NameClassPair;
   
  +import org.apache.tomcat.util.compat.JdkCompat;
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
  @@ -184,6 +185,10 @@
   "javax.servlet.Servlet" // Servlet API
   };
   
  + /** 
  +  * Jdk Compatibility Support.
  +  */
  + private static JdkCompat jdkCompat = JdkCompat.getJdkCompat();
   
   /**
* Set of package names which are not allowed to be loaded from a webapp
  @@ -1948,13 +1953,7 @@
   protected URL getURI(File file)
   throws MalformedURLException {
   
  -File realFile = file;
  -try {
  -realFile = realFile.getCanonicalFile();
  -} catch (IOException e) {
  -// Ignore
  -}
  -return realFile.toURI().toURL();
  +return jdkCompat.getURI(file);
   
   }
   
  
  
  

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




cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-02-03 Thread billbarker
billbarker2003/02/03 23:16:47

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  Urm, Err, don't trust cut-and-paste to copy package changes.
  
  Revision  ChangesPath
  1.2   +5 -5  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Jdk14Compat.java  4 Feb 2003 06:01:56 -   1.1
  +++ Jdk14Compat.java  4 Feb 2003 07:16:47 -   1.2
  @@ -60,7 +60,7 @@
*
*/
   
  -package org.apache.catalina.util;
  +package org.apache.tomcat.util.compat;
   
   import java.io.File;
   import java.io.IOException;
  @@ -114,4 +114,4 @@
   }
   
   
  - }
  \ No newline at end of file
  + }
  
  
  
  1.2   +4 -4  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JdkCompat.java4 Feb 2003 06:01:56 -   1.1
  +++ JdkCompat.java4 Feb 2003 07:16:47 -   1.2
  @@ -60,7 +60,7 @@
*
*/
   
  -package org.apache.catalina.util;
  +package org.apache.tomcat.util.compat;
   
   import java.io.File;
   import java.io.IOException;
  
  
  

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




cvs commit: jakarta-tomcat-connectors/util build.xml

2003-02-03 Thread billbarker
billbarker2003/02/03 22:17:26

  Modified:util build.xml
  Log:
  Fix Typo.
  
  Revision  ChangesPath
  1.18  +1 -1  jakarta-tomcat-connectors/util/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml 4 Feb 2003 06:03:46 -   1.17
  +++ build.xml 4 Feb 2003 06:17:26 -   1.18
  @@ -68,7 +68,7 @@
   
   
   
  - 
  + 

   

  
  
  

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




cvs commit: jakarta-tomcat-connectors/util build.xml

2003-02-03 Thread billbarker
billbarker2003/02/03 22:03:46

  Modified:util build.xml
  Log:
  Add support for the new JsdkSupport.
  
  Submitted by: Joe Funk [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.17  +2 -0  jakarta-tomcat-connectors/util/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml 12 Jan 2003 19:01:58 -  1.16
  +++ build.xml 4 Feb 2003 06:03:46 -   1.17
  @@ -38,6 +38,7 @@
   
   
   
  + 
   
   
   
  @@ -67,6 +68,7 @@
   
   
   
  + 

   

  
  
  

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




cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-02-03 Thread billbarker
billbarker2003/02/03 22:01:57

  Added:   util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  Adding JdkSupport classes.
  
  Changes from patch is to include better version detection.
  
  Submitted by: Tim Funk [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
 1.1 2003/02/04 06:01:56 billbarker Exp $
   * $Revision: 1.1 $
   * $Date: 2003/02/04 06:01:56 $
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   "This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/)."
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *Foundation" must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * .
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  package org.apache.catalina.util;
  
  import java.io.File;
  import java.io.IOException;
  import java.net.URI;
  import java.net.URL;
  import java.net.MalformedURLException;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  
  /**
   *  See JdkCompat. This is an extension of that class for Jdk1.4 support.
   *
   *  @author Tim Funk
   */
  public class Jdk14Compat extends JdkCompat {
  // -- Constants
  
  // --- Static Variables
  static Log logger = LogFactory.getLog(Jdk14Compat.class);
  
  // --- Constructors
  /**
   *  Default no-arg constructor
   */
  protected Jdk14Compat() {
  }
  
  
  // - Public Methods
  
  /**
   *  Return the URI for the given file. Originally created for
   *  o.a.c.loader.WebappClassLoader
   *
   *  @param File to wrap into URI
   *  @return A URI as a URL
   */
  public URL getURI(File file)
  throws MalformedURLException {
  
  File realFile = file;
  try {
  realFile = realFile.getCanonicalFile();
  } catch (IOException e) {
  // Ignore
  }
  
  ret

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat - New directory

2003-02-03 Thread billbarker
billbarker2003/02/03 21:58:18

  jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat - New directory

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




DO NOT REPLY [Bug 13523] - problem using JSTL fmt:setLocale with Tomcat 4.1.9

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=13523

problem using JSTL fmt:setLocale with Tomcat 4.1.9

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|NEW



--- Additional Comments From [EMAIL PROTECTED]  2003-02-04 05:04 
---
When I try to use fmt:setLocale, supplying a scope attribute, the server throws 
a RuntimeException.

Example:

Error message:
Illegal scope attribute without var in "fmt:setLocale" tag
Exception:
java.lang.RuntimeException: org.apache.jasper.JasperException: 
Validation error messages from tag library fmtIllegal scope attribute 
without var in "fmt:setLocale" tag.

The JSTL spec (version 1.0) for fmt:setLocale is:
   

therefore I cannot supply a var attribute, nor would it make much sense to do 
so.

Is there another way to set the Locale at the session scope for use with the 
other fmt tags?

This was tested on standard taglib release 1.0.2, servlet engine: JBoss v3.0.4

Regards,
Brad.

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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Tim Funk
Here is an attempt at a JdkCompat implementation. There are 2 classes, 
JdkCompat which is the base support class and Jdk14Compat which extends 
JdkCompat.

The patch is in JdkCompat.txt for WebappClassloader and build.xml. I 
manually edited the patch file to eliminate all the extra edits my text 
editor makes with respect to whitespace changes.

Everyone will call JdkCompat.getJdkCompat() to get a JdkCompat instance. 
When JdkCompat is statically initialized, it determines which 
implementation to load. Currently, it performs a check on 
System.getProperty("java.version"). If the property starts with 1.4 then 
the Jdk14Compat class is loaded. Otherwise, the default JdkCompat will 
be loaded.

So, this has the side effect that when jdk1.5(and beyond) comes out - 
this will load the wrong version of the class. Should I ignore that 
issue for now or create a better comparison?


-Tim

Costin Manolache wrote:
Tim Funk wrote:



To get functionality like jdkCompat (and looking at tomcat3), it looks
like something similar to the following would need added to the existing
jakarta-tomcat-catalina/catalina/build.xml:
--
  
--
Where would jdkCompat live with respect to package name? Does it belong
in catalina? (org.apache.catalina.util.compat.ClassXXX)



I would place it in j-t-c/util, even in o.a.tomcat.util.compat ( but with a
different name than jkd11compat class in 3.3 ).

This kind of code is very common.
 
/*
 * $Header:   $
 * $Revision:   $
 * $Date:  $
 * 
 *
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 1999 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *notice, this list of conditions and the following disclaimer in
 *the documentation and/or other materials provided with the
 *distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *any, must include the following acknowlegement:
 *   "This product includes software developed by the
 *Apache Software Foundation (http://www.apache.org/)."
 *Alternately, this acknowlegement may appear in the software itself,
 *if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
 *Foundation" must not be used to endorse or promote products derived
 *from this software without prior written permission. For written
 *permission, please contact [EMAIL PROTECTED]
 *
 * 5. Products derived from this software may not be called "Apache"
 *nor may "Apache" appear in their names without prior written
 *permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * .
 *
 * [Additional notices, if required by prior licensing conditions]
 *
 */

package org.apache.catalina.util;

import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.net.MalformedURLException;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;


/**
 *  See JdkCompat. This is an extension of that class for Jdk1.4 support.
 *
 *  @author Tim Funk
 */
public class Jdk14Compat extends JdkCompat {
// -- Constants

// --- Static Variables
static Log logger = LogFactory.getLog(Jdk14Compat.class);

// --- Constructors
/**
 *

Re: JSP API javadocs out-of-date

2003-02-03 Thread Jan Luehe
Remy,

> Jan Luehe wrote:
> > I've noticed the JSP API javadocs at
> > 
> >   http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jspapi
> > 
> > are out-of-date, and I'm wondering what I need to do in order to sync
> > them up with the latest API versions at jakarta-servletapi-5.
> > 
> > The JSP API javadocs in the nightly build of the tomcat-docs webapp
> > are up-to-date.
> > 
> > Any suggestions?
> 
> The online docs are synced with the latest release from the branch. So 
> since no releases were made since 5.0.0 (for whatever reason), it was 
> not synced up.
> 
> I'd like to keep this syncing.

would you consider removing the link to the online API docs while the APIs are
not final?
This would give people an incentive to check the API docs link in the nightly build,
which is always up-to-date.

Otherwise, people are likely to get confused if they see APIs that are out-of-date.

Thanks,


Jan


-
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-02-03 Thread luehe
luehe   2003/02/03 16:04:54

  Modified:jasper2/src/share/org/apache/jasper/compiler Parser.java
  Log:
  Fixed bug that prevented EL expressions from being used in the body of
  a  of a 
  
  Revision  ChangesPath
  1.59  +5 -3  
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.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Parser.java   3 Feb 2003 23:11:59 -   1.58
  +++ Parser.java   4 Feb 2003 00:04:53 -   1.59
  @@ -1832,6 +1832,8 @@
if ("value".equals(name)) {
return TagInfo.BODY_CONTENT_JSP;
}
  + } else if (n instanceof Node.JspElement) {
  + return TagInfo.BODY_CONTENT_JSP;
}
   
return JAVAX_BODY_CONTENT_TEMPLATE_TEXT;
  
  
  

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




cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd

2003-02-03 Thread kinman
kinman  2003/02/03 15:36:20

  Modified:jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
   jsr152/src/share/javax/servlet/jsp SkipPageException.java
   jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  jsr152/src/share/javax/servlet/jsp/tagext/SkipPageException.java
   - Made clear that this should not be thrown from within a tag file.
  
  jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
  jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
   - Added some useful subelements to tag-file element:
* description
* display-name
* icon
  * example
* tag-extension
  
  Revision  ChangesPath
  1.8   +54 -8 
jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
  
  Index: web-jsptaglibrary_2_0.xsd
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- web-jsptaglibrary_2_0.xsd 28 Jan 2003 00:19:10 -  1.7
  +++ web-jsptaglibrary_2_0.xsd 3 Feb 2003 23:36:20 -   1.8
  @@ -10,7 +10,7 @@
   
   
   
  -@(#)web-jsptaglibrary_2_0.xsds   1.26 01/24/03
  +%W% %G%
   
   
   
  @@ -334,23 +334,69 @@
   
   The tag-file element has two required subelements:
   
  -nameThe unique action name
  +description   Optional tag-specific information
   
  -pathWhere to find the .tag file implementing this
  -action, relative to the root of the web application or
  - the root of the JAR file for a tag library packaged in
  - a JAR.  This must begin with /WEB-INF/tags if the .tag
  - file resides in the WAR, or /META-INF/tags if the .tag
  - file resides in a JAR.
  +display-name  A short name that is intended to be
  +  displayed by tools
  +
  +icon  Optional icon element that can be used
  +  by tools
  +
  +name  The unique action name
  +
  +path  Where to find the .tag file implementing this
  +  action, relative to the root of the web application or
  +   the root of the JAR file for a tag library packaged in
  +   a JAR.  This must begin with /WEB-INF/tags if the .tag
  +   file resides in the WAR, or /META-INF/tags if the .tag
  +   file resides in a JAR.
  +
  +example   Optional informal description of an
  +  example of a use of this tag
  +
  +tag-extension Zero or more extensions that provide extra
  +   information about this tag, for tool
  +   consumption
   
   
   
   
   
  +
   
   
  +
  +
  +
  +
  +The example element contains an informal description
  +of an example of the use of a tag.
  +
  +
  +
  +
  +
  + 
  + 
  + 
  +
  +Tag extensions are for tool use only and must not affect
  + the behavior of a container.  The TLD extension mechanism
  + only allows ignorable extensions (i.e. those without a
  + mustUnderstand attribute).  A Tag Library is considered
  + invalid if it requires an extension that must be
  + understood by setting mustUnderstand="true".
  +
  + 
  + 
  + 
   
   
   
  
  
  
  1.4   +1 -1  
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java
  
  Index: SkipPageException.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SkipPageException.java29 Oct 2002 01:18:11 -  1.3
  +++ SkipPageException.java3 Feb 2003 23:36:20 -   1.4
  @@ -62,7 +62,7 @@
* the case with tag files).  The effect is similar to that of a 
* Classic Tag Handler returning Tag.SKIP_PAGE from doEndTag().
* Jsp Fragments may also throw this exception.  This exception
  - * should not be thrown manually in a JSP page - the behavior is
  + * should not be thrown manually in a JSP page or tag file - the behavior is
* undefined.  The exception is intended to be thrown inside 
* SimpleTag handlers and in JSP fragments.
* 
  
  
  
  1.8   +54 -8 
jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
  
  Index: web-jsptaglibrary_2_0.xsd
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- web-jsptaglibrary_2_0.xsd 28 Jan 2003 00:19:10 -  1.7
  +++ web-jsptaglibrary_2_0.xsd 3 Feb 2003 23:36:20 -   1.8
  @@ -10,7 +

cvs commit: jakarta-servletapi-5/jsr152/examples/jsp2/simpletag RepeatSimpleTag.java.txt

2003-02-03 Thread kinman
kinman  2003/02/03 15:34:28

  Modified:jsr152/examples/jsp2/simpletag RepeatSimpleTag.java.txt
  Log:
  - Patch by Jan Luehe
  
  This is to sync up the source that is being displayed
  with the real source. The source that is being displayed still supplies
  a Map parameter to the fragment invocation, which was removed a long time ago.
  This has led to some confusion.
  
  Revision  ChangesPath
  1.2   +3 -3  
jakarta-servletapi-5/jsr152/examples/jsp2/simpletag/RepeatSimpleTag.java.txt
  
  Index: RepeatSimpleTag.java.txt
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/simpletag/RepeatSimpleTag.java.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RepeatSimpleTag.java.txt  7 Sep 2002 00:48:00 -   1.1
  +++ RepeatSimpleTag.java.txt  3 Feb 2003 23:34:28 -   1.2
  @@ -8,6 +8,7 @@
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.SimpleTagSupport;
   import java.util.HashMap;
  +import java.io.IOException;
   
   /**
* SimpleTag handler that accepts a num attribute and 
  @@ -17,10 +18,9 @@
   private int num;
   
   public void doTag() throws JspException, IOException {
  -HashMap params = new HashMap();
   for (int i=0; i


cvs commit: jakarta-tomcat-catalina/webapps/docs mbeans-descriptor-howto.xml index.xml project.xml

2003-02-03 Thread amyroh
amyroh  2003/02/03 15:17:08

  Modified:webapps/docs index.xml project.xml
  Added:   webapps/docs mbeans-descriptor-howto.xml
  Log:
  Port change.
  
  Revision  ChangesPath
  1.6   +2 -1  jakarta-tomcat-catalina/webapps/docs/index.xml
  
  Index: index.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.xml 15 Jan 2003 03:40:43 -  1.5
  +++ index.xml 3 Feb 2003 23:17:08 -   1.6
  @@ -81,6 +81,8 @@
   Manager App HOW-TO -
   Operating the Manager web app to deploy, undeploy, and
   redeploy applications while Tomcat is running.
  +MBean Descriptor 
HOW-TO -
  +Configuring MBean descriptors files for custom components.   
   Proxy Support HOW-TO -
   Configuring Tomcat 5 to run behind a proxy server (or a web server
   functioning as a proxy server).
  @@ -180,4 +182,3 @@
   
   
   
  -
  
  
  
  1.8   +2 -0  jakarta-tomcat-catalina/webapps/docs/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml   15 Jan 2003 03:40:43 -  1.7
  +++ project.xml   3 Feb 2003 23:17:08 -   1.8
  @@ -36,6 +36,8 @@
   
   
   
  +
   
   
   
  
  
  
  1.1  jakarta-tomcat-catalina/webapps/docs/mbeans-descriptor-howto.xml
  
  Index: mbeans-descriptor-howto.xml
  ===
  
  
  ]>
  
  
  &project;
  
  
  Amy Roh
  MBean Descriptor How To
  
  
  
  
  
  
  Tomcat 4 uses JMX MBeans as the technology for implementing 
  manageability of Tomcat.
  
  The descriptions of JMX MBeans for Catalina are in the 
  org.apache.catalina.mbeans.mbeans-descriptor.xml file.
  
  You will need to add MBean descriptions for your custom components 
  in order to avoid a "ManagedBean is not found" exception.
  
  
  
  
  
  You may configure custom components (e.g. Valves/Realms) by including 
  your own mbean-descriptor file(s), and setting the "descriptors" 
  attribute to point to a ';' separated list of paths (in the ClassLoader sense) 
  of files to add to the default list under ServerLifecycleListener definition 
  in server.xml.
  
  
  

  
  
  
  
  
  
  You may also add MBean descriptions for custom components in 
  org.apache.catalina.mbeans.mbeans-descriptor.xml file.
  
  

  
  
  
  
  .
  .
  .
  

  
  
  
  
  
  
  
  
  
  
  

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




cvs commit: jakarta-tomcat-catalina/webapps/admin/host host.jsp hosts.jsp

2003-02-03 Thread amyroh
amyroh  2003/02/03 15:16:52

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
DeleteHostAction.java EditHostAction.java
   webapps/admin/host host.jsp hosts.jsp
  Log:
  Port change.
  
  Revision  ChangesPath
  1.3   +34 -4 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Lists.java16 Sep 2002 04:46:18 -  1.2
  +++ Lists.java3 Feb 2003 23:16:52 -   1.3
  @@ -696,4 +696,34 @@
   }
   
   
  +/**
  + * Return the  Host object name string
  + * that the admin app belongs to.
  + *
  + * @param mbserver MBeanServer from which to retrieve the list
  + * @param request Http request
  + *
  + * @exception Exception if thrown while retrieving the list
  + */
  +public static String getAdminAppHost
  +(MBeanServer mbserver, String domain, HttpServletRequest request)
  +throws Exception {
  +
  +// Get the admin app's host name
  +StringBuffer sb = new StringBuffer(domain);
  +sb.append(":type=Context");
  +sb.append(",path=");
  +sb.append(request.getContextPath());
  +sb.append(",*");
  +ObjectName search = new ObjectName(sb.toString());
  +Iterator names = mbserver.queryNames(search, null).iterator();
  +String host = null;
  +while (names.hasNext()) {
  +host = ((ObjectName)names.next()).getKeyProperty("host");
  +}
  +return host;
  +
  +}
  +
  +
   }
  
  
  
  1.2   +21 -4 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
  
  Index: DeleteHostAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeleteHostAction.java 18 Jul 2002 16:48:25 -  1.1
  +++ DeleteHostAction.java 3 Feb 2003 23:16:52 -   1.2
  @@ -90,6 +90,7 @@
   import org.apache.struts.util.MessageResources;
   
   import org.apache.webapp.admin.ApplicationServlet;
  +import org.apache.webapp.admin.Lists;
   import org.apache.webapp.admin.TomcatTreeBuilder;
   
   /**
  @@ -153,6 +154,22 @@
   ("Cannot acquire MBeanServer reference", t);
   }
   
  +String adminHost = null;
  +// Get the host name the admin app runs on
  +// this host cannot be deleted from the admin tool
  +try {
  +adminHost = Lists.getAdminAppHost(
  +  mBServer, "Catalina" ,request);
  +} catch (Exception e) {
  +String message =
  +resources.getMessage("error.hostName.bad",
  +adminHost);
  +getServlet().log(message);
  +response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
  +return (null);
  +}
  +request.setAttribute("adminAppHost", adminHost);
  +
   String serviceName = request.getParameter("serviceName");
   // Set up a form bean containing the currently selected
   // objects to be deleted
  
  
  
  1.4   +20 -4 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
  
  Index: EditHostAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EditHostAction.java   16 Sep 2002 04:46:18 -  1.3
  +++ EditHostAction.java   3 Feb 2003 23:16:52 -   1.4
  @@ -147,6 +147,22 @@
   ("Cannot acquire MBeanServer reference", t);
   }
   
  +String adminHost = null;
  +// Get the host name the admin app runs on
  +// this host cannot be deleted from the admin tool
  +try {
  +adminHost = Lists.getAdminAppHost(
  +  mBServer, "Catalina" ,request);
  +} catch (Exception e) {
  +String message =
  +resources.getMessage("error.hostName.bad",
  +adminHost);
  +getServlet().log(message);
  +   

DO NOT REPLY [Bug 16106] - IllegalAccessException at next startup after Webapps:Aministration

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16106

IllegalAccessException at next startup after Webapps:Aministration

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 23:16 ---
The patch is applied.  Please reopen the bug if the fix doesn't solve the problem.

-
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 JspReader.java Parser.java

2003-02-03 Thread kinman
kinman  2003/02/03 15:11:59

  Modified:jasper2/src/share/org/apache/jasper/compiler JspReader.java
Parser.java
  Log:
  - Recognize  in jsp:text, jsp:declaration, jsp:expression
and jsp:scriptlet.
  
  Revision  ChangesPath
  1.15  +1 -1  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java
  
  Index: JspReader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JspReader.java22 Jan 2003 21:13:51 -  1.14
  +++ JspReader.java3 Feb 2003 23:11:58 -   1.15
  @@ -250,7 +250,7 @@
   /**
* search the stream for a match to a string
* @param string The string to match
  - * @return true is one is found, the current position
  + * @return true is one is found, the current position
* in stream is positioned after the search string, 
*  false otherwise, position in stream unchanged.
*/
  
  
  
  1.58  +101 -32   
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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- Parser.java   17 Jan 2003 20:02:25 -  1.57
  +++ Parser.java   3 Feb 2003 23:11:59 -   1.58
  @@ -668,8 +668,12 @@
   
   /*
* XMLDeclarationBody ::=   ( S? '/>' )
  - *| ( S? '>' (Char* - (char* '<')) ETag )
  + *| ( S? '>' (Char* - (char* '<')) CDSect?)* ETag
*| 
  + * CDSect ::= CDStart CData CDEnd
  + * CDStart ::= '' Char*))
  + * CDEnd ::= ']]>'
*/
   private void parseXMLDeclaration(Node parent) throws JasperException {
   reader.skipSpaces();
  @@ -678,17 +682,35 @@
   err.jspError(start, "jsp.error.unterminated",
   "");
   }
  -start = reader.mark();
  -Mark stop = reader.skipUntil("<");
  -if ((stop == null) || !reader.matchesETagWithoutLessThan(
  -"jsp:declaration" ) )
  -{
  + Mark stop;
  +String text;
  +while (true) {
  +start = reader.mark();
  +stop = reader.skipUntil("<");
  +if (stop == null) {
  +err.jspError(start, "jsp.error.unterminated",
  +"");
  +}
  + text = parseScriptText(reader.getText(start, stop));
  +new Node.Declaration(text, start, parent);
  +if (reader.matches("![CDATA[")) {
  +start = reader.mark();
  +stop = reader.skipUntil("]]>");
  +if (stop == null) {
  +err.jspError(start, "jsp.error.unterminated", "CDATA");
  +}
  + text = parseScriptText(reader.getText(start, stop));
  +new Node.Declaration(text, start, parent);
  +}
  +else {
  +break;
  +}
  + }
  + 
  +if (!reader.matchesETagWithoutLessThan( "jsp:declaration" ) ) {
   err.jspError(start, "jsp.error.unterminated",
   "");
   }
  -
  -new Node.Declaration(parseScriptText(reader.getText(start, stop)),
  -  start, parent);
   }
   }
   
  @@ -708,7 +730,7 @@
   
   /*
* XMLExpressionBody ::=   ( S? '/>' )
  - *   | ( S? '>' (Char* - (char* '<')) ETag )
  + *   | ( S? '>' (Char* - (char* '<')) CDSect?)* ETag )
*   | 
*/
   private void parseXMLExpression(Node parent) throws JasperException {
  @@ -718,17 +740,34 @@
   err.jspError(start, "jsp.error.unterminated",
   "");
   }
  -start = reader.mark();
  -Mark stop = reader.skipUntil("<");
  -if ((stop == null) || !reader.matchesETagWithoutLessThan(
  -"jsp:expression" ))
  -{
  +Mark stop;
  +String text;
  +while (true) {
  +start = reader.mark();
  +stop = reader.skipUntil("<");
  +if (stop == null) {
  +err.jspError(start, "jsp.error.unterminated",
  +

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

2003-02-03 Thread amyroh
amyroh  2003/02/03 15:05:48

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  Port change.
  
  Revision  ChangesPath
  1.12  +5 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardServer.java   7 Jan 2003 22:21:29 -   1.11
  +++ StandardServer.java   3 Feb 2003 23:05:48 -   1.12
  @@ -990,7 +990,7 @@
   private boolean isSkippable(String className) {
   
   for (int i = 0; i < skippables.length; i++) {
  -if (skippables[i] == className) {
  +if (skippables[i].equals(className)) {
   return (true);
   }
   }
  
  
  

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




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs mbeans-descriptor-howto.xml index.xml project.xml

2003-02-03 Thread amyroh
amyroh  2003/02/03 15:03:55

  Modified:webapps/tomcat-docs index.xml project.xml
  Added:   webapps/tomcat-docs mbeans-descriptor-howto.xml
  Log:
  Add mbeans-descriptor-howto documentation.  The question comes up
  often on tomcat-user and tomcat-dev.  It is currently documented in server.xml
  as comment.  However, it disappears when you use the admin tool and press
   "Save Changes".  We can just point to this page if the question arises from
  now on.
  
  Revision  ChangesPath
  1.19  +2 -1  jakarta-tomcat-4.0/webapps/tomcat-docs/index.xml
  
  Index: index.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/index.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- index.xml 12 Jan 2003 17:26:46 -  1.18
  +++ index.xml 3 Feb 2003 23:03:55 -   1.19
  @@ -89,6 +89,8 @@
   Manager App HOW-TO -
   Operating the Manager web app to deploy, undeploy, and
   redeploy applications while Tomcat is running.
  +MBean Descriptor 
HOW-TO -
  +Configuring MBean descriptors files for custom components.
   Proxy Support HOW-TO -
   Configuring Tomcat 4 to run behind a proxy server (or a web server
   functioning as a proxy server).
  @@ -167,4 +169,3 @@
   
   
   
  -
  
  
  
  1.20  +2 -0  jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- project.xml   10 Jan 2003 15:52:19 -  1.19
  +++ project.xml   3 Feb 2003 23:03:55 -   1.20
  @@ -37,6 +37,8 @@
   
   
   
  +
   
   
   
  
  
  
  1.1  
jakarta-tomcat-4.0/webapps/tomcat-docs/mbeans-descriptor-howto.xml
  
  Index: mbeans-descriptor-howto.xml
  ===
  
  
  ]>
  
  
  &project;
  
  
  Amy Roh
  MBean Descriptor How To
  
  
  
  
  
  
  Tomcat 4 uses JMX MBeans as the technology for implementing 
  manageability of Tomcat.
  
  The descriptions of JMX MBeans for Catalina are in the 
  org.apache.catalina.mbeans.mbeans-descriptor.xml file.
  
  You will need to add MBean descriptions for your custom components 
  in order to avoid a "ManagedBean is not found" exception.
  
  
  
  
  
  You may configure custom components (e.g. Valves/Realms) by including 
  your own mbean-descriptor file(s), and setting the "descriptors" 
  attribute to point to a ';' separated list of paths (in the ClassLoader sense) 
  of files to add to the default list under ServerLifecycleListener definition 
  in server.xml.
  
  
  

  
  
  
  
  
  
  You may also add MBean descriptions for custom components in 
  org.apache.catalina.mbeans.mbeans-descriptor.xml file.
  
  

  
  
  
  
  .
  .
  .
  

  
  
  
  
  
  
  
  
  
  
  

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




cvs commit: jakarta-tomcat-4.0/webapps/admin/host host.jsp hosts.jsp

2003-02-03 Thread amyroh
amyroh  2003/02/03 14:55:01

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
DeleteHostAction.java EditHostAction.java
   webapps/admin/host host.jsp hosts.jsp
  Log:
  Fix to disallow localhost deletion and realm addition to localhost.  The
  checking for localhost was done incorrectly on linux environment therefore
  letting localhost to be deleted.
  
  Revision  ChangesPath
  1.14  +33 -4 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Lists.java14 Sep 2002 23:37:39 -  1.13
  +++ Lists.java3 Feb 2003 22:55:00 -   1.14
  @@ -696,4 +696,33 @@
   }
   
   
  +/**
  + * Return the  Host object name string
  + * that the admin app belongs to.
  + *
  + * @param mbserver MBeanServer from which to retrieve the list
  + * @param request Http request
  + *
  + * @exception Exception if thrown while retrieving the list
  + */
  +public static String getAdminAppHost
  +(MBeanServer mbserver, String domain, HttpServletRequest request)
  +throws Exception {
  +
  +// Get the admin app's host name
  +StringBuffer sb = new StringBuffer(domain);
  +sb.append(":type=Context");
  +sb.append(",path=");
  +sb.append(request.getContextPath());
  +sb.append(",*");
  +ObjectName search = new ObjectName(sb.toString());
  +Iterator names = mbserver.queryNames(search, null).iterator();
  +String host = null;
  +while (names.hasNext()) {
  +host = ((ObjectName)names.next()).getKeyProperty("host");
  +}
  +return host;
  +
  +}
  +
   }
  
  
  
  1.4   +22 -5 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
  
  Index: DeleteHostAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeleteHostAction.java 15 Mar 2002 01:16:29 -  1.3
  +++ DeleteHostAction.java 3 Feb 2003 22:55:00 -   1.4
  @@ -90,6 +90,7 @@
   import org.apache.struts.util.MessageResources;
   
   import org.apache.webapp.admin.ApplicationServlet;
  +import org.apache.webapp.admin.Lists;
   import org.apache.webapp.admin.TomcatTreeBuilder;
   
   /**
  @@ -152,7 +153,23 @@
   throw new ServletException
   ("Cannot acquire MBeanServer reference", t);
   }
  -
  +
  +String adminHost = null;
  +// Get the host name the admin app runs on
  +// this host cannot be deleted from the admin tool
  +try {
  +adminHost = Lists.getAdminAppHost(
  +  mBServer, "Catalina" ,request);
  +} catch (Exception e) {
  +String message =
  +resources.getMessage("error.hostName.bad",
  +adminHost);
  +getServlet().log(message);
  +response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
  +return (null);
  +}
  +request.setAttribute("adminAppHost", adminHost);
  + 
   String serviceName = request.getParameter("serviceName");
   // Set up a form bean containing the currently selected
   // objects to be deleted
  
  
  
  1.4   +20 -4 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
  
  Index: EditHostAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EditHostAction.java   9 Sep 2002 19:57:23 -   1.3
  +++ EditHostAction.java   3 Feb 2003 22:55:00 -   1.4
  @@ -147,6 +147,22 @@
   ("Cannot acquire MBeanServer reference", t);
   }
   
  +String adminHost = null;
  +// Get the host name the admin app runs on
  +// this host cannot be deleted from the admin tool
  +try {
  +adminHost = Lists.getAdminAppHost(
  +  mBServer, "Catalina" ,request);
  +} catch (Exception e) {
  +   

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

2003-02-03 Thread amyroh
amyroh  2003/02/03 14:52:20

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  Fix for bugzilla 16106.  Patch submitted by Rich J <[EMAIL PROTECTED]>.
  
  Revision  ChangesPath
  1.37  +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- StandardServer.java   7 Jan 2003 22:20:12 -   1.36
  +++ StandardServer.java   3 Feb 2003 22:52:19 -   1.37
  @@ -931,7 +931,7 @@
   private boolean isSkippable(String className) {
   
   for (int i = 0; i < skippables.length; i++) {
  -if (skippables[i] == className) {
  +if (skippables[i].equals(className)) {
   return (true);
   }
   }
  
  
  

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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Costin Manolache
Tim Funk wrote:

> To get functionality like jdkCompat (and looking at tomcat3), it looks
> like something similar to the following would need added to the existing
> jakarta-tomcat-catalina/catalina/build.xml:
> --
> unless="jdk.1.4.present"/>
> --
> Where would jdkCompat live with respect to package name? Does it belong
> in catalina? (org.apache.catalina.util.compat.ClassXXX)

I would place it in j-t-c/util, even in o.a.tomcat.util.compat ( but with a
different name than jkd11compat class in 3.3 ).

This kind of code is very common.



> Are there any other methods (wishlist) which need to be here?

We can add as we go. You can do a grep in sources for all reflection - and
see if anything else is needed there.

 
> Or am I getting ahead of myself and should I be patient and wait for
> someone with better insight to do this instead?

You seem to have good insight, please do it.

Costin 

> 
> -Tim
> 
> 
> Remy Maucherat wrote:
>> Costin Manolache wrote:
>> 
>>> Tim Funk wrote:
>>>
>>>
>>> Oh, NO. Please don't even think about it Commons-dbcp must do it
>>> because
>>> it is impossible to write a JDBC driver that works and compiles in
>>> both 1.3
>>> and 1.4.
>>> Reflection is fine - I would preffer using a jdkCompat-like trick and
>>> have
>>> substitute code for 1.3, but I'm fine with reflection.
>> 
>> 
>> Yes, I agree using a compat class is definitely much nicer :)
>> 
>> Remy
>>



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




DO NOT REPLY [Bug 16316] - DataSourceRealm can not find JNDI name in context

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16316

DataSourceRealm can not find JNDI name in context





--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 22:05 ---
Try configuring your JNDI Named DataSource which is used
by the DataSourceRealm in the 
GlobalNamingResources section of your server.xml config.

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




DO NOT REPLY [Bug 16106] - IllegalAccessException at next startup after Webapps:Aministration

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16106

IllegalAccessException at next startup after Webapps:Aministration





--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 22:00 ---
We've seen this same problem on Tru64 UNIX.  Tracked it down to a bogus
string comparison in org/apache/catalina/core/StandardServer.java, here's
a fix:

*** StandardServer.java.origMon Feb  3 16:01:21 2003
--- StandardServer.javaMon Feb  3 16:02:59 2003
***
*** 930,936 
  private boolean isSkippable(String className) {

  for (int i = 0; i < skippables.length; i++) {
! if (skippables[i] == className) {
  return (true);
  }
  }
--- 930,936 
  private boolean isSkippable(String className) {

  for (int i = 0; i < skippables.length; i++) {
! if (skippables[i].equals(className)) {
  return (true);
  }
  }

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




DO NOT REPLY [Bug 16733] New: - Validator have no errDispatcher Instance

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16733

Validator have no errDispatcher Instance

   Summary: Validator have no errDispatcher Instance
   Product: Tomcat 4
   Version: 4.1.19
  Platform: All
OS/Version: All
Status: UNCONFIRMED
  Severity: Critical
  Priority: Other
 Component: Jasper 2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Example:  
  
1. adding a page buffer="128" directive to examples/jsp/simpletag/foo.jsp  
2. request it via browser 
  
Exception:  
  
java.lang.NullPointerException  
at  
org.apache.jasper.compiler.Validator$PageDirectiveVisitor.visit(Validator.java:183)  
at org.apache.jasper.compiler.Node$PageDirective.accept(Node.java:280)  
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:1038)  
at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:1080)  
at org.apache.jasper.compiler.Node$Visitor.visit(Node.java:1086)  
at org.apache.jasper.compiler.Node$Root.accept(Node.java:232)  
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:1038)  
at org.apache.jasper.compiler.Validator.validate(Validator.java:581)  
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:230)  
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:365)  
at  
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:474)  
at  
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:184)  
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.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:247)
  
at  
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:193)
  
at  
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:260)  
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  
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643)
  
at  
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:493) 
 
at  
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:641)
  
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.StandardContext.invoke(StandardContext.java:2415)  
at  
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:180)  
at  
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643)
  
at  
org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatcherValve.java:170)  
at  
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:641)
  
at  
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:172)  
at  
org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:641)
  
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.StandardEngineValve.invoke(StandardEngineValve.java:174)  
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.coyote.tomcat4.CoyoteAdapter.service(CoyoteAdapter.java:223)  
at  
org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:612)  
at  
org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.processConnection(Http11Protocol.java:428)
  
at  
org.apac

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties

2003-02-03 Thread luehe
luehe   2003/02/03 12:33:37

  Modified:jasper2/src/share/org/apache/jasper/compiler Validator.java
   jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
  Log:
  Fixed 16731: A translation error is not raised by the container if
  jsp:invoke specifies the 'scope' attribute but not 'var' or
  'varReader'
  
  Revision  ChangesPath
  1.72  +17 -9 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
  
  Index: Validator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Validator.java3 Feb 2003 20:11:42 -   1.71
  +++ Validator.java3 Feb 2003 20:33:35 -   1.72
  @@ -946,9 +946,13 @@
String scope = n.getTextAttribute ("scope");
JspUtil.checkScope(scope, n, err);
   
  - if (n.getAttributeValue("var") != null
  - && n.getAttributeValue("varReader") != null) {
  - err.jspError(n, "jsp.error.invoke.varAndVarReader");
  + String var = n.getAttributeValue("var");
  + String varReader = n.getAttributeValue("varReader");
  + if (scope != null && var == null && varReader == null) {
  + err.jspError(n, "jsp.error.missing_var_or_varReader");
  + }
  + if (var != null && varReader != null) {
  + err.jspError(n, "jsp.error.var_and_varReader");
}
}
   
  @@ -959,9 +963,13 @@
String scope = n.getTextAttribute ("scope");
JspUtil.checkScope(scope, n, err);
   
  - if (n.getAttributeValue("var") != null
  - && n.getAttributeValue("varReader") != null) {
  - err.jspError(n, "jsp.error.doBody.varAndVarReader");
  + String var = n.getAttributeValue("var");
  + String varReader = n.getAttributeValue("varReader");
  + if (scope != null && var == null && varReader == null) {
  + err.jspError(n, "jsp.error.missing_var_or_varReader");
  + }
  + if (var != null && varReader != null) {
  + err.jspError(n, "jsp.error.var_and_varReader");
}
}
   
  
  
  
  1.88  +3 -3  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- messages.properties   3 Feb 2003 20:11:42 -   1.87
  +++ messages.properties   3 Feb 2003 20:33:36 -   1.88
  @@ -295,8 +295,8 @@
   jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' attributes.  
If 'fragment' is present, 'type' is fixed as 'javax.servlet.jsp.tagext.JspFragment'
   jsp.error.fragmentwithrtexprvalue=Cannot specify both 'fragment' and 'rtexprvalue' 
attributes.  If 'fragment' is present, 'rtexprvalue' is fixed as 'true'
   jsp.error.fragmentWithDeclareOrScope=Both 'fragment' and 'declare' or 'scope' 
attributes specified in variable directive
  -jsp.error.invoke.varAndVarReader=Both 'var' and 'varReader' specified in jsp:invoke
  -jsp.error.doBody.varAndVarReader=Both 'var' and 'varReader' specified in jsp:doBody
  +jsp.error.var_and_varReader=Only one of \'var\' or \'varReader\' may be specified
  +jsp.error.missing_var_or_varReader=Missing \'var\' or \'varReader\' attribute
   jsp.warning.bad.urlpattern.propertygroup=Bad value {0} in the url-pattern 
subelement in web.xml
   jsp.error.unknown_attribute_type=Unknown attribute type ({1}) for attribute {0}.
   jsp.error.jspelement.missing.name=Mandatory attribute 'name' missing in jsp:element
  
  
  
  1.33  +2 -3  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
  
  Index: messages_es.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- messages_es.properties1 Feb 2003 02:41:13 -   1.32
  +++ messages_es.properties3 Feb 2003 20:33:36 -   1.33
  @@ -211,8 +211,7 @@
   jsp.error.taglibDirective.missing.location=
   jsp.error.fragmentwithtype=
   jsp.error.fragmentWithDeclareOrScope=
  -jsp.error.invoke.varAndVarReader=
  -jsp.error.doBody.varAndVarReader=
  +jsp.error.var_and_varReader=
   jsp.warning.bad.urlpattern.propertygroup=
   jsp.error.jspelement.missing.name=
  

DO NOT REPLY [Bug 16731] - A translation error is not raised by the container if jsp:invoke specifies the 'scope' attribute but not 'var' or 'varReader'

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16731

A translation error is not raised by the container if jsp:invoke specifies the 'scope' 
attribute but not 'var' or 'varReader'

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

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




DO NOT REPLY [Bug 16728] - Translation error not raised of jsp:attribute is provided an invalid value to the 'scope' attribute

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16728

Translation error not raised of jsp:attribute is provided an invalid value to the 
'scope' attribute

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

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




cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_fr.properties

2003-02-03 Thread luehe
luehe   2003/02/03 12:11:43

  Modified:jasper2/src/share/org/apache/jasper/compiler JspUtil.java
Validator.java
   jasper2/src/share/org/apache/jasper/resources
messages.properties messages_fr.properties
  Log:
  Fixed 16728: Translation error not raised of jsp:attribute is provided
  an invalid value to the 'scope' attribute
  
  Revision  ChangesPath
  1.29  +23 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java
  
  Index: JspUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JspUtil.java  22 Jan 2003 20:08:24 -  1.28
  +++ JspUtil.java  3 Feb 2003 20:11:41 -   1.29
  @@ -225,6 +225,26 @@
   }
   
   /**
  + * Checks to see if the given scope is valid.
  + *
  + * @param scope The scope to be checked
  + * @param n The Node containing the 'scope' attribute whose value is to be
  + * checked
  + * @param err error dispatcher
  + *
  + * @throws JasperException if scope is not null and different from
  + * "page", "request", "session", and
  + * "application"
  + */
  +public static void checkScope(String scope, Node n, ErrorDispatcher err)
  +throws JasperException {
  + if (scope != null && !scope.equals("page") && !scope.equals("request")
  + && !scope.equals("session") && !scope.equals("application")) {
  + err.jspError(n, "jsp.error.invalid.scope", scope);
  + }
  +}
  +
  +/**
* Checks if all mandatory attributes are present and if all attributes
* present have valid names.  Checks attributes specified as XML-style
* attributes as well as attributes specified using the jsp:attribute
  
  
  
  1.71  +12 -3 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
  
  Index: Validator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Validator.java27 Jan 2003 23:15:34 -  1.70
  +++ Validator.java3 Feb 2003 20:11:42 -   1.71
  @@ -542,6 +542,7 @@
   
String name = n.getTextAttribute ("id");
String scope = n.getTextAttribute ("scope");
  + JspUtil.checkScope(scope, n, err);
String className = n.getTextAttribute ("class");
String type = n.getTextAttribute ("type");
BeanRepository beanInfo = pageInfo.getBeanRepository();
  @@ -941,6 +942,10 @@
public void visit(Node.InvokeAction n) throws JasperException {
   
   JspUtil.checkAttributes("Invoke", n, invokeAttrs, err);
  +
  + String scope = n.getTextAttribute ("scope");
  + JspUtil.checkScope(scope, n, err);
  +
if (n.getAttributeValue("var") != null
&& n.getAttributeValue("varReader") != null) {
err.jspError(n, "jsp.error.invoke.varAndVarReader");
  @@ -950,6 +955,10 @@
public void visit(Node.DoBodyAction n) throws JasperException {
   
   JspUtil.checkAttributes("DoBody", n, doBodyAttrs, err);
  +
  + String scope = n.getTextAttribute ("scope");
  + JspUtil.checkScope(scope, n, err);
  +
if (n.getAttributeValue("var") != null
&& n.getAttributeValue("varReader") != null) {
err.jspError(n, "jsp.error.doBody.varAndVarReader");
  
  
  
  1.87  +2 -2  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- messages.properties   1 Feb 2003 02:41:13 -   1.86
  +++ messages.properties   3 Feb 2003 20:11:42 -   1.87
  @@ -31,7 +31,7 @@
   by jsp directive defined earlier: 
   jsp.error.usebean.not.both=useBean: Can't specify both class and beanName 
attribute: 
   jsp.error.usebean.bad.type.cast=useBean ({0}): Type ({1}) is not assignable from 
class ({2}) 
  -jsp.error.usebean.invalid.scope=Invalid scope ({1}) in useBean: ({0}).
  +jsp.error.invalid.scope=Invalid value of 'scope' attribute: {0} (must be one of 
\"page\", \"request\", \"session\", or \"application\")
   jsp.error.classname=Can't determine classname from .class file
   jsp.warning.bad.type=Warning: bad type in .class file
   jsp.error.data.file.write=Error while 

DO NOT REPLY [Bug 16731] New: - A translation error is not raised by the container if jsp:invoke specifies the 'scope' attribute but not 'var' or 'varReader'

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16731

A translation error is not raised by the container if jsp:invoke specifies the 'scope' 
attribute but not 'var' or 'varReader'

   Summary: A translation error is not raised by the container if
jsp:invoke specifies the 'scope' attribute but not 'var'
or 'varReader'
   Product: Tomcat 5
   Version: Nightly Build
  Platform: All
OS/Version: All
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


JSP.5-8 states that a translation error will result if the scope attribute
is specified and var or varReader are not.

The current Jasper impementation doesn't raise any translation error and instead
ignores the scope attribute and sends the result of jsp:invoke to the current
writer.

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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Tim Funk
To get functionality like jdkCompat (and looking at tomcat3), it looks 
like something similar to the following would need added to the existing 
jakarta-tomcat-catalina/catalina/build.xml:
--
  
   unless="jdk.1.4.present"/>
--
Where would jdkCompat live with respect to package name? Does it belong 
in catalina? (org.apache.catalina.util.compat.ClassXXX)

Are there any other methods (wishlist) which need to be here?

Or am I getting ahead of myself and should I be patient and wait for 
someone with better insight to do this instead?

-Tim


Remy Maucherat wrote:
Costin Manolache wrote:


Tim Funk wrote:


Oh, NO. Please don't even think about it Commons-dbcp must do it 
because
it is impossible to write a JDBC driver that works and compiles in 
both 1.3
and 1.4.
Reflection is fine - I would preffer using a jdkCompat-like trick and 
have
substitute code for 1.3, but I'm fine with reflection.


Yes, I agree using a compat class is definitely much nicer :)

Remy




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




Re: JSP API javadocs out-of-date

2003-02-03 Thread Remy Maucherat
Jan Luehe wrote:

I've noticed the JSP API javadocs at

  http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jspapi

are out-of-date, and I'm wondering what I need to do in order to sync
them up with the latest API versions at jakarta-servletapi-5.

The JSP API javadocs in the nightly build of the tomcat-docs webapp
are up-to-date.

Any suggestions?


The online docs are synced with the latest release from the branch. So 
since no releases were made since 5.0.0 (for whatever reason), it was 
not synced up.

I'd like to keep this syncing.

Remy


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



4.1.20 release date? [re bug 15845]

2003-02-03 Thread Aditya
Is there an interim build with this patch applied (I can't see
anything in the nightly builds on jakarta.apache.org)? If not, is
there a target date for 4.1.20? Building from source is an adventure
I'd rather not have at this point.

Thanks,
Adi

> On Sun, 26 Jan 2003 20:35:20 -0600, Glenn Nielsen <[EMAIL PROTECTED]> said:
> You read it correctly. AFAIK, all previous versions of jasper held
> on to objects which it no longer needed after a JSP compile.

> Glenn

> Aditya wrote: Although bug 15845 is listed as being for 4.1.19, it
> looks like it affected Jasper2 even before that -- or am I reading
> the commit message wrong?  Thanks, Adi
>>
>>> On 26 Jan 2003 19:00:19 -, [EMAIL PROTECTED] said: glenn
>>> 2003/01/26 11:00:19
>>
>>> Modified: .  RELEASE-NOTES-4.1.txt Log: Update release notes
>>
>>> Revision Changes Path 1.52 +6 -1
>>> 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.51 retrieving revision 1.52 diff -u -r1.51
>>> -r1.52 --- RELEASE-NOTES-4.1.txt 21 Jan 2003 23:19:56 - 1.51
>>> +++ RELEASE-NOTES-4.1.txt 26 Jan 2003 19:00:19 - 1.52 @@
>>> -1041,6 +1041,11 @@ PageContextImpl: pushBody()/popBody() error on
>>> tomcat 4.1.X.
>>
>>> +[4.1.20] #15845 + Fixed JSP page compiles so that objects created
>>> for performing + the JSP page compiles which are not reused are
>>> dereferenced so + they are eligible for GC. This should reduce the
>>> memory footprint + and improve GC performance.
>>
>>>  KNOWN ISSUES IN THIS RELEASE:
> --
> To unsubscribe, e-mail:
>>> 
> For additional commands, e-mail:
>>> 

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




[PATCH] jakarta-servletapi-5

2003-02-03 Thread Mark Roth
jsr152/src/share/javax/servlet/jsp/tagext/SkipPageException.java
- Made clear that this should not be thrown from within a tag file.

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Added some useful subelements to tag-file element:
	* description
	* display-name
	* icon
* example
	* tag-extension

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.

Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.7
diff -u -r1.7 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  28 Jan 2003 00:19:10 - 
 1.7
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  3 Feb 2003 19:05:56 -
@@ -10,7 +10,7 @@
 
 
 
-@(#)web-jsptaglibrary_2_0.xsds 1.26 01/24/03
+%W% %G%
 
 
 
@@ -334,23 +334,69 @@
 
 The tag-file element has two required subelements:
 
-nameThe unique action name
+description   Optional tag-specific information
 
-pathWhere to find the .tag file implementing this
-action, relative to the root of the web application or
-   the root of the JAR file for a tag library packaged in
-   a JAR.  This must begin with /WEB-INF/tags if the .tag
-   file resides in the WAR, or /META-INF/tags if the .tag
-   file resides in a JAR.
+display-name  A short name that is intended to be
+  displayed by tools
+
+icon  Optional icon element that can be used
+  by tools
+
+name  The unique action name
+
+path  Where to find the .tag file implementing this
+  action, relative to the root of the web application or
+ the root of the JAR file for a tag library packaged in
+ a JAR.  This must begin with /WEB-INF/tags if the .tag
+ file resides in the WAR, or /META-INF/tags if the .tag
+ file resides in a JAR.
+
+example   Optional informal description of an
+  example of a use of this tag
+
+tag-extension Zero or more extensions that provide extra
+ information about this tag, for tool
+ consumption
 
 
 
 
 
+
 
 
+
+
+
+
+The example element contains an informal description
+of an example of the use of a tag.
+
+
+
+
+
+   
+   
+   
+
+Tag extensions are for tool use only and must not affect
+   the behavior of a container.  The TLD extension mechanism
+   only allows ignorable extensions (i.e. those without a
+   mustUnderstand attribute).  A Tag Library is considered
+   invalid if it requires an extension that must be
+   understood by setting mustUnderstand="true".
+
+   
+   
+   
 
 
 
Index: jsr152/src/share/javax/servlet/jsp/SkipPageException.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java,v
retrieving revision 1.3
diff -u -r1.3 SkipPageException.java
--- jsr152/src/share/javax/servlet/jsp/SkipPageException.java   29 Oct 2002 01:18:11 
-  1.3
+++ jsr152/src/share/javax/servlet/jsp/SkipPageException.java   3 Feb 2003 19:05:56 
+-
@@ -62,7 +62,7 @@
  * the case with tag files).  The effect is similar to that of a 
  * Classic Tag Handler returning Tag.SKIP_PAGE from doEndTag().
  * Jsp Fragments may also throw this exception.  This exception
- * should not be thrown manually in a JSP page - the behavior is
+ * should not be thrown manually in a JSP page or tag file - the behavior is
  * undefined.  The exception is intended to be thrown inside 
  * SimpleTag handlers and in JSP fragments.
  * 
Index: jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.7
diff -u -r1.7 web-jsptaglibrary_2_0.xsd
--- jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd  28 Jan 2003 00:19:10 - 
 1.7
+++ jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd  3 Feb 2003 19:06:04 -
@@ -10,7 +10,7 @@
 
 
 
-@(#)web-jsptaglibrary_2_0.xsds 1.26 01/24/03
+%W% %G%
 
 
 
@@ -334,23 +334,69 @@
 
 The tag-file element has two required subelements:
 
-nameThe unique action name
+description   Optional tag-specific information
 
-pathWhere to find the .tag file implementing this
-action, relative to the root of the web application or
-   the root of the JAR file for a tag library packaged in
-   a JAR.  This must begin with /WEB-INF/tags if the .tag
-   file resides in the WAR, or /META-INF/

Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Costin Manolache
Remy Maucherat wrote:

> Costin Manolache wrote:
>> Remy Maucherat wrote:
>> 
>> 
>>>Tim Funk wrote:
>>>
Tomcat5 does not compile with JDK1.3. It does with JDK1.4.

There is only one line of code that prevents it from compiling with
JDK1.3. org.apache.catalina.loader.WebappClassLoader depends on
File.toURI() which does not exist on jdk1.3.

I got around this by the performing the following:
OLD CODE:
  return realFile.toURI().toURL();
NEW CODE
  return new URL("file:" + realFile.toURL().getPath());

My patch also has some spurious stuff because my text editor
automatically strips all trailing whitespace from lines and converts
tabs to spaces. The important stuff is the last 9 lines of the patch
file.
>>>
>>>The patch is a bad idea. The change was made to fix RMI related problems.
>>>
>>>What should be done is invoke the appropriate methods through
>>>reflection, catching any error (and defaulting to the old code if it
>>>fails).
>> 
>> 
>> Well, reflection is a bad idea too :-) A better solution is to use a
>> wrapper like jdkCompat ( i.e. a base class with the 1.3 implementation,
>> extended with a 1.4 impl ). This class could include other 1.4 methods
>> and their 1.3 equivalent, if any.
> 
> Well, I was planning to implement it as:
> 
> try {
>   // do the nasty 1.4 stuff with reflection
> } catch (Throwable t) {
>   // do the compatible stuff
> }
> 
> It's not nice but it works (and as the CL is cached, we don't care too
> much about the performance loss due to the exception).

It works - but programming control statements via exceptions is ugly.
And very likely the code will be cut&pasted in other places.

Having a base jdkCompat will allow this code to be reused and will be
cleaner ( IMO ).

Not a big deal...


Costin


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




DO NOT REPLY [Bug 16728] New: - Translation error not raised of jsp:attribute is provided an invalid value to the 'scope' attribute

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16728

Translation error not raised of jsp:attribute is provided an invalid value to the 
'scope' attribute

   Summary: Translation error not raised of jsp:attribute is
provided an invalid value to the 'scope' attribute
   Product: Tomcat 5
   Version: Nightly Build
  Platform: All
OS/Version: All
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Table JSP.5-8 states that the valid values that can be provided to the 'scope' 
attribute of jsp:invoke are 'page', 'request', 'session', 'application'.

If I provide values such as Page, reQuest, sessioN, or ApplicatioN a translation
error is not raised by the container.

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




DO NOT REPLY [Bug 15463] - StandardManager incorrectly uses getLastAccessedTime

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=15463

StandardManager incorrectly uses getLastAccessedTime





--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 18:40 ---
I've made the same observation.

I was implementing a session keep alive for a client, when I noticed the 
session's getLastAccessedTime() is not updating.

After some testing, I noticed the correct value is displayed for every second 
hit.

My current workaround is to hit the server twice for every keep alive i need.

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




DO NOT REPLY [Bug 16727] New: - Incorrect exception raised when tag file uses jsp:invoke to store result of fragment into session scope and calling page doesn't participate in a session.

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16727

Incorrect exception raised when tag file uses jsp:invoke to store result of fragment 
into session scope and calling page doesn't participate in a session.

   Summary: Incorrect exception raised when tag file uses jsp:invoke
to store result of fragment into session scope and
calling page doesn't participate in a session.
   Product: Tomcat 5
   Version: Nightly Build
  Platform: All
OS/Version: All
Status: NEW
  Severity: Major
  Priority: Other
 Component: Jasper2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Table JSP.5-8 states that the container must throw am IllegalStateException at
runtime if scope is session and the calling page does not participate in a session.

Consider the following:

TestPage.jsp
-
<%@ page session="false" %>
<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>


attribute value


--

notInSession.tag
--
<%@ attribute name="attr1" fragment="true" %>


--

If I wrap the section of the calling page that invokes the tag with 
a try catch, an Exception is indeed thrown, but it is an instance of
JspException.  If I check the root exception of the JspException it is
an instance of IllegalArgumentException.

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




JSP API javadocs out-of-date

2003-02-03 Thread Jan Luehe
I've noticed the JSP API javadocs at

  http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jspapi

are out-of-date, and I'm wondering what I need to do in order to sync
them up with the latest API versions at jakarta-servletapi-5.

The JSP API javadocs in the nightly build of the tomcat-docs webapp
are up-to-date.

Any suggestions?

Thanks,


Jan


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




Re: MacOS X - mod_jk.so

2003-02-03 Thread Han Ming Ong
What's wrong with using the binary versions found at

http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/ 
v1.2.2/bin/macosx/

Just wondering?

Han Ming

On Monday, February 3, 2003, at 09:15  AM, Tom Anderson wrote:

Looks like you may need the dlcompat stuff.  Check out this URL:  
http://www.geektimes.com/macintosh/os/x/10_0/and/tomcat_install.html

On Sunday, February 2, 2003, at 09:01 PM, Ro wrote:

Hi,
i am doing Java JSP coding and I installed TOMCAT 4.1.18. Now I would  
like to link it with apache.

I've been try all day to build the mod_jk.so on OSX but with no  
results:

When I try to build it with the dlopen.c and dlfcn.h... I get an  
error from the dlopen.c file:

dlopen.c:84: return type is an incomplete type
dlopen.c: In function `NSMakePrivateModulePublic':
dlopen.c:95: warning: `return' with a value, in function returning  
void
dlopen.c:97: invalid use of undefined type `enum bool'
dlopen.c:97: warning: `return' with a value, in function returning  
void
dlopen.c: In function `dlopen':
dlopen.c:255: void value not ignored as it ought to be
dlopen.c:337: void value not ignored as it ought to be


Please help

Rolley

___
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com

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




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




Re: MacOS X - mod_jk.so

2003-02-03 Thread Tom Anderson
Looks like you may need the dlcompat stuff.  Check out this URL: 
http://www.geektimes.com/macintosh/os/x/10_0/and/tomcat_install.html

On Sunday, February 2, 2003, at 09:01 PM, Ro wrote:

Hi,
i am doing Java JSP coding and I installed TOMCAT 4.1.18. Now I would 
like to link it with apache.

I've been try all day to build the mod_jk.so on OSX but with no 
results:

When I try to build it with the dlopen.c and dlfcn.h... I get an error 
from the dlopen.c file:

dlopen.c:84: return type is an incomplete type
dlopen.c: In function `NSMakePrivateModulePublic':
dlopen.c:95: warning: `return' with a value, in function returning void
dlopen.c:97: invalid use of undefined type `enum bool'
dlopen.c:97: warning: `return' with a value, in function returning void
dlopen.c: In function `dlopen':
dlopen.c:255: void value not ignored as it ought to be
dlopen.c:337: void value not ignored as it ought to be


Please help

Rolley

___
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com

-
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: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Remy Maucherat
Costin Manolache wrote:

Tim Funk wrote:


Oh, NO. Please don't even think about it Commons-dbcp must do it because
it is impossible to write a JDBC driver that works and compiles in both 1.3
and 1.4. 

Reflection is fine - I would preffer using a jdkCompat-like trick and have
substitute code for 1.3, but I'm fine with reflection.

Yes, I agree using a compat class is definitely much nicer :)

Remy


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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Remy Maucherat
Costin Manolache wrote:

Remy Maucherat wrote:



Tim Funk wrote:


Tomcat5 does not compile with JDK1.3. It does with JDK1.4.

There is only one line of code that prevents it from compiling with
JDK1.3. org.apache.catalina.loader.WebappClassLoader depends on
File.toURI() which does not exist on jdk1.3.

I got around this by the performing the following:
OLD CODE:
 return realFile.toURI().toURL();
NEW CODE
 return new URL("file:" + realFile.toURL().getPath());

My patch also has some spurious stuff because my text editor
automatically strips all trailing whitespace from lines and converts
tabs to spaces. The important stuff is the last 9 lines of the patch
file.


The patch is a bad idea. The change was made to fix RMI related problems.

What should be done is invoke the appropriate methods through
reflection, catching any error (and defaulting to the old code if it
fails).



Well, reflection is a bad idea too :-) A better solution is to use a 
wrapper like jdkCompat ( i.e. a base class with the 1.3 implementation,
extended with a 1.4 impl ). This class could include other 1.4 methods
and their 1.3 equivalent, if any.

Well, I was planning to implement it as:

try {
 // do the nasty 1.4 stuff with reflection
} catch (Throwable t) {
 // do the compatible stuff
}

It's not nice but it works (and as the CL is cached, we don't care too 
much about the performance loss due to the exception).

This would allow implementing the correct stuff, instead of failing. 

Sure.

Remy


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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Costin Manolache
Tim Funk wrote:

> After looking at the older revisions, I agree my patch was stupendously
> horrible :(
> 
> The patch now uses reflection to keep the current code equivalent for
> jdk14 and use the old way in case of a jdk1.3 jvm.
> 
> That being said - I would assume that the RMI issue your patch addressed
> would still be an issue in JDK1.3. Can you give me some insight on what
> it was? If possible I can attempt to make the appropriate fix.
> 
> I think commons-dbcp project do some wacky magic on java src files (
> poor man's equivalent of c directives for code include/exclude). Is that
> an alternative to move towards for situations like this? Or is having
> one and only one binary the a better goal? (So users don't need to
> choose a 1.3 and 1.4 binary)

Oh, NO. Please don't even think about it Commons-dbcp must do it because
it is impossible to write a JDBC driver that works and compiles in both 1.3
and 1.4. 

Reflection is fine - I would preffer using a jdkCompat-like trick and have
substitute code for 1.3, but I'm fine with reflection.

Costin




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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Costin Manolache
Remy Maucherat wrote:

> Tim Funk wrote:
>> Tomcat5 does not compile with JDK1.3. It does with JDK1.4.
>> 
>> There is only one line of code that prevents it from compiling with
>> JDK1.3. org.apache.catalina.loader.WebappClassLoader depends on
>> File.toURI() which does not exist on jdk1.3.
>> 
>> I got around this by the performing the following:
>> OLD CODE:
>>   return realFile.toURI().toURL();
>> NEW CODE
>>   return new URL("file:" + realFile.toURL().getPath());
>> 
>> My patch also has some spurious stuff because my text editor
>> automatically strips all trailing whitespace from lines and converts
>> tabs to spaces. The important stuff is the last 9 lines of the patch
>> file.
> 
> The patch is a bad idea. The change was made to fix RMI related problems.
> 
> What should be done is invoke the appropriate methods through
> reflection, catching any error (and defaulting to the old code if it
> fails).

Well, reflection is a bad idea too :-) A better solution is to use a 
wrapper like jdkCompat ( i.e. a base class with the 1.3 implementation,
extended with a 1.4 impl ). This class could include other 1.4 methods
and their 1.3 equivalent, if any.

This would allow implementing the correct stuff, instead of failing. 

Costin



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




DO NOT REPLY [Bug 8363] - Out of memory error

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=8363

Out of memory error





--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 15:41 ---
We are using Apache Tomcat 4.0.6 and jd2sk1.4.1. We have augmented our heap 
size with the following params--Xms 128ms -Xmx256m. This delays the problem a 
little , however, the more transactions that occur, the memory will gradual 
increase. 

How do we precompile the JSP pages to avoid the problem?

Because we compile our pages in JBuilder and generate a war file. However our 
pages are not static in that the content is dynamically changing with each 
request/transaction that is being made to the database.

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




DO NOT REPLY [Bug 8363] - Out of memory error

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=8363

Out of memory error





--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 15:34 ---

are your jsp pages precompiled?

if they are not, there was a memory allocation bug that has been fixed in cvs 
where jasper was keeping stuff it did not need after compiling a jsp page.

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




DO NOT REPLY [Bug 16316] - DataSourceRealm can not find JNDI name in context

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16316

DataSourceRealm can not find JNDI name in context





--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 15:30 ---
Created an attachment (id=4686)
Testcase: server.xml , web.xml , index.jsp test file.

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




DO NOT REPLY [Bug 16316] - DataSourceRealm can not find JNDI name in context

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16316

DataSourceRealm can not find JNDI name in context

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |



--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 15:27 ---
Sad but true, I've forced to reopen this bug. I tried all the possible variants
in configuration files (config.xml , web.xml) with no luck.
I have a servlet that looks up JNDI for DataSource object, and a DataSourceRealm
relied on JNDI resource defined in config.xml . With one configuration,
DataSource obtains successfully, but Realm doesn't work, throwing an exception;
with another, DataSource throwing an exception, but database access works fine.
How can I have it work both siumltaneuosly? Seems like nobody uses this
technique for now because I asked similar questions several time in tomcat-dev
list, and nobody helped to make it work both, but separately only.
Exception is the same:

javax.naming.NameNotFoundException: Name java:comp is not bound in this Context

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




DO NOT REPLY [Bug 16705] New: - Pending requests can corrupt data of recycled sessions

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16705

Pending requests can corrupt data of recycled sessions

   Summary: Pending requests can corrupt data of recycled sessions
   Product: Tomcat 4
   Version: 4.1.12
  Platform: Sun
OS/Version: Solaris
Status: NEW
  Severity: Critical
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Sometimes we have problems that one user can see the stored session data of
another one.
We find out that the recycling of invalidated sessions is unsafe, if there are
pending requests. The pending request can write some data in a recycled session,
if the associated session of this request were invalidated during the request!

Consider the following example.

-- first.jsp
<%
  // invalidate a valid session if there is one
  if(request.getSession(false) != null) {
request.getSession().invalidate();
  }

  // get a new session
  request.getSession(true);

  // print out the new session id
  out.write(request.getSession().getId()+"");

  out.write("Go");
%>



-- second.jsp
<%
  // do the work only if there is a session
  if(session != null && !session.isNew()) {

// save the old session id
String firstId = session.getId();

// print out the old session id
out.write(firstId+"");
out.write("");

// this wait of 10 seconds is only to achieve reproducibility
System.out.println("start!");
try {
  synchronized(this) {
wait(1);
  }
}
catch(Exception e) {
}
System.out.println("end!");

// save id in session if there is no one
if(session.getAttribute("Id") == null) {
  session.setAttribute("Id",firstId);
}

// get the saved id
String savedId = (String) session.getAttribute("Id");

// print out the 'actual' session id and the saved session id
out.write(session.getId()+"");
out.write(savedId+"");
  }
  else {
out.write("Please call this first!");
  }
%>

To reproduce the bug do the following:

1. Call first.jsp - You will get a new session.

2. Call second.jsp.

3. Wait if "start!" is logged on the Tomcat console.

4. Break up the request to second.jsp in your browser.

5. Call first.jsp again - The old session will invalidate and you will get a new
  session again.

6. Call second.jsp again.

7. In the response the last two printed ids differs!

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




DO NOT REPLY [Bug 8363] - Out of memory error

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=8363

Out of memory error

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|LATER   |



--- Additional Comments From [EMAIL PROTECTED]  2003-02-03 14:13 ---
Does someone have the solution of the problem above ?
We have the same problem.

Using : Tomcat 4.0.6 , j2sdk1.4.1 ,  512Ram , 2Ghz

thanks

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




Re: help for a realm author

2003-02-03 Thread Tony Dahbura
Thanks!  That was the info I was looking for.

Tony


"Craig R. McClanahan" wrote:

> On Sun, 2 Feb 2003, Tony Dahbura wrote:
>
> > Date: Sun, 02 Feb 2003 15:56:01 -0500
> > From: Tony Dahbura <[EMAIL PROTECTED]>
> > Reply-To: Tomcat Developers List <[EMAIL PROTECTED]>
> > To: Tomcat Developers List <[EMAIL PROTECTED]>
> > Subject: help for a realm author
> >
> > Team:
> > When tomcat is configured to support client side certificates for
> > authentication-what method does it call in a realm package?
> >
>
> Have a look at the authenticate() method in
> org.apache.catalina.authenticator.SSLAuthenticator, and you'll see that
> Tomcat calls the Realm.authenticate() method that takes a certificate
> chain as an argument.  If your Realm implementation subclasses RealmBase
> and you don't override it, the version of this method in
> org.apache.catalina.realm.RealmBase will get executed.
>
> > For instance for form and uid/password authentication it calls the
> > method
> > public Principal authenticate(String username, String credentials)
> >
> > For a certificate based access model is there another method tomcat will
> > call in the realm module?  I am trying to add certificate support to my
> > realm module and do not see much info on this?
> >
> > I would assume that Tomcat would support calling into a realm module
> > when client side certificates are enabled or is this handled differently
> > and outside of  the domain of realm modules-please elaborate if so?
> >
>
> Note that none of the above actually happens unless the user tries to
> access a webapp resource that is protected by a security constraint.
>
> > I may start the document on how to build realm modules as it has been
> > marked as a fixme for quite some time if the group thinks this would be
> > helpful.
> >
>
> That would be a very useful document.
>
> > Thanks for the assist on the above,
> > Tony
> >
>
> Craig
>
> -
> 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]




DO NOT REPLY [Bug 16701] New: - No exception if jsp:include fails

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16701

No exception if jsp:include fails

   Summary: No exception if jsp:include fails
   Product: Tomcat 4
   Version: 4.1.12
  Platform: PC
OS/Version: Windows NT/2K
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If the standard action jsp:include fails to locate the resource
(say JSP file) specified in the page attribute, there is no
exception generated. Tomcat does just do nothing about the
failed include action, but leaves the place in the response
empty.

Tomcat 3.2 did throw a java.io.FileNotFoundException, which I
would also expect to obtaine using Tomcat 4.1.

I did not try other versions of Tomcat 4, but two different
installations of Tomcat, one 4.1.12, antoher 4.1.x had the
same problem.

I checked not to be confused by the ErrorPage (removing the
part in the page directive), also put try/catch around the
include with various exception classes; none showed any 
evidence of an exception thrown by the code executing the
jsp:include action. Using pageContext.include() behaves the
same.

jsp:includes does work well if the page can be found.

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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Tim Funk
After looking at the older revisions, I agree my patch was stupendously 
horrible :(

The patch now uses reflection to keep the current code equivalent for 
jdk14 and use the old way in case of a jdk1.3 jvm.

That being said - I would assume that the RMI issue your patch addressed 
would still be an issue in JDK1.3. Can you give me some insight on what 
it was? If possible I can attempt to make the appropriate fix.

I think commons-dbcp project do some wacky magic on java src files ( 
poor man's equivalent of c directives for code include/exclude). Is that 
an alternative to move towards for situations like this? Or is having 
one and only one binary the a better goal? (So users don't need to 
choose a 1.3 and 1.4 binary)

-Tim


Remy Maucherat wrote:
Tim Funk wrote:


Tomcat5 does not compile with JDK1.3. It does with JDK1.4.

There is only one line of code that prevents it from compiling with 
JDK1.3.
org.apache.catalina.loader.WebappClassLoader depends on File.toURI() 
which does not exist on jdk1.3.

I got around this by the performing the following:
OLD CODE:
  return realFile.toURI().toURL();
NEW CODE
  return new URL("file:" + realFile.toURL().getPath());

My patch also has some spurious stuff because my text editor 
automatically strips all trailing whitespace from lines and converts 
tabs to spaces. The important stuff is the last 9 lines of the patch 
file.


The patch is a bad idea. The change was made to fix RMI related problems.

What should be done is invoke the appropriate methods through 
reflection, catching any error (and defaulting to the old code if it 
fails).

Remy


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


Index: WebappClassLoader.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.13
diff -u -r1.13 WebappClassLoader.java
--- WebappClassLoader.java  13 Nov 2002 00:36:25 -  1.13
+++ WebappClassLoader.java  3 Feb 2003 12:59:09 -
@@ -65,6 +65,7 @@
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -109,22 +110,22 @@
 /**
  * Specialized web application class loader.
  * 
- * This class loader is a full reimplementation of the 
+ * This class loader is a full reimplementation of the
  * URLClassLoader from the JDK. It is desinged to be fully
  * compatible with a normal URLClassLoader, although its internal
  * behavior may be completely different.
  * 
- * IMPLEMENTATION NOTE - This class loader faithfully follows 
- * the delegation model recommended in the specification. The system class 
- * loader will be queried first, then the local repositories, and only then 
- * delegation to the parent class loader will occur. This allows the web 
+ * IMPLEMENTATION NOTE - This class loader faithfully follows
+ * the delegation model recommended in the specification. The system class
+ * loader will be queried first, then the local repositories, and only then
+ * delegation to the parent class loader will occur. This allows the web
  * application to override any shared class except the classes from J2SE.
  * Special handling is provided from the JAXP XML parser interfaces, the JNDI
- * interfaces, and the classes from the servlet API, which are never loaded 
+ * interfaces, and the classes from the servlet API, which are never loaded
  * from the webapp repository.
  * 
- * IMPLEMENTATION NOTE - Due to limitations in Jasper 
- * compilation technology, any repository which contains classes from 
+ * IMPLEMENTATION NOTE - Due to limitations in Jasper
+ * compilation technology, any repository which contains classes from
  * the servlet API will be ignored by the class loader.
  * 
  * IMPLEMENTATION NOTE - The class loader generates source
@@ -227,9 +228,9 @@
 public WebappClassLoader(ClassLoader parent) {
 
 super(new URL[0], parent);
-
+
 this.parent = getParent();
-
+
 system = getSystemClassLoader();
 securityManager = System.getSecurityManager();
 
@@ -670,7 +671,7 @@
 /**
  * Return a String array of the current repositories for this class
  * loader.  If there are no repositories, a zero-length array is
- * returned.For security reason, returns a clone of the Array (since 
+ * returned.For security reason, returns a clone of the Array (since
  * String are immutable).
  */
 public String[] findRepositories() {
@@ -705,7 +706,7 @@
 ((ResourceAttributes) resources.getAttributes(paths[i]))
 .getLastModified();
 if (lastModified != lastModifiedDates[i]) {
-  

DO NOT REPLY [Bug 16698] New: - JsPC command occurs NullPointerException without -d option

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16698

JsPC command occurs NullPointerException without -d option

   Summary: JsPC command occurs NullPointerException without -d
option
   Product: Tomcat 4
   Version: 4.1.19
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Jasper 2
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


JsPC command occurs following NullPointerException without -d option:

> jspc.bat numguess.jsp
2003-02-03 08:56:11 - ERROR-the file '\jsp\num\numguess.jsp' generated the follo
wing general exception: java.lang.NullPointerException
error:null

I think the cause of this problem is just typo, below patch fixes it:

--- JspC.java.orig  2003-01-15 17:56:40.0 +0900
+++ JspC.java   2003-02-03 19:11:10.0 +0900
@@ -383,7 +383,7 @@
 void setupContext(JspCompilationContext clctxt) {
 // set up a scratch/output dir if none is provided
 if (scratchDir == null) {
-String temp = System.getProperty("java.io.tempdir");
+String temp = System.getProperty("java.io.tmpdir");
 if (temp == null) {
 temp = "";
 }

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




MacOS X - mod_jk.so

2003-02-03 Thread Ro
Hi,
i am doing Java JSP coding and I installed TOMCAT 4.1.18. Now I would 
like to link it with apache.

I've been try all day to build the mod_jk.so on OSX but with no results:

When I try to build it with the dlopen.c and dlfcn.h... I get an error 
from the dlopen.c file:

dlopen.c:84: return type is an incomplete type
dlopen.c: In function `NSMakePrivateModulePublic':
dlopen.c:95: warning: `return' with a value, in function returning void
dlopen.c:97: invalid use of undefined type `enum bool'
dlopen.c:97: warning: `return' with a value, in function returning void
dlopen.c: In function `dlopen':
dlopen.c:255: void value not ignored as it ought to be
dlopen.c:337: void value not ignored as it ought to be


Please help

Rolley

___
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com

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



DO NOT REPLY [Bug 16694] New: - jsp:include fails if param=../../

2003-02-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=16694

jsp:include fails if param=../../

   Summary: jsp:include fails if param=../../
   Product: Tomcat 4
   Version: 4.1.18
  Platform: All
OS/Version: Other
Status: NEW
  Severity: Minor
  Priority: Other
 Component: Servlet & JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


jsp:include fails if you has one Parameter with ../../

expl:
 works: Param=../..
 fails!
 works: BUT 
Param=../..

you can fix this if you replace / with %2F

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




Re: [PATCH] allow tomcat5 to compile/run with JDK1.3

2003-02-03 Thread Remy Maucherat
Tim Funk wrote:

Tomcat5 does not compile with JDK1.3. It does with JDK1.4.

There is only one line of code that prevents it from compiling with JDK1.3.
org.apache.catalina.loader.WebappClassLoader depends on File.toURI() 
which does not exist on jdk1.3.

I got around this by the performing the following:
OLD CODE:
  return realFile.toURI().toURL();
NEW CODE
  return new URL("file:" + realFile.toURL().getPath());

My patch also has some spurious stuff because my text editor 
automatically strips all trailing whitespace from lines and converts 
tabs to spaces. The important stuff is the last 9 lines of the patch file.

The patch is a bad idea. The change was made to fix RMI related problems.

What should be done is invoke the appropriate methods through 
reflection, catching any error (and defaulting to the old code if it fails).

Remy


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



Re: Problems building the WebApp module for Solaris 9

2003-02-03 Thread jean-frederic clere
Jesse Olivas wrote:

Hi my name is Jesse Olivas and I am having problems
building the WebApp module for Solaris 9.

The package is "webapp-module-1.0-tc40".

This is the output of my attempted build.
$ ./configure --with-apxs=/usr/local/apache/bin/apxs
loading cache ./config.cache
checking for test... /usr/bin/test
checking for true... /usr/bin/true
checking for echo... /usr/bin/echo
checking for grep... /usr/bin/grep
checking for cat... /usr/bin/cat
checking for sed... /usr/bin/sed
checking for ln... /usr/bin/ln
checking for rm... /usr/bin/rm
checking host system type... sparc-sun-solaris2.9
checking for sources directory...
/export/home/olivasj/webapp-module-1.0-tc40
checking for targets directory...
/export/home/olivasj/webapp-module-1.0-tc40

C-Language compilation tools
checking for ar... /usr/ccs/bin/ar
checking for ranlib... /usr/ccs/bin/ranlib
checking for gcc... gcc
checking whether the C compiler (gcc  ) works... yes
checking whether the C compiler (gcc  ) is a
cross-compiler... no
checking whether we are using GNU C... yes
checking whether gcc accepts -g... yes
checking for gcc... /usr/local/bin/gcc
checking whether /usr/local/bin/gcc and cc understand
-c and -o together... yes
checking how to run the C preprocessor...
/usr/local/bin/gcc -E
checking for debug build... no

JAVA-Language compilation tools
checking for java support... no

API documentation generation
checking for C API documentation... no
checking for Java API documentation... no

Target web-server
checking for Apache apxs... yes
checking target module... apache-1.3
checking for full APR directory path...
/export/home/olivasj/webapp-module-1.0-tc40/apr

Building APR configure script
  Invoking: "./buildconf" in
"/export/home/olivasj/webapp-module-1.0-tc40/apr"
APR buildconf: buildconf: checking installation...
APR buildconf: buildconf: autoconf version 2.57
(ok)
APR buildconf: buildconf: libtool version 1.4 (ok)
APR buildconf: Copying libtool helper files ...
./buildconf: autoheader: not found
APR buildconf: Creating
include/arch/unix/apr_private.h.in ...
APR buildconf: Creating configure ...
/usr/local/bin/autoconf: /usr/local/bin/autom4te: not
found
  Execution of ./buildconf returned 0

Configuring APR
  Invoking: "./configure --enable-static
--disable-shared --disable-threads" in
"/export/home/olivasj/webapp-module-1.0-tc40/apr"
configure: error: cannot find or execute "./configure"
in "/export/home/olivasj/webapp-module-1.0-tc40/apr"




This is the contents of the config.log file

configure:1215: checking for gcc
configure:1328: checking whether the C compiler (gcc 
) works
configure:1344: gcc -o conftestconftest.c  1>&5
configure:1370: checking whether the C compiler (gcc 
) is a cross-compiler
configure:1375: checking whether we are using GNU C
configure:1384: gcc -E conftest.c
configure:1403: checking whether gcc accepts -g
configure:1447: checking for gcc
configure:1492: checking whether /usr/local/bin/gcc
and cc understand -c and -o
together
configure:1507: /usr/local/bin/gcc -c conftest.c -o
conftest.o 1>&5
configure:1508: /usr/local/bin/gcc -c conftest.c -o
conftest.o 1>&5
configure:1513: cc -c conftest.c 1>&5
./configure: cc: not found
configure:1543: checking how to run the C preprocessor
configure:1564: /usr/local/bin/gcc -E  conftest.c

/dev/null 2>conftest.out


configure:1628: checking for debug build
configure:1653: checking for java support
configure:2013: checking for C API documentation
configure:2126: checking for Java API documentation
configure:2195: checking for Apache apxs
configure:2304: checking target module
configure:2323: checking for full APR directory path



Here is the $PATH value

$ echo $PATH
/usr/bin:/bin:/usr/sbin:/sbin:/usr/ccs/bin:/usr/local/bin



I don't understand why I get the following error when
the $PATH includes "/usr/local/bin". The autoconf file
is located within the same "/usr/local/bin" directory
as the autom4te file. 

APR buildconf: Creating configure ...
/usr/local/bin/autoconf: /usr/local/bin/autom4te: not
found
  Execution of ./buildconf returned 0


$ ls /usr/local/bin/auto*
/usr/local/bin/autoconf/usr/local/bin/autopasswd
/usr/local/bin/autoexpect  /usr/local/bin/autoreconf
/usr/local/bin/autoheader  /usr/local/bin/autoscan
/usr/local/bin/autom4te/usr/local/bin/autoupdate


Any ideas? Suggestions?

automake missing.



Thanks.

Jesse Olivas




__
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

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