Revision 12
| trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/pom.xml | ||
|---|---|---|
| 122 | 122 |
<type>test-jar</type> |
| 123 | 123 |
<scope>test</scope> |
| 124 | 124 |
</dependency> |
| 125 |
|
|
| 126 | 125 |
<dependency> |
| 127 | 126 |
<groupId>org.gvsig</groupId> |
| 127 |
<artifactId>org.gvsig.metadata.lib.basic.impl</artifactId> |
|
| 128 |
<scope>compile</scope> |
|
| 129 |
</dependency> |
|
| 130 |
<dependency> |
|
| 131 |
<groupId>org.gvsig</groupId> |
|
| 128 | 132 |
<artifactId>org.gvsig.projection.cresques.impl</artifactId> |
| 129 | 133 |
<scope>test</scope> |
| 130 | 134 |
</dependency> |
| trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/src/main/java/org/gvsig/mssqlserver/dal/MSSQLServerStoreParameters.java | ||
|---|---|---|
| 21 | 21 |
*/ |
| 22 | 22 |
package org.gvsig.mssqlserver.dal; |
| 23 | 23 |
|
| 24 |
import org.apache.commons.lang3.StringUtils; |
|
| 24 | 25 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 25 | 26 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
| 26 | 27 |
|
| ... | ... | |
| 34 | 35 |
} |
| 35 | 36 |
|
| 36 | 37 |
@Override |
| 38 |
public String getUrl() {
|
|
| 39 |
String url = super.getUrl(); |
|
| 40 |
if( StringUtils.isEmpty(url) ) {
|
|
| 41 |
url = MSSQLServerSQLHelper.getConnectionURL(this); |
|
| 42 |
this.setUrl(url); |
|
| 43 |
} |
|
| 44 |
return url; |
|
| 45 |
} |
|
| 46 |
|
|
| 47 |
@Override |
|
| 37 | 48 |
public void validate() throws ValidateDataParametersException {
|
| 38 | 49 |
if (getJDBCDriverClassName() == null) {
|
| 39 | 50 |
setJDBCDriverClassName(MSSQLServerSQLHelper.MSSQLServerJDBCDriver); |
| ... | ... | |
| 44 | 55 |
if (getDynValue("instanceName") == null) {
|
| 45 | 56 |
setDynValue("InstanceName", MSSQLServerSQLHelper.INSTANCE_NAME);
|
| 46 | 57 |
} |
| 47 |
if (getUrl() == null) {
|
|
| 48 |
setUrl(MSSQLServerSQLHelper.getConnectionURL(this)); |
|
| 49 |
} |
|
| 50 | 58 |
super.validate(); |
| 51 | 59 |
} |
| 52 | 60 |
} |
| trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/src/main/java/org/gvsig/mssqlserver/dal/MSSQLServerExplorerParameters.java | ||
|---|---|---|
| 24 | 24 |
*/ |
| 25 | 25 |
package org.gvsig.mssqlserver.dal; |
| 26 | 26 |
|
| 27 |
import org.apache.commons.lang3.StringUtils; |
|
| 27 | 28 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 28 | 29 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
| 29 | 30 |
|
| ... | ... | |
| 38 | 39 |
} |
| 39 | 40 |
|
| 40 | 41 |
@Override |
| 42 |
public String getUrl() {
|
|
| 43 |
String url = super.getUrl(); |
|
| 44 |
if( StringUtils.isEmpty(url) ) {
|
|
| 45 |
url = MSSQLServerSQLHelper.getConnectionURL(this); |
|
| 46 |
this.setUrl(url); |
|
| 47 |
} |
|
| 48 |
return url; |
|
| 49 |
} |
|
| 50 |
|
|
| 51 |
@Override |
|
| 41 | 52 |
public void validate() throws ValidateDataParametersException {
|
| 42 | 53 |
if (getJDBCDriverClassName() == null) {
|
| 43 | 54 |
setJDBCDriverClassName(MSSQLServerSQLHelper.MSSQLServerJDBCDriver); |
| ... | ... | |
| 48 | 59 |
if( getDynValue("instanceName") == null ) {
|
| 49 | 60 |
setDynValue("InstanceName", MSSQLServerSQLHelper.INSTANCE_NAME);
|
| 50 | 61 |
} |
| 51 |
if (getUrl() == null) {
|
|
| 52 |
setUrl(MSSQLServerSQLHelper.getConnectionURL(this)); |
|
| 53 |
} |
|
| 54 | 62 |
super.validate(); |
| 55 | 63 |
} |
| 56 | 64 |
} |
| trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/src/main/java/org/gvsig/mssqlserver/dal/MSSQLServerNewStoreParameters.java | ||
|---|---|---|
| 21 | 21 |
*/ |
| 22 | 22 |
package org.gvsig.mssqlserver.dal; |
| 23 | 23 |
|
| 24 |
import org.apache.commons.lang3.StringUtils; |
|
| 24 | 25 |
import org.gvsig.fmap.dal.store.jdbc.JDBCNewStoreParameters; |
| 25 | 26 |
|
| 26 | 27 |
public class MSSQLServerNewStoreParameters extends JDBCNewStoreParameters {
|
| ... | ... | |
| 31 | 32 |
MSSQLServerLibrary.NAME |
| 32 | 33 |
); |
| 33 | 34 |
} |
| 35 |
|
|
| 36 |
@Override |
|
| 37 |
public String getUrl() {
|
|
| 38 |
String url = super.getUrl(); |
|
| 39 |
if( StringUtils.isEmpty(url) ) {
|
|
| 40 |
url = MSSQLServerSQLHelper.getConnectionURL(this); |
|
| 41 |
this.setUrl(url); |
|
| 42 |
} |
|
| 43 |
return url; |
|
| 44 |
} |
|
| 34 | 45 |
} |
| trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/src/main/java/org/gvsig/mssqlserver/dal/MSSQLServerSQLHelper.java | ||
|---|---|---|
| 101 | 101 |
dataSource.setDriverClassName(params.getJDBCDriverClassName()); |
| 102 | 102 |
dataSource.setUsername(params.getUser()); |
| 103 | 103 |
dataSource.setPassword(params.getPassword()); |
| 104 |
dataSource.setUrl(getConnectionURL(params));
|
|
| 104 |
dataSource.setUrl(params.getUrl());
|
|
| 105 | 105 |
|
| 106 | 106 |
dataSource.setMaxWait(60L * 1000); |
| 107 | 107 |
return dataSource; |
| ... | ... | |
| 142 | 142 |
public Connection getConnection() throws AccessResourceException {
|
| 143 | 143 |
try {
|
| 144 | 144 |
if (this.connectionProvider == null) {
|
| 145 |
this.connectionProvider = new ConnectionProvider(connectionParameters);
|
|
| 145 |
this.connectionProvider = new ConnectionProvider(this.getConnectionParameters());
|
|
| 146 | 146 |
} |
| 147 | 147 |
return this.connectionProvider.getConnection(); |
| 148 | 148 |
} catch (SQLException ex) {
|
| 149 | 149 |
throw new AccessResourceException(MSSQLServerLibrary.NAME, ex); |
| 150 | 150 |
} |
| 151 | 151 |
} |
| 152 |
|
|
| 153 |
@Override |
|
| 154 |
public String getConnectionURL() {
|
|
| 155 |
return getConnectionURL(this.getConnectionParameters()); |
|
| 156 |
} |
|
| 152 | 157 |
|
| 153 | 158 |
@Override |
| 154 | 159 |
protected String getResourceType() {
|
Also available in: Unified diff