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

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

Author: scott.stark at jboss.org
Date: 2006-10-27 02:24:29 -0400 (Fri, 27 Oct 2006)
New Revision: 57886

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
Simply use deployers.determineStructure(module, metaData) to process each module

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-10-27 06:18:16 UTC (rev 57885)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-10-27 06:24:29 UTC (rev 57886)
@@ -62,9 +62,9 @@
    }
 
    /**
-    * Get the webInfLibFilter.
+    * Get the earLibFilter.
     *
-    * @return the webInfLibFilter.
+    * @return the earLibFilter.
     */
    public VirtualFileFilter getEarLibFilter()
    {
@@ -72,9 +72,9 @@
    }
 
    /**
-    * Set the webInfLibFilter.
+    * Set the earLibFilter.
     *
-    * @param earLibFilter the webInfLibFilter.
+    * @param earLibFilter the earLibFilter.
     * @throws IllegalArgumentException for a null filter
     */
    public void setEarLibFilter(VirtualFileFilter earLibFilter)
@@ -98,6 +98,7 @@
       {
          if( root.isLeaf() == true || root.getName().endsWith(".ear") == false)
             return false;
+
          ContextInfoImpl context = new ContextInfoImpl(root.getPathName());
          context.setMetaDataPath("META-INF");
 
@@ -169,11 +170,13 @@
                   {
                      throw new RuntimeException(fileName + " module listed in application.xml does not exist within .ear " + root.getName());
                   }
-                  ContextInfoImpl moduleContext = new ContextInfoImpl(module.getPathName());
-                  //moduleContext.getTransientAttachments().addAttachment(J2eeModuleMetaData.class, mod);
-                  metaData.addContext(moduleContext);
-                  // Add the manifest locations 
-                  addClassPath(root, module, false, true, moduleContext);
+                  // Ask the deployers to analyze this
+                  if( deployers.determineStructure(module, metaData) == false )
+                  {
+                     throw new RuntimeException(fileName
+                           + " module listed in application.xml is not a recognized deployment, .ear: "
+                           + root.getName());
+                  }
                }
                catch (IOException ignored)
                {
@@ -182,6 +185,7 @@
             }
          }
 
+         valid = true;
       }
       catch(Exception e)
       {