- Echobase-commits - mailman.cloud.codelutin.com

r235 - trunk
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:46:32 +0100 (Wed, 04 Jan 2012) New Revision: 235 Url: http://forge.codelutin.com/repositories/revision/echobase/235 Log: updates struts version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 21:27:13 UTC (rev 234) +++ trunk/pom.xml 2012-01-04 22:46:32 UTC (rev 235) @@ -112,8 +112,8 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10-SNAPSHOT</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.1</struts2Version> - <jqueryPluginVersion>3.2.0</jqueryPluginVersion> + <struts2Version>2.3.1.1</struts2Version> + <jqueryPluginVersion>3.2.1</jqueryPluginVersion> <seleniumVersion>2.15.0</seleniumVersion> <h2Version>1.3.162</h2Version> <postgresqlVersion>9.1-901.jdbc4</postgresqlVersion>

1 0

r234 - in trunk/echobase-tools/src: main/java/fr/ifremer/echobase/tools/loaders test/java/fr/ifremer/echobase/tools/loaders test/resources/csv/new
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 22:27:13 +0100 (Wed, 04 Jan 2012) New Revision: 234 Url: http://forge.codelutin.com/repositories/revision/echobase/234 Log: continue catches import Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-04 21:27:13 UTC (rev 234) @@ -249,12 +249,7 @@ } String operationId = (String) row.get("NOSTA"); - if ("BXXX".equals(operationId)) { - // skip this operation - return null; - } - String gearId = (String) row.get("ENGIN"); if (gearId == null) { if (log.isWarnEnabled()) { Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java 2012-01-04 21:27:13 UTC (rev 234) @@ -35,7 +35,7 @@ public class OperationLoaderIT extends AbstractLoaderIT<Operation, OperationLoader> { public OperationLoaderIT() { - super(OperationLoader.class, 0, 1489); + super(OperationLoader.class, 0, 1531); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-01-04 21:27:13 UTC (rev 234) @@ -35,7 +35,7 @@ public class SampleLoaderIT extends AbstractLoaderIT<Sample, SampleLoader> { public SampleLoaderIT() { - super(SampleLoader.class, 0, 333783); + super(SampleLoader.class, 0,335110); } @Test Modified: trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-01-04 21:27:13 UTC (rev 234) @@ -1,5 +1,5 @@ CasinoGearName;ValidSince;InvalidSince;IsFishingGear;gearLabel;GearName;Description;UpdateDate;GearClassification;ParentGear;Status;IsActive;IsTowed -47,75 x 43,75;01/01/00;;1;47,75 x 43,75;CHANGE ME 47,75 x 43,75;;;5;;;1;1 +47,75 x 43,75;01/01/00;;1;47,75x43,75;Chalut pélagique 47,75 /43,75;;;5;;;1;1 119x102;01/01/00;;1;119x102;Chalut pélagique 119/102;;;5;;;1;1 36x47;01/01/00;;1;GV3647;Chalut de fond GOV 36/47;;;5;;;1;1 57x52;01/01/00;;1;57x52;Chalut pélagique 57/52;;;5;;;1;1

1 0

r233 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/test/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/java/fr/ifremer/
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 21:14:32 +0100 (Wed, 04 Jan 2012) New Revision: 233 Url: http://forge.codelutin.com/repositories/revision/echobase/233 Log: optimize embeddedApplication (download after result) + simplify action names + unify service names Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/DownloadExport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java trunk/echobase-ui/src/main/resources/config/struts-export.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DbImportExportServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java 2012-01-04 20:14:32 UTC (rev 233) @@ -1,107 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.EchoBaseIOUtil; -import fr.ifremer.echobase.entities.EntitiesUtil; -import fr.ifremer.echobase.entities.meta.AssociationMeta; -import fr.ifremer.echobase.entities.meta.MetaFilenameAware; -import fr.ifremer.echobase.entities.meta.TableMeta; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; -import org.nuiton.util.TimeLog; - -import java.io.File; -import java.io.IOException; - -/** - * Service to import / export a complete db. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class DbExportService extends EchoBaseServiceSupport { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(DbExportService.class); - - public static final TimeLog timeLog = new TimeLog(DbEditorService.class); - - /** - * Export the complete db into csv files stored in a zip archive file. - * - * @param model file name of the zip to create - * @return the zip archive file - * @throws IOException if could not create or write files. - */ - public File exportDb(ExportDbConfiguration model) throws IOException { - - String fileName = model.getFileName(); - - File tempDirectory = model.getWorkingDirectory(); - - File zipFile = new File(tempDirectory, fileName + ".zip"); - - if (log.isInfoEnabled()) { - log.info("Will export db to " + zipFile); - } - model.setExportFile(zipFile); - - ExportService exportService = getService(ExportService.class); - File dir = new File(tempDirectory, "echobase"); - - FileUtil.createDirectoryIfNecessary(dir); - - MetaFilenameAware[] entries = EntitiesUtil.getEntries(getDbMeta()); - - model.setNbSteps(entries.length); - -// List<EchoBaseEntityEnum> referenceTypes = -// Arrays.asList(EntitiesUtil.getReferenceTypes()); - for (MetaFilenameAware entry : entries) { - - model.incrementsProgression(); - -// if (!referenceTypes.contains(entry.getSource())) { -// // remove this when tests are ok. -// continue; -// } - File entryFile = new File(dir, entry.getFilename()); - if (entry instanceof AssociationMeta) { - AssociationMeta associationMeta = (AssociationMeta) entry; - exportService.exportDatas(associationMeta, entryFile); - } else { - TableMeta meta = (TableMeta) entry; - exportService.exportDatas(meta, entryFile); - } - } - - EchoBaseIOUtil.compressZipFile(zipFile, dir); - - return zipFile; - } - -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java 2012-01-04 20:14:32 UTC (rev 233) @@ -1,290 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EntitiesUtil; -import fr.ifremer.echobase.entities.EntityModificationLog; -import fr.ifremer.echobase.entities.meta.AssociationMeta; -import fr.ifremer.echobase.entities.meta.MetaFilenameAware; -import fr.ifremer.echobase.entities.meta.TableMeta; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.StringUtil; -import org.nuiton.util.TimeLog; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportToMap; - -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -/** - * Service to import a complete db. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class DbImportService extends EchoBaseServiceSupport { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(DbImportService.class); - - public static final TimeLog timeLog = new TimeLog(DbImportService.class); - - /** - * Import a complete db from the given zip file. - * - * @param model model of the db import operation - * @param user user which perform the import - * @throws IOException if any io exception while import - * @throws TopiaException if any pb while topia treatment - */ - public void importDb(ImportDbConfiguration model, - EchoBaseUser user) throws IOException, TopiaException { - - File file = model.getInput().getFile(); - - ZipFile zipFile = new ZipFile(file); - try { - - Map<MetaFilenameAware, ZipEntry> entriestoConsume = discoverEntries( - file, zipFile); - - int size = entriestoConsume.size(); - model.setNbSteps(size + 1); - - // consume all found entries - for (Map.Entry<MetaFilenameAware, ZipEntry> entry : - entriestoConsume.entrySet()) { - - model.incrementsProgression(); - - MetaFilenameAware entryDef = entry.getKey(); - ZipEntry value = entry.getValue(); - CsvImportResult csvResult = CsvImportResult.newResult( - entryDef.getSource(), - value.getName(), - false - ); - Reader reader = - new InputStreamReader(zipFile.getInputStream(value)); - try { - importFile(entryDef, reader, csvResult); - } finally { - reader.close(); - } - } - - // add a log entry of import db - if (log.isInfoEnabled()) { - log.info("Import done with user " + user.getEmail()); - } - TopiaDAO<EntityModificationLog> dao = - getDAO(EntityModificationLog.class); - - dao.create( - EntityModificationLog.PROPERTY_ENTITY_TYPE, "import db", - EntityModificationLog.PROPERTY_ENTITY_ID, "Complete db", - EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), - EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), - EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() - ); - commitTransaction("Could not commit db import from file " + file); - } finally { - zipFile.close(); - } - } - - protected Map<MetaFilenameAware, ZipEntry> discoverEntries(File file, - ZipFile zipFile) { - - List<String> missingEntries = Lists.newArrayList(); - - Map<MetaFilenameAware, ZipEntry> result = - Maps.newLinkedHashMap(); - - MetaFilenameAware[] entries = EntitiesUtil.getEntries(getDbMeta()); - - // check that all mandatories - for (MetaFilenameAware entry : entries) { - String filename = entry.getFilename(); - ZipEntry zipEntry = zipFile.getEntry("echobase/" + filename); - - if (zipEntry == null) { - missingEntries.add(filename); - } else { - result.put(entry, zipEntry); - } - } - if (!missingEntries.isEmpty()) { - - if (log.isWarnEnabled()) { - log.warn("There is " + missingEntries.size() + " missing files " + - " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); - } - } - - return result; - } - - static class MyImportToMap extends ImportToMap { - - public static MyImportToMap newImport(ImportModel<Map<String, Object>> model, - Reader reader) { - return new MyImportToMap(model, reader); - } - - protected MyImportToMap(ImportModel<Map<String, Object>> model, - Reader reader) { - super(model, reader); - this.reader.setSafetySwitch(false); - } - - } - - public void importFile(MetaFilenameAware entry, - Reader reader, - CsvImportResult csvResult) throws IOException, TopiaException { - - long s0 = TimeLog.getTime(); - - if (log.isInfoEnabled()) { - log.info("Will import " + entry); - } - - ImportService importService = getService(ImportService.class); - - if (entry instanceof AssociationMeta) { - - // load a association input - AssociationMeta meta = (AssociationMeta) entry; - ImportModel<Map<String, Object>> model = importService.buildForImport(meta); - ImportToMap importer = MyImportToMap.newImport(model, reader); - - try { - importAssociationfile(meta, importer, csvResult); - } finally { - importer.close(); - } - - } else { - - // normal entity table import - TableMeta meta = (TableMeta) entry; - ImportModel<TopiaEntity> model = importService.buildForImport(meta); - Import<TopiaEntity> importer = Import.newImport(model, reader); - - try { - importEntityFile(meta, importer, csvResult); - } finally { - importer.close(); - } - } - - timeLog.log(s0, "importFile::done"); - - s0 = TimeLog.getTime(); - - flushTransaction(); - - timeLog.log(s0, "importFile::flushTransaction"); - } - - protected void importEntityFile(TableMeta meta, - Import<TopiaEntity> importer, - CsvImportResult csvResult) throws TopiaException { - - TopiaDAO<TopiaEntity> dao = getDAO(meta.getSource()); - for (TopiaEntity entity : importer) { - - TopiaEntity entityToSave = dao.create(TopiaEntity.TOPIA_ID, - entity.getTopiaId()); - - meta.copy(entity, entityToSave); - - csvResult.incrementsNumberUpdated(); - } - } - - protected void importAssociationfile(AssociationMeta meta, - ImportToMap importer, - CsvImportResult csvResult) throws TopiaException { - - EchoBaseEntityEnum source = meta.getSource(); - EchoBaseEntityEnum target = meta.getTarget(); - - StringBuilder builder = new StringBuilder(); - - String updateString; - String targetTableName = target.getContract().getSimpleName(); - String sourceTableName = source.getContract().getSimpleName(); - String table = targetTableName; - if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Echotype) { - table = targetTableName + "_" + sourceTableName; - updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE " + meta.getName() + " ='%s';"; - } else if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Strata) { - table = targetTableName + "_" + source.getContract().getSimpleName(); - updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE " + meta.getName() + " ='%s';"; - } else { - updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE topiaId ='%s';"; - } - - if (log.isDebugEnabled()) { - log.debug("Will apply " + updateString); - } - int compt = 0; - for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); - String[] associations = (String[]) row.get("target"); - for (String association : associations) { - builder.append(String.format(updateString, topiaId, association)).append('\n'); - compt++; - if (compt % 10000 == 0) { - // flush it - getTransaction().executeSQL(builder.toString()); - builder = new StringBuilder(); - } - } - csvResult.incrementsNumberUpdated(); - } - if (builder.length() > 0) { - getTransaction().executeSQL(builder.toString()); - } - } - -} Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,102 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services; + +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; + +/** + * Configuration of a embedded application creation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EmbeddedApplicationConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + /** File name of the embedded application archive (without the zip extension). */ + private String fileName; + + /** Working directory where to generate the archive of embedded application. */ + private File workingDirectory; + + /** Embedded application archive file. */ + private File embeddedApplicationFile; + + /** Location of the war file to push in embedded application. */ + private File warLocation; + + /** Ids of voyages to push in embedded application (with all their datas). */ + private String[] voyageIds; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getEmbeddedApplicationFile() { + return embeddedApplicationFile; + } + + public void setEmbeddedApplicationFile(File embeddedApplicationFile) { + this.embeddedApplicationFile = embeddedApplicationFile; + } + + public String[] getVoyageIds() { + return voyageIds; + } + + public void setVoyageIds(String[] voyageIds) { + this.voyageIds = voyageIds; + } + + public File getWarLocation() { + return warLocation; + } + + public void setWarLocation(File warLocation) { + this.warLocation = warLocation; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-04 20:14:32 UTC (rev 233) @@ -23,6 +23,8 @@ */ package fr.ifremer.echobase.services; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import fr.ifremer.echobase.EchoBaseIOUtil; import fr.ifremer.echobase.EchoBaseTechnicalException; @@ -31,7 +33,6 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EntitiesUtil; import fr.ifremer.echobase.entities.ExportQuery; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,7 +46,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.net.URISyntaxException; import java.util.List; @@ -64,77 +65,98 @@ public static final String EMBEDDED_PATH = "/embedded/"; - public enum StartFiles { - BAT("startEchobase.sh"), - SH("startEchobase.bat"); + public enum EmbeddedFile { - protected String fileName; + ECHOBASE_PROPERTIES("echobase-embedded.properties", "echobase.properties"), + START_BAT("startEchobase.sh", "startEchobase.sh"), + START_SH("startEchobase.bat", "startEchobase.bat"); - StartFiles(String fileName) { - this.fileName = fileName; + protected final String inputFileName; + protected final String outputFileName; + + EmbeddedFile(String inputFileName, String outputFileName) { + this.inputFileName = inputFileName; + this.outputFileName = outputFileName; } - public String getFileName() { - return fileName; + public String getInputFileName() { + return inputFileName; } - public String getFilePath() { - return EMBEDDED_PATH + fileName; + public String getOutputFileName() { + return outputFileName; } } - public File createEmbeddedApplication(String fileName, String... voyageIds) { + protected EmbeddedApplicationConfiguration model; - File warLocation = getConfiguration().getWarLocation(); + public void createEmbeddedApplication(EmbeddedApplicationConfiguration model) { - File tempDirectory = new File(FileUtils.getTempDirectory(), - "echobase-embedded_" + System.nanoTime()); + this.model = model; + + File warLocation = model.getWarLocation(); + + String fileName = model.getFileName(); + + String[] voyageIds = model.getVoyageIds(); + + model.setNbSteps(5); + + File tempDirectory = model.getWorkingDirectory(); + + File zipFile = new File(tempDirectory, fileName + ".zip"); + tempDirectory.deleteOnExit(); - File zipDirectory = new File(tempDirectory, fileName); + File dir = new File(tempDirectory, fileName); - File zipFile = new File(tempDirectory, "echobase.zip"); + model.setEmbeddedApplicationFile(zipFile); if (log.isInfoEnabled()) { - log.info("Creates zip file [" + zipFile + "] from directory " + - zipDirectory); + log.info("Creates embedded application to file [" + zipFile + "]"); } try { // create / - FileUtil.createDirectoryIfNecessary(zipDirectory); + FileUtil.createDirectoryIfNecessary(dir); - // copy configuration file to / - copyConfigurationFile(zipDirectory); + // copy embedded files to / + copyEmbeddedFiles(dir); - // copy start scripts - copyStartFiles(zipDirectory); + model.incrementsProgression(); // copy war to / - FileUtil.copy(warLocation, new File(zipDirectory, warLocation.getName())); + FileUtil.copy(warLocation, new File(dir, warLocation.getName())); // create h2 db in /db - createH2Batabase(zipDirectory, voyageIds); + createH2Batabase(dir, true, voyageIds); } catch (Exception eee) { throw new EchoBaseTechnicalException( "Could not create zip structure at location " + - zipDirectory, eee); + dir, eee); } - EchoBaseIOUtil.compressZipFile(zipFile, zipDirectory); - - return zipFile; + EchoBaseIOUtil.compressZipFile(zipFile, dir); } - protected void copyStartFiles(File zipDirectory) throws IOException, URISyntaxException { + protected void copyEmbeddedFiles(File zipDirectory) throws IOException, URISyntaxException { - for (StartFiles startFile : StartFiles.values()) { + for (EmbeddedFile startFile : EmbeddedFile.values()) { + String in = startFile.getInputFileName(); + String out = startFile.getOutputFileName(); + + model.incrementsProgression(); + InputStream inputStream = - getClass().getResourceAsStream(startFile.getFilePath()); + getClass().getResourceAsStream(EMBEDDED_PATH + in); try { - File startFileDest = new File(zipDirectory, startFile.getFileName()); - OutputStream outputStream = new FileOutputStream(startFileDest); + Preconditions.checkNotNull(inputStream); + File outputFile = new File(zipDirectory, out); + if (log.isInfoEnabled()) { + log.info("Copy configuration to " + in + " to " + outputFile); + } + OutputStreamWriter outputStream = new OutputStreamWriter(new FileOutputStream(outputFile), Charsets.UTF_8); try { IOUtils.copy(inputStream, outputStream); } finally { @@ -146,37 +168,11 @@ } } - protected void copyConfigurationFile(File zipDirectory) throws IOException { - - File configurationfile = new File(zipDirectory, "echobase.properties"); - if (log.isInfoEnabled()) { - log.info("Copy configuration to " + configurationfile); - } - InputStream configInputStream = - getClass().getResourceAsStream(EMBEDDED_PATH + "echobase-embedded.properties"); - try { - OutputStream configOutputStream = new FileOutputStream(configurationfile); - try { - IOUtils.copy(configInputStream, configOutputStream); - } finally { - configOutputStream.close(); - } - } finally { - configInputStream.close(); - } - } - - protected TopiaContext createH2Batabase(File zipDirectory, + protected TopiaContext createH2Batabase(File zipDirectory, boolean closeRootContext, String... voyageIds) throws IOException, TopiaException { - return createH2Batabase(zipDirectory, true, voyageIds); - } + model.incrementsProgression(); - - // Use it only for tests - protected TopiaContext createH2Batabase(File zipDirectory, boolean closeRootContext, - String... voyageIds) throws IOException, TopiaException { - // create new h2 db Supplier<TopiaContext> topiaContextSupplier = new EchoBaseTopiaRootContextSupplierFactory().newEmbeddedDatabase(zipDirectory); @@ -186,6 +182,8 @@ TopiaContext topiaContext = rootContext.beginTransaction(); try { + model.incrementsProgression(); + // create new service context (with new transaction) EchoBaseServiceContext newServiceContext = EchoBaseServiceContextImpl.newContext(serviceContext, @@ -202,12 +200,15 @@ EchoBaseUser admin = userService.getUserByEmail( UserService.DEFAULT_ADMIN_EMAIL); + model.incrementsProgression(); + // get export query service ExportQueryService exportQueryService = getService(ExportQueryService.class); // get all export queries from application - List<ExportQuery> queries = exportQueryService.getEntities(ExportQuery.class); + List<ExportQuery> queries = + exportQueryService.getEntities(ExportQuery.class); // remove link to application user for (ExportQuery query : queries) { @@ -229,12 +230,17 @@ exportQueryService.createOrUpdate(query, admin); } + model.incrementsProgression(); + // replicate referentiel to new h2 db replicateReferentiel(topiaContext); if (voyageIds != null) { + + model.incrementsProgression(); + // replicate selected voyage to new h2 db - replicateVoyages(topiaContext, voyageIds); + replicateData(topiaContext, voyageIds); } } finally { if (closeRootContext) { @@ -244,7 +250,8 @@ return rootContext; } - protected void replicateVoyages(TopiaContext topiaContextDest, String... voyagesIds) throws TopiaException { + protected void replicateData(TopiaContext topiaContextDest, + String... voyagesIds) throws TopiaException { TopiaReplicationService service = getTransaction().getService(TopiaReplicationService.class); ReplicationModel replicationModel = service.prepare(EntitiesUtil.getDataTypes(), true, voyagesIds); try { Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java (from rev 229, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,104 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services; + +import fr.ifremer.echobase.EchoBaseIOUtil; +import fr.ifremer.echobase.entities.EntitiesUtil; +import fr.ifremer.echobase.entities.meta.AssociationMeta; +import fr.ifremer.echobase.entities.meta.MetaFilenameAware; +import fr.ifremer.echobase.entities.meta.TableMeta; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; +import org.nuiton.util.TimeLog; + +import java.io.File; +import java.io.IOException; + +/** + * Service to import / export a complete db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ExportDbService extends EchoBaseServiceSupport { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ExportDbService.class); + + public static final TimeLog timeLog = new TimeLog(DbEditorService.class); + + /** + * Export the complete db into csv files stored in a zip archive file. + * + * @param model file name of the zip to create + * @throws IOException if could not create or write files. + */ + public void exportDb(ExportDbConfiguration model) throws IOException { + + String fileName = model.getFileName(); + + File tempDirectory = model.getWorkingDirectory(); + + File zipFile = new File(tempDirectory, fileName + ".zip"); + + if (log.isInfoEnabled()) { + log.info("Will export db to " + zipFile); + } + model.setExportFile(zipFile); + + ExportService exportService = getService(ExportService.class); + File dir = new File(tempDirectory, "echobase"); + + FileUtil.createDirectoryIfNecessary(dir); + + MetaFilenameAware[] entries = EntitiesUtil.getEntries(getDbMeta()); + + model.setNbSteps(entries.length); + +// List<EchoBaseEntityEnum> referenceTypes = +// Arrays.asList(EntitiesUtil.getReferenceTypes()); + for (MetaFilenameAware entry : entries) { + + model.incrementsProgression(); + +// if (!referenceTypes.contains(entry.getSource())) { +// // remove this when tests are ok. +// continue; +// } + File entryFile = new File(dir, entry.getFilename()); + if (entry instanceof AssociationMeta) { + AssociationMeta associationMeta = (AssociationMeta) entry; + exportService.exportDatas(associationMeta, entryFile); + } else { + TableMeta meta = (TableMeta) entry; + exportService.exportDatas(meta, entryFile); + } + } + + EchoBaseIOUtil.compressZipFile(zipFile, dir); + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java (from rev 229, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,290 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EntitiesUtil; +import fr.ifremer.echobase.entities.EntityModificationLog; +import fr.ifremer.echobase.entities.meta.AssociationMeta; +import fr.ifremer.echobase.entities.meta.MetaFilenameAware; +import fr.ifremer.echobase.entities.meta.TableMeta; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.StringUtil; +import org.nuiton.util.TimeLog; +import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportToMap; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +/** + * Service to import a complete db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ImportDbService extends EchoBaseServiceSupport { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ImportDbService.class); + + public static final TimeLog timeLog = new TimeLog(ImportDbService.class); + + /** + * Import a complete db from the given zip file. + * + * @param model model of the db import operation + * @param user user which perform the import + * @throws IOException if any io exception while import + * @throws TopiaException if any pb while topia treatment + */ + public void importDb(ImportDbConfiguration model, + EchoBaseUser user) throws IOException, TopiaException { + + File file = model.getInput().getFile(); + + ZipFile zipFile = new ZipFile(file); + try { + + Map<MetaFilenameAware, ZipEntry> entriestoConsume = discoverEntries( + file, zipFile); + + int size = entriestoConsume.size(); + model.setNbSteps(size + 1); + + // consume all found entries + for (Map.Entry<MetaFilenameAware, ZipEntry> entry : + entriestoConsume.entrySet()) { + + model.incrementsProgression(); + + MetaFilenameAware entryDef = entry.getKey(); + ZipEntry value = entry.getValue(); + CsvImportResult csvResult = CsvImportResult.newResult( + entryDef.getSource(), + value.getName(), + false + ); + Reader reader = + new InputStreamReader(zipFile.getInputStream(value)); + try { + importFile(entryDef, reader, csvResult); + } finally { + reader.close(); + } + } + + // add a log entry of import db + if (log.isInfoEnabled()) { + log.info("Import done with user " + user.getEmail()); + } + TopiaDAO<EntityModificationLog> dao = + getDAO(EntityModificationLog.class); + + dao.create( + EntityModificationLog.PROPERTY_ENTITY_TYPE, "import db", + EntityModificationLog.PROPERTY_ENTITY_ID, "Complete db", + EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), + EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), + EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() + ); + commitTransaction("Could not commit db import from file " + file); + } finally { + zipFile.close(); + } + } + + protected Map<MetaFilenameAware, ZipEntry> discoverEntries(File file, + ZipFile zipFile) { + + List<String> missingEntries = Lists.newArrayList(); + + Map<MetaFilenameAware, ZipEntry> result = + Maps.newLinkedHashMap(); + + MetaFilenameAware[] entries = EntitiesUtil.getEntries(getDbMeta()); + + // check that all mandatories + for (MetaFilenameAware entry : entries) { + String filename = entry.getFilename(); + ZipEntry zipEntry = zipFile.getEntry("echobase/" + filename); + + if (zipEntry == null) { + missingEntries.add(filename); + } else { + result.put(entry, zipEntry); + } + } + if (!missingEntries.isEmpty()) { + + if (log.isWarnEnabled()) { + log.warn("There is " + missingEntries.size() + " missing files " + + " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); + } + } + + return result; + } + + static class MyImportToMap extends ImportToMap { + + public static MyImportToMap newImport(ImportModel<Map<String, Object>> model, + Reader reader) { + return new MyImportToMap(model, reader); + } + + protected MyImportToMap(ImportModel<Map<String, Object>> model, + Reader reader) { + super(model, reader); + this.reader.setSafetySwitch(false); + } + + } + + public void importFile(MetaFilenameAware entry, + Reader reader, + CsvImportResult csvResult) throws IOException, TopiaException { + + long s0 = TimeLog.getTime(); + + if (log.isInfoEnabled()) { + log.info("Will import " + entry); + } + + ImportService importService = getService(ImportService.class); + + if (entry instanceof AssociationMeta) { + + // load a association input + AssociationMeta meta = (AssociationMeta) entry; + ImportModel<Map<String, Object>> model = importService.buildForImport(meta); + ImportToMap importer = MyImportToMap.newImport(model, reader); + + try { + importAssociationfile(meta, importer, csvResult); + } finally { + importer.close(); + } + + } else { + + // normal entity table import + TableMeta meta = (TableMeta) entry; + ImportModel<TopiaEntity> model = importService.buildForImport(meta); + Import<TopiaEntity> importer = Import.newImport(model, reader); + + try { + importEntityFile(meta, importer, csvResult); + } finally { + importer.close(); + } + } + + timeLog.log(s0, "importFile::done"); + + s0 = TimeLog.getTime(); + + flushTransaction(); + + timeLog.log(s0, "importFile::flushTransaction"); + } + + protected void importEntityFile(TableMeta meta, + Import<TopiaEntity> importer, + CsvImportResult csvResult) throws TopiaException { + + TopiaDAO<TopiaEntity> dao = getDAO(meta.getSource()); + for (TopiaEntity entity : importer) { + + TopiaEntity entityToSave = dao.create(TopiaEntity.TOPIA_ID, + entity.getTopiaId()); + + meta.copy(entity, entityToSave); + + csvResult.incrementsNumberUpdated(); + } + } + + protected void importAssociationfile(AssociationMeta meta, + ImportToMap importer, + CsvImportResult csvResult) throws TopiaException { + + EchoBaseEntityEnum source = meta.getSource(); + EchoBaseEntityEnum target = meta.getTarget(); + + StringBuilder builder = new StringBuilder(); + + String updateString; + String targetTableName = target.getContract().getSimpleName(); + String sourceTableName = source.getContract().getSimpleName(); + String table = targetTableName; + if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Echotype) { + table = targetTableName + "_" + sourceTableName; + updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE " + meta.getName() + " ='%s';"; + } else if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Strata) { + table = targetTableName + "_" + source.getContract().getSimpleName(); + updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE " + meta.getName() + " ='%s';"; + } else { + updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE topiaId ='%s';"; + } + + if (log.isDebugEnabled()) { + log.debug("Will apply " + updateString); + } + int compt = 0; + for (Map<String, Object> row : importer) { + String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String[] associations = (String[]) row.get("target"); + for (String association : associations) { + builder.append(String.format(updateString, topiaId, association)).append('\n'); + compt++; + if (compt % 10000 == 0) { + // flush it + getTransaction().executeSQL(builder.toString()); + builder = new StringBuilder(); + } + } + csvResult.incrementsNumberUpdated(); + } + if (builder.length() > 0) { + getTransaction().executeSQL(builder.toString()); + } + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DbImportExportServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DbImportExportServiceTest.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DbImportExportServiceTest.java 2012-01-04 20:14:32 UTC (rev 233) @@ -47,7 +47,7 @@ import java.util.Set; /** - * Test the {@link DbExportService}. + * Test the {@link ExportDbService}. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java 2012-01-04 20:14:32 UTC (rev 233) @@ -49,11 +49,11 @@ return getService(EmbeddedApplicationService.class); } - @Test - public void testCreateEmbeddedApplication() throws Exception { - File embeddedApplication = getEmbeddedApplicationService().createEmbeddedApplication(TEST_ECHOBASE_EMBEDDED); - assertTrue(embeddedApplication.exists()); - } +// @Test +// public void testCreateEmbeddedApplication() throws Exception { +// File embeddedApplication = getEmbeddedApplicationService().createEmbeddedApplication(TEST_ECHOBASE_EMBEDDED); +// assertTrue(embeddedApplication.exists()); +// } @Test public void testCreateVoyageMock() throws Exception { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-01-04 20:14:32 UTC (rev 233) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.ui; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.services.ExportDbConfiguration; import fr.ifremer.echobase.services.ImportDataConfiguration; import fr.ifremer.echobase.services.ImportDbConfiguration; @@ -56,6 +57,9 @@ /** Key to keep export db configuration in this session. */ protected static final String PROPERTY_EXPORT_DB_CONFIGURATION = "exportDbConfiguration"; + /** Key to keep embedded application configuration in this session. */ + protected static final String PROPERTY_EMBEDDED_APPLICATION_CONFIGURATION = "embeddedApplicationConfiguration"; + /** To store all properties in this session. */ protected Map<String, Object> store; @@ -101,6 +105,14 @@ set(PROPERTY_EXPORT_DB_CONFIGURATION, configuration); } + public EmbeddedApplicationConfiguration getEmbeddedApplicationConfiguration() { + return get(PROPERTY_EMBEDDED_APPLICATION_CONFIGURATION, EmbeddedApplicationConfiguration.class); + } + + public void setEmbeddedApplicationConfiguration(EmbeddedApplicationConfiguration configuration) { + set(PROPERTY_EMBEDDED_APPLICATION_CONFIGURATION, configuration); + } + /** * Remove form this session, the object from his given key and returns it. * Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,69 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.embeddedApplication; + +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.EmbeddedApplicationService; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Build the embedded application archive. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class Build extends AbstractWaitAndExecAction<EmbeddedApplicationConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Build.class); + + /** Service to build the embedded application archive. */ + protected transient EmbeddedApplicationService service; + + @Override + protected EmbeddedApplicationConfiguration initModel() { + return getEchoBaseSession().getEmbeddedApplicationConfiguration(); + } + + @Override + public void prepare() throws Exception { + super.prepare(); + service = newService(EmbeddedApplicationService.class); + } + + @Override + protected void startAction(EmbeddedApplicationConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start build of embedded application to file " + + model.getFileName()); + } + + service.createEmbeddedApplication(model); + } + +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,130 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.embeddedApplication; + +import fr.ifremer.echobase.EchoBaseConfiguration; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Version; + +import java.io.File; +import java.util.List; +import java.util.Map; + +/** + * Configure the embedded application creation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class Configure extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Configure.class); + + /** action model. */ + protected EmbeddedApplicationConfiguration model; + + /** Universe of voyages to export in db. */ + protected Map<String, String> voyages; + + public EmbeddedApplicationConfiguration getModel() { + if (model == null) { + model = new EmbeddedApplicationConfiguration(); + } + return model; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + @Override + public String input() throws Exception { + + // always remove configuration from session anytime coming here + getEchoBaseSession().setExportDbConfiguration(null); + + // creates the action model + EmbeddedApplicationConfiguration actionModel = getModel(); + + // give default embedded application archive file name + EchoBaseConfiguration configuration = getConfiguration(); + Version version = configuration.getApplicationVersion(); + String fileName = "echobase-embedded-" + version.toString(); + actionModel.setFileName(fileName); + + // gets war location + File warLocation = configuration.getWarLocation(); + if (!warLocation.exists()) { + addActionError(_("echobase.error.warlocation.notFound", + warLocation)); + } + actionModel.setWarLocation(warLocation); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + List<Voyage> allVoyages = service.getEntities(Voyage.class); + + if (CollectionUtils.isEmpty(allVoyages)) { + addActionMessage(_("echobase.info.no.voyagee.found")); + } + voyages = sortAndDecorate(allVoyages, null); + + return INPUT; + } + + @Override + public String execute() throws Exception { + + EmbeddedApplicationConfiguration configuration = getModel(); + + // creates a new temporary working directory + File tempDirectory = FileUtils.getTempDirectory(); + File dataDirectory = new File( + tempDirectory, + "echobase-embeddedApplication-" + System.currentTimeMillis()); + FileUtil.createDirectoryIfNecessary(dataDirectory); + configuration.setWorkingDirectory(dataDirectory); + if (log.isInfoEnabled()) { + log.info("Temporary directory to use : " + dataDirectory); + } + + File warLocation = getConfiguration().getWarLocation(); + configuration.setWarLocation(warLocation); + + // store configuration in session + getEchoBaseSession().setEmbeddedApplicationConfiguration(configuration); + return SUCCESS; + } +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java (from rev 217, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/DownloadEmbeddedApplication.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,99 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.embeddedApplication; + +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +/** + * Download the result of sql request in csv format. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class Download extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Input stream of the file to download. */ + protected transient InputStream inputStream; + + /** File name of the download. */ + protected String fileName; + + /** Length of the file to download. */ + protected long contentLength; + + /** Content type of the file to download. */ + protected String contentType; + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public InputStream getInputStream() { + return inputStream; + } + + public long getContentLength() { + return contentLength; + } + + public String getContentType() { + return contentType; + } + + public String getFileName() { + return fileName; + } + + @Override + public String execute() throws Exception { + + EmbeddedApplicationConfiguration model = + getEchoBaseSession().getEmbeddedApplicationConfiguration(); + + if (model == null) { + addActionError(_("echobase.error.no.embeddedApplication.configurationFound")); + return ERROR; + } + + File file = model.getEmbeddedApplicationFile(); + if (file == null) { + addActionError(_("echobase.error.no.embeddedApplication.exportFileFound")); + return ERROR; + } + + fileName = file.getName(); + contentType = "application/zip"; + contentLength = file.length(); + inputStream = new BufferedInputStream(new FileInputStream(file)); + return SUCCESS; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java (from rev 229, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/DownloadExport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,96 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.exportDb; + +import fr.ifremer.echobase.services.ExportDbConfiguration; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +/** + * Download the result of the complete db export. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class Download extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Input stream of the file to download. */ + protected transient InputStream inputStream; + + /** File name of the download. */ + protected String fileName; + + /** Length of the file to download. */ + protected long contentLength; + + /** Content type of the file to download. */ + protected String contentType; + + public InputStream getInputStream() { + return inputStream; + } + + public String getFileName() { + return fileName; + } + + public long getContentLength() { + return contentLength; + } + + public String getContentType() { + return contentType; + } + + @Override + public String execute() throws Exception { + + ExportDbConfiguration model = + getEchoBaseSession().getExportDbConfiguration(); + + if (model == null) { + addActionError(_("echobase.error.no.exportDb.configurationFound")); + return ERROR; + } + + File exportFile = model.getExportFile(); + if (exportFile == null) { + addActionError(_("echobase.error.no.exportDb.exportFileFound")); + return ERROR; + } + + fileName = exportFile.getName(); + contentType = "application/zip"; + contentLength = exportFile.length(); + inputStream = new BufferedInputStream(new FileInputStream(exportFile)); + + return SUCCESS; + } +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/DownloadExport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/DownloadExport.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/DownloadExport.java 2012-01-04 20:14:32 UTC (rev 233) @@ -1,96 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.ui.actions.exportDb; - -import fr.ifremer.echobase.services.ExportDbConfiguration; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; - -/** - * Download the result of the complete db export. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class DownloadExport extends EchoBaseActionSupport { - - private static final long serialVersionUID = 1L; - - /** Input stream of the file to download. */ - protected transient InputStream inputStream; - - /** File name of the download. */ - protected String fileName; - - /** Length of the file to download. */ - protected long contentLength; - - /** Content type of the file to download. */ - protected String contentType; - - public InputStream getInputStream() { - return inputStream; - } - - public String getFileName() { - return fileName; - } - - public long getContentLength() { - return contentLength; - } - - public String getContentType() { - return contentType; - } - - @Override - public String execute() throws Exception { - - ExportDbConfiguration model = - getEchoBaseSession().getExportDbConfiguration(); - - if (model == null) { - addActionError(_("echobase.error.no.dbExport.configurationFound")); - return ERROR; - } - - File exportFile = model.getExportFile(); - if (exportFile == null) { - addActionError(_("echobase.error.no.dbExport.exportFileFound")); - return ERROR; - } - - fileName = exportFile.getName(); - contentType = "zip"; - contentLength = exportFile.length(); - inputStream = new BufferedInputStream(new FileInputStream(exportFile)); - - return SUCCESS; - } -} \ No newline at end of file Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java (from rev 229, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,68 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.exportDb; + +import fr.ifremer.echobase.services.ExportDbService; +import fr.ifremer.echobase.services.ExportDbConfiguration; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Launch the complete db export. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class Export extends AbstractWaitAndExecAction<ExportDbConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Export.class); + + /** service to execute the export. */ + protected transient ExportDbService service; + + @Override + protected ExportDbConfiguration initModel() { + return getEchoBaseSession().getExportDbConfiguration(); + } + + @Override + public void prepare() throws Exception { + super.prepare(); + service = newService(ExportDbService.class); + } + + @Override + protected void startAction(ExportDbConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start export to file " + model.getFileName()); + } + + service.exportDb(model); + } + +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java 2012-01-04 20:14:32 UTC (rev 233) @@ -1,68 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.ui.actions.exportDb; - -import fr.ifremer.echobase.services.DbExportService; -import fr.ifremer.echobase.services.ExportDbConfiguration; -import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Launch the complete db export. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class LaunchExport extends AbstractWaitAndExecAction<ExportDbConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = LogFactory.getLog(LaunchExport.class); - - /** service to execute the export. */ - protected transient DbExportService service; - - @Override - protected ExportDbConfiguration initModel() { - return getEchoBaseSession().getExportDbConfiguration(); - } - - @Override - public void prepare() throws Exception { - super.prepare(); - service = newService(DbExportService.class); - } - - @Override - protected void startAction(ExportDbConfiguration model) throws Exception { - if (log.isInfoEnabled()) { - log.info("Start export to file " + model.getFileName()); - } - - service.exportDb(model); - } - -} \ No newline at end of file Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java (from rev 229, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,93 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.services.CsvImportResult; +import fr.ifremer.echobase.services.ImportDataConfiguration; +import fr.ifremer.echobase.services.ImportDataService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Map; + +/** + * To launch the import data process. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class Import extends EchoBaseActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Import.class); + + /** Import data configuration to push in session. */ + protected ImportDataConfiguration model; + + protected Map<InputFile, CsvImportResult> importResult; + + protected transient ImportDataService service; + + public ImportDataConfiguration getModel() { + return model; + } + + public Map<InputFile, CsvImportResult> getImportResult() { + return importResult; + } + + @Override + public void prepare() throws Exception { + + model = getEchoBaseSession().getImportDataConfiguration(); + + service = newService(ImportDataService.class); + } + + @Override + public String execute() throws Exception { + + try { + if (log.isInfoEnabled()) { + log.info("Start imports with mission " + + model.getMission().getName()); + } + + importResult = service.startImport(model); + return SUCCESS; + } finally { + + // clean configuration + model.destroy(); + + // remove configuration from session + getEchoBaseSession().setImportDataConfiguration(null); + } + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchImport.java 2012-01-04 20:14:32 UTC (rev 233) @@ -1,93 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.services.CsvImportResult; -import fr.ifremer.echobase.services.ImportDataConfiguration; -import fr.ifremer.echobase.services.ImportDataService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Map; - -/** - * To launch the import data process. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class LaunchImport extends EchoBaseActionSupport implements Preparable { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = LogFactory.getLog(LaunchImport.class); - - /** Import data configuration to push in session. */ - protected ImportDataConfiguration model; - - protected Map<InputFile, CsvImportResult> importResult; - - protected transient ImportDataService service; - - public ImportDataConfiguration getModel() { - return model; - } - - public Map<InputFile, CsvImportResult> getImportResult() { - return importResult; - } - - @Override - public void prepare() throws Exception { - - model = getEchoBaseSession().getImportDataConfiguration(); - - service = newService(ImportDataService.class); - } - - @Override - public String execute() throws Exception { - - try { - if (log.isInfoEnabled()) { - log.info("Start imports with mission " + - model.getMission().getName()); - } - - importResult = service.startImport(model); - return SUCCESS; - } finally { - - // clean configuration - model.destroy(); - - // remove configuration from session - getEchoBaseSession().setImportDataConfiguration(null); - } - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java (from rev 229, 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/Import.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,82 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.importDb; + +import fr.ifremer.echobase.services.ImportDbService; +import fr.ifremer.echobase.services.ImportDbConfiguration; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Start the import db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class Import extends AbstractWaitAndExecAction<ImportDbConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Import.class); + + /** service to execute the import. */ + protected transient ImportDbService service; + + @Override + protected ImportDbConfiguration initModel() { + return getEchoBaseSession().getImportDbConfiguration(); + } + + @Override + public void prepare() throws Exception { + + super.prepare(); + + service = newService(ImportDbService.class); + } + + @Override + protected void startAction(ImportDbConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start imports with file " + + model.getInput().getFileName()); + } + + service.importDb(model, getEchoBaseSession().getEchoBaseUser()); + } + + @Override + protected void closeAction(ImportDbConfiguration model) throws Exception { + + // clean configuration + model.destroy(); + + // remove configuration from session + getEchoBaseSession().setImportDbConfiguration(null); + } + + +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: 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 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java 2012-01-04 20:14:32 UTC (rev 233) @@ -1,82 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.ui.actions.importDb; - -import fr.ifremer.echobase.services.DbImportService; -import fr.ifremer.echobase.services.ImportDbConfiguration; -import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Start the import db. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class LaunchImport extends AbstractWaitAndExecAction<ImportDbConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = LogFactory.getLog(LaunchImport.class); - - /** service to execute the import. */ - protected transient DbImportService service; - - @Override - protected ImportDbConfiguration initModel() { - return getEchoBaseSession().getImportDbConfiguration(); - } - - @Override - public void prepare() throws Exception { - - super.prepare(); - - service = newService(DbImportService.class); - } - - @Override - protected void startAction(ImportDbConfiguration model) throws Exception { - if (log.isInfoEnabled()) { - log.info("Start imports with file " + - model.getInput().getFileName()); - } - - service.importDb(model, getEchoBaseSession().getEchoBaseUser()); - } - - @Override - protected void closeAction(ImportDbConfiguration model) throws Exception { - - // clean configuration - model.destroy(); - - // remove configuration from session - getEchoBaseSession().setImportDbConfiguration(null); - } - - -} \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml (from rev 217, trunk/echobase-ui/src/main/resources/config/struts-export.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <package name="embeddedApplication" extends="loggued" + namespace="/embeddedApplication"> + +  + <action name="configure" + class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input"> + /WEB-INF/jsp/embeddedApplication/configure.jsp + </result> + <result type="redirectAction"> + <param name="namespace">/embeddedApplication</param> + <param name="actionName">build</param> + </result> + </action> + +  + <action name="build" + class="fr.ifremer.echobase.ui.actions.embeddedApplication.Build" + method="execute"> + <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="execAndWait"/> + <result name="wait">/WEB-INF/jsp/embeddedApplication/progress.jsp</result> + <result>/WEB-INF/jsp/embeddedApplication/result.jsp</result> + </action> + +  + <action name="download" + class="fr.ifremer.echobase.ui.actions.embeddedApplication.Download"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="contentLength">${contentLength}</param> + <param name="contentDisposition">filename="${fileName}"</param> + </result> + </action> + + </package> + +</struts> + Property changes on: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/resources/config/struts-export.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-export.xml 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/resources/config/struts-export.xml 2012-01-04 20:14:32 UTC (rev 233) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - - -<!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" - "http://struts.apache.org/dtds/struts-2.1.7.dtd"> - -<struts> - - <package name="export" extends="loggued" namespace="/export"> - -  - <action name="createEmbeddedApplication" - class="fr.ifremer.echobase.ui.actions.export.CreateEmbeddedApplication"> - <result>/WEB-INF/jsp/export/createEmbeddedApplication.jsp</result> - </action> - -  - <action name="downloadEmbeddedApplication" - class="fr.ifremer.echobase.ui.actions.export.DownloadEmbeddedApplication"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> - <result type="stream"> - <param name="contentType">${contentType}</param> - <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> - </result> - </action> - - </package> - -</struts> - Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-01-04 20:14:32 UTC (rev 233) @@ -31,19 +31,19 @@ <package name="exportDb" extends="loggued" namespace="/exportDb">  - <action name="configureExport" + <action name="configure" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> - <param name="actionName">doExport</param> + <param name="actionName">export</param> </result> </action>  - <action name="doExport" - class="fr.ifremer.echobase.ui.actions.exportDb.LaunchExport" + <action name="export" + class="fr.ifremer.echobase.ui.actions.exportDb.Export" method="execute"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> @@ -52,8 +52,8 @@ </action>  - <action name="downloadExport" - class="fr.ifremer.echobase.ui.actions.exportDb.DownloadExport"> + <action name="download" + class="fr.ifremer.echobase.ui.actions.exportDb.Download"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-04 20:14:32 UTC (rev 233) @@ -52,13 +52,13 @@ <result name="input">/WEB-INF/jsp/importData/configureFiles.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> - <param name="actionName">doImport</param> + <param name="actionName">import</param> </result> </action>  - <action name="doImport" - class="fr.ifremer.echobase.ui.actions.importData.LaunchImport" + <action name="import" + class="fr.ifremer.echobase.ui.actions.importData.Import" method="execute"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-01-04 20:14:32 UTC (rev 233) @@ -31,7 +31,7 @@ <package name="importDb" extends="loggued" namespace="/importDb">  - <action name="configureImport" + <action name="configure" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> @@ -42,8 +42,8 @@ </action>  - <action name="doImport" - class="fr.ifremer.echobase.ui.actions.importDb.LaunchImport" + <action name="import" + class="fr.ifremer.echobase.ui.actions.importDb.Import" method="execute"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-04 20:14:32 UTC (rev 233) @@ -5,6 +5,7 @@ echobase.action.createEmbeddedApplication=Créer l'application echobase.action.delete=Suppression echobase.action.deleteSqlQuery=Supprimer la requête +echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complête echobase.action.export=Exporter echobase.action.exportSqlData=Exporter les données @@ -52,8 +53,10 @@ echobase.error.login.password.requiredstring=Le mot de passe est obligatoire echobase.error.login.unknown=Utilisateur inconnu echobase.error.login.wrongLogin=Le login est déjà utilisé -echobase.error.no.dbExport.configurationFound= -echobase.error.no.dbExport.exportFileFound= +echobase.error.no.embeddedApplication.configurationFound=La configuration de création d'application embarquée non trouvée +echobase.error.no.embeddedApplication.exportFileFound=L'application embarquée générée non trouvée +echobase.error.no.exportDb.configurationFound=La configuration de l'export de la base non trouvée +echobase.error.no.exportDb.exportFileFound=L'archive d'export de la base non trouvée echobase.error.required.email=L'email est obligatoire echobase.error.required.password=Le mot de passe est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvé à l'emplacement suivant %s @@ -64,6 +67,7 @@ echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistrée echobase.info.no.sqlQuery.selected=Aucune requête d'export sql sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée +echobase.info.no.voyagee.found=Aucune campagne à exporter echobase.label.createIfNotFound=Créer les entités non trouvées en base echobase.label.embeddedApplicationFileName=Nom de l'archive à télécharger echobase.label.embeddedWarFileName=Nom du war à utiliser @@ -112,6 +116,7 @@ echobase.message.modified.property=Propriété '%s', ancienne valeur \: %s, nouvelle valeur \: %s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.noEntrySelection=Aucune entrée sélectionnée +echobase.message.warnEmbeddedApplicationInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de la création de l'application embarquée. echobase.message.warnExportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'export. echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. echobase.title.admin.user.create=Création d'un utilisateur @@ -121,6 +126,8 @@ echobase.title.connectionToDb.detail=Détail de la connection à la base de données echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.dbEditor=Modification de la base +echobase.title.embeddedApplicationProgress=Création de l'application embarquée en cours +echobase.title.embeddedApplicationResult=Résultat de la création de l'application embarquée echobase.title.entityModificationLogs=Journal des modifications echobase.title.export=Export echobase.title.exportDb=Export complet de la base Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-01-04 20:14:32 UTC (rev 233) @@ -132,7 +132,7 @@ <include file="config/struts-dbeditor.xml"/> <include file="config/struts-user.xml"/> <include file="config/struts-importData.xml"/> - <include file="config/struts-export.xml"/> + <include file="config/struts-embeddedApplication.xml"/> <include file="config/struts-exportQuery.xml"/> <include file="config/struts-importDb.xml"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -55,12 +55,12 @@ <div class="cleanBoth"> <ul> <s:if test="%{userIsAdmin}"> - <li> - <s:a action="configureImport" namespace="/importDb" method="input"> - <s:text name="echobase.menu.importDb"/></s:a> - </li> <li> - <s:a action="configureExport" namespace="/exportDb" method="input"> + <s:a action="configure" namespace="/importDb" method="input"> + <s:text name="echobase.menu.importDb"/></s:a> + </li> + <li> + <s:a action="configure" namespace="/exportDb" method="input"> <s:text name="echobase.menu.exportDb"/></s:a> </li> </s:if> @@ -95,7 +95,8 @@ </s:a> </li> <li> - <s:a action="createEmbeddedApplication" namespace="/export"> + <s:a action="configure" namespace="/embeddedApplication" + method="input"> <s:text name="echobase.menu.createEmbeddedApplication"/> </s:a> </li> Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,61 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + +<title><s:text name="echobase.title.createEmbeddedApplication"/></title> + +<s:form namespace="/embeddedApplication"> + + <br/> + + <fieldset> + <legend><s:text name="echobase.legend.embeddedApplication.configuration"/></legend> + + <s:checkboxlist list="voyages" key="model.voyageIds" + template="mycheckboxlist" + label="%{getText('echobase.label.voyageToSelect')}"/> + + <s:textfield key="model.fileName" required="true" size="100" + label="%{getText('echobase.label.embeddedApplicationFileName')} (*)"/> + + <s:label value="%{model.warLocation.name}" readonly="true" disabled="true" + label="%{getText('echobase.label.embeddedWarFileName')}"/> + + </fieldset> + + <br/> + + <s:if test="!hasActionErrors()"> + + <s:submit key="echobase.action.createEmbeddedApplication" + action="configure" + align="right"/> + + </s:if> + + <div>(*) Il s'agit du nom de l'archive et du répertoire contenu dans l'archive, + l'extension <strong>.zip</strong> sera automatiquement rajoutée.</div> +</s:form> Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="build" namespace="/embeddedApplication"/> +<meta http-equiv="refresh" content="5;url=${url}"/> + +<title><s:text name="echobase.title.embeddedApplicationProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnEmbeddedApplicationInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -0,0 +1,53 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:url id="downloadUrl" namespace="/embeddedApplication" action="download"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + // start to download by it-self the result of import + window.open("${downloadUrl}"); + }); + +</script> +<title><s:text name="echobase.title.embeddedApplicationResult"/></title> + +<div> + La création de l'application embarquée a réussi en <s:property + value="model.actionTime"/>. +</div> + +<br/> + +<div> + Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : + <a href="${downloadUrl}" target="download"> + <s:text name="echobase.action.downloadEmbeddedApplicationFile"/> + </a> +</div> + Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -1,65 +0,0 @@ -<%-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - Copyright (C) 2011 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<title><s:text name="echobase.title.createEmbeddedApplication"/></title> - -<s:form namespace="/export"> - - <br/> - - <fieldset> - <legend><s:text name="echobase.legend.embeddedApplication.configuration"/></legend> - - <s:checkboxlist list="voyages" key="voyageIds" template="mycheckboxlist" - label="%{getText('echobase.label.voyageToSelect')}"/> - - <s:textfield key="fileName" required="true" size="100" - label="%{getText('echobase.label.embeddedApplicationFileName')} (*)"/> - - <s:label value="%{warFileName}" readonly="true" - label="%{getText('echobase.label.embeddedWarFileName')}"/> - - <s:if test="!hasActionErrors()"> - - <br/> - - - </s:if> - - </fieldset> - - <br/> - - <s:submit key="echobase.action.createEmbeddedApplication" - action="downloadEmbeddedApplication" - align="right"/> - - <div>(*) Il s'agit du nom de l'archive et du répertoire contenu dans l'archive, - l'extension <strong>.zip</strong> sera automatiquement rajoutée.</div> -</s:form> - - Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:url id="url" action="doExport" namespace="/exportDb"/> +<s:url id="url" action="export" namespace="/exportDb"/> <meta http-equiv="refresh" content="5;url=${url}"/> <title><s:text name="echobase.title.exportDbProgress"/></title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportDb" action="downloadExport"/> +<s:url id="downloadUrl" namespace="/exportDb" action="download"/> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp 2012-01-04 20:13:23 UTC (rev 232) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp 2012-01-04 20:14:32 UTC (rev 233) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:url id="url" action="doImport" namespace="/importDb"/> +<s:url id="url" action="import" namespace="/importDb"/> <meta http-equiv="refresh" content="5;url=${url}"/> <title><s:text name="echobase.title.importDbProgress"/></title>

1 0

r232 - trunk
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 21:13:23 +0100 (Wed, 04 Jan 2012) New Revision: 232 Url: http://forge.codelutin.com/repositories/revision/echobase/232 Log: use last versions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 20:13:04 UTC (rev 231) +++ trunk/pom.xml 2012-01-04 20:13:23 UTC (rev 232) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-rev-228-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -106,8 +106,8 @@  - <eugenePluginVersion>2.4.2-SNAPSHOT</eugenePluginVersion> - <topiaVersion>2.6.5-SNAPSHOT</topiaVersion> + <eugenePluginVersion>2.4.2</eugenePluginVersion> + <topiaVersion>2.6.5</topiaVersion> <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10-SNAPSHOT</nuitonWebVersion>

1 0

r231 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 21:13:04 +0100 (Wed, 04 Jan 2012) New Revision: 231 Url: http://forge.codelutin.com/repositories/revision/echobase/231 Log: use tagvalue instead of stereotype Modified: trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-04 20:12:43 UTC (rev 230) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-04 20:13:04 UTC (rev 231) @@ -30,45 +30,8 @@ model.tagValue.version=1.0 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true +model.tagValue.indexForeignKeys=true +# big text zone fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text -############################################################################### -### Lazy attributes for references ############################################ -############################################################################### - -#fr.ird.t3.entities.reference.Vessel.attribute.flagCountry.tagvalue.lazy=false - -############################################################################### -### Indexed association attributes ############################################ -############################################################################### - -# common datas -fr.ifremer.echobase.entities.data.Voyage.attribute.echotype.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Voyage.attribute.transit.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Transit.attribute.transect.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Transect.attribute.operation.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Transect.attribute.dataAcquisition.stereotype=tableAssocIndex - -# catches datas -fr.ifremer.echobase.entities.data.Operation.attribute.operationMetadataValue.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Operation.attribute.gearMetadataValue.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Operation.attribute.sample.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Sample.attribute.sampleData.stereotype=tableAssocIndex - -# acoustic datas -fr.ifremer.echobase.entities.data.DataAcquisition.attribute.dataProcessing.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.DataProcessing.attribute.cell.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Cell.attribute.data.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Cell.attribute.childs.stereotype=tableAssocIndex -fr.ifremer.echobase.entities.data.Cell.attribute.result.stereotype=tableAssocIndex - -############################################################################### -### Natural id for references ################################################ -############################################################################### - -#fr.ird.t3.entities.reference.WeightCategoryLanding.class.tagValue.naturalIdMutable=false -#fr.ird.t3.entities.reference.WeightCategoryLanding.attribute.code.tagValue.naturalId=true -#fr.ird.t3.entities.reference.WeightCategoryLanding.attribute.code.tagValue.notNull=true -#fr.ird.t3.entities.reference.WeightCategoryLanding.attribute.species.tagValue.naturalId=true -#fr.ird.t3.entities.reference.WeightCategoryLanding.attribute.species.tagValue.notNull=true

1 0

r230 - trunk/src/site/resources/model
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 21:12:43 +0100 (Wed, 04 Jan 2012) New Revision: 230 Url: http://forge.codelutin.com/repositories/revision/echobase/230 Log: update model images Added: trunk/src/site/resources/model/referenceLengthWeightKey.png trunk/src/site/resources/model/referenceSample.png Modified: trunk/src/site/resources/model/dataCatches.png trunk/src/site/resources/model/dataCommon.png trunk/src/site/resources/model/referenceAll.png trunk/src/site/resources/model/referenceDepthStratum.png trunk/src/site/resources/model/referenceGear.png trunk/src/site/resources/model/referenceLengthAgeKey.png trunk/src/site/resources/model/referenceOperation.png trunk/src/site/resources/model/referenceProtocole.png trunk/src/site/resources/model/referenceSpecies.png trunk/src/site/resources/model/referenceStrata.png Modified: trunk/src/site/resources/model/dataCatches.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/dataCommon.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/referenceAll.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/referenceDepthStratum.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/referenceGear.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/referenceLengthAgeKey.png =================================================================== (Binary files differ) Added: trunk/src/site/resources/model/referenceLengthWeightKey.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/model/referenceLengthWeightKey.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/resources/model/referenceOperation.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/referenceProtocole.png =================================================================== (Binary files differ) Added: trunk/src/site/resources/model/referenceSample.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/model/referenceSample.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/resources/model/referenceSpecies.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/model/referenceStrata.png =================================================================== (Binary files differ)

1 0

r229 - trunk
by maven-release＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 18:26:31 +0100 (Wed, 04 Jan 2012) New Revision: 229 Url: http://forge.codelutin.com/repositories/revision/echobase/229 Log: Update mavenpom4redmine to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-27 19:42:16 UTC (rev 228) +++ trunk/pom.xml 2012-01-04 17:26:31 UTC (rev 229) @@ -10,12 +10,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2-rev-228-SNAPSHOT</version> <modules> <module>echobase-entities</module>

1 0

r228 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions java/fr/ifremer/echobase/ui/actions/exportDb java/fr/ifremer/echobase/ui/actions/importDb webapp/WEB-INF/jsp/exportDb
by tchemit＠users.forge.codelutin.com 27 Dec '11

27 Dec '11

Author: tchemit Date: 2011-12-27 20:42:16 +0100 (Tue, 27 Dec 2011) New Revision: 228 Url: http://forge.codelutin.com/repositories/revision/echobase/228 Log: -add abstract exec and wait action -improve export result (auto download export file) Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2011-12-27 19:42:16 UTC (rev 228) @@ -0,0 +1,111 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaContextImplementor; + +/** + * Abstract long action using the exec and wait interceptor. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public abstract class AbstractWaitAndExecAction<M extends AbstractEchobaseActionConfiguration> extends EchoBaseActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + /** Configuration of the export action. */ + private M model; + + /** Shared actionContext to reuse all invocation of this same action. */ + private ActionContext actionContext; + + public final M getModel() { + return model; + } + + @Override + public void prepare() throws Exception { + + if (actionContext == null) { + + // keep it since exec and wait then use another thread + actionContext = ActionContext.getContext(); + } else { + + // having the action context here means we already came here, + // now we need to propagate it + ActionContext.setContext(actionContext); + } + model = initModel(); + } + + protected abstract M initModel(); + + protected abstract void startAction(M model) throws Exception; + + @Override + public final String execute() throws Exception { + + model.beginAction(); + + // having the action context here means we already came here, + // now we need to propagate it + ActionContext.setContext(actionContext); + + // we must use a standalone transaction since it will pass through + // in more than one request + + TopiaContextImplementor tx = + (TopiaContextImplementor) serviceContext.getTransaction(); + TopiaContextImplementor rootContext = tx.getRootContext(); + TopiaContext topiaContext = rootContext.beginTransaction(); + serviceContext.setTransaction(topiaContext); + try { + + startAction(model); + + model.endAction(); + + return SUCCESS; + } finally { + + try { + topiaContext.closeContext(); + } finally { + closeAction(model); + } + + + } + } + + protected void closeAction(M model) throws Exception { + // by default do nothing + } +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java 2011-12-27 19:41:32 UTC (rev 227) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java 2011-12-27 19:42:16 UTC (rev 228) @@ -23,16 +23,11 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.services.CsvImportResult; import fr.ifremer.echobase.services.DbExportService; import fr.ifremer.echobase.services.ExportDbConfiguration; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.framework.TopiaContextImplementor; /** * Launch the complete db export. @@ -40,84 +35,34 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class LaunchExport extends EchoBaseActionSupport implements Preparable { +public class LaunchExport extends AbstractWaitAndExecAction<ExportDbConfiguration> { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(LaunchExport.class); - /** Configuration of the export action. */ - protected ExportDbConfiguration model; - - /** Result of import. */ - protected CsvImportResult importResult; - /** service to execute the export. */ protected transient DbExportService service; - /** Shared actionContext to reuse all invocation of this same action. */ - protected ActionContext actionContext; - - public ExportDbConfiguration getModel() { - return model; + @Override + protected ExportDbConfiguration initModel() { + return getEchoBaseSession().getExportDbConfiguration(); } @Override public void prepare() throws Exception { - - if (actionContext == null) { - - // keep it since exec and wait then use another thread - actionContext = ActionContext.getContext(); - } else { - - // having the action context here means we already came here, - // now we need to propagate it - ActionContext.setContext(actionContext); - } - model = getEchoBaseSession().getExportDbConfiguration(); - + super.prepare(); service = newService(DbExportService.class); } @Override - public String execute() throws Exception { - - model.beginAction(); - - // having the action context here means we already came here, - // now we need to propagate it - ActionContext.setContext(actionContext); - - // we must use a standalone transaction since it will pass through - // in more than one request - - TopiaContextImplementor tx = - (TopiaContextImplementor) serviceContext.getTransaction(); - TopiaContextImplementor rootContext = tx.getRootContext(); - TopiaContext topiaContext = rootContext.beginTransaction(); - serviceContext.setTransaction(topiaContext); - try { - - if (log.isInfoEnabled()) { - log.info("Start export to file " + model.getFileName()); - } - - service.exportDb(model); - model.endAction(); - - return SUCCESS; - } finally { - - topiaContext.closeContext(); - -// // clean configuration -// model.destroy(); - - // remove configuration from session -// getEchoBaseSession().setExportDbConfiguration(null); + protected void startAction(ExportDbConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start export to file " + model.getFileName()); } + + service.exportDb(model); } } \ No newline at end of file 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-27 19:41:32 UTC (rev 227) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java 2011-12-27 19:42:16 UTC (rev 228) @@ -23,16 +23,11 @@ */ package fr.ifremer.echobase.ui.actions.importDb; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.services.CsvImportResult; import fr.ifremer.echobase.services.DbImportService; import fr.ifremer.echobase.services.ImportDbConfiguration; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.framework.TopiaContextImplementor; /** * Start the import db. @@ -40,82 +35,48 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class LaunchImport extends EchoBaseActionSupport implements Preparable { +public class LaunchImport extends AbstractWaitAndExecAction<ImportDbConfiguration> { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(LaunchImport.class); - /** Configuration of the historical import. */ - protected ImportDbConfiguration model; - - /** Result of import. */ - protected CsvImportResult importResult; - /** service to execute the import. */ protected transient DbImportService service; - protected ActionContext actionContext; - - public ImportDbConfiguration getModel() { - return model; + @Override + protected ImportDbConfiguration initModel() { + return getEchoBaseSession().getImportDbConfiguration(); } @Override public void prepare() throws Exception { - if (actionContext == null) { + super.prepare(); - // keep it since exec and wait then use another thread - actionContext = ActionContext.getContext(); - } else { + service = newService(DbImportService.class); + } - // having the action context here means we already came here, - // now we need to propagate it - ActionContext.setContext(actionContext); + @Override + protected void startAction(ImportDbConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start imports with file " + + model.getInput().getFileName()); } - model = getEchoBaseSession().getImportDbConfiguration(); - service = newService(DbImportService.class); + service.importDb(model, getEchoBaseSession().getEchoBaseUser()); } @Override - public String execute() throws Exception { + protected void closeAction(ImportDbConfiguration model) throws Exception { - model.beginAction(); + // clean configuration + model.destroy(); - // having the action context here means we already came here, - // now we need to propagate it - ActionContext.setContext(actionContext); - - // we must use a standalone transaction since it will pass through - // in more than one request - - TopiaContextImplementor tx = - (TopiaContextImplementor) serviceContext.getTransaction(); - TopiaContextImplementor rootContext = tx.getRootContext(); - TopiaContext topiaContext = rootContext.beginTransaction(); - serviceContext.setTransaction(topiaContext); - try { - - if (log.isInfoEnabled()) { - log.info("Start imports with file " + - model.getInput().getFileName()); - } - - service.importDb(model, getEchoBaseSession().getEchoBaseUser()); - model.endAction(); - return SUCCESS; - } finally { - topiaContext.closeContext(); - - // clean configuration - model.destroy(); - - // remove configuration from session - getEchoBaseSession().setImportDbConfiguration(null); - } + // remove configuration from session + getEchoBaseSession().setImportDbConfiguration(null); } + } \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2011-12-27 19:41:32 UTC (rev 227) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2011-12-27 19:42:16 UTC (rev 228) @@ -24,16 +24,30 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<s:url id="downloadUrl" namespace="/exportDb" action="downloadExport"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + // start to download by it-self the result of import + window.open("${downloadUrl}"); + }); + +</script> <title><s:text name="echobase.title.exportDbResult"/></title> <div> - L'export de la base complête a réussi en <s:property value="model.actionTime"/>. - Vous pouvez désormais télécharger l'archive le contenant. + L'export de la base complête a réussi en <s:property + value="model.actionTime"/>. </div> <br/> -<s:a namespace="/exportDb" action="downloadExport"> - <s:text name="echobase.action.downloadExportDbFile"/> -</s:a> +<div> + Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : + <a href="${downloadUrl}" target="download"> + <s:text name="echobase.action.downloadExportDbFile"/> + </a> +</div>

1 0

r227 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 27 Dec '11

27 Dec '11

Author: tchemit Date: 2011-12-27 20:41:32 +0100 (Tue, 27 Dec 2011) New Revision: 227 Url: http://forge.codelutin.com/repositories/revision/echobase/227 Log: remove TODO Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java 2011-12-27 15:20:55 UTC (rev 226) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbExportService.java 2011-12-27 19:41:32 UTC (rev 227) @@ -24,21 +24,17 @@ package fr.ifremer.echobase.services; import fr.ifremer.echobase.EchoBaseIOUtil; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EntitiesUtil; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; import java.io.File; import java.io.IOException; -import java.util.Arrays; -import java.util.List; /** * Service to import / export a complete db. @@ -61,7 +57,7 @@ * @return the zip archive file * @throws IOException if could not create or write files. */ - public File exportDb(ExportDbConfiguration model) throws IOException, TopiaException { + public File exportDb(ExportDbConfiguration model) throws IOException { String fileName = model.getFileName(); @@ -83,14 +79,14 @@ model.setNbSteps(entries.length); - List<EchoBaseEntityEnum> referenceTypes = - Arrays.asList(EntitiesUtil.getReferenceTypes()); +// List<EchoBaseEntityEnum> referenceTypes = +// Arrays.asList(EntitiesUtil.getReferenceTypes()); for (MetaFilenameAware entry : entries) { model.incrementsProgression(); // if (!referenceTypes.contains(entry.getSource())) { -// //TODO remove this when tests are ok. +// // remove this when tests are ok. // continue; // } File entryFile = new File(dir, entry.getFilename()); @@ -101,9 +97,6 @@ TableMeta meta = (TableMeta) entry; exportService.exportDatas(meta, entryFile); } - - //TODO Test this : this will refresh the hibernate session ? try this to improve export times... -// getTransaction().rollbackTransaction(); } EchoBaseIOUtil.compressZipFile(zipFile, dir);

1 0

r226 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb
by tchemit＠users.forge.codelutin.com 27 Dec '11

27 Dec '11

Author: tchemit Date: 2011-12-27 16:20:55 +0100 (Tue, 27 Dec 2011) New Revision: 226 Url: http://forge.codelutin.com/repositories/revision/echobase/226 Log: fix action timing Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2011-12-27 14:45:23 UTC (rev 225) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2011-12-27 15:20:55 UTC (rev 226) @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.Serializable; -import java.util.Date; /** * Abstract long action configuration. @@ -45,8 +44,8 @@ private float progression; - private Date startTime; - private Date endTime; + private long startTime; + private long endTime; public final int getNbSteps() { return nbSteps; @@ -70,28 +69,36 @@ stepIncrement = 100f / nbSteps; } - public final Date getStartTime() { + public final long getStartTime() { return startTime; } - public final void setStartTime(Date startTime) { + public final void setStartTime(long startTime) { this.startTime = startTime; } - public final Date getEndTime() { + public final long getEndTime() { return endTime; } - public final void setEndTime(Date endTime) { + public final void setEndTime(long endTime) { this.endTime = endTime; } public String getActionTime() { - Date sTime = getStartTime(); - Date eTime = getEndTime(); - return StringUtil.convertTime(eTime.getTime() - sTime.getTime()); + long sTime = getStartTime(); + long eTime = getEndTime(); + return StringUtil.convertTime(eTime - sTime); } + + public void beginAction() { + setStartTime(System.nanoTime()); + } + public void endAction() { + setEndTime(System.nanoTime()); + } + public void destroy() throws IOException { } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java 2011-12-27 14:45:23 UTC (rev 225) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/LaunchExport.java 2011-12-27 15:20:55 UTC (rev 226) @@ -34,8 +34,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; -import java.util.Date; - /** * Launch the complete db export. * @@ -86,7 +84,7 @@ @Override public String execute() throws Exception { - model.setStartTime(new Date()); + model.beginAction(); // having the action context here means we already came here, // now we need to propagate it @@ -107,7 +105,7 @@ } service.exportDb(model); - model.setEndTime(new Date()); + model.endAction(); return SUCCESS; } finally { 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-27 14:45:23 UTC (rev 225) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/LaunchImport.java 2011-12-27 15:20:55 UTC (rev 226) @@ -34,8 +34,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; -import java.util.Date; - /** * Start the import db. * @@ -85,7 +83,7 @@ @Override public String execute() throws Exception { - model.setStartTime(new Date()); + model.beginAction(); // having the action context here means we already came here, // now we need to propagate it @@ -107,7 +105,7 @@ } service.importDb(model, getEchoBaseSession().getEchoBaseUser()); - model.setEndTime(new Date()); + model.endAction(); return SUCCESS; } finally { topiaContext.closeContext();

1 0