[jboss-cvs] JBossAS SVN: r90275 - in projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration: persistence and 1 other directory.

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

Author: dan.j.allen
Date: 2009-06-16 20:08:42 -0400 (Tue, 16 Jun 2009)
New Revision: 90275

Modified:
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java
Log:
reflect relocation of annotation accessor methods isAnnotationPresent() and getAnnotation() for InjectionPoint


Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java	2009-06-16 21:31:05 UTC (rev 90274)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java	2009-06-17 00:08:42 UTC (rev 90275)
@@ -57,7 +57,7 @@
 
    public Object resolveEjb(InjectionPoint injectionPoint)
    {
-      if (!injectionPoint.isAnnotationPresent(EJB.class))
+      if (!injectionPoint.getAnnotated().isAnnotationPresent(EJB.class))
       {
          throw new IllegalArgumentException("No @EJB annotation found on injection point " + injectionPoint);
       }
@@ -65,7 +65,7 @@
       {
          throw new IllegalArgumentException("Injection point represents a method which doesn't follow JavaBean conventions (must have exactly one parameter) " + injectionPoint);
       }
-      EJB annotation = injectionPoint.getAnnotation(EJB.class);
+      EJB annotation = injectionPoint.getAnnotated().getAnnotation(EJB.class);
       // Get properties from the annotation
       String beanName = annotation.beanName();
       String beanInterface = annotation.beanInterface().getName();
@@ -196,7 +196,7 @@
     *
     * @return all ejb container names
     */
-   public Iterable<String> getEjbContainerNames() 
+   public Iterable<String> getEjbContainerNames()
    {
 	   return Collections.unmodifiableCollection(ejbContainerNames);
    }

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java	2009-06-16 21:31:05 UTC (rev 90274)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java	2009-06-17 00:08:42 UTC (rev 90275)
@@ -43,7 +43,7 @@
 
    public EntityManager resolvePersistenceContext(InjectionPoint injectionPoint)
    {
-      if (!injectionPoint.isAnnotationPresent(PersistenceContext.class))
+      if (!injectionPoint.getAnnotated().isAnnotationPresent(PersistenceContext.class))
       {
          throw new IllegalArgumentException("No @PersistenceContext annotation found on injection point " + injectionPoint);
       }
@@ -53,7 +53,7 @@
       }
       try
       {
-         return resolvePersistenceContext((injectionPoint.getAnnotation(PersistenceContext.class).unitName()));
+         return resolvePersistenceContext((injectionPoint.getAnnotated().getAnnotation(PersistenceContext.class).unitName()));
       }
       catch (IllegalStateException e)
       {
@@ -90,7 +90,7 @@
          {
             return persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
          }
-         catch (IllegalArgumentException e) 
+         catch (IllegalArgumentException e)
          {
             // No-op, means we can't find the PU in this DU
          }