[jboss-svn-commits] JBoss Common SVN: r3868 - in arquillian/trunk: testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss and 1 other directory.

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

Author: aslak
Date: 2009-12-16 07:45:58 -0500 (Wed, 16 Dec 2009)
New Revision: 3868

Modified:
   arquillian/trunk/demo/src/main/java/com/acme/ejb/GreetingManagerBean.java
   arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/EJBInjectionEnricher.java
Log:
ARQ-34 Added fallback to remote ejb lookup if local fail

Modified: arquillian/trunk/demo/src/main/java/com/acme/ejb/GreetingManagerBean.java
===================================================================
--- arquillian/trunk/demo/src/main/java/com/acme/ejb/GreetingManagerBean.java	2009-12-16 12:25:14 UTC (rev 3867)
+++ arquillian/trunk/demo/src/main/java/com/acme/ejb/GreetingManagerBean.java	2009-12-16 12:45:58 UTC (rev 3868)
@@ -16,7 +16,7 @@
  */
 package com.acme.ejb;
 
-import javax.ejb.Remote;
+import javax.ejb.Local;
 import javax.ejb.Stateless;
 
 /**
@@ -25,7 +25,7 @@
  * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
  * @version $Revision: $
  */
- at Remote(GreetingManager.class)
+ at Local(GreetingManager.class)
 @Stateless
 public class GreetingManagerBean implements GreetingManager
 {

Modified: arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/EJBInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/EJBInjectionEnricher.java	2009-12-16 12:25:14 UTC (rev 3867)
+++ arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/EJBInjectionEnricher.java	2009-12-16 12:45:58 UTC (rev 3868)
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import org.jboss.arquillian.spi.TestEnricher;
 
@@ -73,6 +74,13 @@
    {
       // TODO: figure out test context ? 
       InitialContext context = new InitialContext();
-      return context.lookup("test/" + field.getType().getSimpleName() + "Bean/local");
+      try 
+      {
+    	  return context.lookup("test/" + field.getType().getSimpleName() + "Bean/local");
+      } 
+      catch (NamingException e) 
+      {
+    	  return context.lookup("test/" + field.getType().getSimpleName() + "Bean/remote");
+      }
    }
 }