[jboss-cvs] jboss-seam/src/main/org/jboss/seam/util ...

[Gavin King]

  User: gavin   
  Date: 06/11/14 12:53:13

  Modified:    src/main/org/jboss/seam/util  EJB.java
  Log:
  ooops, use the standard EJB context
  
  Revision  Changes    Path
  1.4       +21 -2     jboss-seam/src/main/org/jboss/seam/util/EJB.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EJB.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/EJB.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- EJB.java	8 Nov 2006 17:32:43 -0000	1.3
  +++ EJB.java	14 Nov 2006 17:53:13 -0000	1.4
  @@ -3,12 +3,14 @@
   import java.lang.annotation.Annotation;
   
   import javax.ejb.EJBContext;
  +import javax.naming.NameNotFoundException;
   import javax.naming.NamingException;
   
   
   public class EJB
   {
  -   public static final String EJBCONTEXT_NAME = "java:comp.ejb3/EJBContext";
  +   public static String ejbContextName = "java:comp.ejb3/EJBContext";
  +   public static final String STANDARD_EJB_CONTEXT_NAME = "java:comp/EJBContext";
   
      public @interface Dummy {}
      
  @@ -74,7 +76,24 @@
   
      public static EJBContext getEJBContext() throws NamingException
      {
  -      return (EJBContext) Naming.getInitialContext().lookup(EJBCONTEXT_NAME);
  +      try
  +      {
  +         return (EJBContext) Naming.getInitialContext().lookup(ejbContextName);
  +      }
  +      catch (NameNotFoundException nnfe)
  +      {
  +         return (EJBContext) Naming.getInitialContext().lookup(STANDARD_EJB_CONTEXT_NAME);
  +      }
  +   }
  +
  +   protected static String getEjbContextName()
  +   {
  +      return ejbContextName;
  +   }
  +
  +   protected static void setEjbContextName(String ejbContextName)
  +   {
  +      EJB.ejbContextName = ejbContextName;
      }
   
   }