svn commit: r393248 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: core/NamingContextListener.java core/StandardContext.java util/AnnotationProcessor.java

[remm]

Author: remm
Date: Tue Apr 11 08:36:04 2006
New Revision: 393248

URL: http://svn.apache.org/viewcvs?rev=393248&view=rev
Log:
- Add a few naming related cleanups.

Modified:
    
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=393248&r1=393247&r2=393248&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
Tue Apr 11 08:36:04 2006
@@ -147,9 +147,7 @@
      * Return the "name" property.
      */
     public String getName() {
-
         return (this.name);
-
     }
 
 
@@ -159,14 +157,19 @@
      * @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 @@
      * Return the associated naming context.
      */
     public NamingContext getNamingContext() {
-
         return (this.namingContext);
-
     }
 
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=393248&r1=393247&r2=393248&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue 
Apr 11 08:36:04 2006
@@ -4842,6 +4842,14 @@
     
 
     /**
+     * Naming context listener setter.
+     */
+    public void setNamingContextListener(NamingContextListener 
namingContextListener) {
+        this.namingContextListener = namingContextListener;
+    }
+    
+
+    /**
      * Return the request processing paused flag for this Context.
      */
     public boolean getPaused() {

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java?rev=393248&r1=393247&r2=393248&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java 
Tue Apr 11 08:36:04 2006
@@ -117,15 +117,15 @@
                 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 @@
                 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());
             }
             */
         }            



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]