Author: tchemit Date: 2012-05-01 18:58:33 +0200 (Tue, 01 May 2012) New Revision: 3336 Url: http://chorem.org/repositories/revision/pollen/3336 Log: refs #538: Improve install documentation Modified: 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/pom.xml trunk/pollen-ui-struts2/src/main/assembly/bin.xml trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-05-01 16:58:33 UTC (rev 3336) @@ -32,6 +32,8 @@ import java.io.File; import java.net.URL; +import static org.nuiton.i18n.I18n.n_; + /** * All Pollen configuration options. * @@ -41,43 +43,43 @@ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { /** login for default admin. */ - APPLICATION_URL("siteUrl", "Application url", "", URL.class), + APPLICATION_URL("siteUrl", n_("pollen.configuration.siteUrl"), "", URL.class), /** login for default admin. */ - DATA_DIR("pollen.dataDirectory", "Default directory where to put data", "/var/local/pollen/data", File.class), + DATA_DIR("pollen.dataDirectory", n_("pollen.configuration.dataDirectory"), "/var/local/pollen/data", File.class), /** login for default admin. */ - ADMIN_LOGIN("adminLogin", "login for default admin", "admin", String.class), + ADMIN_LOGIN("adminLogin", n_("pollen.configuration.db.login"), "admin", String.class), /** password for default admin. */ - ADMIN_PASSWORD("adminPassword", "password for default admin", "pollen", String.class), + ADMIN_PASSWORD("adminPassword", n_("pollen.configuration.db.password"), "pollen", String.class), /** email for default admin. */ - ADMIN_EMAIL("adminEmail", "email for default admin", "admin@domain.com", String.class), + ADMIN_EMAIL("adminEmail", n_("pollen.configuration.adminEmail"), "admin@domain.com", String.class), /** email for contact link. */ - CONTACT_EMAIL("contactEmail", "email for contact link", "", String.class), + CONTACT_EMAIL("contactEmail", n_("pollen.configuration.contactEmail"), "", String.class), /** host for email sending configuration. */ - EMAIL_HOST("email_host", "host for email sending configuration", "smtp", String.class), + EMAIL_HOST("email_host", n_("pollen.configuration.emailHost"), "smtp", String.class), /** port for email sending configuration. */ - EMAIL_PORT("email_port", "port for email sending configuration", "25", String.class), + EMAIL_PORT("email_port", n_("pollen.configuration.emailPort"), "25", String.class), /** from for email sending configuration. */ - EMAIL_FROM("email_from", "from for email sending configuration", "bot@pollen.org", String.class), + 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", "directory to store emails before sending them", "${pollen.dataDirectory}/emails", File.class), + EMAIL_DIR("pollen.emails.directory", n_("pollen.configuration.emaiDirectory"), "${pollen.dataDirectory}/emails", File.class), /** path for feed directory. */ - FEED_DIR("feedDir", "path for feed directory", "${pollen.dataDirectory}/feeds", File.class), + FEED_DIR("feedDir", n_("pollen.configuration.feedDirectory"), "${pollen.dataDirectory}/feeds", File.class), /** path for uploaded images directory. */ - IMG_DIR("upImgDir", "path for uploaded images directory", "${pollen.dataDirectory}/uploadedImages", File.class), + IMG_DIR("upImgDir", n_("pollen.configuration.imageDirectory"), "${pollen.dataDirectory}/uploadedImages", File.class), /** nb votes to display per page. */ - NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", "nb votes to display per page", "25", int.class), + NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", n_("pollen.configuration.nbVoteByPage"), "25", int.class), /** Charset of Pollen. */ - CHARSET("pollen.charset", "Charset of Pollen", "UTF-8", String.class), + 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", "Default poll type to use at a new poll creation", PollType.FREE.name(), PollType.class), + 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", "Default vote counting type to use at a new poll creation", VoteCountingType.NORMAL.name(), VoteCountingType.class), + DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), VoteCountingType.NORMAL.name(), VoteCountingType.class), /** Default choice type to use at a new poll creation. */ - DEFAULT_CHOICE_TYPE("pollen.default.choiceType", "Default choice type to use at a new poll creation", ChoiceType.TEXT.name(), ChoiceType.class), + DEFAULT_CHOICE_TYPE("pollen.default.choiceType", n_("pollen.configuration.defaultChoiceType"), ChoiceType.TEXT.name(), ChoiceType.class), /** Pollen version. */ - VERSION("pollen.version", "Version de l'application", "", Version.class); + VERSION("pollen.version", n_("Version de l'application"), "", Version.class); /** Configuration key. */ protected final String key; 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-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-01 16:58:33 UTC (rev 3336) @@ -12,3 +12,20 @@ pollen.exception.user_wrong_password= pollen.exception.vote_doubloon= pollen.exception.vote_not_allowed= +pollen.configuration.siteUrl=Application url +pollen.configuration.dataDirectory=Directory where to put pollen data +pollen.configuration.defaultChoiceType=Default choice type to use at a new poll creation +pollen.configuration.defaultVoteCountingType=Default vote counting type to use at a new poll creation +pollen.configuration.defaultPollType=Default poll type to use at a new poll creation +pollen.configuration.charset=Charset of Pollen +pollen.configuration.nbVoteByPage=nb votes to display per page +pollen.configuration.imageDirectory=path for uploaded images directory +pollen.configuration.db.login=login for default admin +pollen.configuration.db.password=password for default admin +pollen.configuration.adminEmail=email for default admin +pollen.configuration.contactEmail=email for contact link +pollen.configuration.emailHost=host for email sending configuration +pollen.configuration.emailPort=port for email sending configuration +pollen.configuration.emailFrom=from for email sending configuration +pollen.configuration.emaiDirectory=directory to store emails before sending them +pollen.configuration.feedDirectory=path for feed directory 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-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-01 16:58:33 UTC (rev 3336) @@ -4,7 +4,7 @@ pollen.exception.participant_exist=La liste %1$s contient déjà un votant nommé %2$s avec un email %3$s pollen.exception.participant_exist_without_email=La liste %1$s contient déjà un votant nommé %2$s avec aucun email pollen.exception.poll_exist= -pollen.exception.poll_not_exist=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complètement dans le champ d'adresse de votre navigateur. +pollen.exception.poll_not_exist=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complêtement dans le champ d'adresse de votre navigateur. pollen.exception.smtp_not_available=Impossible d'envoyer un email à %1$s. Serveur smtp indisponible pour l'envoi d'email, veuillez contacter un administrateur. pollen.exception.user_email_exist=Un utilisateur est déjà enregistré avec cet email. pollen.exception.user_login_exist=Un utilisateur est déjà enregistré avec cet identifiant. @@ -12,3 +12,20 @@ pollen.exception.user_wrong_password=Le mot de passe renseigné est incorrect pour l'utilisateur '%1$s'. pollen.exception.vote_doubloon= pollen.exception.vote_not_allowed= +pollen.configuration.siteUrl=Url publique de l'aplication (utilisée dans les emails envoyés) +pollen.configuration.dataDirectory=Répertoire des données de Pollen +pollen.configuration.defaultChoiceType=Choix par défaut utilisation lors de la création d'un sondage +pollen.configuration.defaultVoteCountingType=Type de dépouillement lors de la création d'un sondage +pollen.configuration.defaultPollType=Type de sondage lors de la création d'un sondage +pollen.configuration.charset=Encodnig de Pollen +pollen.configuration.nbVoteByPage=Nombre de votes à afficher par page +pollen.configuration.imageDirectory=répertoire où sont enregistrés les images +pollen.configuration.db.login=Login de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) +pollen.configuration.db.password=Mot de passe de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) +pollen.configuration.adminEmail=Email de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) +pollen.configuration.contactEmail=Email pour le lien Contact +pollen.configuration.emailHost=Serveur d'envoie d'email +pollen.configuration.emailPort=Port du serveur d'envoi d'email +pollen.configuration.emailFrom=Email de l'envoyeur dans les emails +pollen.configuration.emaiDirectory=Répertoire des emails +pollen.configuration.feedDirectory=Répertoire des flux rss Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-01 16:58:33 UTC (rev 3336) @@ -328,7 +328,7 @@ <type>jar</type> </overlay> </overlays> - <warName>pollen-embedded-${project.version}.war</warName> + <warName>pollen-embedded-${project.version}</warName> </configuration> </execution> </executions> Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-05-01 16:58:33 UTC (rev 3336) @@ -34,7 +34,7 @@ <outputDirectory>/</outputDirectory> <fileMode>0755</fileMode> <includes> - <include>${project.build.finalName}.war</include> + <include>pollen-embedded-${project.version}.war</include> </includes> </fileSet> Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-01 16:58:33 UTC (rev 3336) @@ -37,10 +37,10 @@ set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" echo java.exe defined to %JAVA_COMMAND% -set POLLEN_OPTS="-Xms512m -Xmx1024m -pollen.log.dir=./logs" +set POLLEN_OPTS="-Xms512m -Xmx1024m" echo java options used : %POLLEN_OPTS% -%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war +%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war --option pollen.log.dir $CURRENTPWD/logs goto end :end Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-01 16:30:50 UTC (rev 3335) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-01 16:58:33 UTC (rev 3336) @@ -8,6 +8,7 @@ OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` -POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -pollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war $* +POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m" +#POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Jpollen.log.dir=$CURRENTPWD/logs" +java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war --option pollen.log.dir $CURRENTPWD/logs $* cd "$OLDPWD" \ No newline at end of file