[jboss-cvs] JBossAS SVN: r58479 - trunk/server/src/main/org/jboss/ejb/deployers

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

Author: bill.burke at jboss.com
Date: 2006-11-16 19:29:05 -0500 (Thu, 16 Nov 2006)
New Revision: 58479

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
EJB 2.1 Deployer should ignore DeploymentUnit if the major version number of ejb-jar.xml file is greater than 2.  (EJB3 deployer should handle the deployment then).

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-11-17 00:27:34 UTC (rev 58478)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-11-17 00:29:05 UTC (rev 58479)
@@ -102,6 +102,7 @@
       throws DeploymentException
    {
       // TODO: use BeanVerifier to validate the metadata in the DDs
+      if (deployment.getEjbVersion() > 2) return; // let EJB3 deployer handle this
 
       ServiceMetaData ejbModule = new ServiceMetaData();
       ejbModule.setCode(EjbModule.class.getName());