Menu
▾
▴
[Geotools-commits] svn - r38691 - in branches/2.7.x/modules: library/jdbc/src/test/java/org/geotools/jdbc plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2 plugin/jdbc/jdbc-h2/src/main/java/org/geotools/data/h2 plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2 plugin/jdbc/jdbc-mysql/src/main/java/org/geotools/data/mysql plugin/jdbc/jdbc-mysql/src/test/java/org/geotools/data/mysql plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis plugin/jdbc/jdbc-spatialite/src/test/java/org/geotools/data/spatialite plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver plugin/jdbc/jdbc-teradata/src/test/java/org/geotools/data/teradata
Author: aaime
Date: 2012-04-26 09:19:13 -0700 (Thu, 26 Apr 2012)
New Revision: 38691
Modified:
branches/2.7.x/modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCJNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2JNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/main/java/org/geotools/data/h2/H2JNDIDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2JNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/main/java/org/geotools/data/mysql/MySQLJNDIDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/test/java/org/geotools/data/mysql/MySQLJNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGJNDIDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGOCIDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleJNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostgisNGJNDIDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisJNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-spatialite/src/test/java/org/geotools/data/spatialite/SpatiaLiteJNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerJNDIDataStoreFactory.java
branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerJNDIDataSourceTest.java
branches/2.7.x/modules/plugin/jdbc/jdbc-teradata/src/test/java/org/geotools/data/teradata/TeradataJNDIDataSourceTest.java
Log:
[GEOT-4119] Not all extra params exposed by plain JDBC factories are also exposed by JDNI ones
Modified: branches/2.7.x/modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -18,8 +18,11 @@
package org.geotools.jdbc;
import java.sql.Connection;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+import org.geotools.data.DataAccessFactory.Param;
import org.geotools.data.DataStoreFinder;
/**
@@ -55,5 +58,91 @@
dataStore.closeSafe(con);
}
+
+ /**
+ * Make sure the JNDI factory exposes all the extra params that the non JNDI one exposes
+ */
+ public void testExtraParams() {
+ List<String> baseParams = getBaseParams();
+ List<String> standardParams = getParamKeys(getDataStoreFactory());
+ standardParams.remove(JDBCDataStoreFactory.VALIDATECONN.key);
+ standardParams.remove(JDBCDataStoreFactory.MAX_OPEN_PREPARED_STATEMENTS.key);
+ standardParams.removeAll(baseParams);
+ List<String> baseJndiParams = getBaseJNDIParams();
+ List<String> jndiParams = getParamKeys(getJNDIStoreFactory());
+ jndiParams.removeAll(baseJndiParams);
+ assertEquals(standardParams, jndiParams);
+ }
+ protected abstract JDBCJNDIDataStoreFactory getJNDIStoreFactory();
+
+ protected abstract JDBCDataStoreFactory getDataStoreFactory();
+
+ /**
+ * Extracts the base params all non JNDI JDBC factories have
+ * @return
+ */
+ protected List<String> getBaseParams() {
+ JDBCDataStoreFactory factory = getBaseFactory();
+
+ return getParamKeys(factory);
+ }
+
+ protected JDBCDataStoreFactory getBaseFactory() {
+ JDBCDataStoreFactory factory = new JDBCDataStoreFactory() {
+
+ public String getDescription() {
+ // nothing to do here
+ return null;
+ }
+
+ protected String getValidationQuery() {
+ // nothing to do here
+ return null;
+ }
+
+ protected String getDriverClassName() {
+ // nothing to do here
+ return null;
+ }
+
+ protected String getDatabaseID() {
+ // nothing to do here
+ return null;
+ }
+
+ protected SQLDialect createSQLDialect(JDBCDataStore dataStore) {
+ // nothing to do here
+ return null;
+ }
+ };
+ return factory;
+ }
+
+ /**
+ * Extracts the common params all JNDI factories have
+ * @return
+ */
+ protected List<String> getBaseJNDIParams() {
+ JDBCJNDIDataStoreFactory factory = new JDBCJNDIDataStoreFactory(getBaseFactory()) {
+
+ };
+ return getParamKeys(factory);
+ }
+
+ /**
+ * Extracts the set of params available for a given factory
+ * @param factory
+ * @return
+ */
+ protected List<String> getParamKeys(JDBCDataStoreFactory factory) {
+ Param[] params = factory.getParametersInfo();
+ List<String> results = new ArrayList<String>();
+ for (Param p : params) {
+ results.add(p.key);
+ }
+
+ return results;
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2JNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2JNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2JNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.db2;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class DB2JNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,14 @@
return new JDBCJNDITestSetup(new DB2TestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new DB2NGJNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new DB2NGDataStoreFactory();
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/main/java/org/geotools/data/h2/H2JNDIDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/main/java/org/geotools/data/h2/H2JNDIDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/main/java/org/geotools/data/h2/H2JNDIDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -16,7 +16,10 @@
*/
package org.geotools.data.h2;
+import static org.geotools.data.h2.H2DataStoreFactory.*;
+
import java.io.File;
+import java.util.Map;
import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
@@ -47,4 +50,10 @@
public File getBaseDirectory() {
return ((H2DataStoreFactory)delegate).getBaseDirectory();
}
+
+ @Override
+ protected void setupParameters(Map parameters) {
+ super.setupParameters(parameters);
+ parameters.put(ASSOCIATIONS.key, ASSOCIATIONS);
+ }
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2JNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2JNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2JNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.h2;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class H2JNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,14 @@
return new JDBCJNDITestSetup(new H2TestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new H2JNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new H2DataStoreFactory();
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/main/java/org/geotools/data/mysql/MySQLJNDIDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/main/java/org/geotools/data/mysql/MySQLJNDIDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/main/java/org/geotools/data/mysql/MySQLJNDIDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -16,6 +16,10 @@
*/
package org.geotools.data.mysql;
+import static org.geotools.data.mysql.MySQLDataStoreFactory.*;
+
+import java.util.Map;
+
import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
/**
@@ -32,4 +36,10 @@
public MySQLJNDIDataStoreFactory() {
super(new MySQLDataStoreFactory());
}
+
+ @Override
+ protected void setupParameters(Map parameters) {
+ super.setupParameters(parameters);
+ parameters.put(STORAGE_ENGINE.key, STORAGE_ENGINE);
+ }
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/test/java/org/geotools/data/mysql/MySQLJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/test/java/org/geotools/data/mysql/MySQLJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-mysql/src/test/java/org/geotools/data/mysql/MySQLJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.mysql;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class MySQLJNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,14 @@
return new JDBCJNDITestSetup(new MySQLTestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new MySQLJNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new MySQLDataStoreFactory();
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGJNDIDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGJNDIDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGJNDIDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -40,6 +40,7 @@
super.setupParameters(parameters);
parameters.put(OracleNGDataStoreFactory.LOOSEBBOX.key, OracleNGDataStoreFactory.LOOSEBBOX);
- parameters.put(MAX_OPEN_PREPARED_STATEMENTS.key, MAX_OPEN_PREPARED_STATEMENTS);
+ parameters.put(OracleNGDataStoreFactory.ESTIMATED_EXTENTS.key, OracleNGDataStoreFactory.ESTIMATED_EXTENTS);
+ parameters.put(OracleNGDataStoreFactory.GEOMETRY_METADATA_TABLE.key, OracleNGDataStoreFactory.GEOMETRY_METADATA_TABLE);
}
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGOCIDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGOCIDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleNGOCIDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -82,8 +82,12 @@
if (getValidationQuery() != null)
parameters.put(VALIDATECONN.key, VALIDATECONN);
parameters.put(PK_METADATA_TABLE.key, PK_METADATA_TABLE);
+
+ parameters.put(OracleNGDataStoreFactory.LOOSEBBOX.key, OracleNGDataStoreFactory.LOOSEBBOX);
+ parameters.put(MAX_OPEN_PREPARED_STATEMENTS.key, MAX_OPEN_PREPARED_STATEMENTS);
- parameters.put(LOOSEBBOX.key, LOOSEBBOX);
- parameters.put(MAX_OPEN_PREPARED_STATEMENTS.key, MAX_OPEN_PREPARED_STATEMENTS);
+ parameters.put(OracleNGDataStoreFactory.ESTIMATED_EXTENTS.key, OracleNGDataStoreFactory.ESTIMATED_EXTENTS);
+ parameters.put(OracleNGDataStoreFactory.GEOMETRY_METADATA_TABLE.key, OracleNGDataStoreFactory.GEOMETRY_METADATA_TABLE);
+
}
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -26,4 +26,12 @@
return new JDBCJNDITestSetup(new OracleTestSetup());
}
+ protected OracleNGJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new OracleNGJNDIDataStoreFactory();
+ }
+
+ protected OracleNGDataStoreFactory getDataStoreFactory() {
+ return new OracleNGDataStoreFactory();
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostgisNGJNDIDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostgisNGJNDIDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostgisNGJNDIDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -41,7 +41,7 @@
super.setupParameters(parameters);
parameters.put(LOOSEBBOX.key, LOOSEBBOX);
+ parameters.put(ESTIMATED_EXTENTS.key, ESTIMATED_EXTENTS);
parameters.put(PREPARED_STATEMENTS.key, PREPARED_STATEMENTS);
- parameters.put(MAX_OPEN_PREPARED_STATEMENTS.key, MAX_OPEN_PREPARED_STATEMENTS);
}
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.postgis;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class PostgisJNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,14 @@
return new JDBCJNDITestSetup(new PostGISTestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new PostgisNGJNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new PostgisNGDataStoreFactory();
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-spatialite/src/test/java/org/geotools/data/spatialite/SpatiaLiteJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-spatialite/src/test/java/org/geotools/data/spatialite/SpatiaLiteJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-spatialite/src/test/java/org/geotools/data/spatialite/SpatiaLiteJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.spatialite;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class SpatiaLiteJNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,16 @@
return new JDBCJNDITestSetup(new SpatiaLiteTestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new SpatiaLiteJNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new SpatiaLiteDataStoreFactory();
+ }
+
+
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -36,7 +36,7 @@
/** parameter for database type */
public static final Param DBTYPE = new Param("dbtype", String.class, "Type", true, "sqlserver");
/** parameter for using integrated security, only works on windows, ignores the user and password parameters, the current windows user account is used for login*/
- public static final Param INTSEC = new Param("Integrated Security", Boolean.class, "Login as current windows user account. Works only in windows. Ignores user and password settings.", true, new Boolean(false));
+ public static final Param INTSEC = new Param("Integrated Security", Boolean.class, "Login as current windows user account. Works only in windows. Ignores user and password settings.", false, new Boolean(false));
@Override
protected SQLDialect createSQLDialect(JDBCDataStore dataStore) {
@@ -83,7 +83,7 @@
url = url.substring(0, url.lastIndexOf("/")) + (db != null ? ";DatabaseName="+db : "");
}
- if (intsec.booleanValue()) {
+ if (intsec != null && intsec.booleanValue()) {
url = url + ";integratedSecurity=true";
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerJNDIDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerJNDIDataStoreFactory.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerJNDIDataStoreFactory.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -16,6 +16,10 @@
*/
package org.geotools.data.sqlserver;
+import static org.geotools.data.sqlserver.SQLServerDataStoreFactory.*;
+
+import java.util.Map;
+
import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
/**
@@ -32,4 +36,11 @@
public SQLServerJNDIDataStoreFactory() {
super(new SQLServerDataStoreFactory());
}
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void setupParameters(Map parameters) {
+ super.setupParameters(parameters);
+ parameters.put(INTSEC.key, INTSEC);
+ }
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.sqlserver;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class SQLServerJNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,14 @@
return new JDBCJNDITestSetup(new SQLServerTestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new SQLServerJNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new SQLServerDataStoreFactory();
+ }
+
}
Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-teradata/src/test/java/org/geotools/data/teradata/TeradataJNDIDataSourceTest.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-teradata/src/test/java/org/geotools/data/teradata/TeradataJNDIDataSourceTest.java 2012-04-26 12:25:19 UTC (rev 38690)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-teradata/src/test/java/org/geotools/data/teradata/TeradataJNDIDataSourceTest.java 2012-04-26 16:19:13 UTC (rev 38691)
@@ -17,7 +17,9 @@
package org.geotools.data.teradata;
+import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCJNDIDataSourceTest;
+import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
import org.geotools.jdbc.JDBCJNDITestSetup;
public class TeradataJNDIDataSourceTest extends JDBCJNDIDataSourceTest {
@@ -26,4 +28,14 @@
return new JDBCJNDITestSetup(new TeradataTestSetup());
}
+ @Override
+ protected JDBCJNDIDataStoreFactory getJNDIStoreFactory() {
+ return new TeradataJNDIDataStoreFactory();
+ }
+
+ @Override
+ protected JDBCDataStoreFactory getDataStoreFactory() {
+ return new TeradataDataStoreFactory();
+ }
+
}
|
