Author: dkulp
Date: Mon Dec 3 13:02:49 2007
New Revision: 600689
URL: http://svn.apache.org/viewvc?rev=600689&view=rev
Log:
Merged revisions 600686 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r600686 | dkulp | 2007-12-03 15:57:52 -0500 (Mon, 03 Dec 2007) | 2 lines
[CXF-1219] Allow use of parsers that don't support validation
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java?rev=600689&r1=600688&r2=600689&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
Mon Dec 3 13:02:49 2007
@@ -112,12 +112,17 @@
InputStream is = XMLTypeCreator.class.getResourceAsStream(path);
if (is != null) {
try {
+ aegisDocumentBuilderFactory =
DocumentBuilderFactory.newInstance();
+
+
SchemaFactory schemaFactory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
aegisSchema = schemaFactory.newSchema(new StreamSource(is));
is.close();
-
- aegisDocumentBuilderFactory =
DocumentBuilderFactory.newInstance();
+
aegisDocumentBuilderFactory.setSchema(aegisSchema);
+ } catch (UnsupportedOperationException e) {
+ //Parsers that don't support schema validation
+ LOG.info("Parser doesn't support setSchema. Not validating.",
e);
} catch (IOException ie) {
LOG.error("Error reading Aegis schema", ie);
} catch (FactoryConfigurationError e) {
