summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java4
-rw-r--r--utils/src/main/java/at/gv/egiz/validation/ValidationEventLogger.java55
2 files changed, 59 insertions, 0 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
index 1ef94e81..fe27bc54 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
@@ -27,6 +27,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshalException;
import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.ValidationEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
@@ -48,6 +49,8 @@ import at.gv.egiz.bku.slexceptions.SLRuntimeException;
import at.gv.egiz.bku.utils.DebugReader;
import at.gv.egiz.slbinding.RedirectEventFilter;
import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
+import at.gv.egiz.validation.ValidationEventLogger;
+import javax.xml.bind.ValidationEventHandler;
public class SLCommandFactory {
@@ -276,6 +279,7 @@ public class SLCommandFactory {
unmarshaller.setSchema(slSchema);
}
log.trace("Before unmarshal().");
+ unmarshaller.setEventHandler(new ValidationEventLogger());
object = unmarshaller.unmarshal(filteredReader);
log.trace("After unmarshal().");
} catch (UnmarshalException e) {
diff --git a/utils/src/main/java/at/gv/egiz/validation/ValidationEventLogger.java b/utils/src/main/java/at/gv/egiz/validation/ValidationEventLogger.java
new file mode 100644
index 00000000..0fafdd7f
--- /dev/null
+++ b/utils/src/main/java/at/gv/egiz/validation/ValidationEventLogger.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package at.gv.egiz.validation;
+
+import javax.xml.bind.ValidationEvent;
+import javax.xml.bind.ValidationEventHandler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ValidationEventLogger implements ValidationEventHandler {
+
+ protected static final Log log = LogFactory.getLog(ValidationEventLogger.class);
+
+ /**
+ *
+ * @param event
+ * @return false, terminate the current unmarshal, validate, or marshal operation after handling this warning/error
+ * (except for WARNING validation events)
+ */
+ @Override
+ public boolean handleEvent(ValidationEvent event) {
+ switch (event.getSeverity()) {
+ case ValidationEvent.WARNING:
+ log.info(event.getMessage());
+ return true;
+ case ValidationEvent.ERROR:
+ log.warn(event.getMessage());
+ return false;
+ case ValidationEvent.FATAL_ERROR:
+ log.error(event.getMessage());
+ return false;
+ default:
+ log.debug(event.getMessage());
+ return false;
+ }
+ }
+}