Author: alessio.soldano(a)jboss.com Date: 2011-09-15 09:39:41 -0400 (Thu, 15 Sep 2011) New Revision: 15010 Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java Log: Use merged jbossweb metadata, as on AS 7 master (this prevent messing up with jbossweb metadata when ejb3 endpoints are found in war archives) Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java =================================================================== --- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java 2011-09-13 13:49:24 UTC (rev 15009) +++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java 2011-09-15 13:39:41 UTC (rev 15010) @@ -73,7 +73,7 @@ void create(final Deployment dep) { final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class); WarMetaData warMD = ASHelper.getOptionalAttachment(unit, WarMetaData.ATTACHMENT_KEY); - JBossWebMetaData jbossWebMD = warMD != null ? warMD.getJbossWebMetaData() : null; + JBossWebMetaData jbossWebMD = warMD != null ? warMD.getMergedJBossWebMetaData() : null; if (warMD == null) { warMD = new WarMetaData();