remm 01/01/23 18:35:00
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
- Add bind / unbind calls during init to allow resolving of nested JAR URLs.
- JAR file scanning in /WEB-INF/lib folder needs an update.
Revision Changes Path
1.39 +12 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ContextConfig.java 2001/01/23 22:02:36 1.38
+++ ContextConfig.java 2001/01/24 02:35:00 1.39
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.38 2001/01/23 22:02:36 glenn Exp $
- * $Revision: 1.38 $
- * $Date: 2001/01/23 22:02:36 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.39 2001/01/24 02:35:00 remm Exp $
+ * $Revision: 1.39 $
+ * $Date: 2001/01/24 02:35:00 $
*
* ====================================================================
*
@@ -83,6 +83,7 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import javax.servlet.ServletContext;
+import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.catalina.Authenticator;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -111,7 +112,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.38 $ $Date: 2001/01/23 22:02:36 $
+ * @version $Revision: 1.39 $ $Date: 2001/01/24 02:35:00 $
*/
public final class ContextConfig
@@ -761,7 +762,7 @@
/**
* Process a "start" event for this Context.
*/
- private void start() {
+ private synchronized void start() {
if (debug > 0)
log(sm.getString("contextConfig.start"));
@@ -771,6 +772,7 @@
XmlMapper mapper = createWebMapper();
defaultConfig(mapper);
applicationConfig(mapper);
+ //DirContextURLStreamHandlerFactory.bind(context.getResources());
// Scan tag library descriptor files for additional listener classes
if (ok)
@@ -802,6 +804,8 @@
context.setAvailable(false);
}
+ //DirContextURLStreamHandlerFactory.unbind();
+
}
@@ -900,10 +904,12 @@
URL url = context.getServletContext().getResource(resourcePath);
if (url == null)
return (false);
+ DirContextURLStreamHandler.bind(context.getResources());
url = new URL("jar:" + url.toString() + "!/");
JarURLConnection conn =
(JarURLConnection) url.openConnection();
jarFile = conn.getJarFile();
+ DirContextURLStreamHandler.unbind();
boolean found = false;
Enumeration entries = jarFile.entries();
while (entries.hasMoreElements()) {
@@ -942,7 +948,7 @@
}
return (false);
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
