Author: tchemit Date: 2012-04-10 22:46:01 +0200 (Tue, 10 Apr 2012) New Revision: 519 Url: http://forge.codelutin.com/repositories/revision/echobase/519 Log: try to fix again create embedded application :( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-04-10 20:46:01 UTC (rev 519) @@ -358,7 +358,7 @@ ImportDbService importDbService = newServiceContext.newService(ImportDbService.class); - importDbService.importDb(importConfiguration, admin, false); + importDbService.importDb(importConfiguration, admin, false, true); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-10 20:46:01 UTC (rev 519) @@ -71,15 +71,17 @@ /** * Import a complete db from the given zip file. * - * @param model model of the db import operation - * @param user user which perform the import - * @param computeSteps flag to compute stesp inside this method + * @param model model of the db import operation + * @param user user which perform the import + * @param computeSteps flag to compute stesp inside this method + * @param commitAfterEachFile flag to commit after each imported file * @throws IOException if any io exception while import * @throws TopiaException if any pb while topia treatment */ public void importDb(ImportDbConfiguration model, EchoBaseUser user, - boolean computeSteps) throws IOException, TopiaException { + boolean computeSteps, + boolean commitAfterEachFile) throws IOException, TopiaException { File file = model.getInput().getFile(); @@ -125,6 +127,12 @@ importFile(entryDef, reader, csvResult); } finally { reader.close(); + + if (commitAfterEachFile) { + commitTransaction( + "Could not commit db import from file " + + file + "#" + entryDef.getFilename()); + } } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-04-10 20:46:01 UTC (rev 519) @@ -62,7 +62,7 @@ EchoBaseUser user = new EchoBaseUserImpl(); user.setEmail("testUser@fake.fr"); - service.importDb(conf, user, true); + service.importDb(conf, user, true, false); Assert.assertEquals(100f, conf.getProgression(), 1); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-04-10 20:46:01 UTC (rev 519) @@ -65,7 +65,7 @@ model.getInput().getFileName()); } - service.importDb(model, getEchoBaseSession().getEchoBaseUser(), true); + service.importDb(model, getEchoBaseSession().getEchoBaseUser(), true, false); } @Override