branch develop updated (41f0245 -> 11123c1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 41f0245 A la fermeture d'une base bien desenregistrer les listeners dessus new 6eb2fec Fermeture du context applicatif à la fermeture de l'application new 19554fc Supression d'un log intutile new e11bdf2 Suppression d'une classe obsolète new 11123c1 Fermer proprement les base h2 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 11123c181b6e6c7c6e8f82db8fec3c86c925b12b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:33:13 2015 +0100 Fermer proprement les base h2 commit e11bdf22efd7e77b2f0f076112d5dd7e21c1b0a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:32:15 2015 +0100 Suppression d'une classe obsolète commit 19554fce5c103de20c357052790fa649248ddb30 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:31:54 2015 +0100 Supression d'un log intutile commit 6eb2fec5a120e406d418e784d3c1e201d28a1ebf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:12:09 2015 +0100 Fermeture du context applicatif à la fermeture de l'application Summary of changes: .../main/java/fr/ird/observe/ObserveRunner.java | 35 +++++-- .../CollectionFieldExpressionValidator2.java | 6 -- .../observe/ObserveTopiaApplicationContext.java | 19 ++++ .../fr/ird/observe/entities/OpenableEntities.java | 101 --------------------- 4 files changed, 46 insertions(+), 115 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6eb2fec5a120e406d418e784d3c1e201d28a1ebf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:12:09 2015 +0100 Fermeture du context applicatif à la fermeture de l'application --- .../main/java/fr/ird/observe/ObserveRunner.java | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java index d4ca764..15517db 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -50,7 +50,7 @@ import org.nuiton.util.StringUtil; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import javax.swing.*; +import javax.swing.UIManager; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -61,8 +61,16 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.*; import static fr.ird.observe.ObserveResourceManager.Resource; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.DATA_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.DB_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.INITIAL_DB_DUMP; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.MAP_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.REPORT_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.TMP_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY; import static org.nuiton.i18n.I18n.t; /** @@ -376,13 +384,24 @@ public abstract class ObserveRunner extends ApplicationRunner { log.info("ObServe shutdown at " + new Date()); } - // on ferme le service de traduction uniquement si on quitte - // definitivement l'application - I18n.close(); + try { + + // on éteint le context applicatif + onClose(false); + + // on ferme le service de traduction uniquement si on quitte + // definitivement l'application + I18n.close(); + + getActionExecutor().terminatesAndWaits(); + + } finally { + + Runtime.getRuntime().halt(0); + + } - getActionExecutor().terminatesAndWaits(); - Runtime.getRuntime().halt(0); } @Override @@ -505,7 +524,7 @@ public abstract class ObserveRunner extends ApplicationRunner { } protected void detectLocalDataBase(ObserveSwingApplicationConfig config) throws IOException { - boolean hasLocalStorage = new File(config.getLocalDBDirectory(),ObserveSwingApplicationConfig.DB_NAME).exists(); + boolean hasLocalStorage = new File(config.getLocalDBDirectory(), ObserveSwingApplicationConfig.DB_NAME).exists(); config.setLocalStorageExist(hasLocalStorage); if (!hasLocalStorage) { if (log.isInfoEnabled()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 11123c181b6e6c7c6e8f82db8fec3c86c925b12b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 23:33:13 2015 +0100 Fermer proprement les base h2 --- .../ird/observe/ObserveTopiaApplicationContext.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 08d1683..aba848f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -30,6 +30,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; +import org.nuiton.topia.persistence.jdbc.JdbcHelper; import org.nuiton.topia.replication.TopiaReplicationService; import org.nuiton.util.GZUtil; @@ -181,4 +182,22 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat return Objects.hash(authenticationToken); } + @Override + public void close() { + super.close(); + + ObserveTopiaConfiguration topiaConfiguration = getConfiguration(); + + if (topiaConfiguration.isH2Configuration()) { + + if (log.isDebugEnabled()) { + log.debug("Shutdown h2 database"); + } + // Fermer proprement la base + JdbcHelper jdbcHelper = new JdbcHelper(topiaConfiguration); + jdbcHelper.runUpdate("SHUTDOWN COMPACT;"); + + } + + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm