=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Pager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Pager.java 2011-12-19 17:20:37 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Pager.java 2011-12-19 17:26:54 +0000 @@ -1,5 +1,32 @@ package org.hisp.dhis.common; +/* + * Copyright (c) 2004-2011, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import org.codehaus.jackson.annotate.JsonProperty; import javax.xml.bind.annotation.XmlAccessType; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversations.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversations.java 2011-12-16 13:38:59 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversations.java 2011-12-19 17:26:54 +0000 @@ -32,6 +32,7 @@ import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.BaseLinkableObject; import org.hisp.dhis.common.Dxf2Namespace; +import org.hisp.dhis.common.Pager; import org.hisp.dhis.common.adapter.MessageConversationXmlAdapter; import javax.xml.bind.annotation.XmlAccessType; @@ -49,8 +50,22 @@ @XmlAccessorType( value = XmlAccessType.NONE ) public class MessageConversations extends BaseLinkableObject { + private Pager pager; + private List messageConversations = new ArrayList(); + @XmlElement + @JsonProperty + public Pager getPager() + { + return pager; + } + + public void setPager( Pager pager ) + { + this.pager = pager; + } + @XmlElement( name = "messageConversation" ) @XmlJavaTypeAdapter( MessageConversationXmlAdapter.class ) @JsonProperty( value = "messageConversations" )