Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merging rel_8.0 into rel_8.x

  • Loading branch information...
commit fddfd9bed8fbea87479602df7643ab44298723da 2 parents 85b5b3f + 22bdd1d
@victortey victortey authored
Showing with 3,448 additions and 10,762 deletions.
  1. +4 −4 README.html
  2. +1 −1  build/maven/jar-collector/pom.xml
  3. +1 −1  build/maven/javadoc/pom.xml
  4. +1 −1  build/maven/jjtree-javacc/pom.xml
  5. +1 −1  build/maven/pom.xml
  6. +1 −1  build/maven/xmlcodegen/pom.xml
  7. +1 −1  build/pom.xml
  8. +3 −3 build/rename.xml
  9. +1 −1  docs/common.py
  10. +1 −1  docs/pom.xml
  11. +92 −19 docs/user/library/jdbc/spatiallite.rst
  12. +1 −1  docs/user/tutorial/advanced/artifacts/pom.xml
  13. +1 −1  docs/user/tutorial/feature/artifacts/pom.xml
  14. +1 −1  docs/user/tutorial/filter/artifacts/pom.xml
  15. +1 −1  docs/user/tutorial/geometry/artifacts/pom.xml
  16. +1 −1  docs/user/tutorial/map/artifacts/pom.xml
  17. +1 −1  docs/user/tutorial/quickstart/artifacts/pom.xml
  18. +1 −1  docs/user/tutorial/raster/artifacts/pom.xml
  19. +1 −1  modules/extension/app-schema/app-schema-example/pom.xml
  20. +1 −1  modules/extension/app-schema/app-schema-packages/pom.xml
  21. +1 −1  modules/extension/app-schema/app-schema-resolver/pom.xml
  22. +1 −1  modules/extension/app-schema/app-schema/pom.xml
  23. +1 −1  modules/extension/app-schema/pom.xml
  24. +1 −1  modules/extension/app-schema/sample-data-access/pom.xml
  25. +1 −1  modules/extension/brewer/pom.xml
  26. +1 −1  modules/extension/graph/pom.xml
  27. +1 −1  modules/extension/pom.xml
  28. +1 −1  modules/extension/validation/pom.xml
  29. +1 −1  modules/extension/wms/pom.xml
  30. +1 −1  modules/extension/xsd/pom.xml
  31. +1 −1  modules/extension/xsd/xsd-core/pom.xml
  32. +1 −1  modules/extension/xsd/xsd-fes/pom.xml
  33. +1 −1  modules/extension/xsd/xsd-filter/pom.xml
  34. +1 −1  modules/extension/xsd/xsd-gml2/pom.xml
  35. +1 −1  modules/extension/xsd/xsd-gml3/pom.xml
  36. +1 −1  modules/extension/xsd/xsd-kml/pom.xml
  37. +2 −2 modules/extension/xsd/xsd-ows/pom.xml
  38. +1 −1  modules/extension/xsd/xsd-sld/pom.xml
  39. +1 −1  modules/extension/xsd/xsd-wcs/pom.xml
  40. +1 −1  modules/extension/xsd/xsd-wfs/pom.xml
  41. +1 −1  modules/extension/xsd/xsd-wms/pom.xml
  42. +1 −1  modules/extension/xsd/xsd-wps/pom.xml
  43. +1 −1  modules/library/api/pom.xml
  44. +1 −1  modules/library/coverage/pom.xml
  45. +1 −1  modules/library/cql/pom.xml
  46. +1 −1  modules/library/data/pom.xml
  47. +1 −1  modules/library/jdbc/pom.xml
  48. +4 −4 modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
  49. +3 −2 modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCFeatureSource.java
  50. +39 −0 modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCFeatureSourceTest.java
  51. +1 −1  modules/library/main/pom.xml
  52. +1 −1  modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java
  53. +81 −0 modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_property.java
  54. +110 −0 modules/library/main/src/main/java/org/geotools/filter/function/math/ModuloFunction.java
  55. +2 −0  modules/library/main/src/main/resources/META-INF/services/org.opengis.filter.expression.Function
  56. +128 −0 modules/library/main/src/test/java/org/geotools/filter/function/FilterFunctionPropertyTest.java
  57. +113 −0 modules/library/main/src/test/java/org/geotools/filter/function/math/ModuloFunctionTest.java
  58. +1 −1  modules/library/metadata/pom.xml
  59. +2 −11 modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
  60. +1 −1  modules/library/opengis/pom.xml
  61. +1 −1  modules/library/pom.xml
  62. +1 −1  modules/library/referencing/pom.xml
  63. +24 −0 modules/library/referencing/src/main/java/org/geotools/referencing/wkt/Formattable.java
  64. +1 −1  modules/library/render/pom.xml
  65. +14 −8 modules/library/render/src/main/java/org/geotools/renderer/lite/gridcoverage2d/GridCoverageRenderer.java
  66. +1 −1  modules/library/sample-data/pom.xml
  67. +1 −1  modules/library/xml/pom.xml
  68. +1 −1  modules/ogc/net.opengis.fes/pom.xml
  69. +2 −2 modules/ogc/net.opengis.ows/pom.xml
  70. +1 −1  modules/ogc/net.opengis.wcs/pom.xml
  71. +1 −1  modules/ogc/net.opengis.wfs/pom.xml
  72. +2 −2 modules/ogc/net.opengis.wfsv/pom.xml
  73. +1 −1  modules/ogc/net.opengis.wps/pom.xml
  74. +1 −1  modules/ogc/org.w3.xlink/pom.xml
  75. +1 −1  modules/ogc/pom.xml
  76. +1 −1  modules/plugin/arcgrid/pom.xml
  77. +1 −1  modules/plugin/arcsde/common/pom.xml
  78. +1 −1  modules/plugin/arcsde/datastore/pom.xml
  79. +1 −1  modules/plugin/arcsde/pom.xml
  80. +1 −1  modules/plugin/arcsde/sde-dummy/pom.xml
  81. +1 −1  modules/plugin/charts/pom.xml
  82. +1 −1  modules/plugin/epsg-extension/pom.xml
  83. +1 −1  modules/plugin/epsg-hsql/pom.xml
  84. +1 −1  modules/plugin/epsg-postgresql/pom.xml
  85. +1 −1  modules/plugin/epsg-wkt/pom.xml
  86. +1 −1  modules/plugin/feature-pregeneralized/pom.xml
  87. +1 −1  modules/plugin/geotiff/pom.xml
  88. +1 −1  modules/plugin/grassraster/pom.xml
  89. +1 −1  modules/plugin/gtopo30/pom.xml
  90. +1 −1  modules/plugin/image/pom.xml
  91. +1 −1  modules/plugin/imageio-ext-gdal/pom.xml
  92. +1 −1  modules/plugin/imagemosaic-jdbc/pom.xml
  93. +1 −1  modules/plugin/imagemosaic/pom.xml
  94. +18 −4 modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/catalogbuilder/CatalogBuilder.java
  95. +1 −1  modules/plugin/imagepyramid/pom.xml
  96. +1 −1  modules/plugin/jdbc/jdbc-db2/pom.xml
  97. +1 −1  modules/plugin/jdbc/jdbc-h2/pom.xml
  98. +1 −1  modules/plugin/jdbc/jdbc-mysql/pom.xml
  99. +1 −1  modules/plugin/jdbc/jdbc-oracle/pom.xml
  100. +1 −1  modules/plugin/jdbc/jdbc-postgis/pom.xml
  101. +0 −12 modules/plugin/jdbc/jdbc-spatialite/README.sqlitejdbc
  102. +60 −0 modules/plugin/jdbc/jdbc-spatialite/README.txt
  103. +2 −2 modules/plugin/jdbc/jdbc-spatialite/pom.xml
  104. +11 −0 modules/plugin/jdbc/jdbc-spatialite/src/main/java/org/geotools/data/spatialite/SpatiaLiteDataStoreFactory.java
  105. +52 −16 modules/plugin/jdbc/jdbc-spatialite/src/main/java/org/geotools/data/spatialite/SpatiaLiteDialect.java
  106. +1 −1  .../plugin/jdbc/jdbc-spatialite/src/test/java/org/geotools/data/spatialite/SpatiaLiteDataStoreFactoryTest.java
  107. +1 −1  modules/plugin/jdbc/jdbc-sqlserver/pom.xml
  108. +1 −1  modules/plugin/jdbc/jdbc-teradata/pom.xml
  109. +1 −1  modules/plugin/jdbc/pom.xml
  110. +1 −1  modules/plugin/jp2k/pom.xml
  111. +1 −1  modules/plugin/pom.xml
  112. +1 −1  modules/plugin/property/pom.xml
  113. +1 −1  modules/plugin/referencing3D/pom.xml
  114. +1 −1  modules/plugin/shapefile/pom.xml
  115. +1 −1  modules/plugin/svg/pom.xml
  116. +1 −1  modules/pom.xml
  117. +1 −1  modules/unsupported/app-schema/pom.xml
  118. +1 −1  modules/unsupported/app-schema/webservice/pom.xml
  119. +1 −1  modules/unsupported/caching/pom.xml
  120. +3 −3 modules/unsupported/couchdb/pom.xml
  121. +1 −1  modules/unsupported/coverage-experiment/coverage-api/pom.xml
  122. +1 −1  modules/unsupported/coverage-experiment/coverage-core/pom.xml
  123. +1 −1  modules/unsupported/coverage-experiment/grib1/pom.xml
  124. +1 −1  modules/unsupported/coverage-experiment/hdf4/pom.xml
  125. +1 −1  modules/unsupported/coverage-experiment/netcdf/pom.xml
  126. +1 −1  modules/unsupported/coverage-experiment/pom.xml
  127. +1 −1  modules/unsupported/coveragetools/pom.xml
  128. +1 −1  modules/unsupported/csv/pom.xml
  129. +1 −1  modules/unsupported/dxf/pom.xml
  130. +1 −1  modules/unsupported/edigeo/pom.xml
  131. +2 −2 modules/unsupported/efeature/pom.xml
  132. +1 −1  modules/unsupported/epsg-oracle/pom.xml
  133. +1 −1  modules/unsupported/example/pom.xml
  134. +1 −1  modules/unsupported/excel/pom.xml
  135. +1 −1  modules/unsupported/feature-aggregate/pom.xml
  136. +0 −143 modules/unsupported/geogit-versioned/pom.xml
  137. +0 −130 modules/unsupported/geogit-versioned/src/main/java/org/geogit/storage/hessian/GtEntityType.java
  138. +0 −148 ...s/unsupported/geogit-versioned/src/main/java/org/geogit/storage/hessian/HessianSimpleFeatureTypeReader.java
  139. +0 −110 ...s/unsupported/geogit-versioned/src/main/java/org/geogit/storage/hessian/HessianSimpleFeatureTypeWriter.java
  140. +0 −404 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/GeoGitDataStore.java
  141. +0 −143 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/GeoGitDataStoreFactory.java
  142. +0 −342 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/GeoGitFeatureSource.java
  143. +0 −338 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/GeoGitFeatureStore.java
  144. +0 −579 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/GeoGitSimpleFeatureCollection.java
  145. +0 −125 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/GeoToolsCommitStateResolver.java
  146. +0 −124 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/ModifyingFeatureCollection.java
  147. +0 −230 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/VersioningTransactionState.java
  148. +0 −27 ...unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/SimpleVersioningFeatureLocking.java
  149. +0 −27 .../unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/SimpleVersioningFeatureSource.java
  150. +0 −27 ...s/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/SimpleVersioningFeatureStore.java
  151. +0 −26 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/VersioningDataAccess.java
  152. +0 −26 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/VersioningDataStore.java
  153. +0 −26 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/VersioningFeatureLocking.java
  154. +0 −26 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/VersioningFeatureSource.java
  155. +0 −26 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/VersioningFeatureStore.java
  156. +0 −267 .../unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java
  157. +0 −107 ...s/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataStoreDecorator.java
  158. +0 −756 ...eogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DefaultVersionedFeatureCollection.java
  159. +0 −73 ...upported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureLockingDecorator.java
  160. +0 −346 ...supported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureSourceDecorator.java
  161. +0 −339 ...nsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureStoreDecorator.java
  162. +0 −106 ...nsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/QueryFeatureCollector.java
  163. +0 −138 ...it-versioned/src/main/java/org/geotools/data/versioning/decorator/ResourceIdAssigningFeatureCollection.java
  164. +0 −108 ...orted/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/ResourceIdFeatureCollector.java
  165. +0 −116 .../geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/ResourceIdQueryFeatureCollector.java
  166. +0 −82 ...ed/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/SimpleFeatureLockingDecorator.java
  167. +0 −64 ...ted/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/SimpleFeatureSourceDecorator.java
  168. +0 −113 ...rted/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/SimpleFeatureStoreDecorator.java
  169. +0 −98 ...sioned/src/main/java/org/geotools/data/versioning/decorator/SimpleResourceIdAssigningFeatureCollection.java
  170. +0 −210 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/VersionDetail.java
  171. +0 −122 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/VersionFilters.java
  172. +0 −505 modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/VersionQuery.java
  173. +0 −81 ...upported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/VersionedFeatureWrapper.java
  174. +0 −86 ...pported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/VersioningAdapterFactory.java
  175. +0 −109 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/RepositoryTestCase.java
  176. +0 −312 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/geogit/GeoGITRepositoryTestCase.java
  177. +0 −248 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/geogit/GeoGitDataStoreTest.java
  178. +0 −360 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/geogit/GeoGitFeatureSourceTest.java
  179. +0 −282 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/geogit/GeoGitFeatureStoreTest.java
  180. +0 −698 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/versioning/SimpleMemoryDataAccess.java
  181. +0 −55 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/versioning/VersioningTestSupport.java
  182. +0 −472 ...s/unsupported/geogit-versioned/src/test/java/org/geoserver/data/versioning/decorator/DecoratedTestCase.java
  183. +0 −201 ...les/unsupported/geogit-versioned/src/test/java/org/geoserver/data/versioning/decorator/UnversionedTest.java
  184. +0 −467 modules/unsupported/geogit-versioned/src/test/java/org/geoserver/data/versioning/decorator/VersionedTest.java
  185. +1 −1  modules/unsupported/geojson/pom.xml
  186. +1 −1  modules/unsupported/geometry/pom.xml
  187. +1 −1  modules/unsupported/georest/pom.xml
  188. +1 −1  modules/unsupported/geotiff_new/pom.xml
  189. +1 −1  modules/unsupported/grid/pom.xml
  190. +1 −1  modules/unsupported/imagecollection/pom.xml
  191. +1 −1  modules/unsupported/jdbc-ng/jdbc-ingres/pom.xml
  192. +1 −1  modules/unsupported/jdbc-ng/pom.xml
  193. +1 −1  modules/unsupported/jts-wrapper/pom.xml
  194. +1 −1  modules/unsupported/mark-wkt/pom.xml
  195. +1 −1  modules/unsupported/matfile5/pom.xml
  196. +1 −1  modules/unsupported/mongodb/pom.xml
  197. 0  modules/unsupported/ogr/{ → ogr-bridj}/jnaerate.sh
  198. +102 −0 modules/unsupported/ogr/ogr-bridj/pom.xml
  199. +666 −0 modules/unsupported/ogr/ogr-bridj/src/main/java/org/geotools/data/ogr/bridj/BridjOGR.java
  200. +37 −0 modules/unsupported/ogr/ogr-bridj/src/main/java/org/geotools/data/ogr/bridj/BridjOGRDataStoreFactory.java
  201. +9 −0 modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/BridjUtilities.java
  202. 0  modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/CplErrorLibrary.java
  203. +1 −1  ...c/main/java/org/geotools/data/ogr → ogr-bridj/src/main/java/org/geotools/data/ogr/bridj}/GdalInit.java
  204. 0  modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/OGREnvelope.java
  205. 0  modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/OGRField.java
  206. +1 −37 ...c/main/java/org/geotools/data/ogr → ogr-bridj/src/main/java/org/geotools/data/ogr/bridj}/OGRUtils.java
  207. 0  modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/OgrLibrary.java
  208. 0  modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/OsrLibrary.java
  209. 0  modules/unsupported/ogr/{ → ogr-bridj}/src/main/java/org/geotools/data/ogr/bridj/__locale_struct.java
  210. +1 −0  modules/unsupported/ogr/ogr-bridj/src/main/resources/META-INF/services/org.geotools.data.DataStoreFactorySpi
  211. +15 −0 modules/unsupported/ogr/ogr-bridj/src/test/java/org/geotools/data/ogr/bridj/BridjGeometryMapperTest.java
  212. +11 −0 modules/unsupported/ogr/ogr-bridj/src/test/java/org/geotools/data/ogr/bridj/BridjOGRDataStoreFactoryTest.java
  213. +11 −0 modules/unsupported/ogr/ogr-bridj/src/test/java/org/geotools/data/ogr/bridj/BridjOGRDataStoreTest.java
  214. +11 −0 modules/unsupported/ogr/ogr-bridj/src/test/java/org/geotools/data/ogr/bridj/BridjOGRPerformanceTest.java
  215. +1 −2  ...t/java/org/geotools/data/ogr → ogr-bridj/src/test/java/org/geotools/data/ogr/bridj}/DumpShapefile.java
  216. +1 −0  modules/unsupported/ogr/ogr-bridj/src/test/resources/org/geotools/data/ogr/bridj/test-data/keepme.txt
  217. +63 −0 modules/unsupported/ogr/ogr-core/pom.xml
  218. +69 −73 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/FeatureMapper.java
  219. +101 −105 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/FeatureTypeMapper.java
  220. 0  modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/FilterToRestrictedWhere.java
  221. +30 −30 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/GeometryMapper.java
  222. +281 −0 modules/unsupported/ogr/ogr-core/src/main/java/org/geotools/data/ogr/OGR.java
  223. +80 −103 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRDataStore.java
  224. +61 −29 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRDataStoreFactory.java
  225. +25 −26 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRDirectFeatureWriter.java
  226. +17 −16 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRFeatureReader.java
  227. +37 −43 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRFeatureSource.java
  228. +9 −8 modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRFeatureStore.java
  229. 0  modules/unsupported/ogr/{ → ogr-core}/src/main/java/org/geotools/data/ogr/OGRFilterTranslator.java
  230. 0  modules/unsupported/ogr/{ → ogr-core}/src/site/apt/review.apt
  231. +12 −16 modules/unsupported/ogr/{ → ogr-core}/src/test/java/org/geotools/data/ogr/GeometryMapperTest.java
  232. +7 −4 modules/unsupported/ogr/{ → ogr-core}/src/test/java/org/geotools/data/ogr/OGRDataStoreFactoryTest.java
  233. +21 −20 modules/unsupported/ogr/{ → ogr-core}/src/test/java/org/geotools/data/ogr/OGRDataStoreTest.java
  234. +7 −2 modules/unsupported/ogr/{ → ogr-core}/src/test/java/org/geotools/data/ogr/OGRPeformanceTest.java
  235. +52 −17 modules/unsupported/ogr/{ → ogr-core}/src/test/java/org/geotools/data/ogr/TestCaseSupport.java
  236. 0  modules/unsupported/ogr/{ → ogr-core}/src/test/resources/org/geotools/data/ogr/test-data/keepme.txt
  237. +94 −0 modules/unsupported/ogr/ogr-jni/pom.xml
  238. +616 −0 modules/unsupported/ogr/ogr-jni/src/main/java/org/geotools/data/ogr/jni/JniOGR.java
  239. +19 −0 modules/unsupported/ogr/ogr-jni/src/main/java/org/geotools/data/ogr/jni/JniOGRDataStoreFactory.java
  240. +1 −0  modules/unsupported/ogr/ogr-jni/src/main/resources/META-INF/services/org.geotools.data.DataStoreFactorySpi
  241. +11 −0 modules/unsupported/ogr/ogr-jni/src/test/java/org/geotools/data/ogr/jni/JniGeometryMapperTest.java
  242. +11 −0 modules/unsupported/ogr/ogr-jni/src/test/java/org/geotools/data/ogr/jni/JniOGRDataSToreFactoryTest.java
  243. +12 −0 modules/unsupported/ogr/ogr-jni/src/test/java/org/geotools/data/ogr/jni/JniOGRDataStoreTest.java
  244. +11 −0 modules/unsupported/ogr/ogr-jni/src/test/java/org/geotools/data/ogr/jni/JniOGRPerformanceTest.java
  245. +1 −0  modules/unsupported/ogr/ogr-jni/src/test/resources/org/geotools/data/ogr/jni/test-data/keepme.txt
  246. +8 −26 modules/unsupported/ogr/pom.xml
  247. +0 −1  modules/unsupported/ogr/src/main/resources/META-INF/services/org.geotools.data.DataStoreFactorySpi
  248. +2 −11 modules/unsupported/pom.xml
  249. +1 −1  modules/unsupported/postgis-versioned/pom.xml
  250. +1 −1  modules/unsupported/process-feature/pom.xml
  251. +1 −1  modules/unsupported/process-geometry/pom.xml
  252. +1 −1  modules/unsupported/process-raster/pom.xml
  253. +1 −1  modules/unsupported/process/pom.xml
  254. +1 −1  modules/unsupported/property-ng/pom.xml
  255. +1 −1  modules/unsupported/sfs/pom.xml
  256. +1 −1  modules/unsupported/shapefile-ng/pom.xml
  257. +1 −1  modules/unsupported/shapefile-renderer/pom.xml
  258. +1 −1  modules/unsupported/swing/pom.xml
  259. +1 −1  modules/unsupported/swt/pom.xml
  260. +1 −1  modules/unsupported/vpf/pom.xml
  261. +1 −1  modules/unsupported/wfs-ng/pom.xml
  262. +1 −1  modules/unsupported/wfs/pom.xml
  263. +1 −1  modules/unsupported/wps/pom.xml
  264. +4 −2 pom.xml
  265. +8 −8 spike/jan/gsoc-transformations/pom.xml
  266. +1 −1  spike/mauro/ogr/pom.xml
View
8 README.html
@@ -2,7 +2,7 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
- <TITLE>GeoTools 8.0-RC2 README</TITLE>
+ <TITLE>GeoTools 8.0 README</TITLE>
<META NAME="GENERATOR" CONTENT="LibreOffice 3.3 (Linux)">
<META NAME="CREATED" CONTENT="0;0">
<META NAME="CHANGEDBY" CONTENT="Jody Garnett">
@@ -23,9 +23,9 @@
</HEAD>
<BODY LANG="en-AU" DIR="LTR">
<a href="http://geotools.org"><img src="geotools-logo.png"></a>
-<H1 CLASS="western">GeoTools 8.0-RC2</H1>
-<P>Thank you for downloading GeoTools 8.0-RC2. This release was
-created on Jul 02, 2012.</P>
+<H1 CLASS="western">GeoTools 8.0</H1>
+<P>Thank you for downloading GeoTools 8.0. This release was
+created on Aug 03, 2012.</P>
<P>This release contains only a subset of the current GeoTools code
base. The full GeoTools code base contains additional unsupported
View
2  build/maven/jar-collector/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  build/maven/javadoc/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  build/maven/jjtree-javacc/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  build/maven/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>build</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  build/maven/xmlcodegen/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  build/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
6 build/rename.xml
@@ -10,14 +10,14 @@
<include name="**/pom.xml"/>
<include name="**/GeoTools.java"/>
<include name="**/common.py"/>
- <replacefilter token="8-SNAPSHOT" value="8.0-RC2"/>
+ <replacefilter token="8-SNAPSHOT" value="8.0"/>
</replace>
</target>
<target name="readme">
<replace file="../README.html">
- <replacefilter token="@RELEASE@" value="8.0-RC2"/>
- <replacefilter token="@DATE@" value="Jul 02, 2012"/>
+ <replacefilter token="@RELEASE@" value="8.0"/>
+ <replacefilter token="@DATE@" value="Aug 03, 2012"/>
</replace>
</target>
View
2  docs/common.py
@@ -49,7 +49,7 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
-release = '8.0-RC2'
+release = '8.0'
# The short X.Y version.
version = release
View
2  docs/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
111 docs/user/library/jdbc/spatiallite.rst
@@ -7,9 +7,10 @@ SQLite is a popular embedded relational database. SpatiaLite is the spatial exte
.. note::
- The plugin uses internal versions of SpatiaLite (2.3.1) and SQLite (3.7.2).
- Therefore the plugin is only capable of accessing databases that are
- compatible with these versions.
+ This plugin uses internal versions of both SQLite (3.7.2) and SpatialLite (2.4.0).
+ Therefore the plugin is only capable of accessing databases that are compatible with these
+ versions.
+
References:
@@ -46,33 +47,105 @@ Example use::
Map params = new HashMap();
params.put("dbtype", "spatialite");
- params.put("database", "geotools");
+ params.put("database", "geotools.db");
DataStore datastore = DataStoreFinder.getDataStore(params);
Setup
^^^^^
-* Native Libraries
+The SpatiaLite datastore ships with its own build of the SQLite and SpatiaLite
+libraries. The SpatiaLite component has been compiled with GEOS and PROJ support
+so those libraries are required for the plugin to function. Setting up the plugin
+requires:
+
+#. Install the required native libraries for your platform
+#. Ensure Java is configured to locate the native libraries
+
+Prebuilt libraries are available for all supported platforms but you may choose to
+compile your own. For more information see:
+
+* http://trac.osgeo.org/proj/
+* http://trac.osgeo.org/geos/
+
+Supported Platforms
+~~~~~~~~~~~~~~~~~~~
+
+The following platforms are currently supported.
+
+Native Libraries
+~~~~~~~~~~~~~~~~
+
+Prebuilt libraries of PROJ and GEOS are available for a number of platforms.
+
+Windows 32-bit
+==============
+
+Prebuilt 32-bit Windows DLL's for PROJ and GEOS are available from:
+
+ http://gridlock.opengeo.org/geotools/spatialite-libs/spatialite-libs-win-x86.zip
- The SpatiaLite datastore ships with its own build of the SQLite and SpatiaLite
- libraries. The SpatiaLite component has been compiled with GEOS and PROJ support
- so those libraries need to be installed on the system for the datastore to
- function. Binaries for a variety of platforms are available at https://www.gaia-gis.it/fossil/libspatialite/index.
+These libraries along with the original header files are also available from:
- See also:
+ http://www.gaia-gis.it/spatialite-2.3.1/binaries.html
- * http://trac.osgeo.org/proj/
- * http://trac.osgeo.org/geos/
+These DLL files should be installed in a directory that is on the default search
+path for DLL's such as ``C:\WINDOWS\System32``.
+
+Windows 64-bit
+==============
-* Java Environment
+At this time Windows 64-bit libraries are not available but the 32-bit libraries should work on 64-bit systems.
- In order to load the native libraries at runtime Java must be told where the libraries live
- with a system property named "java.library.path". This is specified during java startup::
+Linux 32-bit
+============
+
+Prebuilt 32-bit Linux shared libraries for PROJ and GEOS are available from:
+
+ http://gridlock.opengeo.org/geotools/spatialite-libs/spatialite-libs-linux-x86.zip
- java -Djava.library.path=/usr/local/lib ...
-
- Depending on how the O/S is configured the additional ``LD_LIBRARY_PATH`` (unix/linux) and
- ``DYLD_LIBRARY_PATH`` (osx) environment variables may need to be set.
+Linux 64-bit
+============
+
+Prebuilt 64-bit Linux shared libraries for PROJ and GEOS are available from:
+
+ http://gridlock.opengeo.org/geotools/spatialite-libs/spatialite-libs-linux-x86_64.zip
+
+Mac
+===
+
+Prebuilt 32/64-bit shared libraries for PROJ and GEOS for **Intel based Macs only** are available from:
+
+ http://gridlock.opengeo.org/geotools/spatialite-libs/spatialite-libs-osx-intel.zip
+
+
+Java Environment
+~~~~~~~~~~~~~~~~
+
+For the SpatiaLite plugin to function Java must be configured to load the required PROJ/GEOS libraries.
+
+Windows
+=======
+
+The easiest way to allow Java to load the required DLL's is to put them in the ``C:\WINDOWS\System32`` directory.
+
+Linux
+=====
+
+The libraries may be installed anywhere on the system, a common place to put them is under ``/usr/local``.
+Java is configured by setting the ``-Djava.library.path`` system property::
+
+ java -Djava.library.path=/usr/local/lib
+
+It also maybe required to set the ``LD_LIBRARY_PATH`` environment variable as well::
+
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+ java -Djava.library.path=/usr/local/lib
+
+Mac
+===
+
+Same as for Linux expect that ``LD_LIBRARY_PATH`` is replaced with ``DYLD_LIBRARY_PATH``.
+
View
2  docs/user/tutorial/advanced/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
View
2  docs/user/tutorial/feature/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
View
2  docs/user/tutorial/filter/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
<!-- Provides map projections -->
View
2  docs/user/tutorial/geometry/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
<dependency>
View
2  docs/user/tutorial/map/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
<dependency>
View
2  docs/user/tutorial/quickstart/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
<dependency>
View
2  docs/user/tutorial/raster/artifacts/pom.xml
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC2</geotools.version>
+ <geotools.version>8.0</geotools.version>
</properties>
<dependencies>
<dependency>
View
2  modules/extension/app-schema/app-schema-example/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/app-schema/app-schema-packages/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools</groupId>
View
2  modules/extension/app-schema/app-schema-resolver/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools</groupId>
View
2  modules/extension/app-schema/app-schema/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools</groupId>
View
2  modules/extension/app-schema/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools</groupId>
View
2  modules/extension/app-schema/sample-data-access/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>app-schema</artifactId>
<groupId>org.geotools</groupId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools</groupId>
View
2  modules/extension/brewer/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/graph/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/validation/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/wms/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/xsd-core/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/xsd-fes/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/xsd-filter/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/xsd-gml2/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
View
2  modules/extension/xsd/xsd-gml3/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/xsd-kml/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
View
4 modules/extension/xsd/xsd-ows/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>net.opengis.ows</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</dependency>
<dependency>
<groupId>org.geotools.xsd</groupId>
View
2  modules/extension/xsd/xsd-sld/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/extension/xsd/xsd-wcs/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
View
2  modules/extension/xsd/xsd-wfs/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
View
2  modules/extension/xsd/xsd-wms/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
View
2  modules/extension/xsd/xsd-wps/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<!-- =========================================================== -->
View
2  modules/library/api/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/coverage/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/cql/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/data/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/jdbc/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
8 modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
@@ -1668,12 +1668,12 @@ protected final Connection createConnection() {
}
/**
- * Releases an existing connection.
+ * Releases an existing connection (paying special attention to {@link Transaction#AUTO_COMMIT}.
+ * <p>
+ * If the state is based off the AUTO_COMMIT transaction - close using {@link #closeSafe(Connection)}.
+ * Otherwise wait until the transaction itself is closed to close the connection.
*/
protected final void releaseConnection( Connection cx, JDBCState state ) {
- //if the state is based off the AUTO_COMMIT transaction, close the
- // connection, otherwise wait until the transaction itself is closed to
- // close the connection
if ( state.getTransaction() == Transaction.AUTO_COMMIT ) {
closeSafe( cx );
}
View
5 modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCFeatureSource.java
@@ -655,14 +655,15 @@ protected boolean canTransact() {
@Override
protected boolean handleVisitor(Query query, FeatureVisitor visitor) throws IOException {
- //grab connection
+ // grab connection using the current transaction
Connection cx = getDataStore().getConnection(getState());
try {
Object result = getDataStore().getAggregateValue(visitor, getSchema(), query, cx);
return result != null;
}
finally {
- getDataStore().closeSafe( cx );
+ // release the connection - behaviour depends on Transaction.AUTO_COMMIT
+ getDataStore().releaseConnection(cx, getState());
}
}
View
39 modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCFeatureSourceTest.java
@@ -16,12 +16,15 @@
*/
package org.geotools.jdbc;
+import java.sql.Connection;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.geotools.data.DefaultQuery;
+import org.geotools.data.DefaultTransaction;
import org.geotools.data.Query;
import org.geotools.data.QueryCapabilities;
+import org.geotools.data.Transaction;
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureIterator;
import org.geotools.data.store.ContentFeatureSource;
@@ -32,6 +35,8 @@
import org.geotools.geometry.jts.LiteCoordinateSequenceFactory;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.referencing.CRS;
+import org.opengis.feature.Feature;
+import org.opengis.feature.FeatureVisitor;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.filter.And;
@@ -501,4 +506,38 @@ SimpleFeature getFirstFeature(SimpleFeatureCollection fc) {
}
}
}
+
+ public void testAcceptsVisitor() throws Exception {
+ class TotalVisitor implements FeatureVisitor {
+ int total=0;
+ public void visit(Feature feature) {
+ total++;
+ }
+ }
+ TotalVisitor visitor = new TotalVisitor();
+
+ // initial test on Transaction.AUTO_COMMIT
+ int count = featureSource.getCount(Query.ALL);
+ featureSource.accepts( Query.ALL, visitor, null );
+ assertEquals( count, visitor.total );
+ visitor.total = 0; // reset
+
+ // test on a transaction
+ JDBCFeatureStore ft1 = (JDBCFeatureStore) dataStore.getFeatureSource(tname("ft1"));
+ Transaction transaction = new DefaultTransaction();
+ try {
+ ft1.setTransaction( transaction );
+ Connection connection = ft1.getDataStore().getConnection( ft1.getState() );
+ assertFalse( "connection established", connection.isClosed() );
+
+ ft1.accepts( Query.ALL, visitor, null );
+
+ assertFalse( "connection maintained", connection.isClosed() );
+ }
+ finally {
+ if( transaction != null ){
+ transaction.close();
+ }
+ }
+ }
}
View
2  modules/library/main/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java
@@ -33,7 +33,7 @@
*/
public class FilterFunction_numPoints extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numInteriorRing", Integer.class,
+ public static FunctionName NAME = new FunctionNameImpl("numPoints", Integer.class,
parameter("geometry", Geometry.class));
public FilterFunction_numPoints() {
View
81 modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_property.java
@@ -0,0 +1,81 @@
+package org.geotools.filter.function;
+
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2005-2008, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library 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.
+ */
+
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
+import org.geotools.factory.CommonFactoryFinder;
+import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.geotools.util.Converters;
+import org.opengis.filter.FilterFactory2;
+import org.opengis.filter.capability.FunctionName;
+import org.opengis.filter.expression.PropertyName;
+import org.opengis.filter.expression.VolatileFunction;
+
+/**
+ * Extracts a property from a feature, taking the property name as a parameter
+ *
+ * @author Andrea Aime - GeoSolutions
+ *
+ * @source $URL$
+ */
+public class FilterFunction_property extends FunctionExpressionImpl implements VolatileFunction {
+
+ FilterFactory2 FF = CommonFactoryFinder.getFilterFactory2();
+
+ public static FunctionName NAME = new FunctionNameImpl("property", parameter("propertyValue",
+ Object.class), parameter("propertyName", String.class));
+
+ /**
+ * Cache the last PropertyName used in a thead safe way
+ */
+ volatile PropertyName lastPropertyName;
+
+ public FilterFunction_property() {
+ super(NAME);
+ }
+
+ @Override
+ public Object evaluate(Object object, Class context) {
+ Object result = evaluate(object);
+ if (result == null) {
+ return null;
+ } else {
+ return Converters.convert(result, context);
+ }
+ }
+
+ public Object evaluate(Object feature) {
+ String name = getExpression(0).evaluate(feature, String.class);
+
+ if (name == null) {
+ return null;
+ }
+
+ PropertyName pn = lastPropertyName;
+ if (pn != null && pn.getPropertyName().equals(name)) {
+ return pn.evaluate(feature);
+ } else {
+ pn = FF.property(name);
+ Object result = pn.evaluate(feature);
+ lastPropertyName = pn;
+ return result;
+ }
+ }
+}
View
110 modules/library/main/src/main/java/org/geotools/filter/function/math/ModuloFunction.java
@@ -0,0 +1,110 @@
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2012, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library 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.
+ */
+package org.geotools.filter.function.math;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.geotools.util.Converters;
+import org.opengis.filter.capability.FunctionName;
+import org.opengis.filter.expression.Expression;
+import org.opengis.filter.expression.ExpressionVisitor;
+import org.opengis.filter.expression.Function;
+import org.opengis.filter.expression.Literal;
+
+/**
+ * Implements the Knuth floored division modulo_operation
+ *
+ * @see <a href="http://en.wikipedia.org/wiki/Modulo_operation#Remainder_calculation_for_the_modulo_operation">Modulo_operation</a>
+ */
+public class ModuloFunction implements Function {
+
+ static FunctionName NAME = new FunctionNameImpl(
+ "modulo",
+ Integer.class,
+ FunctionNameImpl.parameter("dividend", Integer.class),
+ FunctionNameImpl.parameter("divisor", Integer.class)
+ );
+
+ private final FunctionName functionName;
+
+ private final List<Expression> parameters;
+
+ private final Literal fallback;
+
+ public ModuloFunction() {
+ this.functionName = NAME;
+ this.parameters = Collections.emptyList();
+ this.fallback = null;
+ }
+
+ public ModuloFunction(List<Expression> parameters, Literal fallback) {
+ if (parameters == null) {
+ throw new NullPointerException("parameters must be provided");
+ }
+
+ if (parameters.size() != NAME.getArguments().size()) {
+ throw new IllegalArgumentException(NAME.getArguments().size() + " function parameters are required");
+ }
+
+ this.functionName = NAME;
+ this.parameters = parameters;
+ this.fallback = fallback;
+ }
+
+ public Object evaluate(Object object) {
+ return evaluate(object, functionName.getReturn().getType());
+ }
+
+ public <T> T evaluate(Object object, Class<T> context) {
+ Expression dividendExpression = parameters.get(0);
+ int dividend = dividendExpression.evaluate(object, Integer.class);
+
+ Expression divisorExpression = parameters.get(1);
+ int divisor = divisorExpression.evaluate(object, Integer.class);
+
+ if (divisor == 0) {
+ throw new IllegalArgumentException("divisor cannot be 0");
+ }
+
+ int modulo = dividend - divisor * (int) Math.floor((double) dividend / divisor);
+
+ return Converters.convert(modulo, context);
+ }
+
+ public Object accept(ExpressionVisitor visitor, Object extraData) {
+ return visitor.visit(this, extraData);
+ }
+
+ public String getName() {
+ return functionName.getName();
+ }
+
+ public FunctionName getFunctionName() {
+ return functionName;
+ }
+
+ public List<Expression> getParameters() {
+ return Collections.unmodifiableList(parameters);
+ }
+
+ public Literal getFallbackValue() {
+ return fallback;
+ }
+
+}
View
2  modules/library/main/src/main/resources/META-INF/services/org.opengis.filter.expression.Function
@@ -123,6 +123,7 @@ org.geotools.filter.function.FilterFunction_Convert
org.geotools.filter.function.FilterFunction_vertices
org.geotools.filter.function.FilterFunction_offset
org.geotools.filter.function.FilterFunction_isometric
+org.geotools.filter.function.FilterFunction_property
org.geotools.filter.function.IDFunction
org.geotools.filter.function.InterpolateFunction
org.geotools.filter.function.RecodeFunction
@@ -158,6 +159,7 @@ org.geotools.filter.function.math.FilterFunction_sqrt
org.geotools.filter.function.math.FilterFunction_tan
org.geotools.filter.function.math.FilterFunction_toDegrees
org.geotools.filter.function.math.FilterFunction_toRadians
+org.geotools.filter.function.math.ModuloFunction
org.geotools.filter.function.math.PiFunction
org.geotools.filter.function.string.ConcatenateFunction
org.geotools.filter.function.JenksNaturalBreaksFunction
View
128 modules/library/main/src/test/java/org/geotools/filter/function/FilterFunctionPropertyTest.java
@@ -0,0 +1,128 @@
+package org.geotools.filter.function;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.geotools.data.DataTestCase;
+import org.geotools.factory.CommonFactoryFinder;
+import org.geotools.filter.FunctionFinder;
+import org.junit.After;
+import org.junit.Test;
+import org.opengis.filter.FilterFactory2;
+import org.opengis.filter.expression.Function;
+
+/**
+ * Tests the property function
+ *
+ * @author Andrea Aime
+ */
+public class FilterFunctionPropertyTest extends DataTestCase {
+
+ private static final int LOOPS = 5000;
+ static FilterFactory2 FF = CommonFactoryFinder.getFilterFactory2();
+
+ public FilterFunctionPropertyTest() {
+ super(FilterFunctionPropertyTest.class.getName());
+ }
+
+ @After
+ public void teardown() {
+ EnvFunction.clearLocalValues();
+ }
+
+ @Test
+ public void testLocateFunction() {
+ Function f = new FunctionFinder(null).findFunction("property");
+ assertNotNull(f);
+ assertTrue(f instanceof FilterFunction_property);
+ }
+
+ @Test
+ public void testEvaluateProperty() {
+ Function f = FF.function("property", FF.literal("name"));
+ String result = f.evaluate(roadFeatures[0], String.class);
+ assertEquals("r1", result);
+ }
+
+ @Test
+ public void testEvaluateAndConvert() {
+ Function f = FF.function("property", FF.literal("geom"));
+ String result = f.evaluate(roadFeatures[0], String.class);
+ assertEquals("LINESTRING (1 1, 2 2, 4 2, 5 1)", result);
+ }
+
+ @Test
+ public void testEvaluateAlternate() {
+ Function f = FF.function("property", FF.function("env", FF.literal("pname")));
+
+ EnvFunction.setLocalValue("pname", "name");
+ String result = f.evaluate(roadFeatures[0], String.class);
+ assertEquals("r1", result);
+
+ EnvFunction.setLocalValue("pname", "geom");
+ result = f.evaluate(roadFeatures[0], String.class);
+ assertEquals("LINESTRING (1 1, 2 2, 4 2, 5 1)", result);
+ }
+
+ @Test
+ public void testEvaluateMultithreaded() throws Exception {
+ // we add this one since the property caches the last PropertyName used as
+ // an optimization
+ final Function f = FF.function("property", FF.function("env", FF.literal("pname")));
+ Callable<Void> nameEvaluator = new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ try {
+ EnvFunction.setLocalValue("pname", "name");
+
+ for (int i = 0; i < 1000; i++) {
+ String result = f.evaluate(roadFeatures[0], String.class);
+ assertEquals("r1", result);
+ }
+
+ } finally {
+ EnvFunction.clearLocalValues();
+ }
+
+ return null;
+ }
+ };
+
+ Callable<Void> geomEvaluator = new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ try {
+ EnvFunction.setLocalValue("pname", "geom");
+
+ for (int i = 0; i < LOOPS; i++) {
+ String result = f.evaluate(roadFeatures[0], String.class);
+ assertEquals("LINESTRING (1 1, 2 2, 4 2, 5 1)", result);
+ }
+
+ } finally {
+ EnvFunction.clearLocalValues();
+ }
+
+ return null;
+ }
+ };
+
+ ExecutorService es = Executors.newCachedThreadPool();
+ try {
+ Future<Void> fname = es.submit(nameEvaluator);
+ Future<Void> fgeom = es.submit(geomEvaluator);
+
+ fname.get();
+ fgeom.get();
+ } finally {
+ es.shutdown();
+ }
+
+
+ }
+
+}
View
113 modules/library/main/src/test/java/org/geotools/filter/function/math/ModuloFunctionTest.java
@@ -0,0 +1,113 @@
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2012, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library 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.
+ */
+package org.geotools.filter.function.math;
+
+import junit.framework.TestCase;
+
+import org.geotools.factory.CommonFactoryFinder;
+import org.opengis.filter.FilterFactory;
+import org.opengis.filter.expression.Function;
+
+public class ModuloFunctionTest extends TestCase {
+
+ private FilterFactory ff;
+
+ private String functionName;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ ff = CommonFactoryFinder.getFilterFactory2(null);
+ functionName = ModuloFunction.NAME.getName();
+ }
+
+ public void testModuloInvalidInitNoArgs() {
+ try {
+ ff.function(functionName);
+ } catch (RuntimeException e) {
+ assertEquals("Unable to find function " + functionName, e.getMessage());
+ return;
+ }
+
+ fail("Exception not thrown");
+ }
+
+ public void testModuloInvalidInitOneArg() {
+ try {
+ ff.function(functionName, ff.literal(13));
+ } catch (RuntimeException e) {
+ assertEquals("Unable to find function " + functionName, e.getMessage());
+ return;
+ }
+
+ fail("Exception not thrown");
+ }
+
+ public void testModuloInvalidInitThreeArgs() {
+ try {
+ ff.function(functionName, ff.literal(13), ff.literal(14), ff.literal(15));
+ } catch (RuntimeException e) {
+ assertEquals("Unable to find function " + functionName, e.getMessage());
+ return;
+ }
+
+ fail("Exception not thrown");
+ }
+
+ public void testModulo() {
+ Function function = ff.function(functionName, ff.literal(13), ff.literal(4));
+
+ assertEquals(1, function.evaluate(null));
+ }
+
+ public void testModuloNegativeDividend() {
+ Function function = ff.function(functionName, ff.literal(-13), ff.literal(4));
+
+ assertEquals(3, function.evaluate(null));
+ }
+
+ public void testModuloNegativeDivisor() {
+ Function function = ff.function(functionName, ff.literal(13), ff.literal(-4));
+
+ assertEquals(-3, function.evaluate(null));
+ }
+
+ public void testModuloFloat() {
+ Function function = ff.function(functionName, ff.literal(13.6), ff.literal(4));
+
+ assertEquals(1, function.evaluate(null));
+ }
+
+ public void testModuloOneDivisor() {
+ Function function = ff.function(functionName, ff.literal(13), ff.literal(1));
+
+ assertEquals(0, function.evaluate(null));
+ }
+
+ public void testModuloZeroDivisor() {
+ Function function = ff.function(functionName, ff.literal(13), ff.literal(0));
+
+ try {
+ function.evaluate(null);
+ } catch (IllegalArgumentException e) {
+ return;
+ }
+
+ fail("IllegalArgumentException not thrown");
+ }
+
+}
View
2  modules/library/metadata/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
13 modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
@@ -82,11 +82,6 @@
Properties props = new Properties();
try {
props.load(GeoTools.class.getResourceAsStream("GeoTools.properties"));
-
- //load git info if it is avaialble
- if (GeoTools.class.getResource("/git.properties") != null) {
- props.load(GeoTools.class.getResourceAsStream("/git.properties"));
- }
}
catch(Exception e) {}
@@ -96,18 +91,14 @@
/**
* The current GeoTools version. The separator character must be the dot.
*/
- private static final Version VERSION = new Version(PROPS.getProperty("version", "8.0-RC2"));
+ private static final Version VERSION = new Version(PROPS.getProperty("version", "9-SNAPSHOT"));
/**
* The version control (svn) revision at which this version of geotools was built.
*/
private static final String BUILD_REVISION;
static {
- String rev = PROPS.getProperty("build.revision", "-1");
- if ("-1".equals(rev)) {
- rev = PROPS.getProperty("git.commit.id", "-1");
- }
- BUILD_REVISION = rev;
+ BUILD_REVISION = PROPS.getProperty("build.revision", "-1");
}
/**
View
2  modules/library/opengis/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/referencing/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
24 modules/library/referencing/src/main/java/org/geotools/referencing/wkt/Formattable.java
@@ -126,6 +126,30 @@ public String toWKT(final int indentation) throws UnformattableObjectException {
/**
* Returns a
* <A HREF="http://geoapi.sourceforge.net/snapshot/javadoc/org/opengis/referencing/doc-files/WKT.html"><cite>Well
+ * Known Text</cite> (WKT)</A> for this object using the specified indentation.
+ * </p>
+ * The <tt>strict</tt> parameter is used to control whether the resulting WKT is tested for
+ * validity. When set to <code>false</code> the check is not performed. When <code>true</code>
+ * and the WKT is found to be invalid a {@link UnformattableObjectException} is thrown.
+ * <p>
+ *
+ * @param indentation The amount of spaces to use in indentation for WKT formatting,
+ * or {@link #SINGLE_LINE} for formatting the whole WKT on a single line.
+ * @param strict Controls the check for validity.
+ * @return The Well Know Text for this object.
+ * @throws UnformattableObjectException If this object can't be formatted as WKT.
+ * A formatting may fails because an object is too complex for the WKT format capability
+ * (for example an {@linkplain org.geotools.referencing.crs.DefaultEngineeringCRS
+ * engineering CRS} with different unit for each axis), or because only some specific
+ * implementations can be formatted as WKT.
+ */
+ public String toWKT(final int indentation, boolean strict) throws UnformattableObjectException {
+ return toWKT(Citations.OGC, indentation, strict);
+ }
+
+ /**
+ * Returns a
+ * <A HREF="http://geoapi.sourceforge.net/snapshot/javadoc/org/opengis/referencing/doc-files/WKT.html"><cite>Well
* Known Text</cite> (WKT)</A> for this object using the specified indentation and authority.
*
* @param authority The authority to prefer when choosing WKT entities names.
View
2  modules/library/render/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
22 modules/library/render/src/main/java/org/geotools/renderer/lite/gridcoverage2d/GridCoverageRenderer.java
@@ -47,6 +47,7 @@
import org.geotools.coverage.grid.GridCoverageFactory;
import org.geotools.coverage.grid.GridEnvelope2D;
import org.geotools.coverage.grid.GridGeometry2D;
+import org.geotools.coverage.grid.ViewType;
import org.geotools.coverage.processing.CoverageProcessor;
import org.geotools.coverage.processing.operation.Crop;
import org.geotools.coverage.processing.operation.Resample;
@@ -61,7 +62,6 @@
import org.geotools.referencing.operation.matrix.XAffineTransform;
import org.geotools.resources.i18n.ErrorKeys;
import org.geotools.resources.i18n.Errors;
-import org.geotools.resources.image.ImageUtilities;
import org.geotools.styling.RasterSymbolizer;
import org.opengis.coverage.grid.GridCoverage;
import org.opengis.filter.expression.Expression;
@@ -365,8 +365,7 @@ public GridCoverageRenderer(
this.hints.add(hints);
// this prevents users from overriding lenient hint
this.hints.put(Hints.LENIENT_DATUM_SHIFT, Boolean.TRUE);
- this.hints.add(ImageUtilities.DONT_REPLACE_INDEX_COLOR_MODEL);
-
+ this.hints.put(Hints.COVERAGE_PROCESSING_VIEW, ViewType.SAME);
}
/**
@@ -614,6 +613,11 @@ private GCpair prepareFinalImage(
final Interpolation interpolation = (Interpolation) hints.get(JAI.KEY_INTERPOLATION);
if (LOGGER.isLoggable(Level.FINE))
LOGGER.fine("Using interpolation "+interpolation);
+ final Hints localHints = this.hints.clone();
+ if(interpolation instanceof InterpolationNearest){
+ localHints.add(new RenderingHints(JAI.KEY_REPLACE_INDEX_COLOR_MODEL, Boolean.FALSE));
+ localHints.add(new RenderingHints(JAI.KEY_TRANSFORM_ON_COLORMAP, Boolean.TRUE));
+ }
// /////////////////////////////////////////////////////////////////////
@@ -623,7 +627,7 @@ private GCpair prepareFinalImage(
// /////////////////////////////////////////////////////////////////////
GridCoverage2D preResample=gridCoverage;
try{
- preResample = getCroppedCoverage(gridCoverage, intersectionEnvelope, sourceCoverageCRS,this.hints);
+ preResample = getCroppedCoverage(gridCoverage, intersectionEnvelope, sourceCoverageCRS,localHints);
if (preResample == null) {
// nothing to render, the AOI does not overlap
if (LOGGER.isLoggable(Level.FINE))
@@ -653,7 +657,7 @@ private GCpair prepareFinalImage(
// /////////////////////////////////////////////////////////////////////
GridCoverage2D preSymbolizer;
if (doReprojection) {
- preSymbolizer = resample(preResample, destinationCRS,interpolation == null ? new InterpolationNearest(): interpolation, destinationEnvelope,this.hints);
+ preSymbolizer = resample(preResample, destinationCRS,interpolation == null ? new InterpolationNearest(): interpolation, destinationEnvelope,localHints);
if (LOGGER.isLoggable(Level.FINE))
LOGGER.fine("Reprojecting to crs "+ destinationCRS.toWKT());
} else
@@ -802,10 +806,12 @@ public RenderedImage renderImage(
final ImageLayout layout = new ImageLayout(finalImage);
layout.setTileGridXOffset(0).setTileGridYOffset(0).setTileHeight(tileSizeY).setTileWidth(tileSizeX);
final RenderingHints localHints = this.hints.clone();
- localHints.add(new RenderingHints(JAI.KEY_IMAGE_LAYOUT, layout));
- //add hints to preserve IndexColorModel
- if(interpolation instanceof InterpolationNearest)
+ localHints.add(new RenderingHints(JAI.KEY_IMAGE_LAYOUT, layout));
+ if (interpolation instanceof InterpolationNearest) {
localHints.add(new RenderingHints(JAI.KEY_REPLACE_INDEX_COLOR_MODEL, Boolean.FALSE));
+ localHints.add(new RenderingHints(JAI.KEY_TRANSFORM_ON_COLORMAP, Boolean.TRUE));
+ }
+
//SG add hints for the border extender
localHints.add(new RenderingHints(JAI.KEY_BORDER_EXTENDER,BorderExtender.createInstance(BorderExtender.BORDER_COPY)));
RenderedImage im=null;
View
2  modules/library/sample-data/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/library/xml/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/ogc/net.opengis.fes/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
View
4 modules/ogc/net.opengis.ows/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>org.w3.xlink</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</dependency>
</dependencies>
View
2  modules/ogc/net.opengis.wcs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
View
2  modules/ogc/net.opengis.wfs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
View
4 modules/ogc/net.opengis.wfsv/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>net.opengis.wfs</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</dependency>
</dependencies>
View
2  modules/ogc/net.opengis.wps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
View
2  modules/ogc/org.w3.xlink/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools.ogc</groupId>
View
2  modules/ogc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
<groupId>org.geotools</groupId>
View
2  modules/plugin/arcgrid/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/plugin/arcsde/common/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/plugin/arcsde/datastore/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>8.0-RC2</version>
+ <version>8.0</version>
</parent>
View
2  modules/plugin/arcsde/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>