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:05:57 UTC
cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/core ServerBinding.java DirContextHelper.java BaseNaming.java ContextAccessController.java BaseContext.java ServerName.java BaseDirContext.java NamingContextEnumeration.java ServerAttributes.java JndiPermission.java ServerAttribute.java NamingEntry.java
hgomez 2003/09/30 02:05:57
Modified: naming/src/org/apache/naming/core ServerBinding.java
DirContextHelper.java BaseNaming.java
ContextAccessController.java BaseContext.java
ServerName.java BaseDirContext.java
NamingContextEnumeration.java ServerAttributes.java
JndiPermission.java ServerAttribute.java
NamingEntry.java
Log:
Clean imports (part #2)
Revision Changes Path
1.2 +3 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerBinding.java
Index: ServerBinding.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerBinding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerBinding.java 5 Nov 2002 19:03:14 -0000 1.1
+++ ServerBinding.java 30 Sep 2003 09:05:56 -0000 1.2
@@ -1,6 +1,8 @@
package org.apache.naming.core;
-import javax.naming.*;
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.NamingException;
/** This is used for both NameClass and Binding.
* Lazy eval - so the extra methods in Binding don't affect us.
1.3 +0 -16 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/DirContextHelper.java
Index: DirContextHelper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/DirContextHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DirContextHelper.java 8 Oct 2002 18:46:42 -0000 1.2
+++ DirContextHelper.java 30 Sep 2003 09:05:56 -0000 1.3
@@ -60,23 +60,7 @@
package org.apache.naming.core;
-import java.util.Hashtable;
-import java.util.HashMap;
-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.directory.DirContext;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import org.apache.tomcat.util.res.StringManager;
-
-import java.io.*;
/**
* Utility class providing additional operations on DirContexts.
1.5 +10 -3 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseNaming.java
Index: BaseNaming.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseNaming.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseNaming.java 26 Feb 2003 18:52:12 -0000 1.4
+++ BaseNaming.java 30 Sep 2003 09:05:56 -0000 1.5
@@ -60,10 +60,17 @@
package org.apache.naming.core;
-import java.util.*;
-import javax.naming.*;
-import javax.naming.directory.DirContext;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.naming.CompositeName;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.NameParser;
+import javax.naming.NamingException;
+import javax.naming.OperationNotSupportedException;
import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
import org.apache.tomcat.util.IntrospectionUtils;
1.3 +0 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ContextAccessController.java
Index: ContextAccessController.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ContextAccessController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextAccessController.java 8 Oct 2002 18:46:42 -0000 1.2
+++ ContextAccessController.java 30 Sep 2003 09:05:56 -0000 1.3
@@ -61,7 +61,6 @@
package org.apache.naming.core;
import java.util.Hashtable;
-import javax.naming.NamingException;
/**
* Handles the access control on the JNDI contexts. All
1.4 +10 -2 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseContext.java
Index: BaseContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseContext.java 26 Feb 2003 18:52:12 -0000 1.3
+++ BaseContext.java 30 Sep 2003 09:05:56 -0000 1.4
@@ -60,8 +60,16 @@
package org.apache.naming.core;
-import java.util.*;
-import javax.naming.*;
+import java.util.Hashtable;
+
+import javax.naming.CompositeName;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NotContextException;
+import javax.naming.OperationNotSupportedException;
import javax.naming.directory.SearchControls;
// Based on a merge of various catalina naming contexts
1.3 +3 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerName.java
Index: ServerName.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerName.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerName.java 17 Oct 2002 16:48:28 -0000 1.2
+++ ServerName.java 30 Sep 2003 09:05:56 -0000 1.3
@@ -60,7 +60,9 @@
package org.apache.naming.core;
-import javax.naming.*;
+import javax.naming.CompositeName;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
/**
* Implementation of Name with support for extra information.
1.7 +9 -4 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseDirContext.java
Index: BaseDirContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseDirContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseDirContext.java 26 Feb 2003 18:52:12 -0000 1.6
+++ BaseDirContext.java 30 Sep 2003 09:05:56 -0000 1.7
@@ -60,11 +60,16 @@
package org.apache.naming.core;
-import java.util.*;
-import javax.naming.*;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.Attributes;
+import java.util.Hashtable;
+
+import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.OperationNotSupportedException;
import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
1.5 +6 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/NamingContextEnumeration.java
Index: NamingContextEnumeration.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/NamingContextEnumeration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamingContextEnumeration.java 26 Feb 2003 18:52:12 -0000 1.4
+++ NamingContextEnumeration.java 30 Sep 2003 09:05:56 -0000 1.5
@@ -62,7 +62,12 @@
import java.util.Enumeration;
-import javax.naming.*;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
/**
* Naming enumeration implementation.
1.3 +1 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerAttributes.java
Index: ServerAttributes.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerAttributes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerAttributes.java 26 Feb 2003 18:52:12 -0000 1.2
+++ ServerAttributes.java 30 Sep 2003 09:05:56 -0000 1.3
@@ -60,7 +60,7 @@
package org.apache.naming.core;
-import javax.naming.directory.*;
+import javax.naming.directory.BasicAttributes;
/**
* Extended version for Attribute. All our dirContexts should return objects
1.2 +1 -2 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/JndiPermission.java
Index: JndiPermission.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/JndiPermission.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JndiPermission.java 1 Oct 2002 18:42:16 -0000 1.1
+++ JndiPermission.java 30 Sep 2003 09:05:56 -0000 1.2
@@ -61,7 +61,6 @@
package org.apache.naming.core;
import java.security.BasicPermission;
-import java.security.Permission;
/**
* Java SecurityManager Permission class for JNDI name based file resources
1.3 +1 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerAttribute.java
Index: ServerAttribute.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/ServerAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerAttribute.java 26 Feb 2003 18:52:12 -0000 1.2
+++ ServerAttribute.java 30 Sep 2003 09:05:56 -0000 1.3
@@ -60,7 +60,7 @@
package org.apache.naming.core;
-import javax.naming.directory.*;
+import javax.naming.directory.BasicAttribute;
/**
* Extended version for Attribute. All our dirContexts should return objects
1.2 +1 -1 jakarta-tomcat-connectors/naming/src/org/apache/naming/core/NamingEntry.java
Index: NamingEntry.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/NamingEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamingEntry.java 8 Oct 2002 18:46:42 -0000 1.1
+++ NamingEntry.java 30 Sep 2003 09:05:56 -0000 1.2
@@ -60,7 +60,7 @@
package org.apache.naming.core;
-import javax.naming.directory.*;
+import javax.naming.directory.Attributes;
/**
* Represents a binding in a NamingContext. All jtc contexts should
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org