Author: lmandel
Date: Wed Sep 28 09:36:42 2005
New Revision: 292225
URL: http://svn.apache.org/viewcvs?rev=292225&view=rev
Log:
Added call to validation logic to base and DOM readers.
Modified:
incubator/woden/java/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
Modified: incubator/woden/java/src/org/apache/woden/internal/BaseWSDLReader.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/BaseWSDLReader.java?rev=292225&r1=292224&r2=292225&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/BaseWSDLReader.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/BaseWSDLReader.java Wed
Sep 28 09:36:42 2005
@@ -29,7 +29,7 @@
private ErrorReporter fErrorReporter;
- private ReaderFeatures features;
+ protected ReaderFeatures features;
//Override the default constructor to throw a WSDL exception
protected BaseWSDLReader() throws WSDLException {
Modified: incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java?rev=292225&r1=292224&r2=292225&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java Wed
Sep 28 09:36:42 2005
@@ -82,6 +82,12 @@
Element docEl = doc.getDocumentElement();
DescriptionElement desc = parseDescription(wsdlURL, docEl, null);
+
+ // Validate the model if validation is enabled.
+ if(features.getValue(ReaderFeatures.VALIDATION_FEATURE_ID))
+ {
+ //TODO: Add call to validation logic.
+ }
return desc;
//We can't continue from any caught exceptions, so just wrap them as
@@ -495,7 +501,17 @@
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
- factory.setValidating(false);
+
+ // Enable validation on the XML parser if it has been enabled
+ // for the Woden parser.
+ if(features.getValue(ReaderFeatures.VALIDATION_FEATURE_ID))
+ {
+ factory.setValidating(true);
+ }
+ else
+ {
+ factory.setValidating(false);
+ }
Document doc = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
