Menu
▾
▴
[Geotools-commits] svn - r35954 - in tags/2.7-M2-GS: . build build/maven build/maven/jar-collector build/maven/javadoc build/maven/jjtree-javacc build/maven/xmlcodegen demo demo/example demo/gmlparsing demo/jdbc demo/libraryJTS demo/svgsupport demo/xml-po docs modules modules/extension modules/extension/brewer modules/extension/graph modules/extension/validation modules/extension/wms modules/extension/xsd modules/extension/xsd/xsd-core modules/extension/xsd/xsd-filter modules/extension/xsd/xsd-gml2 modules/extension/xsd/xsd-gml3 modules/extension/xsd/xsd-kml modules/extension/xsd/xsd-ows modules/extension/xsd/xsd-sld modules/extension/xsd/xsd-wcs modules/extension/xsd/xsd-wfs modules/extension/xsd/xsd-wps modules/library modules/library/api modules/library/coverage modules/library/cql modules/library/data modules/library/jdbc modules/library/main modules/library/metadata modules/library/metadata/src/main/java/org/geotools/factory modules/library/referencing modules/library/render modul es/library/sample-data modules/library/temporal modules/library/xml modules/ogc modules/ogc/net.opengis.ows modules/ogc/net.opengis.wcs modules/ogc/net.opengis.wfs modules/ogc/net.opengis.wfsv modules/ogc/net.opengis.wps modules/ogc/org.w3.xlink modules/plugin modules/plugin/arcgrid modules/plugin/arcsde modules/plugin/arcsde/common modules/plugin/arcsde/datastore modules/plugin/arcsde/sde-dummy modules/plugin/charts modules/plugin/db2 modules/plugin/epsg-extension modules/plugin/epsg-hsql modules/plugin/epsg-postgresql modules/plugin/epsg-wkt modules/plugin/feature-pregeneralized modules/plugin/geotiff modules/plugin/gtopo30 modules/plugin/image modules/plugin/imageio-ext-gdal modules/plugin/imagemosaic modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalog modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalogbuilder modules/plugin/imagemosaic-jdbc modules/pl ugin/imagepyramid modules/plugin/jdbc modules/plugin/jdbc/jdbc-db2 modules/plugin/jdbc/jdbc-h2 modules/plugin/jdbc/jdbc-mysql modules/plugin/jdbc/jdbc-oracle modules/plugin/jdbc/jdbc-postgis modules/plugin/jdbc/jdbc-spatialite modules/plugin/jdbc/jdbc-sqlserver modules/plugin/jp2k modules/plugin/postgis modules/plugin/property modules/plugin/referencing3D modules/plugin/shapefile modules/plugin/svg modules/unsupported modules/unsupported/app-schema modules/unsupported/app-schema/app-schema modules/unsupported/app-schema/app-schema-packages modules/unsupported/app-schema/app-schema-resolver modules/unsupported/app-schema/jdbc-regfunc modules/unsupported/app-schema/sample-data-access modules/unsupported/app-schema/sample-data-access-isogeom modules/unsupported/app-schema/webservice modules/unsupported/caching modules/unsupported/coverage-experiment modules/unsupported/coverage-experiment/coverage-api modules/unsupported/coverage-experiment/coverage-core modules/unsupported/cov erage-experiment/grib1 modules/unsupported/coverage-experiment/hdf4 modules/unsupported/coverage-experiment/netcdf modules/unsupported/coverageio modules/unsupported/coverageio-netcdf modules/unsupported/coveragetools modules/unsupported/directory modules/unsupported/dxf modules/unsupported/edigeo modules/unsupported/epsg-h2 modules/unsupported/epsg-oracle modules/unsupported/example modules/unsupported/geojson modules/unsupported/geometry modules/unsupported/geometryless modules/unsupported/grassraster modules/unsupported/grid modules/unsupported/idl-process modules/unsupported/jai-tools modules/unsupported/jdbc-ng modules/unsupported/jdbc-ng/jdbc-ingres modules/unsupported/jts-wrapper modules/unsupported/matfile5 modules/unsupported/mysql modules/unsupported/ogr modules/unsupported/oracle-spatial modules/unsupported/postgis-versioned modules/unsupported/process modules/unsupported/shapefile-renderer modules/unsupported/sql-datastore modules/unsupported/swing modules/unsupp orted/vpf modules/unsupported/wfs modules/unsupported/wps spike/jan/gsoc-transformations
Author: danieleromagnoli
Date: 2010-07-26 08:16:22 +0000 (Mon, 26 Jul 2010)
New Revision: 35954
Modified:
tags/2.7-M2-GS/build/maven/jar-collector/pom.xml
tags/2.7-M2-GS/build/maven/javadoc/pom.xml
tags/2.7-M2-GS/build/maven/jjtree-javacc/pom.xml
tags/2.7-M2-GS/build/maven/pom.xml
tags/2.7-M2-GS/build/maven/xmlcodegen/pom.xml
tags/2.7-M2-GS/build/pom.xml
tags/2.7-M2-GS/demo/example/pom.xml
tags/2.7-M2-GS/demo/gmlparsing/pom.xml
tags/2.7-M2-GS/demo/jdbc/pom.xml
tags/2.7-M2-GS/demo/libraryJTS/pom.xml
tags/2.7-M2-GS/demo/pom.xml
tags/2.7-M2-GS/demo/svgsupport/pom.xml
tags/2.7-M2-GS/demo/xml-po/pom.xml
tags/2.7-M2-GS/docs/pom.xml
tags/2.7-M2-GS/modules/extension/brewer/pom.xml
tags/2.7-M2-GS/modules/extension/graph/pom.xml
tags/2.7-M2-GS/modules/extension/pom.xml
tags/2.7-M2-GS/modules/extension/validation/pom.xml
tags/2.7-M2-GS/modules/extension/wms/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-core/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-filter/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-gml2/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-gml3/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-kml/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-ows/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-sld/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-wcs/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-wfs/pom.xml
tags/2.7-M2-GS/modules/extension/xsd/xsd-wps/pom.xml
tags/2.7-M2-GS/modules/library/api/pom.xml
tags/2.7-M2-GS/modules/library/coverage/pom.xml
tags/2.7-M2-GS/modules/library/cql/pom.xml
tags/2.7-M2-GS/modules/library/data/pom.xml
tags/2.7-M2-GS/modules/library/jdbc/pom.xml
tags/2.7-M2-GS/modules/library/main/pom.xml
tags/2.7-M2-GS/modules/library/metadata/pom.xml
tags/2.7-M2-GS/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
tags/2.7-M2-GS/modules/library/pom.xml
tags/2.7-M2-GS/modules/library/referencing/pom.xml
tags/2.7-M2-GS/modules/library/render/pom.xml
tags/2.7-M2-GS/modules/library/sample-data/pom.xml
tags/2.7-M2-GS/modules/library/temporal/pom.xml
tags/2.7-M2-GS/modules/library/xml/pom.xml
tags/2.7-M2-GS/modules/ogc/net.opengis.ows/pom.xml
tags/2.7-M2-GS/modules/ogc/net.opengis.wcs/pom.xml
tags/2.7-M2-GS/modules/ogc/net.opengis.wfs/pom.xml
tags/2.7-M2-GS/modules/ogc/net.opengis.wfsv/pom.xml
tags/2.7-M2-GS/modules/ogc/net.opengis.wps/pom.xml
tags/2.7-M2-GS/modules/ogc/org.w3.xlink/pom.xml
tags/2.7-M2-GS/modules/ogc/pom.xml
tags/2.7-M2-GS/modules/plugin/arcgrid/pom.xml
tags/2.7-M2-GS/modules/plugin/arcsde/common/pom.xml
tags/2.7-M2-GS/modules/plugin/arcsde/datastore/pom.xml
tags/2.7-M2-GS/modules/plugin/arcsde/pom.xml
tags/2.7-M2-GS/modules/plugin/arcsde/sde-dummy/pom.xml
tags/2.7-M2-GS/modules/plugin/charts/pom.xml
tags/2.7-M2-GS/modules/plugin/db2/pom.xml
tags/2.7-M2-GS/modules/plugin/epsg-extension/pom.xml
tags/2.7-M2-GS/modules/plugin/epsg-hsql/pom.xml
tags/2.7-M2-GS/modules/plugin/epsg-postgresql/pom.xml
tags/2.7-M2-GS/modules/plugin/epsg-wkt/pom.xml
tags/2.7-M2-GS/modules/plugin/feature-pregeneralized/pom.xml
tags/2.7-M2-GS/modules/plugin/geotiff/pom.xml
tags/2.7-M2-GS/modules/plugin/gtopo30/pom.xml
tags/2.7-M2-GS/modules/plugin/image/pom.xml
tags/2.7-M2-GS/modules/plugin/imageio-ext-gdal/pom.xml
tags/2.7-M2-GS/modules/plugin/imagemosaic-jdbc/pom.xml
tags/2.7-M2-GS/modules/plugin/imagemosaic/pom.xml
tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/FootprintUtils.java
tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleDescriptor.java
tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterLayerResponse.java
tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterManager.java
tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalog/GTDataStoreGranuleCatalog.java
tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalogbuilder/CatalogBuilder.java
tags/2.7-M2-GS/modules/plugin/imagepyramid/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-db2/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-h2/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-mysql/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-oracle/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-postgis/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-spatialite/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/jdbc-sqlserver/pom.xml
tags/2.7-M2-GS/modules/plugin/jdbc/pom.xml
tags/2.7-M2-GS/modules/plugin/jp2k/pom.xml
tags/2.7-M2-GS/modules/plugin/pom.xml
tags/2.7-M2-GS/modules/plugin/postgis/pom.xml
tags/2.7-M2-GS/modules/plugin/property/pom.xml
tags/2.7-M2-GS/modules/plugin/referencing3D/pom.xml
tags/2.7-M2-GS/modules/plugin/shapefile/pom.xml
tags/2.7-M2-GS/modules/plugin/svg/pom.xml
tags/2.7-M2-GS/modules/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/app-schema-packages/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/app-schema-resolver/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/app-schema/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/jdbc-regfunc/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/sample-data-access/pom.xml
tags/2.7-M2-GS/modules/unsupported/app-schema/webservice/pom.xml
tags/2.7-M2-GS/modules/unsupported/caching/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverage-experiment/coverage-api/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverage-experiment/coverage-core/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverage-experiment/grib1/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverage-experiment/hdf4/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverage-experiment/netcdf/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverage-experiment/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverageio-netcdf/pom.xml
tags/2.7-M2-GS/modules/unsupported/coverageio/pom.xml
tags/2.7-M2-GS/modules/unsupported/coveragetools/pom.xml
tags/2.7-M2-GS/modules/unsupported/directory/pom.xml
tags/2.7-M2-GS/modules/unsupported/dxf/pom.xml
tags/2.7-M2-GS/modules/unsupported/edigeo/pom.xml
tags/2.7-M2-GS/modules/unsupported/epsg-h2/pom.xml
tags/2.7-M2-GS/modules/unsupported/epsg-oracle/pom.xml
tags/2.7-M2-GS/modules/unsupported/example/pom.xml
tags/2.7-M2-GS/modules/unsupported/geojson/pom.xml
tags/2.7-M2-GS/modules/unsupported/geometry/pom.xml
tags/2.7-M2-GS/modules/unsupported/geometryless/pom.xml
tags/2.7-M2-GS/modules/unsupported/grassraster/pom.xml
tags/2.7-M2-GS/modules/unsupported/grid/pom.xml
tags/2.7-M2-GS/modules/unsupported/idl-process/pom.xml
tags/2.7-M2-GS/modules/unsupported/jai-tools/pom.xml
tags/2.7-M2-GS/modules/unsupported/jdbc-ng/jdbc-ingres/pom.xml
tags/2.7-M2-GS/modules/unsupported/jdbc-ng/pom.xml
tags/2.7-M2-GS/modules/unsupported/jts-wrapper/pom.xml
tags/2.7-M2-GS/modules/unsupported/matfile5/pom.xml
tags/2.7-M2-GS/modules/unsupported/mysql/pom.xml
tags/2.7-M2-GS/modules/unsupported/ogr/pom.xml
tags/2.7-M2-GS/modules/unsupported/oracle-spatial/pom.xml
tags/2.7-M2-GS/modules/unsupported/pom.xml
tags/2.7-M2-GS/modules/unsupported/postgis-versioned/pom.xml
tags/2.7-M2-GS/modules/unsupported/process/pom.xml
tags/2.7-M2-GS/modules/unsupported/shapefile-renderer/pom.xml
tags/2.7-M2-GS/modules/unsupported/sql-datastore/pom.xml
tags/2.7-M2-GS/modules/unsupported/swing/pom.xml
tags/2.7-M2-GS/modules/unsupported/vpf/pom.xml
tags/2.7-M2-GS/modules/unsupported/wfs/pom.xml
tags/2.7-M2-GS/modules/unsupported/wps/pom.xml
tags/2.7-M2-GS/pom.xml
tags/2.7-M2-GS/spike/jan/gsoc-transformations/pom.xml
Log:
- Updating poms with the TAG's version (2.7-M2-GS)
- Porting ImageMosaic's fixes from trunk
Modified: tags/2.7-M2-GS/build/maven/jar-collector/pom.xml
===================================================================
--- tags/2.7-M2-GS/build/maven/jar-collector/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/build/maven/jar-collector/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/build/maven/javadoc/pom.xml
===================================================================
--- tags/2.7-M2-GS/build/maven/javadoc/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/build/maven/javadoc/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/build/maven/jjtree-javacc/pom.xml
===================================================================
--- tags/2.7-M2-GS/build/maven/jjtree-javacc/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/build/maven/jjtree-javacc/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/build/maven/pom.xml
===================================================================
--- tags/2.7-M2-GS/build/maven/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/build/maven/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>build</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/build/maven/xmlcodegen/pom.xml
===================================================================
--- tags/2.7-M2-GS/build/maven/xmlcodegen/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/build/maven/xmlcodegen/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/build/pom.xml
===================================================================
--- tags/2.7-M2-GS/build/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/build/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/demo/example/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/example/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/example/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/demo/gmlparsing/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/gmlparsing/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/gmlparsing/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/demo/jdbc/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/jdbc/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/jdbc/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/demo/libraryJTS/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/libraryJTS/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/libraryJTS/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/demo/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/demo/svgsupport/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/svgsupport/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/svgsupport/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/demo/xml-po/pom.xml
===================================================================
--- tags/2.7-M2-GS/demo/xml-po/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/demo/xml-po/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/docs/pom.xml
===================================================================
--- tags/2.7-M2-GS/docs/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/docs/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/brewer/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/brewer/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/brewer/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/graph/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/graph/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/graph/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/validation/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/validation/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/validation/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/wms/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/wms/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/wms/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/xsd/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-core/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-core/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-core/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-filter/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-filter/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-filter/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-gml2/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-gml2/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-gml2/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-gml3/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-gml3/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-gml3/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-kml/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-kml/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-kml/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-ows/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-ows/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-ows/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>net.opengis.ows</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</dependency>
<dependency>
<groupId>org.geotools.xsd</groupId>
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-sld/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-sld/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-sld/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-wcs/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-wcs/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-wcs/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-wfs/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-wfs/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-wfs/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/modules/extension/xsd/xsd-wps/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/extension/xsd/xsd-wps/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/extension/xsd/xsd-wps/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/modules/library/api/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/api/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/api/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/coverage/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/coverage/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/coverage/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/cql/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/cql/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/cql/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/data/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/data/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/data/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/jdbc/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/jdbc/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/jdbc/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/main/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/main/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/main/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/metadata/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/metadata/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/metadata/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
===================================================================
--- tags/2.7-M2-GS/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2010-07-26 08:16:22 UTC (rev 35954)
@@ -67,7 +67,7 @@
/**
* The current GeoTools version. The separator character must be the dot.
*/
- private static final Version VERSION = new Version("2.7-M2");
+ private static final Version VERSION = new Version("2.7-M2-GS");
/**
* Object to inform about system-wide configuration changes.
Modified: tags/2.7-M2-GS/modules/library/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/referencing/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/referencing/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/referencing/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/render/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/render/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/render/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/sample-data/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/sample-data/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/sample-data/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/temporal/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/temporal/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/temporal/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/library/xml/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/library/xml/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/library/xml/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/ogc/net.opengis.ows/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/net.opengis.ows/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/net.opengis.ows/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools.ogc</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>org.w3.xlink</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</dependency>
</dependencies>
Modified: tags/2.7-M2-GS/modules/ogc/net.opengis.wcs/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/net.opengis.wcs/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/net.opengis.wcs/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7-M2-GS/modules/ogc/net.opengis.wfs/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/net.opengis.wfs/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/net.opengis.wfs/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7-M2-GS/modules/ogc/net.opengis.wfsv/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/net.opengis.wfsv/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/net.opengis.wfsv/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools.ogc</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>net.opengis.wfs</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</dependency>
</dependencies>
Modified: tags/2.7-M2-GS/modules/ogc/net.opengis.wps/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/net.opengis.wps/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/net.opengis.wps/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7-M2-GS/modules/ogc/org.w3.xlink/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/org.w3.xlink/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/org.w3.xlink/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7-M2-GS/modules/ogc/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/ogc/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/ogc/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<groupId>org.geotools</groupId>
Modified: tags/2.7-M2-GS/modules/plugin/arcgrid/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/arcgrid/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/arcgrid/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/arcsde/common/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/arcsde/common/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/arcsde/common/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/arcsde/datastore/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/arcsde/datastore/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/arcsde/datastore/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/arcsde/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/arcsde/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/arcsde/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/arcsde/sde-dummy/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/arcsde/sde-dummy/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/arcsde/sde-dummy/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/charts/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/charts/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/charts/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/db2/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/db2/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/db2/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/epsg-extension/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/epsg-extension/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/epsg-extension/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/epsg-hsql/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/epsg-hsql/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/epsg-hsql/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/epsg-postgresql/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/epsg-postgresql/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/epsg-postgresql/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/epsg-wkt/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/epsg-wkt/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/epsg-wkt/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/feature-pregeneralized/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/feature-pregeneralized/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/feature-pregeneralized/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/geotiff/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/geotiff/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/geotiff/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/gtopo30/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/gtopo30/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/gtopo30/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/image/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/image/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/image/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/imageio-ext-gdal/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imageio-ext-gdal/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imageio-ext-gdal/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7-M2-GS/modules/plugin/imagemosaic/pom.xml
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imagemosaic/pom.xml 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imagemosaic/pom.xml 2010-07-26 08:16:22 UTC (rev 35954)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-M2</version>
+ <version>2.7-M2-GS</version>
</parent>
Modified: tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/FootprintUtils.java
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/FootprintUtils.java 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/FootprintUtils.java 2010-07-26 08:16:22 UTC (rev 35954)
@@ -202,7 +202,7 @@
try {
if (it != null) {
- it.close();
+ features.close(it);
}
} catch (Throwable e) {
}
Modified: tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleDescriptor.java
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleDescriptor.java 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleDescriptor.java 2010-07-26 08:16:22 UTC (rev 35954)
@@ -54,15 +54,12 @@
import org.geotools.factory.Hints;
import org.geotools.gce.imagemosaic.RasterLayerResponse.GranuleLoadingResult;
import org.geotools.geometry.DirectPosition2D;
-import org.geotools.geometry.GeneralEnvelope;
import org.geotools.geometry.jts.LiteShape2;
import org.geotools.geometry.jts.ReferencedEnvelope;
-import org.geotools.metadata.iso.spatial.PixelTranslation;
import org.geotools.referencing.CRS;
import org.geotools.referencing.operation.builder.GridToEnvelopeMapper;
import org.geotools.referencing.operation.matrix.XAffineTransform;
import org.geotools.referencing.operation.transform.AffineTransform2D;
-import org.geotools.referencing.operation.transform.ProjectiveTransform;
import org.geotools.resources.geometry.XRectangle2D;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.geometry.BoundingBox;
@@ -274,6 +271,7 @@
/**
* This class represent an overview level in a single granuleDescriptor.
*
+ * <p> Notice that the internal transformations for the various levels are reffered to the corner, rather than to the centre.
* @author Simone Giannecchini, GeoSolutions S.A.S.
*
*/
@@ -289,7 +287,7 @@
final AffineTransform2D baseToLevelTransform;
- final AffineTransform2D gridToWorldTransform;
+ final AffineTransform2D gridToWorldTransformCorner;
final Rectangle rasterDimensions;
@@ -322,7 +320,7 @@
final AffineTransform gridToWorldTransform_ = new AffineTransform(baseToLevelTransform);
gridToWorldTransform_.preConcatenate(Utils.CENTER_TO_CORNER);
gridToWorldTransform_.preConcatenate(baseGridToWorld);
- this.gridToWorldTransform=new AffineTransform2D(gridToWorldTransform_);
+ this.gridToWorldTransformCorner=new AffineTransform2D(gridToWorldTransform_);
this.width = width;
this.height = height;
this.rasterDimensions= new Rectangle(0,0,width,height);
@@ -333,7 +331,7 @@
}
public AffineTransform2D getGridToWorldTransform() {
- return gridToWorldTransform;
+ return gridToWorldTransformCorner;
}
@@ -348,7 +346,7 @@
.append("scaleX:\t\t").append(scaleX).append("\n")
.append("scaleY:\t\t").append(scaleY).append("\n")
.append("baseToLevelTransform:\t\t").append(baseToLevelTransform.toString()).append("\n")
- .append("gridToWorldTransform:\t\t").append(gridToWorldTransform.toString()).append("\n");
+ .append("gridToWorldTransform:\t\t").append(gridToWorldTransformCorner.toString()).append("\n");
return buffer.toString();
}
@@ -587,20 +585,21 @@
// which source area we need to crop in the selected level taking
// into account the scale factors imposed by the selection of this
// level together with the base level grid to world transformation
- MathTransform2D cropWorldToGrid=(MathTransform2D) PixelTranslation.translate(ProjectiveTransform.create(selectedlevel.gridToWorldTransform), PixelInCell.CELL_CENTER, PixelInCell.CELL_CORNER).inverse();
-
+ AffineTransform tempCropWorldToGrid = new AffineTransform(selectedlevel.gridToWorldTransformCorner);
+ AffineTransform2D cropWorldToGrid= new AffineTransform2D(tempCropWorldToGrid);
+ cropWorldToGrid=(AffineTransform2D) cropWorldToGrid.inverse();
// computing the crop source area which lives into the
// selected level raster space, NOTICE that at the end we need to
// take into account the fact that we might also decimate therefore
// we cannot just use the crop grid to world but we need to correct
// it.
- final Rectangle sourceArea = CRS.transform(cropWorldToGrid, new GeneralEnvelope(intersection)).toRectangle2D().getBounds();
+ final Rectangle sourceArea = CRS.transform(cropWorldToGrid, intersection).toRectangle2D().getBounds();
XRectangle2D.intersect(sourceArea, selectedlevel.rasterDimensions, sourceArea);//make sure roundings don't bother us
// is it empty??
if (sourceArea.isEmpty()) {
if (LOGGER.isLoggable(java.util.logging.Level.FINE)){
- LOGGER.fine(new StringBuilder("Got empty area for granuleDescriptor ").append(this.toString())
- .append(" with request ").append(request.toString()).append(" Resulting in no granule loaded: Empty result").toString());
+ LOGGER.fine("Got empty area for granuleDescriptor "+this.toString()+
+ " with request "+request.toString()+" Resulting in no granule loaded: Empty result");
}
return null;
@@ -748,10 +747,10 @@
addBorderExtender = false;
}
}
+ // border extender
if (addBorderExtender) {
localHints.add(Utils.BORDER_EXTENDER_HINTS);
}
- // border extender
// return WarpDescriptor.create(raster, new WarpAffine(translationTransform.createInverse()),new InterpolationNearest(), request.getBackgroundValues(),localHints);
return new GranuleLoadingResult(AffineDescriptor.create(raster, finalRaster2Model, interpolation, request.getBackgroundValues(),localHints), granuleLoadingShape);
}
@@ -767,13 +766,13 @@
LOGGER.log(java.util.logging.Level.WARNING, new StringBuilder("Unable to load raster for granuleDescriptor ")
.append(this.toString()).append(" with request ").append(request.toString()).append(" Resulting in no granule loaded: Empty result").toString(), e);
}
- return null;
+ return null;
} catch (TransformException e) {
if (LOGGER.isLoggable(java.util.logging.Level.WARNING)) {
LOGGER.log(java.util.logging.Level.WARNING, new StringBuilder("Unable to load raster for granuleDescriptor ")
.append(this.toString()).append(" with request ").append(request.toString()).append(" Resulting in no granule loaded: Empty result").toString(), e);
}
- return null;
+ return null;
}
finally{
Modified: tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterLayerResponse.java
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterLayerResponse.java 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterLayerResponse.java 2010-07-26 08:16:22 UTC (rev 35954)
@@ -128,10 +128,10 @@
RenderedImage loadedImage;
- ROIShape inclusionArea;
+ ROIShape footprint;
public ROIShape getFootprint() {
- return inclusionArea;
+ return footprint;
}
public RenderedImage getRaster() {
@@ -140,7 +140,7 @@
GranuleLoadingResult(RenderedImage loadedImage, ROIShape inclusionArea) {
this.loadedImage = loadedImage;
- this.inclusionArea = inclusionArea;
+ this.footprint = inclusionArea;
}
}
@@ -698,11 +698,23 @@
}
if (oversampledRequest){
try {
- AffineTransform affine1 = new AffineTransform((AffineTransform) baseGridToWorld);
- affine1.concatenate(Utils.CENTER_TO_CORNER);
- AffineTransform affine2 = request.getRequestedGridToWorld().createInverse();
- affine2.concatenate(affine1);
- mosaic = AffineDescriptor.create(mosaic, affine2 , interpolation, backgroundValues, hints);
+ // creating source grid to world corrected to the pixel corner
+ final AffineTransform sourceGridToWorld = new AffineTransform((AffineTransform) baseGridToWorld);
+ sourceGridToWorld.concatenate(Utils.CENTER_TO_CORNER);
+
+ // creating target grid to world corrected to the pixel corner
+ final AffineTransform targetGridToWorld = new AffineTransform(request.getRequestedGridToWorld());
+ targetGridToWorld.concatenate(Utils.CENTER_TO_CORNER);
+
+ // target world to grid at the corner
+ final AffineTransform targetWorldToGrid=targetGridToWorld.createInverse();
+
+ // final complete transformation
+ targetWorldToGrid.concatenate(sourceGridToWorld);
+
+ // create final image
+ // TODO this one could be optimized further depending on how the affine is created
+ mosaic = AffineDescriptor.create(mosaic, targetWorldToGrid , interpolation, backgroundValues, hints);
} catch (NoninvertibleTransformException e) {
if (LOGGER.isLoggable(Level.SEVERE)){
LOGGER.log(Level.SEVERE, "Unable to create the requested mosaic ", e );
@@ -762,32 +774,35 @@
final AffineTransform g2w;
-
- final OverviewLevel baseLevel = rasterManager.overviewsController.resolutionsLevels.get(0);
- final double resX = baseLevel.resolutionX;
- final double resY = baseLevel.resolutionY;
- final double[] requestRes = request.getRequestedResolution();
- if (requestRes[0] < resX || requestRes[1] < resY) {
- // Using the better available resolution
- oversampledRequest = true;
- g2w = new AffineTransform((AffineTransform) baseGridToWorld);
- g2w.concatenate(Utils.CENTER_TO_CORNER);
- } else {
- if (!needsReprojection){
- g2w = new AffineTransform(request.getRequestedGridToWorld());
- g2w.concatenate(Utils.CENTER_TO_CORNER);
- } else {
- GridToEnvelopeMapper mapper = new GridToEnvelopeMapper(new GridEnvelope2D(request.getRequestedRasterArea()), mosaicBBox);
- mapper.setPixelAnchor(PixelInCell.CELL_CORNER);
- g2w = mapper.createAffineTransform();
- }
- }
-
- // move it to the corner
- finalGridToWorldCorner=new AffineTransform2D(g2w);
+ final OverviewLevel baseLevel = rasterManager.overviewsController.resolutionsLevels
+ .get(0);
+ final double resX = baseLevel.resolutionX;
+ final double resY = baseLevel.resolutionY;
+ final double[] requestRes = request.getRequestedResolution();
+ if (requestRes[0] < resX || requestRes[1] < resY) {
+ // Using the best available resolution
+ oversampledRequest = true;
+ g2w = new AffineTransform((AffineTransform) baseGridToWorld);
+ g2w.concatenate(Utils.CENTER_TO_CORNER);
+ } else {
+ if (!needsReprojection) {
+ g2w = new AffineTransform(request.getRequestedGridToWorld());
+ g2w.concatenate(Utils.CENTER_TO_CORNER);
+ } else {
+ GridToEnvelopeMapper mapper = new GridToEnvelopeMapper(
+ new GridEnvelope2D(request.getRequestedRasterArea()),
+ mosaicBBox);
+ mapper.setPixelAnchor(PixelInCell.CELL_CORNER);
+ g2w = mapper.createAffineTransform();
+ }
+ }
+
+ // move it to the corner
+ finalGridToWorldCorner = new AffineTransform2D(g2w);
finalWorldToGridCorner = finalGridToWorldCorner.inverse();// compute raster bounds
- rasterBounds=new GeneralGridEnvelope(CRS.transform(finalWorldToGridCorner, mosaicBBox),PixelInCell.CELL_CORNER,false).toRectangle();
+ final GeneralEnvelope tempRasterBounds = CRS.transform(finalWorldToGridCorner, mosaicBBox);
+ rasterBounds=tempRasterBounds.toRectangle2D().getBounds();
if (rasterBounds.width == 0)
rasterBounds.width++;
if (rasterBounds.height == 0)
@@ -859,9 +874,11 @@
// get those granules
rasterManager.getGranules(query, visitor);
+
+ } else {
+ rasterManager.getGranules(mosaicBBox, visitor);
}
- else
- rasterManager.getGranules(mosaicBBox, visitor);
+ // get those granules
visitor.produce();
//
Modified: tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterManager.java
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterManager.java 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/RasterManager.java 2010-07-26 08:16:22 UTC (rev 35954)
@@ -46,7 +46,6 @@
import org.geotools.gce.imagemosaic.catalog.GranuleCatalog.GranuleCatalogVisitor;
import org.geotools.geometry.GeneralEnvelope;
import org.geotools.geometry.jts.ReferencedEnvelope;
-import org.geotools.metadata.iso.extent.GeographicBoundingBoxImpl;
import org.geotools.referencing.CRS;
import org.geotools.util.Utilities;
import org.opengis.coverage.grid.GridCoverage;
Modified: tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalog/GTDataStoreGranuleCatalog.java
===================================================================
--- tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalog/GTDataStoreGranuleCatalog.java 2010-07-25 18:24:57 UTC (rev 35953)
+++ tags/2.7-M2-GS/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalog/GTDataStoreGranuleCatalog.java 2010-07-26 08:16:22 UTC (rev 35954)
@@ -45,6 +45,7 @@
import org.geotools.data.postgis.PostgisNGDataStoreFactory;
import org.geotools.data.postgis.PostgisNGJNDIDataStoreFactory;
import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.data.simple.SimpleFeatureIterator;
import org.geotools.data.simple.SimpleFeatureSource;
import org.geotools.data.simple.SimpleFeatureStore;
import org.geotools.data.store.ContentFeatureSource;
@@ -135,8 +136,6 @@
private String typeName;
- private SimpleFeatureSource featureSource;
-
private String geometryPropertyName;
private ReferencedEnvelope bounds;
@@ -238,7 +237,7 @@
}
}
- featureSource = tileIndexStore.getFeatureSource(this.typeName);
+ final SimpleFeatureSource featureSource = tileIndexStore.getFeatureSource(this.typeName);
if (featureSource == null)
throw new NullPointerException(
"The provided SimpleFeatureSource is null, it's impossible to create an index!");
@@ -411,7 +410,6 @@
throws IOException {
Utilities.ensureNonNull("q",q);
- SimpleFeatureCollection features=null;
final Lock lock=rwLock.readLock();
try{
lock.lock();
@@ -421,8 +419,12 @@
// Load tiles informations, especially the bounds, which will be
// reused
//
- features = featureSource.getFeatures( q );
-
+
+ final SimpleFeatureSource featureSource = tileIndexStore.getFeatureSource(this.typeName);
+ if (featureSource == null)
+ throw new NullPointerException(
+ "The provided SimpleFeatureSource is null, it's impossible to create an index!");
+ final SimpleFeatureCollection features = featureSource.getFeatures( q );
if (features == null)
throw new NullPointerException(
"The provided SimpleFeatureCollection is null, it's impossible to create an index!");
@@ -431,10 +433,18 @@
LOGGER.fine("Index Loaded");
- //load the feature from the shapefile and create JTS index
- if (features.size()<=0)
- throw new IllegalArgumentException(
- "The provided SimpleFeatureCollection is empty, it's impossible to create an index!");
+ //load the feature from the underlying datastore as needed
+ final SimpleFeatureIterator it = features.features();
+ try{
+ if (!it.hasNext()) {
+ if(LOGGER.isLoggable(Level.FINE))
+ LOGGER.fine("The provided SimpleFeatureCollection or empty, it's impossible to create an index!");
+ return ;
+
+ }
+ }finally{
+ it.close();
+ }
features.accepts( new AbstractFeatureVisitor(){
public void visit( Feature feature ) {
@@ -467,7 +477,6 @@
Utilities.ensureNonNull("q",q);
FeatureIter...
[truncated message content] |