branch feature/8175 created (now 6cb3384)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8175 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 6cb3384 Mise en place du script de mise à jour au démarrage de l'application (See #8175) This branch includes the following new commits: new abb0eb3 Ajout d'un script pour faciliter les mises à jour (See #8175) new fbd0194 Mise à jour de la documentation des mise à jour (See #8175) new 3089b78 Mise à jour de la documentation d'installation (pré-requis tomcat 8) new 6cb3384 Mise en place du script de mise à jour au démarrage de l'application (See #8175) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6cb33848fb8aca99ccc50c2625f7f77e5504d153 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 20 12:08:51 2016 +0200 Mise en place du script de mise à jour au démarrage de l'application (See #8175) commit 3089b785682ae375791d19634fd0ec18abed54a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 15 13:42:26 2016 +0200 Mise à jour de la documentation d'installation (pré-requis tomcat 8) commit fbd0194020b7d3986729b86db367fcc54fef70be Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 15 13:40:57 2016 +0200 Mise à jour de la documentation des mise à jour (See #8175) commit abb0eb3a3fa05fbe923eaa43c4eee2480a3feb91 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 15 13:40:32 2016 +0200 Ajout d'un script pour faciliter les mises à jour (See #8175) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8175 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit abb0eb3a3fa05fbe923eaa43c4eee2480a3feb91 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 15 13:40:32 2016 +0200 Ajout d'un script pour faciliter les mises à jour (See #8175) --- echobase-ui/pom.xml | 1 + echobase-ui/src/main/resources/update-echobase.sh | 54 +++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index ce24db1..af02dfb 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -62,6 +62,7 @@ <includes> <include>echobase.properties</include> <include>struts.xml</include> + <include>update-echobase.sh</include> </includes> </resource> diff --git a/echobase-ui/src/main/resources/update-echobase.sh b/echobase-ui/src/main/resources/update-echobase.sh new file mode 100755 index 0000000..485d3fe --- /dev/null +++ b/echobase-ui/src/main/resources/update-echobase.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +# version to deploy +ECHOBASE_VERSION=$1 + +TOMCAT_HOME_DIRECTORY=/var/lib/tomcat8 +TOMCAT_WEBAPPS_DIRECTORY=${TOMCAT_HOME_DIRECTORY}/webapps + +if [ ! -d ${TOMCAT_WEBAPPS_DIRECTORY} ]; then + echo "Could not find tomcat 8 webapps directory at $TOMCAT_WEBAPPS_DIRECTORY" + exit 1 +fi + +ECHOBASE_DIRECTORY=/var/local/echobase +if [ ! -d ${ECHOBASE_DIRECTORY} ]; then + echo "Could not find echobase directory at $ECHOBASE_DIRECTORY" + exit 1 +fi + +if [ ! -d ${ECHOBASE_DIRECTORY}/war ]; then + echo "Could not find echobase war directory at $ECHOBASE_DIRECTORY/war" + exit 1 +fi + +cd ${ECHOBASE_DIRECTORY}/war + +WAR_FILENAME=echobase-ui-${ECHOBASE_VERSION}-full.war +WAR_URL=https://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${ECHOBASE_VERSION}/${WAR_FILENAME} + +wget ${WAR_URL} +if [ ! -f ${WAR_FILENAME} ]; then + echo "Could not find echobase war at $WAR_URL" + exit 1 +fi + +rm -rf ${TOMCAT_WEBAPPS_DIRECTORY}/echobase.war +rm -rf ${TOMCAT_HOME_DIRECTORY}/Catalina/localhost/echobase + +while [ -d ${TOMCAT_WEBAPPS_DIRECTORY}/echobase ]; do + echo "Waiting for echobase to be nicely undeployed" + sleep 1 +done + +service tomcat8 stop + +cd ${ECHOBASE_DIRECTORY} + +unlink echobase.war +ln -s war/${WAR_FILENAME} echobase.war +cp echobase.war ${TOMCAT_WEBAPPS_DIRECTORY} + +chown tomcat8:echobase -R ${ECHOBASE_DIRECTORY} + +service tomcat8 start -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8175 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit fbd0194020b7d3986729b86db367fcc54fef70be Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 15 13:40:57 2016 +0200 Mise à jour de la documentation des mise à jour (See #8175) --- src/site/en/rst/update.rst.vm | 33 +++++---------------------------- src/site/rst/update.rst.vm | 29 +++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/site/en/rst/update.rst.vm b/src/site/en/rst/update.rst.vm index e6be93d..76b1e33 100644 --- a/src/site/en/rst/update.rst.vm +++ b/src/site/en/rst/update.rst.vm @@ -23,37 +23,14 @@ Echobase ======== -Mise à jour d'une version d'EchoBase sur un serveur ---------------------------------------------------- +Update EchoBase application (after version 4.0-alpha-2) +------------------------------------------------------- Pré-requis: -- L'application doit déjà être installé dans le répertoire /var/local/echobase -- Être loggué sur une console avec l'utilisateur root. - -On suppose que tomcat a été installé via le système de paquets, et donc -que le répertoire **/var/lib/tomcat7** existe. - -Pour utiliser une nouvelle version de l'application, c'est très simple. - -- Supprimer les répertoires suivants : +- Application must have been installed once in version 4.0-alpha-2 +- Be loggued with user root :: - rm -rf /var/lib/tomcat7/webapps/echobase.war - rm -rf /var/lib/tomcat7/Catalina/localhost/echobase - -- Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. - -- Mettre l'application dans tomcat : - -:: - - cd /var/local/echobase/war - wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war - unlink /var/local/echobase/echobase.war - ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war - cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps - -Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse - http://localhost:8080/echobase + sh /var/local/echobase/bin/update-echobase.sh ${project.version} diff --git a/src/site/rst/update.rst.vm b/src/site/rst/update.rst.vm index e6be93d..716a533 100644 --- a/src/site/rst/update.rst.vm +++ b/src/site/rst/update.rst.vm @@ -23,8 +23,21 @@ Echobase ======== -Mise à jour d'une version d'EchoBase sur un serveur ---------------------------------------------------- +Mise à jour d'une version d'EchoBase sur un serveur (après la version 4.0) +-------------------------------------------------------------------------- + +Pré-requis: + +- L'application (version 4.0) doit déjà être installé dans le répertoire /var/local/echobase +- Être loggué sur une console avec l'utilisateur root. + +:: + + sh /var/local/echobase/bin/update-echobase.sh ${project.version} + + +Mise à jour d'une version d'EchoBase sur un serveur (avant la version 4.0) +-------------------------------------------------------------------------- Pré-requis: @@ -32,7 +45,7 @@ Pré-requis: - Être loggué sur une console avec l'utilisateur root. On suppose que tomcat a été installé via le système de paquets, et donc -que le répertoire **/var/lib/tomcat7** existe. +que le répertoire **/var/lib/tomcat8** existe. Pour utiliser une nouvelle version de l'application, c'est très simple. @@ -40,20 +53,20 @@ Pour utiliser une nouvelle version de l'application, c'est très simple. :: - rm -rf /var/lib/tomcat7/webapps/echobase.war - rm -rf /var/lib/tomcat7/Catalina/localhost/echobase + rm -rf /var/lib/tomcat8/webapps/echobase.war + rm -rf /var/lib/tomcat8/Catalina/localhost/echobase -- Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. +- Attendre que le répertoire **/var/lib/tomcat8/webapps/echobase** a bien été supprimé. - Mettre l'application dans tomcat : :: cd /var/local/echobase/war - wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war + wget https://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war unlink /var/local/echobase/echobase.war ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war - cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps + cp /var/local/echobase/echobase.war /var/lib/tomcat8/webapps Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse http://localhost:8080/echobase -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8175 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 3089b785682ae375791d19634fd0ec18abed54a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 15 13:42:26 2016 +0200 Mise à jour de la documentation d'installation (pré-requis tomcat 8) --- src/site/en/rst/install.rst.vm | 5 +++++ src/site/rst/install.rst.vm | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/site/en/rst/install.rst.vm b/src/site/en/rst/install.rst.vm index dcea242..7496240 100644 --- a/src/site/en/rst/install.rst.vm +++ b/src/site/en/rst/install.rst.vm @@ -30,6 +30,11 @@ Echobase :start: 1 :depth: 2 +TODO +---- + +Update this documentation from the french one. + Installing EchoBase on a server ------------------------------- diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index e9d7c64..83ae1cd 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -57,7 +57,7 @@ Installation de l'applicatif L'application utilise les applicatifs suivants qu'il faut installer et configurer si nécessaire : -- tomcat7 +- tomcat8 - apache2 - qgis-map-server - lizmap @@ -67,9 +67,9 @@ Installation tomcat :: - apt-get install tomcat7 + apt-get install tomcat8 -Activez le connecteur AJP tomcat : dans le fichier **/etc/tomcat7/server.xml** décommentez la ligne +Activez le connecteur AJP tomcat : dans le fichier **/etc/tomcat8/server.xml** décommentez la ligne :: <Connector port="8009" enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/> @@ -77,7 +77,7 @@ Activez le connecteur AJP tomcat : dans le fichier **/etc/tomcat7/server.xml** d Redémarrez le service tomcat :: - service tomcat7 restart + service tomcat8 restart Installation apache2 ~~~~~~~~~~~~~~~~~~~~ @@ -97,7 +97,7 @@ On crée un groupe utilisateur nommé *echobase* pour gérer les droits aussi bi addgroup echobase adduser www-data echobase - adduser tomcat7 echobase + adduser tomcat8 echobase Installation Qgis map server ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -137,7 +137,7 @@ Nous utilisons la version ${lizmapVersion} de Lizmap. ln -s lizmap-web-client-${lizmapVersion} echobase-map cd /var/www/html/echobase-map/lizmap - wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-lizmap.zip + wget https://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-lizmap.zip unzip -o echobase-ui-${project.version}-lizmap.zip rm -rf echobase-ui-${project.version}-lizmap.zip @@ -153,7 +153,7 @@ Installation EchoBase ~~~~~~~~~~~~~~~~~~~~~ On suppose que tomcat a été installé via le système de paquets, et donc -que le répertoire **/var/lib/tomcat7** existe. +que le répertoire **/var/lib/tomcat8** existe. Toutes les données de l'application seront placées dans le répertoire **/var/local/echobase** @@ -167,9 +167,9 @@ Toutes les données de l'application seront placées dans le répertoire **/var/ cd /var/local/echobase ln -s war/echobase-ui-${project.version}-full.war echobase.war - cp echobase.war /var/lib/tomcat7/webapps + cp echobase.war /var/lib/tomcat8/webapps - chown -R tomcat7:echobase . + chown -R tomcat8:echobase . chmod g+w -R . L'application est bien déployée lorsque vous pouvez y accéder à l'adresse suivante : @@ -267,7 +267,7 @@ On doit indiquer à EchoBase l'adresse qui génère les cartes echo "" >> /etc/echobase.properties echo "echobase.lizmap.application.map.url=http://echobase-map.$DOMAIN/echobase-map/lizmap/www/index.php/view/map" >> /etc/echobase.properties - service tomcat7 restart + service tomcat8 restart Conclusion ~~~~~~~~~~ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8175 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6cb33848fb8aca99ccc50c2625f7f77e5504d153 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 20 12:08:51 2016 +0200 Mise en place du script de mise à jour au démarrage de l'application (See #8175) --- .../echobase/config/EchoBaseConfiguration.java | 14 ++++++- .../config/EchoBaseConfigurationOption.java | 48 ++++++++++++++-------- .../i18n/echobase-domain_en_GB.properties | 3 ++ .../i18n/echobase-domain_fr_FR.properties | 3 ++ .../echobase/ui/EchoBaseApplicationContext.java | 22 ++++++++++ .../resources/{ => embedded}/update-echobase.sh | 0 6 files changed, 72 insertions(+), 18 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 72d841a..a877f47 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -182,6 +182,13 @@ public class EchoBaseConfiguration { return file; } + public File getBinDirectory() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.BIN_DIRECTORY.key); + Preconditions.checkNotNull(file); + return file; + } + public File getTemporaryDirectory() { File file = applicationConfig.getOptionAsFile( EchoBaseConfigurationOption.TEMPORARY_DIRECTORY.key); @@ -196,7 +203,12 @@ public class EchoBaseConfiguration { return file; } - public File getRscriptExecutablePath() { + public File getUpdateExecutablePath() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.UPDATE_EXECTUABLE_PATH.key); + Preconditions.checkNotNull(file); + return file; + } public File getRscriptExecutablePath() { File file = applicationConfig.getOptionAsFile( EchoBaseConfigurationOption.RSCRIPT_EXECTUABLE_PATH.key); Preconditions.checkNotNull(file); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index 09918fc..a259f9c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -36,28 +36,42 @@ import static org.nuiton.i18n.I18n.n; */ public enum EchoBaseConfigurationOption implements ConfigOptionDef { + ECHOBASE_BASE_DIRECTORY("echobase.base.directory", + n("echobase.config.base.directory.description"), + "/var/local/echobase", + File.class), + /** Main directory where to put echobase data (logs, and others...). */ DATA_DIRECTORY("echobase.data.directory", n("echobase.config.data.directory.description"), - "/var/local/echobase/data", + "${echobase.base.directory}/data", File.class), LIBRARY_DIRECTORY("echobase.lib.directory", n("echobase.config.lib.directory.description"), "${echobase.data.directory}/lib", File.class), + BIN_DIRECTORY("echobase.bin.directory", + n("echobase.config.bin.directory.description"), + "${echobase.base.directory}/bin", + File.class), INTERNAL_DB_DIRECTORY( "echobase.internal.db.directory", n("echobase.config.internal.db.directory.description"), "${echobase.data.directory}/internaldb", File.class), TEMPORARY_DIRECTORY("echobase.data.temporary.directory", - n("echobase.config.data.temporary.directory.description"), - "${echobase.data.directory}/temp", - File.class), + n("echobase.config.data.temporary.directory.description"), + "${echobase.data.directory}/temp", + File.class), + UPDATE_EXECTUABLE_PATH( + "echobase.update.executable.path", + n("echobase.config.update.executable.path.description"), + "/usr/bin/Rscript", + File.class), RSCRIPT_EXECTUABLE_PATH( "echobase.Rscript.executable.path", n("echobase.config.Rscript.executable.path.description"), - "/usr/bin/Rscript", + "${echobase.bin.directory}/update_echobase.sh", File.class), EMBEDDED("echobase.embedded", n("echobase.config.embedded.description"), @@ -120,21 +134,21 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { "${echobase.gis.directory}/projects", File.class), LIZMAP_APPLICATION_BASEDIR("echobase.lizmap.application.basedir", - n("echobase.config.lizmap.application.basedir.description"), - "/var/www/html/echobase-map", - File.class), + n("echobase.config.lizmap.application.basedir.description"), + "/var/www/html/echobase-map", + File.class), LIZMAP_APPLICATION_CONFIG_FILE("echobase.lizmap.application.config.file", - n("echobase.config.lizmap.application.config.file.description"), - "${echobase.lizmap.application.basedir}/lizmap/var/config/lizmapConfig.ini.php", - File.class), + n("echobase.config.lizmap.application.config.file.description"), + "${echobase.lizmap.application.basedir}/lizmap/var/config/lizmapConfig.ini.php", + File.class), LIZMAP_APPLICATION_MAP_URL("echobase.lizmap.application.map.url", - n("echobase.config.lizmap.application.map.url.description"), - "http://localhost/echobase-map/lizmap/www/index.php/view/map", - String.class), + n("echobase.config.lizmap.application.map.url.description"), + "http://localhost/echobase-map/lizmap/www/index.php/view/map", + String.class), LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", - n("echobase.config.lizmap.application.jdbc.url.description"), - "jdbc:sqlite:${echobase.lizmap.application.basedir}/lizmap/var/jauth.db", - String.class), + n("echobase.config.lizmap.application.jdbc.url.description"), + "jdbc:sqlite:${echobase.lizmap.application.basedir}/lizmap/var/jauth.db", + String.class), LIZMAP_REPOSITORY_NAME("echobase.lizmap.repositoryName", n("echobase.lizmap.repositoryName.description"), "echobase", diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties index 0c80451..00f6d96 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties @@ -27,6 +27,8 @@ echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Voyage import echobase.common.importType.voyage.short=Complete voyage echobase.config.Rscript.executable.path.description=Location of the R command +echobase.config.base.directory.description=Base directory of EchoBase +echobase.config.bin.directory.description=Binaries directory echobase.config.coser.api.url=Url to request Coser API echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data @@ -50,6 +52,7 @@ echobase.config.log.config.file.description=Log configuration file echobase.config.postgresqlVersion.description=Postgresql driver version echobase.config.qgis.resources.directory.description=Directory where to store any resources used by Qgis projets (such as maps,...) echobase.config.qgis.template.file.description=Qgis file template +echobase.config.update.executable.path.description=Path to update script echobase.config.version.description=Application version echobase.config.war.location.description=Location of the war used to create embedded applications echobase.configuration.description=EchoBase configuration diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties index 6d0debd..ad3b71b 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties @@ -27,6 +27,8 @@ echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Import Campagne echobase.common.importType.voyage.short=Campagne complête echobase.config.Rscript.executable.path.description=Chemin vers l'exécutable R +echobase.config.base.directory.description=Chemin d'installation d'EchoBase +echobase.config.bin.directory.description=Chemin du répertoire des scripts de démarrage d'EchoBase echobase.config.coser.api.url=Url pour intérroger le site des indicateurs echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application @@ -49,6 +51,7 @@ echobase.config.log.config.file.description=Fichier de configuration des logs echobase.config.postgresqlVersion.description=Version du pilote jdbc Postgresql echobase.config.qgis.resources.directory.description=Répertoire des resources associées à un projet Qgis echobase.config.qgis.template.file.description=Le modèle du fichier Qgis +echobase.config.update.executable.path.description=Chemin du script de mise à jour d'EchoBase echobase.config.version.description=Version de l'application echobase.config.war.location.description=Chemin d'accèss au war embarqué à utiliser pour créer des applications embarquées echobase.configuration.description=Configuration d'EchoBase diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index d58201c..ba07050 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -219,6 +219,13 @@ public class EchoBaseApplicationContext { // init database (and create minimal admin user if required) initInternalDatabase(serviceContext); + // init bin directory + try { + initBinDirectory(); + } catch (IOException e) { + throw new TopiaException("Could not init bin directory", e); + } + // extract files to library directory if required try { extractFiles(); @@ -447,6 +454,21 @@ public class EchoBaseApplicationContext { } } + protected void initBinDirectory() throws IOException { + + // copy drivers + File binDirectory = configuration.getBinDirectory(); + EchoBaseIOUtil.forceMkdir(binDirectory); + File updateExecutablePath = configuration.getUpdateExecutablePath(); + String updateExecutablePathName = updateExecutablePath.getName(); + // copy it from class-path + if (log.isInfoEnabled()) { + log.info("Copy embedded resource " + updateExecutablePathName + " to directory " + binDirectory); + } + EmbeddedApplicationService.copyEmbeddedBinaryFile(updateExecutablePathName, binDirectory); + + } + protected void initGisFiles() { try { diff --git a/echobase-ui/src/main/resources/update-echobase.sh b/echobase-ui/src/main/resources/embedded/update-echobase.sh similarity index 100% rename from echobase-ui/src/main/resources/update-echobase.sh rename to echobase-ui/src/main/resources/embedded/update-echobase.sh -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm