[jboss-cvs] JBossAS SVN: r107945 - trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat.

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

Author: richard.opalka at jboss.com
Date: 2010-09-02 06:51:55 -0400 (Thu, 02 Sep 2010)
New Revision: 107945

Modified:
   trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
Log:
[JBWS-2957] fix AS IL porting layer to handle EJB3s in web archives properly

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2010-09-02 08:08:10 UTC (rev 107944)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2010-09-02 10:51:55 UTC (rev 107945)
@@ -32,6 +32,7 @@
 import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.webservices.integration.util.WebMetaDataHelper;
 import org.jboss.wsf.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
@@ -74,7 +75,11 @@
    void create(final Deployment dep)
    {
       final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
-      final JBossWebMetaData jbossWebMD = new JBossWebMetaData();
+      JBossWebMetaData jbossWebMD = ASHelper.getOptionalAttachment(unit, JBossWebMetaData.class);
+      if (jbossWebMD == null)
+      {
+    	 jbossWebMD = new JBossWebMetaData();
+      }
 
       this.createWebAppDescriptor(dep, jbossWebMD);
       this.createJBossWebAppDescriptor(dep, jbossWebMD);