Author: richard.opalka(a)jboss.com
Date: 2009-04-24 11:24:19 -0400 (Fri, 24 Apr 2009)
New Revision: 9878
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java
Log:
[JBWS-1582] fixing issue
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-04-24
15:18:02 UTC (rev 9877)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-04-24
15:24:19 UTC (rev 9878)
@@ -43,6 +43,7 @@
import javax.management.MBeanServerFactory;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.XMLConstants;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -534,6 +535,7 @@
}
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
is);
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder docBuilder = factory.newDocumentBuilder();
ErrorHandler errorHandler = new Validator();
docBuilder.setErrorHandler(errorHandler);
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java 2009-04-24
15:18:02 UTC (rev 9877)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java 2009-04-24
15:24:19 UTC (rev 9878)
@@ -37,6 +37,7 @@
import javax.xml.stream.XMLStreamReader;
import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory;
+import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -69,7 +70,7 @@
// This parsing step should not be necessary, if we could output to a DOMResult
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- return getDocumentBuilder().parse(bais);
+ return DOMUtils.getDocumentBuilder().parse(bais);
}
catch (XMLStreamException ex)
{
@@ -85,19 +86,4 @@
}
}
- private DocumentBuilder getDocumentBuilder()
- {
- try
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setValidating(false);
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- return builder;
- }
- catch (ParserConfigurationException e)
- {
- throw new RuntimeException("Failed to create DocumentBuilder", e);
- }
- }
}
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2009-04-24
15:18:02 UTC (rev 9877)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2009-04-24
15:24:19 UTC (rev 9878)
@@ -25,6 +25,7 @@
import java.net.URL;
import java.io.StringReader;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -86,6 +87,7 @@
factory.setNamespaceAware(true);
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
"http://www.w3.org/2001/XMLSchema");
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
xsdURL.toExternalForm());
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setErrorHandler(errorHandler);
return builder;
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-24
15:18:02 UTC (rev 9877)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2009-04-24
15:24:19 UTC (rev 9878)
@@ -2114,17 +2114,10 @@
private static Document getDocument(InputSource inputSource,
String desc) throws WSDLException
{
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-
- factory.setNamespaceAware(true);
- factory.setValidating(false);
-
try
{
- DocumentBuilder builder = factory.newDocumentBuilder();
- builder.setEntityResolver( new JBossWSEntityResolver() );
+ DocumentBuilder builder = org.jboss.wsf.common.DOMUtils.getDocumentBuilder();
Document doc = builder.parse(inputSource);
-
return doc;
}
catch (RuntimeException e)