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

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

Author: scott.stark at jboss.org
Date: 2008-06-04 22:02:10 -0400 (Wed, 04 Jun 2008)
New Revision: 74121

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
Log:
JBAS-5586, default to metadata complete if war is 2.4 or earlier and ejb is 2.1 or earlier.

Modified: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-06-05 01:31:43 UTC (rev 74120)
+++ trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-06-05 02:02:10 UTC (rev 74121)
@@ -119,12 +119,24 @@
       boolean isComplete = this.isMetaDataCompleteIsDefault();
       EjbJarMetaData ejbJarMetaData = unit.getAttachment(EjbJarMetaData.class);
       if(ejbJarMetaData != null && ejbJarMetaData instanceof EjbJar3xMetaData)
+      {
          isComplete |= ((EjbJar3xMetaData) ejbJarMetaData).isMetadataComplete();
+      }
+      else if(ejbJarMetaData != null)
+      {
+         // Any ejb-jar.xml 2.1 or earlier deployment is metadata complete
+         isComplete = true;         
+      }
       WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
       if(webMetaData != null && webMetaData instanceof Web25MetaData)
       {
          isComplete |= ((Web25MetaData)webMetaData).isMetadataComplete();
       }
+      else if(webMetaData != null)
+      {
+         // Any web.xml 2.4 or earlier deployment is metadata complete
+         isComplete = true;
+      }
       ApplicationClientMetaData clientMetaData = unit.getAttachment(ApplicationClientMetaData.class);
       if(clientMetaData != null)
          isComplete |= clientMetaData.isMetadataComplete();