Author: tchemit Date: 2011-12-26 11:13:15 +0100 (Mon, 26 Dec 2011) New Revision: 215 Url: http://forge.codelutin.com/repositories/revision/echobase/215 Log: use new service api Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-12-26 10:12:41 UTC (rev 214) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-12-26 10:13:15 UTC (rev 215) @@ -24,11 +24,9 @@ package fr.ifremer.echobase.ui; import com.google.common.base.Supplier; -import com.google.common.collect.Lists; import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserImpl; import fr.ifremer.echobase.entities.meta.DbMeta; @@ -104,10 +102,7 @@ new EchoBaseTopiaRootContextSupplierFactory(); rootContextSupplier = factory.newDatabaseFromConfig(configuration); applicationContext.setRootContextSupplier(rootContextSupplier); - List<EchoBaseEntityEnum> entityEnums = - Lists.newArrayList(EchoBaseEntityEnum.values()); -// entityEnums.remove(EchoBaseEntityEnum.EchoBaseUser); - DbMeta dbMeta = DbMeta.newDbMeta(entityEnums); + DbMeta dbMeta = DbMeta.newDbMeta(); applicationContext.setDbMeta(dbMeta); @@ -220,7 +215,7 @@ // no users in database create the admin user if (log.isInfoEnabled()) { log.info("No user in database, will create default " + - "admin user (password admin)."); + "admin user (password admin)."); } service.createDefaultAdminUser(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-12-26 10:12:41 UTC (rev 214) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-12-26 10:13:15 UTC (rev 215) @@ -24,7 +24,8 @@ package fr.ifremer.echobase.ui.actions.dbeditor; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.services.DbEditorService; +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.services.ExportService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -87,9 +88,10 @@ @Override public String execute() throws Exception { - DbEditorService service = newService(DbEditorService.class); + ExportService exportService = newService(ExportService.class); - String content = service.exportDatas(service.getTableMeta(entityType)); + TableMeta table = serviceContext.getDbMeta().getTable(entityType); + String content = exportService.exportDatas(table); if (log.isDebugEnabled()) { log.debug("file to export " + content); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2011-12-26 10:12:41 UTC (rev 214) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2011-12-26 10:13:15 UTC (rev 215) @@ -26,7 +26,7 @@ import com.google.common.base.Throwables; import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.services.CsvImportResult; -import fr.ifremer.echobase.services.DbEditorService; +import fr.ifremer.echobase.services.ImportService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -111,14 +111,14 @@ // to call input method on validation error to initialize dbeditor page public String execute() throws Exception { - DbEditorService dbEditorService = newService(DbEditorService.class); + ImportService importService = newService(ImportService.class); try { - result = dbEditorService.importDatas(getEntityType(), - importFileFileName, - importFile, - createIfNotFound, - getEchoBaseSession().getEchoBaseUser()); + result = importService.importDatas(getEntityType(), + importFileFileName, + importFile, + createIfNotFound, + getEchoBaseSession().getEchoBaseUser()); } catch (Exception eee) { String message = "Failed to import datas : ";