Menu
▾
▴
geotools-commits — A read only list to which all svn commit statments are posted
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(39) |
Dec
(70) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(168) |
Mar
(248) |
Apr
(143) |
May
(418) |
Jun
(558) |
Jul
(702) |
Aug
(311) |
Sep
(141) |
Oct
(350) |
Nov
(172) |
Dec
(182) |
| 2003 |
Jan
(320) |
Feb
(362) |
Mar
(356) |
Apr
(218) |
May
(447) |
Jun
(203) |
Jul
(745) |
Aug
(494) |
Sep
(175) |
Oct
(422) |
Nov
(554) |
Dec
(162) |
| 2004 |
Jan
(217) |
Feb
(353) |
Mar
(228) |
Apr
(407) |
May
(211) |
Jun
(270) |
Jul
(264) |
Aug
(198) |
Sep
(268) |
Oct
(227) |
Nov
(118) |
Dec
(47) |
| 2005 |
Jan
(207) |
Feb
(243) |
Mar
(297) |
Apr
(197) |
May
(281) |
Jun
(166) |
Jul
(164) |
Aug
(92) |
Sep
(155) |
Oct
(196) |
Nov
(189) |
Dec
(114) |
| 2006 |
Jan
(129) |
Feb
(219) |
Mar
(274) |
Apr
(213) |
May
(245) |
Jun
(220) |
Jul
(376) |
Aug
(347) |
Sep
(179) |
Oct
(493) |
Nov
(448) |
Dec
(339) |
| 2007 |
Jan
(304) |
Feb
(273) |
Mar
(237) |
Apr
(186) |
May
(215) |
Jun
(320) |
Jul
(229) |
Aug
(313) |
Sep
(331) |
Oct
(279) |
Nov
(347) |
Dec
(266) |
| 2008 |
Jan
(332) |
Feb
(280) |
Mar
(203) |
Apr
(277) |
May
(301) |
Jun
(356) |
Jul
(292) |
Aug
(203) |
Sep
(277) |
Oct
(142) |
Nov
(210) |
Dec
(239) |
| 2009 |
Jan
(250) |
Feb
(193) |
Mar
(174) |
Apr
(183) |
May
(342) |
Jun
(230) |
Jul
(292) |
Aug
(161) |
Sep
(204) |
Oct
(280) |
Nov
(281) |
Dec
(175) |
| 2010 |
Jan
(113) |
Feb
(106) |
Mar
(199) |
Apr
(166) |
May
(298) |
Jun
(147) |
Jul
(175) |
Aug
(192) |
Sep
(71) |
Oct
(79) |
Nov
(58) |
Dec
(55) |
| 2011 |
Jan
(83) |
Feb
(169) |
Mar
(142) |
Apr
(207) |
May
(311) |
Jun
(183) |
Jul
(218) |
Aug
(190) |
Sep
(158) |
Oct
(197) |
Nov
(93) |
Dec
(74) |
| 2012 |
Jan
(92) |
Feb
(50) |
Mar
(64) |
Apr
(45) |
May
(100) |
Jun
(70) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(5) |
Nov
(7) |
Dec
(4) |
| 2013 |
Jan
(6) |
Feb
(2) |
Mar
(2) |
Apr
(4) |
May
(3) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2014 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(3) |
May
(3) |
Jun
(1) |
Jul
|
Aug
(4) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <svn...@os...> - 2012-06-28 09:28:08
|
Author: victortey Date: 2012-06-28 02:27:56 -0700 (Thu, 28 Jun 2012) New Revision: 38843 Removed: tags/8.0-RC2/ Log: removing 8.0-RC2 tag |
|
From: <svn...@os...> - 2012-06-28 06:07:00
|
Author: victortey Date: 2012-06-27 23:06:53 -0700 (Wed, 27 Jun 2012) New Revision: 38842 Modified: trunk/docs/common.py Log: GEOT-4185:Docs and Readme not updated when using build script for release, update the copyright year to 2012 Modified: trunk/docs/common.py =================================================================== --- trunk/docs/common.py 2012-06-28 03:06:48 UTC (rev 38841) +++ trunk/docs/common.py 2012-06-28 06:06:53 UTC (rev 38842) @@ -42,7 +42,7 @@ # General information about the project. project = u'GeoTools' -copyright = u'2011, GeoTools' +copyright = u'2012, GeoTools' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the |
Author: victortey Date: 2012-06-27 20:06:48 -0700 (Wed, 27 Jun 2012) New Revision: 38841 Modified: tags/8.0-RC2/README.html tags/8.0-RC2/build/maven/jar-collector/pom.xml tags/8.0-RC2/build/maven/javadoc/pom.xml tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml tags/8.0-RC2/build/maven/pom.xml tags/8.0-RC2/build/maven/xmlcodegen/pom.xml tags/8.0-RC2/build/pom.xml tags/8.0-RC2/build/rename.xml tags/8.0-RC2/docs/common.py tags/8.0-RC2/docs/pom.xml tags/8.0-RC2/docs/user/tutorial/advanced/artifacts/pom.xml tags/8.0-RC2/docs/user/tutorial/feature/artifacts/pom.xml tags/8.0-RC2/docs/user/tutorial/filter/artifacts/pom.xml tags/8.0-RC2/docs/user/tutorial/geometry/artifacts/pom.xml tags/8.0-RC2/docs/user/tutorial/map/artifacts/pom.xml tags/8.0-RC2/docs/user/tutorial/quickstart/artifacts/pom.xml tags/8.0-RC2/docs/user/tutorial/raster/artifacts/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml tags/8.0-RC2/modules/extension/app-schema/pom.xml tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml tags/8.0-RC2/modules/extension/brewer/pom.xml tags/8.0-RC2/modules/extension/graph/pom.xml tags/8.0-RC2/modules/extension/pom.xml tags/8.0-RC2/modules/extension/validation/pom.xml tags/8.0-RC2/modules/extension/wms/pom.xml tags/8.0-RC2/modules/extension/xsd/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml tags/8.0-RC2/modules/library/api/pom.xml tags/8.0-RC2/modules/library/coverage/pom.xml tags/8.0-RC2/modules/library/cql/pom.xml tags/8.0-RC2/modules/library/data/pom.xml tags/8.0-RC2/modules/library/jdbc/pom.xml tags/8.0-RC2/modules/library/main/pom.xml tags/8.0-RC2/modules/library/metadata/pom.xml tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java tags/8.0-RC2/modules/library/opengis/pom.xml tags/8.0-RC2/modules/library/pom.xml tags/8.0-RC2/modules/library/referencing/pom.xml tags/8.0-RC2/modules/library/render/pom.xml tags/8.0-RC2/modules/library/sample-data/pom.xml tags/8.0-RC2/modules/library/xml/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml tags/8.0-RC2/modules/ogc/pom.xml tags/8.0-RC2/modules/plugin/arcgrid/pom.xml tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml tags/8.0-RC2/modules/plugin/arcsde/pom.xml tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml tags/8.0-RC2/modules/plugin/charts/pom.xml tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml tags/8.0-RC2/modules/plugin/geotiff/pom.xml tags/8.0-RC2/modules/plugin/grassraster/pom.xml tags/8.0-RC2/modules/plugin/gtopo30/pom.xml tags/8.0-RC2/modules/plugin/image/pom.xml tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml tags/8.0-RC2/modules/plugin/jdbc/pom.xml tags/8.0-RC2/modules/plugin/jp2k/pom.xml tags/8.0-RC2/modules/plugin/pom.xml tags/8.0-RC2/modules/plugin/property/pom.xml tags/8.0-RC2/modules/plugin/referencing3D/pom.xml tags/8.0-RC2/modules/plugin/shapefile/pom.xml tags/8.0-RC2/modules/plugin/svg/pom.xml tags/8.0-RC2/modules/pom.xml tags/8.0-RC2/modules/unsupported/app-schema/pom.xml tags/8.0-RC2/modules/unsupported/app-schema/webservice/pom.xml tags/8.0-RC2/modules/unsupported/caching/pom.xml tags/8.0-RC2/modules/unsupported/couchdb/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-api/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-core/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/grib1/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/hdf4/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/netcdf/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/pom.xml tags/8.0-RC2/modules/unsupported/coveragetools/pom.xml tags/8.0-RC2/modules/unsupported/csv/pom.xml tags/8.0-RC2/modules/unsupported/dxf/pom.xml tags/8.0-RC2/modules/unsupported/edigeo/pom.xml tags/8.0-RC2/modules/unsupported/efeature/pom.xml tags/8.0-RC2/modules/unsupported/epsg-oracle/pom.xml tags/8.0-RC2/modules/unsupported/example/pom.xml tags/8.0-RC2/modules/unsupported/excel/pom.xml tags/8.0-RC2/modules/unsupported/feature-aggregate/pom.xml tags/8.0-RC2/modules/unsupported/geogit-versioned/pom.xml tags/8.0-RC2/modules/unsupported/geojson/pom.xml tags/8.0-RC2/modules/unsupported/geometry/pom.xml tags/8.0-RC2/modules/unsupported/georest/pom.xml tags/8.0-RC2/modules/unsupported/geotiff_new/pom.xml tags/8.0-RC2/modules/unsupported/grid/pom.xml tags/8.0-RC2/modules/unsupported/imagecollection/pom.xml tags/8.0-RC2/modules/unsupported/jdbc-ng/jdbc-ingres/pom.xml tags/8.0-RC2/modules/unsupported/jdbc-ng/pom.xml tags/8.0-RC2/modules/unsupported/jts-wrapper/pom.xml tags/8.0-RC2/modules/unsupported/mark-wkt/pom.xml tags/8.0-RC2/modules/unsupported/matfile5/pom.xml tags/8.0-RC2/modules/unsupported/mongodb/pom.xml tags/8.0-RC2/modules/unsupported/ogr/pom.xml tags/8.0-RC2/modules/unsupported/pom.xml tags/8.0-RC2/modules/unsupported/postgis-versioned/pom.xml tags/8.0-RC2/modules/unsupported/process-feature/pom.xml tags/8.0-RC2/modules/unsupported/process-geometry/pom.xml tags/8.0-RC2/modules/unsupported/process-raster/pom.xml tags/8.0-RC2/modules/unsupported/process/pom.xml tags/8.0-RC2/modules/unsupported/property-ng/pom.xml tags/8.0-RC2/modules/unsupported/sfs/pom.xml tags/8.0-RC2/modules/unsupported/shapefile-ng/pom.xml tags/8.0-RC2/modules/unsupported/shapefile-renderer/pom.xml tags/8.0-RC2/modules/unsupported/swing/pom.xml tags/8.0-RC2/modules/unsupported/swt/pom.xml tags/8.0-RC2/modules/unsupported/vpf/pom.xml tags/8.0-RC2/modules/unsupported/wfs-ng/pom.xml tags/8.0-RC2/modules/unsupported/wfs/pom.xml tags/8.0-RC2/modules/unsupported/wps/pom.xml tags/8.0-RC2/pom.xml tags/8.0-RC2/spike/jan/gsoc-transformations/pom.xml tags/8.0-RC2/spike/mauro/ogr/pom.xml Log: updating version numbers for 8.0-RC2 Modified: tags/8.0-RC2/README.html =================================================================== --- tags/8.0-RC2/README.html 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/README.html 2012-06-28 03:06:48 UTC (rev 38841) @@ -2,7 +2,7 @@ <HTML> <HEAD> <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8"> - <TITLE>GeoTools @RELEASE@ README</TITLE> + <TITLE>GeoTools 8.0-RC2 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 @RELEASE@</H1> -<P>Thank you for downloading GeoTools @RELEASE@. This release was -created on @DATE@.</P> +<H1 CLASS="western">GeoTools 8.0-RC2</H1> +<P>Thank you for downloading GeoTools 8.0-RC2. This release was +created on Jun 28, 2012.</P> <P>This release contains only a subset of the current GeoTools code base. The full GeoTools code base contains additional unsupported Modified: tags/8.0-RC2/build/maven/jar-collector/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/jar-collector/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/maven/jar-collector/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/javadoc/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/javadoc/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/maven/javadoc/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/maven/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>build</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/xmlcodegen/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/xmlcodegen/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/maven/xmlcodegen/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/pom.xml =================================================================== --- tags/8.0-RC2/build/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>geotools</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/rename.xml =================================================================== --- tags/8.0-RC2/build/rename.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/build/rename.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -10,14 +10,14 @@ <include name="**/pom.xml"/> <include name="**/GeoTools.java"/> <include name="**/common.py"/> - <replacefilter token="8-SNAPSHOT" value="@VERSION@"/> + <replacefilter token="8-SNAPSHOT" value="8.0-RC2"/> </replace> </target> <target name="readme"> <replace file="../README.html"> - <replacefilter token="@RELEASE@" value="@VERSION@"/> - <replacefilter token="@DATE@" value="@RELEASE_DATE@"/> + <replacefilter token="@RELEASE@" value="8.0-RC2"/> + <replacefilter token="@DATE@" value="Jun 28, 2012"/> </replace> </target> Modified: tags/8.0-RC2/docs/common.py =================================================================== --- tags/8.0-RC2/docs/common.py 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/common.py 2012-06-28 03:06:48 UTC (rev 38841) @@ -49,7 +49,7 @@ # built documents. # # The full version, including alpha/beta/rc tags. -release = '8-SNAPSHOT' +release = '8.0-RC2' # The short X.Y version. version = release Modified: tags/8.0-RC2/docs/pom.xml =================================================================== --- tags/8.0-RC2/docs/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>geotools</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/docs/user/tutorial/advanced/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/advanced/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/advanced/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> Modified: tags/8.0-RC2/docs/user/tutorial/feature/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/feature/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/feature/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> Modified: tags/8.0-RC2/docs/user/tutorial/filter/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/filter/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/filter/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> <!-- Provides map projections --> Modified: tags/8.0-RC2/docs/user/tutorial/geometry/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/geometry/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/geometry/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> <dependency> Modified: tags/8.0-RC2/docs/user/tutorial/map/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/map/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/map/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> <dependency> Modified: tags/8.0-RC2/docs/user/tutorial/quickstart/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> <dependency> Modified: tags/8.0-RC2/docs/user/tutorial/raster/artifacts/pom.xml =================================================================== --- tags/8.0-RC2/docs/user/tutorial/raster/artifacts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/docs/user/tutorial/raster/artifacts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -11,7 +11,7 @@ <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <geotools.version>8-SNAPSHOT</geotools.version> + <geotools.version>8.0-RC2</geotools.version> </properties> <dependencies> <dependency> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/app-schema/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -7,7 +7,7 @@ <parent> <artifactId>app-schema</artifactId> <groupId>org.geotools</groupId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/brewer/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/brewer/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/brewer/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/graph/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/graph/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/graph/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/validation/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/validation/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/validation/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/wms/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/wms/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/wms/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> @@ -71,7 +71,7 @@ <dependency> <groupId>org.geotools.ogc</groupId> <artifactId>net.opengis.ows</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> <dependency> <groupId>org.geotools.xsd</groupId> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/library/api/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/api/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/api/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/coverage/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/coverage/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/coverage/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/cql/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/cql/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/cql/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/data/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/data/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/data/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/jdbc/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/jdbc/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/jdbc/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/main/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/main/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/main/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/metadata/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/metadata/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/metadata/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java =================================================================== --- tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2012-06-28 03:06:48 UTC (rev 38841) @@ -96,7 +96,7 @@ /** * The current GeoTools version. The separator character must be the dot. */ - private static final Version VERSION = new Version(PROPS.getProperty("version", "8-SNAPSHOT")); + private static final Version VERSION = new Version(PROPS.getProperty("version", "8.0-RC2")); /** * The version control (svn) revision at which this version of geotools was built. Modified: tags/8.0-RC2/modules/library/opengis/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/opengis/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/opengis/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/referencing/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/referencing/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/referencing/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/render/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/render/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/render/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/sample-data/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/sample-data/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/sample-data/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/xml/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/xml/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/library/xml/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> @@ -28,7 +28,7 @@ <dependency> <groupId>org.geotools.ogc</groupId> <artifactId>org.w3.xlink</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> </dependencies> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> @@ -28,7 +28,7 @@ <dependency> <groupId>org.geotools.ogc</groupId> <artifactId>net.opengis.wfs</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> </dependencies> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/ogc/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/plugin/arcgrid/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcgrid/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/arcgrid/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>arcsde-plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>arcsde-plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/arcsde/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>arcsde-plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/charts/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/charts/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/charts/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/geotiff/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/geotiff/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/geotiff/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/grassraster/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/grassraster/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/grassraster/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/gtopo30/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/gtopo30/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/gtopo30/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/image/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/image/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/image/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!--properties> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jdbc/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jp2k/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jp2k/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/jp2k/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -15,7 +15,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/plugin/property/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/property/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/property/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/referencing3D/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/referencing3D/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/referencing3D/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/shapefile/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/shapefile/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/shapefile/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/svg/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/svg/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/plugin/svg/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/pom.xml =================================================================== --- tags/8.0-RC2/modules/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/pom.xml 2012-06-28 03:06:48 UTC (rev 38841) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>geotools</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/unsupported/app-schema/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/app-schema/pom.xml 2012-06-28 02:40:32 UTC (rev 38840) +++ tags/8.0-RC2/modules/unsupported/app-sche... [truncated message content] |
|
From: <svn...@os...> - 2012-06-28 02:40:38
|
Author: victortey Date: 2012-06-27 19:40:32 -0700 (Wed, 27 Jun 2012) New Revision: 38840 Added: tags/8.0-RC2/ Log: tagging 8.0-RC2 Property changes on: tags/8.0-RC2 ___________________________________________________________________ Added: svn:ignore + .project .settings .classpath .jetproperties .wtpmodules target bin cobertura.ser nbproject nbactions.xml target.list .featurelock.patch.swp Added: svn:mergeinfo + /branches/simple-features:35278-35308 |
|
From: <svn...@os...> - 2012-06-28 02:40:34
|
Author: victortey Date: 2012-06-27 19:40:28 -0700 (Wed, 27 Jun 2012) New Revision: 38839 Removed: tags/8.0-RC2/ Log: removing 8.0-RC2 tag |
|
From: <svn...@os...> - 2012-06-27 18:38:58
|
Author: jdeolive
Date: 2012-06-27 11:38:52 -0700 (Wed, 27 Jun 2012)
New Revision: 38838
Modified:
trunk/build/rename.xml
trunk/docs/common.py
Log:
tweaking doc version to avoid @RELEASE@ tag in snapshot builds
Modified: trunk/build/rename.xml
===================================================================
--- trunk/build/rename.xml 2012-06-27 18:19:03 UTC (rev 38837)
+++ trunk/build/rename.xml 2012-06-27 18:38:52 UTC (rev 38838)
@@ -1,24 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Rename" default="rename">
- <target name="rename" depends="code,doc,readme"
- description="Update the version references in code, doc and readme"
+ <target name="rename" depends="code, readme"
+ description="Update the version references in code and readme"
/>
<target name="code">
<replace dir="..">
<include name="**/pom.xml"/>
<include name="**/GeoTools.java"/>
+ <include name="**/common.py"/>
<replacefilter token="8-SNAPSHOT" value="@VERSION@"/>
</replace>
</target>
- <target name="doc">
- <replace file="../docs/common.py">
- <replacefilter token="@RELEASE@" value="@VERSION@"/>
- </replace>
- </target>
-
<target name="readme">
<replace file="../README.html">
<replacefilter token="@RELEASE@" value="@VERSION@"/>
Modified: trunk/docs/common.py
===================================================================
--- trunk/docs/common.py 2012-06-27 18:19:03 UTC (rev 38837)
+++ trunk/docs/common.py 2012-06-27 18:38:52 UTC (rev 38838)
@@ -49,12 +49,13 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
-release = '@RELEASE@'
+release = '8-SNAPSHOT'
# The short X.Y version.
-version = re.sub('-.*', '', release)
+version = release
+if version.find('SNAPSHOT') == -1:
+ version = re.sub('-.*', '', version)
-
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
|
|
From: <svn...@os...> - 2012-06-27 18:19:14
|
Author: jdeolive
Date: 2012-06-27 11:19:03 -0700 (Wed, 27 Jun 2012)
New Revision: 38837
Modified:
trunk/build/release/build_release.sh
trunk/build/rename.xml
trunk/docs/build.xml
trunk/docs/common.py
trunk/docs/pom.xml
trunk/docs/user/tutorial/advanced/artifacts/pom.xml
trunk/docs/user/tutorial/feature/artifacts/pom.xml
trunk/docs/user/tutorial/filter/artifacts/pom.xml
trunk/docs/user/tutorial/geometry/artifacts/pom.xml
trunk/docs/user/tutorial/map/artifacts/pom.xml
trunk/docs/user/tutorial/quickstart/artifacts/pom.xml
trunk/docs/user/tutorial/raster/artifacts/pom.xml
trunk/modules/unsupported/wfs-ng/pom.xml
Log:
GEOT-4185, fixing version substitution for release
Modified: trunk/build/release/build_release.sh
===================================================================
--- trunk/build/release/build_release.sh 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/build/release/build_release.sh 2012-06-27 18:19:03 UTC (rev 38837)
@@ -136,6 +136,7 @@
# update versions
pushd build > /dev/null
sed -i 's/@VERSION@/'$tag'/g' rename.xml
+sed -i "s/@RELEASE_DATE@/`date "+%b %d, %Y"`/g" rename.xml
ant -f rename.xml
popd > /dev/null
Modified: trunk/build/rename.xml
===================================================================
--- trunk/build/rename.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/build/rename.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -8,37 +8,21 @@
<target name="code">
<replace dir="..">
<include name="**/pom.xml"/>
- <replacefilter token="<version>8-SNAPSHOT</version>"
- value="<version>@VERSION@</version>"/>
+ <include name="**/GeoTools.java"/>
+ <replacefilter token="8-SNAPSHOT" value="@VERSION@"/>
</replace>
-
- <replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
- <include name="GeoTools.java"/>
- <replacefilter token="8-SNAPSHOT"
- value="@VERSION@"/>
- </replace>
</target>
<target name="doc">
- <replace dir="../docs/user/tutorial/">
- <include name="**/pom.xml"/>
- <replacefilter token="<geotools.version>8-SNAPSHOT</geotools.version>"
- value="<geotools.version>@VERSION@</geotools.version>"/>
+ <replace file="../docs/common.py">
+ <replacefilter token="@RELEASE@" value="@VERSION@"/>
</replace>
-
- <replace dir="../docs/">
- <include name="pom.xml"/>
- <replacefilter token="8-SNAPSHOT"
- value="@VERSION@"/>
- </replace>
</target>
- <target name="readme">
+ <target name="readme">
<replace file="../README.html">
- <replacefilter token="@RELEASE@"
- value="@VERSION@"/>
- <replacefilter token="@DATE@"
- value="@RELEASE_DATE@"/>
+ <replacefilter token="@RELEASE@" value="@VERSION@"/>
+ <replacefilter token="@DATE@" value="@RELEASE_DATE@"/>
</replace>
</target>
Modified: trunk/docs/build.xml
===================================================================
--- trunk/docs/build.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/build.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -26,7 +26,7 @@
<isset property="build.directory" />
</condition>
- <condition property="project.version" value="${project.version}" else="8.0-M3">
+ <condition property="project.version" value="${project.version}" else="8-SNAPSHOT">
<isset property="project.version" />
</condition>
Modified: trunk/docs/common.py
===================================================================
--- trunk/docs/common.py 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/common.py 2012-06-27 18:19:03 UTC (rev 38837)
@@ -12,6 +12,7 @@
# serve to show the default.
import sys, os
+import re
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -47,11 +48,12 @@
# |version| and |release|, also used in various other places throughout the
# built documents.
#
+# The full version, including alpha/beta/rc tags.
+release = '@RELEASE@'
+
# The short X.Y version.
-version = '8.0'
+version = re.sub('-.*', '', release)
-# The full version, including alpha/beta/rc tags.
-release = '8.0-RC1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -240,7 +240,7 @@
<ant antfile="build.xml" dir="${basedir}" target="${target}">
<property name="build.directory" value="${build.directory}"/>
<!-- may be ${project.version} when tagged -->
- <property name="project.version" value="8.0-RC1"/>
+ <property name="project.version" value="${project.version}"/>
</ant>
</tasks>
</configuration>
Modified: trunk/docs/user/tutorial/advanced/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/advanced/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/advanced/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
Modified: trunk/docs/user/tutorial/feature/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/feature/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/feature/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
Modified: trunk/docs/user/tutorial/filter/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/filter/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/filter/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<!-- Provides map projections -->
Modified: trunk/docs/user/tutorial/geometry/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/geometry/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/geometry/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/docs/user/tutorial/map/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/map/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/map/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/docs/user/tutorial/quickstart/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC1</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/docs/user/tutorial/raster/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/raster/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/raster/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/modules/unsupported/wfs-ng/pom.xml
===================================================================
--- trunk/modules/unsupported/wfs-ng/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/modules/unsupported/wfs-ng/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -105,9 +105,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-data</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-data</artifactId>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
|
Author: victortey Date: 2012-06-26 19:57:30 -0700 (Tue, 26 Jun 2012) New Revision: 38836 Modified: tags/8.0-RC2/README.html tags/8.0-RC2/build/maven/jar-collector/pom.xml tags/8.0-RC2/build/maven/javadoc/pom.xml tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml tags/8.0-RC2/build/maven/pom.xml tags/8.0-RC2/build/maven/xmlcodegen/pom.xml tags/8.0-RC2/build/pom.xml tags/8.0-RC2/build/rename.xml tags/8.0-RC2/docs/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml tags/8.0-RC2/modules/extension/app-schema/pom.xml tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml tags/8.0-RC2/modules/extension/brewer/pom.xml tags/8.0-RC2/modules/extension/graph/pom.xml tags/8.0-RC2/modules/extension/pom.xml tags/8.0-RC2/modules/extension/validation/pom.xml tags/8.0-RC2/modules/extension/wms/pom.xml tags/8.0-RC2/modules/extension/xsd/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml tags/8.0-RC2/modules/library/api/pom.xml tags/8.0-RC2/modules/library/coverage/pom.xml tags/8.0-RC2/modules/library/cql/pom.xml tags/8.0-RC2/modules/library/data/pom.xml tags/8.0-RC2/modules/library/jdbc/pom.xml tags/8.0-RC2/modules/library/main/pom.xml tags/8.0-RC2/modules/library/metadata/pom.xml tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java tags/8.0-RC2/modules/library/opengis/pom.xml tags/8.0-RC2/modules/library/pom.xml tags/8.0-RC2/modules/library/referencing/pom.xml tags/8.0-RC2/modules/library/render/pom.xml tags/8.0-RC2/modules/library/sample-data/pom.xml tags/8.0-RC2/modules/library/xml/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml tags/8.0-RC2/modules/ogc/pom.xml tags/8.0-RC2/modules/plugin/arcgrid/pom.xml tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml tags/8.0-RC2/modules/plugin/arcsde/pom.xml tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml tags/8.0-RC2/modules/plugin/charts/pom.xml tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml tags/8.0-RC2/modules/plugin/geotiff/pom.xml tags/8.0-RC2/modules/plugin/grassraster/pom.xml tags/8.0-RC2/modules/plugin/gtopo30/pom.xml tags/8.0-RC2/modules/plugin/image/pom.xml tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml tags/8.0-RC2/modules/plugin/jdbc/pom.xml tags/8.0-RC2/modules/plugin/jp2k/pom.xml tags/8.0-RC2/modules/plugin/pom.xml tags/8.0-RC2/modules/plugin/property/pom.xml tags/8.0-RC2/modules/plugin/referencing3D/pom.xml tags/8.0-RC2/modules/plugin/shapefile/pom.xml tags/8.0-RC2/modules/plugin/svg/pom.xml tags/8.0-RC2/modules/pom.xml tags/8.0-RC2/modules/unsupported/app-schema/pom.xml tags/8.0-RC2/modules/unsupported/app-schema/webservice/pom.xml tags/8.0-RC2/modules/unsupported/caching/pom.xml tags/8.0-RC2/modules/unsupported/couchdb/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-api/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-core/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/grib1/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/hdf4/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/netcdf/pom.xml tags/8.0-RC2/modules/unsupported/coverage-experiment/pom.xml tags/8.0-RC2/modules/unsupported/coveragetools/pom.xml tags/8.0-RC2/modules/unsupported/csv/pom.xml tags/8.0-RC2/modules/unsupported/dxf/pom.xml tags/8.0-RC2/modules/unsupported/edigeo/pom.xml tags/8.0-RC2/modules/unsupported/efeature/pom.xml tags/8.0-RC2/modules/unsupported/epsg-oracle/pom.xml tags/8.0-RC2/modules/unsupported/example/pom.xml tags/8.0-RC2/modules/unsupported/excel/pom.xml tags/8.0-RC2/modules/unsupported/feature-aggregate/pom.xml tags/8.0-RC2/modules/unsupported/geogit-versioned/pom.xml tags/8.0-RC2/modules/unsupported/geojson/pom.xml tags/8.0-RC2/modules/unsupported/geometry/pom.xml tags/8.0-RC2/modules/unsupported/georest/pom.xml tags/8.0-RC2/modules/unsupported/geotiff_new/pom.xml tags/8.0-RC2/modules/unsupported/grid/pom.xml tags/8.0-RC2/modules/unsupported/imagecollection/pom.xml tags/8.0-RC2/modules/unsupported/jdbc-ng/jdbc-ingres/pom.xml tags/8.0-RC2/modules/unsupported/jdbc-ng/pom.xml tags/8.0-RC2/modules/unsupported/jts-wrapper/pom.xml tags/8.0-RC2/modules/unsupported/mark-wkt/pom.xml tags/8.0-RC2/modules/unsupported/matfile5/pom.xml tags/8.0-RC2/modules/unsupported/mongodb/pom.xml tags/8.0-RC2/modules/unsupported/ogr/pom.xml tags/8.0-RC2/modules/unsupported/pom.xml tags/8.0-RC2/modules/unsupported/postgis-versioned/pom.xml tags/8.0-RC2/modules/unsupported/process-feature/pom.xml tags/8.0-RC2/modules/unsupported/process-geometry/pom.xml tags/8.0-RC2/modules/unsupported/process-raster/pom.xml tags/8.0-RC2/modules/unsupported/process/pom.xml tags/8.0-RC2/modules/unsupported/property-ng/pom.xml tags/8.0-RC2/modules/unsupported/sfs/pom.xml tags/8.0-RC2/modules/unsupported/shapefile-ng/pom.xml tags/8.0-RC2/modules/unsupported/shapefile-renderer/pom.xml tags/8.0-RC2/modules/unsupported/swing/pom.xml tags/8.0-RC2/modules/unsupported/swt/pom.xml tags/8.0-RC2/modules/unsupported/vpf/pom.xml tags/8.0-RC2/modules/unsupported/wfs-ng/pom.xml tags/8.0-RC2/modules/unsupported/wfs/pom.xml tags/8.0-RC2/modules/unsupported/wps/pom.xml tags/8.0-RC2/pom.xml tags/8.0-RC2/spike/jan/gsoc-transformations/pom.xml tags/8.0-RC2/spike/mauro/ogr/pom.xml Log: updating version numbers for 8.0-RC2 Modified: tags/8.0-RC2/README.html =================================================================== --- tags/8.0-RC2/README.html 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/README.html 2012-06-27 02:57:30 UTC (rev 38836) @@ -2,7 +2,7 @@ <HTML> <HEAD> <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8"> - <TITLE>GeoTools @RELEASE@ README</TITLE> + <TITLE>GeoTools 8.0-RC2 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 @RELEASE@</H1> -<P>Thank you for downloading GeoTools @RELEASE@. This release was -created on @DATE@.</P> +<H1 CLASS="western">GeoTools 8.0-RC2</H1> +<P>Thank you for downloading GeoTools 8.0-RC2. This release was +created on @RELEASE_DATE@.</P> <P>This release contains only a subset of the current GeoTools code base. The full GeoTools code base contains additional unsupported Modified: tags/8.0-RC2/build/maven/jar-collector/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/jar-collector/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/maven/jar-collector/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/javadoc/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/javadoc/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/maven/javadoc/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/maven/jjtree-javacc/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/maven/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>build</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/maven/xmlcodegen/pom.xml =================================================================== --- tags/8.0-RC2/build/maven/xmlcodegen/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/maven/xmlcodegen/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.maven</groupId> <artifactId>maven</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/pom.xml =================================================================== --- tags/8.0-RC2/build/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>geotools</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/build/rename.xml =================================================================== --- tags/8.0-RC2/build/rename.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/build/rename.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -9,13 +9,13 @@ <replace dir=".."> <include name="**/pom.xml"/> <replacefilter token="<version>8-SNAPSHOT</version>" - value="<version>@VERSION@</version>"/> + value="<version>8.0-RC2</version>"/> </replace> <replace dir="../modules/library/metadata/src/main/java/org/geotools/factory"> <include name="GeoTools.java"/> <replacefilter token="8-SNAPSHOT" - value="@VERSION@"/> + value="8.0-RC2"/> </replace> </target> @@ -23,20 +23,20 @@ <replace dir="../docs/user/tutorial/"> <include name="**/pom.xml"/> <replacefilter token="<geotools.version>8-SNAPSHOT</geotools.version>" - value="<geotools.version>@VERSION@</geotools.version>"/> + value="<geotools.version>8.0-RC2</geotools.version>"/> </replace> <replace dir="../docs/"> <include name="pom.xml"/> <replacefilter token="8-SNAPSHOT" - value="@VERSION@"/> + value="8.0-RC2"/> </replace> </target> <target name="readme"> <replace file="../README.html"> <replacefilter token="@RELEASE@" - value="@VERSION@"/> + value="8.0-RC2"/> <replacefilter token="@DATE@" value="@RELEASE_DATE@"/> </replace> Modified: tags/8.0-RC2/docs/pom.xml =================================================================== --- tags/8.0-RC2/docs/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/docs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>geotools</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema-example/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema-packages/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/app-schema/app-schema-resolver/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/app-schema/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/app-schema/sample-data-access/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <artifactId>app-schema</artifactId> <groupId>org.geotools</groupId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/extension/brewer/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/brewer/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/brewer/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/graph/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/graph/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/graph/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/validation/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/validation/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/validation/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/wms/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/wms/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/wms/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>extension</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-core/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-fes/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-filter/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-gml2/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-gml3/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-kml/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-ows/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> @@ -71,7 +71,7 @@ <dependency> <groupId>org.geotools.ogc</groupId> <artifactId>net.opengis.ows</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> <dependency> <groupId>org.geotools.xsd</groupId> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-sld/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wcs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wfs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wms/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml =================================================================== --- tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/extension/xsd/xsd-wps/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.xsd</groupId> <artifactId>xsd</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/library/api/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/api/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/api/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/coverage/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/coverage/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/coverage/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/cql/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/cql/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/cql/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/data/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/data/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/data/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/jdbc/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/jdbc/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/jdbc/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/main/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/main/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/main/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/metadata/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/metadata/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/metadata/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java =================================================================== --- tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2012-06-27 02:57:30 UTC (rev 38836) @@ -96,7 +96,7 @@ /** * The current GeoTools version. The separator character must be the dot. */ - private static final Version VERSION = new Version(PROPS.getProperty("version", "8-SNAPSHOT")); + private static final Version VERSION = new Version(PROPS.getProperty("version", "8.0-RC2")); /** * The version control (svn) revision at which this version of geotools was built. Modified: tags/8.0-RC2/modules/library/opengis/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/opengis/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/opengis/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/referencing/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/referencing/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/referencing/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/render/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/render/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/render/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/sample-data/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/sample-data/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/sample-data/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/library/xml/pom.xml =================================================================== --- tags/8.0-RC2/modules/library/xml/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/library/xml/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>library</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/net.opengis.fes/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/net.opengis.ows/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> @@ -28,7 +28,7 @@ <dependency> <groupId>org.geotools.ogc</groupId> <artifactId>org.w3.xlink</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> </dependencies> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/net.opengis.wcs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/net.opengis.wfs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/net.opengis.wfsv/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> @@ -28,7 +28,7 @@ <dependency> <groupId>org.geotools.ogc</groupId> <artifactId>net.opengis.wfs</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> </dependencies> Modified: tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/net.opengis.wps/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/org.w3.xlink/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>ogc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools.ogc</groupId> Modified: tags/8.0-RC2/modules/ogc/pom.xml =================================================================== --- tags/8.0-RC2/modules/ogc/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/ogc/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,7 +5,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/plugin/arcgrid/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcgrid/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/arcgrid/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/arcsde/common/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>arcsde-plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/arcsde/datastore/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>arcsde-plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/arcsde/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -13,7 +13,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/arcsde/sde-dummy/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>arcsde-plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/charts/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/charts/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/charts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/epsg-extension/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/epsg-hsql/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/epsg-postgresql/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/epsg-wkt/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/feature-pregeneralized/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/geotiff/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/geotiff/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/geotiff/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/grassraster/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/grassraster/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/grassraster/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/gtopo30/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/gtopo30/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/gtopo30/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/image/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/image/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/image/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/imageio-ext-gdal/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/imagemosaic/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/imagemosaic-jdbc/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/imagepyramid/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!--properties> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-db2/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-h2/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-mysql/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-oracle/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-postgis/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-spatialite/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-sqlserver/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/jdbc-teradata/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools.jdbc</groupId> <artifactId>gt-jdbc</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jdbc/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jdbc/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jdbc/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/jp2k/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/jp2k/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/jp2k/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -15,7 +15,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>modules</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/plugin/property/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/property/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/property/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/referencing3D/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/referencing3D/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/referencing3D/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/shapefile/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/shapefile/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/shapefile/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/plugin/svg/pom.xml =================================================================== --- tags/8.0-RC2/modules/plugin/svg/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/plugin/svg/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>plugin</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/pom.xml =================================================================== --- tags/8.0-RC2/modules/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>geotools</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/unsupported/app-schema/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/app-schema/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/app-schema/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>unsupported</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/unsupported/app-schema/webservice/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/app-schema/webservice/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/app-schema/webservice/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -7,7 +7,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>app-schema-unsupported</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> Modified: tags/8.0-RC2/modules/unsupported/caching/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/caching/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/caching/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>unsupported</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/unsupported/couchdb/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/couchdb/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/couchdb/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -5,12 +5,12 @@ <parent> <artifactId>unsupported</artifactId> <groupId>org.geotools</groupId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <groupId>org.geotools</groupId> <artifactId>gt-couchdb</artifactId> <packaging>jar</packaging> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> <name>Couchdb Data Store</name> <url>http://maven.apache.org</url> <description>CouchDB DataStore</description> @@ -28,7 +28,7 @@ <dependency> <groupId>org.geotools</groupId> <artifactId>gt-geojson</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> Modified: tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-api/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-api/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-api/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -16,7 +16,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>gt-coverage-experiment</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-core/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-core/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/coverage-experiment/coverage-core/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -12,7 +12,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>gt-coverage-experiment</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> Modified: tags/8.0-RC2/modules/unsupported/coverage-experiment/grib1/pom.xml =================================================================== --- tags/8.0-RC2/modules/unsupported/coverage-experiment/grib1/pom.xml 2012-06-27 02:28:15 UTC (rev 38835) +++ tags/8.0-RC2/modules/unsupported/coverage-experiment/grib1/pom.xml 2012-06-27 02:57:30 UTC (rev 38836) @@ -12,7 +12,7 @@ <parent> <groupId>org.geotools</groupId> <artifactId>gt-coverage-experiment</artifactId> - <version>8-SNAPSHOT</version> + <version>8.0-RC2</version> </parent> <!-- =========================================================== --> Modified: tags/8.0-RC2/modules/unsupported/coverage-... [truncated message content] |
|
From: <svn...@os...> - 2012-06-27 02:28:21
|
Author: victortey Date: 2012-06-26 19:28:15 -0700 (Tue, 26 Jun 2012) New Revision: 38835 Added: tags/8.0-RC2/ Log: tagging 8.0-RC2 Property changes on: tags/8.0-RC2 ___________________________________________________________________ Added: svn:ignore + .project .settings .classpath .jetproperties .wtpmodules target bin cobertura.ser nbproject nbactions.xml target.list .featurelock.patch.swp Added: svn:mergeinfo + /branches/simple-features:35278-35308 |
|
From: <svn...@os...> - 2012-06-26 16:58:41
|
Author: jdeolive Date: 2012-06-26 09:58:34 -0700 (Tue, 26 Jun 2012) New Revision: 38834 Modified: trunk/build/release/build_release.sh Log: building release with process profile Modified: trunk/build/release/build_release.sh =================================================================== --- trunk/build/release/build_release.sh 2012-06-25 16:29:25 UTC (rev 38833) +++ trunk/build/release/build_release.sh 2012-06-26 16:58:34 UTC (rev 38834) @@ -143,7 +143,7 @@ if [ -z $SKIP_BUILD ]; then echo "building release" #mvn $MAVEN_FLAGS -Dall clean - mvn $MAVEN_FLAGS -DskipTests clean install + mvn $MAVEN_FLAGS -DskipTests -P process clean install mvn $MAVEN_FLAGS -DskipTests assembly:assembly fi |
|
From: <svn...@os...> - 2012-06-25 16:29:32
|
Author: jive
Date: 2012-06-25 09:29:25 -0700 (Mon, 25 Jun 2012)
New Revision: 38833
Modified:
trunk/docs/user/tutorial/advanced/function.rst
Log:
A note about volitile function with an example of generating a random color
Modified: trunk/docs/user/tutorial/advanced/function.rst
===================================================================
--- trunk/docs/user/tutorial/advanced/function.rst 2012-06-24 14:42:11 UTC (rev 38832)
+++ trunk/docs/user/tutorial/advanced/function.rst 2012-06-25 16:29:25 UTC (rev 38833)
@@ -55,8 +55,8 @@
^^^^^^^^^^^^^
* Create a quick test case to show that the above function is available using::
-
- FunctionFactory ff = CommonFactoryFinder.getFactoryFinder( null );
+
+ FunctionFactory ff = CommonFactoryFinder.getFactoryFinder();
Expression expr = ff.function( "snap", ff.property("the_geom"), ff.literal( lines ) );
* The function should be very slow as written (when called to snap thousands of points).
@@ -71,6 +71,47 @@
GeoTools does provide a couple Abstract classes you can extend when defining your own functions.
Have a look **FunctionImpl** and see if you find it easier then just starting from scratch.
+* Functions are used to process their parameters and produce an answer::
+
+ public Object evaluate(Object feature) {
+ Expression geomExpression = parameters.get(0);
+ Geometry geom = geomExpression.evaulate( feature, Geometry.class );
+
+ return geom.centroid();
+ }
+
+ When a function is used as part of a Style users often want to calculate a value based
+ on the attributes of the Feature being drawn. The Expression PropertyName is used in this
+ fashion to extract values out of a Feature and pass them into the function for evaluation
+
+ **IMPORTANT**: When using your function with a Style we try and be efficient. If the style
+ calls your function without any reference to PropertyName it will only be called once.
+ The assumption is that the function will produce the same value each time it is called, and
+ thus will produce the same value for all features. By only calling the function once (and
+ remembering the result) the rendering engine is able to perform much faster.
+
+ If this is not the functionality you are after please implement **VolatileFunction**::
+
+ public class MagicFunction extends FunctionExpressionImpl implements VolatileFunction {
+ Random random;
+ public MagicFunction() {
+ super("magic");
+ random = new Random();
+ }
+ public int getArgCount() {
+ return 0; // no arguments!
+ }
+ public Object evaluate(Object feature) {
+ float r = rand.nextFloat();
+ float g = rand.nextFloat();
+ float b = rand.nextFloat();
+
+ Color color = new Color(r, g, b);
+
+ return color;
+ }
+ }
+
Function
^^^^^^^^
|
|
From: <svn...@os...> - 2012-06-24 14:42:18
|
Author: jive
Date: 2012-06-24 07:42:11 -0700 (Sun, 24 Jun 2012)
New Revision: 38832
Modified:
trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java
Log:
Update javadocs with an example using FeatureIterator and remove some notes for future GeoTools 2.2 plans.
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java
===================================================================
--- trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java 2012-06-24 14:41:56 UTC (rev 38831)
+++ trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java 2012-06-24 14:42:11 UTC (rev 38832)
@@ -20,10 +20,10 @@
import java.util.Collection;
import java.util.Iterator;
+import org.geotools.data.FeatureSource;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureVisitor;
-import org.opengis.feature.type.AttributeDescriptor;
import org.opengis.feature.type.FeatureType;
import org.opengis.filter.Filter;
import org.opengis.filter.sort.SortBy;
@@ -31,40 +31,39 @@
/**
- * Represents a collection of features.
+ * Collection of features, often handled as a result set.
* <p>
- * Implementations (and client code) should adhere to the rules set forth
- * by java.util.Collection. That is, some methods are
- * optional to implement, and may throw an UnsupportedOperationException.
+ * Where possible FeatureCollection is method compatible with {@link Collection}.
+ * In keeping with the rules set for by {@link Collection}, some methods are
+ * optional, and may throw an UnsupportedOperationException.
* </p>
* <p>
* SimpleFeatureCollection house rules:
* <ul>
- * <li>FeatureCollection.close( iterator ) must be called (see example below)
- * <li>Features are not specifically ordered within the SimpleFeatureCollection (see FeatureList)
- * <li>Two instances cannot exist with the same Feature ID (Feature contract)
- * <li>(unsure) the same Instance can be in the collection more then once
+ * <li>Each iterator is considered a connection which my be closed (see example below)</li>
+ * <li>Features are not specifically ordered within the SimpleFeatureCollection</li>
+ * <li>Two instances cannot exist with the same {@link FeatureId}</li>
* </ul>
- * In programmer speak a SimpleFeatureCollection is a "Bag" with an index based ID.
* </p>
* <p>
- * <h3>Life Cycle of Iterator</h3>
+ * <h3>FeatureIterator close</h3>
* <p>
- * We have also adopted an additional constraint on the use of iterator.
- * You must call FeatureCollection.close( iterator ) to allow FeatureCollection
- * to clean up any operating system resources used to acces information.
+ * FeatureCollection provides streaming access. With this in mind we have
+ * a restriction on the use of {@link FeatureIterator}: You must call
+ * {@link FeatureIterator#close()}. This allows FeatureCollection
+ * to clean up any operating system resources used to access information.
* </p>
* <p>
* Example (safe) use:<pre><code>
- * Iterator iterator = collection.iterator();
+ * FeatureIterator iterator = collection.features();
* try {
- * for( Iterator i=collection.iterator(); i.hasNext();){
- * Feature feature = (Feature) i.hasNext();
+ * while( iterator.hasNext() ){
+ * Feature feature = iterator.hasNext();
* System.out.println( feature.getID() );
* }
* }
* finally {
- * collection.close( iterator );
+ * iterator.close();
* }
* </code></pre>
* </p>
@@ -73,31 +72,26 @@
* to release resources at when the iterator has reached the end of its contents
* this is not something you should rely on.
* </p>
- * <h2>Notes for SimpleFeatureCollection Implementors</h2>
+ * <h2>FeatureCollection Implementation Tips</h2>
* <p>
- * Many users will be treating this as a straight forward Collection,
- * there code will break often enough due to latency - try and close
- * up resources for them when you can detect that an Iterator is not
- * useful anymore.
+ * Try and close up resources when you can detect that an Iterator is no
+ * longer in use.
* </p>
* <p>
- * Collections are used in two fashions, basically as you see them,
- * and also as "range" for common opperations. You can see this with
- * List.subCollection( Filter ). Existing RnD effort is
- * going towards supporting this kind of use at the FeatureCollection
- * level.
+ * FeatureCollection is used in two fashions, as a result set, where each iterator acts
+ * as a cursor over the content. Also as a predefined query which can be refined
+ * further. An example is using featureCollection.subCollection( Filter ) or
+ * featureCollection.sort( SortBy ) before listing features out of a FeatureCollection.
* </p>
*
- * @see java.util.Collection, org.geotools.Feature
+ * @see org.geotools.Feature
* @author Ian Turton, CCG
* @author Rob Hranac, VFNY
* @author Ian Schneider, USDA-ARS
* @author Jody Garnett, Refractions Research, Inc.
*
- *
* @source $URL$
* @version $Id$
- *
*/
public interface FeatureCollection<T extends FeatureType, F extends Feature> {
/**
@@ -204,87 +198,25 @@
void removeListener(CollectionListener listener) throws NullPointerException;
/**
- * Gets a reference to the type of this feature collection.
+ * The schema for the child feature members of this collection.
* <p>
- * There are several limitations on the use of FeatureType with respect to a FeatureCollection.
- * </p>
- * <p>
- * GML 3.x: all FeatureCollections decend from gml:AbstractFeatureCollectionType:
+ * Represents the most general FeatureType in common to all the features in this
+ * collection.
* <ul>
- * <li>featureMember 0..* allows _Feature or xlink:ref
- * <li>featureMembers 0..1 contents treated as _Feature
- * </ul>
- * The contents defined in this manner is returned the collection
- * iterator() method.
- * </p>
- * <p>
- * GML 3.x: gml:AbstractFeatureCollectionType decends from gml:BoundedFeatureType:
- * <ul>
- * <li>metaDataProperty 0..*
- * <li>description 0..1
- * <li>name 0..*
- * <li>boundedBy 1..1 (required)
- * <li>location 0..1
- * </ul>
- * The value of the boundedBy attribute should be derived from the contents
- * of the collection.
- * </p>
- * <h3>Implementation Notes</h3>
- * <p>
- * There is a difference between getFeatureType() and getSchema(), getSchema is named
- * for historical reasons and reprensets the LCD FeatureType that best represents the
- * contents of this collection.
- * <ul>
- * <li>The degenerate case returns the "_Feature" FeatureType, where the
- * onlything known is that the contents are Features.
- * <li>For a collection backed by a shapefiles (or database tables) the
- * FeatureType returned by getSchema() will complete describe each and every child in the collection.
- * <li>For mixed content FeatureCollections you will need to check the FeatureType
- * of each Feature as it is retrived from the collection
- * </ul>
- * </p>
- *
- * @return A reference to this collections type
- */
-
- //FeatureType getFeatureType();
-
- /**
- * The schema for the child features of this collection.
- * <p>
- * There is a difference between getFeatureType() and getSchema()represents the LCD
- * FeatureType that best represents the contents of this collection.
- * <ul>
- * <li>The degenerate case returns the "_Feature" FeatureType, where the
- * onlything known is that the contents are Features.
* <li>For a collection backed by a shapefiles (or database tables) the FeatureType returned by getSchema() will
* complete describe each and every child in the collection.
* <li>For mixed content FeatureCollections you will need to check the FeatureType of each Feature as it
* is retrived from the collection
+ * <li>The degenerate case returns the "_Feature" FeatureType, where the
+ * only thing known is that the contents are Features.
* </ul>
* </p>
- * <p>
- * The method getSchema() is named for compatability with the geotools 2.0 API. In the
- * Geotools 2.2 time frame we should be able to replace this method with a careful check
- * of getFeatureType() and its attributes.
- * </p>
* @return FeatureType describing the "common" schema to all child features of this collection
*/
T getSchema();
- /**
- * The type for feature members of this FeatureCollection.
- */
- // T getType();
/**
- * The feature member AttributeDescriptor.
- *
- * @return
- */
- // AttributeDescriptor getDescriptor();
-
- /**
* ID used when serializing to GML
*/
String getID();
|
|
From: <svn...@os...> - 2012-06-24 14:42:02
|
Author: jive
Date: 2012-06-24 07:41:56 -0700 (Sun, 24 Jun 2012)
New Revision: 38831
Modified:
trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java
Log:
depreacte CollectionListener methods
Modified: trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java
===================================================================
--- trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java 2012-06-24 14:41:39 UTC (rev 38830)
+++ trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java 2012-06-24 14:41:56 UTC (rev 38831)
@@ -190,6 +190,7 @@
*
* @param listener The listener to add
* @throws NullPointerException If the listener is null.
+ * @deprecated Use {@link FeatureSource#addFeatureListener} to monitor change
*/
void addListener(CollectionListener listener) throws NullPointerException;
@@ -198,6 +199,7 @@
*
* @param listener The listener to remove
* @throws NullPointerException If the listener is null.
+ * @deprecated Use {@link FeatureSource#removeFeatureListener} to monitor change
*/
void removeListener(CollectionListener listener) throws NullPointerException;
|
|
From: <svn...@os...> - 2012-06-24 14:41:46
|
Author: jive
Date: 2012-06-24 07:41:39 -0700 (Sun, 24 Jun 2012)
New Revision: 38830
Modified:
trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java
Log:
Deprecate feature collection methods that assume an in memory model as per GEOT-4181
Modified: trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java
===================================================================
--- trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java 2012-06-24 09:31:02 UTC (rev 38829)
+++ trunk/modules/library/api/src/main/java/org/geotools/feature/FeatureCollection.java 2012-06-24 14:41:39 UTC (rev 38830)
@@ -23,6 +23,7 @@
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureVisitor;
+import org.opengis.feature.type.AttributeDescriptor;
import org.opengis.feature.type.FeatureType;
import org.opengis.filter.Filter;
import org.opengis.filter.sort.SortBy;
@@ -269,7 +270,21 @@
*/
T getSchema();
- /** ID used when serializing to GML */
+ /**
+ * The type for feature members of this FeatureCollection.
+ */
+ // T getType();
+
+ /**
+ * The feature member AttributeDescriptor.
+ *
+ * @return
+ */
+ // AttributeDescriptor getDescriptor();
+
+ /**
+ * ID used when serializing to GML
+ */
String getID();
/**
@@ -320,9 +335,12 @@
public FeatureCollection<T, F> subCollection(Filter filter);
/**
- * collection.subCollection( myFilter ).sort( {"foo","bar"} );
- * collection.subCollection( myFilter ).sort( "bar" ).sort("foo")
- * @param order
+ * Obtained sorted contents.
+ * <p>
+ * This method may not be supported by all implementations, consider
+ * the use of FeatureSource.features( Query ).
+ *
+ * @param order Sort order
* @return FeatureCollection sorted in the indicated order
*/
public FeatureCollection<T, F> sort(SortBy order);
@@ -364,7 +382,7 @@
* </code></pre>
* </p>
* @return Iterator
- * @deprecated Please use features() to obtain a FeatureIterator
+ * @deprecated Please use features() to obtain a closable FeatureIterator
*/
public Iterator<F> iterator();
@@ -391,6 +409,7 @@
*
* @return true of the element was added
* @see java.util.Collection#add(Object)
+ * @deprecated Assumes modification Collection in memory - use FeatureSource
*/
boolean add(F obj);
@@ -399,13 +418,20 @@
* <p>
* This method is often not implemented for collections produced as the results of a query.
* @see java.util.Collection#addAll(Collection)
+ * @deprecated Assumes modification Collection in memory - use FeatureSource
*/
boolean addAll(Collection<? extends F> collection);
- /** @see #addAll(Collection) */
+ /**
+ * @see #addAll(Collection)
+ * @deprecated Assume modification Collection in memory - use FeatureSource
+ */
boolean addAll(FeatureCollection<? extends T,? extends F> resource);
- /** @see java.util.Collection#clear() */
+ /**
+ * @see java.util.Collection#clear()
+ * @deprecated Assumes modification Collection in memory - use FeatureSource
+ */
void clear();
/**
@@ -421,16 +447,27 @@
/** @see java.util.Collection#isEmpty() */
boolean isEmpty();
- /** @see java.util.Collection#remove(Object) */
+ /**
+ * @see java.util.Collection#remove(Object)
+ * @deprecated Assumes modification Collection in memory - use FeatureSource
+ */
boolean remove(Object o);
- /** @see java.util.Collection#removeAll(Collection) */
+ /**
+ * @see java.util.Collection#removeAll(Collection)
+ * @deprecated Assumes modification Collection in memory - use FeatureSource
+ */
public boolean removeAll(Collection<?> c);
- /** @see java.util.Collection#retainAll(Collection) */
+ /**
+ * @see java.util.Collection#retainAll(Collection)
+ * @deprecated Assumes modification Collection in memory - use FeatureSource
+ */
public boolean retainAll(Collection<?> c);
-
+
/**
+ * Please note this operation may be expensive when working with remote content.
+ *
* @see java.util.Collection#size()
*/
int size();
|
|
From: <svn...@os...> - 2012-06-24 09:31:11
|
Author: aaime
Date: 2012-06-24 02:31:02 -0700 (Sun, 24 Jun 2012)
New Revision: 38829
Modified:
trunk/modules/library/main/src/main/java/org/geotools/filter/function/ClassificationFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_AverageFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_CountFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MaxFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MedianFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MinFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_SumFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_UniqueFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/EqualIntervalFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_pointN.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relate.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relatePattern.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_roundDouble.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_setCRS.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startAngle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startPoint.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strCapitalize.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strConcat.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEndsWith.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEqualsIgnoreCase.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strIndexOf.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLastIndexOf.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLength.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strMatches.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strPosition.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strReplace.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strStartsWith.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strToUpperCase.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim2.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_symDifference.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_toWKT.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_touches.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_union.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_vertices.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_within.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/IDFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/JenksNaturalBreaksFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/QuantileFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/StandardDeviationFunction.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/UniqueIntervalFunction.java
Log:
Second part of the function name QA
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/ClassificationFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/ClassificationFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/ClassificationFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -49,8 +49,7 @@
protected static final java.util.logging.Logger LOGGER = org.geotools.util.logging.Logging.getLogger("org.geotools.filter.function");
- /** function name **/
- String name;
+ FunctionName name;
/** function params **/
List params = new ArrayList(2);
@@ -59,15 +58,14 @@
ProgressListener progress;
- /** Creates a new instance of ClassificationFunction. Subclasses should call setName */
- public ClassificationFunction() {
- setName("ClassificationFunction");
- params.add(0, null);
- params.add(1, null);
+ public ClassificationFunction(FunctionName name) {
+ this.name = name;
this.expressionType = ExpressionType.FUNCTION;
}
- public abstract int getArgCount();
+ public int getArgCount() {
+ return name.getArgumentNames().size();
+ }
/**
* @see org.opengis.filter.expression.Expression#accept(ExpressionVisitor, Object)
@@ -116,17 +114,12 @@
*
*/
public String getName() {
- return name;
+ return name.getName();
}
+
public FunctionName getFunctionName() {
- return new FunctionNameImpl( getName(), getArgCount() );
+ return name;
}
- /**
- * Sets the name of the function.
- */
- public void setName(String name) {
- this.name = name;
- }
/**
* Returns the function parameters (the contents are Expressions, usually attribute expression and literal expression).
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_AverageFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_AverageFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_AverageFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -56,10 +56,9 @@
Object average = null;
Expression expr;
- //public static FunctionName NAME = new FunctionNameImpl("Collection_Average","expression");
public static FunctionName NAME = new FunctionNameImpl("Collection_Average",
- parameter("average",Object.class),
- parameter("expression",Object.class));
+ parameter("average", Number.class),
+ parameter("expression", Number.class));
/**
* Creates a new instance of Collection_AverageFunction
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_CountFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_CountFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_CountFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -18,10 +18,9 @@
*/
package org.geotools.filter.function;
-import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
import java.io.IOException;
-import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -51,10 +50,8 @@
Object count = null;
- // public static FunctionName NAME = new FunctionNameImpl("Collection_Count","expression");
public static FunctionName NAME = new FunctionNameImpl("Collection_Count",
- parameter( "count", Object.class),
- parameter("expression", Object.class));
+ parameter("count", Object.class));
/**
* Creates a new instance of Collection_CountFunction
@@ -63,10 +60,6 @@
super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
/**
* Calculate count (using FeatureCalc) - only one parameter is used.
*
@@ -85,33 +78,6 @@
return countVisitor.getResult();
}
- /**
- * The provided arguments are evaulated with respect to the
- * FeatureCollection.
- *
- * <p>
- * For an aggregate function (like count) please use the WFS mandated XPath
- * syntax to refer to featureMember content.
- * </p>
- *
- * <p>
- * To refer to all 'X': <code>featureMember/asterisk/X</code>
- * </p>
- *
- * @param args
- * DOCUMENT ME!
- *
- * @throws IllegalArgumentException
- * DOCUMENT ME!
- */
- public void setParameters(List args) {
- // if we see "featureMembers/*/ATTRIBUTE" change to "ATTRIBUTE"
- org.opengis.filter.expression.Expression expr = (org.opengis.filter.expression.Expression) args.get(0);
- expr = (org.opengis.filter.expression.Expression) expr.accept(new CollectionFeatureMemberFilterVisitor(),null);
- args.set(0, expr );
- super.setParameters(args);
- }
-
public Object evaluate(Object feature) {
if (feature == null) {
return new Integer(0); // no features were visited in the making of this answer
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MaxFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MaxFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MaxFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -56,8 +56,8 @@
//public static FunctionName NAME = new FunctionNameImpl("Collection_Max","value");
public static FunctionName NAME = new FunctionNameImpl("Collection_Max",
- parameter("max", Object.class),
- parameter("expression", Object.class));
+ parameter("max", Comparable.class),
+ parameter("expression", Comparable.class));
/**
* Creates a new instance of Collection_MaxFunction
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MedianFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MedianFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MedianFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -58,8 +58,8 @@
//public static FunctionName NAME = new FunctionNameImpl("Collection_Median","value");
public static FunctionName NAME = new FunctionNameImpl("Collection_Median",
- parameter("median", Object.class),
- parameter("expression", Object.class));
+ parameter("median", Comparable.class),
+ parameter("expression", Comparable.class));
/**
* Creates a new instance of Collection_MedianFunction
*/
@@ -67,10 +67,6 @@
super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
/**
* Calculate median (using FeatureCalc) - only one parameter is used.
*
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MinFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MinFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_MinFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -54,8 +54,8 @@
//public static FunctionName NAME = new FunctionNameImpl("Collection_Min","expression");
public static FunctionName NAME = new FunctionNameImpl("Collection_Min",
- parameter("min", Object.class),
- parameter("expression", Object.class));
+ parameter("min", Comparable.class),
+ parameter("expression", Comparable.class));
/**
* Creates a new instance of Collection_MinFunction
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_SumFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_SumFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_SumFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -55,8 +55,8 @@
//public static FunctionName NAME = new FunctionNameImpl("Collection_Sum","expression");
public static FunctionName NAME = new FunctionNameImpl("Collection_Sum",
- parameter("sum", Object.class),
- parameter("expression", Object.class));
+ parameter("sum", Number.class),
+ parameter("expression", Number.class));
/**
* Creates a new instance of Collection_SumFunction
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_UniqueFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_UniqueFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/Collection_UniqueFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -53,9 +53,8 @@
SimpleFeatureCollection previousFeatureCollection = null;
Object unique = null;
- //public static FunctionName NAME = new FunctionNameImpl("Collection_Unique","expression");
public static FunctionName NAME = new FunctionNameImpl("Collection_Unique",
- parameter("unqiue", Object.class),
+ parameter("unique", Object.class),
parameter("expression", Object.class));
/**
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/EqualIntervalFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/EqualIntervalFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/EqualIntervalFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -17,6 +17,8 @@
*/
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@@ -28,7 +30,9 @@
import org.geotools.feature.visitor.MinVisitor;
import org.geotools.feature.visitor.UniqueVisitor;
import org.geotools.filter.IllegalFilterException;
+import org.geotools.filter.capability.FunctionNameImpl;
import org.geotools.util.NullProgressListener;
+import org.opengis.filter.capability.FunctionName;
/**
@@ -42,9 +46,14 @@
* @source $URL$
*/
public class EqualIntervalFunction extends ClassificationFunction {
+
+ public static FunctionName NAME = new FunctionNameImpl("EqualInterval",
+ RangedClassifier.class,
+ parameter("value", Double.class),
+ parameter("classes", Integer.class));
public EqualIntervalFunction() {
- setName("EqualInterval");
+ super(NAME);
}
private RangedClassifier calculate(SimpleFeatureCollection featureCollection) {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_pointN.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_pointN.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_pointN.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,14 @@
*/
public class FilterFunction_pointN extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("pointN", "geometry","index");
+ public static FunctionName NAME = new FunctionNameImpl("pointN", Geometry.class,
+ parameter("geometry", Geometry.class),
+ parameter("index", Integer.class));
public FilterFunction_pointN() {
- super("pointN");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
int arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relate.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relate.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relate.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,14 @@
*/
public class FilterFunction_relate extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("relate", "geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("relate", String.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_relate() {
- super("relate");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relatePattern.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relatePattern.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_relatePattern.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -32,7 +32,6 @@
* @source $URL$
*/
public class FilterFunction_relatePattern extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("relatePattern", "geometry","geometry","pattern");
public static FunctionName NAME = new FunctionNameImpl("relatePattern",
parameter("related", Boolean.class),
parameter("geometry", Geometry.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_roundDouble.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_roundDouble.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_roundDouble.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_roundDouble extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("roundDouble", "number");
public static FunctionName NAME = new FunctionNameImpl("roundDouble",
parameter("rounded", Double.class),
parameter("number", Number.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_setCRS.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_setCRS.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_setCRS.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -33,14 +33,9 @@
parameter("geometry", Geometry.class), parameter("CRS", String.class));
public FilterFunction_setCRS() {
- super("setSRS");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry geom;
CoordinateReferenceSystem crs;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startAngle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startAngle.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startAngle.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -33,7 +33,6 @@
* @source $URL$
*/
public class FilterFunction_startAngle extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("startAngle", "geometry");
public static FunctionName NAME = new FunctionNameImpl("startAngle",
parameter("degrees", Double.class),
parameter("linestring", LineString.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startPoint.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startPoint.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_startPoint.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -35,7 +35,6 @@
* @source $URL$
*/
public class FilterFunction_startPoint extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("startPoint","geometry");
public static FunctionName NAME = new FunctionNameImpl("startPoint",
parameter("point", Point.class),
parameter("linestring", LineString.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strCapitalize.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strCapitalize.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strCapitalize.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strCapitalize extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strCapitalize","string");
public static FunctionName NAME = new FunctionNameImpl("strCapitalize",
parameter("string", String.class),
parameter("string", String.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strConcat.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strConcat.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strConcat.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,11 +31,10 @@
*/
public class FilterFunction_strConcat extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strConcat","string","string");
public static FunctionName NAME = new FunctionNameImpl("strConcat",
- parameter("string", String.class),
- parameter("string", String.class),
- parameter("string", String.class));
+ parameter("strConcat", String.class),
+ parameter("string1", String.class),
+ parameter("string2", String.class));
public FilterFunction_strConcat() {
super(NAME);
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEndsWith.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEndsWith.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEndsWith.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strEndsWith extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strEndsWith","string","postfix");
public static FunctionName NAME = new FunctionNameImpl("strEndsWith",
parameter("endsWith", Boolean.class),
parameter("String", String.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEqualsIgnoreCase.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEqualsIgnoreCase.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strEqualsIgnoreCase.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,10 +31,9 @@
*/
public class FilterFunction_strEqualsIgnoreCase extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strEqualsIgnoreCase","string","string");
public static FunctionName NAME = new FunctionNameImpl("strEqualsIgnoreCase",
parameter("equals", Boolean.class),
- parameter("String", String.class),
+ parameter("string", String.class),
parameter("lookup", String.class));
public FilterFunction_strEqualsIgnoreCase() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strIndexOf.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strIndexOf.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strIndexOf.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strIndexOf extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strIndexOf","string","string");
public static FunctionName NAME = new FunctionNameImpl("strIndexOf",
parameter("index", Integer.class),
parameter("String", String.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLastIndexOf.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLastIndexOf.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLastIndexOf.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -30,7 +30,6 @@
* @source $URL$
*/
public class FilterFunction_strLastIndexOf extends FunctionExpressionImpl{
- //public static FunctionName NAME = new FunctionNameImpl("strLastIndexOf","string","string");
public static FunctionName NAME = new FunctionNameImpl("strLastIndexOf",
parameter("index", Integer.class),
parameter("String", String.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLength.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLength.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strLength.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -30,7 +30,7 @@
* @source $URL$
*/
public class FilterFunction_strLength extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strLength","string");
+
public static FunctionName NAME = new FunctionNameImpl("strLength",
parameter("length", Integer.class),
parameter("string", String.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strMatches.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strMatches.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strMatches.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strMatches extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strMatches","string","regex");
public static FunctionName NAME = new FunctionNameImpl("strMatches",
parameter("match", Boolean.class),
parameter("string", String.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strPosition.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strPosition.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strPosition.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -45,7 +45,6 @@
*/
public class FilterFunction_strPosition extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strPosition","string","lookup","forward/backToFront");
public static FunctionName NAME;
static {
Parameter<String> method = new Parameter<String>(
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strReplace.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strReplace.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strReplace.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strReplace extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strReplace","string","search","replace","all");
public static FunctionName NAME = new FunctionNameImpl("strReplace",
parameter("string", String.class),
parameter("string", String.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strStartsWith.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strStartsWith.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strStartsWith.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strStartsWith extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strStartsWith","string","prefix");
public static FunctionName NAME = new FunctionNameImpl("strStartsWith",
parameter("starts with", Boolean.class),
parameter("string", String.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strToUpperCase.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strToUpperCase.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strToUpperCase.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strToUpperCase extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strToUpperCase","string");
public static FunctionName NAME = new FunctionNameImpl("strToUpperCase",
parameter("uppercase", String.class),
parameter("string", String.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -31,7 +31,6 @@
*/
public class FilterFunction_strTrim extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strTrim","string");
public static FunctionName NAME = new FunctionNameImpl("strTrim",
parameter("trim", String.class),
parameter("string", String.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim2.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim2.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_strTrim2.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -45,7 +45,6 @@
*/
public class FilterFunction_strTrim2 extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("strTrim2","string","leading/trailing/both","character");
public static FunctionName NAME;
static {
Parameter<String> method = new Parameter<String>(
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_symDifference.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_symDifference.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_symDifference.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -33,7 +33,6 @@
*/
public class FilterFunction_symDifference extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("symDifference","geometry","geometry");
public static FunctionName NAME = new FunctionNameImpl("symDifference",
parameter("symetric difference", Geometry.class),
parameter("geometry", Geometry.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_toWKT.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_toWKT.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_toWKT.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -33,7 +33,6 @@
*/
public class FilterFunction_toWKT extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("toWKT","geometry");
public static FunctionName NAME = new FunctionNameImpl("toWKT",
parameter("wkt", String.class),
parameter("geometry", Geometry.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_touches.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_touches.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_touches.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -33,7 +33,6 @@
*/
public class FilterFunction_touches extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("touches","geometry","geometry");
public static FunctionName NAME = new FunctionNameImpl("touches",
parameter("touches", Boolean.class),
parameter("geometry", Geometry.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_union.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_union.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_union.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -35,7 +35,6 @@
public class FilterFunction_union extends FunctionExpressionImpl implements
FunctionExpression {
- //public static FunctionName NAME = new FunctionNameImpl("union","geometry","geometry");
public static FunctionName NAME = new FunctionNameImpl("union",
parameter("union", Geometry.class),
parameter("geometry", Geometry.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_vertices.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_vertices.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_vertices.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -22,7 +22,6 @@
*/
public class FilterFunction_vertices extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("vertices","geometry");
public static FunctionName NAME = new FunctionNameImpl("vertices",
parameter("vertices", MultiPoint.class),
parameter("geometry", Geometry.class));
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_within.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_within.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_within.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -33,7 +33,6 @@
*/
public class FilterFunction_within extends FunctionExpressionImpl {
- //public static FunctionName NAME = new FunctionNameImpl("within","geometry","geometry");
public static FunctionName NAME = new FunctionNameImpl("within",
parameter("within",Boolean.class),
parameter("geometry", Geometry.class),
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/IDFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/IDFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/IDFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -17,9 +17,13 @@
*/
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.feature.Attribute;
import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.filter.capability.FunctionName;
/**
* Allow access to the value of Feature.getID() as an expression
@@ -33,6 +37,9 @@
*/
public class IDFunction extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("id",
+ String.class);
+
public IDFunction() {
super("id");
}
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -166,9 +166,6 @@
* Make the instance of FunctionName available in
* a consistent spot.
*/
-// public static final FunctionName NAME = new FunctionNameImpl("Interpolate", "LookupValue",
-// "Data 1", "Value 1", "Data 2", "Value 2", "linear, cosine or cubic", "numeric or color");
-
public static final FunctionName NAME;
static {
Parameter<Object> lookup = new Parameter<Object>("lookup",Object.class,1,1);
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/JenksNaturalBreaksFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/JenksNaturalBreaksFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/JenksNaturalBreaksFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -17,6 +17,8 @@
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.logging.Level;
@@ -25,9 +27,14 @@
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureIterator;
import org.geotools.feature.FeatureCollection;
+import org.geotools.filter.capability.FunctionNameImpl;
import org.geotools.util.logging.Logging;
import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.filter.capability.FunctionName;
+import org.opengis.filter.expression.Expression;
+import com.vividsolutions.jts.geom.Geometry;
+
/**
* Calculate the Jenks' Natural Breaks classification for a featurecollection
*
@@ -40,27 +47,19 @@
org.opengis.util.ProgressListener progress;
private static final Logger logger = Logging.getLogger("org.geotools.filter.function");
+
+ public static FunctionName NAME = new FunctionNameImpl("Jenks",
+ RangedClassifier.class,
+ parameter("value", Double.class),
+ parameter("classes", Integer.class));
- /**
- *
- */
public JenksNaturalBreaksFunction() {
- setName("Jenks");
+ super(NAME);
}
/*
* (non-Javadoc)
*
- * @see org.geotools.filter.function.ClassificationFunction#getArgCount()
- */
- public int getArgCount() {
- // TODO Auto-generated method stub
- return 2;
- }
-
- /*
- * (non-Javadoc)
- *
* @see org.geotools.filter.function.ClassificationFunction#evaluate(java.lang.Object)
*/
public Object evaluate(Object feature) {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/QuantileFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/QuantileFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/QuantileFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -16,6 +16,8 @@
*/
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
@@ -27,7 +29,9 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.visitor.CalcResult;
import org.geotools.feature.visitor.QuantileListVisitor;
+import org.geotools.filter.capability.FunctionNameImpl;
import org.geotools.util.NullProgressListener;
+import org.opengis.filter.capability.FunctionName;
/**
* Breaks a SimpleFeatureCollection into classes with an equal number of items in each.
@@ -38,14 +42,15 @@
* @source $URL$
*/
public class QuantileFunction extends ClassificationFunction {
+
+ public static FunctionName NAME = new FunctionNameImpl("Quantile",
+ RangedClassifier.class,
+ parameter("value", Double.class),
+ parameter("classes", Integer.class));
public QuantileFunction() {
- setName("Quantile");
+ super(NAME);
}
-
- public int getArgCount() {
- return 2;
- }
private Object calculate(SimpleFeatureCollection featureCollection) {
// use a visitor to find the values in each bin
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/StandardDeviationFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/StandardDeviationFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/StandardDeviationFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -19,12 +19,14 @@
import java.io.IOException;
import java.util.logging.Level;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.visitor.AverageVisitor;
import org.geotools.feature.visitor.CalcResult;
import org.geotools.feature.visitor.StandardDeviationVisitor;
-import org.geotools.util.NullProgressListener;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
* Breaks a SimpleFeatureCollection into classes using the standard deviation classification method.
@@ -36,14 +38,15 @@
*/
public class StandardDeviationFunction extends ClassificationFunction {
- public int getArgCount() {
- return 2;
+ public static FunctionName NAME = new FunctionNameImpl("StandardDeviation",
+ RangedClassifier.class,
+ parameter("value", Double.class),
+ parameter("classes", Integer.class));
+
+ public StandardDeviationFunction() {
+ super(NAME);
}
- public StandardDeviationFunction() {
- setName("StandardDeviation");
- }
-
private Object calculate(SimpleFeatureCollection featureCollection) {
try {
int classNum = getClasses();
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/UniqueIntervalFunction.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/UniqueIntervalFunction.java 2012-06-24 07:54:52 UTC (rev 38828)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/UniqueIntervalFunction.java 2012-06-24 09:31:02 UTC (rev 38829)
@@ -16,6 +16,8 @@
*/
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
@@ -28,7 +30,9 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.visitor.CalcResult;
import org.geotools.feature.visitor.UniqueVisitor;
+import org.geotools.filter.capability.FunctionNameImpl;
import org.geotools.util.NullProgressListener;
+import org.opengis.filter.capability.FunctionName;
/**
@@ -41,8 +45,13 @@
*/
public class UniqueIntervalFunction extends ClassificationFunction {
+ public static FunctionName NAME = new FunctionNameImpl("UniqueInterval",
+ RangedClassifier.class,
+ parameter("value", Double.class),
+ parameter("classes", Integer.class));
+
public UniqueIntervalFunction() {
- setName("UniqueInterval");
+ super(NAME);
}
private Object calculate(SimpleFeatureCollection featureCollection) {
|
|
From: <svn...@os...> - 2012-06-24 07:54:59
|
Author: aaime
Date: 2012-06-24 00:54:52 -0700 (Sun, 24 Jun 2012)
New Revision: 38828
Modified:
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java
Log:
Fixing isNull function name
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java 2012-06-23 20:25:33 UTC (rev 38827)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java 2012-06-24 07:54:52 UTC (rev 38828)
@@ -32,8 +32,7 @@
public class FilterFunction_isNull extends FunctionExpressionImpl {
public static FunctionName NAME = new FunctionNameImpl("isNull", Boolean.class,
- parameter("object", Object.class),
- parameter("regex", String.class));
+ parameter("object", Object.class));
public FilterFunction_isNull() {
super(NAME);
|
|
From: <svn...@os...> - 2012-06-23 20:25:41
|
Author: aaime
Date: 2012-06-23 13:25:33 -0700 (Sat, 23 Jun 2012)
New Revision: 38827
Modified:
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java
Log:
Giving function name QA a good kick (but not done)
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +31,12 @@
*/
public class FilterFunction_int2bbool extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("int2bbool","int");
+ public static FunctionName NAME = new FunctionNameImpl("int2bbool", Boolean.class, parameter("int", Integer.class));
public FilterFunction_int2bbool() {
- super("int2bbool");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
int arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,9 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +32,12 @@
*/
public class FilterFunction_int2ddouble extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("int2ddouble","int");
+ public static FunctionName NAME = new FunctionNameImpl("int2ddouble", Double.class, parameter("int", Integer.class));
public FilterFunction_int2ddouble() {
- super("int2ddouble");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
int arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,11 +18,14 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Point;
/**
*
@@ -31,17 +34,12 @@
*/
public class FilterFunction_interiorPoint extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("interiorPoint","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("interiorPoint", Point.class, parameter("geometry", Geometry.class));
public FilterFunction_interiorPoint() {
- super("interiorPoint");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,11 +18,14 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LinearRing;
/**
*
@@ -31,17 +34,14 @@
*/
public class FilterFunction_interiorRingN extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("interiorRingN","geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("interiorRingN", LinearRing.class,
+ parameter("geometry", Geometry.class),
+ parameter("n", Integer.class));
public FilterFunction_interiorRingN() {
- super("interiorRingN");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
int arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,17 +32,14 @@
* @source $URL$
*/
public class FilterFunction_intersection extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("intersection","geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("intersection", Geometry.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_intersection() {
- super("intersection");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,14 @@
*/
public class FilterFunction_intersects extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("intersects","geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("intersects", Boolean.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_intersects() {
- super("intersects");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isClosed extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isClosed","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isClosed", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isClosed() {
- super("isClosed");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isEmpty extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isEmpty","geometry");
-
+ public static FunctionName NAME = new FunctionNameImpl("isEmpty", Boolean.class,
+ parameter("geometry", Geometry.class));
+
public FilterFunction_isEmpty() {
- super("isEmpty");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +31,14 @@
*/
public class FilterFunction_isLike extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isLike","string","regex");
+ public static FunctionName NAME = new FunctionNameImpl("isLike", Boolean.class,
+ parameter("string", String.class),
+ parameter("regex", String.class));
public FilterFunction_isLike() {
- super("isLike");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
String arg0;
String arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,7 +18,11 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
*
@@ -27,14 +31,14 @@
*/
public class FilterFunction_isNull extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("isNull", Boolean.class,
+ parameter("object", Object.class),
+ parameter("regex", String.class));
+
public FilterFunction_isNull() {
- super("isNull");
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isRing extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isRing", "geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isRing", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isRing() {
- super("isRing");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isSimple extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isSimple", "geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isSimple", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isSimple() {
- super("isSimple");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isValid extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isValid", "geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isValid", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isValid() {
- super("isValid");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,15 @@
*/
public class FilterFunction_isWithinDistance extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isWithinDistance", "geometry","geometry","distance");
+ public static FunctionName NAME = new FunctionNameImpl("isWithinDistance", Boolean.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class),
+ parameter("distance", Double.class));
public FilterFunction_isWithinDistance() {
- super("isWithinDistance");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 3;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -19,6 +19,8 @@
//this was autogenerated and then hand modified to implement better support for geometry
// transformations in SLD
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -45,17 +47,14 @@
public class FilterFunction_isometric extends FunctionExpressionImpl implements
GeometryTransformation {
- public static FunctionName NAME = new FunctionNameImpl("isometric", "geometry","extrusion");
+ public static FunctionName NAME = new FunctionNameImpl("isometric", Geometry.class,
+ parameter("geometry", Geometry.class),
+ parameter("extrusion", Double.class));
public FilterFunction_isometric() {
- super("isometric");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry geom = getExpression(0).evaluate(feature, Geometry.class);
Double extrusion = getExpression(1).evaluate(feature, Double.class);
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,22 +18,29 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
+import com.vividsolutions.jts.geom.Geometry;
+
/**
*
*
* @source $URL$
*/
public class FilterFunction_lessEqualThan extends FunctionExpressionImpl {
+
+ public static FunctionName NAME = new FunctionNameImpl("lessEqualThan", Boolean.class,
+ parameter("a", Number.class),
+ parameter("b", Number.class));
+
public FilterFunction_lessEqualThan() {
- super("lessEqualThan");
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Object arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,7 +18,11 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
*
@@ -27,14 +31,14 @@
*/
public class FilterFunction_lessThan extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("lessThan", Boolean.class,
+ parameter("a", Number.class),
+ parameter("b", Number.class));
+
public FilterFunction_lessThan() {
- super("lessThan");
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Object arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,8 +16,12 @@
* 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.filter.FunctionExpression;
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
@@ -27,23 +31,18 @@
*/
public class FilterFunction_minimumCircle extends FunctionExpressionImpl implements
FunctionExpression {
+
+ public static FunctionName NAME = new FunctionNameImpl("mincircle", Geometry.class,
+ parameter("geometry", Geometry.class));
/**
* Create a new FilterFunction_minimumCircle instance
*/
public FilterFunction_minimumCircle() {
- super("mincircle");
+ super(NAME);
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's minimum bounding circle.
* @param feature The feature should be a Geometry
* @return The minimum bounding circle Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,6 +16,8 @@
* 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 com.vividsolutions.jts.geom.Geometry;
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
@@ -29,12 +31,10 @@
*/
public class FilterFunction_minimumDiameter extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("minimumdiameter", Geometry.class,
+ parameter("geometry", Geometry.class));
+
/**
- * The FunctionName
- */
- public static FunctionName NAME = new FunctionNameImpl("minimumdiameter","geometry");
-
- /**
* Create a new FilterFunction_minimumDiameter instance
*/
public FilterFunction_minimumDiameter() {
@@ -42,15 +42,6 @@
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- @Override
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's minimum diameter.
* @param feature The feature should be a Geometry
* @return The minimum diameter Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,8 +16,12 @@
* 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.filter.FunctionExpression;
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
@@ -29,21 +33,19 @@
FunctionExpression {
/**
+ * The FunctionName
+ */
+ public static FunctionName NAME = new FunctionNameImpl("minrectangle", Geometry.class,
+ parameter("geometry", Geometry.class));
+
+ /**
* Create a new FilterFunction_minimumRectangle instance
*/
public FilterFunction_minimumRectangle() {
- super("minrectangle");
+ super(NAME);
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's minimum rectangle.
* @param feature The feature should be a Geometry
* @return The minimum rectangle Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,8 +18,14 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
+import com.vividsolutions.jts.geom.Geometry;
+
/**
*
*
@@ -27,14 +33,13 @@
*/
public class FilterFunction_not extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("not", Boolean.class,
+ parameter("logicValue", Boolean.class));
+
public FilterFunction_not() {
- super("not");
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
boolean arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,7 +18,11 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
*
@@ -26,14 +30,15 @@
* @source $URL$
*/
public class FilterFunction_notEqualTo extends FunctionExpressionImpl {
+
+ public static FunctionName NAME = new FunctionNameImpl("notEqualTo", Boolean.class,
+ parameter("a", Object.class),
+ parameter("b", Object.class));
+
public FilterFunction_notEqualTo() {
- super("notEqualTo");
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Object arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,10 +32,12 @@
* @source $URL$
*/
public class FilterFunction_numGeometries extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numGeometries","geometry");
+
+ public static FunctionName NAME = new FunctionNameImpl("numGeometries", Integer.class,
+ parameter("geometry", Geometry.class));
+
public FilterFunction_numGeometries() {
- super("numGeometries");
- functionName = NAME;
+ super(NAME);
}
public int getArgCount() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,17 +32,14 @@
* @source $URL$
*/
public class FilterFunction_numInteriorRing extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numInteriorRing","polygon");
+
+ public static FunctionName NAME = new FunctionNameImpl("numInteriorRing", Integer.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_numInteriorRing() {
- super("numInteriorRing");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,11 +32,12 @@
* @source $URL$
*/
public class FilterFunction_numPoints extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numPoints","geometry");
+
+ public static FunctionName NAME = new FunctionNameImpl("numInteriorRing", Integer.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_numPoints() {
- super("numPoints");
- functionName = NAME;
+ super(NAME);
}
public int getArgCount() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -17,6 +17,8 @@
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.text.DecimalFormat;
import org.geotools.filter.FunctionExpressionImpl;
@@ -34,18 +36,15 @@
* @source $URL$
*/
public class FilterFunction_numberFormat extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numberFormat","string","number");
+ public static FunctionName NAME = new FunctionNameImpl("numberFormat", String.class,
+ parameter("format", String.class),
+ parameter("number", Number.class));
+
public FilterFunction_numberFormat() {
- super("numberFormat");
- functionName = NAME;
+ super(NAME);
}
- @Override
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
String format;
Double number;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,6 +16,8 @@
*/
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
@@ -38,17 +40,18 @@
* @source $URL$
*/
public class FilterFunction_numberFormat2 extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numberFormat2","format","number","minus","decimal","seperator");
+
+ public static FunctionName NAME = new FunctionNameImpl("numberFormat2", String.class,
+ parameter("format", String.class),
+ parameter("number", Number.class),
+ parameter("minus", String.class),
+ parameter("decimal", String.class),
+ parameter("separator", String.class));
+
public FilterFunction_numberFormat2() {
- super("numberFormat2");
- functionName = NAME;
+ super(NAME);
}
- @Override
- public int getArgCount() {
- return 5;
- }
-
public Object evaluate(Object feature) {
String format;
Double number;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,6 +16,8 @@
* 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 com.vividsolutions.jts.geom.Geometry;
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
@@ -29,10 +31,8 @@
*/
public class FilterFunction_octagonalEnvelope extends FunctionExpressionImpl {
- /**
- * The FunctionName
- */
- public static FunctionName NAME = new FunctionNameImpl("octagonalenvelope","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("octagonalenvelope", Geometry.class,
+ parameter("geometry", Geometry.class));
/**
* Create a new FilterFunction_octagonalEnvelope instance
@@ -42,15 +42,6 @@
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- @Override
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's octagonal envelope.
* @param feature The feature should be a Geometry
* @return The octagonal envelope Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -19,6 +19,8 @@
//this was autogenerated and then hand modified to implement better support for geometry
// transformations in SLD
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.geotools.geometry.jts.ReferencedEnvelope;
@@ -36,11 +38,13 @@
public class FilterFunction_offset extends FunctionExpressionImpl implements
GeometryTransformation {
- public static FunctionName NAME = new FunctionNameImpl("offset","geometry","offsetX","offsetY");
+ public static FunctionName NAME = new FunctionNameImpl("offset", Geometry.class,
+ parameter("geometry", Geometry.class),
+ parameter("offsetX", Double.class),
+ parameter("offsetY", Double.class));
public FilterFunction_offset() {
- super("offset");
- functionName = NAME;
+ super(NAME);
}
public int getArgCount() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,14 @@
*/
public class FilterFunction_overlaps extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("overlaps","geometry","geometr");
+ public static FunctionName NAME = new FunctionNameImpl("overlaps", Geometry.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_overlaps() {
- super("overlaps");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -28,17 +30,14 @@
* @source $URL$
*/
public class FilterFunction_parseBoolean extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseBoolean", "string");
+
+ public static FunctionName NAME = new FunctionNameImpl("parseBoolean", Boolean.class,
+ parameter("string", String.class));
public FilterFunction_parseBoolean() {
- super("parseBoolean");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -28,17 +30,14 @@
* @source $URL$
*/
public class FilterFunction_parseDouble extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseDouble", "string");
+
+ public static FunctionName NAME = new FunctionNameImpl("parseDouble", Double.class,
+ parameter("string", String.class));
public FilterFunction_parseDouble() {
- super("parseDouble");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +31,13 @@
*/
public class FilterFunction_parseInt extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseInt", "string");
+ public static FunctionName NAME = new FunctionNameImpl("parseInt", Integer.class,
+ parameter("string", String.class));
public FilterFunction_parseInt() {
- super("parseInt");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -28,17 +30,14 @@
* @source $URL$
*/
public class FilterFunction_parseLong extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseLong", "string");
+
+ public static FunctionName NAME = new FunctionNameImpl("parseLong", Long.class,
+ parameter("string", String.class));
public FilterFunction_parseLong() {
- super("parseLong");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
|
|
From: <svn...@os...> - 2012-06-22 04:06:57
|
Author: victortey
Date: 2012-06-21 21:06:50 -0700 (Thu, 21 Jun 2012)
New Revision: 38826
Modified:
trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java
Log:
GEOT-3454: Geoserver app-schema: types that only have client properties attributes are always skipped : fixed online test build failure
Modified: trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java
===================================================================
--- trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java 2012-06-22 01:16:09 UTC (rev 38825)
+++ trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java 2012-06-22 04:06:50 UTC (rev 38826)
@@ -833,17 +833,12 @@
if (isLastStep) {
// reached the leaf
if (currStepDescriptor == null) {
- throw new IllegalArgumentException(currStep + " is not a valid location path for type "
- + _parentType.getName());
+ throw new IllegalArgumentException(currStep
+ + " is not a valid location path for type " + _parentType.getName());
}
- if (value == null && !currStepDescriptor.isNillable() && sourceExpression != null
- && !sourceExpression.equals(Expression.NIL)) {
- if (currStepDescriptor.getMinOccurs() == 0) {
- return null;
- }
- }
- return setLeafAttribute(currStepDescriptor, currStep, id, value,
- parent, targetNodeType, isXlinkRef);
+
+ return setLeafAttribute(currStepDescriptor, currStep, id, value, parent,
+ targetNodeType, isXlinkRef);
} else {
// parent = appendComplexProperty(parent, currStep,
// currStepDescriptor);
|
|
From: <svn...@os...> - 2012-06-22 01:16:16
|
Author: jdeolive
Date: 2012-06-21 18:16:09 -0700 (Thu, 21 Jun 2012)
New Revision: 38825
Modified:
trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java
Log:
GEOT-4179, excluding postgis 2.0 extra metadata tables
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java 2012-06-21 03:38:39 UTC (rev 38824)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java 2012-06-22 01:16:09 UTC (rev 38825)
@@ -155,8 +155,15 @@
return false;
} else if (tableName.equals("geography_columns")) {
return false;
+ } else if (tableName.equals("raster_columns")) {
+ return false;
+ } else if (tableName.equals("raster_overviews")) {
+ return false;
}
+ if (schemaName != null && schemaName.equals("topology")) {
+ return false;
+ }
// others?
return true;
}
|
|
From: <svn...@os...> - 2012-06-21 03:38:46
|
Author: mbedward
Date: 2012-06-20 20:38:39 -0700 (Wed, 20 Jun 2012)
New Revision: 38824
Modified:
trunk/modules/library/render/src/main/java/org/geotools/map/MapContent.java
Log:
minor javadoc edit
Modified: trunk/modules/library/render/src/main/java/org/geotools/map/MapContent.java
===================================================================
--- trunk/modules/library/render/src/main/java/org/geotools/map/MapContent.java 2012-06-21 01:43:21 UTC (rev 38823)
+++ trunk/modules/library/render/src/main/java/org/geotools/map/MapContent.java 2012-06-21 03:38:39 UTC (rev 38824)
@@ -671,8 +671,7 @@
}
/**
- * Sets the viewport for this map content and returns the previously
- * set one (which may be {@code null}). The {@code viewport} argument may
+ * Sets the viewport for this map content. The {@code viewport} argument may
* be {@code null}, in which case a subsequent to {@linkplain #getViewport()}
* will return a new instance with default settings.
*
|
|
From: <svn...@os...> - 2012-06-21 01:43:27
|
Author: jive
Date: 2012-06-20 18:43:21 -0700 (Wed, 20 Jun 2012)
New Revision: 38823
Modified:
trunk/docs/user/library/data/featuresource.rst
Log:
update code examples for FeatureStore addFeature
Modified: trunk/docs/user/library/data/featuresource.rst
===================================================================
--- trunk/docs/user/library/data/featuresource.rst 2012-06-21 01:43:08 UTC (rev 38822)
+++ trunk/docs/user/library/data/featuresource.rst 2012-06-21 01:43:21 UTC (rev 38823)
@@ -157,26 +157,13 @@
Adding Data
'''''''''''
-Adding features can be done in the following manner.::
-
- Transaction transaction = new Transaction("Example1");
- SimpleFeatureStore store = (SimpleFeatureStore) dataStore.getFeatureSource( typeName );
- store.setTransaction( transaction );
-
- SimpleFeatureType featureType = store.getFeatureType();
-
- SimpleFeatureCollection collection = FeatureCollections.newInstance();
- collection.add( featureType.create( new Object[]{ geom1, "hello" } ) );
- collection.add( featureType.create( new Object[]{ geom2, "hello" } ) );
-
- try {
- store.addFeatures( collection );
- transaction.commit(); // actually writes out the features in one go
- }
- catch( Exception eek){
- transaction.rollback();
- }
+Adding features can be done in the following manner.:
+.. literalinclude:: /../src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java
+ :language: java
+ :start-after: // addExample start
+ :end-before: // addExample end
+
Hints:
* If addFeatures is really slow you probably forgot to use a Transaction!
@@ -201,8 +188,8 @@
.. literalinclude:: /../src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java
:language: java
- :start-after: // addExample start
- :end-before: // addExample end
+ :start-after: // addFeatureIdExample start
+ :end-before: // addFeatureIdExample end
FeatureID are assigned during the commit process. While we make an attempt to determine an
appropriate ID prior to commit we ask that you wait until commit() is finished before
|
|
From: <svn...@os...> - 2012-06-21 01:43:15
|
Author: jive
Date: 2012-06-20 18:43:08 -0700 (Wed, 20 Jun 2012)
New Revision: 38822
Modified:
trunk/docs/src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java
trunk/docs/user/library/data/featuresource.rst
Log:
update feature collection doc examples around addFeature including batch feature events
Modified: trunk/docs/src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java
===================================================================
--- trunk/docs/src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java 2012-06-20 22:47:41 UTC (rev 38821)
+++ trunk/docs/src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java 2012-06-21 01:43:08 UTC (rev 38822)
@@ -1,15 +1,23 @@
package org.geotools.data;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
+import org.geotools.data.collection.ListFeatureCollection;
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureStore;
import org.geotools.factory.CommonFactoryFinder;
import org.geotools.factory.GeoTools;
+import org.geotools.feature.FeatureCollections;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.geotools.geometry.jts.GeometryBuilder;
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.Filter;
import org.opengis.filter.FilterFactory;
import org.opengis.filter.identity.FeatureId;
@@ -20,6 +28,87 @@
String typeName;
+private void addFeaturesExample() throws Exception {
+ // addExample start
+ SimpleFeatureStore store = (SimpleFeatureStore) dataStore.getFeatureSource( typeName );
+
+ SimpleFeatureType featureType = store.getSchema();
+
+ SimpleFeatureBuilder build = new SimpleFeatureBuilder(featureType);
+ GeometryBuilder geom = new GeometryBuilder();
+
+ List<SimpleFeature> list = new ArrayList<SimpleFeature>();
+ list.add( build.buildFeature("fid1", new Object[]{ geom.point(1,1), "hello" } ) );
+ list.add( build.buildFeature("fid2", new Object[]{ geom.point(2,3), "martin" } ) );
+ SimpleFeatureCollection collection = new ListFeatureCollection(featureType, list);
+
+ Transaction transaction = new DefaultTransaction("Add Example");
+ store.setTransaction( transaction );
+ try {
+ store.addFeatures( collection );
+ transaction.commit(); // actually writes out the features in one go
+ }
+ catch( Exception eek){
+ transaction.rollback();
+ }
+ // addExample end
+}
+
+private void addFeatureIdExample(SimpleFeatureCollection collection ) throws Exception {
+ // addFeatureIdExample start
+ Transaction transaction = new DefaultTransaction("Add Example");
+ SimpleFeatureStore store = (SimpleFeatureStore) dataStore.getFeatureSource(typeName);
+ store.setTransaction(transaction);
+ try {
+ List<FeatureId> added = store.addFeatures( collection );
+ System.out.println( added ); // prints out the temporary feature ids
+
+ transaction.commit();
+ System.out.println( added ); // prints out the final feature ids
+
+ Set<FeatureId> selection = new HashSet<FeatureId>( added );
+ FilterFactory ff = CommonFactoryFinder.getFilterFactory();
+ Filter selected = ff.id( selection ); // filter selecting all the features just added
+ }
+ catch( Exception problem){
+ transaction.rollback();
+ throw problem;
+ }
+ // addFeatureIdExample end
+}
+
+private void addFeaturesEvents(SimpleFeatureCollection collection ) throws Exception {
+ // addEvents start
+ Transaction transaction = new DefaultTransaction("Add Example");
+ SimpleFeatureStore store = (SimpleFeatureStore) dataStore.getFeatureSource(typeName);
+ store.setTransaction(transaction);
+
+ class CommitListener implements FeatureListener {
+ public void changed(FeatureEvent featureEvent) {
+ if (featureEvent instanceof BatchFeatureEvent ){
+ BatchFeatureEvent batchEvent = (BatchFeatureEvent) featureEvent;
+
+ System.out.println( "area changed:" + batchEvent.getBounds() );
+ System.out.println( "created fids:" + batchEvent.fids );
+ }
+ else {
+ System.out.println( "bounds:" + featureEvent.getBounds() );
+ System.out.println( "change:" + featureEvent.filter );
+ }
+ }
+ }
+ CommitListener listener = new CommitListener();
+ store.addFeatureListener( listener );
+ try {
+ List<FeatureId> added = store.addFeatures( collection );
+ transaction.commit();
+ }
+ catch( Exception problem){
+ transaction.rollback();
+ throw problem;
+ }
+ // addEvents end
+}
private void removeExample() throws Exception {
// removeExample start
Transaction transaction = new DefaultTransaction("removeExample");
Modified: trunk/docs/user/library/data/featuresource.rst
===================================================================
--- trunk/docs/user/library/data/featuresource.rst 2012-06-20 22:47:41 UTC (rev 38821)
+++ trunk/docs/user/library/data/featuresource.rst 2012-06-21 01:43:08 UTC (rev 38822)
@@ -197,30 +197,30 @@
Each feature has an identifier that is intended to be unique in agreement with the WFS specification.
For most implementations the FeatureID is assigned when the feature is added
- (and even more interestingly when it is committed!)::
-
- try {
- Set<FeatureId> added = store.addFeatures( collection );
- System.out.println( added ); // prints out the temporary feature ids
-
- transaction.commit();
- System.out.println( added ); // prints out the final feature ids
- }
- catch( Exception eek){
- transaction.rollback();
- }
- FilterFactory ff = CommonFactoryFinder.getFilterFactory(null);
- Filter selected = ff.id( added ); // filter selecting all the features just added
+ (and even more interestingly when it is committed!):
- Please be careful; if you write down a FeatureID when you created in memory the feature you will lose
- track of it (since the ID not actually assigned until the feature is stored for safekeeping).
- You need to update any filters you have to use the real FeatureID after the commit has happened.
+ .. literalinclude:: /../src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java
+ :language: java
+ :start-after: // addExample start
+ :end-before: // addExample end
- To help you with this:
+ FeatureID are assigned during the commit process. While we make an attempt to determine an
+ appropriate ID prior to commit we ask that you wait until commit() is finished before
+ writing down the identifiers of the added content.
- * The commit feature event has the final set of identifiers
- * Any FeatureID instances in memory can get their internal value updated to reflect the final official value
-
+ The FeatureID instances returned by addFeatures are updated to reflect the final value
+ provided during commit. If you need to perform this step yourself you can listen for a
+ BatchFeatureEvent as shown below.
+
+* FeatureEvents are sent out when adding:
+
+ .. literalinclude:: /../src/main/java/org/geotools/data/SimpleFeatureStoreExamples.java
+ :language: java
+ :start-after: // addEvents start
+ :end-before: // addEvents end
+
+ The BatchFeatureEvent sent out during commit contains the final set of identifiers
+
* Handling of FeatureID Yourself
Recentlyy a few datastore implementations (JDBCNG and Property) added support for a "Hint" allowing
|
|
From: <svn...@os...> - 2012-06-20 22:47:51
|
Author: jdeolive
Date: 2012-06-20 15:47:41 -0700 (Wed, 20 Jun 2012)
New Revision: 38821
Modified:
trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISPSDialect.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGIS3DTestSetup.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISTestSetup.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisDataStoreAPITestSetup.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisNoPrimaryKeyTestSetup.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisSkipColumnTestSetup.java
trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisViewTestSetup.java
Log:
GEOT-4179, adding support for postgis 2.0
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISDialect.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -104,6 +104,8 @@
static final Version V_1_5_0 = new Version("1.5.0");
+ static final Version V_2_0_0 = new Version("2.0.0");
+
public PostGISDialect(JDBCDataStore dataStore) {
super(dataStore);
}
@@ -253,7 +255,7 @@
if (att instanceof GeometryDescriptor) {
// use estimated extent (optimizer statistics)
StringBuffer sql = new StringBuffer();
- sql.append("select AsText(force_2d(Envelope(ST_Estimated_Extent('");
+ sql.append("select ST_AsText(ST_force_2d(ST_Envelope(ST_Estimated_Extent('");
if(schema != null) {
sql.append(schema);
sql.append("', '");
@@ -467,8 +469,12 @@
// fall back on inspection of the first geometry, assuming uniform srid (fair assumption
// an unpredictable srid makes the table un-queriable)
- if(srid == null) {
- String sqlStatement = "SELECT SRID(\"" + columnName + "\") " +
+ //JD: In postgis 2.0 forward there is no way to leave a geometry srid unset since
+ // geometry_columns is a view populated from system tables, so we check for 0 and take
+ // that to mean unset
+
+ if(srid == null || (getVersion(cx).compareTo(V_2_0_0) >= 0 && srid == 0)) {
+ String sqlStatement = "SELECT ST_SRID(\"" + columnName + "\") " +
"FROM \"" + schemaName + "\".\"" + tableName + "\" " +
"WHERE " + columnName + " IS NOT NULL " +
"LIMIT 1";
@@ -662,27 +668,42 @@
if (geomType == null)
geomType = "GEOMETRY";
- // register the geometry type, first remove and eventual
- // leftover, then write out the real one
- String sql =
- "DELETE FROM GEOMETRY_COLUMNS"
- + " WHERE f_table_catalog=''" //
- + " AND f_table_schema = '" + schemaName + "'" //
- + " AND f_table_name = '" + tableName + "'" //
- + " AND f_geometry_column = '" + gd.getLocalName() + "'";
-
- LOGGER.fine( sql );
- st.execute( sql );
-
- sql = "INSERT INTO GEOMETRY_COLUMNS VALUES (''," //
- + "'" + schemaName + "'," //
- + "'" + tableName + "'," //
- + "'" + gd.getLocalName() + "'," //
- + dimensions + "," //
- + srid + "," //
- + "'" + geomType + "')";
- LOGGER.fine( sql );
- st.execute( sql );
+ String sql = null;
+ if (getVersion(cx).compareTo(V_2_0_0) >= 0) {
+ // postgis 2 and up we don't muck with geometry_columns, we just alter the
+ // type directly to set the geometry type and srid
+ //setup the geometry type
+ sql =
+ "ALTER TABLE \"" + schemaName + "\".\"" + tableName + "\" " +
+ "ALTER COLUMN \"" + gd.getLocalName() + "\" " +
+ "TYPE geometry (" + geomType + ", " + srid + ");";
+
+ LOGGER.fine( sql );
+ st.execute( sql );
+ }
+ else {
+ // register the geometry type, first remove and eventual
+ // leftover, then write out the real one
+ sql =
+ "DELETE FROM GEOMETRY_COLUMNS"
+ + " WHERE f_table_catalog=''" //
+ + " AND f_table_schema = '" + schemaName + "'" //
+ + " AND f_table_name = '" + tableName + "'" //
+ + " AND f_geometry_column = '" + gd.getLocalName() + "'";
+
+ LOGGER.fine( sql );
+ st.execute( sql );
+
+ sql = "INSERT INTO GEOMETRY_COLUMNS VALUES (''," //
+ + "'" + schemaName + "'," //
+ + "'" + tableName + "'," //
+ + "'" + gd.getLocalName() + "'," //
+ + dimensions + "," //
+ + srid + "," //
+ + "'" + geomType + "')";
+ LOGGER.fine( sql );
+ st.execute( sql );
+ }
// add srid checks
if (srid > -1) {
@@ -692,7 +713,7 @@
+ "\"" + tableName + "\"" //
+ " ADD CONSTRAINT \"enforce_srid_" //
+ gd.getLocalName() + "\""//
- + " CHECK (SRID(" //
+ + " CHECK (ST_SRID(" //
+ "\"" + gd.getLocalName() + "\"" //
+ ") = " + srid + ")";
LOGGER.fine( sql );
@@ -743,8 +764,10 @@
st.execute(sql);
}
}
- cx.commit();
- } finally {
+ if (!cx.getAutoCommit()) {
+ cx.commit();
+ }
+ } finally {
dataStore.closeSafe(st);
}
}
@@ -760,7 +783,7 @@
value = value.getFactory().createLineString(((LinearRing) value).getCoordinateSequence());
}
- sql.append("GeomFromText('" + value.toText() + "', " + srid + ")");
+ sql.append("ST_GeomFromText('" + value.toText() + "', " + srid + ")");
}
}
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISPSDialect.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISPSDialect.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/main/java/org/geotools/data/postgis/PostGISPSDialect.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -191,7 +191,7 @@
public void prepareGeometryValue(Geometry g, int srid, Class binding,
StringBuffer sql) {
if (g != null) {
- sql.append("GeomFromWKB(?, " + srid + ")");
+ sql.append("ST_GeomFromWKB(?, " + srid + ")");
} else {
sql.append("?");
}
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGIS3DTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGIS3DTestSetup.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGIS3DTestSetup.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -40,10 +40,10 @@
// insert data
run("INSERT INTO \"line3d\" (\"id\",\"geom\",\"name\") VALUES (0,"
- + "GeomFromText('LINESTRING(1 1 0, 2 2 0, 4 2 1, 5 1 1)', 4326),"
+ + "ST_GeomFromText('LINESTRING(1 1 0, 2 2 0, 4 2 1, 5 1 1)', 4326),"
+ "'l1')");
run("INSERT INTO \"line3d\" (\"id\",\"geom\",\"name\") VALUES (1,"
- + "GeomFromText('LINESTRING(3 0 1, 3 2 2, 3 3 3, 3 4 5)', 4326),"
+ + "ST_GeomFromText('LINESTRING(3 0 1, 3 2 2, 3 3 3, 3 4 5)', 4326),"
+ "'l2')");
}
@@ -57,9 +57,9 @@
// insert data
run("INSERT INTO \"point3d\" (\"id\",\"geom\",\"name\") VALUES (0,"
- + "GeomFromText('POINT(1 1 1)', 4326)," + "'p1')");
+ + "ST_GeomFromText('POINT(1 1 1)', 4326)," + "'p1')");
run("INSERT INTO \"point3d\" (\"id\",\"geom\",\"name\") VALUES (1,"
- + "GeomFromText('POINT(3 0 1)', 4326)," + "'p2')");
+ + "ST_GeomFromText('POINT(3 0 1)', 4326)," + "'p2')");
}
@Override
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISTestSetup.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISTestSetup.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -16,11 +16,15 @@
*/
package org.geotools.data.postgis;
+import java.sql.Connection;
import java.util.Properties;
+import javax.sql.DataSource;
+
import org.geotools.jdbc.JDBCDataStore;
import org.geotools.jdbc.JDBCDataStoreFactory;
import org.geotools.jdbc.JDBCTestSetup;
+import org.geotools.util.Version;
/**
*
@@ -29,7 +33,25 @@
*/
public class PostGISTestSetup extends JDBCTestSetup {
+ protected Version postgisVersion;
+
@Override
+ protected void initializeDatabase() throws Exception {
+ DataSource dataSource = getDataSource();
+ Connection cx = dataSource.getConnection();
+ try {
+ postgisVersion = new PostGISDialect(new JDBCDataStore()).getVersion(cx);
+ }
+ finally {
+ cx.close();
+ }
+ }
+
+ public boolean isVersion2() {
+ return postgisVersion != null && postgisVersion.compareTo(PostGISDialect.V_2_0_0) >= 0;
+ }
+
+ @Override
protected void setUpDataStore(JDBCDataStore dataStore) {
super.setUpDataStore(dataStore);
@@ -69,11 +91,14 @@
+ "\"doubleProperty\" double precision, " //
+ "\"stringProperty\" varchar)");
run("INSERT INTO GEOMETRY_COLUMNS VALUES('', 'public', 'ft1', 'geometry', 2, '4326', 'POINT')");
+ if (isVersion2()) {
+ run("ALTER TABLE \"ft1\" ALTER COLUMN \"geometry\" TYPE geometry(Point,4326);");
+ }
run("CREATE INDEX FT1_GEOMETRY_INDEX ON \"ft1\" USING GIST (\"geometry\") ");
- run("INSERT INTO \"ft1\" VALUES(0, GeometryFromText('POINT(0 0)', 4326), 0, 0.0, 'zero')");
- run("INSERT INTO \"ft1\" VALUES(1, GeometryFromText('POINT(1 1)', 4326), 1, 1.1, 'one')");
- run("INSERT INTO \"ft1\" VALUES(2, GeometryFromText('POINT(2 2)', 4326), 2, 2.2, 'two')");
+ run("INSERT INTO \"ft1\" VALUES(0, ST_GeometryFromText('POINT(0 0)', 4326), 0, 0.0, 'zero')");
+ run("INSERT INTO \"ft1\" VALUES(1, ST_GeometryFromText('POINT(1 1)', 4326), 1, 1.1, 'one')");
+ run("INSERT INTO \"ft1\" VALUES(2, ST_GeometryFromText('POINT(2 2)', 4326), 2, 2.2, 'two')");
// advance the sequence to 2
run("SELECT nextval(pg_get_serial_sequence('ft1','id'))");
run("SELECT nextval(pg_get_serial_sequence('ft1','id'))");
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisDataStoreAPITestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisDataStoreAPITestSetup.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisDataStoreAPITestSetup.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -35,13 +35,17 @@
run("CREATE TABLE \"lake\"(\"fid\" serial PRIMARY KEY, \"id\" int, "
+ "\"geom\" geometry, \"name\" varchar )");
run("INSERT INTO GEOMETRY_COLUMNS VALUES('', 'public', 'lake', 'geom', 2, '4326', 'POLYGON')");
+
+ if (((PostGISTestSetup)delegate).isVersion2()) {
+ run("ALTER TABLE \"lake\" ALTER COLUMN \"geom\" TYPE geometry(Polygon,4326);");
+ }
run("CREATE INDEX LAKE_GEOM_INDEX ON \"lake\" USING GIST (\"geom\") ");
// advance the sequence to 1 to compensate for hand insertions
run("SELECT nextval(pg_get_serial_sequence('lake','fid'))");
run("INSERT INTO \"lake\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (0, 0,"
- + "GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ + "ST_GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ "'muddy')");
}
@@ -50,16 +54,20 @@
run("CREATE TABLE \"river\"(\"fid\" serial PRIMARY KEY, \"id\" int, "
+ "\"geom\" geometry, \"river\" varchar , \"flow\" real )");
run("INSERT INTO GEOMETRY_COLUMNS VALUES('', 'public', 'river', 'geom', 2, '4326', 'MULTILINESTRING')");
+
+ if (((PostGISTestSetup)delegate).isVersion2()) {
+ run("ALTER TABLE \"river\" ALTER COLUMN \"geom\" TYPE geometry(MultiLineString,4326);");
+ }
run("CREATE INDEX RIVER_GEOM_INDEX ON \"river\" USING GIST (\"geom\") ");
// advance the sequence to 1 to compensate for hand insertions
run("SELECT nextval(pg_get_serial_sequence('river','fid'))");
run("INSERT INTO \"river\" (\"fid\", \"id\",\"geom\",\"river\", \"flow\") VALUES (0, 0,"
- + "GeomFromText('MULTILINESTRING((5 5, 7 4),(7 5, 9 7, 13 7),(7 5, 9 3, 11 3))',4326),"
+ + "ST_GeomFromText('MULTILINESTRING((5 5, 7 4),(7 5, 9 7, 13 7),(7 5, 9 3, 11 3))',4326),"
+ "'rv1', 4.5)");
run("INSERT INTO \"river\" (\"fid\", \"id\",\"geom\",\"river\", \"flow\") VALUES (1, 1,"
- + "GeomFromText('MULTILINESTRING((4 6, 4 8, 6 10))',4326),"
+ + "ST_GeomFromText('MULTILINESTRING((4 6, 4 8, 6 10))',4326),"
+ "'rv2', 3.0)");
}
@@ -69,6 +77,9 @@
run("CREATE TABLE \"road\"(\"fid\" serial PRIMARY KEY, \"id\" int, "
+ "\"geom\" geometry, \"name\" varchar )");
run("INSERT INTO GEOMETRY_COLUMNS VALUES('', 'public', 'road', 'geom', 2, '4326', 'LINESTRING')");
+ if (((PostGISTestSetup)delegate).isVersion2()) {
+ run("ALTER TABLE \"road\" ALTER COLUMN \"geom\" TYPE geometry(LineString,4326);");
+ }
run("CREATE INDEX ROAD_GEOM_INDEX ON \"road\" USING GIST (\"geom\") ");
// advance the sequence to 2 to compensate for hand insertions
@@ -77,13 +88,13 @@
// insertions
run("INSERT INTO \"road\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (0, 0,"
- + "GeomFromText('LINESTRING(1 1, 2 2, 4 2, 5 1)',4326),"
+ + "ST_GeomFromText('LINESTRING(1 1, 2 2, 4 2, 5 1)',4326),"
+ "'r1')");
run("INSERT INTO \"road\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (1, 1,"
- + "GeomFromText('LINESTRING(3 0, 3 2, 3 3, 3 4)',4326),"
+ + "ST_GeomFromText('LINESTRING(3 0, 3 2, 3 3, 3 4)',4326),"
+ "'r2')");
run("INSERT INTO \"road\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (2, 2,"
- + "GeomFromText('LINESTRING(3 2, 4 2, 5 3)',4326)," + "'r3')");
+ + "ST_GeomFromText('LINESTRING(3 2, 4 2, 5 3)',4326)," + "'r3')");
}
@Override
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisNoPrimaryKeyTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisNoPrimaryKeyTestSetup.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisNoPrimaryKeyTestSetup.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -37,7 +37,7 @@
run("CREATE INDEX LAKE_GEOM_INDEX ON \"lake\" USING GIST (\"geom\") ");
run("INSERT INTO \"lake\" (\"id\",\"geom\",\"name\") VALUES (0,"
- + "GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ + "ST_GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ "'muddy')");
}
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisSkipColumnTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisSkipColumnTestSetup.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisSkipColumnTestSetup.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -24,7 +24,7 @@
run("INSERT INTO GEOMETRY_COLUMNS VALUES('', 'public', 'skipcolumn', 'geom', 2, '4326', 'POINT')");
run("CREATE INDEX SKIPCOLUMN_GEOM_INDEX ON \"skipcolumn\" USING GIST (\"geom\") ");
- run("INSERT INTO \"skipcolumn\" VALUES(0, 0, GeometryFromText('POINT(0 0)', 4326), null, 'GeoTools')");
+ run("INSERT INTO \"skipcolumn\" VALUES(0, 0, ST_GeometryFromText('POINT(0 0)', 4326), null, 'GeoTools')");
}
Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisViewTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisViewTestSetup.java 2012-06-20 05:20:22 UTC (rev 38820)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostgisViewTestSetup.java 2012-06-20 22:47:41 UTC (rev 38821)
@@ -26,7 +26,7 @@
run("INSERT INTO \"lakes_null\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (-1, -1,"
+ "null, 'empty')");
run("INSERT INTO \"lakes_null\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (0, 0,"
- + "GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ + "ST_GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ "'muddy')");
run("CREATE VIEW \"lakes_null_view\" AS SELECT * FROM \"lakes_null\"");
}
@@ -38,8 +38,11 @@
run("INSERT INTO GEOMETRY_COLUMNS VALUES('', 'public', 'lakes', 'geom', 2, '4326', 'POLYGON')");
run("CREATE INDEX LAKES_GEOM_INDEX ON \"lakes\" USING GIST (\"geom\") ");
+ if (((PostGISTestSetup)delegate).isVersion2()) {
+ run("ALTER TABLE \"lakes\" ALTER COLUMN \"geom\" TYPE geometry(Polygon,4326);");
+ }
run("INSERT INTO \"lakes\" (\"fid\", \"id\",\"geom\",\"name\") VALUES (0, 0,"
- + "GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ + "ST_GeomFromText('POLYGON((12 6, 14 8, 16 6, 16 4, 14 4, 12 6))',4326),"
+ "'muddy')");
}
|
|
From: <svn...@os...> - 2012-06-20 05:20:29
|
Author: jive
Date: 2012-06-19 22:20:22 -0700 (Tue, 19 Jun 2012)
New Revision: 38820
Modified:
trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureStoreDecorator.java
Log:
Review add feature code to spoon feed changes in blocks of 1000 to avoid SQL issues generating large fid filters
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureStoreDecorator.java
===================================================================
--- trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureStoreDecorator.java 2012-06-20 05:19:54 UTC (rev 38819)
+++ trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/FeatureStoreDecorator.java 2012-06-20 05:20:22 UTC (rev 38820)
@@ -19,6 +19,7 @@
import static org.geotools.data.Transaction.AUTO_COMMIT;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -29,6 +30,7 @@
import org.geogit.repository.Repository;
import org.geotools.data.FeatureReader;
import org.geotools.data.FeatureStore;
+import org.geotools.data.Query;
import org.geotools.data.Transaction;
import org.geotools.data.geogit.VersioningTransactionState;
import org.geotools.data.versioning.VersioningFeatureStore;
@@ -98,27 +100,52 @@
@Override
public List<FeatureId> addFeatures(FeatureCollection<T, F> collection)
throws IOException {
- if (isVersioned()) {
+ boolean versioned = isVersioned();
+
+ if (versioned) {
checkTransaction();
}
+ FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2();
final FeatureStore<T, F> unversioned = getUnversionedStore();
+
+ // Optimisation: special case the first load (this is often when we have lots of feaures)
+ int initialCount = -1;
+ if( versioned ){
+ initialCount = unversioned.getCount(Query.ALL);
+ }
+ // step 1: add features to unversioned
List<FeatureId> unversionedIds = unversioned.addFeatures(collection);
-
- if (isVersioned()) {
+
+ // step 2: add features to versioned databse
+ if (versioned) {
try {
final Name typeName = getSchema().getName();
VersioningTransactionState versioningState = getVersioningState();
-
- FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(null);
-
- Id id = ff.id(new HashSet<Identifier>(unversionedIds));
- FeatureCollection<T, F> inserted = unversioned.getFeatures(id);
- List<FeatureId> versionedIds;
- versionedIds = versioningState.stageInsert(typeName, inserted,
- true);
+
+ List<Filter> block = new ArrayList<Filter>();
+
+ if( initialCount == 0 ){
+ // Optimisation: grab everything for the first load
+ block.add( Filter.INCLUDE );
+ }
+ else {
+ // Stage inserts in blocks of 3000 to avoid limitations of SQL generation
+ final int PAGE = 1000;
+ int SIZE = unversionedIds.size();
+ for( int i=0; i < SIZE; i+=PAGE){
+ List<FeatureId> list = unversionedIds.subList(i, Math.min( SIZE, i+PAGE));
+ Id id = ff.id(new HashSet<Identifier>(list));
+ block.add( id );
+ }
+ }
+ List<FeatureId> versionedIds = new ArrayList<FeatureId>();
+ for( Filter filter : block ){
+ FeatureCollection<T, F> inserted = unversioned.getFeatures( filter );
+ List<FeatureId> staged = versioningState.stageInsert(typeName, inserted, true);
+ versionedIds.addAll( staged );
+ }
return versionedIds;
-
} catch (Exception e) {
Throwables.propagate(e);
}
|
|
From: <svn...@os...> - 2012-06-20 05:20:01
|
Author: jive
Date: 2012-06-19 22:19:54 -0700 (Tue, 19 Jun 2012)
New Revision: 38819
Modified:
trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionEvent.java
trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionListener.java
trunk/modules/library/main/src/main/java/org/geotools/data/BatchFeatureEvent.java
Log:
deprecate CollectionListener and CollectionEvent
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionEvent.java
===================================================================
--- trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionEvent.java 2012-06-20 02:50:19 UTC (rev 38818)
+++ trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionEvent.java 2012-06-20 05:19:54 UTC (rev 38819)
@@ -28,8 +28,8 @@
* A simple event object to represent all events triggered by FeatureCollection
* instances (typically change events).
*
- *
* @source $URL$
+ * @deprecated Use {@link FeatureEvent}
*/
public class CollectionEvent extends EventObject {
private static final long serialVersionUID = -1864190177730929948L;
Modified: trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionListener.java
===================================================================
--- trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionListener.java 2012-06-20 02:50:19 UTC (rev 38818)
+++ trunk/modules/library/api/src/main/java/org/geotools/feature/CollectionListener.java 2012-06-20 05:19:54 UTC (rev 38819)
@@ -16,15 +16,17 @@
*/
package org.geotools.feature;
+import org.geotools.data.FeatureListener;
+
/**
* Interface to be implemented by all listeners of CollectionEvents.
*
* @author Ray Gallagher
*
- *
* @source $URL$
* @version $Id$
+ * @deprecated Use {@link FeatureListener}
*/
public interface CollectionListener {
/**
Modified: trunk/modules/library/main/src/main/java/org/geotools/data/BatchFeatureEvent.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/data/BatchFeatureEvent.java 2012-06-20 02:50:19 UTC (rev 38818)
+++ trunk/modules/library/main/src/main/java/org/geotools/data/BatchFeatureEvent.java 2012-06-20 05:19:54 UTC (rev 38819)
@@ -40,8 +40,6 @@
*
* @author Jody Garnett
*
- *
- *
* @source $URL$
*/
public class BatchFeatureEvent extends FeatureEvent {
|
289 messages has been excluded from this view by a project administrator.
