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

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

Author: richard.opalka at jboss.com
Date: 2010-09-16 06:49:55 -0400 (Thu, 16 Sep 2010)
New Revision: 108171

Modified:
   trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java
Log:
[JBAS-8403] jboss-web.xml is now parsed even if there's no web.xml (e.g. annotation driven Servlets usecase)

Modified: trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java	2010-09-16 10:11:42 UTC (rev 108170)
+++ trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java	2010-09-16 10:49:55 UTC (rev 108171)
@@ -43,7 +43,6 @@
    public JBossWebAppParsingDeployer()
    {
       super(JBossWebMetaData.class);
-      setInput(WebMetaData.class);
       setName("jboss-web.xml");
    }
 
@@ -68,6 +67,12 @@
    {
       setName(webXmlPath);
    }
+   
+   @Override
+   protected boolean accepts(final DeploymentUnit unit) throws DeploymentException
+   {
+      return unit.getSimpleName().endsWith(".war");
+   }
 
    @Override
    protected void createMetaData(DeploymentUnit unit, String name, String suffix) throws DeploymentException