[jboss-cvs] JBossAS SVN: r66676 - in trunk: server/src/main/org/jboss/ejb/deployers and 1 other directory.

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

Author: wolfc
Date: 2007-11-02 08:17:15 -0400 (Fri, 02 Nov 2007)
New Revision: 66676

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
JBAS-4506: Make sure we pick up the right deployer for unknown version deployment

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2007-11-02 11:02:29 UTC (rev 66675)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2007-11-02 12:17:15 UTC (rev 66676)
@@ -77,9 +77,10 @@
    {
       try
       {
-         if(metaData != null && !metaData.isEJB3x())
+         // Pickup any deployment which doesn't have metaData or metaData with ejbVersion unknown or 3
+         if(metaData != null && (metaData.isEJB2x() || metaData.isEJB1x()))
          {
-            log.trace("Ignoring legacy EJB deployment " + unit);
+            log.debug("Ignoring legacy EJB deployment " + unit);
             return;
          }
          

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-11-02 11:02:29 UTC (rev 66675)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-11-02 12:17:15 UTC (rev 66676)
@@ -175,8 +175,10 @@
       throws DeploymentException
    {
       // TODO: use BeanVerifier to validate the metadata in the DDs
-      if (deployment.isEJB3x())
-         return; // let EJB3 deployer handle this 
+      
+      // If it is a deployment with ejbVersion unknown or 3
+      if (!deployment.isEJB2x() && !deployment.isEJB1x())
+         return; // let EJB3 deployer handle this
 
       ServiceMetaData ejbModule = new ServiceMetaData();
       ejbModule.setCode(EjbModule.class.getName());