costin 2002/11/05 11:07:59
Modified: naming/src/org/apache/naming/modules/fs FileDirContext.java
naming/src/org/apache/naming/modules/java
SelectorContext.java
naming/src/org/apache/naming/modules/memory
MemoryNamingContext.java
Log:
Small adjustments for the api changes.
Revision Changes Path
1.4 +2 -2
jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/fs/FileDirContext.java
Index: FileDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/fs/FileDirContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileDirContext.java 17 Oct 2002 16:49:03 -0000 1.3
+++ FileDirContext.java 5 Nov 2002 19:07:59 -0000 1.4
@@ -362,7 +362,7 @@
Vector entries = list(file);
- return new NamingContextEnumeration(entries);
+ return new NamingContextEnumeration(entries.elements(), this, false);
}
@@ -393,7 +393,7 @@
Vector entries = list(file);
- return new NamingContextBindingsEnumeration(entries);
+ return new NamingContextEnumeration(entries.elements(), this, true);
}
1.3 +3 -12
jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/SelectorContext.java
Index: SelectorContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/SelectorContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SelectorContext.java 8 Oct 2002 18:46:43 -0000 1.2
+++ SelectorContext.java 5 Nov 2002 19:07:59 -0000 1.3
@@ -69,6 +69,7 @@
import org.apache.tomcat.util.res.StringManager;
import org.apache.naming.modules.memory.*;
+import org.apache.naming.core.*;
/* This delegates to another context, removing a prefix.
XXX make it generic, move to core. The context thread can be
@@ -80,7 +81,7 @@
*
* @author Remy Maucherat
*/
-public class SelectorContext implements Context {
+public class SelectorContext extends BaseContext {
// -------------------------------------------------------------- Constants
@@ -110,7 +111,7 @@
* Builds a Catalina selector context using the given environment.
*/
public SelectorContext(Hashtable env) {
- this.env = env;
+ super( env );
}
@@ -150,16 +151,6 @@
// -------------------------------------------------------- Context Methods
- /**
- * Retrieves the named object. If name is empty, returns a new instance
- * of this context (which represents the same naming context as this
- * context, but its environment may be modified independently and it may
- * be accessed concurrently).
- *
- * @param name the name of the object to look up
- * @return the object bound to name
- * @exception NamingException if a naming exception is encountered
- */
public Object lookup(Name name)
throws NamingException {
// Strip the URL header
1.4 +3 -3
jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory/MemoryNamingContext.java
Index: MemoryNamingContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory/MemoryNamingContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryNamingContext.java 17 Oct 2002 16:49:30 -0000 1.3
+++ MemoryNamingContext.java 5 Nov 2002 19:07:59 -0000 1.4
@@ -188,7 +188,7 @@
name = name.getSuffix(1);
if (name.isEmpty()) {
- return new NamingContextEnumeration(bindings.elements());
+ return new NamingContextEnumeration(bindings.elements(), this, false);
}
NamingEntry entry = (NamingEntry) bindings.get(name.get(0));
@@ -231,7 +231,7 @@
name = name.getSuffix(1);
if (name.isEmpty()) {
- return new NamingContextBindingsEnumeration(bindings.elements());
+ return new NamingContextEnumeration(bindings.elements(), this, true);
}
NamingEntry entry = (NamingEntry) bindings.get(name.get(0));
@@ -313,7 +313,7 @@
NamingEntry entry=findNamingEntry( name, resolveLinks );
if( entry.type == NamingEntry.CONTEXT ) {
- return ((BaseDirContext) entry.value).lookup(name.getSuffix(1),
resolveLinks, o);
+ return ((BaseDirContext) entry.value).lookup(name.getSuffix(1),
resolveLinks);
}
if ((resolveLinks) && (entry.type == NamingEntry.LINK_REF)) {
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
