[Jboss-cvs] JBossAS SVN: r55428 - in trunk/ejb3/src/main/org/jboss: ejb3 injection

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

Author: bdecoste
Date: 2006-08-08 20:09:32 -0400 (Tue, 08 Aug 2006)
New Revision: 55428

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
   trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java
Log:
fixed EJBHandler to use xml based IgnoreDependency annotations

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2006-08-08 23:45:44 UTC (rev 55427)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2006-08-09 00:09:32 UTC (rev 55428)
@@ -761,6 +761,11 @@
       Class aclass = annotationType;
       return (T) method.getAnnotation(aclass);
    }
+   
+   public <T> T getAnnotation(Class<T> annotationType, Method method)
+   {
+      return (T) resolveAnnotation(method, annotationType);
+   }
 
    public <T> T getAnnotation(Class<T> annotationType, Class clazz, Field field)
    {
@@ -771,6 +776,11 @@
       Class aclass = annotationType;
       return (T) field.getAnnotation(aclass);
    }
+   
+   public <T> T getAnnotation(Class<T> annotationType, Field field)
+   {
+      return (T) resolveAnnotation(field, annotationType);
+   }
 
    public String getIdentifier()
    {

Modified: trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2006-08-08 23:45:44 UTC (rev 55427)
+++ trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2006-08-09 00:09:32 UTC (rev 55428)
@@ -327,8 +327,8 @@
          if (!container.getEncInjectors().containsKey(encName))
          {
             ejbRefEncInjector(ref.mappedName(), encName, method.getParameterTypes()[0], ref.beanName(), "@EJB", container);
-
-            if (!method.isAnnotationPresent(IgnoreDependency.class)) ejbRefDependency(ref.beanName(), container, method.getParameterTypes()[0], "@EJB", encName);
+            
+            if (container.getAnnotation(IgnoreDependency.class, method) == null) ejbRefDependency(ref.beanName(), container, method.getParameterTypes()[0], "@EJB", encName);
          }
 
          injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
@@ -351,7 +351,7 @@
          }
          if (!container.getEncInjectors().containsKey(encName))
          {
-            if (!field.isAnnotationPresent(IgnoreDependency.class)) ejbRefDependency(ref.beanName(), container, field.getType(), "@EJB", encName);
+            if (container.getAnnotation(IgnoreDependency.class, field) == null) ejbRefDependency(ref.beanName(), container, field.getType(), "@EJB", encName);
             ejbRefEncInjector(ref.mappedName(), encName, field.getType(), ref.beanName(), "@EJB", container);
          }
          injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));

Modified: trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2006-08-08 23:45:44 UTC (rev 55427)
+++ trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2006-08-09 00:09:32 UTC (rev 55428)
@@ -95,6 +95,8 @@
     * @return
     */
    <T> T getAnnotation(Class<T> annotationType, Class clazz, Method method);
+   
+   <T> T getAnnotation(Class<T> annotationType, Method method);
 
    /**
     * If class has container overridable annotations, this method will
@@ -106,6 +108,8 @@
     * @return
     */
    <T> T getAnnotation(Class<T> annotationType, Class clazz, Field field);
+   
+   <T> T getAnnotation(Class<T> annotationType, Field field);
 
    DependencyPolicy getDependencyPolicy();