costin 2003/01/20 16:38:27
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
Remove unused imports, convert to c-l.
Revision Changes Path
1.2 +18 -19
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamingContextListener.java 18 Jul 2002 16:48:06 -0000 1.1
+++ NamingContextListener.java 21 Jan 2003 00:38:27 -0000 1.2
@@ -67,24 +67,13 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.TreeMap;
import java.util.Hashtable;
-import java.util.Stack;
import java.util.Enumeration;
import java.util.StringTokenizer;
import javax.naming.NamingException;
-import javax.naming.InitialContext;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import javax.naming.NamingEnumeration;
-import javax.naming.Binding;
import javax.naming.StringRefAddr;
-import javax.naming.directory.DirContext;
import org.apache.naming.NamingContext;
import org.apache.naming.ContextBindings;
import org.apache.naming.ContextAccessController;
@@ -99,7 +88,6 @@
import org.apache.catalina.Context;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
import org.apache.catalina.Server;
@@ -112,6 +100,9 @@
import org.apache.catalina.deploy.ResourceParams;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Helper class used to initialize and populate the JNDI context associated
@@ -124,6 +115,8 @@
public class NamingContextListener
implements LifecycleListener, ContainerListener, PropertyChangeListener {
+ private static Log log = LogFactory.getLog(NamingContextListener.class);
+
// ----------------------------------------------------------- Constructors
@@ -132,6 +125,8 @@
* Create a new naming context listener.
*/
public NamingContextListener() {
+ if( log.isDebugEnabled() )
+ log.debug( "new NamingContextListener");
}
@@ -236,7 +231,8 @@
public void setName(String name) {
this.name = name;
-
+ if( log.isDebugEnabled() )
+ log.debug( "setName " + name);
}
@@ -283,6 +279,9 @@
}
ContextAccessController.setSecurityToken(getName(), container);
ContextBindings.bindContext(container, namingContext, container);
+ if( log.isDebugEnabled() ) {
+ log.debug("Bound " + container );
+ }
// Setting the context in read/write mode
ContextAccessController.setWritable(getName(), container);
@@ -699,8 +698,8 @@
int i;
- if (debug >= 1)
- log("Creating JNDI naming context");
+ if (log.isDebugEnabled())
+ log.debug("Creating JNDI naming context");
if (namingResources == null) {
namingResources = new NamingResources();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
