remm 01/01/11 22:43:51
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
ContextConfig.java
Log:
- Refactoring using DirContext to replace Resources.
Revision Changes Path
1.12 +10 -10
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Catalina.java 2001/01/04 20:05:39 1.11
+++ Catalina.java 2001/01/12 06:43:50 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.11 2001/01/04 20:05:39 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/01/04 20:05:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.12 2001/01/12 06:43:50 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/01/12 06:43:50 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2001/01/04 20:05:39 $
+ * @version $Revision: 1.12 $ $Date: 2001/01/12 06:43:50 $
*/
public class Catalina {
@@ -367,12 +367,12 @@
mapper.addRule("Server/Service/Engine/Host/Resources",
mapper.objectCreate
- ("org.apache.catalina.core.StandardResources",
+ ("org.apache.naming.resources.FileDirContext",
"className"));
mapper.addRule("Server/Service/Engine/Host/Resources",
mapper.setProperties());
mapper.addRule("Server/Service/Engine/Host/Resources", mapper.addChild
- ("setResources", "org.apache.catalina.Resources"));
+ ("setResources", "javax.naming.directory.DirContext"));
mapper.addRule("Server/Service/Engine/Host/Valve", mapper.objectCreate
(null, "className"));
@@ -402,12 +402,12 @@
("setRealm", "org.apache.catalina.Realm"));
mapper.addRule("Server/Service/Engine/Resources", mapper.objectCreate
- ("org.apache.catalina.core.StandardResources",
+ ("org.apache.naming.resources.FileDirContext",
"className"));
mapper.addRule("Server/Service/Engine/Resources",
mapper.setProperties());
mapper.addRule("Server/Service/Engine/Resources", mapper.addChild
- ("setResources", "org.apache.catalina.Resources"));
+ ("setResources", "javax.naming.directory.DirContext"));
mapper.addRule("Server/Service/Engine/Valve", mapper.objectCreate
(null, "className"));
@@ -540,12 +540,12 @@
mapper.addRule(prefix + "/Resources",
mapper.objectCreate
- ("org.apache.catalina.core.StandardResources",
+ ("org.apache.naming.resources.FileDirContext",
"className"));
mapper.addRule(prefix + "/Resources",
mapper.setProperties());
mapper.addRule(prefix + "/Resources", mapper.addChild
- ("setResources", "org.apache.catalina.Resources"));
+ ("setResources", "javax.naming.directory.DirContext"));
mapper.addRule(prefix + "/Valve", mapper.objectCreate
(null, "className"));
1.36 +14 -14
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ContextConfig.java 2000/12/22 00:37:52 1.35
+++ ContextConfig.java 2001/01/12 06:43:50 1.36
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.35 2000/12/22 00:37:52 craigmcc Exp $
- * $Revision: 1.35 $
- * $Date: 2000/12/22 00:37:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.36 2001/01/12 06:43:50 remm Exp $
+ * $Revision: 1.36 $
+ * $Date: 2001/01/12 06:43:50 $
*
* ====================================================================
*
@@ -89,6 +89,7 @@
import java.util.Stack;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import javax.servlet.ServletContext;
import org.apache.catalina.Authenticator;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -97,7 +98,6 @@
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
import org.apache.catalina.Pipeline;
-import org.apache.catalina.Resources;
import org.apache.catalina.Valve;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.ContainerBase;
@@ -118,7 +118,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.35 $ $Date: 2000/12/22 00:37:52 $
+ * @version $Revision: 1.36 $ $Date: 2001/01/12 06:43:50 $
*/
public final class ContextConfig
@@ -225,10 +225,10 @@
// Open the application web.xml file, if it exists
InputStream stream = null;
- Resources resources = context.getResources();
- if (resources != null)
- stream =
- resources.getResourceAsStream(Constants.ApplicationWebXml);
+ ServletContext servletContext = context.getServletContext();
+ if (servletContext != null)
+ stream = servletContext.getResourceAsStream
+ (Constants.ApplicationWebXml);
if (stream == null) {
log(sm.getString("contextConfig.applicationMissing"));
return;
@@ -777,11 +777,11 @@
// Accumulate the common permissions we will add to all code sources
if (debug >= 1)
log("Building common permissions to add");
- Resources resources = context.getResources();
+ ServletContext servletContext = context.getServletContext();
Permissions commonPerms = new Permissions();
URL baseURL = null;
try {
- baseURL = resources.getResource("/");
+ baseURL = servletContext.getResource("/");
if (debug >= 1)
log(" baseURL=" + baseURL.toString());
} catch (MalformedURLException e) {
@@ -814,7 +814,7 @@
log("Building document root code source");
URL docURL = null;
try {
- docURL = resources.getResource("/WEB-INF");
+ docURL = servletContext.getResource("/WEB-INF");
if (debug >= 1)
log(" docURL=" + docURL.toString());
} catch (MalformedURLException e) {
@@ -970,10 +970,10 @@
// FIXME - Yet another dependence on files
if (debug >= 1)
log("Scanning library JAR files");
- Resources resources = context.getResources();
+ ServletContext servletContext = context.getServletContext();
URL libURL = null;
try {
- libURL = resources.getResource("/WEB-INF/lib");
+ libURL = servletContext.getResource("/WEB-INF/lib");
} catch (MalformedURLException e) {
;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
