You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2003/09/30 11:06:36 UTC

cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/util DomXml.java RecyclableNamingEnumeration.java AttributeHelper.java

hgomez      2003/09/30 02:06:36

  Modified:    naming/src/org/apache/naming/util DomXml.java
                        RecyclableNamingEnumeration.java
                        AttributeHelper.java
  Log:
  Clean imports (part #5)
  
  Revision  Changes    Path
  1.2       +11 -10    jakarta-tomcat-connectors/naming/src/org/apache/naming/util/DomXml.java
  
  Index: DomXml.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/util/DomXml.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DomXml.java	1 Oct 2002 18:49:49 -0000	1.1
  +++ DomXml.java	30 Sep 2003 09:06:35 -0000	1.2
  @@ -58,18 +58,19 @@
    */
   package org.apache.naming.util;
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import java.security.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.StringReader;
   
  -import org.apache.tomcat.util.IntrospectionUtils;
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
  +import javax.xml.parsers.ParserConfigurationException;
   
  -import javax.xml.parsers.*;
  -
  -/* Yes, it's using DOM */
  -import org.w3c.dom.*;
  -import org.xml.sax.*;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Node;
  +import org.xml.sax.EntityResolver;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
   
   // moved from jk2 config package. 
   
  
  
  
  1.2       +7 -8      jakarta-tomcat-connectors/naming/src/org/apache/naming/util/RecyclableNamingEnumeration.java
  
  Index: RecyclableNamingEnumeration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/util/RecyclableNamingEnumeration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RecyclableNamingEnumeration.java	1 Oct 2002 18:49:49 -0000	1.1
  +++ RecyclableNamingEnumeration.java	30 Sep 2003 09:06:35 -0000	1.2
  @@ -64,12 +64,11 @@
   
   package org.apache.naming.util;
   
  -import java.util.Hashtable;
  -import java.util.Vector;
   import java.util.Enumeration;
  -import javax.naming.NamingException;
  +import java.util.Vector;
  +
   import javax.naming.NamingEnumeration;
  -import javax.naming.NameClassPair;
  +import javax.naming.NamingException;
   
   /**
    * Naming enumeration implementation.
  
  
  
  1.2       +4 -15     jakarta-tomcat-connectors/naming/src/org/apache/naming/util/AttributeHelper.java
  
  Index: AttributeHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/util/AttributeHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeHelper.java	1 Oct 2002 18:49:49 -0000	1.1
  +++ AttributeHelper.java	30 Sep 2003 09:06:35 -0000	1.2
  @@ -59,25 +59,14 @@
   
   package org.apache.naming.util;
   
  -import java.io.*;
  -import java.security.Permission;
  +import java.text.ParseException;
  +import java.text.SimpleDateFormat;
   import java.util.Date;
  -import java.util.Enumeration;
  -import java.util.Vector;
  +import java.util.Locale;
  +
   import javax.naming.NamingException;
  -import javax.naming.NamingEnumeration;
  -import javax.naming.NameClassPair;
  -import javax.naming.directory.DirContext;
   import javax.naming.directory.Attribute;
   import javax.naming.directory.Attributes;
  -
  -import java.text.SimpleDateFormat;
  -import java.text.DateFormat;
  -import java.text.ParseException;
  -
  -import java.util.Locale;
  -
  -import org.apache.naming.core.JndiPermission;
   // import org.apache.naming.resources.Resource;
   // import org.apache.naming.resources.ResourceAttributes;