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

2001-01-14 Thread remm 

remm01/01/14 11:53:47

  Modified:catalina/src/share/org/apache/catalina/loader
StandardLoader.java
  Log:
  - Fix Jasper classpath generation.
  
  Revision  ChangesPath
  1.16  +10 -7 
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
  
  Index: StandardLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- StandardLoader.java   2001/01/13 05:27:54 1.15
  +++ StandardLoader.java   2001/01/14 19:53:47 1.16
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.15 2001/01/13 05:27:54 remm Exp $
  - * $Revision: 1.15 $
  - * $Date: 2001/01/13 05:27:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.16 2001/01/14 19:53:47 remm Exp $
  + * $Revision: 1.16 $
  + * $Date: 2001/01/14 19:53:47 $
*
* 
*
  @@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.15 $ $Date: 2001/01/13 05:27:54 $
  + * @version $Revision: 1.16 $ $Date: 2001/01/14 19:53:47 $
*/
   
   public final class StandardLoader
  @@ -806,6 +806,9 @@
   repository = repository.substring(7);
   else if (repository.startsWith("file:"))
   repository = repository.substring(5);
  +else if (repository.startsWith("jndi:"))
  +repository = 
  +servletContext.getRealPath(repository.substring(5));
   else
   continue;
   if (repository.endsWith("/"))
  @@ -821,7 +824,7 @@
   }
   
   // Store the assembled class path as a servlet context attribute
  - servletContext.setAttribute(Globals.CLASS_PATH_ATTR,
  +servletContext.setAttribute(Globals.CLASS_PATH_ATTR,
classpath.toString());
   
   }
  @@ -839,7 +842,7 @@
   ((Context) container).getServletContext();
   
// Add the WEB-INF/classes subdirectory
  - URL classesURL = null;
  +URL classesURL = null;
try {
   classesURL = servletContext.getResource("/WEB-INF/classes");
   } catch (MalformedURLException e) {
  @@ -869,7 +872,7 @@
   }
   addRepository(classesURLString + "/");
   }
  -
  +
// Add the WEB-INF/lib/*.jar files
   // FIXME - This still requires disk directory!  Scan JARs if present
   File libFile = new File(((Context) container).getDocBase(), 
  
  
  

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

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

2001-01-11 Thread remm 

remm01/01/11 22:46:54

  Modified:catalina/src/share/org/apache/catalina/loader
StandardLoader.java
  Log:
  - Refactoring with loading repositories from DirContext.
  - Unfortunately, the Loader / ClassLoader was heavily biased towards
loading its class repositories from the filesystem. This causes Catalina to
crash on startup at the moment. Additional refactoring of the classloader is
needed to address this (and will be done ASAP).
  
  Revision  ChangesPath
  1.14  +11 -11
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
  
  Index: StandardLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StandardLoader.java   2000/12/22 00:37:50 1.13
  +++ StandardLoader.java   2001/01/12 06:46:54 1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.13 2000/12/22 00:37:50 craigmcc Exp $
  - * $Revision: 1.13 $
  - * $Date: 2000/12/22 00:37:50 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.14 2001/01/12 06:46:54 remm Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/01/12 06:46:54 $
*
* 
*
  @@ -83,7 +83,6 @@
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Loader;
   import org.apache.catalina.Logger;
  -import org.apache.catalina.Resources;
   import org.apache.catalina.util.LifecycleSupport;
   import org.apache.catalina.util.StringManager;
   
  @@ -101,7 +100,7 @@
* is not present, the system class loader will be used instead.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.13 $ $Date: 2000/12/22 00:37:50 $
  + * @version $Revision: 1.14 $ $Date: 2001/01/12 06:46:54 $
*/
   
   public final class StandardLoader
  @@ -823,12 +822,13 @@
   
   if (!(container instanceof Context))
   return;
  - Resources resources = ((Context) container).getResources();
  + ServletContext servletContext = 
  +((Context) container).getServletContext();
   
// Add the WEB-INF/classes subdirectory
URL classesURL = null;
try {
  - classesURL = resources.getResource("/WEB-INF/classes");
  +classesURL = servletContext.getResource("/WEB-INF/classes");
   } catch (MalformedURLException e) {
classesURL = null;
}
  @@ -860,12 +860,12 @@
// Add the WEB-INF/lib/*.jar files
URL libURL = null;
try {
  - libURL = resources.getResource("/WEB-INF/lib");
  + libURL = servletContext.getResource("/WEB-INF/lib");
} catch (MalformedURLException e) {
libURL = null;
}
   // FIXME - This still requires disk directory!  Scan JARs if present
  - if ((libURL != null)  "file".equals(libURL.getProtocol())) {
  +if ((libURL != null)  "file".equals(libURL.getProtocol())) {
File libFile = new File(libURL.getFile());
if (libFile.exists()  libFile.canRead() 
libFile.isDirectory()) {
  @@ -884,8 +884,8 @@
   }
}
}
  - }
  -
  +}
  +
   }
   
   
  
  
  

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