dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1058: Moved the DXF 2 related classes to a new package.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 19 Nov 2009 18:02:13 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 1058
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-11-19 19:00:48 +0100
message:
  Moved the DXF 2 related classes to a new package.
removed:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/
added:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/importer/
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/
renamed:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/V2Parser.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/importer/Parser.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Categories.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Categories.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Category.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Category.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryCombo.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombo.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryCombos.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombos.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryOptionCombo.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombo.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryOptionCombos.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombos.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CompleteDataSetRegistrations.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CompleteDataSetRegistrations.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaries.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaries.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryDataElement.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElement.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryDataElements.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElements.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryIndicator.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicator.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryIndicators.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicators.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElement.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElement.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroup.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroup.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroupSet.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSet.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroupSets.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElements.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElements.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetMembers.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetMembers.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetSourceAssociation.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociation.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetSourceAssociations.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociations.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSets.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataValue.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValue.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataValues.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValues.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Dxf.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Dxf.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSetMember.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMember.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSetMembers.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMembers.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSets.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IdentifiableObject.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IdentifiableObject.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroup.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroup.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroupSet.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSet.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroupSets.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorTypes.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorTypes.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Indicators.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Indicators.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Metadata.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Metadata.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ObjectFactory.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ObjectFactory.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnit.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnit.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroupMember.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMember.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroupMembers.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMembers.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroups.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroups.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitLevel.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevel.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitLevels.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevels.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitRelationship.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationship.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitRelationships.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationships.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnits.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnits.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Period.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Period.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Periods.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Periods.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableCategoryOptionCombos.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableCategoryOptionCombos.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataElements.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataElements.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataSet.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSet.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataSets.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableIndicator.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicator.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableIndicators.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicators.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableOrganisationUnit.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnit.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableOrganisationUnits.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnits.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTablePeriods.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTablePeriods.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTables.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTables.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/package-info.java => dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/package-info.java
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/importer/Parser.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Categories.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Category.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombo.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombos.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombo.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombos.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CompleteDataSetRegistrations.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaries.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElement.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElements.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicator.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicators.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElement.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroup.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSet.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElements.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetMembers.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociation.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociations.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValue.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValues.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Dxf.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMember.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMembers.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IdentifiableObject.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroup.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSet.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorTypes.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Indicators.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Metadata.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ObjectFactory.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnit.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMember.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMembers.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroups.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevel.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevels.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationship.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationships.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnits.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Period.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Periods.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableCategoryOptionCombos.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataElements.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSet.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSets.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicator.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicators.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnit.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnits.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTablePeriods.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTables.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/package-info.java


--
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.

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-11-02 11:56:51 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-11-19 18:00:48 +0000
@@ -168,7 +168,7 @@
 import org.hisp.dhis.source.Source;
 import org.hisp.dhis.system.util.StreamUtils;
 import org.hisp.dhis.validation.ValidationRuleService;
-import org.hisp.dhis.importexport.dxf.importer.V2Parser;
+import org.hisp.dhis.importexport.dxf2.importer.Parser;
 
 /**
  * @author Lars Helge Overland
@@ -371,7 +371,7 @@
 
             try
             {
-                V2Parser v2parser = new V2Parser();
+                Parser v2parser = new Parser();
                 v2parser.getMetadata( reader.getXmlStreamReader() );
                 v2parser.getDataValues( reader.getXmlStreamReader() );
             }

=== removed directory 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object'
=== added directory 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2'
=== added directory 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/importer'
=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/V2Parser.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/importer/Parser.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/V2Parser.java	2009-10-31 01:31:57 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/importer/Parser.java	2009-11-19 18:00:48 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.importexport.dxf.importer;
+package org.hisp.dhis.importexport.dxf2.importer;
 
 /*
  * Copyright (c) 2004-2007, University of Oslo
@@ -31,35 +31,40 @@
 import javax.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLStreamReader;
 
-import org.hisp.dhis.importexport.dxf.v2object.DataValues;
-import org.hisp.dhis.importexport.dxf.v2object.Metadata;
+import org.hisp.dhis.importexport.dxf2.object.DataValues;
+import org.hisp.dhis.importexport.dxf2.object.Metadata;
 
 /**
  * @author Bob Jolliffe
  */
-public class V2Parser {
-	
+public class Parser
+{
     protected JAXBContext metadata_ctx;
     Metadata metadata;
-    
     protected JAXBContext datavalues_ctx;
     DataValues datavalues;
-    
-    public V2Parser() throws javax.xml.bind.JAXBException {
-	metadata_ctx = JAXBContext.newInstance(new Class[] {Metadata.class});
-	datavalues_ctx =  JAXBContext.newInstance(new Class[] {DataValues.class});		
+
+    public Parser()
+        throws javax.xml.bind.JAXBException
+    {
+        metadata_ctx = JAXBContext.newInstance( new Class[] { Metadata.class } );
+        datavalues_ctx = JAXBContext.newInstance( new Class[] { DataValues.class } );
     }
-    
-    public void getMetadata(XMLStreamReader reader) throws javax.xml.bind.JAXBException {
+
+    public void getMetadata( XMLStreamReader reader )
+        throws javax.xml.bind.JAXBException
+    {
         Unmarshaller um = metadata_ctx.createUnmarshaller();
-        metadata = (Metadata) um.unmarshal(reader);        
+        metadata = (Metadata) um.unmarshal( reader );
         // ... process metadata
     }
 
     // just pulling in one bite for now - will do them one at a time later
-    public void getDataValues(XMLStreamReader reader) throws javax.xml.bind.JAXBException {
+    public void getDataValues( XMLStreamReader reader )
+        throws javax.xml.bind.JAXBException
+    {
         Unmarshaller um = datavalues_ctx.createUnmarshaller();
-        datavalues = (DataValues) um.unmarshal(reader);
+        datavalues = (DataValues) um.unmarshal( reader );
         // ... process datavalues
     }
 }
\ No newline at end of file

=== added directory 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object'
=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Categories.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Categories.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Categories.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Categories.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Category.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Category.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Category.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Category.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryCombo.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombo.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryCombo.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombo.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryCombos.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombos.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryCombos.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryCombos.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryOptionCombo.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombo.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryOptionCombo.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombo.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryOptionCombos.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombos.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CategoryOptionCombos.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CategoryOptionCombos.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CompleteDataSetRegistrations.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CompleteDataSetRegistrations.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/CompleteDataSetRegistrations.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/CompleteDataSetRegistrations.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaries.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaries.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaries.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaries.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryDataElement.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElement.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryDataElement.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElement.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryDataElements.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElements.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryDataElements.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryDataElements.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryIndicator.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicator.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryIndicator.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicator.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryIndicators.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicators.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataDictionaryIndicators.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataDictionaryIndicators.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElement.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElement.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElement.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElement.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroup.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroup.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroup.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroup.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroupSet.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSet.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroupSet.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSet.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroupSets.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSets.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElementGroupSets.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElementGroupSets.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElements.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElements.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataElements.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataElements.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetMembers.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetMembers.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetMembers.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetMembers.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetSourceAssociation.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociation.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetSourceAssociation.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociation.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetSourceAssociations.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociations.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSetSourceAssociations.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSetSourceAssociations.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSets.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSets.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataSets.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataSets.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataValue.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValue.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataValue.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValue.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataValues.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValues.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/DataValues.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/DataValues.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Dxf.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Dxf.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Dxf.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Dxf.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSetMember.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMember.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSetMember.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMember.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSetMembers.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMembers.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSetMembers.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSetMembers.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSets.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSets.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/GroupSets.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/GroupSets.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IdentifiableObject.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IdentifiableObject.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IdentifiableObject.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IdentifiableObject.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -51,7 +51,7 @@
     "description"
 })
 @XmlSeeAlso({
-    org.hisp.dhis.importexport.dxf.v2object.Indicators.Indicator.class,
+    org.hisp.dhis.importexport.dxf2.object.Indicators.Indicator.class,
     DataElementGroupSet.class,
     DataElement.class,
     Category.class,

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroup.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroup.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroup.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroup.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroupSet.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSet.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroupSet.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSet.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroupSets.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSets.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorGroupSets.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorGroupSets.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorTypes.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorTypes.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/IndicatorTypes.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/IndicatorTypes.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Indicators.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Indicators.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Indicators.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Indicators.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Metadata.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Metadata.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Metadata.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Metadata.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ObjectFactory.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ObjectFactory.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ObjectFactory.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ObjectFactory.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.JAXBElement;
@@ -335,8 +335,8 @@
      * Create an instance of {@link org.hisp.dhis.importexport.dxf.v2object.Categories }
      * 
      */
-    public org.hisp.dhis.importexport.dxf.v2object.Categories createCategories() {
-        return new org.hisp.dhis.importexport.dxf.v2object.Categories();
+    public org.hisp.dhis.importexport.dxf2.object.Categories createCategories() {
+        return new org.hisp.dhis.importexport.dxf2.object.Categories();
     }
 
     /**

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnit.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnit.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnit.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnit.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroupMember.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMember.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroupMember.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMember.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroupMembers.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMembers.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroupMembers.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroupMembers.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroups.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroups.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitGroups.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitGroups.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitLevel.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevel.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitLevel.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevel.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitLevels.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevels.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitLevels.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitLevels.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitRelationship.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationship.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitRelationship.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationship.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitRelationships.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationships.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnitRelationships.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnitRelationships.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnits.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnits.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/OrganisationUnits.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/OrganisationUnits.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Period.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Period.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Period.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Period.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Periods.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Periods.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/Periods.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/Periods.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableCategoryOptionCombos.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableCategoryOptionCombos.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableCategoryOptionCombos.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableCategoryOptionCombos.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataElements.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataElements.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataElements.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataElements.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataSet.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSet.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataSet.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSet.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataSets.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSets.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableDataSets.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableDataSets.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableIndicator.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicator.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableIndicator.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicator.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableIndicators.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicators.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableIndicators.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableIndicators.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableOrganisationUnit.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnit.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableOrganisationUnit.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnit.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableOrganisationUnits.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnits.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTableOrganisationUnits.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTableOrganisationUnits.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTablePeriods.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTablePeriods.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTablePeriods.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTablePeriods.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.util.ArrayList;
 import java.util.List;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTables.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTables.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/ReportTables.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/ReportTables.java	2009-11-19 18:00:48 +0000
@@ -6,7 +6,7 @@
 //
 
 
-package org.hisp.dhis.importexport.dxf.v2object;
+package org.hisp.dhis.importexport.dxf2.object;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

=== renamed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/package-info.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/package-info.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/v2object/package-info.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/object/package-info.java	2009-11-19 18:00:48 +0000
@@ -6,4 +6,5 @@
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://dhis2.org/ns/schema/dxf2";, elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.hisp.dhis.importexport.dxf.v2object;
+
+package org.hisp.dhis.importexport.dxf2.object;