=== 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-24 13:28:16 +0000 +++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2012-04-25 14:01:07 +0000 @@ -27,20 +27,21 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.cache.HibernateCacheManager; import org.hisp.dhis.dxf2.importsummary.ImportConflict; import org.hisp.dhis.dxf2.importsummary.ImportSummary; +import org.hisp.dhis.user.CurrentUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * @author Morten Olav Hansen */ @@ -64,6 +65,9 @@ @Autowired private HibernateCacheManager cacheManager; + @Autowired + private CurrentUserService currentUserService; + //------------------------------------------------------------------------------------------------------- // ImportService Implementation //------------------------------------------------------------------------------------------------------- @@ -81,7 +85,8 @@ objectBridge.init(); Date startDate = new Date(); - log.info( "Started import at " + startDate ); + + log.info( "User " + currentUserService.getCurrentUsername() + " started import at " + startDate ); doImport( metaData.getOrganisationUnits(), importOptions, importSummary ); doImport( metaData.getOrganisationUnitLevels(), importOptions, importSummary ); @@ -176,7 +181,7 @@ if ( importer != null ) { List importConflicts = importer.importObjects( objects, importOptions ); - + importSummary.getConflicts().addAll( importConflicts ); // importSummary.getCounts().add( count ); //FIXME }