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-01 16:39:57
|
Author: jdeolive Date: 2012-06-01 09:39:50 -0700 (Fri, 01 Jun 2012) New Revision: 38795 Modified: trunk/build/release/publish_release.sh Log: deploying all modules on opengeo deploy since geoserver depends on some unsupported modules Modified: trunk/build/release/publish_release.sh =================================================================== --- trunk/build/release/publish_release.sh 2012-06-01 15:17:18 UTC (rev 38794) +++ trunk/build/release/publish_release.sh 2012-06-01 16:39:50 UTC (rev 38795) @@ -25,7 +25,7 @@ # deploy the release to maven repo pushd tags/$tag > /dev/null mvn deploy -DskipTests -mvn -P deploy.opengeo deploy -DskipTests +mvn -P deploy.opengeo deploy -DskipTests -Dall popd > /dev/null # get <major.minor> for sf release dir |
|
From: <svn...@os...> - 2012-06-01 15:17:28
|
Author: jdeolive Date: 2012-06-01 08:17:18 -0700 (Fri, 01 Jun 2012) New Revision: 38794 Modified: trunk/build/release/publish_release.sh Log: Removing non-existing src directory Modified: trunk/build/release/publish_release.sh =================================================================== --- trunk/build/release/publish_release.sh 2012-06-01 14:32:59 UTC (rev 38793) +++ trunk/build/release/publish_release.sh 2012-06-01 15:17:18 UTC (rev 38794) @@ -23,7 +23,7 @@ . "$( cd "$( dirname "$0" )" && pwd )"/functions # deploy the release to maven repo -pushd tags/$tag/src > /dev/null +pushd tags/$tag > /dev/null mvn deploy -DskipTests mvn -P deploy.opengeo deploy -DskipTests popd > /dev/null |
Author: afabiani
Date: 2012-06-01 07:32:59 -0700 (Fri, 01 Jun 2012)
New Revision: 38793
Modified:
tags/2.7.5/build/maven/jar-collector/pom.xml
tags/2.7.5/build/maven/javadoc/pom.xml
tags/2.7.5/build/maven/jjtree-javacc/pom.xml
tags/2.7.5/build/maven/pom.xml
tags/2.7.5/build/maven/xmlcodegen/pom.xml
tags/2.7.5/build/pom.xml
tags/2.7.5/build/rename.xml
tags/2.7.5/demo/example/pom.xml
tags/2.7.5/demo/gmlparsing/pom.xml
tags/2.7.5/demo/jdbc/pom.xml
tags/2.7.5/demo/libraryJTS/pom.xml
tags/2.7.5/demo/pom.xml
tags/2.7.5/demo/svgsupport/pom.xml
tags/2.7.5/demo/xml-po/pom.xml
tags/2.7.5/docs/pom.xml
tags/2.7.5/modules/extension/brewer/pom.xml
tags/2.7.5/modules/extension/graph/pom.xml
tags/2.7.5/modules/extension/pom.xml
tags/2.7.5/modules/extension/validation/pom.xml
tags/2.7.5/modules/extension/wms/pom.xml
tags/2.7.5/modules/extension/xsd/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-core/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-fes/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-filter/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-gml2/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-gml3/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-kml/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-ows/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-sld/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-wcs/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-wfs/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-wms/pom.xml
tags/2.7.5/modules/extension/xsd/xsd-wps/pom.xml
tags/2.7.5/modules/library/api/pom.xml
tags/2.7.5/modules/library/coverage/pom.xml
tags/2.7.5/modules/library/cql/pom.xml
tags/2.7.5/modules/library/data/pom.xml
tags/2.7.5/modules/library/jdbc/pom.xml
tags/2.7.5/modules/library/main/pom.xml
tags/2.7.5/modules/library/metadata/pom.xml
tags/2.7.5/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
tags/2.7.5/modules/library/opengis/pom.xml
tags/2.7.5/modules/library/pom.xml
tags/2.7.5/modules/library/referencing/pom.xml
tags/2.7.5/modules/library/render/pom.xml
tags/2.7.5/modules/library/sample-data/pom.xml
tags/2.7.5/modules/library/temporal/pom.xml
tags/2.7.5/modules/library/xml/pom.xml
tags/2.7.5/modules/ogc/net.opengis.ows/pom.xml
tags/2.7.5/modules/ogc/net.opengis.wcs/pom.xml
tags/2.7.5/modules/ogc/net.opengis.wfs/pom.xml
tags/2.7.5/modules/ogc/net.opengis.wfsv/pom.xml
tags/2.7.5/modules/ogc/net.opengis.wps/pom.xml
tags/2.7.5/modules/ogc/org.w3.xlink/pom.xml
tags/2.7.5/modules/ogc/pom.xml
tags/2.7.5/modules/plugin/arcgrid/pom.xml
tags/2.7.5/modules/plugin/arcsde/common/pom.xml
tags/2.7.5/modules/plugin/arcsde/datastore/pom.xml
tags/2.7.5/modules/plugin/arcsde/pom.xml
tags/2.7.5/modules/plugin/arcsde/sde-dummy/pom.xml
tags/2.7.5/modules/plugin/charts/pom.xml
tags/2.7.5/modules/plugin/epsg-extension/pom.xml
tags/2.7.5/modules/plugin/epsg-hsql/pom.xml
tags/2.7.5/modules/plugin/epsg-postgresql/pom.xml
tags/2.7.5/modules/plugin/epsg-wkt/pom.xml
tags/2.7.5/modules/plugin/feature-pregeneralized/pom.xml
tags/2.7.5/modules/plugin/geotiff/pom.xml
tags/2.7.5/modules/plugin/grassraster/pom.xml
tags/2.7.5/modules/plugin/gtopo30/pom.xml
tags/2.7.5/modules/plugin/image/pom.xml
tags/2.7.5/modules/plugin/imageio-ext-gdal/pom.xml
tags/2.7.5/modules/plugin/imagemosaic-jdbc/pom.xml
tags/2.7.5/modules/plugin/imagemosaic/pom.xml
tags/2.7.5/modules/plugin/imagepyramid/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-db2/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-h2/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-mysql/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-oracle/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-postgis/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-spatialite/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-sqlserver/pom.xml
tags/2.7.5/modules/plugin/jdbc/jdbc-teradata/pom.xml
tags/2.7.5/modules/plugin/jdbc/pom.xml
tags/2.7.5/modules/plugin/jp2k/pom.xml
tags/2.7.5/modules/plugin/pom.xml
tags/2.7.5/modules/plugin/property/pom.xml
tags/2.7.5/modules/plugin/referencing3D/pom.xml
tags/2.7.5/modules/plugin/shapefile/pom.xml
tags/2.7.5/modules/plugin/svg/pom.xml
tags/2.7.5/modules/pom.xml
tags/2.7.5/modules/unsupported/app-schema/app-schema-packages/pom.xml
tags/2.7.5/modules/unsupported/app-schema/app-schema-resolver/pom.xml
tags/2.7.5/modules/unsupported/app-schema/app-schema/pom.xml
tags/2.7.5/modules/unsupported/app-schema/jdbc-regfunc/pom.xml
tags/2.7.5/modules/unsupported/app-schema/pom.xml
tags/2.7.5/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml
tags/2.7.5/modules/unsupported/app-schema/sample-data-access/pom.xml
tags/2.7.5/modules/unsupported/app-schema/webservice/pom.xml
tags/2.7.5/modules/unsupported/caching/pom.xml
tags/2.7.5/modules/unsupported/coverage-experiment/coverage-api/pom.xml
tags/2.7.5/modules/unsupported/coverage-experiment/coverage-core/pom.xml
tags/2.7.5/modules/unsupported/coverage-experiment/grib1/pom.xml
tags/2.7.5/modules/unsupported/coverage-experiment/hdf4/pom.xml
tags/2.7.5/modules/unsupported/coverage-experiment/netcdf/pom.xml
tags/2.7.5/modules/unsupported/coverage-experiment/pom.xml
tags/2.7.5/modules/unsupported/coverageio-netcdf/pom.xml
tags/2.7.5/modules/unsupported/coverageio/pom.xml
tags/2.7.5/modules/unsupported/coveragetools/pom.xml
tags/2.7.5/modules/unsupported/csv/pom.xml
tags/2.7.5/modules/unsupported/db2/pom.xml
tags/2.7.5/modules/unsupported/dxf/pom.xml
tags/2.7.5/modules/unsupported/edigeo/pom.xml
tags/2.7.5/modules/unsupported/epsg-h2/pom.xml
tags/2.7.5/modules/unsupported/epsg-oracle/pom.xml
tags/2.7.5/modules/unsupported/example/pom.xml
tags/2.7.5/modules/unsupported/excel/pom.xml
tags/2.7.5/modules/unsupported/geojson/pom.xml
tags/2.7.5/modules/unsupported/geometry/pom.xml
tags/2.7.5/modules/unsupported/geometryless/pom.xml
tags/2.7.5/modules/unsupported/georest/pom.xml
tags/2.7.5/modules/unsupported/geotiff_new/pom.xml
tags/2.7.5/modules/unsupported/grassraster/pom.xml
tags/2.7.5/modules/unsupported/grid/pom.xml
tags/2.7.5/modules/unsupported/jai-tools/pom.xml
tags/2.7.5/modules/unsupported/jdbc-ng/jdbc-ingres/pom.xml
tags/2.7.5/modules/unsupported/jdbc-ng/pom.xml
tags/2.7.5/modules/unsupported/jts-wrapper/pom.xml
tags/2.7.5/modules/unsupported/matfile5/pom.xml
tags/2.7.5/modules/unsupported/mysql/pom.xml
tags/2.7.5/modules/unsupported/ogr/pom.xml
tags/2.7.5/modules/unsupported/oracle-spatial/pom.xml
tags/2.7.5/modules/unsupported/pom.xml
tags/2.7.5/modules/unsupported/postgis-versioned/pom.xml
tags/2.7.5/modules/unsupported/postgis/pom.xml
tags/2.7.5/modules/unsupported/process/pom.xml
tags/2.7.5/modules/unsupported/sfs/pom.xml
tags/2.7.5/modules/unsupported/shapefile-renderer/pom.xml
tags/2.7.5/modules/unsupported/sql-datastore/pom.xml
tags/2.7.5/modules/unsupported/swing/pom.xml
tags/2.7.5/modules/unsupported/vpf/pom.xml
tags/2.7.5/modules/unsupported/wfs-ng/pom.xml
tags/2.7.5/modules/unsupported/wfs/pom.xml
tags/2.7.5/modules/unsupported/wps/pom.xml
tags/2.7.5/pom.xml
tags/2.7.5/spike/jan/gsoc-transformations/pom.xml
Log:
updating version numbers for 2.7.5
Modified: tags/2.7.5/build/maven/jar-collector/pom.xml
===================================================================
--- tags/2.7.5/build/maven/jar-collector/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/maven/jar-collector/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/build/maven/javadoc/pom.xml
===================================================================
--- tags/2.7.5/build/maven/javadoc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/maven/javadoc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/build/maven/jjtree-javacc/pom.xml
===================================================================
--- tags/2.7.5/build/maven/jjtree-javacc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/maven/jjtree-javacc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/build/maven/pom.xml
===================================================================
--- tags/2.7.5/build/maven/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/maven/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>build</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/build/maven/xmlcodegen/pom.xml
===================================================================
--- tags/2.7.5/build/maven/xmlcodegen/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/maven/xmlcodegen/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/build/pom.xml
===================================================================
--- tags/2.7.5/build/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/build/rename.xml
===================================================================
--- tags/2.7.5/build/rename.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/build/rename.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -4,12 +4,12 @@
<replace dir="..">
<include name="**/pom.xml"/>
<replacefilter token="<version>2.7-SNAPSHOT</version>"
- value="<version>@VERSION@</version>"/>
+ value="<version>2.7.5</version>"/>
</replace>
<replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
<include name="GeoTools.java"/>
<replacefilter token="2.7-SNAPSHOT"
- value="@VERSION@"/>
+ value="2.7.5"/>
</replace>
</target>
</project>
Modified: tags/2.7.5/demo/example/pom.xml
===================================================================
--- tags/2.7.5/demo/example/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/example/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/demo/gmlparsing/pom.xml
===================================================================
--- tags/2.7.5/demo/gmlparsing/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/gmlparsing/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/demo/jdbc/pom.xml
===================================================================
--- tags/2.7.5/demo/jdbc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/jdbc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/demo/libraryJTS/pom.xml
===================================================================
--- tags/2.7.5/demo/libraryJTS/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/libraryJTS/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/demo/pom.xml
===================================================================
--- tags/2.7.5/demo/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/demo/svgsupport/pom.xml
===================================================================
--- tags/2.7.5/demo/svgsupport/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/svgsupport/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/demo/xml-po/pom.xml
===================================================================
--- tags/2.7.5/demo/xml-po/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/demo/xml-po/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.demo</groupId>
<artifactId>demo</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/docs/pom.xml
===================================================================
--- tags/2.7.5/docs/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/docs/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/brewer/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/brewer/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/brewer/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/graph/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/graph/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/graph/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/validation/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/validation/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/validation/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/wms/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/wms/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/wms/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>extension</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/xsd-core/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-core/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-core/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/xsd-fes/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-fes/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-fes/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/xsd-filter/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-filter/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-filter/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/xsd-gml2/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-gml2/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-gml2/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/extension/xsd/xsd-gml3/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-gml3/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-gml3/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/xsd-kml/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-kml/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-kml/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/extension/xsd/xsd-ows/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-ows/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-ows/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>net.opengis.ows</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</dependency>
<dependency>
<groupId>org.geotools.xsd</groupId>
Modified: tags/2.7.5/modules/extension/xsd/xsd-sld/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-sld/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-sld/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/extension/xsd/xsd-wcs/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-wcs/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-wcs/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/extension/xsd/xsd-wfs/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-wfs/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-wfs/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/extension/xsd/xsd-wms/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-wms/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-wms/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/extension/xsd/xsd-wps/pom.xml
===================================================================
--- tags/2.7.5/modules/extension/xsd/xsd-wps/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/extension/xsd/xsd-wps/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/library/api/pom.xml
===================================================================
--- tags/2.7.5/modules/library/api/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/api/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/coverage/pom.xml
===================================================================
--- tags/2.7.5/modules/library/coverage/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/coverage/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/cql/pom.xml
===================================================================
--- tags/2.7.5/modules/library/cql/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/cql/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/data/pom.xml
===================================================================
--- tags/2.7.5/modules/library/data/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/data/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/jdbc/pom.xml
===================================================================
--- tags/2.7.5/modules/library/jdbc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/jdbc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/main/pom.xml
===================================================================
--- tags/2.7.5/modules/library/main/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/main/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/metadata/pom.xml
===================================================================
--- tags/2.7.5/modules/library/metadata/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/metadata/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
===================================================================
--- tags/2.7.5/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java 2012-06-01 14:32:59 UTC (rev 38793)
@@ -95,7 +95,7 @@
/**
* The current GeoTools version. The separator character must be the dot.
*/
- private static final Version VERSION = new Version(PROPS.getProperty("version", "2.7-SNAPSHOT"));
+ private static final Version VERSION = new Version(PROPS.getProperty("version", "2.7.5"));
/**
* The version control (svn) revision at which this version of geotools was built.
Modified: tags/2.7.5/modules/library/opengis/pom.xml
===================================================================
--- tags/2.7.5/modules/library/opengis/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/opengis/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/pom.xml
===================================================================
--- tags/2.7.5/modules/library/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/referencing/pom.xml
===================================================================
--- tags/2.7.5/modules/library/referencing/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/referencing/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/render/pom.xml
===================================================================
--- tags/2.7.5/modules/library/render/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/render/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/sample-data/pom.xml
===================================================================
--- tags/2.7.5/modules/library/sample-data/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/sample-data/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/temporal/pom.xml
===================================================================
--- tags/2.7.5/modules/library/temporal/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/temporal/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/library/xml/pom.xml
===================================================================
--- tags/2.7.5/modules/library/xml/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/library/xml/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>library</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/ogc/net.opengis.ows/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/net.opengis.ows/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/net.opengis.ows/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools.ogc</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>org.w3.xlink</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</dependency>
</dependencies>
Modified: tags/2.7.5/modules/ogc/net.opengis.wcs/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/net.opengis.wcs/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/net.opengis.wcs/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7.5/modules/ogc/net.opengis.wfs/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/net.opengis.wfs/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/net.opengis.wfs/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7.5/modules/ogc/net.opengis.wfsv/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/net.opengis.wfsv/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/net.opengis.wfsv/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools.ogc</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.geotools.ogc</groupId>
<artifactId>net.opengis.wfs</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</dependency>
</dependencies>
Modified: tags/2.7.5/modules/ogc/net.opengis.wps/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/net.opengis.wps/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/net.opengis.wps/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7.5/modules/ogc/org.w3.xlink/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/org.w3.xlink/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/org.w3.xlink/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>ogc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools.ogc</groupId>
Modified: tags/2.7.5/modules/ogc/pom.xml
===================================================================
--- tags/2.7.5/modules/ogc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/ogc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools</groupId>
Modified: tags/2.7.5/modules/plugin/arcgrid/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/arcgrid/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/arcgrid/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/arcsde/common/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/arcsde/common/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/arcsde/common/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/arcsde/datastore/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/arcsde/datastore/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/arcsde/datastore/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/arcsde/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/arcsde/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/arcsde/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/arcsde/sde-dummy/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/arcsde/sde-dummy/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/arcsde/sde-dummy/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>arcsde-plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/charts/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/charts/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/charts/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/epsg-extension/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/epsg-extension/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/epsg-extension/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/epsg-hsql/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/epsg-hsql/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/epsg-hsql/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/epsg-postgresql/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/epsg-postgresql/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/epsg-postgresql/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/epsg-wkt/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/epsg-wkt/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/epsg-wkt/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/feature-pregeneralized/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/feature-pregeneralized/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/feature-pregeneralized/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/geotiff/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/geotiff/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/geotiff/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/grassraster/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/grassraster/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/grassraster/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/gtopo30/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/gtopo30/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/gtopo30/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/image/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/image/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/image/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/imageio-ext-gdal/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/imageio-ext-gdal/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/imageio-ext-gdal/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/plugin/imagemosaic/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/imagemosaic/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/imagemosaic/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/imagemosaic-jdbc/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/imagemosaic-jdbc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/imagemosaic-jdbc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/imagepyramid/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/imagepyramid/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/imagepyramid/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!--properties>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-db2/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-db2/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-db2/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-h2/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-h2/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-h2/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-mysql/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-mysql/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-mysql/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-oracle/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-oracle/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-oracle/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-postgis/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-postgis/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-postgis/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-spatialite/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-spatialite/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-spatialite/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-sqlserver/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-sqlserver/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-sqlserver/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/jdbc-teradata/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/jdbc-teradata/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/jdbc-teradata/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jdbc/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jdbc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jdbc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/jp2k/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/jp2k/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/jp2k/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -15,7 +15,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>modules</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/plugin/property/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/property/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/property/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/referencing3D/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/referencing3D/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/referencing3D/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/shapefile/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/shapefile/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/shapefile/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/plugin/svg/pom.xml
===================================================================
--- tags/2.7.5/modules/plugin/svg/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/plugin/svg/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>plugin</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/pom.xml
===================================================================
--- tags/2.7.5/modules/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>geotools</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/app-schema/app-schema/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/app-schema/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/app-schema/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -15,7 +15,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/app-schema/app-schema-packages/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/app-schema-packages/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/app-schema-packages/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools</groupId>
Modified: tags/2.7.5/modules/unsupported/app-schema/app-schema-resolver/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/app-schema-resolver/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/app-schema-resolver/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools</groupId>
Modified: tags/2.7.5/modules/unsupported/app-schema/jdbc-regfunc/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/jdbc-regfunc/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/jdbc-regfunc/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/app-schema/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>unsupported</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/app-schema/sample-data-access/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/sample-data-access/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/sample-data-access/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -6,7 +6,7 @@
<parent>
<artifactId>app-schema</artifactId>
<groupId>org.geotools</groupId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools</groupId>
Modified: tags/2.7.5/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -6,7 +6,7 @@
<parent>
<artifactId>app-schema</artifactId>
<groupId>org.geotools</groupId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<groupId>org.geotools</groupId>
Modified: tags/2.7.5/modules/unsupported/app-schema/webservice/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/app-schema/webservice/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/app-schema/webservice/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>app-schema</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/caching/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/caching/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/caching/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>unsupported</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/coverage-experiment/coverage-api/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/coverage-experiment/coverage-api/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/coverage-experiment/coverage-api/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>gt-coverage-experiment</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/coverage-experiment/coverage-core/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/coverage-experiment/coverage-core/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/coverage-experiment/coverage-core/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>gt-coverage-experiment</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
Modified: tags/2.7.5/modules/unsupported/coverage-experiment/grib1/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/coverage-experiment/grib1/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/coverage-experiment/grib1/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>gt-coverage-experiment</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/unsupported/coverage-experiment/hdf4/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/coverage-experiment/hdf4/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/modules/unsupported/coverage-experiment/hdf4/pom.xml 2012-06-01 14:32:59 UTC (rev 38793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.geotools</groupId>
<artifactId>gt-coverage-experiment</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.7.5</version>
</parent>
<!-- =========================================================== -->
Modified: tags/2.7.5/modules/unsupported/coverage-experiment/netcdf/pom.xml
===================================================================
--- tags/2.7.5/modules/unsupported/coverage-experiment/netcdf/pom.xml 2012-06-01 14:18:48 UTC (rev 38792)
+++ tags/2.7.5/m...
[truncated message content] |
|
From: <svn...@os...> - 2012-06-01 14:18:59
|
Author: afabiani Date: 2012-06-01 07:18:48 -0700 (Fri, 01 Jun 2012) New Revision: 38792 Added: tags/2.7.5/ Log: tagging 2.7.5 Property changes on: tags/2.7.5 ___________________________________________________________________ Added: svn:ignore + .project .settings .classpath .jetproperties .wtpmodules target bin cobertura.ser nbproject nbactions.xml target.list Added: svn:mergeinfo + /branches/simple-features:35278-35308 |
|
From: <svn...@os...> - 2012-06-01 14:16:40
|
Author: jdeolive
Date: 2012-06-01 07:16:28 -0700 (Fri, 01 Jun 2012)
New Revision: 38791
Modified:
trunk/build/release/build_release.sh
Log:
properly specifying svn branch url
Modified: trunk/build/release/build_release.sh
===================================================================
--- trunk/build/release/build_release.sh 2012-05-31 14:50:12 UTC (rev 38790)
+++ trunk/build/release/build_release.sh 2012-06-01 14:16:28 UTC (rev 38791)
@@ -74,14 +74,14 @@
svn_opts="--username $svn_user --password $svn_passwd --non-interactive --trust-server-cert"
+if [ "$branch" == "trunk" ]; then
+ svn_url=$SVN_ROOT/trunk
+else
+ svn_url=$SVN_ROOT/branches/$branch
+fi
+
if [ ! -z $BUILD_FROM_BRANCH ]; then
if [ ! -e tags/$tag ]; then
- if [ "$branch" == "trunk" ]; then
- svn_url=$SVN_ROOT/trunk
- else
- svn_url=$SVN_ROOT/branches/$branch
- fi
-
echo "checking out $svn_url"
svn co $svn_opts $svn_url tags/$tag
fi
@@ -104,7 +104,7 @@
fi
echo "Creating $tag tag from $branch ($rev) at $svn_tag_url"
- svn cp $svn_opts -m "tagging $tag" $revopt $SVN_ROOT/$branch $svn_tag_url
+ svn cp $svn_opts -m "tagging $tag" $revopt $svn_url $svn_tag_url
# checkout newly created tag
if [ -e tags/$tag ]; then
|
Author: jdeolive
Date: 2012-05-31 07:50:12 -0700 (Thu, 31 May 2012)
New Revision: 38790
Added:
trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java
Modified:
trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java
trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java
trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java
trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java
trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java
trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java
trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java
Log:
GEOT-3581, making GML srsName syntax configurable in GML encoding
Modified: trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -375,6 +375,26 @@
}
/**
+ * Returns the first dependency of this configuration of the specified type.
+ * @since 8.0
+ */
+ public <C extends Configuration> C getDependency(Class<C> clazz) {
+ //first try straight dependencies
+ for (Configuration dep : (List<Configuration>)getDependencies()) {
+ if (clazz.isInstance(dep)) {
+ return (C) dep;
+ }
+ }
+ //fall back to all
+ for (Configuration dep : (List<Configuration>)allDependencies()) {
+ if (clazz.isInstance(dep)) {
+ return (C) dep;
+ }
+ }
+ return null;
+ }
+
+ /**
* Adds a dependent configuration.
* <p>
* This method should only be called from the constructor.
Modified: trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -84,6 +84,11 @@
public static final QName ENCODE_FEATURE_MEMBER = new QName( "org.geotools.gml", "encodeFeatureMember" );
/**
+ * Srs name style to encode srsName URI's with
+ */
+ protected SrsSyntax srsSyntax = SrsSyntax.OGC_HTTP_URL;
+
+ /**
* Creates the new gml configuration, with a depenendency
* on {@link XLINKConfiguration}
*/
@@ -99,6 +104,23 @@
getProperties().add(Parser.Properties.PARSE_UNKNOWN_ATTRIBUTES);
}
+ /**
+ * Sets the syntax to use for encoding srs uris.
+ * <p>
+ * If this method is not explicitly called {@link SrsSyntax#LEGACY} is used as the default.
+ * </p>
+ */
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ this.srsSyntax = srsSyntax;
+ }
+
+ /**
+ * Returns the syntax to use for encoding srs uris.
+ */
+ public SrsSyntax getSrsSyntax() {
+ return srsSyntax;
+ }
+
public void registerBindings(MutablePicoContainer container) {
//geometry
container.registerComponentImplementation(GML.AbstractGeometryCollectionBaseType,
@@ -182,5 +204,7 @@
CoordinateArraySequenceFactory.instance());
container.registerComponentImplementation(GeometryFactory.class);
container.registerComponentImplementation(DefaultFeatureCollections.class);
+
+ container.registerComponentInstance(srsSyntax);
}
}
Added: trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java (rev 0)
+++ trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -0,0 +1,69 @@
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2002-2012, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
+package org.geotools.gml2;
+
+/**
+ * Enumeration describing the syntax to use for an srsName URI.
+ *
+ * @author Justin Deoliveira, OpenGeo
+ *
+ */
+public enum SrsSyntax {
+
+ /**
+ * Commonly used syntax outside of gml that follows the form: <pre>EPSG:1234</pre>.
+ */
+ EPSG_CODE ("EPSG:"),
+
+ /**
+ * First form of url syntax used by GML 2.1.2 that follows the form:
+ *
+ * <pre>http://www.opengis.net/gml/srs/epsg.xml#1234</pre>.
+ */
+ OGC_HTTP_URL ("http://www.opengis.net/gml/srs/epsg.xml#"),
+
+ /**
+ * First form of urn syntax used by GML 3 that follows the form:
+ *
+ * <pre>urn:x-ogc:def:crs:EPSG:1234</pre>.
+ */
+ OGC_URN_EXPERIMENTAL ("urn:x-ogc:def:crs:EPSG:"),
+
+ /**
+ * Revised form of urn syntax used by GML 3 that follows the form:
+ *
+ * <pre>urn:ogc:def:crs:EPSG::1234</pre>.
+ */
+ OGC_URN ("urn:ogc:def:crs:EPSG::"),
+
+ /**
+ * Newest form from OGC using a url syntax of the form:
+ *
+ * <pre>"http://www.opengis.net/def/crs/EPSG/0/1234</pre>.
+ */
+ OGC_HTTP_URI ("http://www.opengis.net/def/crs/EPSG/0/");
+
+ private String prefix;
+
+ private SrsSyntax(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+}
Modified: trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -27,6 +27,7 @@
import org.eclipse.xsd.XSDElementDeclaration;
import org.eclipse.xsd.XSDTypeDefinition;
import org.geotools.gml2.GML;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.metadata.iso.citation.Citations;
import org.geotools.referencing.CRS;
import org.geotools.referencing.CRS.AxisOrder;
@@ -91,7 +92,7 @@
public static String toURI(CoordinateReferenceSystem crs) {
return toURI(crs,false);
}
-
+
/**
* Encodes the crs object as a uri.
* <p>
@@ -99,17 +100,30 @@
* </p>
*/
public static String toURI(CoordinateReferenceSystem crs, boolean forceOldStyle) {
+ return toURI(crs, forceOldStyle ? SrsSyntax.OGC_HTTP_URL : SrsSyntax.OGC_URN_EXPERIMENTAL);
+ }
+
+ /**
+ * Encodes the crs object as a uri using the specified syntax.
+ * <p>
+ * The axis order of the crs is taken into account. In cases where
+ * </p>
+ */
+ public static String toURI(CoordinateReferenceSystem crs, SrsSyntax srsSyntax) {
String code = epsgCode(crs);
AxisOrder axisOrder = CRS.getAxisOrder(crs, true);
if (code != null) {
- if (forceOldStyle ||( (axisOrder == AxisOrder.EAST_NORTH) ||
- (axisOrder == AxisOrder.INAPPLICABLE)) ) {
- return "http://www.opengis.net/gml/srs/epsg.xml#" + code;
- } else {
- //return "urn:x-ogc:def:crs:EPSG:6.11.2:" + code;
- return "urn:x-ogc:def:crs:EPSG:" + code;
+ //do an axis order check, if axisOrder is east/north or inapplicable force the legacy
+ // syntax since the newer syntaxes define a different axis ordering
+ //JD: TODO: perhaps we don't want to do this override and just want to use the specified
+ // syntax verbatim, maintaining this check for to maintain the excision behavior of this
+ // method
+ if (axisOrder == AxisOrder.EAST_NORTH || axisOrder == AxisOrder.INAPPLICABLE) {
+ srsSyntax = SrsSyntax.OGC_HTTP_URL;
}
+
+ return srsSyntax.getPrefix() + code;
}
return null;
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -19,6 +19,7 @@
import javax.xml.namespace.QName;
import org.geotools.gml2.FeatureTypeCache;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml2.bindings.GMLCoordTypeBinding;
import org.geotools.gml2.bindings.GMLCoordinatesTypeBinding;
import org.geotools.gml3.bindings.AbstractFeatureCollectionTypeBinding;
@@ -125,7 +126,12 @@
* extended support for arcs and surface flag
*/
boolean extArcSurfaceSupport = false;
-
+
+ /**
+ * Srs name style to encode srsName URI's with
+ */
+ protected SrsSyntax srsSyntax = SrsSyntax.OGC_URN_EXPERIMENTAL;
+
public GMLConfiguration() {
this(false);
}
@@ -148,6 +154,23 @@
}
/**
+ * Sets the syntax to use for encoding srs uris.
+ * <p>
+ * If this method is not explicitly called {@link SrsSyntax#URN} is used as the default.
+ * </p>
+ */
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ this.srsSyntax = srsSyntax;
+ }
+
+ /**
+ * Returns the syntax to use for encoding srs uris.
+ */
+ public SrsSyntax getSrsSyntax() {
+ return srsSyntax;
+ }
+
+ /**
* Flag that when set triggers extended support for arcs and surfaces.
*/
public void setExtendedArcSurfaceSupport(boolean arcSurfaceSupport) {
@@ -314,5 +337,7 @@
if (isExtendedArcSurfaceSupport()) {
container.registerComponentInstance(new ArcParameters());
}
+
+ container.registerComponentInstance(srsSyntax);
}
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -19,6 +19,7 @@
import javax.xml.namespace.QName;
import org.geotools.geometry.jts.coordinatesequence.CoordinateSequences;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.GML;
import org.geotools.gml3.GMLConfiguration;
import org.geotools.xml.AbstractComplexBinding;
@@ -70,15 +71,21 @@
*/
public class AbstractGeometryTypeBinding extends AbstractComplexBinding {
Configuration config;
+ SrsSyntax srsSyntax;
- public AbstractGeometryTypeBinding(Configuration config) {
+ public AbstractGeometryTypeBinding(Configuration config, SrsSyntax srsSyntax) {
this.config = config;
+ this.srsSyntax = srsSyntax;
}
public void setConfiguration(Configuration config) {
this.config = config;
}
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ this.srsSyntax = srsSyntax;
+ }
+
/**
* @generated
*/
@@ -124,7 +131,7 @@
if ("srsName".equals(name.getLocalPart())) {
CoordinateReferenceSystem crs = GML3EncodingUtils.getCRS(geometry);
if (crs != null) {
- return GML3EncodingUtils.toURI(crs);
+ return GML3EncodingUtils.toURI(crs, srsSyntax);
}
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -22,6 +22,7 @@
import org.geotools.geometry.jts.LiteCoordinateSequence;
import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.GML;
import org.geotools.gml3.GMLConfiguration;
import org.geotools.xml.AbstractComplexBinding;
@@ -89,9 +90,11 @@
*/
public class EnvelopeTypeBinding extends AbstractComplexBinding {
Configuration config;
-
- public EnvelopeTypeBinding(Configuration config) {
+ SrsSyntax srsSyntax;
+
+ public EnvelopeTypeBinding(Configuration config, SrsSyntax srsSyntax) {
this.config = config;
+ this.srsSyntax = srsSyntax;
}
/**
@@ -185,7 +188,7 @@
String localName = name.getLocalPart();
if (localName.equals("srsName")) {
return GML3EncodingUtils.toURI(((ReferencedEnvelope) envelope)
- .getCoordinateReferenceSystem());
+ .getCoordinateReferenceSystem(), srsSyntax);
} else if (localName.equals("srsDimension")) {
//check if srsDimension is turned off
if (config.hasProperty(GMLConfiguration.NO_SRS_DIMENSION)) {
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -28,6 +28,7 @@
import org.eclipse.xsd.XSDElementDeclaration;
import org.geotools.feature.NameImpl;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml2.bindings.GML2EncodingUtils;
import org.geotools.gml2.bindings.GMLEncodingUtils;
import org.geotools.gml3.GML;
@@ -87,13 +88,13 @@
return line.getCoordinateSequence();
}
- static URI toURI(CoordinateReferenceSystem crs) {
+ static URI toURI(CoordinateReferenceSystem crs, SrsSyntax srsSyntax) {
if (crs == null) {
return null;
}
try {
- String crsCode = GML2EncodingUtils.crs(crs);
+ String crsCode = GML2EncodingUtils.toURI(crs, srsSyntax);
if (crsCode != null) {
return new URI(crsCode);
@@ -105,13 +106,6 @@
}
}
- /**
- * @deprecated use {@link #toURI(CoordinateReferenceSystem)}.
- */
- static URI crs(CoordinateReferenceSystem crs) {
- return toURI(crs);
- }
-
static CoordinateReferenceSystem getCRS(Geometry g) {
return GML2EncodingUtils.getCRS(g);
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -18,6 +18,7 @@
import javax.xml.namespace.QName;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml2.bindings.GMLCoordinatesTypeBinding;
import org.geotools.gml3.bindings.AbstractFeatureCollectionTypeBinding;
import org.geotools.gml3.bindings.AbstractFeatureTypeBinding;
@@ -92,6 +93,11 @@
public static final QName NO_SRS_DIMENSION = org.geotools.gml3.GMLConfiguration.NO_SRS_DIMENSION;
/**
+ * gml3 configuration used to delegate to for configuration
+ */
+ org.geotools.gml3.GMLConfiguration delegate;
+
+ /**
* Creates a new configuration.
*
* @generated
@@ -106,26 +112,39 @@
*/
public GMLConfiguration(boolean arcSurfaceSupport) {
super(GML.getInstance());
- this.extArcSurfaceSupport = arcSurfaceSupport;
+ delegate = new org.geotools.gml3.GMLConfiguration(arcSurfaceSupport);
+ delegate.setSrsSyntax(SrsSyntax.OGC_URN);
}
/**
- * extended support for arcs and surface flag
- */
- boolean extArcSurfaceSupport = false;
-
- /**
* Flag that when set triggers extended support for arcs and surfaces.
*/
public void setExtendedArcSurfaceSupport(boolean extArcSurfaceSupport) {
- this.extArcSurfaceSupport = extArcSurfaceSupport;
+ delegate.setExtendedArcSurfaceSupport(extArcSurfaceSupport);
}
public boolean isExtendedArcSurfaceSupport() {
- return extArcSurfaceSupport;
+ return delegate.isExtendedArcSurfaceSupport();
}
-
+
/**
+ * Sets the syntax to use for encoding srs uris.
+ * <p>
+ * If this method is not explicitly called {@link SrsSyntax#URN2} is used as the default.
+ * </p>
+ */
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ delegate.setSrsSyntax(srsSyntax);
+ }
+
+ /**
+ * Returns the syntax to use for encoding srs uris.
+ */
+ public SrsSyntax getSrsSyntax() {
+ return delegate.getSrsSyntax();
+ }
+
+ /**
* Registers the bindings for the configuration.
*
* @generated
@@ -250,7 +269,8 @@
@Override
protected void configureContext(MutablePicoContainer container) {
super.configureContext(container);
- new org.geotools.gml3.GMLConfiguration(extArcSurfaceSupport).configureContext(container);
+
+ delegate.configureContext(container);
container.unregisterComponent(GML3EncodingUtils.class);
container.registerComponentInstance(new GML32EncodingUtils());
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -18,13 +18,14 @@
import javax.xml.namespace.QName;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.v3_2.GML;
import org.geotools.xml.Configuration;
public class EnvelopeTypeBinding extends org.geotools.gml3.bindings.EnvelopeTypeBinding {
- public EnvelopeTypeBinding(Configuration config) {
- super(config);
+ public EnvelopeTypeBinding(Configuration config, SrsSyntax srsSyntax) {
+ super(config, srsSyntax);
}
@Override
Modified: trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -28,6 +28,7 @@
import org.apache.xerces.parsers.SAXParser;
import org.eclipse.xsd.XSDSchema;
import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.bindings.GML3MockData;
import org.geotools.gml3.bindings.TEST;
import org.geotools.gml3.bindings.TestConfiguration;
@@ -203,4 +204,21 @@
dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
assertFalse(dom.getDocumentElement().hasAttribute("srsDimension"));
}
+
+ public void testEncodeSrsSyntax() throws Exception {
+ GMLConfiguration gml = new GMLConfiguration();
+ Document dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
+ assertTrue(dom.getDocumentElement().getAttribute("srsName")
+ .startsWith("urn:x-ogc:def:crs:EPSG:"));
+
+ gml.setSrsSyntax(SrsSyntax.OGC_URN);
+ dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
+ assertTrue(dom.getDocumentElement().getAttribute("srsName")
+ .startsWith("urn:ogc:def:crs:EPSG::"));
+
+ gml.setSrsSyntax(SrsSyntax.OGC_HTTP_URI);
+ dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
+ assertTrue(dom.getDocumentElement().getAttribute("srsName")
+ .startsWith("http://www.opengis.net/def/crs/EPSG/0/"));
+ }
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -48,7 +48,6 @@
assertEquals(1,
dom.getElementsByTagNameNS(GML.NAMESPACE, GML.pos.getLocalPart()).getLength());
- //assertEquals("urn:x-ogc:def:crs:EPSG:6.11.2:4326",
- assertEquals("urn:x-ogc:def:crs:EPSG:4326", dom.getDocumentElement().getAttribute("srsName"));
+ assertEquals("urn:ogc:def:crs:EPSG::4326", dom.getDocumentElement().getAttribute("srsName"));
}
}
Modified: trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java
===================================================================
--- trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -4,7 +4,6 @@
import javax.xml.namespace.QName;
import org.geotools.filter.v2_0.FES;
-import org.geotools.gml3.v3_2.GML;
import org.geotools.ows.v1_1.OWS;
import org.geotools.xml.XSD;
@@ -38,7 +37,6 @@
protected void addDependencies(Set dependencies) {
dependencies.add(OWS.getInstance());
dependencies.add(FES.getInstance());
- dependencies.add(GML.getInstance());
}
/**
Modified: trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -9,15 +9,11 @@
import net.opengis.wfs20.DropStoredQueryType;
import net.opengis.wfs20.ResolveValueType;
import net.opengis.wfs20.ResultTypeType;
-import net.opengis.wfs20.StoredQueryDescriptionType;
import net.opengis.wfs20.UpdateActionType;
-import net.opengis.wfs20.ValueReferenceType;
import net.opengis.wfs20.Wfs20Factory;
import org.geotools.filter.v2_0.FESConfiguration;
import org.geotools.gml3.XSDIdRegistry;
-import org.geotools.gml3.v3_2.GML;
-import org.geotools.gml3.v3_2.GMLConfiguration;
import org.geotools.ows.v1_1.OWSConfiguration;
import org.geotools.wfs.v2_0.bindings.EnvelopePropertyTypeBinding;
import org.geotools.wfs.v2_0.bindings.ParameterParserDelegate;
@@ -57,7 +53,6 @@
addDependency(new OWSConfiguration());
addDependency(new FESConfiguration());
- addDependency(new GMLConfiguration());
}
@Override
|
|
From: <svn...@os...> - 2012-05-30 19:16:18
|
Author: jdeolive Date: 2012-05-30 12:16:05 -0700 (Wed, 30 May 2012) New Revision: 38789 Modified: trunk/build/release/publish_release.sh Log: adding steps to publish to maven Modified: trunk/build/release/publish_release.sh =================================================================== --- trunk/build/release/publish_release.sh 2012-05-30 19:15:50 UTC (rev 38788) +++ trunk/build/release/publish_release.sh 2012-05-30 19:16:05 UTC (rev 38789) @@ -22,6 +22,12 @@ . "$( cd "$( dirname "$0" )" && pwd )"/properties . "$( cd "$( dirname "$0" )" && pwd )"/functions +# deploy the release to maven repo +pushd tags/$tag/src > /dev/null +mvn deploy -DskipTests +mvn -P deploy.opengeo deploy -DskipTests +popd > /dev/null + # get <major.minor> for sf release dir if [ "$( echo $str | egrep "[0-9]+\.[0-9]+((\.|-).*)?" )" != "$str" ]; then echo "$tag is not a valid release version number" |
|
From: <svn...@os...> - 2012-05-30 19:16:03
|
Author: jdeolive Date: 2012-05-30 12:15:50 -0700 (Wed, 30 May 2012) New Revision: 38788 Modified: trunk/build/release/hudson_release.sh Log: setting path so JAVA_HOME/bin first on PATH Modified: trunk/build/release/hudson_release.sh =================================================================== --- trunk/build/release/hudson_release.sh 2012-05-30 16:55:16 UTC (rev 38787) +++ trunk/build/release/hudson_release.sh 2012-05-30 19:15:50 UTC (rev 38788) @@ -22,4 +22,7 @@ OPTS="$OPTS -p $SVN_PASSWD" fi +if [ ! -z $JAVA_HOME ]; then + export PATH=$JAVA_HOME/bin:$PATH +fi ./build_release.sh $OPTS $VERSION |
|
From: <svn...@os...> - 2012-05-30 16:55:24
|
Author: jdeolive Date: 2012-05-30 09:55:16 -0700 (Wed, 30 May 2012) New Revision: 38787 Modified: trunk/build/release/build_release.sh Log: forgot assembly step Modified: trunk/build/release/build_release.sh =================================================================== --- trunk/build/release/build_release.sh 2012-05-30 13:16:28 UTC (rev 38786) +++ trunk/build/release/build_release.sh 2012-05-30 16:55:16 UTC (rev 38787) @@ -144,6 +144,7 @@ echo "building release" #mvn $MAVEN_FLAGS -Dall clean mvn $MAVEN_FLAGS -DskipTests clean install + mvn $MAVEN_FLAGS -DskipTests assembly:assembly fi pushd target > /dev/null |
|
From: <svn...@os...> - 2012-05-30 13:16:41
|
Author: jdeolive Date: 2012-05-30 06:16:28 -0700 (Wed, 30 May 2012) New Revision: 38786 Modified: trunk/build/release/build_release.sh Log: disabling pre clean step, since on a tag won't be needed and it fails after version numbers have been changed Modified: trunk/build/release/build_release.sh =================================================================== --- trunk/build/release/build_release.sh 2012-05-30 13:07:49 UTC (rev 38785) +++ trunk/build/release/build_release.sh 2012-05-30 13:16:28 UTC (rev 38786) @@ -142,8 +142,8 @@ # build the release if [ -z $SKIP_BUILD ]; then echo "building release" - mvn $MAVEN_FLAGS -Dall clean - mvn $MAVEN_FLAGS -DskipTests install + #mvn $MAVEN_FLAGS -Dall clean + mvn $MAVEN_FLAGS -DskipTests clean install fi pushd target > /dev/null |
|
From: <svn...@os...> - 2012-05-30 13:08:01
|
Author: jdeolive
Date: 2012-05-30 06:07:49 -0700 (Wed, 30 May 2012)
New Revision: 38785
Modified:
branches/2.7.x/build/rename.xml
Log:
fixing path reference . -> .. in rename.xml
Modified: branches/2.7.x/build/rename.xml
===================================================================
--- branches/2.7.x/build/rename.xml 2012-05-30 13:01:39 UTC (rev 38784)
+++ branches/2.7.x/build/rename.xml 2012-05-30 13:07:49 UTC (rev 38785)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Rename" default="rename">
<target name="rename">
- <replace dir=".">
+ <replace dir="..">
<include name="**/pom.xml"/>
<replacefilter token="<version>2.7-SNAPSHOT</version>"
value="<version>@VERSION@</version>"/>
|
|
From: <svn...@os...> - 2012-05-30 13:01:52
|
Author: jdeolive
Date: 2012-05-30 06:01:39 -0700 (Wed, 30 May 2012)
New Revision: 38784
Modified:
branches/2.7.x/build/rename.xml
Log:
fixing version numbers and path to GeoTools.java in rename.xml
Modified: branches/2.7.x/build/rename.xml
===================================================================
--- branches/2.7.x/build/rename.xml 2012-05-30 12:53:10 UTC (rev 38783)
+++ branches/2.7.x/build/rename.xml 2012-05-30 13:01:39 UTC (rev 38784)
@@ -3,13 +3,13 @@
<target name="rename">
<replace dir=".">
<include name="**/pom.xml"/>
- <replacefilter token="<version>2.6-SNAPSHOT</version>"
- value="<version>2.6-RC2</version>"/>
+ <replacefilter token="<version>2.7-SNAPSHOT</version>"
+ value="<version>@VERSION@</version>"/>
</replace>
- <replace dir="./modules/library/metadata/src/main/java/org/geotools/factory">
+ <replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
<include name="GeoTools.java"/>
- <replacefilter token="2.6-SNAPSHOT"
- value="2.6-RC2"/>
+ <replacefilter token="2.7-SNAPSHOT"
+ value="@VERSION@"/>
</replace>
</target>
</project>
|
|
From: <svn...@os...> - 2012-05-30 12:53:20
|
Author: jdeolive
Date: 2012-05-30 05:53:10 -0700 (Wed, 30 May 2012)
New Revision: 38783
Modified:
trunk/build/release/functions
Log:
fixing sed statement used to parse out jira release id
Modified: trunk/build/release/functions
===================================================================
--- trunk/build/release/functions 2012-05-30 05:45:18 UTC (rev 38782)
+++ trunk/build/release/functions 2012-05-30 12:53:10 UTC (rev 38783)
@@ -90,7 +90,8 @@
# gets the jira id for a version named <tag>
function get_jira_id() {
local tag=$1
- local jira_id=`curl -s -G $JIRA_REST/project/$JIRA_PROJ/versions | tr "{" "\n" | grep $tag | tr "," "\n" | grep "\"id\"" | sed 's/"id": *\([0-9]*\).*/\1/g'`
+ local jira_id=`curl -s -G $JIRA_REST/project/$JIRA_PROJ/versions | tr "{" "\n" | grep $tag | tr "," "\n" | grep "\"id\"" | sed 's/"id": *"\([0-9]\+\).*/\1/g'`
+
if [ ! -z $jira_id ]; then
echo $jira_id
fi
|
|
From: <svn...@os...> - 2012-05-30 05:45:27
|
Author: jive
Date: 2012-05-29 22:45:18 -0700 (Tue, 29 May 2012)
New Revision: 38782
Modified:
trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java
Log:
Allow access to default repository; sensibly fall back to default repository if custom repo mapping resulted in null
Modified: trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java
===================================================================
--- trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java 2012-05-30 05:08:04 UTC (rev 38781)
+++ trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java 2012-05-30 05:45:18 UTC (rev 38782)
@@ -202,8 +202,15 @@
}
return features;
}
-
/**
+ * Access the default repository (as provided to the constructor).
+ *
+ * @return Default repository (provided to the constructor)
+ */
+ protected Repository getRepository(){
+ return repository;
+ }
+ /**
* Lookup appropriate repository for provided typeName.
* <b>
* By default there is a single GeoGit repository associated with the {@link #unversioned}
@@ -225,6 +232,9 @@
*/
protected FeatureSource<T, F> createFeatureSource(FeatureSource<T, F> source) {
Repository repo = getRepository( source.getName() );
+ if( repo == null ){
+ repo = getRepository();
+ }
return new FeatureSourceDecorator(source, repo);
}
/**
@@ -236,6 +246,9 @@
*/
protected FeatureStore<T, F> createFeatureStore(FeatureStore<T, F> store) {
Repository repo = getRepository( store.getName() );
+ if( repo == null ){
+ repo = getRepository();
+ }
return new FeatureStoreDecorator(store, repo);
}
|
|
From: <svn...@os...> - 2012-05-30 05:08:11
|
Author: jive
Date: 2012-05-29 22:08:04 -0700 (Tue, 29 May 2012)
New Revision: 38781
Modified:
trunk/pom.xml
Log:
Set source encoding as UTF-8 to remove warnings from maven
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-05-30 03:48:34 UTC (rev 38780)
+++ trunk/pom.xml 2012-05-30 05:08:04 UTC (rev 38781)
@@ -98,6 +98,7 @@
<build.timestamp>${maven.build.timestamp}</build.timestamp>
<fork.javac>true</fork.javac>
<javac.maxHeapSize>256M</javac.maxHeapSize>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<!-- Profiles set on the command-line overwrite default properties. -->
|
|
From: <svn...@os...> - 2012-05-30 03:48:44
|
Author: jdeolive Date: 2012-05-29 20:48:34 -0700 (Tue, 29 May 2012) New Revision: 38780 Modified: trunk/build/release/ Log: setting svn:ignore on tags directory Property changes on: trunk/build/release ___________________________________________________________________ Added: svn:ignore + tags |
|
From: <svn...@os...> - 2012-05-30 03:35:39
|
Author: jdeolive
Date: 2012-05-29 20:35:31 -0700 (Tue, 29 May 2012)
New Revision: 38779
Added:
trunk/build/release/hudson_release.sh
Modified:
trunk/build/release/build_release.sh
Log:
added svn_opts to release script and a wrapper script to invoke from hudson
Modified: trunk/build/release/build_release.sh
===================================================================
--- trunk/build/release/build_release.sh 2012-05-30 03:24:31 UTC (rev 38778)
+++ trunk/build/release/build_release.sh 2012-05-30 03:35:31 UTC (rev 38779)
@@ -2,7 +2,6 @@
# error out if any statements fail
set -e
-set -x
function usage() {
echo "$0 [options] <tag>"
@@ -13,6 +12,8 @@
echo " -h : Print usage"
echo " -b <branch> : Branch to release from (eg: trunk, 2.1.x, ...)"
echo " -r <rev> : Revision to release (eg: 12345)"
+ echo " -u <user> : Subversion username"
+ echo " -p <passwd> : Subversion password"
echo
echo "Environment variables:"
echo " BUILD_FROM_BRANCH : Builds release from branch rather than tag"
@@ -21,7 +22,7 @@
}
# parse options
-while getopts "hb:r:" opt; do
+while getopts "hb:r:u:p:" opt; do
case $opt in
h)
usage
@@ -33,6 +34,12 @@
r)
rev=$OPTARG
;;
+ u)
+ svn_user=$OPTARG
+ ;;
+ p)
+ svn_passwd=$OPTARG
+ ;;
\?)
usage
exit 1
@@ -65,6 +72,8 @@
mvn -version
+svn_opts="--username $svn_user --password $svn_passwd --non-interactive --trust-server-cert"
+
if [ ! -z $BUILD_FROM_BRANCH ]; then
if [ ! -e tags/$tag ]; then
if [ "$branch" == "trunk" ]; then
@@ -74,17 +83,18 @@
fi
echo "checking out $svn_url"
- svn co $svn_url tags/$tag
+ svn co $svn_opts $svn_url tags/$tag
fi
else
# check if the svn tag already exists
if [ -z $SKIP_SVN_TAG ]; then
- set +e && svn ls $SVN_ROOT/tags/$tag >& /dev/null && set -e
+ svn_tag_url=$SVN_ROOT/tags/$tag
+ set +e && svn ls $svn_opts $svn_tag_url >& /dev/null && set -e
if [ $? == 0 ]; then
# tag already exists
- # TODO: delete it automatically...
- echo "svn tag $tag already exists, delete before proceeding"
- exit 1
+ # tag already exists
+ echo "svn tag $tag already exists, deleteing"
+ svn $svn_opts rm -m "removing $tag tag" $svn_tag_url
fi
# create svn tag
@@ -93,7 +103,8 @@
revopt=""
fi
- echo "svn cp -m "tagging $tag" $revopt $SVN_ROOT/$branch $SVN_ROOT/tags/$tag"
+ echo "Creating $tag tag from $branch ($rev) at $svn_tag_url"
+ svn cp $svn_opts -m "tagging $tag" $revopt $SVN_ROOT/$branch $svn_tag_url
# checkout newly created tag
if [ -e tags/$tag ]; then
@@ -102,7 +113,7 @@
fi
echo "checking out tag $tag"
- svn co $SVN_ROOT/tags/$tag tags/$tag
+ svn $svn_opts co $svn_tag_url tags/$tag
fi
fi
@@ -180,5 +191,12 @@
popd > /dev/null
+# svn commit changes on the tag
+if [ -z $SKIP_SVN_TAG ]; then
+ pushd tags/$tag > /dev/null
+ svn commit $svn_opts -m "updating version numbers for $tag" .
+ popd > /dev/null
+fi
+
echo "build complete, artifacts available at $DIST_URL/$tag"
exit 0
Added: trunk/build/release/hudson_release.sh
===================================================================
--- trunk/build/release/hudson_release.sh (rev 0)
+++ trunk/build/release/hudson_release.sh 2012-05-30 03:35:31 UTC (rev 38779)
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# main script invoked by hudson
+
+# sanity check parameters
+[ -z $BRANCH ] && echo "BRANCH variable mandatory" && exit 1
+[ -z $REV ] && echo "REV variable mandatory" && exit 1
+[ -z $VERSION ] && echo "VERSION variable mandatory" && exit 1
+[ -z $SVN_TAG ] && echo "SVN_TAG variable mandatory" && exit 1
+
+if [ "$SVN_TAG" == "false" ]; then
+ echo "skipping svn tag"
+ export SKIP_SVN_TAG="true"
+ export BUILD_FROM_BRANCH="true"
+fi
+
+OPTS="-b $BRANCH -r $REV"
+if [ ! -z $SVN_USER ]; then
+ OPTS="$OPTS -u $SVN_USER"
+fi
+if [ ! -z $SVN_PASSWD ]; then
+ OPTS="$OPTS -p $SVN_PASSWD"
+fi
+
+./build_release.sh $OPTS $VERSION
Property changes on: trunk/build/release/hudson_release.sh
___________________________________________________________________
Added: svn:executable
+ *
|
|
From: <svn...@os...> - 2012-05-30 03:24:41
|
Author: jdeolive
Date: 2012-05-29 20:24:31 -0700 (Tue, 29 May 2012)
New Revision: 38778
Added:
trunk/build/release/
trunk/build/release/build_release.sh
trunk/build/release/functions
trunk/build/release/jira_release.py
trunk/build/release/properties
trunk/build/release/publish_release.sh
Modified:
trunk/build/rename.xml
Log:
adding automated release scripts
Added: trunk/build/release/build_release.sh
===================================================================
--- trunk/build/release/build_release.sh (rev 0)
+++ trunk/build/release/build_release.sh 2012-05-30 03:24:31 UTC (rev 38778)
@@ -0,0 +1,184 @@
+#!/bin/bash
+
+# error out if any statements fail
+set -e
+set -x
+
+function usage() {
+ echo "$0 [options] <tag>"
+ echo
+ echo " tag : Release tag (eg: 2.7.5, 8.0-RC1, ...)"
+ echo
+ echo "Options:"
+ echo " -h : Print usage"
+ echo " -b <branch> : Branch to release from (eg: trunk, 2.1.x, ...)"
+ echo " -r <rev> : Revision to release (eg: 12345)"
+ echo
+ echo "Environment variables:"
+ echo " BUILD_FROM_BRANCH : Builds release from branch rather than tag"
+ echo " SKIP_SVN_TAG : Skips creation of svn tag"
+ echo " SKIP_BUILD : Skips main release build"
+}
+
+# parse options
+while getopts "hb:r:" opt; do
+ case $opt in
+ h)
+ usage
+ exit
+ ;;
+ b)
+ branch=$OPTARG
+ ;;
+ r)
+ rev=$OPTARG
+ ;;
+ \?)
+ usage
+ exit 1
+ ;;
+ :)
+ echo "Option -$OPTARG requires an argument"
+ exit 1
+ ;;
+ esac
+done
+
+# clear options to parse main arguments
+shift $(( OPTIND -1 ))
+tag=$1
+
+# sanity check
+if [ -z $tag ] || [ ! -z $2 ]; then
+ usage
+ exit 1
+fi
+
+# load properties + functions
+. "$( cd "$( dirname "$0" )" && pwd )"/properties
+. "$( cd "$( dirname "$0" )" && pwd )"/functions
+
+echo "Building release with following parameters:"
+echo " branch = $branch"
+echo " revision = $rev"
+echo " tag = $tag"
+
+mvn -version
+
+if [ ! -z $BUILD_FROM_BRANCH ]; then
+ if [ ! -e tags/$tag ]; then
+ if [ "$branch" == "trunk" ]; then
+ svn_url=$SVN_ROOT/trunk
+ else
+ svn_url=$SVN_ROOT/branches/$branch
+ fi
+
+ echo "checking out $svn_url"
+ svn co $svn_url tags/$tag
+ fi
+else
+ # check if the svn tag already exists
+ if [ -z $SKIP_SVN_TAG ]; then
+ set +e && svn ls $SVN_ROOT/tags/$tag >& /dev/null && set -e
+ if [ $? == 0 ]; then
+ # tag already exists
+ # TODO: delete it automatically...
+ echo "svn tag $tag already exists, delete before proceeding"
+ exit 1
+ fi
+
+ # create svn tag
+ revopt="-r $rev"
+ if [ "$rev" == "latest" ]; then
+ revopt=""
+ fi
+
+ echo "svn cp -m "tagging $tag" $revopt $SVN_ROOT/$branch $SVN_ROOT/tags/$tag"
+
+ # checkout newly created tag
+ if [ -e tags/$tag ]; then
+ # remove old checkout
+ rm -rf tags/$tag
+ fi
+
+ echo "checking out tag $tag"
+ svn co $SVN_ROOT/tags/$tag tags/$tag
+ fi
+fi
+
+if [ ! -z $SKIP_SVN_TAG ] || [ ! -z $BUILD_FROM_BRANCH ]; then
+ echo "updating tag $tag"
+ svn revert --recursive tags/$tag
+ svn up tags/$tag
+fi
+
+# update the rename script
+# generate release notes
+jira_id=`get_jira_id $tag`
+if [ -z $jira_id ]; then
+ echo "Could not locate release $tag in JIRA"
+ exit -1
+fi
+
+pushd tags/$tag > /dev/null
+
+# update versions
+pushd build > /dev/null
+sed -i 's/@VERSION@/'$tag'/g' rename.xml
+ant -f rename.xml
+popd > /dev/null
+
+# build the release
+if [ -z $SKIP_BUILD ]; then
+ echo "building release"
+ mvn $MAVEN_FLAGS -Dall clean
+ mvn $MAVEN_FLAGS -DskipTests install
+fi
+
+pushd target > /dev/null
+bin=geotools-$tag-bin.zip
+unzip $bin
+cd geotools-$tag
+rm junit*.jar
+rm *dummy-*
+cd ..
+rm $bin
+zip -r $bin geotools-$tag
+rm -rf geotools-$tag
+popd > /dev/null
+
+target=`pwd`/target
+
+# build the javadocs
+pushd modules > /dev/null
+mvn javadoc:aggregate
+pushd target/site > /dev/null
+zip -r $target/geotools-$tag-doc.zip apidocs
+popd > /dev/null
+popd > /dev/null
+
+# build the user docs
+pushd docs > /dev/null
+mvn $MAVEN_FLAGS install
+pushd target/user > /dev/null
+zip -r $target/geotools-$tag-userguide.zip html
+popd > /dev/null
+popd > /dev/null
+
+# copy over the artifacts
+if [ ! -e $DIST_PATH ]; then
+ mkdir -p $DIST_PATH
+fi
+dist=$DIST_PATH/$tag
+if [ -e $dist ]; then
+ rm -rf $dist
+fi
+mkdir $dist
+
+echo "copying artifacts to $dist"
+cp $target/*.zip $dist
+
+popd > /dev/null
+
+echo "build complete, artifacts available at $DIST_URL/$tag"
+exit 0
Property changes on: trunk/build/release/build_release.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/build/release/functions
===================================================================
--- trunk/build/release/functions (rev 0)
+++ trunk/build/release/functions 2012-05-30 03:24:31 UTC (rev 38778)
@@ -0,0 +1,97 @@
+# common functions
+
+# get_file <base_url> <file> <dir>
+# downlaods file from $base_url/$file into directory $dir
+function get_file() {
+ local base_url=$1
+ local file=$2
+ local dir=$3
+
+ if [ ! -e $dir ]; then
+ mkdir $dir
+ fi
+ if [ -e $dir/$file ]; then
+ rm $dir/$file
+ fi
+ pushd $dir > /dev/null
+ wget $base_url/$file
+ popd > /dev/null
+}
+
+# setup_artifacts <tag> <suffix>
+# downloads artifacts to build installer:
+# 1. geoserver bin artifact
+# 2. installer specific artifact specified by <suffix>
+# files are unpacked into tmp directory
+function setup_artifacts() {
+ local tag=$1
+ local suf=$2
+
+ local gs_artifact=geoserver-$tag-bin.zip
+ local installer_artifact=geoserver-$tag-$suf.zip
+
+ if [ -z $SKIP_DOWNLOAD ]; then
+ get_file $DIST_URL/$tag $gs_artifact files
+ get_file $DIST_URL/$tag $installer_artifact files
+ fi
+
+ # unpack the artifacts
+ if [ -e tmp ]; then
+ rm -rf tmp
+ fi
+ mkdir -p tmp
+
+ unzip -d tmp files/$installer_artifact
+ unzip -d tmp files/$gs_artifact
+}
+
+# upload_installer <tag> <file>
+# uploads file <file> to distribution server under tag <tag>
+function upload_installer() {
+ local tag=$1
+ local file=$2
+ local ssh_opts="-i $DIST_PK -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+ if [ -z $SKIP_UPLOAD ]; then
+ echo "uploading $file"
+ scp $ssh_opts -P $DIST_PORT $file $DIST_USER@$DIST_HOST:$DIST_PATH/$tag
+ fi
+}
+
+# start_installer_job <hudson_url> <tag>
+# starts a hudson installer job
+function start_installer_job() {
+ curl -k --connect-timeout 10 "$1/job/geoserver-installer/buildWithParameters?TAG=$2"
+}
+
+# is_version_nuym <str>
+# tests a string to see if it is a x.y.z or x.y-z style version number
+function is_version_num() {
+ local str=$1
+ if [ "$( echo $str | egrep "[0-9]+\.[0-9]+((\.|-).*)?" )" == "$str" ]; then
+ echo "1"
+ else
+ if [ "$( echo $str | egrep "[0-9]+-.*" )" == "$str" ]; then
+ echo "1"
+ else
+ echo "0"
+ fi
+ fi
+}
+
+# get_pom_version <pom>
+# gets the version declared in a pom file
+function get_pom_version() {
+ local pom=$1
+ echo `grep "<version>" $pom | head -n 1 | sed 's/<.*>\(.*\)<\/.*>/\1/g' | sed 's/ //g'`
+}
+
+# get_jira_id <tag>
+# gets the jira id for a version named <tag>
+function get_jira_id() {
+ local tag=$1
+ local jira_id=`curl -s -G $JIRA_REST/project/$JIRA_PROJ/versions | tr "{" "\n" | grep $tag | tr "," "\n" | grep "\"id\"" | sed 's/"id": *\([0-9]*\).*/\1/g'`
+ if [ ! -z $jira_id ]; then
+ echo $jira_id
+ fi
+}
Added: trunk/build/release/jira_release.py
===================================================================
--- trunk/build/release/jira_release.py (rev 0)
+++ trunk/build/release/jira_release.py 2012-05-30 03:24:31 UTC (rev 38778)
@@ -0,0 +1,128 @@
+import sys, optparse, getpass
+import SOAPpy, SOAPpy.Types
+
+class JIRA(object):
+
+ def __init__(self, jira_host, proj, user, passwd):
+ self.proj = proj
+ self.soap = SOAPpy.WSDL.Proxy(
+ '%s/rpc/soap/jirasoapservice-v2?wsdl'%jira_host)
+ self.auth = self.soap.login(user, passwd)
+
+
+ def list_methods(self):
+ for m in self.soap.methods.keys():
+ print m
+
+ def describe_method(self, name):
+ m = self.soap.methods[name]
+ for p in m.inparams:
+ print p.name.ljust(10), p.type
+
+ def list_versions(self):
+ versions = self.soap.getVersions(self.auth, self.proj)
+ return [v.name for v in versions]
+
+ def is_version_released(self, name):
+ versions = self.soap.getVersions(self.auth, self.proj)
+ for v in versions:
+ if v.name == name:
+ return v.released
+
+ def get_version_id(self, name):
+ """
+ Return the id for a named version, returning None if no such version exists.
+ """
+ versions = self.soap.getVersions(self.auth, self.proj)
+ for v in versions:
+ if v.name == name:
+ return v.id
+
+ def create_version(self, name):
+ """
+ Creates a new version with the specified name.
+ """
+ self.soap.addVersion(self.auth, self.proj, {'name': name})
+
+ def get_open_issues(self, ver_name):
+ """
+ Returns keys for unresolved/open issues for the specified version name.
+ """
+ jql = 'project = %s and status in (Open, "In Progress", Reopened) and fixVersion = "%s"' % (self.proj, ver_name)
+ n = SOAPpy.Types.intType(500)
+ issues = self.soap.getIssuesFromJqlSearch(self.auth, jql, n)
+ return [i.key for i in issues]
+
+ def set_fixed_version(self, issue, ver_name):
+ """
+ Sets the fixVersion for an issue
+ """
+ ver_id = self.get_version_id(ver_name)
+ if ver_id:
+ self.soap.updateIssue(self.auth, issue,
+ [{'id': 'fixVersions', 'values': [ver_id]}])
+
+ def release_version(self, ver_name):
+ self.soap.releaseVersion(self.auth, self.proj,
+ {'name': ver_name, "released": True})
+
+if __name__ == "__main__":
+
+ p = optparse.OptionParser('Usage: %prog [options] version next_version')
+ p.add_option('-j', '--host', dest='host', default='http://jira.codehaus.org',
+ help='JIRA host, default is codehaus')
+ p.add_option('-k', '--key', dest='key', default='GEOS',
+ help='JIRA project key, default is GEOS')
+ p.add_option('-u', '--user', dest='user', default=getpass.getuser(),
+ help='JIRA user, default is current OS user')
+ p.add_option('-p', '--passwd', dest='passwd',
+ help='JIRA password')
+ p.add_option('-v', '--verbose', dest='verbose', action='store_true',
+ help='Verbose flag')
+
+ opts, args = p.parse_args()
+ if len(args) < 2:
+ p.error('Must specify version to release and next version')
+
+ opts = vars(opts)
+ jira = JIRA(opts['host'], opts['key'], opts['user'], opts['passwd'])
+
+ verbose = opts['verbose']
+ ver = args[0]
+ next_ver = args[1]
+
+ if not jira.get_version_id(ver):
+ sys.exit('Version %s does not exist in JIRA' % ver)
+
+ if jira.is_version_released(ver) == True:
+ print 'Version %s is already released in JIRA, exiting' % ver
+ sys.exit(0)
+
+ if not jira.get_version_id(next_ver):
+ # create id
+ print 'creating version %s in JIRA' % next_ver
+ jira.create_version(next_ver)
+
+ if not jira.get_version_id(next_ver):
+ sys.exit('Unable to create version %s in JIRA' % next_ver)
+
+ # move over all open issues from old to new
+ x = 0
+ while x < 100:
+ issues = jira.get_open_issues(ver)
+ if len(issues) == 0:
+ break
+
+ for i in jira.get_open_issues(ver):
+ if verbose == True:
+ print 'Setting fix version of %s to %s' % (i, next_ver)
+ jira.set_fixed_version(i, next_ver)
+ x += 1
+
+ # check all versions were moved
+ if len(jira.get_open_issues(ver)) > 0:
+ sys.exit('Unable to move back all issues to version %s' % next_ver)
+
+ # mark the version as released
+ print 'Releasing %s in JIRA' % ver
+ jira.release_version(ver)
Added: trunk/build/release/properties
===================================================================
--- trunk/build/release/properties (rev 0)
+++ trunk/build/release/properties 2012-05-30 03:24:31 UTC (rev 38778)
@@ -0,0 +1,49 @@
+
+# as environment variables
+
+# constants
+SVN_ROOT=http://svn.osgeo.org/geotools
+JIRA_REST=http://jira.codehaus.org/rest/api/latest
+JIRA_PROJ=GEOT
+SF_HOST=frs.sourceforge.net
+
+# parameter defaults
+if [ -z $branch ]; then
+ branch="trunk"
+fi
+
+if [ -z $rev ]; then
+ rev="HEAD"
+fi
+
+if [ -z $DIST_PATH ]; then
+ DIST_PATH=/var/www/html/geotools/release
+fi
+
+if [ -z $DIST_HOST ]; then
+ DIST_HOST=gridlock.opengeo.org
+fi
+
+if [ -z $DIST_URL ]; then
+ DIST_URL=http://$DIST_HOST/geotools/release
+fi
+
+if [ -z $DIST_PORT ]; then
+ DIST_PORT=7777
+fi
+
+if [ -z $DIST_USER ]; then
+ DIST_USER=tomcat
+fi
+
+if [ -z $DIST_PK ]; then
+ DIST_PK=$HOME/.ssh/id_rsa_${DIST_USER}_${DIST_HOST}
+fi
+
+if [ -z $SF_USER ]; then
+ SF_USER=jdeolive
+fi
+
+if [ -z $SF_PK ]; then
+ SF_PK=$HOME/.ssh/id_dsa_${SF_USER}_frs.sourceforge.net
+fi
Added: trunk/build/release/publish_release.sh
===================================================================
--- trunk/build/release/publish_release.sh (rev 0)
+++ trunk/build/release/publish_release.sh 2012-05-30 03:24:31 UTC (rev 38778)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# error out if any statements fail
+set -e
+set -x
+
+function usage() {
+ echo "$0 [options] <tag>"
+ echo
+ echo " tag : Release tag (eg: 2.1.4, 2.2-beta1, ...)"
+ echo
+}
+
+if [ -z $1 ]; then
+ usage
+ exit
+fi
+
+tag=$1
+
+# load properties + functions
+. "$( cd "$( dirname "$0" )" && pwd )"/properties
+. "$( cd "$( dirname "$0" )" && pwd )"/functions
+
+# get <major.minor> for sf release dir
+if [ "$( echo $str | egrep "[0-9]+\.[0-9]+((\.|-).*)?" )" != "$str" ]; then
+ echo "$tag is not a valid release version number"
+ exit 1
+fi
+dir=`echo $tag | sed 's/\([0-9]*\.[0-9]*\).*/\1/g'`
+
+pushd $DIST_PATH/$tag > /dev/null
+
+rsync -ave "ssh -i $SF_PK" *.zip $SF_USER@$SF_HOST:"/home/pfs/project/g/ge/geotools/GeoTools\ $dir\ Releases/$tag/"
+
+popd > /dev/null
Property changes on: trunk/build/release/publish_release.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/build/rename.xml
===================================================================
--- trunk/build/rename.xml 2012-05-30 02:22:31 UTC (rev 38777)
+++ trunk/build/rename.xml 2012-05-30 03:24:31 UTC (rev 38778)
@@ -9,36 +9,36 @@
<replace dir="..">
<include name="**/pom.xml"/>
<replacefilter token="<version>8-SNAPSHOT</version>"
- value="<version>8.0-RC2</version>"/>
+ value="<version>@VERSION@</version>"/>
</replace>
<replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
<include name="GeoTools.java"/>
<replacefilter token="8-SNAPSHOT"
- value="8.0-M5"/>
+ value="@VERSION@"/>
</replace>
</target>
<target name="doc">
<replace dir="../docs/user/tutorial/">
<include name="**/pom.xml"/>
- <replacefilter token="<geotools.version>8.0-RC1</geotools.version>"
- value="<geotools.version>8.0-RC2</geotools.version>"/>
+ <replacefilter token="<geotools.version>8-SNAPSHOT</geotools.version>"
+ value="<geotools.version>@VERSION@</geotools.version>"/>
</replace>
<replace dir="../docs/">
- <include name="common.py"/>
- <replacefilter token="8.0-RC1"
- value="8.0-RC2"/>
+ <include name="pom.xml"/>
+ <replacefilter token="8-SNAPSHOT"
+ value="@VERSION@"/>
</replace>
</target>
<target name="readme">
<replace file="../README.html">
<replacefilter token="@RELEASE@"
- value="8.0-M5"/>
+ value="@VERSION@"/>
<replacefilter token="@DATE@"
- value="Dec, 8th, 2011"/>
+ value="@RELEASE_DATE@"/>
</replace>
</target>
|
Author: victortey
Date: 2012-05-29 19:22:31 -0700 (Tue, 29 May 2012)
New Revision: 38777
Modified:
trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/FeatureTypeRegistry.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java
Log:
GEOT-4105:app-schema GML 3.2 gml:id xlink:href for repeated elements in wrong location
Modified: trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/FeatureTypeRegistry.java
===================================================================
--- trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/FeatureTypeRegistry.java 2012-05-29 08:53:53 UTC (rev 38776)
+++ trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/FeatureTypeRegistry.java 2012-05-30 02:22:31 UTC (rev 38777)
@@ -41,7 +41,6 @@
import org.geotools.feature.Types;
import org.geotools.feature.type.ComplexFeatureTypeFactoryImpl;
import org.geotools.feature.type.GeometryTypeImpl;
-import org.geotools.gml3.GML;
import org.geotools.gml3.GMLConfiguration;
import org.geotools.gml3.GMLSchema;
import org.geotools.gml3.smil.SMIL20LANGSchema;
@@ -127,6 +126,7 @@
private FeatureTypeFactory typeFactory;
+ private GMLHandler GML;
/**
* stack of currently being built type names, used by
* {@link #createType(Name, XSDTypeDefinition)} to prevent recursive type definitions by
@@ -140,6 +140,12 @@
}
public FeatureTypeRegistry(NamespaceSupport namespaces) {
+ if (namespaces != null) {
+ GML = new GMLHandler(namespaces.getURI("gml"));
+ } else {
+ GML = new GMLHandler(null);
+ }
+
schemas = new ArrayList<SchemaIndex>();
typeFactory = new ComplexFeatureTypeFactoryImpl();
descriptorRegistry = new HashMap<Name, AttributeDescriptor>();
@@ -463,14 +469,14 @@
AttributeType type;
if (null == typeDefinition.getSimpleType()
&& typeDefinition instanceof XSDComplexTypeDefinition) {
- boolean isFeatureType = isDerivedFrom(typeDefinition, GML.AbstractFeatureType);
+ boolean isFeatureType = isDerivedFrom(typeDefinition, GML.getAbstractFeatureType());
if (isFeatureType) {
type = new FeatureTypeProxy(assignedName, typeRegistry);
} else {
type = new ComplexTypeProxy(assignedName, typeRegistry);
}
} else {
- boolean isGeometryType = isDerivedFrom(typeDefinition, GML.AbstractGeometryType);
+ boolean isGeometryType = isDerivedFrom(typeDefinition, GML.getAbstractGeometryType());
if (isGeometryType) {
type = new GeometryTypeProxy(assignedName, typeRegistry);
} else {
@@ -616,7 +622,7 @@
final Collection<PropertyDescriptor> schema,
final XSDComplexTypeDefinition typeDefinition, final AttributeType superType) {
- AttributeType abstractFType = getType(GML.NAMESPACE, GML.AbstractFeatureType.getLocalPart());
+ AttributeType abstractFType = getType(GML.getNameSpace(), GML.getAbstractFeatureType().getLocalPart());
assert abstractFType != null;
boolean isFeatureType = isDerivedFrom(typeDefinition, abstractFType.getName());
@@ -648,7 +654,7 @@
private boolean isIdentifiable(XSDComplexTypeDefinition typeDefinition) {
List attributeUses = typeDefinition.getAttributeUses();
- final String idAttName = GML.id.getLocalPart();
+ final String idAttName = GML.getId().getLocalPart();
for (Iterator it = attributeUses.iterator(); it.hasNext();) {
XSDAttributeUse use = (XSDAttributeUse) it.next();
@@ -658,7 +664,7 @@
String targetNamespace = idAtt.getTargetNamespace();
String name = idAtt.getName();
- if (GML.NAMESPACE.equals(targetNamespace) && idAttName.equals(name)) {
+ if (GML.getNameSpace().equals(targetNamespace) && idAttName.equals(name)) {
if (XSDAttributeUseCategory.REQUIRED_LITERAL.equals(useCategory)) {
return true;
}
@@ -778,5 +784,58 @@
}
LOGGER.fine("Schema " + schema.getURI() + " imported successfully");
}
-
+
+ /**
+ * Private inner glass for handling any request made to GML. Depending on the schema type
+ * different version of GML class may be called upon. eg {@link org.geotools.gml3.v3_2.GML} or
+ * {@link org.geotools.gml3.GML}
+ *
+ * @author Victor Tey, CSIRO Exploration and Mining
+ *
+ */
+
+ private class GMLHandler {
+ String namespace;
+
+ public GMLHandler(String uri) {
+ if (uri != null) {
+ namespace = uri;
+ } else {
+ namespace = "";
+ }
+ }
+
+ public QName getAbstractFeatureType() {
+ if (namespace.equals(org.geotools.gml3.v3_2.GML.NAMESPACE)) {
+ return org.geotools.gml3.v3_2.GML.AbstractFeatureType;
+ } else {
+ return org.geotools.gml3.GML.AbstractFeatureType;
+ }
+ }
+
+ public QName getAbstractGeometryType() {
+ if (namespace.equals(org.geotools.gml3.v3_2.GML.NAMESPACE)) {
+ return org.geotools.gml3.v3_2.GML.AbstractGeometryType;
+ } else {
+ return org.geotools.gml3.GML.AbstractGeometryType;
+ }
+ }
+
+ public String getNameSpace() {
+ if (namespace.equals(org.geotools.gml3.v3_2.GML.NAMESPACE)) {
+ return org.geotools.gml3.v3_2.GML.NAMESPACE;
+ } else {
+ return org.geotools.gml3.GML.NAMESPACE;
+ }
+ }
+
+ public QName getId() {
+ if (namespace.equals(org.geotools.gml3.v3_2.GML.NAMESPACE)) {
+ return org.geotools.gml3.v3_2.GML.id;
+ } else {
+ return org.geotools.gml3.GML.id;
+ }
+ }
+ }
+
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java 2012-05-29 08:53:53 UTC (rev 38776)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java 2012-05-30 02:22:31 UTC (rev 38777)
@@ -256,7 +256,7 @@
}
encoding.setAttributeNS(gml.getNamespaceURI(), "id", id);
}
- encodeClientProperties(feature, value);
+ encodeClientProperties(feature, encoding);
return encoding;
}
|
|
From: <svn...@os...> - 2012-05-29 08:54:06
|
Author: mcr
Date: 2012-05-29 01:53:53 -0700 (Tue, 29 May 2012)
New Revision: 38776
Added:
trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTest.java
trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTestSetup.java
Modified:
trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2SQLDialectPrepared.java
trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2Util.java
Log:
Empty geomtry support for DB2
Modified: trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2SQLDialectPrepared.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2SQLDialectPrepared.java 2012-05-29 07:47:24 UTC (rev 38775)
+++ trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2SQLDialectPrepared.java 2012-05-29 08:53:53 UTC (rev 38776)
@@ -184,7 +184,7 @@
@Override
public void setGeometryValue(Geometry g, int srid, Class binding, PreparedStatement ps, int column) throws SQLException {
- if (g ==null) {
+ if (g ==null || g.isEmpty()) {
//ps.setNull(column, Types.OTHER);
ps.setBytes(column, null);
return;
Modified: trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2Util.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2Util.java 2012-05-29 07:47:24 UTC (rev 38775)
+++ trunk/modules/plugin/jdbc/jdbc-db2/src/main/java/org/geotools/data/db2/DB2Util.java 2012-05-29 08:53:53 UTC (rev 38776)
@@ -143,7 +143,7 @@
static public void encodeGeometryValue(Geometry value, int srid, StringBuffer sql)
throws IOException {
- if (value ==null) {
+ if (value ==null || value.isEmpty()) {
sql.append("null");
return;
}
Added: trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTest.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTest.java (rev 0)
+++ trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTest.java 2012-05-29 08:53:53 UTC (rev 38776)
@@ -0,0 +1,33 @@
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2002-2008, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
+package org.geotools.data.db2;
+
+import org.geotools.jdbc.JDBCEmptyGeometryTest;
+import org.geotools.jdbc.JDBCEmptyGeometryTestSetup;
+
+/**
+ *
+ *
+ */
+public class DB2EmptyGeometryTest extends JDBCEmptyGeometryTest {
+
+ @Override
+ protected JDBCEmptyGeometryTestSetup createTestSetup() {
+ return new DB2EmptyGeometryTestSetup(new DB2TestSetup());
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id URL
Added: svn:eol-style
+ native
Added: trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTestSetup.java (rev 0)
+++ trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTestSetup.java 2012-05-29 08:53:53 UTC (rev 38776)
@@ -0,0 +1,72 @@
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2002-2008, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
+package org.geotools.data.db2;
+
+import java.sql.Connection;
+
+import org.geotools.jdbc.JDBCEmptyGeometryTestSetup;
+import org.geotools.jdbc.JDBCTestSetup;
+
+/**
+ *
+ *
+ */
+public class DB2EmptyGeometryTestSetup extends JDBCEmptyGeometryTestSetup {
+
+ public DB2EmptyGeometryTestSetup(JDBCTestSetup delegate) {
+ super(delegate);
+ }
+
+ @Override
+ protected void createEmptyGeometryTable() throws Exception {
+ Connection con = getDataSource().getConnection();
+ con.prepareStatement("CREATE TABLE "+DB2TestUtil.SCHEMA_QUOTED+".\"empty\"(\"fid\" int PRIMARY KEY not null GENERATED ALWAYS AS IDENTITY, "
+ + "\"id\" integer, "
+ + "\"geom_point\" db2gse.ST_POINT, "
+ + "\"geom_linestring\" db2gse.ST_LINESTRING, "
+ + "\"geom_polygon\" db2gse.ST_POLYGON, "
+ + "\"geom_multipoint\" db2gse.ST_MULTIPOINT, "
+ + "\"geom_multilinestring\" db2gse.ST_MULTILINESTRING, "
+ + "\"geom_multipolygon\" db2gse.ST_MULTIPOLYGON, "
+ + "\"name\" varchar(250))" ).execute();
+
+ DB2Util.executeRegister(DB2TestUtil.SCHEMA, "empty", "geom_point", DB2TestUtil.SRSNAME,con);
+ DB2Util.executeRegister(DB2TestUtil.SCHEMA, "empty", "geom_linestring",DB2TestUtil.SRSNAME, con);
+ DB2Util.executeRegister(DB2TestUtil.SCHEMA, "empty", "geom_polygon", DB2TestUtil.SRSNAME,con);
+ DB2Util.executeRegister(DB2TestUtil.SCHEMA, "empty", "geom_multipoint", DB2TestUtil.SRSNAME,con);
+ DB2Util.executeRegister(DB2TestUtil.SCHEMA, "empty", "geom_linestring", DB2TestUtil.SRSNAME,con);
+ DB2Util.executeRegister(DB2TestUtil.SCHEMA, "empty", "geom_multipolygon", DB2TestUtil.SRSNAME,con);
+
+ con.close();
+
+ }
+
+ @Override
+ protected void dropEmptyGeometryTable() throws Exception {
+ Connection con = getDataSource().getConnection();
+ DB2Util.executeUnRegister(DB2TestUtil.SCHEMA, "empty", "geom_point", con);
+ DB2Util.executeUnRegister(DB2TestUtil.SCHEMA, "empty", "geom_linestring", con);
+ DB2Util.executeUnRegister(DB2TestUtil.SCHEMA, "empty", "geom_polygon", con);
+ DB2Util.executeUnRegister(DB2TestUtil.SCHEMA, "empty", "geom_multipoint", con);
+ DB2Util.executeUnRegister(DB2TestUtil.SCHEMA, "empty", "geom_linestring", con);
+ DB2Util.executeUnRegister(DB2TestUtil.SCHEMA, "empty", "geom_multipolygon", con);
+ DB2TestUtil.dropTable(DB2TestUtil.SCHEMA, "empty", con);
+ con.close();
+
+ }
+
+}
Property changes on: trunk/modules/plugin/jdbc/jdbc-db2/src/test/java/org/geotools/data/db2/DB2EmptyGeometryTestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id URL
Added: svn:eol-style
+ native
|
|
From: <svn...@os...> - 2012-05-29 07:47:31
|
Author: jive
Date: 2012-05-29 00:47:24 -0700 (Tue, 29 May 2012)
New Revision: 38775
Modified:
trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/VersioningTransactionState.java
trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java
trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataStoreDecorator.java
Log:
Make DataStoreDecorator repository available through getRepository( typeName ) to allow for synchronisation sets.
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/VersioningTransactionState.java
===================================================================
--- trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/VersioningTransactionState.java 2012-05-29 07:47:06 UTC (rev 38774)
+++ trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/geogit/VersioningTransactionState.java 2012-05-29 07:47:24 UTC (rev 38775)
@@ -102,16 +102,22 @@
public void setTransaction(final Transaction transaction) {
if (transaction != null) {
// configure
- this.transaction = transaction;
+ if( this.transaction == null ){
+ this.transaction = transaction;
+ }
+ else {
+ LOGGER.fine("Transaction being hot replaced!");
+ this.transaction = transaction;
+ }
} else {
+ // Any thing to close() or cleanup?
this.transaction = null;
- // TODO: is there some cleanup to do here?
}
}
@Override
public void addAuthorization(String AuthID) throws IOException {
- // TODO Auto-generated method stub
+ // no security hooks provided for transaction state locking
}
@Override
Modified: trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java
===================================================================
--- trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java 2012-05-29 07:47:06 UTC (rev 38774)
+++ trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataAccessDecorator.java 2012-05-29 07:47:24 UTC (rev 38775)
@@ -46,7 +46,7 @@
/**
* Decorator around an unversioned DataAccess allowing it to be used in conjunction
- * with a GeoGit repository (for revision information).
+ * with a GeoGit {@link Repository} for revision information.
*
* @param <T> FeatureType
* @param <F> Feature
@@ -54,11 +54,19 @@
@SuppressWarnings({ "rawtypes", "unchecked" })
public class DataAccessDecorator<T extends FeatureType, F extends Feature>
implements VersioningDataAccess<T, F> {
-
+
+ /** Checkout database used to reflect unversioned "live" data */
protected DataAccess<T, F> unversioned;
+
+ /**
+ * Default GeoGit repository to use for storing revision history.
+ * <p>
+ * Subclasses can use {@link #getRepository(Name)} to access while still allowing support
+ * for multiple repositories if needed.
+ */
+ private Repository repository;
+
- protected Repository repository;
-
public DataAccessDecorator(DataAccess unversioned, Repository versioningRepo) {
Assert.notNull(unversioned);
Assert.notNull(versioningRepo);
@@ -129,6 +137,7 @@
@Override
public void updateSchema(Name typeName, T featureType) throws IOException {
unversioned.updateSchema(typeName, featureType);
+ // Is any effort needed to track the schema change in the geogit repository
}
/**
@@ -148,13 +157,16 @@
}
/**
+ * Used to retreive past revisions from GeoGit repository; the revision history range
+ * is provided by versionFilter (which is required tocontain a {@link ResourceId}.
+ *
* @precondition {@code typeName != null && versioningFilter != null}
* @precondition {@code versioningFilter.getIdentifiers().size() > 0}
* @postcondition {@code $return != null}
* @param typeName
- * @param versioningFilter
+ * @param versioningFilter Id Filter providing revision history range
* @param extraQuery
- * @return
+ * @return features
* @throws IOException
*/
public FeatureCollection getFeatures(final Name typeName,
@@ -178,28 +190,65 @@
}
final FeatureType featureType = this.getSchema(typeName);
- ResourceIdFeatureCollector versionQuery;
- versionQuery = new ResourceIdFeatureCollector(repository, featureType,
+ ResourceIdFeatureCollector versionCollector;
+ versionCollector = new ResourceIdFeatureCollector(repository, featureType,
resourceIds);
DefaultFeatureCollection features = new DefaultFeatureCollection(null,
(SimpleFeatureType) featureType);
- for (Feature f : versionQuery) {
+
+ for (Feature f : versionCollector) {
features.add((SimpleFeature) f);
}
return features;
}
-
+
+ /**
+ * Lookup appropriate repository for provided typeName.
+ * <b>
+ * By default there is a single GeoGit repository associated with the {@link #unversioned}
+ * DataStore. When making use of more than one Repository you can override this method to
+ * perform the mapping.
+ *
+ * @param typeName
+ * @return Repository for use with the provided typeName
+ */
+ protected Repository getRepository( Name typeName ){
+ return repository;
+ }
+ /**
+ * Return a {@link FeatureSourceDecorator} using the repository provided
+ * by {@link #getRepository(Name)}.
+ *
+ * @param source
+ * @return FeatureSource allowing access to source and repository data
+ */
protected FeatureSource<T, F> createFeatureSource(FeatureSource<T, F> source) {
- return new FeatureSourceDecorator(source, repository);
+ Repository repo = getRepository( source.getName() );
+ return new FeatureSourceDecorator(source, repo);
}
-
+ /**
+ * Return a {@link FeatureStoreDecorator} using the repository provided
+ * by {@link #getRepository(Name)}.
+ *
+ * @param store
+ * @return FeatureSource allowing access to source and repository data
+ */
protected FeatureStore<T, F> createFeatureStore(FeatureStore<T, F> store) {
- return new FeatureStoreDecorator(store, repository);
+ Repository repo = getRepository( store.getName() );
+ return new FeatureStoreDecorator(store, repo);
}
+ /**
+ * Return a {@link FeatureLockingDecorator} using the repository provided
+ * by {@link #getRepository(Name)}.
+ *
+ * @param locking
+ * @return FeatureSource allowing access to source and repository data
+ */
protected FeatureLocking<T, F> createFeatureLocking(
FeatureLocking<T, F> locking) {
- return new FeatureLockingDecorator(locking, repository);
+ Repository repo = getRepository( locking.getName() );
+ return new FeatureLockingDecorator(locking, repo);
}
}
Modified: trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataStoreDecorator.java
===================================================================
--- trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataStoreDecorator.java 2012-05-29 07:47:06 UTC (rev 38774)
+++ trunk/modules/unsupported/geogit-versioned/src/main/java/org/geotools/data/versioning/decorator/DataStoreDecorator.java 2012-05-29 07:47:24 UTC (rev 38775)
@@ -21,6 +21,7 @@
import org.geogit.repository.Repository;
import org.geotools.data.DataStore;
import org.geotools.data.FeatureReader;
+import org.geotools.data.FeatureSource;
import org.geotools.data.FeatureWriter;
import org.geotools.data.LockingManager;
import org.geotools.data.Query;
@@ -43,8 +44,10 @@
@Override
public SimpleFeatureSource getFeatureSource(Name typeName)
throws IOException {
- return (SimpleFeatureSource) VersioningAdapterFactory.create(
- unversioned.getFeatureSource(typeName), repository);
+ Repository repo = getRepository(typeName);
+
+ FeatureSource<SimpleFeatureType, SimpleFeature> source = unversioned.getFeatureSource(typeName);
+ return (SimpleFeatureSource) VersioningAdapterFactory.create(source, repo);
}
@Override
@@ -66,9 +69,9 @@
@Override
public SimpleFeatureSource getFeatureSource(String typeName)
throws IOException {
- return (SimpleFeatureSource) VersioningAdapterFactory.create(
- ((DataStore) unversioned).getFeatureSource(typeName),
- repository);
+ SimpleFeatureSource source = ((DataStore) unversioned).getFeatureSource(typeName);
+ Repository repo = getRepository( source.getName() );
+ return (SimpleFeatureSource) VersioningAdapterFactory.create(source,repo);
}
@Override
|
|
From: <svn...@os...> - 2012-05-29 07:47:18
|
Author: jive
Date: 2012-05-29 00:47:06 -0700 (Tue, 29 May 2012)
New Revision: 38774
Modified:
trunk/build/rename.xml
trunk/docs/common.py
trunk/docs/pom.xml
trunk/docs/user/tutorial/quickstart/artifacts/pom.xml
Log:
Change trunk over to generate RC1 docs
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/build/rename.xml
===================================================================
--- trunk/build/rename.xml 2012-05-29 07:46:52 UTC (rev 38773)
+++ trunk/build/rename.xml 2012-05-29 07:47:06 UTC (rev 38774)
@@ -9,7 +9,7 @@
<replace dir="..">
<include name="**/pom.xml"/>
<replacefilter token="<version>8-SNAPSHOT</version>"
- value="<version>8.0-M5</version>"/>
+ value="<version>8.0-RC2</version>"/>
</replace>
<replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
@@ -22,13 +22,14 @@
<target name="doc">
<replace dir="../docs/user/tutorial/">
<include name="**/pom.xml"/>
- <replacefilter token="<geotools.version>8-SNAPSHOT</geotools.version>"
- value="<geotools.version>8.0-M5</geotools.version>"/>
+ <replacefilter token="<geotools.version>8.0-RC1</geotools.version>"
+ value="<geotools.version>8.0-RC2</geotools.version>"/>
</replace>
+
<replace dir="../docs/">
- <include name="pom.xml"/>
- <replacefilter token="8-SNAPSHOT"
- value="8.0-M5"/>
+ <include name="common.py"/>
+ <replacefilter token="8.0-RC1"
+ value="8.0-RC2"/>
</replace>
</target>
Modified: trunk/docs/common.py
===================================================================
--- trunk/docs/common.py 2012-05-29 07:46:52 UTC (rev 38773)
+++ trunk/docs/common.py 2012-05-29 07:47:06 UTC (rev 38774)
@@ -51,7 +51,7 @@
version = '8.0'
# The full version, including alpha/beta/rc tags.
-release = '8.0-M3'
+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-05-29 07:46:52 UTC (rev 38773)
+++ trunk/docs/pom.xml 2012-05-29 07:47:06 UTC (rev 38774)
@@ -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-M4"/>
+ <property name="project.version" value="8.0-RC1"/>
</ant>
</tasks>
</configuration>
Modified: trunk/docs/user/tutorial/quickstart/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-05-29 07:46:52 UTC (rev 38773)
+++ trunk/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-05-29 07:47:06 UTC (rev 38774)
@@ -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.0-RC1</geotools.version>
</properties>
<dependencies>
<dependency>
|
|
From: <svn...@os...> - 2012-05-29 07:47:04
|
Author: jive
Date: 2012-05-29 00:46:52 -0700 (Tue, 29 May 2012)
New Revision: 38773
Modified:
trunk/modules/library/main/src/main/java/org/geotools/data/DataUtilities.java
trunk/modules/library/main/src/test/java/org/geotools/data/DataUtilitiesTest.java
Log:
Move the type spec javadocs to createType, as createAttribute method is not shown in our javadocs.
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/modules/library/main/src/main/java/org/geotools/data/DataUtilities.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/data/DataUtilities.java 2012-05-29 07:46:31 UTC (rev 38772)
+++ trunk/modules/library/main/src/main/java/org/geotools/data/DataUtilities.java 2012-05-29 07:46:52 UTC (rev 38773)
@@ -1769,74 +1769,70 @@
* </p>
*
* <p>
- * Where <i>Type</i> is defined by createAttribute.
+ * Where <i>Type</i> is defined by {@link createAttribute}:
+ * <ul>
+ * <li>Each attribute descriptor is defined using the form: <i>"name:Type:hint"</i> </li>
+ * <li>Where <i>Type</i> is:
+ * <ul>
+ * <li>0,Interger,int: represents Interger</li>
+ * <li>0.0, Double, double: represents Double</li>
+ * <li>"",String,string: represents String</li>
+ * <li>Geometry: represents Geometry, additional common geometry types supported including
+ * Point,LineString,Polygon,MultiLineString,MultiPolygon,MultiPoint,GeometryCollection</ul>
+ * <li>UUID</li>
+ * <li>Date</li>
+ * <li><i>full.class.path</i>: represents java type</li>
+ * </ul>
+ * </li>
+ * <li>Where <i>hint</i> is "hint1;hint2;...;hintN", in which "hintN" is one of:
+ * <ul>
+ * <li><code>nillable</code></li>
+ * <li><code>srid=<#></code></li>
+ * </ul>
+ * </li>
+ * <li>You may indicate the default Geometry with an astrix: "*geom:Geometry".</li>
+ * <li>You may also indicate the srid (used to look up a EPSG code): "*point:Point:3226</li>
* </p>
*
* <p>
- * You may indicate the default Geometry with an astrix: "*geom:Geometry". You may also indicate
- * the srid (used to look up a EPSG code).
- * </p>
- *
- * <p>
* Examples:
* <ul>
- * <li><code>name:"",age:0,geom:Geometry,centroid:Point,url:java.io.URL"</code>
- * <li><code>id:String,polygonProperty:Polygon:srid=32615</code>
+ * <li><code>name:"",age:0,geom:Geometry,centroid:Point,url:java.io.URL"</code></li>
+ * <li><code>id:String,polygonProperty:Polygon:srid=32615</code></li>
+ * <li><code>identifier:UUID,location:Point,*area:MultiPolygon,created:Date</code></li>
+ * <li><code>uuid:UUID,name:String,description:String,time:java.sql.Timestamp</code></li>
* </ul>
* </p>
*
- * @param identification
+ * @param typeName
* identification of FeatureType: (<i>namesapce</i>).<i>typeName</i>
* @param typeSpec
- * Specification for FeatureType
+ * Specification of FeatureType attributes "name:Type,name2:Type2,..."
*
*
* @throws SchemaException
*/
- public static SimpleFeatureType createType(String identification, String typeSpec)
+ public static SimpleFeatureType createType(String typeName, String typeSpec)
throws SchemaException {
- int split = identification.lastIndexOf('.');
- String namespace = (split == -1) ? null : identification.substring(0, split);
- String typeName = (split == -1) ? identification : identification.substring(split + 1);
+ int split = typeName.lastIndexOf('.');
+ String namespace = (split == -1) ? null : typeName.substring(0, split);
+ String name = (split == -1) ? typeName : typeName.substring(split + 1);
- return createType(namespace, typeName, typeSpec);
+ return createType(namespace, name, typeSpec);
}
/**
* Utility method for FeatureType construction.
* <p>
- * Will parse a String of the form: <i>"name:Type,name2:Type2,..."</i>
- * </p>
- *
- * <p>
- * Where <i>Type</i> is defined by createAttribute.
- * </p>
- *
- * <p>
- * You may indicate the default Geometry with an astrix: "*geom:Geometry". You may also indicate
- * the srid (used to look up a EPSG code).
- * </p>
- *
- * <p>
- * Examples:
- * <ul>
- * <li><code>name:"",age:0,geom:Geometry,centroid:Point,url:java.io.URL"</code>
- * <li><code>id:String,polygonProperty:Polygon:srid=32615</code>
- * </ul>
- * </p>
- *
- * @param identification
- * identification of FeatureType: (<i>namesapce</i>).<i>typeName</i>
- * @param typeSpec
- * Specification for FeatureType
- *
- *
+ * @param namespace Typename namespace used to qualify the provided name
+ * @param name Typename name, as qualified by namespace
+ * @param typeSpec Definition of attributes, for details see {@link #createType(String, String)}
* @throws SchemaException
*/
- public static SimpleFeatureType createType(String namespace, String typeName, String typeSpec)
+ public static SimpleFeatureType createType(String namespace, String name, String typeSpec)
throws SchemaException {
SimpleFeatureTypeBuilder builder = new SimpleFeatureTypeBuilder();
- builder.setName(typeName);
+ builder.setName(name);
builder.setNamespaceURI(namespace);
String[] types = typeSpec.split(",");
@@ -2512,40 +2508,14 @@
}
/**
- * Returns AttributeType based on String specification (based on UML).
- *
+ * Generate AttributeDescriptor based on String type specification (based on UML).
* <p>
- * Will parse a String of the form: <i>"name:Type:hint"</i>
+ * Will parse a String of the form: <i>"name:Type:hint" as described in {@link #createType}</i>
* </p>
*
- * <p>
- * Where <i>Type</i> is:
- * </p>
- *
- * <ul>
- * <li>
- * 0,Interger,int: represents Interger</li>
- * <li>
- * 0.0, Double, double: represents Double</li>
- * <li>
- * "",String,string: represents String</li>
- * <li>
- * Geometry: represents Geometry</li>
- * <li>
- * <i>full.class.path</i>: represents java type</li>
- * </ul>
- *
- * <p>
- * Where <i>hint</i> is "hint1;hint2;...;hintN", in which "hintN" is one of:
- * <ul>
- * <li><code>nillable</code></li>
- * <li><code>srid=<#></code></li>
- * </ul>
- * </p>
- *
* @param typeSpec
+ * @see #createType
*
- *
* @throws SchemaException
* If typeSpect could not be interpreted
*/
Modified: trunk/modules/library/main/src/test/java/org/geotools/data/DataUtilitiesTest.java
===================================================================
--- trunk/modules/library/main/src/test/java/org/geotools/data/DataUtilitiesTest.java 2012-05-29 07:46:31 UTC (rev 38772)
+++ trunk/modules/library/main/src/test/java/org/geotools/data/DataUtilitiesTest.java 2012-05-29 07:46:52 UTC (rev 38773)
@@ -43,6 +43,7 @@
import org.geotools.feature.type.AttributeDescriptorImpl;
import org.geotools.feature.type.AttributeTypeImpl;
import org.geotools.filter.IllegalFilterException;
+import org.geotools.geometry.jts.GeometryBuilder;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.referencing.CRS;
import org.geotools.referencing.crs.DefaultGeographicCRS;
@@ -464,6 +465,17 @@
// test escape handling
assertEquals( "newline decode check", "Jody Garnett\nSteering Committee", feature1.getAttribute("party") );
assertEquals( "escape check", "John Hudson|Hapless Victim", feature2.getAttribute("party") );
+
+ // test feature id handling
+ assertEquals( "fid1", feature1.getID() );
+ assertNotNull( feature2.getID() );
+ assertEquals( feature2.getID(), feature2.getIdentifier().getID() );
+
+ // test geometry handling
+ GeometryBuilder geomBuilder = new GeometryBuilder();
+ assertEquals( geomBuilder.point(6,2), feature2.getDefaultGeometry() );
+ assertEquals( geomBuilder.point(6,2), feature2.getAttribute("geom") );
+
}
/**
* Test createType and createFeature methods as per GEOT-4150
@@ -676,7 +688,7 @@
public void testSpecNoCRS() throws Exception {
String spec = "id:String,polygonProperty:Polygon";
SimpleFeatureType ft = DataUtilities.createType("testType", spec);
- String spec2 = DataUtilities.spec(ft);
+ String spec2 = DataUtilities.encodeType(ft);
// System.out.println("BEFORE:"+spec);
// System.out.println(" AFTER:"+spec2);
assertEquals(spec, spec2);
@@ -685,7 +697,7 @@
public void testSpecCRS() throws Exception {
String spec = "id:String,polygonProperty:Polygon:srid=32615";
SimpleFeatureType ft = DataUtilities.createType("testType", spec);
- String spec2 = DataUtilities.spec(ft);
+ String spec2 = DataUtilities.encodeType(ft);
// System.out.println("BEFORE:"+spec);
// System.out.println(" AFTER:"+spec2);
assertEquals(spec, spec2);
@@ -700,7 +712,7 @@
// since we cannot go back to a code with do a best effort encoding
String expected = "id:String,polygonProperty:Polygon";
- String spec2 = DataUtilities.spec(transformedFt);
+ String spec2 = DataUtilities.encodeType(transformedFt);
// System.out.println(" BEFORE:"+spec);
// System.out.println("EXPECTED:"+expected);
// System.out.println(" AFTER:"+spec2);
|
|
From: <svn...@os...> - 2012-05-29 07:46:41
|
Author: jive
Date: 2012-05-29 00:46:31 -0700 (Tue, 29 May 2012)
New Revision: 38772
Modified:
trunk/pom.xml
Log:
Add docs back into the build; must of been removed for the missing config file failure?
In the future if docs break please just remove the profile activation against -Dall.
Signed-off-by: Jody Garnett <jod...@gm...>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-05-29 01:05:28 UTC (rev 38771)
+++ trunk/pom.xml 2012-05-29 07:46:31 UTC (rev 38772)
@@ -108,7 +108,7 @@
<property><name>all</name></property>
</activation>
<modules>
- <!--module>docs</module-->
+ <module>docs</module>
</modules>
</profile>
<profile>
|
|
From: <svn...@os...> - 2012-05-29 01:05:37
|
Author: jdeolive
Date: 2012-05-28 18:05:28 -0700 (Mon, 28 May 2012)
New Revision: 38771
Modified:
trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd
trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java
Log:
updated internal copy of filter schema to match online published, PropertyName in BBOX is optional
Modified: trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd
===================================================================
--- trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd 2012-05-28 22:58:36 UTC (rev 38770)
+++ trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd 2012-05-29 01:05:28 UTC (rev 38771)
@@ -194,7 +194,7 @@
<xsd:complexContent>
<xsd:extension base="ogc:SpatialOpsType">
<xsd:sequence>
- <xsd:element ref="ogc:PropertyName"/>
+ <xsd:element ref="ogc:PropertyName" minOccurs="0"/>
<xsd:element ref="gml:Envelope"/>
</xsd:sequence>
</xsd:extension>
Modified: trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java
===================================================================
--- trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java 2012-05-28 22:58:36 UTC (rev 38770)
+++ trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java 2012-05-29 01:05:28 UTC (rev 38771)
@@ -26,6 +26,9 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.StringReader;
+import java.util.List;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.opengis.filter.Filter;
import org.opengis.filter.FilterFactory;
@@ -34,7 +37,7 @@
import org.opengis.filter.expression.PropertyName;
import org.opengis.filter.spatial.DWithin;
import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.filter.v1_0.OGCConfiguration;
+
import org.geotools.xml.Encoder;
import org.geotools.xml.Parser;
import org.geotools.xml.Parser.Properties;
@@ -141,4 +144,21 @@
String unit = filter.getDistanceUnits();
assertEquals("km", unit);
}
+
+ public void testBBOXValidateWithoutPropertyName() throws Exception {
+ String xml =
+ "<ogc:Filter xmlns:ogc='http://www.opengis.net/ogc'>" +
+ "<ogc:BBOX>" +
+ "<gml:Envelope xmlns:gml='http://www.opengis.net/gml'>" +
+ "<gml:lowerCorner>36.986771000000005 -91.516129</gml:lowerCorner>" +
+ "<gml:upperCorner>42.50936100000001 -87.507889</gml:upperCorner>" +
+ "</gml:Envelope>" +
+ "</ogc:BBOX>" +
+ "</ogc:Filter>";
+
+ Parser p = new Parser(new OGCConfiguration());
+ p.validate(new StringReader(xml));
+
+ assertTrue(p.getValidationErrors().isEmpty());
+ }
}
|
289 messages has been excluded from this view by a project administrator.
