1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java Wed Sep 24 22:53:30 2014 +0200
1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java Thu Sep 25 17:50:40 2014 +0200
1.3 @@ -31,6 +31,8 @@
1.4 import info.globalcode.sql.dk.formatting.Formatter;
1.5 import info.globalcode.sql.dk.formatting.FormatterContext;
1.6 import info.globalcode.sql.dk.formatting.FormatterException;
1.7 +import info.globalcode.sql.dk.jmx.ConnectionManagement;
1.8 +import info.globalcode.sql.dk.jmx.ManagementUtils;
1.9 import java.io.File;
1.10 import java.io.FileNotFoundException;
1.11 import java.io.IOException;
1.12 @@ -149,7 +151,9 @@
1.13 private void processQueryNow() throws ConfigurationException, SQLException, FormatterException {
1.14 DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName());
1.15 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName());
1.16 - try (DatabaseConnection c = dd.connect(options.getDatabaseProperties())) {
1.17 + ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName());
1.18 +
1.19 + try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) {
1.20 log.log(Level.FINE, "Database connected");
1.21 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) {
1.22 c.executeQuery(options.getSQLCommand(), f);
1.23 @@ -169,7 +173,9 @@
1.24
1.25 DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName());
1.26 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName());
1.27 - try (DatabaseConnection c = dd.connect(options.getDatabaseProperties())) {
1.28 + ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName());
1.29 +
1.30 + try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) {
1.31 log.log(Level.FINE, "Database connected");
1.32 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) {
1.33 c.executeBatch(b, f);