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

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

Author: scott.stark at jboss.org
Date: 2008-04-17 09:02:05 -0400 (Thu, 17 Apr 2008)
New Revision: 72347

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/client/ApplicationClientProcessor.java
Log:
Separate out the remote-environment and environment processing and only set the application client metadata env if it does not exist

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 13:01:57 UTC (rev 72346)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java	2008-04-17 13:02:05 UTC (rev 72347)
@@ -40,6 +40,7 @@
 import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
 
 /**
@@ -133,11 +134,11 @@
    }
 
    /**
-    * Process type for environment metadata related annotations
+    * Process type for remote environment metadata related annotations
     * @param metaData
     * @param type
     */
-   public void process(EnvironmentRefsGroupMetaData metaData, Class<?> type)
+   public void process(RemoteEnvironmentRefsGroupMetaData metaData, Class<?> type)
    {
       // @Resources/@Resource
       processClass(metaData, type);
@@ -151,14 +152,6 @@
       }
       processClass(aejbRefs, type);
 
-      // @PersistenceContext
-      PersistenceContextReferencesMetaData pcRefs = metaData.getPersistenceContextRefs();
-      if(pcRefs == null)
-      {
-         pcRefs = new PersistenceContextReferencesMetaData();
-         metaData.setPersistenceContextRefs(pcRefs);
-      }
-      processClass(pcRefs, type);
       // @PersistenceUnit
       PersistenceUnitReferencesMetaData puRefs = metaData.getPersistenceUnitRefs();
       if(puRefs == null)
@@ -177,6 +170,24 @@
       processClass(wsRefs, type);
    }
    /**
+    * Process type for environment metadata related annotations
+    * @param metaData
+    * @param type
+    */
+   public void process(EnvironmentRefsGroupMetaData metaData, Class<?> type)
+   {
+      this.process((RemoteEnvironmentRefsGroupMetaData)metaData, type);
+
+      // @PersistenceContext
+      PersistenceContextReferencesMetaData pcRefs = metaData.getPersistenceContextRefs();
+      if(pcRefs == null)
+      {
+         pcRefs = new PersistenceContextReferencesMetaData();
+         metaData.setPersistenceContextRefs(pcRefs);
+      }
+      processClass(pcRefs, type);
+   }
+   /**
     * Process type for component metadata related annotations
     * @param metaData
     * @param type

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/client/ApplicationClientProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/client/ApplicationClientProcessor.java	2008-04-17 13:01:57 UTC (rev 72346)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/client/ApplicationClientProcessor.java	2008-04-17 13:02:05 UTC (rev 72347)
@@ -27,13 +27,13 @@
 import org.jboss.metadata.annotation.creator.Processor;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 
 /**
  * Create ApplicationClient5MetaData for a client main class annotations
  *
  * @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
  */
 public class ApplicationClientProcessor
    extends AbstractComponentProcessor<ApplicationClient5MetaData>
@@ -49,8 +49,13 @@
    {
       super.process(metaData, type);
 
-      EnvironmentRefsGroupMetaData env = new EnvironmentRefsGroupMetaData();
+      
+      RemoteEnvironmentRefsGroupMetaData env = metaData.getJndiEnvironmentRefsGroup();
+      if(env == null)
+      {
+         env = new RemoteEnvironmentRefsGroupMetaData();
+         metaData.setJndiEnvironmentRefsGroup(env);        
+      }
       super.process(env, type);
-      metaData.setJndiEnvironmentRefsGroup(env);
    }
 }