1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java	Wed Sep 24 22:53:30 2014 +0200
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java	Thu Sep 25 17:50:40 2014 +0200
     1.3 @@ -19,7 +19,14 @@
     1.4  
     1.5  import static info.globalcode.sql.dk.Xmlns.CONFIGURATION;
     1.6  import info.globalcode.sql.dk.DatabaseConnection;
     1.7 +import info.globalcode.sql.dk.jmx.ConnectionManagement;
     1.8 +import java.lang.management.ManagementFactory;
     1.9  import java.sql.SQLException;
    1.10 +import java.util.Hashtable;
    1.11 +import java.util.logging.Level;
    1.12 +import java.util.logging.Logger;
    1.13 +import javax.management.MBeanServer;
    1.14 +import javax.management.ObjectName;
    1.15  import javax.xml.bind.annotation.XmlElement;
    1.16  
    1.17  /**
    1.18 @@ -29,6 +36,7 @@
    1.19   */
    1.20  public class DatabaseDefinition implements NameIdentified {
    1.21  
    1.22 +	private static final Logger log = Logger.getLogger(DatabaseDefinition.class.getName());
    1.23  	private String name;
    1.24  	private String url;
    1.25  	private String userName;
    1.26 @@ -83,8 +91,17 @@
    1.27  
    1.28  	/**
    1.29  	 * @param properties ad-hoc properties from CLI options (for the JDBC driver)
    1.30 +	 * @param jmxBean JMX management bean for progress reporting | null = disable JMX
    1.31 +	 */
    1.32 +	public DatabaseConnection connect(Properties properties, ConnectionManagement jmxBean) throws SQLException {
    1.33 +		return new DatabaseConnection(this, properties, jmxBean);
    1.34 +	}
    1.35 +
    1.36 +	/**
    1.37 +	 * @see #connect(info.globalcode.sql.dk.configuration.Properties, java.lang.String)
    1.38 +	 * With disabled JMX reporting.
    1.39  	 */
    1.40  	public DatabaseConnection connect(Properties properties) throws SQLException {
    1.41 -		return new DatabaseConnection(this, properties);
    1.42 +		return new DatabaseConnection(this, properties, null);
    1.43  	}
    1.44  }