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

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

Author: bill.burke at jboss.com
Date: 2006-11-07 18:18:05 -0500 (Tue, 07 Nov 2006)
New Revision: 58194

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
add ear's ContextInfo before any children are added

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-07 22:07:54 UTC (rev 58193)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-07 23:18:05 UTC (rev 58194)
@@ -131,6 +131,10 @@
             in.close();
          }
 
+         // 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)
@@ -166,7 +170,6 @@
 
          // Add the ear manifest locations?
          super.addClassPath(root, root, false, true, context);
-         metaData.addContext(context);
 
          // TODO: need to scan for annotationss
          if( scan )