[jboss-cvs] JBossAS SVN: r67899 - trunk/server/src/main/org/jboss/deployment.

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

Author: adrian at jboss.org
Date: 2007-12-04 11:45:14 -0500 (Tue, 04 Dec 2007)
New Revision: 67899

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
[JBAS-5045] - Hack the problem where some processing is not done when there is no jboss.xml

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-12-04 15:40:28 UTC (rev 67898)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-12-04 16:45:14 UTC (rev 67899)
@@ -23,12 +23,13 @@
 
 import java.net.URL;
 import java.util.Set;
+
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 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.ApplicationMetaData;
 import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
@@ -72,23 +73,35 @@
       addOutput(LoaderRepositoryConfig.class);
    }
 
+   // FIXME This should not be here 
    @Override
-   protected void init(VFSDeploymentUnit unit, JBossMetaData metaData, VirtualFile file) throws Exception
+   protected void createMetaData(DeploymentUnit unit, String name, String suffix)
+         throws DeploymentException
    {
-      super.init(unit, metaData, file);
-      // For legacy
-      ApplicationMetaData amd = new ApplicationMetaData(metaData);
-      unit.addAttachment(ApplicationMetaData.class, amd);
+      super.createMetaData(unit, name, suffix);
+      
+      JBossMetaData jbossMetaData = unit.getAttachment(getOutput());
+      EjbJarMetaData ejbJarMetaData = unit.getAttachment(EjbJarMetaData.class);
+      if (ejbJarMetaData != null || jbossMetaData != null)
+      {
 
-      // Wrap in the standardjboss.xml 
-      JBossMetaData stdMetaData = getStandardMetaData(unit);
-      // Save this as a transient(non-managed) attachment
-      unit.addAttachment("standardjboss.xml", stdMetaData);
+         // Wrap in the standardjboss.xml 
+         JBossMetaData stdMetaData = getStandardMetaData();
+         // Save this as a transient(non-managed) attachment
+         unit.addAttachment("standardjboss.xml", stdMetaData);
 
-      // Add the loader repository config
-      LoaderRepositoryConfig loaderRepositoryConfig = createLoaderRepositoryConfig(metaData);
-      if (loaderRepositoryConfig != null)
-         unit.addAttachment(LoaderRepositoryConfig.class.getName(), loaderRepositoryConfig);
+         if (jbossMetaData != null)
+         {
+            // For legacy - but its totally redundant????
+            ApplicationMetaData amd = new ApplicationMetaData(jbossMetaData);
+            unit.addAttachment(ApplicationMetaData.class, amd);
+
+            // Add the loader repository config
+            LoaderRepositoryConfig loaderRepositoryConfig = createLoaderRepositoryConfig(jbossMetaData);
+            if (loaderRepositoryConfig != null)
+               unit.addAttachment(LoaderRepositoryConfig.class.getName(), loaderRepositoryConfig);
+         }
+      }
    }
 
    /**
@@ -147,7 +160,7 @@
       return repositoryConfig;
    }
 
-   private JBossMetaData getStandardMetaData(VFSDeploymentUnit unit) throws DeploymentException
+   private JBossMetaData getStandardMetaData() throws DeploymentException
    {
       if (standardMetaData == null)
       {
@@ -160,7 +173,7 @@
             {
                throw new DeploymentException("standardjboss.xml not found in config dir: " + configPath);
             }
-            standardMetaData = super.parse(unit, stdJBoss, null);
+            standardMetaData = super.parse(null, stdJBoss, null);
          }
          catch (Exception ex)
          {