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

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

Author: emuckenhuber
Date: 2008-07-07 12:16:45 -0400 (Mon, 07 Jul 2008)
New Revision: 75451

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
[JBAS-5679] switch to JBoss50Creator

Modified: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-07-07 16:08:50 UTC (rev 75450)
+++ trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-07-07 16:16:45 UTC (rev 75451)
@@ -245,15 +245,10 @@
          AnnotationFinder<AnnotatedElement> finder, Collection<Class<?>> classes)
    {
       // Create the metadata model from the annotations
-      EjbJar30Creator creator = new EjbJar30Creator(finder);
-      EjbJar30MetaData annotationMetaData = creator.create(classes);
+      JBoss50Creator creator = new JBoss50Creator(finder);
+      JBossMetaData 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);
+         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-07-07 16:08:50 UTC (rev 75450)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-07-07 16:16:45 UTC (rev 75451)
@@ -69,33 +69,17 @@
 
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
-      EjbJarMetaData specMetaData = unit.getAttachment(EjbJarMetaData.class);
+      EjbJarMetaData ejbJarMetaData = unit.getAttachment(EjbJarMetaData.class);
       JBossMetaData metaData = unit.getAttachment(JBossMetaData.class);
       // 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)
+      JBossMetaData annotatedMetaData = (JBossMetaData) unit.addAttachment(key, JBossMetaData.class);
+      if(ejbJarMetaData == null && metaData == null && annotatedMetaData == null)
          return;
 
-      if(annotatedMetaData != null)
-      {
-         if(specMetaData != null)
-         {
-            EjbJar3xMetaData specMerged = new EjbJar30MetaData();
-            AnnotationMergedView.merge(specMerged, (EjbJar3xMetaData) specMetaData, annotatedMetaData);
-            specMetaData = specMerged;
-         }
-         else
-            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;
+      JBossMetaData specMetaData = new JBoss50MetaData();
       if(ejbJarMetaData != null)
       {
-         specMetaData = new JBoss50MetaData();
          specMetaData.merge(null, ejbJarMetaData);
          if(annotatedMetaData != null)
          {
@@ -106,7 +90,7 @@
       }
       else
          specMetaData = annotatedMetaData;
-      */
+
       
       // Create a merged view
       JBossMetaData mergedMetaData = new JBossMetaData();