[webbeans-commits] Webbeans SVN: r3136 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2009-07-22 12:02:00 -0400 (Wed, 22 Jul 2009)
New Revision: 3136

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
Log:
Minor cleanup...fixed test assertion and removed code not needed in deployer.

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java	2009-07-22 14:31:32 UTC (rev 3135)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java	2009-07-22 16:02:00 UTC (rev 3136)
@@ -167,15 +167,8 @@
    {
       ObserverMethodImpl<?, ?> observer = ObserverFactory.create(method, declaringBean, manager);
       environment.getObservers().add(observer);
-      //TODO Not sure how to create the templated event without any type information here
-      //fireProcessObserverMethod(observer, method);
    }
    
-   private <X, T> void fireProcessObserverMethod(final ObserverMethodImpl<X, T> observerMethod, final AnnotatedMethod<X> method)
-   {
-      manager.fireEvent(new ProcessObserverMethodImpl<X, T>(method, observerMethod, definitionErrors));
-   }
-
    protected <T> void createSimpleBean(WBClass<T> annotatedClass)
    {
       SimpleBean<T> bean = SimpleBean.of(annotatedClass, manager);

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java	2009-07-22 14:31:32 UTC (rev 3135)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java	2009-07-22 16:02:00 UTC (rev 3136)
@@ -11,19 +11,20 @@
 
 /**
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  *
  */
 @Artifact
 @IntegrationTest
 public class ManagerTest extends AbstractJSR299Test
 {
-   @Test(groups = { "manager", "ejb3", "integration" })
-   @SpecAssertion(section = "11.2", id = "d")
+   @Test(groups = { "manager", "ejb3", "integration", "rewrite" })
+   //TODO This test needs to use an EJB component that looks up the JNDI manager (java:comp)
+   @SpecAssertion(section = "11.3", id = "da")
    public void testManagerLookupInJndi() throws Exception
    {
       InitialContext ctx = new InitialContext();
-      BeanManager beanManager = (BeanManager) ctx.lookup("java:app/BeanManager");
+      BeanManager beanManager = (BeanManager) ctx.lookup("java:comp/BeanManager");
       assert beanManager != null;
    }
 }