[jboss-cvs] JBossAS SVN: r108490 - trunk/ejb3/src/main/java/org/jboss/ejb3/deployers.

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

Author: jaikiran
Date: 2010-10-08 12:22:54 -0400 (Fri, 08 Oct 2010)
New Revision: 108490

Modified:
   trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
Log:
JBAS-8509 Do not merge metadata in parsing deployer

Modified: trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2010-10-08 13:10:44 UTC (rev 108489)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2010-10-08 16:22:54 UTC (rev 108490)
@@ -21,8 +21,6 @@
  */
 package org.jboss.ejb3.deployers;
 
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.metadata.client.spec.ApplicationClientMetaData;
@@ -30,11 +28,7 @@
 /**
  * The jboss-client.xml javaee client parsing deployer
  * 
- * This deployer generates a merged JBossClientMetaData.
- * For application-client.xml ApplicationClientMetaData is retrieved from
- * the attachments. If there is a jboss-client.xml it will be parsed
- * by the SchemaResolverDeployer.
- * If either one is available a merged view will be created.
+ * 
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @author adrian at jboss.org
@@ -51,31 +45,4 @@
       setName("jboss-client.xml");
    }
 
-   /**
-    * Override to create the merged JBossClientMetaData view
-    */
-   @Override
-   protected void createMetaData(DeploymentUnit unit, String name, String suffix) throws DeploymentException
-   {
-      super.createMetaData(unit, name, suffix);
-      JBossClientMetaData jbossMetaData = getMetaData(unit, JBossClientMetaData.class.getName());
-      ApplicationClientMetaData acmd = unit.getAttachment(ApplicationClientMetaData.class);
-      // If either one is available generate a merged view
-      if(jbossMetaData == null && acmd == null)
-         return;
-
-      // If there no JBossClientMetaData was created from a jboss-client.xml, create one
-      if (jbossMetaData == null)
-      {
-         jbossMetaData = new JBossClientMetaData();
-      }
-      // Create a merged view
-      JBossClientMetaData metaData = new JBossClientMetaData();
-      metaData.merge(jbossMetaData, acmd, true);
-      // Register the merged view as the output
-      unit.getTransientManagedObjects().addAttachment(JBossClientMetaData.class.getName(), metaData, getOutput());
-      // Keep the raw parsed as well
-      // TODO: Wolf: Why? (ProfileService?)
-      unit.getTransientManagedObjects().addAttachment("Raw"+JBossClientMetaData.class.getName(), jbossMetaData, getOutput());
-   }
 }