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

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

Author: wolfc
Date: 2007-11-20 04:29:16 -0500 (Tue, 20 Nov 2007)
New Revision: 67281

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
Log:
EJBTHREE-1067: fixed regression for optional application-client.xml

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2007-11-20 08:26:34 UTC (rev 67280)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2007-11-20 09:29:16 UTC (rev 67281)
@@ -24,14 +24,17 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * 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
@@ -43,7 +46,8 @@
    public JBossClientParsingDeployer()
    {
       super(JBossClientMetaData.class);
-      super.setInput(ApplicationClientMetaData.class);
+      // If an ApplicationClientMetaData is available use it
+      setInputs(ApplicationClientMetaData.class);
       setName("jboss-client.xml");
    }
 
@@ -56,6 +60,7 @@
       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;
 
@@ -70,6 +75,7 @@
       // 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());
    }
 }