Author: sletellier Date: 2011-11-17 14:55:15 +0100 (Thu, 17 Nov 2011) New Revision: 91 Url: http://forge.codelutin.com/repositories/revision/echobase/91 Log: Dont keep export file, use tmp dir instead Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-17 12:42:01 UTC (rev 90) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-17 13:55:15 UTC (rev 91) @@ -111,12 +111,6 @@ return file; } - public File getModifExportDirectory() { - File file = applicationConfig.getOptionAsFile(EchoBaseConfigurationOption.MODIF_EXPORT_DIRECTORY.key); - Preconditions.checkNotNull(file); - return file; - } - public Version getApplicationVersion() { String versionStr = applicationConfig.getOption(EchoBaseConfigurationOption.VERSION.key); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2011-11-17 12:42:01 UTC (rev 90) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2011-11-17 13:55:15 UTC (rev 91) @@ -53,9 +53,6 @@ WAR_DIRECTORY("war.directory", "Répertoire où est stoqué le war", "${data.directory}/war", File.class), - MODIF_EXPORT_DIRECTORY("motif.export.directory", - "Répertoire où sont stoqué les exports", - "${data.directory}/modifExport", File.class), WAR_LOCATION("war.location", "Chemin complêt d'accès au war", "${war.directory}/echobase-ui-${project.version}.war", Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-17 12:42:01 UTC (rev 90) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-17 13:55:15 UTC (rev 91) @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; @@ -37,6 +36,7 @@ import fr.ifremer.echobase.entities.meta.DbMeta; import fr.ifremer.echobase.entities.meta.TableMeta; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -442,13 +442,13 @@ } // Write export file - EchoBaseConfiguration configuration = getConfiguration(); - File modifExportDirectory = configuration.getModifExportDirectory(); - SimpleDateFormat format = new SimpleDateFormat("yyMMddHHmm"); String now = format.format(new Date()); - File file = new File(modifExportDirectory, EXPORT_FILE_PREFIX + now + SCV_EXT); + // Write in tmp dir + File tempDirectory = FileUtils.getTempDirectory(); + File file = new File(tempDirectory, EXPORT_FILE_PREFIX + now + SCV_EXT); + file.deleteOnExit(); FileWriter writer = null; try { 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 2011-11-17 12:42:01 UTC (rev 90) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-17 13:55:15 UTC (rev 91) @@ -35,7 +35,7 @@ echobase.common.user=Utilisateur echobase.common.voyage=Voyage echobase.common.voyagesToSelect=Voyage à exporter -echobase.dbEditor.propertyDiffsResult=Nombres d'entrées importés \: +echobase.dbEditor.propertyDiffsResult=Nombres d'entrées modifiés \: %s echobase.dbeditor.create=Création de '%s' echobase.dbeditor.edit=Edition de '%s' echobase.dbeditor.export=Exporter Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp 2011-11-17 12:42:01 UTC (rev 90) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp 2011-11-17 13:55:15 UTC (rev 91) @@ -32,5 +32,5 @@ href="<s:url value='/css/screen.css' />"/> <link rel="icon" type="image/png" href="<s:url value='/images/logo_codelutin.png' />"/> - <sj:head jqueryui="true" loadAtOnce="true" compressed="false" jquerytheme="cupertino"/> + <sj:head jqueryui="true" jquerytheme="cupertino"/> </head> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp 2011-11-17 12:42:01 UTC (rev 90) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp 2011-11-17 13:55:15 UTC (rev 91) @@ -25,7 +25,11 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <title><s:text name="echobase.title.dbEditor"/></title> -<h2><s:text name="echobase.dbEditor.propertyDiffsResult"/><s:property value="#{propertyDiffs.size}"/></h2> +<h2> + <s:text name="echobase.dbEditor.propertyDiffsResult"> + <s:param value="%{propertyDiffs.size}"/> + </s:text> +</h2> <s:a namespace="/dbeditor" action="dbeditor"> <s:param name="tableName" value="%{tableName}"/> <s:text name="echobase.common.return"/>