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

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

Author: aslak
Date: 2010-05-07 12:52:22 -0400 (Fri, 07 May 2010)
New Revision: 4358

Modified:
   arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java
Log:
ARQ-93 Added EJB 3.1 Global name for War EJB deployments. Fixed tried jndiNames in Exception


Modified: arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java	2010-05-07 14:51:43 UTC (rev 4357)
+++ arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java	2010-05-07 16:52:22 UTC (rev 4358)
@@ -134,6 +134,8 @@
       String[] jndiNames = {
             "java:global/test.ear/test/" + fieldType.getSimpleName() + "Bean",
             "java:global/test.ear/test/" + fieldType.getSimpleName(),
+            "java:global/test/" + fieldType.getSimpleName(),
+            "java:global/test/" + fieldType.getSimpleName() + "Bean",
             "java:global/test/" + fieldType.getSimpleName() + "/no-interface",
             "test/" + fieldType.getSimpleName() + "Bean/local",
             "test/" + fieldType.getSimpleName() + "Bean/remote",
@@ -154,11 +156,23 @@
             // no-op, try next
          }
       }
-      throw new NamingException("No EJB found in JNDI, tried the following names: " + jndiNames);
+      throw new NamingException("No EJB found in JNDI, tried the following names: " + joinJndiNames(jndiNames));
    }
    
    protected InitialContext createContext(Context context) throws Exception
    {
       return new InitialContext();
    }
+   
+   // Simple helper for printing the jndi names
+   private String joinJndiNames(String[] strings)
+   {
+      StringBuilder sb = new StringBuilder();
+      
+      for(String string: strings)
+      {
+         sb.append(string).append(", ");
+      }
+      return sb.toString();
+   }
 }