diff --git a/hibernate-spatial/databases/sqlserver2008_spatial/matrix.gradle b/hibernate-spatial/databases/sqlserver2008_spatial/matrix.gradle new file mode 100644 index 0000000000..101eff7ab0 --- /dev/null +++ b/hibernate-spatial/databases/sqlserver2008_spatial/matrix.gradle @@ -0,0 +1,24 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +jdbcDependency "com.microsoft:sqljdbc:2.0" \ No newline at end of file diff --git a/hibernate-spatial/databases/sqlserver2008_spatial/resources/hibernate.properties b/hibernate-spatial/databases/sqlserver2008_spatial/resources/hibernate.properties new file mode 100644 index 0000000000..ff699c16ae --- /dev/null +++ b/hibernate-spatial/databases/sqlserver2008_spatial/resources/hibernate.properties @@ -0,0 +1,40 @@ +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# Copyright (c) 2011, Red Hat Inc. or third-party contributors as +# indicated by the @author tags or express copyright attribution +# statements applied by the authors. All third-party contributions are +# distributed under license by Red Hat Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# Lesser General Public License, as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License +# for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this distribution; if not, write to: +# Free Software Foundation, Inc. +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301 USA +# + +hibernate.dialect org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect +hibernate.connection.driver_class com.microsoft.sqlserver.jdbc.SQLServerDriver +hibernate.connection.url jdbc:sqlserver://192.168.0.100:1433;databaseName=HBS +hibernate.connection.username hbs +hibernate.connection.password hbs + + +hibernate.connection.pool_size 5 + +hibernate.show_sql true +hibernate.format_sql true + +hibernate.max_fetch_depth 5 + +hibernate.cache.region_prefix hibernate.test +hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory diff --git a/hibernate-spatial/hibernate-spatial.gradle b/hibernate-spatial/hibernate-spatial.gradle index d9c64ddc83..588c117314 100644 --- a/hibernate-spatial/hibernate-spatial.gradle +++ b/hibernate-spatial/hibernate-spatial.gradle @@ -18,8 +18,8 @@ dependencies { testCompile( libraries.junit ) testCompile( project(':hibernate-testing') ) testCompile( [group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4']) - testCompile([group: 'com.oracle.jdbc', name:'ojdbc6', version:'11.1.0.7.0']) - testCompile([group: 'com.microsoft', name: 'sqljdbc', version: '2.0']) +// testCompile([group: 'com.oracle.jdbc', name:'ojdbc6', version:'11.1.0.7.0']) +// testCompile([group: 'com.microsoft', name: 'sqljdbc', version: '2.0']) matrixRuntime( 'jaxen:jaxen:1.1' ) } diff --git a/hibernate-spatial/matrix-test.sh b/hibernate-spatial/matrix-test.sh index b2571b1c32..3e0d5ea7f9 100755 --- a/hibernate-spatial/matrix-test.sh +++ b/hibernate-spatial/matrix-test.sh @@ -1,3 +1,8 @@ -#! /bin/sh -# gradle -Dhibernate-matrix-databases=/home/maesenka/workspaces/github/hibernate-core/hibernate-spatial/databases -gradle -Dhibernate-matrix-databases="/home/maesenka/workspaces/github/hibernate-core/hibernate-spatial/databases" -Dhibernate-matrix-ignore='mysql50,mysql51,postgresql82,postgresql83,postgresql84' $@ +#! /bin/bash + +TASK=matrix +if [[ -n $@ ]]; then + TASK="$@" +fi +echo "TASK : $TASK" +gradle -Dhibernate-matrix-databases="/home/maesenka/workspaces/github/hibernate-core/hibernate-spatial/databases" -Dhibernate-matrix-ignore='mysql50,mysql51,postgresql82,postgresql83,postgresql84' $TASK diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServer2008SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServer2008SpatialDialect.java index c8e98c107c..222142be31 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServer2008SpatialDialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServer2008SpatialDialect.java @@ -26,6 +26,7 @@ package org.hibernate.spatial.dialect.sqlserver; +import org.hibernate.HibernateException; import org.hibernate.dialect.SQLServer2008Dialect; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.spatial.GeometryType; @@ -103,6 +104,13 @@ public class SqlServer2008SpatialDialect extends SQLServer2008Dialect implements registerFunction( "pointonsurface", new SQLFunctionTemplate( GeometryType.INSTANCE, "?1.STPointOnSurface()" ) ); } + //Temporary Fix for HHH-6074 + @Override + public String getTypeName(int code, long length, int precision, int scale) throws HibernateException { + if (code == 3000) return "GEOMETRY"; + return super.getTypeName(code, length, precision, scale); + } + @Override public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) { if ( sqlTypeDescriptor instanceof GeometrySqlTypeDescriptor) { diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/AbstractConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/AbstractConvertorTest.java similarity index 87% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/AbstractConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/AbstractConvertorTest.java index 68a3fd71aa..6b81aa2814 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/AbstractConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/AbstractConvertorTest.java @@ -22,7 +22,7 @@ * * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; /** * @author Karel Maesen, Geovise BVBA. @@ -32,9 +32,6 @@ package org.hibernate.spatial.testing.dialects.sqlserver.convertors; import com.vividsolutions.jts.geom.Geometry; import org.hibernate.spatial.Log; import org.hibernate.spatial.LogFactory; -import org.hibernate.spatial.dialect.sqlserver.convertors.Decoders; -import org.hibernate.spatial.dialect.sqlserver.convertors.Encoders; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.spatial.testing.DataSourceUtils; import org.hibernate.spatial.testing.SpatialFunctionalTestCase; import org.hibernate.spatial.testing.TestData; @@ -67,7 +64,6 @@ public abstract class AbstractConvertorTest extends SpatialFunctionalTestCase { Map encodedGeoms; Map expectedGeoms; - public void beforeClass() { dataSourceUtils = new DataSourceUtils( "sqlserver/hibernate-spatial-sqlserver-test.properties", @@ -84,17 +80,17 @@ public abstract class AbstractConvertorTest extends SpatialFunctionalTestCase { throw new RuntimeException(e); } } - - public void afterClass() { - try { - String sql = dataSourceUtils.parseSqlIn("sqlserver/drop-sqlserver-test-schema.sql"); - dataSourceUtils.executeStatement(sql); - } catch (SQLException e) { - throw new RuntimeException(e); - } catch (IOException e) { - throw new RuntimeException(e); - } - } +// +// public void afterClass() { +// try { +// String sql = dataSourceUtils.parseSqlIn("sqlserver/drop-sqlserver-test-schema.sql"); +// dataSourceUtils.executeStatement(sql); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } catch (IOException e) { +// throw new RuntimeException(e); +// } +// } public void doDecoding(OpenGisType type) { rawResults = dataSourceUtils.rawDbObjects(type.toString()); diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/GeometryCollectionConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/GeometryCollectionConvertorTest.java similarity index 85% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/GeometryCollectionConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/GeometryCollectionConvertorTest.java index 2fc0be837c..64a3919f2c 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/GeometryCollectionConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/GeometryCollectionConvertorTest.java @@ -23,11 +23,9 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; -import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; import org.junit.Test; @@ -43,7 +41,7 @@ import org.junit.Test; public class GeometryCollectionConvertorTest extends AbstractConvertorTest { @BeforeClassOnce - public void setUp() { + public void beforeClass() { super.beforeClass(); doDecoding(OpenGisType.GEOMETRYCOLLECTION); doEncoding(); @@ -59,9 +57,4 @@ public class GeometryCollectionConvertorTest extends AbstractConvertorTest { super.test_decoding(); } - @AfterClassOnce - public void afterClass(){ - super.afterClass(); - } - } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/LineStringConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/LineStringConvertorTest.java similarity index 94% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/LineStringConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/LineStringConvertorTest.java index edfff5e4e9..2fa566aa0c 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/LineStringConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/LineStringConvertorTest.java @@ -23,12 +23,11 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.LineString; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.spatial.jts.mgeom.MCoordinate; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; @@ -41,9 +40,10 @@ import static org.junit.Assert.assertTrue; @RequiresDialect(SqlServer2008SpatialDialect.class) public class LineStringConvertorTest extends AbstractConvertorTest { - @BeforeClassOnce - public void setUp() { - doDecoding( OpenGisType.LINESTRING ); + @BeforeClassOnce + public void beforeClass() { + super.beforeClass(); + doDecoding(OpenGisType.LINESTRING); doEncoding(); } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiLineStringConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiLineStringConvertorTest.java similarity index 90% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiLineStringConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiLineStringConvertorTest.java index 94fceef17d..f7048bb8a6 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiLineStringConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiLineStringConvertorTest.java @@ -23,10 +23,9 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; import org.junit.Test; @@ -35,7 +34,8 @@ import org.junit.Test; public class MultiLineStringConvertorTest extends AbstractConvertorTest { @BeforeClassOnce - public void setUp() { + public void beforeClass() { + super.beforeClass(); doDecoding( OpenGisType.MULTILINESTRING ); doEncoding(); } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiPointConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiPointConvertorTest.java similarity index 90% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiPointConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiPointConvertorTest.java index 7630c08584..acd8a619dd 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiPointConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiPointConvertorTest.java @@ -23,10 +23,9 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; import org.junit.Test; @@ -35,7 +34,8 @@ import org.junit.Test; public class MultiPointConvertorTest extends AbstractConvertorTest { @BeforeClassOnce - public void setUp() { + public void beforeClass() { + super.beforeClass(); doDecoding( OpenGisType.MULTIPOINT ); doEncoding(); } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiPolygonConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiPolygonConvertorTest.java similarity index 90% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiPolygonConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiPolygonConvertorTest.java index b250745663..b2c302076f 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/MultiPolygonConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/MultiPolygonConvertorTest.java @@ -23,10 +23,9 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; import org.junit.Test; @@ -35,7 +34,8 @@ import org.junit.Test; public class MultiPolygonConvertorTest extends AbstractConvertorTest { @BeforeClassOnce - public void setUp() { + public void beforeClass() { + super.beforeClass(); doDecoding( OpenGisType.MULTIPOLYGON ); doEncoding(); } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/PointConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/PointConvertorTest.java similarity index 94% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/PointConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/PointConvertorTest.java index 13842dafad..c07364e4e5 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/PointConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/PointConvertorTest.java @@ -23,12 +23,11 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Point; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.spatial.jts.mgeom.MCoordinate; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; @@ -44,7 +43,8 @@ import static junit.framework.Assert.assertEquals; public class PointConvertorTest extends AbstractConvertorTest { @BeforeClassOnce - public void setup() { + public void beforeClass() { + super.beforeClass(); doDecoding( OpenGisType.POINT ); doEncoding(); } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/PolygonConvertorTest.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/PolygonConvertorTest.java similarity index 90% rename from hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/PolygonConvertorTest.java rename to hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/PolygonConvertorTest.java index 46aaf264d5..3cc74e0516 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/sqlserver/convertors/PolygonConvertorTest.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/dialect/sqlserver/convertors/PolygonConvertorTest.java @@ -23,10 +23,9 @@ * For more information, visit: http://www.hibernatespatial.org/ */ -package org.hibernate.spatial.testing.dialects.sqlserver.convertors; +package org.hibernate.spatial.dialect.sqlserver.convertors; import org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect; -import org.hibernate.spatial.dialect.sqlserver.convertors.OpenGisType; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; import org.junit.Test; @@ -36,7 +35,8 @@ public class PolygonConvertorTest extends AbstractConvertorTest { @BeforeClassOnce - public void setUp() { + public void beforeClass() { + super.beforeClass(); doDecoding( OpenGisType.POLYGON ); doEncoding(); } diff --git a/hibernate-spatial/src/test/resources/hibernate.properties b/hibernate-spatial/src/test/resources/hibernate.properties index d8bd3fb02f..ac7d980c83 100644 --- a/hibernate-spatial/src/test/resources/hibernate.properties +++ b/hibernate-spatial/src/test/resources/hibernate.properties @@ -58,7 +58,7 @@ hibernate.jdbc.batch_versioned_data true #hibernate.dialect org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect #hibernate.connection.driver_class com.microsoft.sqlserver.jdbc.SQLServerDriver -#hibernate.connection.url jdbc:sqlserver://192.168.122.67:1433;databaseName=HBS +#hibernate.connection.url jdbc:sqlserver://192.168.0.100:1433;databaseName=HBS #hibernate.connection.username hbs #hibernate.connection.password hbs # diff --git a/hibernate-spatial/src/test/resources/sqlserver/hibernate-spatial-sqlserver-test.properties b/hibernate-spatial/src/test/resources/sqlserver/hibernate-spatial-sqlserver-test.properties index 2e899f5167..47d33b3dc2 100644 --- a/hibernate-spatial/src/test/resources/sqlserver/hibernate-spatial-sqlserver-test.properties +++ b/hibernate-spatial/src/test/resources/sqlserver/hibernate-spatial-sqlserver-test.properties @@ -2,9 +2,9 @@ # $Id: hibernate-spatial-sqlserver-test.properties 182 2010-03-20 17:30:12Z maesenka $ # -#jdbcUrl = jdbc:sqlserver://192.168.0.100:1433;databaseName=HBS -#jdbcDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver -#jdbcUser = hbs -#jdbcPass = hbs -#dataset = test-data-set.xml +jdbcUrl = jdbc:sqlserver://192.168.0.100:1433;databaseName=HBS +jdbcDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver +jdbcUser = hbs +jdbcPass = hbs +dataset = test-data-set.xml diff --git a/hibernate-spatial/src/test/resources/sqlserver/sqlserver-2008-test-data.ser b/hibernate-spatial/src/test/resources/sqlserver/sqlserver-2008-test-data.ser deleted file mode 100644 index ad85f6185b..0000000000 Binary files a/hibernate-spatial/src/test/resources/sqlserver/sqlserver-2008-test-data.ser and /dev/null differ