java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java
branchv_0
changeset 29 d66858b4b563
parent 27 24aa5199bfd6
child 30 b7ea47b2d4ca
     1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java	Sat Dec 21 22:22:30 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/configuration/DatabaseDefinition.java	Sun Dec 22 18:19:38 2013 +0100
     1.3 @@ -17,9 +17,10 @@
     1.4   */
     1.5  package info.globalcode.sql.dk.configuration;
     1.6  
     1.7 +import static info.globalcode.sql.dk.Constants.XMLNS_CONFIGURATION;
     1.8  import info.globalcode.sql.dk.DatabaseConnection;
     1.9 +import java.sql.SQLException;
    1.10  import javax.xml.bind.annotation.XmlElement;
    1.11 -import javax.xml.bind.annotation.XmlTransient;
    1.12  
    1.13  /**
    1.14   *
    1.15 @@ -32,7 +33,7 @@
    1.16  	private String userName;
    1.17  	private String password;
    1.18  
    1.19 -	@XmlElement(name = "name")
    1.20 +	@XmlElement(name = "name", namespace = XMLNS_CONFIGURATION)
    1.21  	@Override
    1.22  	public String getName() {
    1.23  		return name;
    1.24 @@ -42,7 +43,7 @@
    1.25  		this.name = name;
    1.26  	}
    1.27  
    1.28 -	@XmlElement(name = "url")
    1.29 +	@XmlElement(name = "url", namespace = XMLNS_CONFIGURATION)
    1.30  	public String getUrl() {
    1.31  		return url;
    1.32  	}
    1.33 @@ -51,7 +52,7 @@
    1.34  		this.url = url;
    1.35  	}
    1.36  
    1.37 -	@XmlElement(name = "userName")
    1.38 +	@XmlElement(name = "userName", namespace = XMLNS_CONFIGURATION)
    1.39  	public String getUserName() {
    1.40  		return userName;
    1.41  	}
    1.42 @@ -60,7 +61,7 @@
    1.43  		this.userName = userName;
    1.44  	}
    1.45  
    1.46 -	@XmlElement(name = "password")
    1.47 +	@XmlElement(name = "password", namespace = XMLNS_CONFIGURATION)
    1.48  	public String getPassword() {
    1.49  		return password;
    1.50  	}
    1.51 @@ -69,8 +70,7 @@
    1.52  		this.password = password;
    1.53  	}
    1.54  
    1.55 -	@XmlTransient
    1.56 -	public DatabaseConnection connect() {
    1.57 +	public DatabaseConnection connect() throws SQLException {
    1.58  		return new DatabaseConnection(this);
    1.59  	}
    1.60  }