Author: tchemit Date: 2011-12-15 12:05:49 +0100 (Thu, 15 Dec 2011) New Revision: 194 Url: http://forge.codelutin.com/repositories/revision/echobase/194 Log: use exploded import service Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java 2011-12-15 11:05:26 UTC (rev 193) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java 2011-12-15 11:05:49 UTC (rev 194) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.services.CsvImportResult; -import fr.ifremer.echobase.services.DbImportExportService; +import fr.ifremer.echobase.services.DbImportService; import fr.ifremer.echobase.services.ImportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; @@ -54,7 +54,7 @@ protected CsvImportResult importResult; /** service to execute the import. */ - protected transient DbImportExportService service; + protected transient DbImportService service; protected ActionContext actionContext; @@ -77,7 +77,7 @@ } model = getEchoBaseSession().getImportDbConfiguration(); - service = newService(DbImportExportService.class); + service = newService(DbImportService.class); } @Override @@ -88,9 +88,10 @@ ActionContext.setContext(actionContext); // we must use a standalone transaction since it will pass through - // in more thna one request + // in more than one request - TopiaContextImplementor tx = (TopiaContextImplementor) serviceContext.getTransaction(); + TopiaContextImplementor tx = + (TopiaContextImplementor) serviceContext.getTransaction(); TopiaContextImplementor rootContext = tx.getRootContext(); TopiaContext topiaContext = rootContext.beginTransaction(); serviceContext.setTransaction(topiaContext);