Merge authors: Morten Olav Hansen (mortenoh) ------------------------------------------------------------ revno: 6312 [merge] committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Tue 2012-03-20 13:47:54 +0100 message: merged with dhis-webapi-jackson removed: dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/AttributeXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/CategoryComboXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/CategoryOptionComboXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/CategoryOptionXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/CategoryXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ChartXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ConstantXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DashboardContentXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DataElementGroupSetXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DataElementGroupXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DataElementXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DataSetXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/DocumentXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/GridRowsXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/IndicatorGroupSetXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/IndicatorGroupXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/IndicatorTypeXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/IndicatorXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/MessageConversationXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/MessageXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/OrganisationUnitGroupSetXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/OrganisationUnitGroupXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/OrganisationUnitLevelXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/OrganisationUnitXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/PeriodXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ReportTableXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ReportXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/SqlViewXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/UserGroupXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/UserXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ValidationRuleGroupXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ValidationRuleXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/package-info.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/package-info.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ExportController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ImportController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/ExtendedMappingJacksonView.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/package-info.java added: dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/DetailedView.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/ExportView.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/IdentifiableObjectView.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayers.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSets.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegends.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSets.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MapLayerController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MapLegendController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MapLegendSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/JacksonJsonView.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/JacksonXmlView.java modified: dhis-2/dhis-api/pom.xml dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attributes.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Charts.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseCollection.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRow.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRows.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Pager.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/Concept.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constants.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContent.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContents.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionary.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategories.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombos.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombos.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptions.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSets.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroups.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElements.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSets.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Sections.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Documents.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSets.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroups.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorTypes.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicators.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegend.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Maps.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/Message.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversations.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/UserMessage.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSets.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroups.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevels.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnits.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Reports.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportParams.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTables.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViews.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroups.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/Users.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroups.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRules.java dhis-2/dhis-dxf2/pom.xml dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLayer.hbm.xml dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegendSet.hbm.xml dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AggregatedValueController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeTypeController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ConstantController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DashboardContentController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DocumentController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndicatorController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndicatorGroupController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndicatorGroupSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MapController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SmsConfigurationController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/UserController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/UserGroupController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ValidationRuleController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ValidationRuleGroupController.java 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/view/JacksonUtils.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/XsltHtmlView.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/DXF2.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/DataValueSets.java 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/Resource.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml 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/resource.xsl dhis-2/pom.xml The size of the diff (18517 lines) is larger than your specified limit of 5000 lines
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
