tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory MemoryNamingContext.java memoryURLContextFactory.java
Date Tue, 30 Sep 2003 09:06:26 GMT
hgomez      2003/09/30 02:06:26

  Modified:    naming/src/org/apache/naming/modules/fs
                        fsURLContextFactory.java FileAttributes.java
                        FileDirContext.java
               naming/src/org/apache/naming/modules/cache
                        ProxyDirContext.java
               naming/src/org/apache/naming/modules/java
                        javaURLContextFactory.java ContextBindings.java
                        SelectorContext.java
               naming/src/org/apache/naming/modules/memory
                        MemoryNamingContext.java
                        memoryURLContextFactory.java
  Log:
  Clean imports (part #4)
  
  Revision  Changes    Path
  1.3       +3 -3      jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/fs/fsURLContextFactory.java
  
  Index: fsURLContextFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/fs/fsURLContextFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- fsURLContextFactory.java	8 Oct 2002 18:46:43 -0000	1.2
  +++ fsURLContextFactory.java	30 Sep 2003 09:06:25 -0000	1.3
  @@ -60,12 +60,12 @@
   package org.apache.naming.modules.fs;
   
   import java.util.Hashtable;
  -import javax.naming.Name;
  +
   import javax.naming.Context;
  +import javax.naming.Name;
   import javax.naming.NamingException;
  -import javax.naming.spi.ObjectFactory;
   import javax.naming.spi.InitialContextFactory;
  -import org.apache.naming.modules.memory.MemoryNamingContext;
  +import javax.naming.spi.ObjectFactory;
   //import org.apache.naming.ContextBindings;
   
   /**
  
  
  
  1.2       +3 -23     jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/fs/FileAttributes.java
  
  Index: FileAttributes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/fs/FileAttributes.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileAttributes.java	1 Oct 2002 18:45:19 -0000	1.1
  +++ FileAttributes.java	30 Sep 2003 09:06:25 -0000	1.2
  @@ -60,31 +60,11 @@
   
   package org.apache.naming.modules.fs;
   
  -import java.util.Arrays;
  -import java.util.Hashtable;
  -import java.util.Vector;
  -import java.util.Date;
   import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.InputStream;
  -import java.io.FileOutputStream;
  -import java.io.FileNotFoundException;
  -import java.io.OutputStream;
  -import java.io.IOException;
  -import javax.naming.Context;
  -import javax.naming.Name;
  -import javax.naming.NameParser;
  -import javax.naming.NamingEnumeration;
  -import javax.naming.NamingException;
  -import javax.naming.CompositeName;
  -import javax.naming.NameParser;
  -import javax.naming.OperationNotSupportedException;
  -import javax.naming.NameAlreadyBoundException;
  -import javax.naming.directory.*;
   
  -import org.apache.tomcat.util.res.StringManager;
  -
  -import org.apache.naming.core.*;
  +import javax.naming.directory.Attribute;
  +import javax.naming.directory.BasicAttribute;
  +import javax.naming.directory.BasicAttributes;
   
   /**
    * This specialized resource attribute implementation does some lazy 
  
  
  
  1.6       +10 -20    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileDirContext.java	26 Feb 2003 18:52:12 -0000	1.5
  +++ FileDirContext.java	30 Sep 2003 09:06:25 -0000	1.6
  @@ -51,35 +51,25 @@
   
   package org.apache.naming.modules.fs;
   
  -import java.util.Arrays;
  -import java.util.Hashtable;
  -import java.util.Vector;
  -import java.util.Date;
   import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.InputStream;
   import java.io.FileOutputStream;
  -import java.io.FileNotFoundException;
  -import java.io.OutputStream;
   import java.io.IOException;
  -import javax.naming.Context;
  +import java.io.InputStream;
  +import java.util.Arrays;
  +import java.util.Hashtable;
  +import java.util.Vector;
  +
   import javax.naming.Name;
  -import javax.naming.NameParser;
  +import javax.naming.NameAlreadyBoundException;
   import javax.naming.NamingEnumeration;
   import javax.naming.NamingException;
  -import javax.naming.CompositeName;
  -import javax.naming.NameParser;
  -import javax.naming.OperationNotSupportedException;
  -import javax.naming.NameAlreadyBoundException;
  -import javax.naming.directory.DirContext;
   import javax.naming.directory.Attributes;
  -import javax.naming.directory.Attribute;
  -import javax.naming.directory.ModificationItem;
  -import javax.naming.directory.SearchControls;
  +import javax.naming.directory.DirContext;
   
  +import org.apache.naming.core.BaseDirContext;
  +import org.apache.naming.core.NamingContextEnumeration;
  +import org.apache.naming.core.NamingEntry;
   import org.apache.tomcat.util.res.StringManager;
  -
  -import org.apache.naming.core.*;
   
   /**
    * DirContext for a filesystem directory.
  
  
  
  1.2       +4 -12     jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/cache/ProxyDirContext.java
  
  Index: ProxyDirContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/cache/ProxyDirContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProxyDirContext.java	1 Oct 2002 18:45:19 -0000	1.1
  +++ ProxyDirContext.java	30 Sep 2003 09:06:25 -0000	1.2
  @@ -61,31 +61,23 @@
   package org.apache.naming.modules.cache;
   
   import java.util.Collections;
  -import java.util.Date;
   import java.util.Hashtable;
   import java.util.Map;
  -import java.io.InputStream;
  -import java.io.IOException;
  -import java.io.ByteArrayInputStream;
   
   import javax.naming.Context;
   import javax.naming.Name;
   import javax.naming.NameParser;
   import javax.naming.NamingEnumeration;
   import javax.naming.NamingException;
  -import javax.naming.directory.DirContext;
   import javax.naming.directory.Attributes;
  -import javax.naming.directory.Attribute;
  +import javax.naming.directory.DirContext;
   import javax.naming.directory.ModificationItem;
   import javax.naming.directory.SearchControls;
   
  -// Better classloader support
  -import org.apache.tomcat.util.res.StringManager;
  -
  -import org.apache.naming.core.*;
  -import org.apache.naming.util.AttributeHelper;
  -
   import org.apache.commons.collections.LRUMap;
  +import org.apache.naming.core.BaseDirContext;
  +import org.apache.naming.util.AttributeHelper;
  +import org.apache.tomcat.util.res.StringManager;
   
   /* Changes( costin ): The goal is to make it a generic JNDI cache, not specific
      to file system. 
  
  
  
  1.3       +4 -5      jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/javaURLContextFactory.java
  
  Index: javaURLContextFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/javaURLContextFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- javaURLContextFactory.java	8 Oct 2002 18:46:43 -0000	1.2
  +++ javaURLContextFactory.java	30 Sep 2003 09:06:26 -0000	1.3
  @@ -61,15 +61,14 @@
   package org.apache.naming.modules.java;
   
   import java.util.Hashtable;
  -import javax.naming.Name;
  +
   import javax.naming.Context;
  +import javax.naming.Name;
   import javax.naming.NamingException;
  -import javax.naming.spi.ObjectFactory;
   import javax.naming.spi.InitialContextFactory;
  -import org.apache.naming.modules.memory.MemoryNamingContext;
  -//import org.apache.naming.ContextBindings;
  +import javax.naming.spi.ObjectFactory;
   
  -import org.apache.tomcat.util.res.StringManager;
  +import org.apache.naming.modules.memory.MemoryNamingContext;
   
   /**
    * Context factory for the "java:" namespace.
  
  
  
  1.2       +3 -2      jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/ContextBindings.java
  
  Index: ContextBindings.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/ContextBindings.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContextBindings.java	1 Oct 2002 18:46:30 -0000	1.1
  +++ ContextBindings.java	30 Sep 2003 09:06:26 -0000	1.2
  @@ -60,11 +60,12 @@
   package org.apache.naming.modules.java;
   
   import java.util.Hashtable;
  -import javax.naming.NamingException;
  +
   import javax.naming.Context;
  +import javax.naming.NamingException;
   
  +import org.apache.naming.core.ContextAccessController;
   import org.apache.tomcat.util.res.StringManager;
  -import org.apache.naming.core.*;
   
   // this can be a nice generic util that binds per thread or CL any object.
   
  
  
  
  1.4       +3 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SelectorContext.java	5 Nov 2002 19:07:59 -0000	1.3
  +++ SelectorContext.java	30 Sep 2003 09:06:26 -0000	1.4
  @@ -61,15 +61,16 @@
   package org.apache.naming.modules.java;
   
   import java.util.Hashtable;
  +
   import javax.naming.Context;
   import javax.naming.Name;
   import javax.naming.NameParser;
   import javax.naming.NamingEnumeration;
   import javax.naming.NamingException;
   
  +import org.apache.naming.core.BaseContext;
  +import org.apache.naming.modules.memory.MemoryNamingContext;
   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
  
  
  
  1.5       +17 -5     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MemoryNamingContext.java	5 Nov 2002 19:07:59 -0000	1.4
  +++ MemoryNamingContext.java	30 Sep 2003 09:06:26 -0000	1.5
  @@ -60,13 +60,25 @@
   package org.apache.naming.modules.memory;
   
   import java.util.Hashtable;
  -import java.util.Enumeration;
  -import javax.naming.*;
  -import javax.naming.directory.*;
  +
  +import javax.naming.Context;
  +import javax.naming.InitialContext;
  +import javax.naming.LinkRef;
  +import javax.naming.Name;
  +import javax.naming.NameNotFoundException;
  +import javax.naming.NamingEnumeration;
  +import javax.naming.NamingException;
  +import javax.naming.NotContextException;
  +import javax.naming.Reference;
  +import javax.naming.Referenceable;
  +import javax.naming.directory.Attributes;
  +import javax.naming.directory.DirContext;
   import javax.naming.spi.NamingManager;
   
  -import org.apache.naming.core.*;
  -import org.apache.tomcat.util.res.*;
  +import org.apache.naming.core.BaseDirContext;
  +import org.apache.naming.core.NamingContextEnumeration;
  +import org.apache.naming.core.NamingEntry;
  +import org.apache.tomcat.util.res.StringManager;
   
   /**
    * In-memory context.
  
  
  
  1.2       +1 -2      jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory/memoryURLContextFactory.java
  
  Index: memoryURLContextFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory/memoryURLContextFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- memoryURLContextFactory.java	1 Oct 2002 18:46:06 -0000	1.1
  +++ memoryURLContextFactory.java	30 Sep 2003 09:06:26 -0000	1.2
  @@ -60,10 +60,9 @@
   package org.apache.naming.modules.memory;
   
   import java.util.Hashtable;
  -import javax.naming.Name;
  +
   import javax.naming.Context;
   import javax.naming.NamingException;
  -import javax.naming.spi.ObjectFactory;
   import javax.naming.spi.InitialContextFactory;
   
   /**
  
  
  

Mime
View raw message