=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java 2012-03-19 22:10:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java 2012-03-27 17:38:48 +0000 @@ -80,7 +80,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getValueType() { return valueType; @@ -93,7 +93,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isMandatory() { return mandatory; @@ -106,7 +106,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isDataElementAttribute() { return dataElementAttribute; @@ -119,7 +119,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isIndicatorAttribute() { return indicatorAttribute; @@ -132,7 +132,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isOrganisationUnitAttribute() { return organisationUnitAttribute; @@ -145,7 +145,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isUserAttribute() { return userAttribute; @@ -166,9 +166,6 @@ this.attributeValues = attributeValues; } - @JsonProperty - @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty public Integer getSortOrder() { return sortOrder; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java 2012-03-19 22:10:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java 2012-03-27 17:38:48 +0000 @@ -82,7 +82,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public Attribute getAttribute() { return attribute; @@ -95,7 +95,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getValue() { return value; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2012-03-19 21:27:41 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2012-03-27 17:38:48 +0000 @@ -329,7 +329,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDomainAxisLabel() { return domainAxisLabel; @@ -342,7 +342,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getRangeAxisLabel() { return rangeAxisLabel; @@ -355,7 +355,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getType() { return type; @@ -368,7 +368,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getSeries() { return series; @@ -381,7 +381,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getCategory() { return category; @@ -394,7 +394,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getFilter() { return filter; @@ -407,7 +407,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isHideLegend() { return hideLegend; @@ -420,7 +420,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isRegression() { return regression; @@ -433,7 +433,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Double getTargetLineValue() { return targetLineValue; @@ -446,7 +446,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getTargetLineLabel() { return targetLineLabel; @@ -459,7 +459,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Double getBaseLineValue() { return baseLineValue; @@ -472,7 +472,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getBaseLineLabel() { return baseLineLabel; @@ -485,7 +485,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isHideSubtitle() { return hideSubtitle; @@ -499,8 +499,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicators" ) - @JacksonXmlProperty( localName = "indicator" ) + @JacksonXmlElementWrapper( localName = "indicators", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicator", namespace = Dxf2Namespace.NAMESPACE ) public List getIndicators() { return indicators; @@ -514,8 +514,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElements" ) - @JacksonXmlProperty( localName = "dataElement" ) + @JacksonXmlElementWrapper( localName = "dataElements", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElement", namespace = Dxf2Namespace.NAMESPACE ) public List getDataElements() { return dataElements; @@ -529,8 +529,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataSets" ) - @JacksonXmlProperty( localName = "dataSet" ) + @JacksonXmlElementWrapper( localName = "dataSets", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataSet", namespace = Dxf2Namespace.NAMESPACE ) public List getDataSets() { return dataSets; @@ -544,8 +544,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnits" ) - @JacksonXmlProperty( localName = "organisationUnit" ) + @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnit", namespace = Dxf2Namespace.NAMESPACE ) public List getOrganisationUnits() { return organisationUnits; @@ -558,7 +558,7 @@ @JsonProperty( value = "relativePeriods" ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public RelativePeriods getRelatives() { return relatives; @@ -571,7 +571,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isUserOrganisationUnit() { return userOrganisationUnit; @@ -585,7 +585,7 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public User getUser() { return user; @@ -598,7 +598,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public OrganisationUnitGroupSet getOrganisationUnitGroupSet() { return organisationUnitGroupSet; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseCollection.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseCollection.java 2012-03-16 10:07:49 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseCollection.java 2012-03-27 17:38:48 +0000 @@ -29,10 +29,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** * @author Morten Olav Hansen */ +@JacksonXmlRootElement( localName = "collection", namespace = Dxf2Namespace.NAMESPACE ) public class BaseCollection implements LinkableObject { @@ -50,6 +52,7 @@ //------------------------------------------------------------------------------------- @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Pager getPager() { return pager; @@ -75,7 +78,7 @@ //------------------------------------------------------------------------------------- @JsonProperty - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public String getLink() { if ( linkableObject == null ) @@ -98,84 +101,4 @@ linkableObject.setLink( link ); } } - - /** - * Get current page. - * - * @return Current page - */ - public Integer getPage() - { - if ( pager == null ) - { - return null; - } - - return pager.getPage(); - } - - /** - * Total number of items. - * - * @return number of items in collection - */ - public Integer getTotal() - { - if ( pager == null ) - { - return null; - } - - return pager.getTotal(); - } - - /** - * How many items per page. - * - * @return items per page - */ - public Integer getPageSize() - { - if ( pager == null ) - { - return null; - } - - return pager.getPageSize(); - } - - /** - * How many pages in total. - * - * @return total page count - */ - public Integer getPageCount() - { - if ( pager == null ) - { - return null; - } - - return pager.getPageCount(); - } - - public String getNextPage() - { - if ( pager == null ) - { - return null; - } - - return pager.getNextPage(); - } - - public String getPrevPage() - { - if ( pager == null ) - { - return null; - } - - return pager.getPrevPage(); - } } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2012-03-27 17:38:48 +0000 @@ -114,7 +114,7 @@ @JsonProperty( value = "internalId" ) @JsonView( {DetailedView.class, IdentifiableObjectView.class, ExportView.class} ) - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public int getId() { return id; @@ -126,7 +126,7 @@ } @JsonProperty( value = "id" ) - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public String getUid() { return uid; @@ -139,7 +139,7 @@ @JsonProperty @JsonView( {DetailedView.class, IdentifiableObjectView.class, ExportView.class} ) - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public String getCode() { return code; @@ -152,7 +152,7 @@ @JsonProperty @JsonView( {DetailedView.class, IdentifiableObjectView.class, ExportView.class} ) - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public String getName() { return name; @@ -165,7 +165,7 @@ @JsonProperty @JsonView( {DetailedView.class, IdentifiableObjectView.class, ExportView.class} ) - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public Date getLastUpdated() { return lastUpdated; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java 2012-03-16 10:07:49 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java 2012-03-27 17:38:48 +0000 @@ -29,10 +29,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** * @author Morten Olav Hansen */ +@JacksonXmlRootElement( localName = "linkableObject", namespace = Dxf2Namespace.NAMESPACE ) public class BaseLinkableObject implements LinkableObject { @@ -43,7 +45,7 @@ private transient String link; @JsonProperty - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public String getLink() { return link; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java 2012-03-27 17:38:48 +0000 @@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; @@ -91,6 +92,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getAlternativeName() { return alternativeName; @@ -103,6 +105,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getShortName() { return shortName; @@ -115,6 +118,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDescription() { return description; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java 2012-03-12 14:27:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java 2012-03-27 17:38:48 +0000 @@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.common.view.DetailedView; @@ -96,6 +97,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getName() { return name; @@ -108,6 +110,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getColumn() { return column; @@ -120,6 +123,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getType() { return type; @@ -132,6 +136,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isHidden() { return hidden; @@ -144,6 +149,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isMeta() { return meta; === 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 2012-03-26 18:11:26 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Pager.java 2012-03-27 17:38:48 +0000 @@ -28,6 +28,7 @@ */ import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** @@ -87,12 +88,14 @@ } @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getPage() { return page; } @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getTotal() { return total; @@ -104,6 +107,7 @@ * @return Number of items per page. */ @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getPageSize() { return pageSize; @@ -115,6 +119,7 @@ * @return Total number of pages */ @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getPageCount() { int pageCount = 1; @@ -140,6 +145,7 @@ } @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getNextPage() { return nextPage; @@ -151,6 +157,7 @@ } @JsonProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getPrevPage() { return prevPage; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2012-03-26 18:11:26 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2012-03-27 17:38:48 +0000 @@ -389,7 +389,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getFormName() { return formName; @@ -402,7 +402,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isActive() { return active; @@ -428,7 +428,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getType() { return type; @@ -441,7 +441,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getAggregationOperator() { return aggregationOperator; @@ -455,6 +455,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElementCategoryCombo getCategoryCombo() { return categoryCombo; @@ -465,9 +466,6 @@ this.categoryCombo = categoryCombo; } - @JsonProperty - @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty public Integer getSortOrder() { return sortOrder; @@ -480,7 +478,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getUrl() { return url; @@ -494,8 +492,8 @@ @JsonProperty( value = "dataElementGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "dataElementGroups" ) - @JacksonXmlProperty( localName = "dataElementGroup" ) + @JacksonXmlElementWrapper( localName = "dataElementGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElementGroup", namespace = Dxf2Namespace.NAMESPACE ) public Set getGroups() { return groups; @@ -509,8 +507,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "dataSets" ) - @JacksonXmlProperty( localName = "dataSet" ) + @JacksonXmlElementWrapper( localName = "dataSets", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataSet", namespace = Dxf2Namespace.NAMESPACE ) public Set getDataSets() { return dataSets; @@ -523,7 +521,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public List getAggregationLevels() { return aggregationLevels; @@ -536,7 +534,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isZeroIsSignificant() { return zeroIsSignificant; @@ -549,7 +547,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getNumberType() { return numberType; @@ -562,8 +560,8 @@ @JsonProperty( value = "attributes" ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "attributes" ) - @JacksonXmlProperty( localName = "attribute" ) + @JacksonXmlElementWrapper( localName = "attributes", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "attribute", namespace = Dxf2Namespace.NAMESPACE ) public Set getAttributeValues() { return attributeValues; @@ -577,7 +575,7 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public OptionSet getOptionSet() { return optionSet; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java 2012-03-27 17:38:48 +0000 @@ -154,8 +154,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "categoryOptions" ) - @JacksonXmlProperty( localName = "categoryOption" ) + @JacksonXmlElementWrapper( localName = "categoryOptions", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "categoryOption", namespace = Dxf2Namespace.NAMESPACE ) public List getCategoryOptions() { return categoryOptions; @@ -169,7 +169,7 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Concept getConcept() { return concept; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2012-03-27 17:38:48 +0000 @@ -217,8 +217,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "categories" ) - @JacksonXmlProperty( localName = "category" ) + @JacksonXmlElementWrapper( localName = "categories", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "category", namespace = Dxf2Namespace.NAMESPACE ) public List getCategories() { return categories; @@ -232,8 +232,8 @@ @JsonProperty( value = "categoryOptionCombo" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "categoryOptionCombos" ) - @JacksonXmlProperty( localName = "categoryOptionCombo" ) + @JacksonXmlElementWrapper( localName = "categoryOptionCombos", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "categoryOptionCombo", namespace = Dxf2Namespace.NAMESPACE ) public Set getOptionCombos() { return optionCombos; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2012-03-27 17:38:48 +0000 @@ -138,6 +138,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElementCategory getCategory() { return category; @@ -161,8 +162,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "categoryOptionCombos" ) - @JacksonXmlProperty( localName = "categoryOptionCombo" ) + @JacksonXmlElementWrapper( localName = "categoryOptionCombos", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "categoryOptionCombo", namespace = Dxf2Namespace.NAMESPACE ) public Set getCategoryOptionCombos() { return categoryOptionCombos; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2012-03-26 18:11:26 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2012-03-27 17:38:48 +0000 @@ -300,7 +300,7 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElementCategoryCombo getCategoryCombo() { return categoryCombo; @@ -314,8 +314,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "categoryOptions" ) - @JacksonXmlProperty( localName = "categoryOption" ) + @JacksonXmlElementWrapper( localName = "categoryOptions", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "categoryOption", namespace = Dxf2Namespace.NAMESPACE ) public List getCategoryOptions() { return categoryOptions; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2012-03-27 17:38:48 +0000 @@ -148,8 +148,8 @@ @JsonProperty( value = "dataElements" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElements" ) - @JacksonXmlProperty( localName = "dataElement" ) + @JacksonXmlElementWrapper( localName = "dataElements", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElement", namespace = Dxf2Namespace.NAMESPACE ) public Set getMembers() { return members; @@ -163,6 +163,7 @@ @JsonProperty( value = "dataElementGroupSet" ) @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElementGroupSet getGroupSet() { return groupSet; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2012-03-27 17:38:48 +0000 @@ -200,6 +200,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDescription() { return description; @@ -212,6 +213,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean isCompulsory() { if ( compulsory == null ) @@ -230,8 +232,8 @@ @JsonProperty( value = "dataElementGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElementGroups" ) - @JacksonXmlProperty( localName = "dataElementGroup" ) + @JacksonXmlElementWrapper( localName = "dataElementGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElementGroup", namespace = Dxf2Namespace.NAMESPACE ) public List getMembers() { return members; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2012-03-20 14:42:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2012-03-27 17:38:48 +0000 @@ -313,7 +313,7 @@ @JsonSerialize( using = JacksonPeriodTypeSerializer.class ) @JsonDeserialize( using = JacksonPeriodTypeDeserializer.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public PeriodType getPeriodType() { return periodType; @@ -326,7 +326,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataEntryForm getDataEntryForm() { return dataEntryForm; @@ -340,8 +340,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElements" ) - @JacksonXmlProperty( localName = "dataElement" ) + @JacksonXmlElementWrapper( localName = "dataElements", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElement", namespace = Dxf2Namespace.NAMESPACE ) public Set getDataElements() { return dataElements; @@ -355,8 +355,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicators" ) - @JacksonXmlProperty( localName = "indicator" ) + @JacksonXmlElementWrapper( localName = "indicators", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicator", namespace = Dxf2Namespace.NAMESPACE ) public Set getIndicators() { return indicators; @@ -369,6 +369,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Set getCompulsoryDataElementOperands() { return compulsoryDataElementOperands; @@ -382,8 +383,8 @@ @JsonProperty( value = "organisationUnits" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnits" ) - @JacksonXmlProperty( localName = "organisationUnit" ) + @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnit", namespace = Dxf2Namespace.NAMESPACE ) public Set getSources() { return sources; @@ -394,9 +395,6 @@ this.sources = sources; } - @JsonProperty - @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty public Integer getSortOrder() { return sortOrder; @@ -409,8 +407,8 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "sections" ) - @JacksonXmlProperty( localName = "section" ) + @JacksonXmlElementWrapper( localName = "sections", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "section", namespace = Dxf2Namespace.NAMESPACE ) public Set
getSections() { return sections; @@ -423,7 +421,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isMobile() { return mobile; @@ -436,7 +434,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getVersion() { return version; @@ -449,7 +447,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getExpiryDays() { return expiryDays; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2012-03-20 09:04:21 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2012-03-27 17:38:48 +0000 @@ -173,8 +173,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElements" ) - @JacksonXmlProperty( localName = "dataElement" ) + @JacksonXmlElementWrapper( localName = "dataElements", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElement", namespace = Dxf2Namespace.NAMESPACE ) public List getDataElements() { return dataElements; @@ -192,7 +192,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getSortOrder() { return sortOrder; @@ -205,8 +205,8 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "greyedFields" ) - @JacksonXmlProperty( localName = "greyedField" ) + @JacksonXmlElementWrapper( localName = "greyedFields", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "greyedField", namespace = Dxf2Namespace.NAMESPACE ) public Set getGreyedFields() { return greyedFields; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java 2012-03-19 22:39:21 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java 2012-03-27 17:38:48 +0000 @@ -92,7 +92,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getUrl() { return url; @@ -105,7 +105,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isExternal() { return external; @@ -118,7 +118,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getContentType() { return contentType; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java 2012-03-19 22:10:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java 2012-03-27 17:38:48 +0000 @@ -162,6 +162,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isAnnualized() { return annualized; @@ -175,6 +176,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public IndicatorType getIndicatorType() { return indicatorType; @@ -187,6 +189,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getNumerator() { return numerator; @@ -199,6 +202,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getNumeratorDescription() { return numeratorDescription; @@ -211,6 +215,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getExplodedNumerator() { return explodedNumerator; @@ -223,6 +228,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDenominator() { return denominator; @@ -235,6 +241,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDenominatorDescription() { return denominatorDescription; @@ -247,6 +254,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getExplodedDenominator() { return explodedDenominator; @@ -257,8 +265,6 @@ this.explodedDenominator = explodedDenominator; } - @JsonProperty - @JsonView( {DetailedView.class, ExportView.class} ) public Integer getSortOrder() { return sortOrder; @@ -271,6 +277,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getUrl() { return url; @@ -284,8 +291,8 @@ @JsonProperty( value = "indicatorGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "indicatorGroups" ) - @JacksonXmlProperty( localName = "indicatorGroup" ) + @JacksonXmlElementWrapper( localName = "indicatorGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicatorGroup", namespace = Dxf2Namespace.NAMESPACE ) public Set getGroups() { return groups; @@ -299,8 +306,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "dataSets" ) - @JacksonXmlProperty( localName = "dataSet" ) + @JacksonXmlElementWrapper( localName = "dataSets", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataSet", namespace = Dxf2Namespace.NAMESPACE ) public Set getDataSets() { return dataSets; @@ -313,8 +320,8 @@ @JsonProperty( value = "attributes" ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "attributes" ) - @JacksonXmlProperty( localName = "attribute" ) + @JacksonXmlElementWrapper( localName = "attributes", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "attribute", namespace = Dxf2Namespace.NAMESPACE ) public Set getAttributeValues() { return attributeValues; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java 2012-03-27 17:38:48 +0000 @@ -148,8 +148,8 @@ @JsonProperty( value = "indicators" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicators" ) - @JacksonXmlProperty( localName = "indicator" ) + @JacksonXmlElementWrapper( localName = "indicators", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicator", namespace = Dxf2Namespace.NAMESPACE ) public Set getMembers() { return members; @@ -163,8 +163,8 @@ @JsonProperty( value = "indicatorGroupSet" ) @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicatorGroupSets" ) - @JacksonXmlProperty( localName = "indicatorGroupSet" ) + @JacksonXmlElementWrapper( localName = "indicatorGroupSets", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicatorGroupSet", namespace = Dxf2Namespace.NAMESPACE ) public IndicatorGroupSet getGroupSet() { return groupSet; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java 2012-03-27 17:38:48 +0000 @@ -194,6 +194,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDescription() { return description; @@ -206,6 +207,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean isCompulsory() { if ( compulsory == null ) @@ -224,8 +226,8 @@ @JsonProperty( value = "indicatorGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicatorGroups" ) - @JacksonXmlProperty( localName = "indicatorGroup" ) + @JacksonXmlElementWrapper( localName = "indicatorGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicatorGroup", namespace = Dxf2Namespace.NAMESPACE ) public List getMembers() { return members; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java 2012-03-19 23:09:27 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java 2012-03-27 17:38:48 +0000 @@ -112,7 +112,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public int getFactor() { return factor; @@ -125,7 +125,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public boolean isNumber() { return number; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java 2012-03-19 22:10:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java 2012-03-27 17:38:48 +0000 @@ -116,7 +116,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getType() { return type; @@ -129,7 +129,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getUrl() { return url; @@ -142,7 +142,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getLayers() { return layers; @@ -155,7 +155,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getTime() { return time; @@ -168,7 +168,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getFillColor() { return fillColor; @@ -181,7 +181,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public double getFillOpacity() { return fillOpacity; @@ -194,7 +194,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getStrokeColor() { return strokeColor; @@ -207,7 +207,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getStrokeWidth() { return strokeWidth; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegend.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegend.java 2012-03-19 18:32:42 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegend.java 2012-03-27 17:38:48 +0000 @@ -103,7 +103,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Double getStartValue() { return startValue; @@ -116,7 +116,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Double getEndValue() { return endValue; @@ -129,7 +129,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getColor() { return color; @@ -142,7 +142,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getImage() { return image; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java 2012-03-19 18:32:42 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java 2012-03-27 17:38:48 +0000 @@ -114,7 +114,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getType() { return type; @@ -127,7 +127,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getSymbolizer() { return symbolizer; @@ -141,8 +141,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "mapLegends" ) - @JacksonXmlProperty( localName = "mapLegend" ) + @JacksonXmlElementWrapper( localName = "mapLegends", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "mapLegend", namespace = Dxf2Namespace.NAMESPACE ) public Set getMapLegends() { return mapLegends; @@ -156,8 +156,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicators" ) - @JacksonXmlProperty( localName = "indicator" ) + @JacksonXmlElementWrapper( localName = "indicators", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicator", namespace = Dxf2Namespace.NAMESPACE ) public Set getIndicators() { return indicators; @@ -171,8 +171,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElements" ) - @JacksonXmlProperty( localName = "dataElement" ) + @JacksonXmlElementWrapper( localName = "dataElements", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElement", namespace = Dxf2Namespace.NAMESPACE ) public Set getDataElements() { return dataElements; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java 2012-03-26 13:00:42 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java 2012-03-27 17:38:48 +0000 @@ -29,11 +29,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.Dxf2Namespace; +import org.hisp.dhis.common.adapter.JacksonPeriodTypeDeserializer; +import org.hisp.dhis.common.adapter.JacksonPeriodTypeSerializer; import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; import org.hisp.dhis.dataelement.DataElement; @@ -181,7 +184,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public User getUser() { return user; @@ -194,7 +197,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getMapValueType() { return mapValueType; @@ -208,7 +211,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public IndicatorGroup getIndicatorGroup() { return indicatorGroup; @@ -222,7 +225,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Indicator getIndicator() { return indicator; @@ -236,7 +239,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElementGroup getDataElementGroup() { return dataElementGroup; @@ -250,7 +253,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElement getDataElement() { return dataElement; @@ -261,6 +264,11 @@ this.dataElement = dataElement; } + @JsonProperty + @JsonSerialize( using = JacksonPeriodTypeSerializer.class ) + @JsonDeserialize( using = JacksonPeriodTypeDeserializer.class ) + @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public PeriodType getPeriodType() { return periodType; @@ -274,7 +282,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Period getPeriod() { return period; @@ -288,7 +296,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public OrganisationUnit getParentOrganisationUnit() { return parentOrganisationUnit; @@ -302,7 +310,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public OrganisationUnitLevel getOrganisationUnitLevel() { return organisationUnitLevel; @@ -315,7 +323,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getMapLegendType() { return mapLegendType; @@ -328,7 +336,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getMethod() { return method; @@ -341,7 +349,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getClasses() { return classes; @@ -354,7 +362,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getBounds() { return bounds; @@ -367,7 +375,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getColorLow() { return colorLow; @@ -380,7 +388,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getColorHigh() { return colorHigh; @@ -394,7 +402,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public MapLegendSet getMapLegendSet() { return mapLegendSet; @@ -407,7 +415,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getRadiusLow() { return radiusLow; @@ -420,7 +428,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getRadiusHigh() { return radiusHigh; @@ -433,7 +441,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getLongitude() { return longitude; @@ -446,7 +454,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getLatitude() { return latitude; @@ -459,7 +467,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getZoom() { return zoom; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2012-03-19 18:32:42 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2012-03-27 17:38:48 +0000 @@ -245,7 +245,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getSubject() { return subject; @@ -258,8 +258,8 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "userMessages" ) - @JacksonXmlProperty( localName = "userMessage" ) + @JacksonXmlElementWrapper( localName = "userMessages", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "userMessage", namespace = Dxf2Namespace.NAMESPACE ) public Set getUserMessages() { return userMessages; @@ -273,8 +273,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "messages" ) - @JacksonXmlProperty( localName = "message" ) + @JacksonXmlElementWrapper( localName = "messages", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "message", namespace = Dxf2Namespace.NAMESPACE ) public List getMessages() { return messages; @@ -288,7 +288,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public User getLastSender() { return lastSender; @@ -301,7 +301,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Date getLastMessage() { return lastMessage; @@ -316,8 +316,6 @@ // Transient fields //------------------------------------------------------------------------------------------------------- - @JsonProperty - @JsonView( {DetailedView.class} ) public boolean isRead() { return read; @@ -328,8 +326,6 @@ this.read = read; } - @JsonProperty - @JsonView( {DetailedView.class} ) public boolean isFollowUp() { return followUp; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2012-03-19 22:10:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2012-03-27 17:38:48 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -74,8 +75,6 @@ private static final String NAME_SEPARATOR = " - "; - private Set children = new HashSet(); - private OrganisationUnit parent; private Date openingDate; @@ -120,6 +119,8 @@ // Transient fields // ------------------------------------------------------------------------- + private Set children = new HashSet(); + private transient boolean currentParent; private transient int level; @@ -525,20 +526,10 @@ // Getters and setters // ------------------------------------------------------------------------- - public Set getChildren() - { - return children; - } - - public void setChildren( Set children ) - { - this.children = children; - } - @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public OrganisationUnit getParent() { return parent; @@ -549,6 +540,7 @@ this.parent = parent; } + @JsonIgnore public String getAlternativeName() { return getShortName(); @@ -561,7 +553,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Date getOpeningDate() { return openingDate; @@ -574,7 +566,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Date getClosedDate() { return closedDate; @@ -587,7 +579,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isActive() { return active; @@ -600,7 +592,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getComment() { return comment; @@ -613,7 +605,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getGeoCode() { return geoCode; @@ -626,7 +618,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getFeatureType() { return featureType; @@ -639,7 +631,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getCoordinates() { return coordinates; @@ -652,7 +644,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getUrl() { return url; @@ -666,8 +658,8 @@ @JsonProperty( value = "organisationUnitGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnitGroups" ) - @JacksonXmlProperty( localName = "organisationUnitGroup" ) + @JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnitGroup", namespace = Dxf2Namespace.NAMESPACE ) public Set getGroups() { return groups; @@ -681,8 +673,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "dataSets" ) - @JacksonXmlProperty( localName = "dataSet" ) + @JacksonXmlElementWrapper( localName = "dataSets", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataSet", namespace = Dxf2Namespace.NAMESPACE ) public Set getDataSets() { return dataSets; @@ -693,7 +685,11 @@ this.dataSets = dataSets; } - // TODO expose this when marshalling? + @JsonProperty + @JsonSerialize( contentAs = BaseIdentifiableObject.class ) + @JsonView( {DetailedView.class} ) + @JacksonXmlElementWrapper( localName = "users", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "user", namespace = Dxf2Namespace.NAMESPACE ) public Set getUsers() { return users; @@ -706,7 +702,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getContactPerson() { return contactPerson; @@ -719,7 +715,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getAddress() { return address; @@ -732,7 +728,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getEmail() { return email; @@ -745,7 +741,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getPhoneNumber() { return phoneNumber; @@ -758,7 +754,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isHasPatients() { return hasPatients; @@ -771,7 +767,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getType() { return type; @@ -784,8 +780,8 @@ @JsonProperty( value = "attributes" ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "attributes" ) - @JacksonXmlProperty( localName = "attribute" ) + @JacksonXmlElementWrapper( localName = "attributes", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "attribute", namespace = Dxf2Namespace.NAMESPACE ) public Set getAttributeValues() { return attributeValues; @@ -796,6 +792,20 @@ this.attributeValues = attributeValues; } + // ------------------------------------------------------------------------- + // Getters and setters for transient fields + // ------------------------------------------------------------------------- + + public Set getChildren() + { + return children; + } + + public void setChildren( Set children ) + { + this.children = children; + } + public int getLevel() { return level; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2012-03-27 17:38:48 +0000 @@ -161,8 +161,8 @@ @JsonProperty( value = "organisationUnits" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnits" ) - @JacksonXmlProperty( localName = "organisationUnit" ) + @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnit", namespace = Dxf2Namespace.NAMESPACE ) public Set getMembers() { return members; @@ -176,6 +176,7 @@ @JsonProperty( value = "organisationUnitGroupSet" ) @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public OrganisationUnitGroupSet getGroupSet() { return groupSet; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java 2012-03-27 17:38:48 +0000 @@ -190,6 +190,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDescription() { return description; @@ -202,6 +203,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isCompulsory() { return compulsory; @@ -215,8 +217,8 @@ @JsonProperty( value = "organisationUnitGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnitGroups" ) - @JacksonXmlProperty( localName = "organisationUnitGroup" ) + @JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnitGroup", namespace = Dxf2Namespace.NAMESPACE ) public Set getOrganisationUnitGroups() { return organisationUnitGroups; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java 2012-03-26 18:11:26 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java 2012-03-27 17:38:48 +0000 @@ -27,20 +27,21 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.Dxf2Namespace; import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - /** * @author Lars Helge Overland */ @JacksonXmlRootElement( localName = "organisationUnitLevel", namespace = Dxf2Namespace.NAMESPACE ) -public class OrganisationUnitLevel extends BaseIdentifiableObject +public class OrganisationUnitLevel + extends BaseIdentifiableObject { /** * Determines if a de-serialized file is compatible with this class. @@ -115,6 +116,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public int getLevel() { return level; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java 2012-03-27 17:38:48 +0000 @@ -27,11 +27,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.Dxf2Namespace; import org.hisp.dhis.common.view.DetailedView; @@ -130,7 +130,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDesignContent() { return designContent; @@ -144,7 +144,7 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public ReportTable getReportTable() { return reportTable; @@ -157,7 +157,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean getUsingOrgUnitGroupSets() { return usingOrgUnitGroupSets; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportParams.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportParams.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportParams.java 2012-03-27 17:38:48 +0000 @@ -128,7 +128,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean getParamReportingMonth() { return paramReportingMonth; @@ -141,7 +141,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean getParamLeafParentOrganisationUnit() { return paramLeafParentOrganisationUnit; @@ -154,7 +154,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean getParamGrandParentOrganisationUnit() { return paramGrandParentOrganisationUnit; @@ -167,7 +167,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean getParamParentOrganisationUnit() { return paramParentOrganisationUnit; @@ -180,7 +180,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Boolean getParamOrganisationUnit() { return paramOrganisationUnit; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2012-03-19 21:27:41 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2012-03-27 17:38:48 +0000 @@ -857,7 +857,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isRegression() { return regression; @@ -870,7 +870,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isCumulative() { return cumulative; @@ -884,8 +884,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataElements" ) - @JacksonXmlProperty( localName = "dataElement" ) + @JacksonXmlElementWrapper( localName = "dataElements", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataElement", namespace = Dxf2Namespace.NAMESPACE ) public List getDataElements() { return dataElements; @@ -899,8 +899,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "indicators" ) - @JacksonXmlProperty( localName = "indicator" ) + @JacksonXmlElementWrapper( localName = "indicators", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicator", namespace = Dxf2Namespace.NAMESPACE ) public List getIndicators() { return indicators; @@ -914,8 +914,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "periods" ) - @JacksonXmlProperty( localName = "period" ) + @JacksonXmlElementWrapper( localName = "periods", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "period", namespace = Dxf2Namespace.NAMESPACE ) public List getPeriods() { return periods; @@ -929,8 +929,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "dataSets" ) - @JacksonXmlProperty( localName = "dataSet" ) + @JacksonXmlElementWrapper( localName = "dataSets", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "dataSet", namespace = Dxf2Namespace.NAMESPACE ) public List getDataSets() { return dataSets; @@ -944,8 +944,8 @@ @JsonProperty( value = "organisationUnits" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnits" ) - @JacksonXmlProperty( localName = "organisationUnit" ) + @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnit", namespace = Dxf2Namespace.NAMESPACE ) public List getUnits() { return units; @@ -959,8 +959,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnitGroups" ) - @JacksonXmlProperty( localName = "organisationUnitGroup" ) + @JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnitGroup", namespace = Dxf2Namespace.NAMESPACE ) public List getOrganisationUnitGroups() { return organisationUnitGroups; @@ -974,7 +974,7 @@ @JsonProperty @JsonSerialize( as = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public DataElementCategoryCombo getCategoryCombo() { return categoryCombo; @@ -987,7 +987,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isDoIndicators() { return doIndicators; @@ -1000,7 +1000,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isDoPeriods() { return doPeriods; @@ -1013,7 +1013,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public boolean isDoUnits() { return doUnits; @@ -1026,7 +1026,7 @@ @JsonProperty( value = "relativePeriods" ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public RelativePeriods getRelatives() { return relatives; @@ -1039,7 +1039,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public ReportParams getReportParams() { return reportParams; @@ -1050,9 +1050,6 @@ this.reportParams = reportParams; } - @JsonProperty - @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty public Integer getSortOrder() { return sortOrder; @@ -1065,7 +1062,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Integer getTopLimit() { return topLimit; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java 2012-03-27 17:38:48 +0000 @@ -113,7 +113,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getDescription() { return description; @@ -126,7 +126,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty(namespace = Dxf2Namespace.NAMESPACE) public String getSqlQuery() { return sqlQuery; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2012-03-26 18:11:26 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2012-03-27 17:38:48 +0000 @@ -258,7 +258,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getFirstName() { return firstName; @@ -271,7 +271,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getSurname() { return surname; @@ -284,7 +284,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getEmail() { return email; @@ -297,7 +297,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getPhoneNumber() { return phoneNumber; @@ -310,7 +310,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public UserCredentials getUserCredentials() { return userCredentials; @@ -324,8 +324,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "organisationUnits" ) - @JacksonXmlProperty( localName = "organisationUnit" ) + @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnit", namespace = Dxf2Namespace.NAMESPACE ) public Collection getOrganisationUnits() { return organisationUnits; @@ -338,8 +338,8 @@ @JsonProperty( value = "attributes" ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "attributes" ) - @JacksonXmlProperty( localName = "attribute" ) + @JacksonXmlElementWrapper( localName = "attributes", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "attribute", namespace = Dxf2Namespace.NAMESPACE ) public Set getAttributeValues() { return attributeValues; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java 2012-03-19 15:52:39 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java 2012-03-27 17:38:48 +0000 @@ -112,8 +112,8 @@ @JsonProperty( value = "users" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "users" ) - @JacksonXmlProperty( localName = "user" ) + @JacksonXmlElementWrapper( localName = "users", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "user", namespace = Dxf2Namespace.NAMESPACE ) public Set getMembers() { return members; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2012-03-20 14:42:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2012-03-27 17:38:48 +0000 @@ -142,7 +142,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDescription() { return description; @@ -157,7 +157,7 @@ @JsonSerialize( using = JacksonPeriodTypeSerializer.class ) @JsonDeserialize( using = JacksonPeriodTypeDeserializer.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public PeriodType getPeriodType() { return periodType; @@ -170,7 +170,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Operator getOperator() { return operator; @@ -183,7 +183,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getType() { return type; @@ -194,10 +194,9 @@ this.type = type; } - // TODO fix serialization of this.. @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Expression getLeftSide() { return leftSide; @@ -208,10 +207,9 @@ this.leftSide = leftSide; } - // TODO fix serialization of this.. @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public Expression getRightSide() { return rightSide; @@ -225,8 +223,8 @@ @JsonProperty( value = "validationRuleGroups" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "validationRuleGroups" ) - @JacksonXmlProperty( localName = "validationRuleGroup" ) + @JacksonXmlElementWrapper( localName = "validationRuleGroups", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "validationRuleGroup", namespace = Dxf2Namespace.NAMESPACE ) public Set getGroups() { return groups; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java 2012-03-19 14:58:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java 2012-03-27 17:38:48 +0000 @@ -113,7 +113,7 @@ @JsonProperty @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getDescription() { return description; @@ -127,8 +127,8 @@ @JsonProperty( value = "validationRules" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class, ExportView.class} ) - @JacksonXmlElementWrapper( localName = "validationRules" ) - @JacksonXmlProperty( localName = "validationRule" ) + @JacksonXmlElementWrapper( localName = "validationRules", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "validationRule", namespace = Dxf2Namespace.NAMESPACE ) public Set getMembers() { return members; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java 2012-03-22 15:04:58 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java 2012-03-27 17:38:48 +0000 @@ -35,10 +35,7 @@ import org.hisp.dhis.attribute.Attributes; import org.hisp.dhis.chart.Chart; import org.hisp.dhis.chart.Charts; -import org.hisp.dhis.common.BaseCollection; -import org.hisp.dhis.common.BaseIdentifiableObject; -import org.hisp.dhis.common.IdentifiableObject; -import org.hisp.dhis.common.LinkableObject; +import org.hisp.dhis.common.*; import org.hisp.dhis.constant.Constant; import org.hisp.dhis.constant.Constants; import org.hisp.dhis.dataelement.*; @@ -363,21 +360,22 @@ if ( baseCollection.getPager() != null ) { String basePath = getBasePath( source.getClass() ); + Pager pager = baseCollection.getPager(); - if ( baseCollection.getPage() < baseCollection.getPageCount() ) + if ( pager.getPage() < pager.getPageCount() ) { - baseCollection.getPager().setNextPage( basePath + "?page=" + (baseCollection.getPage() + 1) ); + pager.setNextPage( basePath + "?page=" + (pager.getPage() + 1) ); } - if ( baseCollection.getPage() > 1 ) + if ( pager.getPage() > 1 ) { - if ( (baseCollection.getPage() - 1) == 1 ) + if ( (pager.getPage() - 1) == 1 ) { - baseCollection.getPager().setPrevPage( basePath ); + pager.setPrevPage( basePath ); } else { - baseCollection.getPager().setPrevPage( basePath + "?page=" + (baseCollection.getPage() - 1) ); + pager.setPrevPage( basePath + "?page=" + (pager.getPage() - 1) ); } } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Message.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Message.java 2012-03-22 18:17:54 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Message.java 2012-03-27 17:38:48 +0000 @@ -65,7 +65,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getSubject() { return subject; @@ -78,7 +78,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) - @JacksonXmlProperty + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) public String getText() { return text; @@ -92,8 +92,8 @@ @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( {DetailedView.class} ) - @JacksonXmlElementWrapper( localName = "users" ) - @JacksonXmlProperty( localName = "user" ) + @JacksonXmlElementWrapper( localName = "users", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "user", namespace = Dxf2Namespace.NAMESPACE ) public Set getUsers() { return users; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java 2012-03-16 10:07:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java 2012-03-27 17:38:48 +0000 @@ -72,7 +72,7 @@ @JsonProperty @JsonView( {DetailedView.class} ) - @JacksonXmlProperty( isAttribute = true ) + @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE ) public String getName() { return name; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - + @@ -45,10 +45,6 @@ - - - -
ID
Last Updated
Code
MandatoryApplicable for Users
Sort Order
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl 2012-02-14 08:24:29 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl 2011-12-16 15:06:35 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl 2012-03-27 17:38:48 +0000 @@ -6,12 +6,12 @@
-

+

- + @@ -54,22 +54,22 @@
Resource Datapngpng
width

- +

Details

- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

ID
Last Updated
Code
Dimension
- + - + - + @@ -34,10 +34,6 @@ - - - - === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

ID
Last Updated
Code
Short Name
Sort Order
Active
- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl 2011-12-15 21:05:08 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl 2012-03-27 17:38:48 +0000 @@ -6,23 +6,23 @@
-

+

ID
Last Updated
Code
Short Name
- +
Resource Dataanyany

- + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl 2012-01-24 13:28:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl 2012-03-27 17:38:48 +0000 @@ -4,11 +4,11 @@ - - - - - + + + + + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

ID
Last Updated
URL
html xml json jsonp html xml json jsonp
- + - + - + @@ -46,11 +46,6 @@ - - - - -
ID
Last Updated
Code
Short NameAnnualized
Sort Order
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl 2012-03-21 12:12:03 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl 2012-03-27 17:38:48 +0000 @@ -8,7 +8,7 @@ - + @@ -29,13 +29,13 @@ - +
ID
Last Updated
Code
Factor
- + - +
Page - - + + 1 @@ -43,30 +43,30 @@ / - - + + 1 - + Previous Page - + Next Page === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl 2011-12-15 21:05:08 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl 2012-03-27 17:38:48 +0000 @@ -4,12 +4,12 @@
-

+

- +
Resource Datapngpng

@@ -32,7 +32,7 @@

- +

Details

@@ -43,7 +43,7 @@ - + @@ -55,34 +55,34 @@ - + - + html - + png - + xml - + json - + jsonp === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl 2011-12-16 19:39:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

- + - + - +
ID
Last Updated
Code
@@ -49,7 +49,7 @@ Sender - +
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl 2011-12-20 08:57:21 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

ID
Last Updated
Code
Short Name
- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@
-

+

- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl 2011-12-22 13:18:22 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl 2012-03-27 17:38:48 +0000 @@ -6,13 +6,13 @@
-

+

- - + + @@ -27,15 +27,15 @@
Resource Datapdfxlspdfxls
ou
- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl 2011-12-15 21:05:08 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl 2012-03-27 17:38:48 +0000 @@ -6,15 +6,15 @@
-

+

- - - - + + + + @@ -29,15 +29,15 @@
Resource Datahtmlpdfxlscsvhtmlpdfxlscsv
ou
- + - + - + @@ -56,10 +56,6 @@ - - - - === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl 2012-03-16 10:07:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl 2012-03-27 17:38:48 +0000 @@ -4,7 +4,7 @@ xmlns:d="http://dhis2.org/schema/dxf/2.0" > - +

Resources

ID
Last Updated
Code
DoIndicators
SortOrder
TopLimit
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@

- +

ID
Last Updated
Code
Description
- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl 2011-12-21 11:37:17 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl 2012-03-27 17:38:48 +0000 @@ -6,20 +6,20 @@

- +

ID
Last Updated
Code
First Name
- + - + - +
ID
Last Updated
Code
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

- + - + - + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl 2011-12-15 19:34:24 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl 2012-03-27 17:38:48 +0000 @@ -7,20 +7,20 @@

- +

ID
Last Updated
Code
Description
- + - + - +
ID
Last Updated
Code
Description