Author: tchemit Date: 2013-11-01 00:03:35 +0100 (Fri, 01 Nov 2013) New Revision: 874 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/874 Log: fixes #3664: Updates to topia 3.0-alpha-3.1 Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/pom.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-10-31 22:58:56 UTC (rev 873) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-10-31 23:03:35 UTC (rev 874) @@ -37,7 +37,6 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; -import java.sql.Statement; /** * helper about topia context and jdbc connections. @@ -56,28 +55,6 @@ return tx; } - public static void releaseH2RootContext(TopiaContext context) throws SQLException { - - TopiaContextImplementor rootContext = ((TopiaContextImplementor) context).getRootContext(); - - String url = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_URL); - String login = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_USER); - String password = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_PASS); - - releaseRootContext(context); - - Connection conn = DriverManager.getConnection(url, login, password); - - try { - Statement statement = conn.createStatement(); - statement.execute("SHUTDOWN;"); - statement.close(); - conn.close(); - } finally { - conn.close(); - } - } - public static void releaseRootContext(TopiaContext context) { TopiaContext rootContext = ((TopiaContextImplementor) context).getRootContext(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2013-10-31 22:58:56 UTC (rev 873) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2013-10-31 23:03:35 UTC (rev 874) @@ -64,7 +64,6 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; -import java.sql.SQLException; import java.util.List; import java.util.Locale; import java.util.Map; @@ -280,13 +279,7 @@ if (internalRootContext != null) { // release internal db - try { - EchoBaseEntityHelper.releaseH2RootContext(internalRootContext); - } catch (SQLException e) { - if (log.isErrorEnabled()) { - log.error("Could not close internal db", e); - } - } + EchoBaseEntityHelper.releaseRootContext(internalRootContext); } } finally { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-31 22:58:56 UTC (rev 873) +++ trunk/pom.xml 2013-10-31 23:03:35 UTC (rev 874) @@ -140,7 +140,7 @@ <!-- libraries version --> <eugenePluginVersion>2.7.1</eugenePluginVersion> - <topiaVersion>3.0-alpha-3</topiaVersion> + <topiaVersion>3.0-alpha-3.1</topiaVersion> <nuitonUtilsVersion>2.7</nuitonUtilsVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion>