[jboss-cvs] JBossAS SVN: r99497 - trunk/server/src/main/java/org/jboss/deployment.

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

Author: jaikiran
Date: 2010-01-15 13:17:16 -0500 (Fri, 15 Jan 2010)
New Revision: 99497

Modified:
   trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
JBAS-7624 JBossMetaData from standardjboss.xml will be created only for EJB2.x beans, henceforth

Modified: trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java	2010-01-15 17:21:56 UTC (rev 99496)
+++ trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java	2010-01-15 18:17:16 UTC (rev 99497)
@@ -99,9 +99,14 @@
       if (ejbJarMetaData != null || jbossMetaData != null)
       {
          // Save this as a transient(non-managed) attachment
-         JBossMetaData stdMetaData = getStandardMetaData();
-         if(stdMetaData != null)
-            unit.addAttachment("standardjboss.xml", stdMetaData);
+         // only for EJB2.x beans (since standardjboss.xml does not apply for EJB3.x and
+         // later)
+         if (this.isEJB2x(ejbJarMetaData, jbossMetaData))
+         {
+            JBossMetaData stdMetaData = getStandardMetaData();
+            if(stdMetaData != null)
+               unit.addAttachment("standardjboss.xml", stdMetaData);
+         }
 
          if (jbossMetaData != null)
          {
@@ -147,4 +152,27 @@
       }
       return standardMetaData;
    }
+   
+   /**
+    * @return Returns true if either the passed <code>ejbJarMetadata</code> or the <code>jbossMetadata</code>
+    * represents a EJB2.x deployment
+    * 
+    * @param ejbJarMetadata ejb-jar metadata
+    * @param jbossMetadata jboss metadata
+    * 
+    */
+   private boolean isEJB2x(EjbJarMetaData ejbJarMetadata, JBossMetaData jbossMetadata)
+   {
+      if (ejbJarMetadata != null && ejbJarMetadata.isEJB2x())
+      {
+         return true;
+      }
+      
+      if (jbossMetadata != null && jbossMetadata.isEJB2x())
+      {
+         return true;
+      }
+      return false;
+   }
+   
 }