[jboss-cvs] JBossAS SVN: r108569 - trunk/server/src/main/java/org/jboss/web/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2010-10-14 06:08:05 -0400 (Thu, 14 Oct 2010)
New Revision: 108569

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
Log:
- JBCTS-1063: If there is no web.xml, it needs to be set to version 3.0.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-10-14 09:46:41 UTC (rev 108568)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-10-14 10:08:05 UTC (rev 108569)
@@ -342,7 +342,11 @@
       // - Merge the fragment metadata into merged fragment meta data
       WebCommonMetaData mergedFragmentMetaData = new WebCommonMetaData();
       if (specMetaData == null)
-         specMetaData = new WebMetaData();
+      {
+         // If there is no web.xml, it has to be considered to be the latest version
+         specMetaData = new Web30MetaData();
+         specMetaData.setVersion("3.0");
+      }
       String key = AnnotationMetaDataDeployer.WEB_ANNOTATED_ATTACHMENT_NAME + ":classes";
       // Augment with meta data from annotations in /WEB-INF/classes
       WebMetaData classesAnnotatedMetaData = unit.getAttachment(key, WebMetaData.class);