[jboss-cvs] JBossAS SVN: r57663 - in trunk/server/src: etc/deploy main/org/jboss/deployment

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

Author: bill.burke at jboss.com
Date: 2006-10-13 13:41:28 -0400 (Fri, 13 Oct 2006)
New Revision: 57663

Added:
   trunk/server/src/etc/deploy/ear-deployer-beans.xml
Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
ear structure

Added: trunk/server/src/etc/deploy/ear-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/ear-deployer-beans.xml	2006-10-13 17:41:01 UTC (rev 57662)
+++ trunk/server/src/etc/deploy/ear-deployer-beans.xml	2006-10-13 17:41:28 UTC (rev 57663)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    JCA Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="EARStructureDeployer" class="org.jboss.deployment.EARStructure">
+      <install bean="MainDeployer" method="addStructureDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeStructureDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+   </bean>
+</deployment>

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-10-13 17:41:01 UTC (rev 57662)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-10-13 17:41:28 UTC (rev 57663)
@@ -96,16 +96,7 @@
             // We require either a WEB-INF or the name ends in .war
             if (root.getName().endsWith(".ear") == false)
             {
-               try
-               {
-                  root.findChild("META-INF");
-                  log.trace("... ok - directory has a META-INF subdirectory");
-               }
-               catch (IOException e)
-               {
-                  log.trace("... no - doesn't look like a ear and no META-INF subdirectory.");
-                  return false;
-               }
+               return false;
             }
             else
             {