Merge authors: Bob Jolliffe (bobjolliffe) Bob Jolliffe [email protected] Morten Olav Hansen (mortenoh) ------------------------------------------------------------ revno: 5221 [merge] committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Fri 2011-11-25 12:19:00 +0100 message: merged with dhis2-dxf2 removed: dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractIdentifiableObject.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractNameableObject.java added: dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Charts.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/BaseNameableObject.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseIdentifiableObjectXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseNameableObjectXmlAdapter.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonDateSerializer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonIdentifiableObjectListSerializer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonIdentifiableObjectSerializer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonIdentifiableObjectSetSerializer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonNameableObjectListSerializer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonNameableObjectSerializer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonNameableObjectSetSerializer.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/DataElementCategoryCombos.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/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/DataElements.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.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/Sections.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/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/organisationunit/OrganisationUnits.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateDimensionalObjectStore.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/CompleteDataSetRegistrationController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementCategoryComboController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementCategoryController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementCategoryOptionComboController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementCategoryOptionController.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/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/IndicatorTypeController.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/SectionController.java tools/dxfgen.sh 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/chart/Chart.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/CodeList.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectNameComparator.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/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/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/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/DataElementCategoryService.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/DataElementOperand.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/Section.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/IndicatorType.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/OrganisationUnitLevel.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitRelationship.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/PivotTable.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/ReportGroup.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/ReportTableGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/Source.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationCriteria.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.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-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptServiceTest.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilder.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java dhis-2/dhis-services/dhis-service-options/src/main/java/org/hisp/dhis/options/displayproperty/DefaultDisplayPropertyHandler.java dhis-2/dhis-services/dhis-service-options/src/main/java/org/hisp/dhis/options/displayproperty/DisplayPropertyHandler.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pivottable/impl/DefaultPivotTableService.java dhis-2/dhis-web/dhis-web-api/pom.xml 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/IndicatorController.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/webapp/WEB-INF/web.xml dhis-2/pom.xml The size of the diff (8058 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
