[jboss-cvs] JBossAS SVN: r69924 - branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42.

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

Author: thomas.diesler at jboss.com
Date: 2008-02-19 04:21:01 -0500 (Tue, 19 Feb 2008)
New Revision: 69924

Modified:
   branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
Log:
JBWS-1985 - EntityResolver not used when reading web.xml during web serivce deployment

Modified: branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
===================================================================
--- branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java	2008-02-19 09:17:19 UTC (rev 69923)
+++ branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java	2008-02-19 09:21:01 UTC (rev 69924)
@@ -33,6 +33,7 @@
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.SAXReader;
 import org.dom4j.io.XMLWriter;
+import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.wsf.common.IOUtils;
 import org.jboss.wsf.spi.deployment.Deployment;
 
@@ -107,8 +108,10 @@
 
       try
       {
+         SAXReader reader = new SAXReader();
+         reader.setEntityResolver(new JBossEntityResolver());
+         
          inputStream = new FileInputStream(input);
-         SAXReader reader = new SAXReader();
          Document document = reader.read(inputStream);
 
          RewriteResults results = desciptorModifier.modifyDescriptor(dep, document);