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

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

Author: bstansberry at jboss.com
Date: 2010-01-15 23:58:14 -0500 (Fri, 15 Jan 2010)
New Revision: 99505

Modified:
   trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
[JBAS-7624] Handle EJB 1.x beans as well

Modified: trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java	2010-01-16 04:34:45 UTC (rev 99504)
+++ trunk/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java	2010-01-16 04:58:14 UTC (rev 99505)
@@ -99,9 +99,9 @@
       if (ejbJarMetaData != null || jbossMetaData != null)
       {
          // Save this as a transient(non-managed) attachment
-         // only for EJB2.x beans (since standardjboss.xml does not apply for EJB3.x and
+         // only for EJB2.x and earlier beans (since standardjboss.xml does not apply for EJB3.x and
          // later)
-         if (this.isEJB2x(ejbJarMetaData, jbossMetaData))
+         if (this.isPreEJB3x(ejbJarMetaData, jbossMetaData))
          {
             JBossMetaData stdMetaData = getStandardMetaData();
             if(stdMetaData != null)
@@ -155,20 +155,20 @@
    
    /**
     * @return Returns true if either the passed <code>ejbJarMetadata</code> or the <code>jbossMetadata</code>
-    * represents a EJB2.x deployment
+    * represents a EJB2.x or EJB1.x deployment
     * 
     * @param ejbJarMetadata ejb-jar metadata
     * @param jbossMetadata jboss metadata
     * 
     */
-   private boolean isEJB2x(EjbJarMetaData ejbJarMetadata, JBossMetaData jbossMetadata)
+   private boolean isPreEJB3x(EjbJarMetaData ejbJarMetadata, JBossMetaData jbossMetadata)
    {
-      if (ejbJarMetadata != null && ejbJarMetadata.isEJB2x())
+      if (ejbJarMetadata != null && (ejbJarMetadata.isEJB2x() || ejbJarMetadata.isEJB1x()))
       {
          return true;
       }
       
-      if (jbossMetadata != null && jbossMetadata.isEJB2x())
+      if (jbossMetadata != null && (jbossMetadata.isEJB2x() || jbossMetadata.isEJB1x()))
       {
          return true;
       }