[jbossws-commits] JBossWS SVN: r9898 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-04-28 05:41:45 -0400 (Tue, 28 Apr 2009)
New Revision: 9898

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java
Log:
[JBWS-1582] WSDL can contain DOCTYPE declarations

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java	2009-04-28 06:52:15 UTC (rev 9897)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java	2009-04-28 09:41:45 UTC (rev 9898)
@@ -44,6 +44,7 @@
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLLocator;
 import javax.wsdl.xml.WSDLReader;
+import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -2114,10 +2115,18 @@
 	private static Document getDocument(InputSource inputSource,
 													String desc) throws WSDLException
 	{
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+		factory.setNamespaceAware(true);
+		factory.setValidating(false);
+
 		try
 		{
-			DocumentBuilder builder = org.jboss.wsf.common.DOMUtils.getDocumentBuilder();
+	      factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			builder.setEntityResolver( new JBossWSEntityResolver() );
 			Document doc = builder.parse(inputSource);
+
 			return doc;
 		}
 		catch (RuntimeException e)