[jboss-cvs] JBossAS SVN: r72364 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator: ejb and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-04-17 11:10:17 -0400 (Thu, 17 Apr 2008)
New Revision: 72364

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PostConstructMethodProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PreDestroyMethodProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourcesClassProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java
Log:
Correct the processor to type mapping for the remote-environment and environment processing separation

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java	2008-04-17 14:46:39 UTC (rev 72363)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java	2008-04-17 15:10:17 UTC (rev 72364)
@@ -141,7 +141,7 @@
    public void process(RemoteEnvironmentRefsGroupMetaData metaData, Class<?> type)
    {
       // @Resources/@Resource
-      processClass(metaData, type);
+      processClass(metaData, type, RemoteEnvironmentRefsGroupMetaData.class);
 
       // @EJBs/@EJB
       AnnotatedEJBReferencesMetaData aejbRefs = metaData.getAnnotatedEjbReferences();

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PostConstructMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PostConstructMethodProcessor.java	2008-04-17 14:46:39 UTC (rev 72363)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PostConstructMethodProcessor.java	2008-04-17 15:10:17 UTC (rev 72364)
@@ -30,6 +30,7 @@
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * Translate @PostConstruct into LifecycleCallbackMetaData for
@@ -40,7 +41,7 @@
  */
 public class PostConstructMethodProcessor
    extends AbstractLifeCycleMethodProcessor
-   implements Processor<EnvironmentRefsGroupMetaData, Method>
+   implements Processor<RemoteEnvironmentRefsGroupMetaData, Method>
 {
    /**
     * @param finder
@@ -50,7 +51,7 @@
       super(finder);
    }
 
-   public void process(EnvironmentRefsGroupMetaData metaData, Method element)
+   public void process(RemoteEnvironmentRefsGroupMetaData metaData, Method element)
    {
       PostConstruct annotation = finder.getAnnotation(element, PostConstruct.class);
       if(annotation == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PreDestroyMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PreDestroyMethodProcessor.java	2008-04-17 14:46:39 UTC (rev 72363)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/PreDestroyMethodProcessor.java	2008-04-17 15:10:17 UTC (rev 72364)
@@ -30,6 +30,7 @@
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * Translate @PreDestroy into LifecycleCallbackMetaData for
@@ -40,7 +41,7 @@
  */
 public class PreDestroyMethodProcessor
    extends AbstractLifeCycleMethodProcessor
-   implements Processor<EnvironmentRefsGroupMetaData, Method>
+   implements Processor<RemoteEnvironmentRefsGroupMetaData, Method>
 {
    /**
     * @param finder
@@ -50,7 +51,7 @@
       super(finder);
    }
 
-   public void process(EnvironmentRefsGroupMetaData metaData, Method element)
+   public void process(RemoteEnvironmentRefsGroupMetaData metaData, Method element)
    {
       PreDestroy annotation = finder.getAnnotation(element, PreDestroy.class);
       if(annotation == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourcesClassProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourcesClassProcessor.java	2008-04-17 14:46:39 UTC (rev 72363)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourcesClassProcessor.java	2008-04-17 15:10:17 UTC (rev 72364)
@@ -55,7 +55,8 @@
       super(finder);
    }
 
-   public void process(EnvironmentRefsGroupMetaData metaData, Class type)
+   @Override
+   public void process(RemoteEnvironmentRefsGroupMetaData metaData, Class type)
    {
       Resources annotation = finder.getAnnotation(type, Resources.class);
       if(annotation == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java	2008-04-17 14:46:39 UTC (rev 72363)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java	2008-04-17 15:10:17 UTC (rev 72364)
@@ -95,7 +95,7 @@
          beanMetaData.setJndiEnvironmentRefsGroup(env);
       }
       super.process(env, beanClass);
-      beanMetaData.setJndiEnvironmentRefsGroup(env);
+
       
       if(ejbJarMetaData.getEnterpriseBeans() == null)
          ejbJarMetaData.setEnterpriseBeans(new EnterpriseBeansMetaData());