=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/PeriodConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/PeriodConverter.java	2011-12-19 14:32:26 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/PeriodConverter.java	2011-12-19 18:12:42 +0000
@@ -55,8 +55,6 @@
     public static final String ELEMENT_NAME = "period";
     
     private static final String FIELD_ID = "id";
-    private static final String FIELD_UID = "uid";
-    private static final String FIELD_CODE = "code";
     private static final String FIELD_PERIOD_TYPE = "periodType";
     private static final String FIELD_START_DATE = "startDate";
     private static final String FIELD_END_DATE = "endDate";
@@ -114,8 +112,6 @@
                 writer.openElement( ELEMENT_NAME );
                 
                 writer.writeElement( FIELD_ID, String.valueOf( period.getId() ) );
-                writer.writeElement( FIELD_UID, period.getUid() );
-                writer.writeElement( FIELD_CODE, period.getCode() );
                 writer.writeElement( FIELD_PERIOD_TYPE, String.valueOf( period.getPeriodType().getName() ) );
                 writer.writeElement( FIELD_START_DATE, DateUtils.getMediumDateString( period.getStartDate() ) );
                 writer.writeElement( FIELD_END_DATE, DateUtils.getMediumDateString( period.getEndDate() ) );
@@ -153,12 +149,6 @@
             
             period.setId( Integer.parseInt( values.get( FIELD_ID ) ) );
 
-            if ( params.minorVersionGreaterOrEqual( "1.3") )
-            {
-                period.setUid( values.get( FIELD_UID ) );
-                period.setCode( values.get( FIELD_CODE) );
-            }
-
             period.setStartDate( DateUtils.getMediumDate( values.get( FIELD_START_DATE ) ) );
             period.setEndDate( DateUtils.getMediumDate( values.get( FIELD_END_DATE ) ) );
 

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java	2011-12-19 13:10:25 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java	2011-12-19 18:12:42 +0000
@@ -300,7 +300,7 @@
     {
         ImportParams importParams = ImportExportUtils.getImportParams( ImportStrategy.NEW_AND_UPDATES, false, false, false );
 
-        importService.importData( importParams, inputStreamA );
+        importService.importData( importParams, inputStreamAx );
 
         assertObjects( dataASize );
     }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java	2010-11-23 16:12:57 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
 
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
 
     protected void setValues( Concept concept )
     {        
+        statementBuilder.setValue( concept.getUid() );
+        statementBuilder.setValue( concept.getCode() );
         statementBuilder.setValue( concept.getName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java	2011-07-13 11:32:13 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,12 +86,16 @@
 
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "value" );
     }
 
     protected void setValues( Constant constant )
     {
+        statementBuilder.setValue( constant.getUid() );
+        statementBuilder.setValue( constant.getCode() );
         statementBuilder.setValue( constant.getName() );
         statementBuilder.setValue( constant.getValue() );
     }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java	2010-11-23 16:12:57 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,6 +86,8 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "description" );
         statementBuilder.setColumn( "region" );
@@ -93,6 +95,8 @@
     
     protected void setValues( DataDictionary dataDictionary )
     {        
+        statementBuilder.setValue( dataDictionary.getUid() );
+        statementBuilder.setValue( dataDictionary.getCode() );
         statementBuilder.setValue( dataDictionary.getName() );
         statementBuilder.setValue( dataDictionary.getDescription() );
         statementBuilder.setValue( dataDictionary.getRegion() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java	2011-11-23 18:07:35 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -92,6 +92,7 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "alternativename" );
         statementBuilder.setColumn( "shortname" );
@@ -109,6 +110,7 @@
     
     protected void setValues( DataElement dataElement )
     {
+        statementBuilder.setValue( dataElement.getUid() );
         statementBuilder.setValue( dataElement.getName() );
         statementBuilder.setValue( dataElement.getAlternativeName() );
         statementBuilder.setValue( dataElement.getShortName() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,12 +86,16 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "conceptid" );
     }
     
     protected void setValues( DataElementCategory category )
     {
+        statementBuilder.setValue( category.getUid() );
+        statementBuilder.setValue( category.getCode() );
         statementBuilder.setValue( category.getName() );
         statementBuilder.setValue( category.getConcept().getId() );
     }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java	2010-11-23 16:12:57 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( DataElementCategoryCombo categoryCombo )
     {        
+        statementBuilder.setValue( categoryCombo.getUid() );
+        statementBuilder.setValue( categoryCombo.getCode() );
         statementBuilder.setValue( categoryCombo.getName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( DataElementCategoryOption categoryOption )
     {        
+        statementBuilder.setValue( categoryOption.getUid() );
+        statementBuilder.setValue( categoryOption.getCode() );
         statementBuilder.setValue( categoryOption.getName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
        
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( DataElementGroup group )
     {
+        statementBuilder.setValue( group.getUid() );        
+        statementBuilder.setValue( group.getCode() );        
         statementBuilder.setValue( group.getName() );        
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
        
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( DataElementGroupSet groupSet )
     {
+        statementBuilder.setValue( groupSet.getUid() );        
+        statementBuilder.setValue( groupSet.getCode() );        
         statementBuilder.setValue( groupSet.getName() );        
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java	2011-11-23 18:07:35 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -90,6 +90,7 @@
 
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "shortName" );
         statementBuilder.setColumn( "code" );
@@ -101,6 +102,7 @@
 
     protected void setValues( DataSet dataSet )
     {
+        statementBuilder.setValue( dataSet.getUid() );
         statementBuilder.setValue( dataSet.getName() );
         statementBuilder.setValue( dataSet.getShortName() );
         statementBuilder.setValue( dataSet.getCode() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java	2010-11-23 16:12:57 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,6 +86,8 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "description" );
         statementBuilder.setColumn( "compulsory" );
@@ -93,6 +95,8 @@
     
     protected void setValues( OrganisationUnitGroupSet groupSet )
     {        
+        statementBuilder.setValue( groupSet.getUid() );
+        statementBuilder.setValue( groupSet.getCode() );
         statementBuilder.setValue( groupSet.getName() );
         statementBuilder.setValue( groupSet.getDescription() );
         statementBuilder.setValue( groupSet.isCompulsory() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java	2011-11-23 18:07:35 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -92,6 +92,7 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "alternativename" );
         statementBuilder.setColumn( "shortname" );
@@ -109,6 +110,7 @@
     
     protected void setValues( Indicator indicator )
     {
+        statementBuilder.setValue( indicator.getUid() );
         statementBuilder.setValue( indicator.getName() );
         statementBuilder.setValue( indicator.getAlternativeName() );
         statementBuilder.setValue( indicator.getShortName() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( IndicatorGroup group )
     {
+        statementBuilder.setValue( group.getUid() );
+        statementBuilder.setValue( group.getCode() );
         statementBuilder.setValue( group.getName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( IndicatorGroupSet groupSet )
     {
+        statementBuilder.setValue( groupSet.getUid() );
+        statementBuilder.setValue( groupSet.getCode() );
         statementBuilder.setValue( groupSet.getName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java	2011-11-23 18:07:35 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,6 +86,8 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "indicatorfactor" );
         statementBuilder.setColumn( "indicatornumber" );
@@ -93,6 +95,8 @@
     
     protected void setValues( IndicatorType type )
     {        
+        statementBuilder.setValue( type.getUid() );
+        statementBuilder.setValue( type.getCode() );
         statementBuilder.setValue( type.getName() );
         statementBuilder.setValue( type.getFactor() );
         statementBuilder.setValue( type.isNumber() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java	2011-11-23 18:07:35 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -90,6 +90,7 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "parentid" );
         statementBuilder.setColumn( "shortname" );
@@ -107,6 +108,7 @@
     
     protected void setValues( OrganisationUnit unit )
     {
+        statementBuilder.setValue( unit.getUid() );        
         statementBuilder.setValue( unit.getName() );        
         statementBuilder.setValue( unit.getParent() != null ? unit.getParent().getId() : null );
         statementBuilder.setValue( unit.getShortName() );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java	2011-11-22 15:48:30 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,11 +86,15 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
     }
     
     protected void setValues( OrganisationUnitGroup group )
     {
+        statementBuilder.setValue( group.getUid() );
+        statementBuilder.setValue( group.getCode() );
         statementBuilder.setValue( group.getName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java	2011-02-23 23:39:31 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java	2011-12-19 18:12:42 +0000
@@ -86,6 +86,8 @@
     
     protected void setColumns()
     {
+        statementBuilder.setColumn( "uid" );
+        statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "regression" );
         statementBuilder.setColumn( "doindicators" );
@@ -107,6 +109,8 @@
     
     protected void setValues( ReportTable reportTable )
     {        
+        statementBuilder.setValue( reportTable.getUid() );
+        statementBuilder.setValue( reportTable.getCode() );
         statementBuilder.setValue( reportTable.getName() );
         statementBuilder.setValue( reportTable.isRegression() );
         statementBuilder.setValue( reportTable.isDoIndicators() );