=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java 2014-04-15 09:59:01 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java 2014-04-15 13:49:04 +0000 @@ -28,21 +28,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.common.Pager; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import org.hisp.dhis.common.DxfNamespaces; -import org.hisp.dhis.common.Pager; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; /** * @author Morten Olav Hansen */ -@JacksonXmlRootElement( localName = "events", namespace = DxfNamespaces.DXF_2_0 ) public class Events { private String program; @@ -83,8 +82,8 @@ this.programInstance = programInstance; } - @JsonProperty( "eventList" ) - @JacksonXmlElementWrapper( localName = "eventList", namespace = DxfNamespaces.DXF_2_0 ) + @JsonProperty + @JacksonXmlElementWrapper( localName = "events", namespace = DxfNamespaces.DXF_2_0 ) @JacksonXmlProperty( localName = "event", namespace = DxfNamespaces.DXF_2_0 ) public List getEvents() {