You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/06 20:21:08 UTC
svn commit: r563211 - in
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation:
DefaultValidationErrorHandler.java SchemaValidationException.java
Author: jstrachan
Date: Mon Aug 6 11:21:08 2007
New Revision: 563211
URL: http://svn.apache.org/viewvc?view=rev&rev=563211
Log:
refactor to make the classes work with any kind of schema
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java?view=diff&rev=563211&r1=563210&r2=563211
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java Mon Aug 6 11:21:08 2007
@@ -58,4 +58,10 @@
throw new SchemaValidationException(exchange, schema, fatalErrors, errors, warnings);
}
}
+
+ public void handleErrors(Exchange exchange, Object schema) throws ValidationException {
+ if (!isValid()) {
+ throw new SchemaValidationException(exchange, schema, fatalErrors, errors, warnings);
+ }
+ }
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java?view=diff&rev=563211&r1=563210&r2=563211
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java Mon Aug 6 11:21:08 2007
@@ -28,12 +28,12 @@
* @version $Revision: $
*/
public class SchemaValidationException extends ValidationException {
- private Schema schema;
+ private Object schema;
private List<SAXParseException> fatalErrors;
private List<SAXParseException> errors;
private List<SAXParseException> warnings;
- public SchemaValidationException(Exchange exchange, Schema schema, List<SAXParseException> fatalErrors, List<SAXParseException> errors, List<SAXParseException> warnings) {
+ public SchemaValidationException(Exchange exchange, Object schema, List<SAXParseException> fatalErrors, List<SAXParseException> errors, List<SAXParseException> warnings) {
super(exchange, message(schema, fatalErrors, errors, warnings));
this.schema = schema;
this.fatalErrors = fatalErrors;
@@ -46,7 +46,7 @@
*
* @return the schema that failed
*/
- public Schema getSchema() {
+ public Object getSchema() {
return schema;
}
@@ -78,7 +78,7 @@
}
- protected static String message(Schema schema, List<SAXParseException> fatalErrors, List<SAXParseException> errors, List<SAXParseException> warnings) {
+ protected static String message(Object schema, List<SAXParseException> fatalErrors, List<SAXParseException> errors, List<SAXParseException> warnings) {
StringBuffer buffer = new StringBuffer("Validation failed for: " + schema);
if (!fatalErrors.isEmpty()) {
buffer.append(" fatal errors: ");