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

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

Author: scott.stark at jboss.org
Date: 2007-11-01 21:42:18 -0400 (Thu, 01 Nov 2007)
New Revision: 66669

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
Log:
Always create a JBossClientMetaData instance even if there is no jboss-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-02 01:41:31 UTC (rev 66668)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2007-11-02 01:42:18 UTC (rev 66669)
@@ -27,6 +27,7 @@
 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;
 
 /**
@@ -54,10 +55,15 @@
    {
       super.createMetaData(unit, name, suffix);
       JBossClientMetaData jbossMetaData = getMetaData(unit, JBossClientMetaData.class.getName());
-      if(jbossMetaData == null)
+      ApplicationClientMetaData acmd = unit.getAttachment(ApplicationClientMetaData.class);
+      if(jbossMetaData == null && acmd == null)
          return;
 
-      ApplicationClientMetaData acmd = unit.getAttachment(ApplicationClientMetaData.class);
+      // 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);