Author: thomas.diesler(a)jboss.com Date: 2006-12-21 16:26:25 -0500 (Thu, 21 Dec 2006) New Revision: 1711 Modified: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java Log: Modified: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-21 21:26:21 UTC (rev 1710) +++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-21 21:26:25 UTC (rev 1711) @@ -34,6 +34,7 @@ import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; +import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; /** * An abstract deployer for JSE Endpoints @@ -61,12 +62,13 @@ // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData InputStream stream = unit.getDeploymentContext().getRoot().findChild("WEB-INF/web.xml").openStream(); - URL webXml = getServiceEndpointPublisher().rewriteWebXml(stream, null, unit.getClassLoader()); - - modifyWebMetaData(unit, webXml); + RewriteResults results = getServiceEndpointPublisher().rewriteWebXml(stream, null, unit.getClassLoader()); + + URL webXML = results.webXML; + modifyWebMetaData(unit, webXML); } - private void modifyWebMetaData(DeploymentUnit unit, URL webXml) throws Exception + private void modifyWebMetaData(DeploymentUnit unit, URL webXML) throws Exception { Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class); if (allMetaData.size() < 1) @@ -95,7 +97,7 @@ } // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData - String webXmlPath = webXml.getPath(); + String webXmlPath = webXML.getPath(); webMetaData.setAltDDPath(webXmlPath); }