- Add a few naming related cleanups.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@393248 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index 108c047..838d8fd 100644 (file)
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -147,9 +147,7 @@ public class NamingContextListener
      * Return the "name" property.\r
      */\r
     public String getName() {\r
-\r
         return (this.name);\r
-\r
     }\r
 \r
 \r
@@ -159,14 +157,19 @@ public class NamingContextListener
      * @param name The new name\r
      */\r
     public void setName(String name) {\r
-\r
         this.name = name;\r
-        if( log.isDebugEnabled() )\r
-            log.debug( "setName " + name);\r
     }\r
 \r
     \r
     /**\r
+     * Return the comp context.\r
+     */\r
+    public javax.naming.Context getCompContext() {\r
+        return this.compCtx;\r
+    }\r
+    \r
+\r
+    /**\r
      * Return the env context.\r
      */\r
     public javax.naming.Context getEnvContext() {\r
@@ -178,9 +181,7 @@ public class NamingContextListener
      * Return the associated naming context.\r
      */\r
     public NamingContext getNamingContext() {\r
-\r
         return (this.namingContext);\r
-\r
     }\r
 \r
 \r

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 7115703..c487ddc 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4842,6 +4842,14 @@ public class StandardContext
     \r
 \r
     /**\r
+     * Naming context listener setter.\r
+     */\r
+    public void setNamingContextListener(NamingContextListener namingContextListener) {\r
+        this.namingContextListener = namingContextListener;\r
+    }\r
+    \r
+\r
+    /**\r
      * Return the request processing paused flag for this Context.\r
      */\r
     public boolean getPaused() {\r

diff --git a/java/org/apache/catalina/util/AnnotationProcessor.java b/java/org/apache/catalina/util/AnnotationProcessor.java
index 1524b5b..05e4f6a 100644 (file)
--- a/java/org/apache/catalina/util/AnnotationProcessor.java
+++ b/java/org/apache/catalina/util/AnnotationProcessor.java
@@ -117,15 +117,15 @@ public class AnnotationProcessor {
                 lookupFieldResource(context, instance, fields[i], annotation.name());\r
             }\r
             /*\r
-            if (f.isAnnotationPresent(EJB.class)) {\r
-                EJB annotation = (EJB) f.getAnnotation(EJB.class);\r
-                lookupOnFieldResource(f, annotation.name());\r
+            if (fields[i].isAnnotationPresent(EJB.class)) {\r
+                EJB annotation = (EJB) fields[i].getAnnotation(EJB.class);\r
+                lookupOnFieldResource(context, instance, fields[i], annotation.name());\r
             }\r
             \r
-            if (f.isAnnotationPresent(WebServiceRef.class)) {\r
-                WebServiceRef annotation = (WebServiceRef) \r
-                f.getAnnotation(WebServiceRef.class);\r
-                lookupOnFieldResource(f, annotation.name());\r
+            if (fields[i].isAnnotationPresent(WebServiceRef.class)) {\r
+                WebServiceRef annotation = \r
+                    (WebServiceRef) fields[i].getAnnotation(WebServiceRef.class);\r
+                lookupOnFieldResource(context, instance, fields[i], annotation.name());\r
             }\r
             */\r
         }\r
@@ -138,14 +138,14 @@ public class AnnotationProcessor {
                 lookupMethodResource(context, instance, methods[i], annotation.name());\r
             }\r
             /*\r
-            if (m.isAnnotationPresent(EJB.class)) {\r
-                EJB annotation = (EJB) m.getAnnotation(EJB.class);\r
-                lookupOnMethodResource(m, annotation.name());\r
+            if (methods[i].isAnnotationPresent(EJB.class)) {\r
+                EJB annotation = (EJB) methods[i].getAnnotation(EJB.class);\r
+                lookupOnMethodResource(context, instance, methods[i], annotation.name());\r
             }\r
-            if (m.isAnnotationPresent(WebServiceRef.class)) {\r
-                WebServiceRef annotation = (WebServiceRef) \r
-                m.getAnnotation(WebServiceRef.class);\r
-                lookupOnMethodResource(m, annotation.name());\r
+            if (methods[i].isAnnotationPresent(WebServiceRef.class)) {\r
+                WebServiceRef annotation = \r
+                    (WebServiceRef) methods[i].getAnnotation(WebServiceRef.class);\r
+                lookupOnMethodResource(context, instance, methods[i], annotation.name());\r
             }\r
             */\r
         }            \r