Author: richard.opalka(a)jboss.com
Date: 2009-04-28 10:57:29 -0400 (Tue, 28 Apr 2009)
New Revision: 9905
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/WSDLDefinitionsFactory.java
Log:
[JBWS-1582] fixing wsdl readers
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
14:24:30 UTC (rev 9904)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2009-04-28
14:57:29 UTC (rev 9905)
@@ -2115,10 +2115,19 @@
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();
- return builder.parse(inputSource);
+ 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)
{
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2009-04-28
14:24:30 UTC (rev 9904)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2009-04-28
14:57:29 UTC (rev 9905)
@@ -35,7 +35,10 @@
import javax.wsdl.Definition;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import java.io.InputStream;
import java.io.StringWriter;
import java.net.ConnectException;
@@ -164,7 +167,14 @@
InputStream inputStream = new ResourceURL(wsdlLocation).openStream();
try
{
- DocumentBuilder builder = DOMUtils.getDocumentBuilder();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+ factory.setNamespaceAware(true);
+ factory.setValidating(false);
+
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ builder.setEntityResolver( new JBossWSEntityResolver() );
return builder.parse(inputStream);
}
finally
Show replies by date