[jboss-cvs] JBossAS SVN: r78709 - projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/threadlocal.

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

Author: wolfc
Date: 2008-09-19 08:21:32 -0400 (Fri, 19 Sep 2008)
New Revision: 78709

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/threadlocal/MockContainer.java
Log:
EJBTHREE-1241: make it merge

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/threadlocal/MockContainer.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/threadlocal/MockContainer.java	2008-09-19 12:06:49 UTC (rev 78708)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/threadlocal/MockContainer.java	2008-09-19 12:21:32 UTC (rev 78709)
@@ -60,18 +60,6 @@
 
    }
 
-   public String getName()
-   {
-      // TODO Auto-generated method stub
-      return null;
-   }
-
-   public void injectBeanContext(BeanContext<?> arg0)
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
    public BeanContext<?> createBeanContext()
    {
       return new MockBeanContext(construct());
@@ -155,6 +143,15 @@
    }
    
    /* (non-Javadoc)
+    * @see org.jboss.ejb3.Container#getName()
+    */
+   public String getName()
+   {
+      // TODO Auto-generated method stub
+      return null;
+   }
+   
+   /* (non-Javadoc)
     * @see org.jboss.ejb3.Container#getObjectName()
     */
    public ObjectName getObjectName()
@@ -196,6 +193,15 @@
    }
 
    /* (non-Javadoc)
+    * @see org.jboss.ejb3.Container#injectBeanContext(org.jboss.ejb3.BeanContext)
+    */
+   public void injectBeanContext(BeanContext<?> beanContext)
+   {
+      // TODO Auto-generated method stub
+      
+   }
+   
+   /* (non-Javadoc)
     * @see org.jboss.ejb3.Container#invokeInit(java.lang.Object)
     */
    public void invokeInit(Object bean)