=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeDeserializer.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeDeserializer.java 2012-03-20 14:42:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeDeserializer.java 2012-03-20 14:48:09 +0000 @@ -19,8 +19,6 @@ { String periodTypeString = jp.readValueAs( String.class ); - System.err.println( "Deserialized: " + periodTypeString ); - return PeriodType.getPeriodTypeByName( periodTypeString ); } } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeSerializer.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeSerializer.java 2012-03-20 14:42:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeSerializer.java 2012-03-20 14:48:09 +0000 @@ -17,8 +17,6 @@ @Override public void serialize( PeriodType value, JsonGenerator jgen, SerializerProvider provider ) throws IOException, JsonProcessingException { - System.err.println( "Deserialized: " + value.getName() ); - jgen.writeString( value.getName() ); } } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java 2012-03-20 14:42:51 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java 2012-03-20 14:48:09 +0000 @@ -255,7 +255,7 @@ private DXF2 getExportObject() { DXF2 dxf2 = new DXF2(); -/* + dxf2.setAttributeTypes( new ArrayList( attributeService.getAllAttributes() ) ); dxf2.setUsers( new ArrayList( userService.getAllUsers() ) ); @@ -284,9 +284,8 @@ dxf2.setOrganisationUnitLevels( new ArrayList( organisationUnitService.getOrganisationUnitLevels() ) ); dxf2.setOrganisationUnitGroups( new ArrayList( organisationUnitGroupService.getAllOrganisationUnitGroups() ) ); dxf2.setOrganisationUnitGroupSets( new ArrayList( organisationUnitGroupService.getAllOrganisationUnitGroupSets() ) ); -*/ + dxf2.setDataSets( new ArrayList( dataSetService.getAllDataSets() ) ); -/* dxf2.setValidationRules( new ArrayList( validationRuleService.getAllValidationRules() ) ); dxf2.setValidationRuleGroups( new ArrayList( validationRuleService.getAllValidationRuleGroups() ) ); @@ -303,7 +302,7 @@ dxf2.setMapLayers( new ArrayList( mappingService.getAllMapLayers() ) ); dxf2.setDataDictionaries( new ArrayList( dataDictionaryService.getAllDataDictionaries() ) ); -*/ + return dxf2; }