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

[Gavin King]

  User: gavin   
  Date: 06/10/31 21:54:02

  Modified:    src/main/org/jboss/seam/util  EJB.java
  Log:
  insulate dependency to javax.interceptor
  
  Revision  Changes    Path
  1.2       +12 -6     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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EJB.java	1 Nov 2006 01:52:09 -0000	1.1
  +++ EJB.java	1 Nov 2006 02:54:02 -0000	1.2
  @@ -23,6 +23,9 @@
      public static final Class<Annotation> REMOVE;
      public static final Class<Annotation> LOCAL;
      public static final Class<Annotation> APPLICATION_EXCEPTION;
  +   public static final Class<Annotation> INTERCEPTORS;
  +   public static final Class<Annotation> AROUND_INVOKE;
  +   public static boolean INVOCATION_CONTEXT_AVAILABLE;
      
      private static Class classForName(String name)
      {
  @@ -40,14 +43,17 @@
         STATELESS = classForName("javax.ejb.Stateless");
         STATEFUL = classForName("javax.ejb.Stateful");
         MESSAGE_DRIVEN = classForName("javax.ejb.MessageDriven");
  -      PRE_PASSIVATE = classForName("javax.ejb.PrePassivate");
  -      POST_ACTIVATE = classForName("javax.ejb.PostActivate");
  -      PRE_DESTROY = classForName("javax.ejb.PreDestroy");
  -      POST_CONSTRUCT = classForName("javax.ejb.PostConstruct");
  -      REMOTE = classForName("javax.ejb.Remote");
  +      APPLICATION_EXCEPTION = classForName("javax.ejb.ApplicationException");
         REMOVE = classForName("javax.ejb.Remove");
  +      REMOTE = classForName("javax.ejb.Remote");
         LOCAL = classForName("javax.ejb.Local");
  -      APPLICATION_EXCEPTION = classForName("javax.ejb.ApplicationException");
  +      PRE_PASSIVATE = classForName("javax.ejb.PrePassivate");
  +      POST_ACTIVATE = classForName("javax.ejb.PostActivate");
  +      PRE_DESTROY = classForName("javax.annotation.PreDestroy");
  +      POST_CONSTRUCT = classForName("javax.annotation.PostConstruct");
  +      INTERCEPTORS = classForName("javax.interceptor.Interceptors");
  +      AROUND_INVOKE = classForName("javax.interceptor.AroundInvoke");
  +      INVOCATION_CONTEXT_AVAILABLE = !classForName("javax.interceptor.InvocationContext").equals(Dummy.class);
      }
      
      public static String name(Annotation annotation)