=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2012-04-22 21:25:27 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2012-04-23 08:02:51 +0000
@@ -35,7 +35,6 @@
import org.hisp.dhis.dxf2.importsummary.ImportSummary;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
@@ -85,7 +84,7 @@
Date startDate = new Date();
doImport( metaData.getOrganisationUnits(), importOptions, importSummary );
- // doImport( metaData.getOrganisationUnitLevels(), importOptions, importSummary );
+ doImport( metaData.getOrganisationUnitLevels(), importOptions, importSummary );
doImport( metaData.getOrganisationUnitGroups(), importOptions, importSummary );
doImport( metaData.getOrganisationUnitGroupSets(), importOptions, importSummary );
=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2012-04-22 21:25:27 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2012-04-23 08:02:51 +0000
@@ -35,6 +35,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.period.PeriodStore;
import org.hisp.dhis.period.PeriodType;
import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +91,7 @@
static
{
registeredTypes.add( PeriodType.class );
+ registeredTypes.add( OrganisationUnitLevel.class );
registeredTypes.add( OrganisationUnit.class );
registeredTypes.add( OrganisationUnitGroup.class );
registeredTypes.add( OrganisationUnitGroupSet.class );
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2012-04-23 07:59:11 +0000
+++ dhis-2/pom.xml 2012-04-23 08:02:51 +0000
@@ -368,12 +368,12 @@
org.aspectj
aspectjrt
- ${aspectj.version}
+ 1.6.4
org.aspectj
aspectjweaver
- >${aspectj.version}
+ >1.6.4
@@ -842,6 +842,5 @@
3.1.0.RELEASE
4.1.0.Final
2.0.0
- 1.6.4