fix Castor and JAXB validation to match XSD

OpenNMS · Mar 10, 2015 · 33396ac · 33396ac
1 parent 778fd51
commit 33396ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/opennms-config-model/src/main/java/org/opennms/netmgt/xml/eventconf/Events.java b/opennms-config-model/src/main/java/org/opennms/netmgt/xml/eventconf/Events.java
@@ -91,7 +91,7 @@ public interface EventCriteria {
     private Global m_global;
 
 	// @Size(min=1)
-	@XmlElement(name="event", required=true)
+	@XmlElement(name="event", required=false)
     private List<Event> m_events = new ArrayList<Event>();
 
 	// @Size(min=0)

diff --git a/...ig-model/src/main/java/org/opennms/netmgt/xml/eventconf/descriptors/EventsDescriptor.java b/...ig-model/src/main/java/org/opennms/netmgt/xml/eventconf/descriptors/EventsDescriptor.java
@@ -181,7 +181,7 @@ public java.lang.Object newInstance(java.lang.Object parent) {
 
         //-- validation code for: _eventList
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
+        fieldValidator.setMinOccurs(0);
         { //-- local scope
         }
         desc.setValidator(fieldValidator);