[jboss-cvs] JBossAS SVN: r57413 - in trunk: ejb3/src/main/org/jboss/ejb3 ejb3/src/main/org/jboss/injection tomcat/src/main/org/jboss/web/tomcat/tc6

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

Author: wolfc
Date: 2006-10-04 04:40:28 -0400 (Wed, 04 Oct 2006)
New Revision: 57413

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
Log:
Merged revision 57412: modified InjectionContainer

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2006-10-04 08:29:06 UTC (rev 57412)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2006-10-04 08:40:28 UTC (rev 57413)
@@ -67,6 +67,8 @@
 import javax.naming.LinkRef;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
+
+import java.lang.annotation.Annotation;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.AccessibleObject;
@@ -752,45 +754,44 @@
       return deployment.getEjbContainer(businessIntf);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz)
    {
       if (clazz == this.getBeanClass())
       {
          return (T) resolveAnnotation(annotationType);
       }
-      return (T) clazz.getAnnotation(annotationType);
+      return clazz.getAnnotation(annotationType);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz, Method method)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method)
    {
       if (clazz == this.getBeanClass())
       {
          return (T) resolveAnnotation(method, annotationType);
       }
-      Class aclass = annotationType;
-      return (T) method.getAnnotation(aclass);
+      return method.getAnnotation(annotationType);
    }
    
-   public <T> T getAnnotation(Class<T> annotationType, Method method)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method)
    {
       return (T) resolveAnnotation(method, annotationType);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz, Field field)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field)
    {
       if (clazz == this.getBeanClass())
       {
          return (T) resolveAnnotation(field, annotationType);
       }
-      Class aclass = annotationType;
-      return (T) field.getAnnotation(aclass);
+      return field.getAnnotation(annotationType);
    }
    
-   public <T> T getAnnotation(Class<T> annotationType, Field field)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field)
    {
       return (T) resolveAnnotation(field, annotationType);
    }
    
+   @Override
    public Object resolveAnnotation(Method m, Class annotation)
    {
       Object value = super.resolveAnnotation(m, annotation);

Modified: trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2006-10-04 08:29:06 UTC (rev 57412)
+++ trunk/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2006-10-04 08:40:28 UTC (rev 57413)
@@ -30,6 +30,7 @@
 import javax.naming.NameNotFoundException;
 import java.util.Map;
 import java.util.List;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Field;
 import java.lang.reflect.AccessibleObject;
@@ -84,7 +85,7 @@
     * @param clazz
     * @return
     */
-   <T> T getAnnotation(Class<T> annotationType, Class clazz);
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz);
    
    /**
     * If class has container overridable annotations, this method will
@@ -95,9 +96,9 @@
     * @param method
     * @return
     */
-   <T> T getAnnotation(Class<T> annotationType, Class clazz, Method method);
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method);
    
-   <T> T getAnnotation(Class<T> annotationType, Method method);
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method);
 
    /**
     * If class has container overridable annotations, this method will
@@ -108,9 +109,9 @@
     * @param field
     * @return
     */
-   <T> T getAnnotation(Class<T> annotationType, Class clazz, Field field);
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field);
    
-   <T> T getAnnotation(Class<T> annotationType, Field field);
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field);
 
    DependencyPolicy getDependencyPolicy();
    

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-10-04 08:29:06 UTC (rev 57412)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-10-04 08:40:28 UTC (rev 57413)
@@ -58,6 +58,8 @@
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
+
+import java.lang.annotation.Annotation;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -512,37 +514,29 @@
       return ejbResolver.getEjbJndiName(link, businessInterface);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz)
    {
-      return (T) clazz.getAnnotation(annotationType);
+      return clazz.getAnnotation(annotationType);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz, Method method)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method)
    {
-      Class t = annotationType;
-      Object o = method.getAnnotation(t);
-      return (T) o;
+      return method.getAnnotation(annotationType);
    }
    
-   public <T> T getAnnotation(Class<T> annotationType, Method method)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method)
    {
-      Class t = annotationType;
-      Object o = method.getAnnotation(t);
-      return (T) o;
+      return method.getAnnotation(annotationType);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz, Field field)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field)
    {
-      Class t = annotationType;
-      Object o = field.getAnnotation(t);
-      return (T) o;
+      return field.getAnnotation(annotationType);
    }
    
-   public <T> T getAnnotation(Class<T> annotationType, Field field)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field)
    {
-      Class t = annotationType;
-      Object o = field.getAnnotation(t);
-      return (T) o;
+      return field.getAnnotation(annotationType);
    }
 
    public DependencyPolicy getDependencyPolicy()