diff -r 5a5fc66f11b1 -r 236332caeb29 java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java --- a/java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java Wed Sep 24 22:53:30 2014 +0200 +++ b/java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java Thu Sep 25 17:50:40 2014 +0200 @@ -19,7 +19,14 @@ import static info.globalcode.sql.dk.Xmlns.CONFIGURATION; import info.globalcode.sql.dk.DatabaseConnection; +import info.globalcode.sql.dk.jmx.ConnectionManagement; +import java.lang.management.ManagementFactory; import java.sql.SQLException; +import java.util.Hashtable; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.management.MBeanServer; +import javax.management.ObjectName; import javax.xml.bind.annotation.XmlElement; /** @@ -29,6 +36,7 @@ */ public class DatabaseDefinition implements NameIdentified { + private static final Logger log = Logger.getLogger(DatabaseDefinition.class.getName()); private String name; private String url; private String userName; @@ -83,8 +91,17 @@ /** * @param properties ad-hoc properties from CLI options (for the JDBC driver) + * @param jmxBean JMX management bean for progress reporting | null = disable JMX + */ + public DatabaseConnection connect(Properties properties, ConnectionManagement jmxBean) throws SQLException { + return new DatabaseConnection(this, properties, jmxBean); + } + + /** + * @see #connect(info.globalcode.sql.dk.configuration.Properties, java.lang.String) + * With disabled JMX reporting. */ public DatabaseConnection connect(Properties properties) throws SQLException { - return new DatabaseConnection(this, properties); + return new DatabaseConnection(this, properties, null); } }