Author: tchemit Date: 2012-06-10 22:42:22 +0200 (Sun, 10 Jun 2012) New Revision: 3432 Url: http://chorem.org/repositories/revision/pollen/3432 Log: add a new directory to keep temporary image choice Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-10 20:42:22 UTC (rev 3432) @@ -87,6 +87,7 @@ createDirectory(PollenConfigurationOption.EMAIL_DIR); createDirectory(PollenConfigurationOption.FEED_DIR); createDirectory(PollenConfigurationOption.IMG_DIR); + createDirectory(PollenConfigurationOption.TMP_DIR); if (log.isDebugEnabled()) { log.debug("parsed options in config file" + @@ -182,6 +183,12 @@ return result; } + public File getTemporaryDirectory() { + File result = applicationConfig.getOptionAsFile( + PollenConfigurationOption.TMP_DIR.key); + return result; + } + public int getNbVotesPerPage() { int result = applicationConfig.getOptionAsInt( PollenConfigurationOption.NB_VOTES_PER_PAGE.key); Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-10 20:42:22 UTC (rev 3432) @@ -43,35 +43,52 @@ /** login for default admin. */ APPLICATION_URL("siteUrl", n_("pollen.configuration.siteUrl"), "", URL.class), + /** login for default admin. */ DATA_DIR("pollen.dataDirectory", n_("pollen.configuration.dataDirectory"), "/var/local/pollen/data", File.class), + /** login for default admin. */ ADMIN_LOGIN("adminLogin", n_("pollen.configuration.db.login"), "admin", String.class), + /** password for default admin. */ ADMIN_PASSWORD("adminPassword", n_("pollen.configuration.db.password"), "pollen", String.class), + /** email for default admin. */ ADMIN_EMAIL("adminEmail", n_("pollen.configuration.adminEmail"), "admin@domain.com", String.class), + /** email for contact link. */ CONTACT_EMAIL("contactEmail", n_("pollen.configuration.contactEmail"), "", String.class), + /** host for email sending configuration. */ EMAIL_HOST("email_host", n_("pollen.configuration.emailHost"), "smtp", String.class), + /** port for email sending configuration. */ EMAIL_PORT("email_port", n_("pollen.configuration.emailPort"), "25", String.class), + /** from for email sending configuration. */ EMAIL_FROM("email_from", n_("pollen.configuration.emailFrom"), "bot@pollen.org", String.class), + /** directory to store emails before sending them. */ EMAIL_DIR("pollen.emails.directory", n_("pollen.configuration.emaiDirectory"), "${pollen.dataDirectory}/emails", File.class), + /** path for feed directory. */ FEED_DIR("feedDir", n_("pollen.configuration.feedDirectory"), "${pollen.dataDirectory}/feeds", File.class), + /** path for uploaded images directory. */ IMG_DIR("upImgDir", n_("pollen.configuration.imageDirectory"), "${pollen.dataDirectory}/uploadedImages", File.class), + + /** path for temporary directory. */ + TMP_DIR("tmpDir", n_("pollen.configuration.tmpDirectory"), "${pollen.dataDirectory}/tmp", File.class), + /** nb votes to display per page. */ NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", n_("pollen.configuration.nbVoteByPage"), "25", int.class), + /** Charset of Pollen. */ CHARSET("pollen.charset", n_("pollen.configuration.charset"), "UTF-8", String.class), /** Default poll type to use at a new poll creation. */ DEFAULT_POLL_TYPE("pollen.default.pollType", n_("pollen.configuration.defaultPollType"), PollType.FREE.name(), PollType.class), + /** Default vote counting type to use at a new poll creation. */ DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), VoteCountingType.NORMAL.name(), VoteCountingType.class), Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-06-10 20:42:22 UTC (rev 3432) @@ -21,3 +21,4 @@ pollen.configuration.imageDirectory=path for uploaded images directory pollen.configuration.nbVoteByPage=nb votes to display per page pollen.configuration.siteUrl=Application url +pollen.configuration.tmpDirectory=Temporary directory (is cleaned at each startup of application) Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-06-10 20:42:22 UTC (rev 3432) @@ -21,3 +21,4 @@ pollen.configuration.imageDirectory=répertoire où sont enregistrés les images pollen.configuration.nbVoteByPage=Nombre de votes à afficher par page pollen.configuration.siteUrl=Url publique de l'aplication (utilisée dans les emails envoyés) +pollen.configuration.tmpDirectory=Répertoire temporaire (est nettoyé à chaque démarrage de l'application) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-10 20:42:22 UTC (rev 3432) @@ -24,6 +24,7 @@ import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; @@ -41,10 +42,12 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.util.FileUtil; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import java.io.File; import java.io.IOException; import java.util.Date; import java.util.Locale; @@ -93,6 +96,16 @@ PollenConfiguration configuration = new PollenConfiguration(); applicationContext.setConfiguration(configuration); + File temporaryDirectory = configuration.getTemporaryDirectory(); + try { + FileUtils.deleteDirectory(temporaryDirectory); + FileUtil.createDirectoryIfNecessary(temporaryDirectory); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not delete tmp dir " + temporaryDirectory, e); + } + } + if (log.isInfoEnabled()) { log.info("Initializing RootContext..."); }