remm 01/01/11 22:52:38
Modified: catalina/src/share/org/apache/catalina Container.java
Globals.java
Removed: catalina/src/share/org/apache/catalina Resources.java
Log:
- Update to DirContext.
- Removed now useless Resources interface.
Revision Changes Path
1.3 +11 -10
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Container.java
Index: Container.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Container.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Container.java 2000/09/30 19:15:42 1.2
+++ Container.java 2001/01/12 06:52:37 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Container.java,v
1.2 2000/09/30 19:15:42 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/09/30 19:15:42 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Container.java,v
1.3 2001/01/12 06:52:37 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/01/12 06:52:37 $
*
* ====================================================================
*
@@ -68,6 +68,7 @@
import java.beans.PropertyChangeListener;
import java.io.IOException;
import javax.servlet.ServletException;
+import javax.naming.directory.DirContext;
/**
@@ -112,14 +113,14 @@
* this Container.
* <li><b>Realm</b> - Read-only interface to a security domain, for
* authenticating user identities and their corresponding roles.
- * <li><b>Resources</b> - Implementation of the resource access method
- * signatures of the <code>ServletContext</code> interface, enabling
- * custom linkages to existing server components when Catalina is embedded
- * in a larger server.
+ * <li><b>Resources</b> - JNDI directory context enabling access to static
+ * resources, enabling custom linkages to existing server components when
+ * Catalina is embedded in a larger server.
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/09/30 19:15:42 $
+ * @author Remy Maucherat
+ * @version $Revision: 1.3 $ $Date: 2001/01/12 06:52:37 $
*/
public interface Container {
@@ -310,7 +311,7 @@
* is no associated Resources object, return the Resources associated with
* our parent Container (if any); otherwise return <code>null</code>.
*/
- public Resources getResources();
+ public DirContext getResources();
/**
@@ -318,7 +319,7 @@
*
* @param resources The newly associated Resources
*/
- public void setResources(Resources resources);
+ public void setResources(DirContext resources);
// --------------------------------------------------------- Public Methods
1.19 +12 -4
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Globals.java 2001/01/09 04:27:05 1.18
+++ Globals.java 2001/01/12 06:52:37 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Globals.java,v
1.18 2001/01/09 04:27:05 craigmcc Exp $
- * $Revision: 1.18 $
- * $Date: 2001/01/09 04:27:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/Globals.java,v
1.19 2001/01/12 06:52:37 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/01/12 06:52:37 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
* Global constants that are applicable to multiple packages within Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2001/01/09 04:27:05 $
+ * @version $Revision: 1.19 $ $Date: 2001/01/12 06:52:37 $
*/
public final class Globals {
@@ -99,6 +99,14 @@
*/
public static final String CLASS_LOADER_ATTR =
"org.apache.catalina.classloader";
+
+
+ /**
+ * The JNDI directory context which is associated with the context. This
+ * context can be used to manipulate static files.
+ */
+ public static final String RESOURCES_ATTR =
+ "org.apache.catalina.resources";
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
