[jboss-svn-commits] JBoss Common SVN: r4065 - arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss.

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

Author: aslak
Date: 2010-02-25 03:54:59 -0500 (Thu, 25 Feb 2010)
New Revision: 4065

Modified:
   arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/CDIInjectionEnricher.java
Log:
ARQ-72 check for BeanManager in comp and app space, WELDINT-19


Modified: arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/CDIInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/CDIInjectionEnricher.java	2010-02-25 08:50:59 UTC (rev 4064)
+++ arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/CDIInjectionEnricher.java	2010-02-25 08:54:59 UTC (rev 4065)
@@ -31,7 +31,8 @@
  */
 public class CDIInjectionEnricher implements TestEnricher 
 {
-   private static final String JNDI_BEAN_MANAGER = "java:/app/BeanManager";
+   private static final String JNDI_BEAN_MANAGER = "java:comp/BeanManager";
+   private static final String JNDI_BEAN_MANAGER_JBOSS = "java:app/BeanManager";
    private static final String ANNOTATION_NAME = "javax.inject.Inject";
    
    @Override
@@ -75,7 +76,15 @@
       }
       catch (Exception e) 
       {
-         return null;
+         // TODO: hack until JBoss fix BeanManager binding 
+         try 
+         {
+            return (BeanManager)new InitialContext().lookup(JNDI_BEAN_MANAGER_JBOSS);
+         } 
+         catch (Exception e2) 
+         {
+            return null;
+         }
       }
    }
 }