From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 11 Apr 2006 15:36:04 +0000 (+0000)
Subject: - Add a few naming related cleanups.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fdada06741c360ca854373993b4ff651d0e68b5a;p=tomcat7.0

- 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 108c047f2..838d8fdd2 100644
--- 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.
      */
     public String getName() {
-
         return (this.name);
-
     }
 
 
@@ -159,14 +157,19 @@ public class NamingContextListener
      * @param name The new name
      */
     public void setName(String name) {
-
         this.name = name;
-        if( log.isDebugEnabled() )
-            log.debug( "setName " + name);
     }
 
     
     /**
+     * Return the comp context.
+     */
+    public javax.naming.Context getCompContext() {
+        return this.compCtx;
+    }
+    
+
+    /**
      * Return the env context.
      */
     public javax.naming.Context getEnvContext() {
@@ -178,9 +181,7 @@ public class NamingContextListener
      * Return the associated naming context.
      */
     public NamingContext getNamingContext() {
-
         return (this.namingContext);
-
     }
 
 
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 711570392..c487ddcad 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4842,6 +4842,14 @@ public class StandardContext
     
 
     /**
+     * Naming context listener setter.
+     */
+    public void setNamingContextListener(NamingContextListener namingContextListener) {
+        this.namingContextListener = namingContextListener;
+    }
+    
+
+    /**
      * Return the request processing paused flag for this Context.
      */
     public boolean getPaused() {
diff --git a/java/org/apache/catalina/util/AnnotationProcessor.java b/java/org/apache/catalina/util/AnnotationProcessor.java
index 1524b5b0b..05e4f6a69 100644
--- 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());
             }
             /*
-            if (f.isAnnotationPresent(EJB.class)) {
-                EJB annotation = (EJB) f.getAnnotation(EJB.class);
-                lookupOnFieldResource(f, annotation.name());
+            if (fields[i].isAnnotationPresent(EJB.class)) {
+                EJB annotation = (EJB) fields[i].getAnnotation(EJB.class);
+                lookupOnFieldResource(context, instance, fields[i], annotation.name());
             }
             
-            if (f.isAnnotationPresent(WebServiceRef.class)) {
-                WebServiceRef annotation = (WebServiceRef) 
-                f.getAnnotation(WebServiceRef.class);
-                lookupOnFieldResource(f, annotation.name());
+            if (fields[i].isAnnotationPresent(WebServiceRef.class)) {
+                WebServiceRef annotation = 
+                    (WebServiceRef) fields[i].getAnnotation(WebServiceRef.class);
+                lookupOnFieldResource(context, instance, fields[i], annotation.name());
             }
             */
         }
@@ -138,14 +138,14 @@ public class AnnotationProcessor {
                 lookupMethodResource(context, instance, methods[i], annotation.name());
             }
             /*
-            if (m.isAnnotationPresent(EJB.class)) {
-                EJB annotation = (EJB) m.getAnnotation(EJB.class);
-                lookupOnMethodResource(m, annotation.name());
+            if (methods[i].isAnnotationPresent(EJB.class)) {
+                EJB annotation = (EJB) methods[i].getAnnotation(EJB.class);
+                lookupOnMethodResource(context, instance, methods[i], annotation.name());
             }
-            if (m.isAnnotationPresent(WebServiceRef.class)) {
-                WebServiceRef annotation = (WebServiceRef) 
-                m.getAnnotation(WebServiceRef.class);
-                lookupOnMethodResource(m, annotation.name());
+            if (methods[i].isAnnotationPresent(WebServiceRef.class)) {
+                WebServiceRef annotation = 
+                    (WebServiceRef) methods[i].getAnnotation(WebServiceRef.class);
+                lookupOnMethodResource(context, instance, methods[i], annotation.name());
             }
             */
         }