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

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

Author: wolfc
Date: 2007-10-12 05:04:54 -0400 (Fri, 12 Oct 2007)
New Revision: 66080

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
EJBTHREE-4506: reinstated the hack and added EjbJarMetaData as optional input

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-10-12 09:00:51 UTC (rev 66079)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-10-12 09:04:54 UTC (rev 66080)
@@ -40,6 +40,7 @@
  * @author adrian at jboss.org
  * @version $Revision:$
  */
+ at SuppressWarnings("deprecation")
 public class JBossEjbParsingDeployer extends SchemaResolverDeployer<JBossMetaData>
 {
    private JBossMetaData standardMetaData;
@@ -51,6 +52,8 @@
    {
       super(JBossMetaData.class);
       super.getOutputs().add(ApplicationMetaData.class.getName());
+      // Optional overridden meta data
+      addInput(EjbJarMetaData.class);
       setName("jboss.xml");
    }
 
@@ -72,6 +75,15 @@
    protected JBossMetaData parse(VFSDeploymentUnit unit, VirtualFile file, JBossMetaData root)
       throws Exception
    {
+      // Wolf: hack to get to old EJB3 deployer, once that one is gone
+      // this should be removed.
+      // FIXME: unify the deployers (JBAS-4506)
+      {
+         EjbJarMetaData ejbJar = unit.getAttachment(EjbJarMetaData.class);
+         if(ejbJar == null || ejbJar.isEJB3x())
+            return null;
+      }
+      
       JBossMetaData metaData = super.parse(unit, file, root);
       // Delegate to any spec ejb-jar metadata
       EjbJarMetaData specMetaData = unit.getAttachment(EjbJarMetaData.class);