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

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

Author: adrian at jboss.org
Date: 2007-07-13 18:39:35 -0400 (Fri, 13 Jul 2007)
New Revision: 64054

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
Fix the bad usage of the StructureMetaData api by the EARStructure deployer - this deployer needs some logging

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2007-07-13 22:10:33 UTC (rev 64053)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2007-07-13 22:39:35 UTC (rev 64054)
@@ -30,7 +30,6 @@
 
 import org.jboss.deployers.spi.structure.ContextInfo;
 import org.jboss.deployers.spi.structure.StructureMetaData;
-import org.jboss.deployers.spi.structure.StructureMetaDataFactory;
 import org.jboss.deployers.vfs.spi.structure.VFSStructuralDeployers;
 import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
 import org.jboss.metadata.XmlFileLoader;
@@ -93,13 +92,14 @@
 
    public boolean determineStructure(VirtualFile root, VirtualFile parent, VirtualFile file, StructureMetaData metaData, VFSStructuralDeployers deployers)
    {
+      ContextInfo context = null;
       boolean valid;
       try
       {
          if (file.isLeaf() == true || file.getName().endsWith(".ear") == false)
             return false;
 
-         ContextInfo context = StructureMetaDataFactory.createContextInfo(file.getPathName(), "META-INF", null);
+         context = createContext(file, "META-INF", metaData);
 
          VirtualFile applicationXml = getMetaDataFile(file, "META-INF/application.xml");
          VirtualFile jbossAppXml = getMetaDataFile(file, "META-INF/jboss-app.xml");
@@ -137,10 +137,6 @@
             }
          }
 
-         // the adding of the context should happen before the lib directory is processed
-         // as the EAR must be the parent to any child DeploymentContexts added in the lib/ directory
-         metaData.addContext(context);
-
          // Add the ear lib contents to the classpath
          String libDir = j2eeMetaData.getLibraryDirectory() == null ? "lib" : j2eeMetaData.getLibraryDirectory();
          if (j2eeMetaData.getLibraryDirectory() != null)