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

2002-03-25 Thread jfclere 

jfclere 02/03/25 06:51:10

  Modified:catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch WebappLoader.java
  Log:
  Another very bad typo ;-((
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.12.2.7  +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.12.2.6
  retrieving revision 1.12.2.7
  diff -u -r1.12.2.6 -r1.12.2.7
  --- WebappLoader.java 22 Mar 2002 17:30:50 -  1.12.2.6
  +++ WebappLoader.java 25 Mar 2002 14:51:09 -  1.12.2.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.12.2.6 2002/03/22 17:30:50 jfclere Exp $
  - * $Revision: 1.12.2.6 $
  - * $Date: 2002/03/22 17:30:50 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.12.2.7 2002/03/25 14:51:09 jfclere Exp $
  + * $Revision: 1.12.2.7 $
  + * $Date: 2002/03/25 14:51:09 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.12.2.6 $ $Date: 2002/03/22 17:30:50 $
  + * @version $Revision: 1.12.2.7 $ $Date: 2002/03/25 14:51:09 $
*/
   
   public class WebappLoader
  @@ -1279,7 +1279,7 @@
   }
   
   // Handle a need for reloading
  -if (!started)
  +if (started)
   notifyContext();
   break;
   
  
  
  

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

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

2002-03-15 Thread remm 

remm02/03/15 12:18:40

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Cosmetic change, to avoid displaying some warnings during stop.
  
  Revision  ChangesPath
  1.27  +8 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- WebappLoader.java 14 Mar 2002 21:40:05 -  1.26
  +++ WebappLoader.java 15 Mar 2002 20:18:40 -  1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.26 2002/03/14 21:40:05 remm Exp $
  - * $Revision: 1.26 $
  - * $Date: 2002/03/14 21:40:05 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.27 2002/03/15 20:18:40 remm Exp $
  + * $Revision: 1.27 $
  + * $Date: 2002/03/15 20:18:40 $
*
* 
*
  @@ -117,7 +117,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.26 $ $Date: 2002/03/14 21:40:05 $
  + * @version $Revision: 1.27 $ $Date: 2002/03/15 20:18:40 $
*/
   
   public class WebappLoader
  @@ -1287,6 +1287,9 @@
   // Wait for our check interval
   threadSleep();
   
  +if (!started)
  +break;
  +
   try {
   // Perform our modification check
   if (!classLoader.modified())
  @@ -1297,8 +1300,7 @@
   }
   
   // Handle a need for reloading
  -if (started)
  -notifyContext();
  +notifyContext();
   break;
   
   }
  
  
  

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

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

2002-03-14 Thread remm 

remm02/03/14 13:40:05

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Don't notify the context unless the loader is started.
  - Submitted by Jean-Frederic Clere.
  
  Revision  ChangesPath
  1.26  +6 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- WebappLoader.java 15 Feb 2002 00:02:28 -  1.25
  +++ WebappLoader.java 14 Mar 2002 21:40:05 -  1.26
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.25 2002/02/15 00:02:28 remm Exp $
  - * $Revision: 1.25 $
  - * $Date: 2002/02/15 00:02:28 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.26 2002/03/14 21:40:05 remm Exp $
  + * $Revision: 1.26 $
  + * $Date: 2002/03/14 21:40:05 $
*
* 
*
  @@ -117,7 +117,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.25 $ $Date: 2002/02/15 00:02:28 $
  + * @version $Revision: 1.26 $ $Date: 2002/03/14 21:40:05 $
*/
   
   public class WebappLoader
  @@ -1297,7 +1297,8 @@
   }
   
   // Handle a need for reloading
  -notifyContext();
  +if (started)
  +notifyContext();
   break;
   
   }
  
  
  

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

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

2002-02-14 Thread remm 

remm02/02/14 16:02:28

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Clean the start and stop methods of context.
  - I think it's not doable to take advantage of the inheritance from ContainerBase
for these two methods, as the StandardContext must take care of the context class 
laoder
binding (and putting it at the end of Loader.start was a hack), so it's necessary 
to
interleave method calls.
  - The shutdown order is also modified, and the manager can now notify
the session listeners if needed.
  
  Revision  ChangesPath
  1.25  +4 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- WebappLoader.java 12 Feb 2002 20:43:33 -  1.24
  +++ WebappLoader.java 15 Feb 2002 00:02:28 -  1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.24 2002/02/12 20:43:33 remm Exp $
  - * $Revision: 1.24 $
  - * $Date: 2002/02/12 20:43:33 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.25 2002/02/15 00:02:28 remm Exp $
  + * $Revision: 1.25 $
  + * $Date: 2002/02/15 00:02:28 $
*
* 
*
  @@ -117,7 +117,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.24 $ $Date: 2002/02/12 20:43:33 $
  + * @version $Revision: 1.25 $ $Date: 2002/02/15 00:02:28 $
*/
   
   public class WebappLoader
  @@ -645,8 +645,6 @@
   // Binding the Webapp class loader to the directory context
   DirContextURLStreamHandler.bind
   ((ClassLoader) classLoader, this.container.getResources());
  -
  -Thread.currentThread().setContextClassLoader(classLoader);
   
   } catch (Throwable t) {
   throw new LifecycleException(start: , t);
  
  
  

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

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

2002-02-12 Thread remm 

remm02/02/12 12:43:33

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Uncomment granting permission for work directory read/write access. I don't think
we should force editing the policy file to grant these permissions which are 
essentially
mandated by the spec.
  
  Revision  ChangesPath
  1.24  +4 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- WebappLoader.java 2 Feb 2002 17:55:08 -   1.23
  +++ WebappLoader.java 12 Feb 2002 20:43:33 -  1.24
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.23 2002/02/02 17:55:08 remm Exp $
  - * $Revision: 1.23 $
  - * $Date: 2002/02/02 17:55:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.24 2002/02/12 20:43:33 remm Exp $
  + * $Revision: 1.24 $
  + * $Date: 2002/02/12 20:43:33 $
*
* 
*
  @@ -117,7 +117,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.23 $ $Date: 2002/02/02 17:55:08 $
  + * @version $Revision: 1.24 $ $Date: 2002/02/12 20:43:33 $
*/
   
   public class WebappLoader
  @@ -816,7 +816,6 @@
   File workDir =
   (File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
   if (workDir != null) {
  -/*
   try {
   String workDirPath = workDir.getCanonicalPath();
   classLoader.addPermission
  @@ -827,7 +826,6 @@
   } catch (IOException e) {
   // Ignore
   }
  -*/
   }
   
   try {
  
  
  

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

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

2002-02-02 Thread remm 

remm02/02/02 09:55:08

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Attempt to fix the (very complex) bug 5201.
  - Bind the CCL to the webapp ClassLoader during the start of the context's children
and subcomponents.
  - Also add some commented out code granting permissions to the webapp codebases
to read/write its work directory. Glenn: This grants the permissions mandated in 
the
spec, so I'd really like to add them.
  
  Revision  ChangesPath
  1.23  +26 -7 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WebappLoader.java 4 Jan 2002 17:09:08 -   1.22
  +++ WebappLoader.java 2 Feb 2002 17:55:08 -   1.23
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.22 2002/01/04 17:09:08 remm Exp $
  - * $Revision: 1.22 $
  - * $Date: 2002/01/04 17:09:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.23 2002/02/02 17:55:08 remm Exp $
  + * $Revision: 1.23 $
  + * $Date: 2002/02/02 17:55:08 $
*
* 
*
  @@ -72,11 +72,13 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.FileOutputStream;
  +import java.io.FilePermission;
   import java.io.OutputStream;
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLClassLoader;
   import java.net.URLStreamHandlerFactory;
  +import java.security.Permission;
   import java.util.jar.JarFile;
   import javax.servlet.ServletContext;
   import javax.naming.NamingException;
  @@ -115,7 +117,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.22 $ $Date: 2002/01/04 17:09:08 $
  + * @version $Revision: 1.23 $ $Date: 2002/02/02 17:55:08 $
*/
   
   public class WebappLoader
  @@ -644,6 +646,8 @@
   DirContextURLStreamHandler.bind
   ((ClassLoader) classLoader, this.container.getResources());
   
  +Thread.currentThread().setContextClassLoader(classLoader);
  +
   } catch (Throwable t) {
   throw new LifecycleException(start: , t);
   }
  @@ -808,6 +812,24 @@
   ServletContext servletContext =
   ((Context) container).getServletContext();
   
  +// Assigning permissions for the work directory
  +File workDir =
  +(File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
  +if (workDir != null) {
  +/*
  +try {
  +String workDirPath = workDir.getCanonicalPath();
  +classLoader.addPermission
  +(new FilePermission(workDirPath, read,write));
  +classLoader.addPermission
  +(new FilePermission(workDirPath + File.separator + -, 
  +read,write,delete));
  +} catch (IOException e) {
  +// Ignore
  +}
  +*/
  +}
  +
   try {
   
   URL rootURL = servletContext.getResource(/);
  @@ -851,9 +873,6 @@
   
   } else {
   
  -File workDir =
  -(File) servletContext.getAttribute
  -(Globals.WORK_DIR_ATTR);
   if (workDir != null) {
   if (libURL != null) {
   File libDir = new File(workDir, WEB-INF/lib/);
  
  
  

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

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

2002-01-04 Thread remm 

remm02/01/04 09:09:09

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Make the notifier qn inner class, because of strange problems when using
JDK 1.4. The code is simpler that way, but I don't undestand the failure I got
(and why I don't get it with the inner class).
The stack trace was (against rev 1.21 of WebappLoader):
  WebappClassLoader:   Resource '/WEB-INF/classes/HelloWorldExample.class' was 
modified; Date is now: Fri Jan 04 17:48:04
  CET 2002 Was: Fri Jan 04 14:48:08 CET 2002
  java.lang.NoClassDefFoundError: org/apache/catalina/loader/WebappContextNotifier
  at 
org.apache.catalina.loader.WebappLoader.notifyContext(WebappLoader.java:792)
  at org.apache.catalina.loader.WebappLoader.run(WebappLoader.java:1286)
  at java.lang.Thread.run(Thread.java:539)
  
  Revision  ChangesPath
  1.22  +17 -36
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WebappLoader.java 3 Jan 2002 16:31:06 -   1.21
  +++ WebappLoader.java 4 Jan 2002 17:09:08 -   1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.21 2002/01/03 16:31:06 remm Exp $
  - * $Revision: 1.21 $
  - * $Date: 2002/01/03 16:31:06 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.22 2002/01/04 17:09:08 remm Exp $
  + * $Revision: 1.22 $
  + * $Date: 2002/01/04 17:09:08 $
*
* 
*
  @@ -115,7 +115,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.21 $ $Date: 2002/01/03 16:31:06 $
  + * @version $Revision: 1.22 $ $Date: 2002/01/04 17:09:08 $
*/
   
   public class WebappLoader
  @@ -788,8 +788,7 @@
*/
   private void notifyContext() {
   
  -WebappContextNotifier notifier =
  -new WebappContextNotifier((Context) container);
  +WebappContextNotifier notifier = new WebappContextNotifier();
   (new Thread(notifier)).start();
   
   }
  @@ -1294,47 +1293,29 @@
   }
   
   
  -}
  -
  -
  -//  Private Classes
  -
  -
  -/**
  - * Private thread class to notify our associated Context that we have
  - * recognized the need for a reload.
  - */
  -
  -final class WebappContextNotifier implements Runnable {
  +// -- WebappContextNotifier Inner Class
   
   
   /**
  - * The Context we will notify.
  + * Private thread class to notify our associated Context that we have
  + * recognized the need for a reload.
*/
  -private Context context = null;
  +protected class WebappContextNotifier implements Runnable {
   
   
  -/**
  - * Construct a new instance of this class.
  - *
  - * @param context The Context to be notified
  - */
  -public WebappContextNotifier(Context context) {
  +/**
  + * Perform the requested notification.
  + */
  +public void run() {
   
  -super();
  -this.context = context;
  -
  -}
  +((Context) container).reload();
   
  +}
   
  -/**
  - * Perform the requested notification.
  - */
  -public void run() {
  -
  -context.reload();
   
   }
   
   
   }
  +
  +
  
  
  

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

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

2001-12-12 Thread craigmcc 

craigmcc01/12/12 12:53:02

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  Allow the webapp class loader to be overridden.
  
  PR: Bugzilla #5391
  Submitted by: [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.20  +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WebappLoader.java 2001/11/25 21:06:23 1.19
  +++ WebappLoader.java 2001/12/12 20:53:02 1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.19 2001/11/25 21:06:23 glenn Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/11/25 21:06:23 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.20 2001/12/12 20:53:02 craigmcc Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/12/12 20:53:02 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.19 $ $Date: 2001/11/25 21:06:23 $
  + * @version $Revision: 1.20 $ $Date: 2001/12/12 20:53:02 $
*/
   
   public class WebappLoader
  @@ -420,7 +420,7 @@
*
* @param loaderClass The new ClassLoader class name
*/
  -public void setLoaderClass() {
  +public void setLoaderClass(String loaderClass) {
   
   this.loaderClass = loaderClass;
   
  
  
  

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

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

2001-12-12 Thread craigmcc 

craigmcc01/12/12 12:54:27

  Modified:catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch WebappLoader.java
  Log:
  Port setLoaderClass() fix to 4.0.x branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.12.2.4  +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.12.2.3
  retrieving revision 1.12.2.4
  diff -u -r1.12.2.3 -r1.12.2.4
  --- WebappLoader.java 2001/11/03 02:28:17 1.12.2.3
  +++ WebappLoader.java 2001/12/12 20:54:27 1.12.2.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.12.2.3 2001/11/03 02:28:17 remm Exp $
  - * $Revision: 1.12.2.3 $
  - * $Date: 2001/11/03 02:28:17 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.12.2.4 2001/12/12 20:54:27 craigmcc Exp $
  + * $Revision: 1.12.2.4 $
  + * $Date: 2001/12/12 20:54:27 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.12.2.3 $ $Date: 2001/11/03 02:28:17 $
  + * @version $Revision: 1.12.2.4 $ $Date: 2001/12/12 20:54:27 $
*/
   
   public class WebappLoader
  @@ -420,7 +420,7 @@
*
* @param loaderClass The new ClassLoader class name
*/
  -public void setLoaderClass() {
  +public void setLoaderClass(String loaderClass) {
   
   this.loaderClass = loaderClass;
   
  
  
  

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

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

2001-11-02 Thread remm 

remm01/11/02 18:28:17

  Modified:catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch WebappLoader.java
  Log:
  - Port from HEAD:
- The context root permission wasn't a canonical path.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.12.2.3  +12 -5 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- WebappLoader.java 2001/10/16 07:02:54 1.12.2.2
  +++ WebappLoader.java 2001/11/03 02:28:17 1.12.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.12.2.2 2001/10/16 07:02:54 remm Exp $
  - * $Revision: 1.12.2.2 $
  - * $Date: 2001/10/16 07:02:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.12.2.3 2001/11/03 02:28:17 remm Exp $
  + * $Revision: 1.12.2.3 $
  + * $Date: 2001/11/03 02:28:17 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.12.2.2 $ $Date: 2001/10/16 07:02:54 $
  + * @version $Revision: 1.12.2.3 $ $Date: 2001/11/03 02:28:17 $
*/
   
   public class WebappLoader
  @@ -809,7 +809,14 @@
   
   String contextRoot = servletContext.getRealPath(/);
   if (contextRoot != null) {
  -classLoader.setPermissions(contextRoot);
  +try {
  +contextRoot = 
  +(new File(contextRoot)).getCanonicalPath() 
  ++ File.separator;
  +classLoader.setPermissions(contextRoot);
  +} catch (IOException e) {
  +// Ignore
  +}
   }
   
   URL classesURL =
  
  
  

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

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

2001-10-23 Thread craigmcc 

craigmcc01/10/23 12:11:38

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  Report the directory used for /WEB-INF/classes whether or not it is
  copied to the work directory (because we are running from a WAR).
  
  Revision  ChangesPath
  1.15  +8 -8  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WebappLoader.java 2001/10/16 07:00:42 1.14
  +++ WebappLoader.java 2001/10/23 19:11:38 1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.14 2001/10/16 07:00:42 remm Exp $
  - * $Revision: 1.14 $
  - * $Date: 2001/10/16 07:00:42 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.15 2001/10/23 19:11:38 craigmcc Exp $
  + * $Revision: 1.15 $
  + * $Date: 2001/10/23 19:11:38 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.14 $ $Date: 2001/10/16 07:00:42 $
  + * @version $Revision: 1.15 $ $Date: 2001/10/23 19:11:38 $
*/
   
   public class WebappLoader
  @@ -925,13 +925,13 @@
   
   classRepository = new File(workDir, classesPath);
   classRepository.mkdirs();
  -
  -log(sm.getString(webappLoader.classDeploy, classesPath,
  - classRepository.getAbsolutePath()));
  -
   copyDir(classes, classRepository);
   
   }
  +
  +log(sm.getString(webappLoader.classDeploy, classesPath,
  + classRepository.getAbsolutePath()));
  +
   
   // Adding the repository to the class loader
   classLoader.addRepository(classesPath + /, classRepository);

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

2001-07-12 Thread remm 

remm01/07/12 14:24:15

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Cleanup of the classpath generation.
  - Implemented addRepository the way it was implemented in StandardLoader.
  - Should fix integration issues with the J2EE RI.
  
  Revision  ChangesPath
  1.8   +25 -36
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WebappLoader.java 2001/06/23 22:30:04 1.7
  +++ WebappLoader.java 2001/07/12 21:24:09 1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.7 2001/06/23 22:30:04 remm Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/06/23 22:30:04 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.8 2001/07/12 21:24:09 remm Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/07/12 21:24:09 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.7 $ $Date: 2001/06/23 22:30:04 $
  + * @version $Revision: 1.8 $ $Date: 2001/07/12 21:24:09 $
*/
   
   public class WebappLoader
  @@ -267,13 +267,6 @@
   private String threadName = WebappLoader;
   
   
  -/**
  - * Classpath (which can be used by any webapp which would need to compile
  - * classes, like a JSP engine.
  - */
  -protected StringBuffer classpath = new StringBuffer();
  -
  -
   // - Properties
   
   
  @@ -493,6 +486,7 @@
   
   if (debug = 1)
log(sm.getString(webappLoader.addRepository, repository));
  +
   for (int i = 0; i  repositories.length; i++) {
   if (repository.equals(repositories[i]))
   return;
  @@ -503,6 +497,11 @@
results[repositories.length] = repository;
repositories = results;
   
  + if (started  (classLoader != null)) {
  + classLoader.addRepository(repository);
  + setClassPath();
  + }
  +
   }
   
   
  @@ -618,9 +617,13 @@
   classLoader.setDebug(this.debug);
   classLoader.setDelegate(this.delegate);
   
  +for (int i = 0; i  repositories.length; i++) {
  +classLoader.addRepository(repositories[i]);
  +}
  +
   // Configure our repositories
  -setClassPath();
   setRepositories();
  +setClassPath();
   
if (container instanceof Context) {
// Tell the class loader the root of the context
  @@ -832,9 +835,6 @@
   
   log(sm.getString(webappLoader.deploy, workDir.getAbsolutePath()));
   
  -// Reset repositories
  -repositories = new String[0];
  -
   DirContext resources = container.getResources();
   
   // Setting up the class repository (/WEB-INF/classes), if it exists
  @@ -861,18 +861,12 @@
   
   if (absoluteClassesPath != null) {
   
  -if (classpath.length() != 0)
  -classpath.append(File.pathSeparator);
  -classpath.append(absoluteClassesPath);
   classRepository = new File(absoluteClassesPath);
   
   } else {
   
  -if (classpath.length() != 0)
  -classpath.append(File.pathSeparator);
   classRepository = new File(workDir, classesPath);
   classRepository.mkdirs();
  -classpath.append(classRepository.getAbsolutePath());
   
   log(sm.getString(webappLoader.classDeploy, classesPath,
classRepository.getAbsolutePath()));
  @@ -884,9 +878,6 @@
   // Adding the repository to the class loader
   classLoader.addRepository(classesPath + /, classRepository);
   
  -// Add to the local repository list
  -addRepository(classesPath + /);
  -
   }
   
   // Setting up the JAR repository (/WEB-INF/lib), if it exists
  @@ -946,30 +937,20 @@
   continue;
   }
   
  -if (classpath.length() != 0)
  -classpath.append(File.pathSeparator);
  -classpath.append(destFile.getAbsolutePath());
  -
   JarFile jarFile = new JarFile(destFile);
   
   classLoader.addJar(filename, jarFile, destFile);
  -

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

2001-07-12 Thread remm 

remm01/07/12 16:42:59

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Fix classpath generation problem on Unix.
  
  Revision  ChangesPath
  1.9   +4 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebappLoader.java 2001/07/12 21:24:09 1.8
  +++ WebappLoader.java 2001/07/12 23:42:57 1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.8 2001/07/12 21:24:09 remm Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/07/12 21:24:09 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.9 2001/07/12 23:42:57 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/07/12 23:42:57 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.8 $ $Date: 2001/07/12 21:24:09 $
  + * @version $Revision: 1.9 $ $Date: 2001/07/12 23:42:57 $
*/
   
   public class WebappLoader
  @@ -983,8 +983,6 @@
   String repository = repositories[i].toString();
   if (repository.startsWith(file://))
   repository = repository.substring(7);
  -else if (repository.startsWith(file:/))
  -repository = repository.substring(6);
   else if (repository.startsWith(file:))
   repository = repository.substring(5);
   else if (repository.startsWith(jndi:))

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

2001-07-12 Thread remm 

remm01/07/12 18:47:50

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Cleanup of the permission generation in the new WebappLoader.
  
  Revision  ChangesPath
  1.10  +85 -37
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- WebappLoader.java 2001/07/12 23:42:57 1.9
  +++ WebappLoader.java 2001/07/13 01:47:47 1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.9 2001/07/12 23:42:57 remm Exp $
  - * $Revision: 1.9 $
  - * $Date: 2001/07/12 23:42:57 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.10 2001/07/13 01:47:47 remm Exp $
  + * $Revision: 1.10 $
  + * $Date: 2001/07/13 01:47:47 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.9 $ $Date: 2001/07/12 23:42:57 $
  + * @version $Revision: 1.10 $ $Date: 2001/07/13 01:47:47 $
*/
   
   public class WebappLoader
  @@ -625,44 +625,15 @@
   setRepositories();
   setClassPath();
   
  - if (container instanceof Context) {
  - // Tell the class loader the root of the context
  - ServletContext servletContext = 
  -((Context) container).getServletContext();
  - try {
  - URL contextURL = servletContext.getResource(/);
  - if( contextURL != null ) {
  - ((WebappClassLoader)classLoader).setPermissions
  -(contextURL);
  -String jarUrl = jar: + contextURL.toString() 
  -+ WEB-INF/lib/;
  -((WebappClassLoader)classLoader).setPermissions
  -(jarUrl);  
  -}
  -String contextRoot = servletContext.getRealPath(/);
  -if (contextRoot != null) {
  -((WebappClassLoader)classLoader).setPermissions
  -(contextRoot);
  -String rootUrl = file: + contextRoot;
  -((WebappClassLoader)classLoader).setPermissions
  -(rootUrl);
  - }
  -File workDir = 
  -(File) servletContext.getAttribute
  -(Globals.WORK_DIR_ATTR);
  -if (workDir != null) {
  -File libDir = new File(workDir, WEB-INF/lib/);
  -((WebappClassLoader)classLoader).setPermissions
  -(libDir.getAbsolutePath());
  -}
  - } catch (MalformedURLException e) {
  - }
  - }
  +setPermissions();
  +
if (classLoader instanceof Lifecycle)
((Lifecycle) classLoader).start();
  +
   // Binding the Webapp class loader to the directory context
   DirContextURLStreamHandler.bind
   ((ClassLoader) classLoader, this.container.getResources());
  +
} catch (Throwable t) {
throw new LifecycleException(start: , t);
}
  @@ -811,6 +782,83 @@
   new WebappContextNotifier((Context) container);
(new Thread(notifier)).start();
   
  +}
  +
  +
  +/**
  + * Configure associated class loader permissions.
  + */
  +private void setPermissions() {
  +
  +if (System.getSecurityManager() == null)
  +return;
  +if (!(container instanceof Context))
  +return;
  +
  +// Tell the class loader the root of the context
  +ServletContext servletContext = 
  +((Context) container).getServletContext();
  +
  +try {
  +
  +URL classesURL = 
  +servletContext.getResource(/WEB-INF/classes/);
  +if (classesURL != null)
  +classLoader.setPermissions(classesURL);
  +
  +URL libURL = servletContext.getResource(/WEB-INF/lib/);
  +if (libURL != null) {
  +classLoader.setPermissions(libURL);
  +}
  +
  +String contextRoot = servletContext.getRealPath(/);
  +if (contextRoot != null) {
  +
  +if (libURL != null) {
  +

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

2001-06-23 Thread remm 

remm01/06/23 15:30:05

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Don't copy the JARs to the work directory if filesystem based.
  
  Revision  ChangesPath
  1.7   +34 -20
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebappLoader.java 2001/06/21 01:39:08 1.6
  +++ WebappLoader.java 2001/06/23 22:30:04 1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.6 2001/06/21 01:39:08 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/06/21 01:39:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.7 2001/06/23 22:30:04 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/06/23 22:30:04 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.6 $ $Date: 2001/06/21 01:39:08 $
  + * @version $Revision: 1.7 $ $Date: 2001/06/23 22:30:04 $
*/
   
   public class WebappLoader
  @@ -608,12 +608,13 @@
   
// Construct a class loader based on our current repositories list
try {
  - if (parentClassLoader == null)
  - classLoader = new WebappClassLoader(container.getResources());
  - else
  - classLoader = new WebappClassLoader
  -(parentClassLoader, container.getResources());
   
  +if (parentClassLoader == null) {
  +classLoader = new WebappClassLoader(container.getResources());
  +} else {
  +classLoader = new WebappClassLoader
  +(parentClassLoader, container.getResources());
  +}
   classLoader.setDebug(this.debug);
   classLoader.setDelegate(this.delegate);
   
  @@ -907,8 +908,18 @@
   
   if (libDir != null) {
   
  -File destDir = new File(workDir, libPath);
  -destDir.mkdirs();
  +boolean copyJars = false;
  +String absoluteLibPath = servletContext.getRealPath(libPath);
  +
  +File destDir = null;
  +
  +if (absoluteLibPath != null) {
  +destDir = new File(absoluteLibPath);
  +} else {
  +copyJars = true;
  +destDir = new File(workDir, libPath);
  +destDir.mkdirs();
  +}
   
   // Looking up directory /WEB-INF/lib in the context
   try {
  @@ -929,18 +940,21 @@
destFile.getAbsolutePath()));
   
   Resource jarResource = (Resource) binding.getObject();
  -if (copy(jarResource.streamContent(), 
  - new FileOutputStream(destFile))) {
  -if (classpath.length() != 0)
  -classpath.append(File.pathSeparator);
  -classpath.append(destFile.getAbsolutePath());
  +if (copyJars) {
  +if (!copy(jarResource.streamContent(), 
  +  new FileOutputStream(destFile)))
  +continue;
   }
  -
  +
  +if (classpath.length() != 0)
  +classpath.append(File.pathSeparator);
  +classpath.append(destFile.getAbsolutePath());
  +
   JarFile jarFile = new JarFile(destFile);
  -
  +
   classLoader.addJar(filename, jarFile, destFile);
   addRepository(filename);
  -
  +
   }
   } catch (NamingException e) {
   // Silent catch: it's valid that no /WEB-INF/lib directory 
  @@ -1255,7 +1269,7 @@
*/
   public void run() {
   
  - context.reload();
  +context.reload();
   
   }

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

2001-06-19 Thread remm 

remm01/06/19 10:38:02

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Add a permission for the work dir.
  
  Revision  ChangesPath
  1.2   +12 -4 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebappLoader.java 2001/06/19 02:12:49 1.1
  +++ WebappLoader.java 2001/06/19 17:38:00 1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.1 2001/06/19 02:12:49 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/06/19 02:12:49 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.2 2001/06/19 17:38:00 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/06/19 17:38:00 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.1 $ $Date: 2001/06/19 02:12:49 $
  + * @version $Revision: 1.2 $ $Date: 2001/06/19 17:38:00 $
*/
   
   public class WebappLoader
  @@ -643,6 +643,14 @@
   ((WebappClassLoader)classLoader).setPermissions
   (rootUrl);
}
  +File workDir = 
  +(File) servletContext.getAttribute
  +(Globals.WORK_DIR_ATTR);
  +if (workDir != null) {
  +File libDir = new File(workDir, WEB-INF/lib/);
  +((WebappClassLoader)classLoader).setPermissions
  +(libDir.getAbsolutePath());
  +}
} catch (MalformedURLException e) {
}
}

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

2001-06-19 Thread remm 

remm01/06/19 16:03:33

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Use the local context notifier. Should fix build failure with Jikes reported
by Jon.
  
  Revision  ChangesPath
  1.3   +6 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WebappLoader.java 2001/06/19 17:38:00 1.2
  +++ WebappLoader.java 2001/06/19 23:03:30 1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.2 2001/06/19 17:38:00 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/06/19 17:38:00 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.3 2001/06/19 23:03:30 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/06/19 23:03:30 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2001/06/19 17:38:00 $
  + * @version $Revision: 1.3 $ $Date: 2001/06/19 23:03:30 $
*/
   
   public class WebappLoader
  @@ -803,7 +803,8 @@
*/
   private void notifyContext() {
   
  - ContextNotifier notifier = new ContextNotifier((Context) container);
  + WebappContextNotifier notifier = 
  +new WebappContextNotifier((Context) container);
(new Thread(notifier)).start();
   
   }

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

2001-06-19 Thread remm 

remm01/06/19 19:29:14

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - Add some temporary traces which could help debug the setup of the
repositories.
  
  Revision  ChangesPath
  1.4   +6 -4  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WebappLoader.java 2001/06/19 23:03:30 1.3
  +++ WebappLoader.java 2001/06/20 02:29:13 1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.3 2001/06/19 23:03:30 remm Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/06/19 23:03:30 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.4 2001/06/20 02:29:13 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/06/20 02:29:13 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.3 $ $Date: 2001/06/19 23:03:30 $
  + * @version $Revision: 1.4 $ $Date: 2001/06/20 02:29:13 $
*/
   
   public class WebappLoader
  @@ -936,7 +936,9 @@
   } catch (NamingException e) {
   // Silent catch: it's valid that no /WEB-INF/lib directory 
   //exists
  +e.printStackTrace();
   } catch (IOException e) {
  +e.printStackTrace();
   }
   
   }

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

2001-06-18 Thread remm 

remm01/06/18 19:12:50

  Added:   catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  - New classloader implementation, used for web applications only.
  - Extends URLClassLoader (to preserve maximum compatibility).
  - Does not require dynamic bindings to work.
  - Supports reloading of classes in /WEB-INF/classes.
  - Supports reloading of JARs. This is untested, and is only a convinience
feature (for example, when you forgot a JAR required by a webapp). In many
cases, a stop / start of the context (which destroys it and recreates it from
scratch) will be needed to avoid getting JVM linkage errors and class casts.
  - Improved efficiency a lot : no more double tracking of the classes and
resources, unified loaded resources repository (classes + resources).
  - Fixed lookup path : first classes repository, then JARs. It was impossible
to control the order of the repositories by directly using URLClassLoader.
  - To the outside world (if getURLs() is called), it appears as a file-based
URLClassLoader.
  - All the JARs in /WEB-INF/lib are extracted and copied to the work directory,
even if the resources are filesystem based. Otherwise, it is not possible to
actually manipulate the JARs which are in the webapp while they're open, at
least under Windows. This operation is relatively fast anyway.
  - Tested with the examples webapp, Slide and Jasper.
  - Note : Jasper reloading of the classes may still be broken.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.1 2001/06/19 02:12:49 remm Exp $
   * $Revision: 1.1 $
   * $Date: 2001/06/19 02:12:49 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights 
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:  
   *   This product includes software developed by the 
   *Apache Software Foundation (http://www.apache.org/).
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names The Jakarta Project, Tomcat, and Apache Software
   *Foundation must not be used to endorse or promote products derived
   *from this software without prior written permission. For written 
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called Apache
   *nor may Apache appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * http://www.apache.org/.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */ 
  
  
  package org.apache.catalina.loader;
  
  
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
  import java.beans.PropertyChangeSupport;
  import