[jboss-cvs] JBossAS SVN: r78082 - in trunk/tomcat/src/main/org/jboss/web/tomcat/service: injection and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-09-05 09:15:44 -0400 (Fri, 05 Sep 2008)
New Revision: 78082

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBHandler.java
Log:
[JBAS-5673] logging

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2008-09-05 13:08:33 UTC (rev 78081)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2008-09-05 13:15:44 UTC (rev 78082)
@@ -250,7 +250,8 @@
       return instance;
    }
 
-   public Object newInstance(String className, ClassLoader classLoader) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
+   public Object newInstance(String className, ClassLoader classLoader) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException
+   {
        Class<?> clazz = classLoader.loadClass(className);
        checkAccess(clazz);
        Object instance = clazz.newInstance();
@@ -263,7 +264,8 @@
        return instance;
    }
 
-   public void newInstance(Object instance) throws IllegalAccessException, InvocationTargetException, NamingException {
+   public void newInstance(Object instance) throws IllegalAccessException, InvocationTargetException, NamingException 
+   {
       processInjectors(instance);
 	  if (!catalinaContext.getIgnoreAnnotations())
 	  {
@@ -273,6 +275,7 @@
    }
 
    public void destroyInstance(Object instance) throws IllegalAccessException, InvocationTargetException {
+       log.trace("destroyInstance: " + instance);
 	   if (!catalinaContext.getIgnoreAnnotations())
 	   {
 		   preDestroy(instance);
@@ -344,16 +347,16 @@
    public void processInjectors(Object object)
    {
       final boolean trace = log.isTraceEnabled();
-      
+
       Map<AccessibleObject, Injector> injectors = getEncInjectionsForObject(object);
       if (injectors == null || injectors.size() == 0)
       {
          if (trace)
-            log.trace("-- no injectors found: " + injectors);
+            log.trace("-- no injectors found for: " + object);
          return;
       }
       if (trace)
-         log.trace("-- doing injections");
+         log.trace("-- doing injections for: " + object);
       for (Injector injector : injectors.values())
       {
          injector.inject(object);

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBHandler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBHandler.java	2008-09-05 13:08:33 UTC (rev 78081)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBHandler.java	2008-09-05 13:15:44 UTC (rev 78082)
@@ -61,9 +61,11 @@
       if (xml != null)
       {
          // local references
+         log.trace("localEjbRefs:" + xml.getEjbLocalReferences());
          if (xml.getEjbLocalReferences() != null)
             loadEjbLocalXml(xml.getEjbLocalReferences(), container);
          // annotated references
+         log.trace("annotatedEjbRefs:" + xml.getEjbLocalReferences());
          if (xml.getAnnotatedEjbReferences() != null)
             loadEjbRefXml(xml.getAnnotatedEjbReferences(), container);
       }