[jboss-cvs] JBossAS SVN: r63671 - trunk/ejb3/src/main/org/jboss/ejb3.

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

Author: wolfc
Date: 2007-06-27 08:31:40 -0400 (Wed, 27 Jun 2007)
New Revision: 63671

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
Log:
Extra logging

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-06-27 11:35:47 UTC (rev 63670)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-06-27 12:31:40 UTC (rev 63671)
@@ -1081,4 +1081,9 @@
       }
       return info;
    }
+   
+   public String toString()
+   {
+      return getObjectName().getCanonicalName();
+   }
 }

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-06-27 11:35:47 UTC (rev 63670)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-06-27 12:31:40 UTC (rev 63671)
@@ -1896,7 +1896,7 @@
          Class annotationClass, Object annotation)
    {
       log.debug("adding class annotation " + annotationClass.getName() + " to "
-            + ejbClass.getName() + " " + annotation);
+            + container + " " + annotation);
       container.getAnnotations()
             .addClassAnnotation(annotationClass, annotation);
    }

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-06-27 11:35:47 UTC (rev 63670)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-06-27 12:31:40 UTC (rev 63671)
@@ -54,10 +54,21 @@
    /**
     * Reports the existance of a container.
     * 
+    * @param container  the container to check
+    * @return           true if found, false otherwise
+    */
+   public static boolean hasContainer(Container container)
+   {
+      return hasContainer(oid(container));
+   }
+   
+   /**
+    * Reports the existance of a container.
+    * 
     * @param oid    the canonical object name of the container
     * @return       true if found, false otherwise
     */
-   public static boolean hasContainer(String oid)
+   private static boolean hasContainer(String oid)
    {
       return containers.containsKey(oid);
    }
@@ -79,6 +90,7 @@
       if(hasContainer(oid))
          throw new IllegalStateException("Container " + oid + " is already registered");
       containers.put(oid, container);
+      log.debug("Registered container " + oid);
    }
 
    /**
@@ -93,6 +105,7 @@
       if(!hasContainer(oid))
          throw new IllegalStateException("Container " + oid + " is not registered");
       containers.remove(oid);
+      log.debug("Unregistered container " + oid);
    }
 
    /**
@@ -119,5 +132,4 @@
    {
       return Collections.unmodifiableCollection(containers.values());
    }
-
 }