Author: echatellier Date: 2014-04-07 12:43:17 +0200 (Mon, 07 Apr 2014) New Revision: 3938 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3938 Log: Update to hibernate 4.3.5 and fix createZip storage closing Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/xmi/isis-fish.properties Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-06 16:10:33 UTC (rev 3937) +++ branches/4.0.1/pom.xml 2014-04-07 10:43:17 UTC (rev 3938) @@ -478,9 +478,9 @@ <!-- Dependencies version --> <jaxxVersion>2.6</jaxxVersion> - <eugeneVersion>2.6.3</eugeneVersion> - <topiaVersion>2.8.1.3</topiaVersion> - <hibernateVersion>4.2.11.Final</hibernateVersion> + <eugeneVersion>2.7.4</eugeneVersion> + <topiaVersion>2.9-SNAPSHOT</topiaVersion> + <hibernateVersion>4.3.5.Final</hibernateVersion> <nuitonI18nVersion>3.1-SNAPSHOT</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-06 16:10:33 UTC (rev 3937) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-07 10:43:17 UTC (rev 3938) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -35,15 +35,10 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.SessionFactory; -import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -128,7 +123,8 @@ TopiaContext tx = getStorage().beginTransaction(); tx.backup(file, true); - tx.closeContext(); + //tx.closeContext(); + closeStorage(); } catch (TopiaException eee) { throw new IsisFishRuntimeException(t("isisfish.error.prepare.data"), eee); } @@ -230,33 +226,11 @@ public void closeStorage() throws TopiaException { if (storage != null) { -// closeDatabase(); - Stoppable pool = getHibernatePool(); - storage.closeContext(); - if (pool != null) { - pool.stop(); - } storage = null; } } - @Deprecated - protected Stoppable getHibernatePool() throws TopiaException { - Stoppable result = null; - if (storage instanceof TopiaContextImpl) { - SessionFactory factory = ((TopiaContextImpl)storage).getHibernateFactory(); - if(factory instanceof SessionFactoryImpl) { - SessionFactoryImpl sf = (SessionFactoryImpl)factory; - ConnectionProvider conn = sf.getConnectionProvider(); - if(conn instanceof Stoppable) { - result = (Stoppable)conn; - } - } - } - return result; - } - /* * @see fr.ifremer.isisfish.datastore.VersionStorage#delete(boolean) */ Modified: branches/4.0.1/src/main/xmi/isis-fish.properties =================================================================== --- branches/4.0.1/src/main/xmi/isis-fish.properties 2014-04-06 16:10:33 UTC (rev 3937) +++ branches/4.0.1/src/main/xmi/isis-fish.properties 2014-04-07 10:43:17 UTC (rev 3938) @@ -22,7 +22,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.copyright=/* Copyright (C) 1999 - 2012 Ifremer - Code Lutin */ +model.tagvalue.copyright=/* Copyright (C) 1999 - 2014 Ifremer - Code Lutin */ model.tagvalue.org.nuiton.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType model.tagvalue.fr.ifremer.isisfish.types.TimeStep=fr.ifremer.isisfish.types.hibernate.TimeStepType @@ -32,6 +32,7 @@ model.tagvalue.hibernateProxyInterface=none model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.useEnumerationName=true +model.tagvalue.doNotGenerateBooleanGetMethods=false fr.ifremer.isisfish.entities.ActiveRule.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.Cell.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.EffortDescription.class.tagvalue.contextable=true