svn commit: r787595 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation: DefaultValidationErrorHandler.java ValidatingProcessor.java ValidatorErrorHandler.java

[ro...@apache.org]

Author: romkal
Date: Tue Jun 23 09:23:10 2009
New Revision: 787595

URL: http://svn.apache.org/viewvc?rev=787595&view=rev
Log:
CAMEL-1745: Changed schema validation to use SaxSource instead of DOM source

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java?rev=787595&r1=787594&r2=787595&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java Tue Jun 23 09:23:10 2009
@@ -19,15 +19,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXResult;
 import javax.xml.validation.Schema;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * A default error handler which just stores all the errors so they can be reported or transformed.
@@ -71,7 +71,7 @@
         return errors.isEmpty() && fatalErrors.isEmpty();
     }
 
-    public void handleErrors(Exchange exchange, Schema schema, DOMResult result) throws ValidationException {
+    public void handleErrors(Exchange exchange, Schema schema, SAXResult result) throws ValidationException {
         if (!isValid()) {
             throw new SchemaValidationException(exchange, schema, fatalErrors, errors, warnings);
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java?rev=787595&r1=787594&r2=787595&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java Tue Jun 23 09:23:10 2009
@@ -22,16 +22,15 @@
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.xml.sax.SAXException;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.xml.sax.SAXException;
 
 /**
  * A processor which validates the XML version of the inbound message body
@@ -53,7 +52,7 @@
         Schema schema = getSchema();
         Validator validator = schema.newValidator();
 
-        Source source = exchange.getIn().getBody(DOMSource.class);
+        Source source = exchange.getIn().getBody(SAXSource.class);
         if (source == null) {
             throw new NoXmlBodyValidationException(exchange);
         }
@@ -63,7 +62,7 @@
         ValidatorErrorHandler handler = errorHandler.getClass().newInstance();
         validator.setErrorHandler(handler);
 
-        DOMResult result = new DOMResult();
+        SAXResult result = new SAXResult();
         validator.validate(source, result);
 
         handler.handleErrors(exchange, schema, result);

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java?rev=787595&r1=787594&r2=787595&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java Tue Jun 23 09:23:10 2009
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.processor.validation;
 
-import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXResult;
 import javax.xml.validation.Schema;
 
-import org.xml.sax.ErrorHandler;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
+import org.xml.sax.ErrorHandler;
 
 /**
  * Validator error handler.
@@ -44,5 +43,5 @@
      * @param result   the result
      * @throws ValidationException is thrown in case of validatation errors
      */
-    void handleErrors(Exchange exchange, Schema schema, DOMResult result) throws ValidationException;
+    void handleErrors(Exchange exchange, Schema schema, SAXResult result) throws ValidationException;
 }