[jboss-cvs] JBossAS SVN: r72354 - 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 09:38:33 -0400 (Thu, 17 Apr 2008)
New Revision: 72354

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractResourceProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceClassProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.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/AbstractResourceProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractResourceProcessor.java	2008-04-17 13:18:05 UTC (rev 72353)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractResourceProcessor.java	2008-04-17 13:38:33 UTC (rev 72354)
@@ -37,6 +37,7 @@
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
 import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.ResourceAuthorityType;
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
@@ -150,14 +151,14 @@
       super(finder);
    }
    
-   public void process(EnvironmentRefsGroupMetaData refs, E element)
+   public void process(RemoteEnvironmentRefsGroupMetaData refs, E element)
    {
       Resource annotation = finder.getAnnotation(element, Resource.class);
       if(annotation == null)
          return;
       process(refs, element, annotation);
    }
-   protected void process(EnvironmentRefsGroupMetaData refs, E element, Resource annotation)
+   protected void process(RemoteEnvironmentRefsGroupMetaData refs, E element, Resource annotation)
    {
       boolean trace = log.isTraceEnabled();
       String type = annotation.type().getName();

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceClassProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceClassProcessor.java	2008-04-17 13:18:05 UTC (rev 72353)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceClassProcessor.java	2008-04-17 13:38:33 UTC (rev 72354)
@@ -25,6 +25,7 @@
 
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * If the annotation is applied to a class, the annotation declares a resource
@@ -41,7 +42,7 @@
  */
 public class ResourceClassProcessor
    extends AbstractResourceProcessor<Class>
-   implements Processor<EnvironmentRefsGroupMetaData, Class>
+   implements Processor<RemoteEnvironmentRefsGroupMetaData, Class>
 {
 
    /**

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java	2008-04-17 13:18:05 UTC (rev 72353)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceFieldProcessor.java	2008-04-17 13:38:33 UTC (rev 72354)
@@ -26,6 +26,7 @@
 
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * @author Scott.Stark at jboss.org
@@ -33,7 +34,7 @@
  */
 public class ResourceFieldProcessor
    extends AbstractResourceProcessor<Field>
-   implements Processor<EnvironmentRefsGroupMetaData, Field>
+   implements Processor<RemoteEnvironmentRefsGroupMetaData, Field>
 {
 
    /**

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.java	2008-04-17 13:18:05 UTC (rev 72353)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourceMethodProcessor.java	2008-04-17 13:38:33 UTC (rev 72354)
@@ -26,6 +26,7 @@
 
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * @author Scott.Stark at jboss.org
@@ -33,7 +34,7 @@
  */
 public class ResourceMethodProcessor
    extends AbstractResourceProcessor<Method>
-   implements Processor<EnvironmentRefsGroupMetaData, Method>
+   implements Processor<RemoteEnvironmentRefsGroupMetaData, Method>
 {
 
    /**

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 13:18:05 UTC (rev 72353)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ResourcesClassProcessor.java	2008-04-17 13:38:33 UTC (rev 72354)
@@ -28,6 +28,7 @@
 
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * If the annotation is applied to a class, the annotation declares a resource
@@ -44,9 +45,8 @@
  */
 public class ResourcesClassProcessor
    extends ResourceClassProcessor
-   implements Processor<EnvironmentRefsGroupMetaData, Class>
+   implements Processor<RemoteEnvironmentRefsGroupMetaData, Class>
 {
-
    /**
     * @param finder
     */

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 13:18:05 UTC (rev 72353)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractEnterpriseBeanProcessor.java	2008-04-17 13:38:33 UTC (rev 72354)
@@ -38,6 +38,7 @@
 import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
 import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
 import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
+import org.jboss.metadata.javaee.spec.Environment;
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 
@@ -45,7 +46,7 @@
  * Comment
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
  */
 public abstract class AbstractEnterpriseBeanProcessor<MD extends EnterpriseBeanMetaData>
    extends AbstractComponentProcessor<MD>
@@ -87,7 +88,12 @@
 
       EjbNameThreadLocal.ejbName.set(beanMetaData.getEjbName());
 
-      EnvironmentRefsGroupMetaData env = new EnvironmentRefsGroupMetaData();
+      EnvironmentRefsGroupMetaData env = (EnvironmentRefsGroupMetaData) beanMetaData.getJndiEnvironmentRefsGroup();
+      if(env == null)
+      {
+         env = new EnvironmentRefsGroupMetaData();
+         beanMetaData.setJndiEnvironmentRefsGroup(env);
+      }
       super.process(env, beanClass);
       beanMetaData.setJndiEnvironmentRefsGroup(env);