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

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

Author: alex.loubyansky at jboss.com
Date: 2008-06-25 12:23:37 -0400 (Wed, 25 Jun 2008)
New Revision: 75069

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
commented out changes necessary to resolve JBAS-5679

Modified: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-06-25 15:27:41 UTC (rev 75068)
+++ trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-06-25 16:23:37 UTC (rev 75069)
@@ -37,11 +37,14 @@
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.metadata.annotation.creator.client.ApplicationClient5MetaDataCreator;
 import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
+import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
 import org.jboss.metadata.annotation.creator.web.Web25MetaDataCreator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
 import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
@@ -246,6 +249,11 @@
       EjbJar30MetaData annotationMetaData = creator.create(classes);
       if(annotationMetaData != null)
          unit.addAttachment(EJB_ANNOTATED_ATTACHMENT_NAME, annotationMetaData, EjbJarMetaData.class);
+      // the lines above should be replaced with the following for JBAS-5679
+      //JBoss50Creator creator = new JBoss50Creator(finder);
+      //JBossMetaData annotationMetaData = creator.create(classes);
+      //if(annotationMetaData != null)
+      //   unit.addAttachment(EJB_ANNOTATED_ATTACHMENT_NAME, annotationMetaData, JBossMetaData.class);
    }
 
    /**

Modified: trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-06-25 15:27:41 UTC (rev 75068)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-06-25 16:23:37 UTC (rev 75069)
@@ -27,6 +27,7 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployment.AnnotationMetaDataDeployer;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
 import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.spec.AnnotationMergedView;
@@ -73,6 +74,7 @@
       // Check for an annotated view
       String key = AnnotationMetaDataDeployer.EJB_ANNOTATED_ATTACHMENT_NAME;
       EjbJar3xMetaData annotatedMetaData = unit.getAttachment(key, EjbJar3xMetaData.class);
+      // JBAS-5679 JBossMetaData annotatedMetaData = (JBossMetaData) unit.addAttachment(key, JBossMetaData.class);
       if(specMetaData == null && metaData == null && annotatedMetaData == null)
          return;
 
@@ -88,6 +90,24 @@
             specMetaData = annotatedMetaData;
       }
 
+      /* the 'if' above should be replaced with the following for JBAS-5679
+         specMetaData above should also be renamed to e.g. ejbJarMetaData for everything below to work
+      JBossMetaData specMetaData = null;
+      if(ejbJarMetaData != null)
+      {
+         specMetaData = new JBoss50MetaData();
+         specMetaData.merge(null, ejbJarMetaData);
+         if(annotatedMetaData != null)
+         {
+            JBossMetaData specMerged = new JBoss50MetaData();
+            specMerged.merge(specMetaData, annotatedMetaData);
+            specMetaData = specMerged;
+         }
+      }
+      else
+         specMetaData = annotatedMetaData;
+      */
+      
       // Create a merged view
       JBossMetaData mergedMetaData = new JBossMetaData();
       mergedMetaData.merge(metaData, specMetaData);