Author: thomas.diesler(a)jboss.com Date: 2006-12-23 17:06:16 -0500 (Sat, 23 Dec 2006) New Revision: 1765 Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java Log: partial commit Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-23 22:06:11 UTC (rev 1764) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-23 22:06:16 UTC (rev 1765) @@ -84,8 +84,9 @@ public abstract String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception; - public RewriteResults rewriteWebXml(URL warURL) + public RewriteResults rewriteWebXml(UnifiedDeploymentInfo udi) { + URL warURL = udi.webappURL; File warFile = new File(warURL.getFile()); if (warFile.isDirectory() == false) throw new WSException("Expected a war directory: " + warURL); @@ -105,7 +106,7 @@ throw new WSException("Cannot rename web.xml: " + orgWebXML); FileInputStream stream = new FileInputStream(orgWebXML); - return rewriteWebXml(stream, webXML, null); + return rewriteWebXml(stream, webXML, udi.classLoader); } catch (RuntimeException rte) { Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-23 22:06:11 UTC (rev 1764) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-23 22:06:16 UTC (rev 1765) @@ -26,7 +26,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; import java.util.HashMap; import java.util.Map;