geotools-commits Mailing List for GeoTools, the Java GIS toolkit (Page 19)

Toolkit for working with and mapping geospatial data

Brought to you by: aaime, afabiani, cholmesny, cory2070, and 15 others

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

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 1187 > >> (Page 19 of 1187)

[Geotools-commits] svn - r38452 - trunk/spike/mauro

From: <svn...@os...> - 2011-12-27 10:57:16

Author: mpazos
Date: 2011-12-27 02:57:10 -0800 (Tue, 27 Dec 2011)
New Revision: 38452

Removed:
   trunk/spike/mauro/test
Log:
svn end test

Deleted: trunk/spike/mauro/test
===================================================================
--- trunk/spike/mauro/test	2011-12-27 10:52:57 UTC (rev 38451)
+++ trunk/spike/mauro/test	2011-12-27 10:57:10 UTC (rev 38452)
@@ -1 +0,0 @@
-hello

[Geotools-commits] svn - r38451 - trunk/spike/mauro

From: <svn...@os...> - 2011-12-27 10:53:04

Author: mpazos
Date: 2011-12-27 02:52:57 -0800 (Tue, 27 Dec 2011)
New Revision: 38451

Added:
   trunk/spike/mauro/test
Log:
svn test

Added: trunk/spike/mauro/test
===================================================================
--- trunk/spike/mauro/test	                        (rev 0)
+++ trunk/spike/mauro/test	2011-12-27 10:52:57 UTC (rev 38451)
@@ -0,0 +1 @@
+hello

[Geotools-commits]

From: <4ev...@gm...> - 2011-12-27 03:52:13

คฑาวุธ “นายแย่มาก”
	คฑาวุธ “นายพูดมากไปแล้ว” ระยะหลังๆมานี้เอาแต่พูดเพ้อเจ้อ กักขฬะ หยาบคาย และ
จาบจ้างสถาบันฯ อย่างอภัยให้ไม่ได้  ถึงจะเป็นลูกนายทหาร และสนิทสนมกับ พลเอกนอกราชการ 
อดีตหัวหน้าพรรคการเมืองใหญ่พรรคหนึ่ง ผลุบๆโผล่ทางการเมืองเป็นระยะ ที่มีความใกล้ชิดกับ
กัมพูชามาก “คฑาวุธ” ถึงได้กล้าพูดจาไม่กลัวฟ้าดิน “คฑาวุธ” คนนี้แหละที่ทำให้คนเสื้อแดงต้อง
ถูกเปิดเผยตัว และเปลี่ยนอีเมล์เป็นจำนวนมาก ยังจำได้ไหมเมื่อบอร์ด “ประชาไท” ในยุคที่ผู้ดูแล
ต้องคอยลบกระทู้กันแบบนาทีต่อนาที “คฑาวุธ” ได้ตอบกระทู้เรื่อง “จับแล้ว คนโพสประชาไท ??” 
โดย “ขีด-ขิน” เมื่อ 4 พฤศจิกายน 2552 “คฑาวุธ” ได้เอ่ยชื่อจริงของ “บีบีบี” ทำให้ น.ส.ธีรนันต์ 
กลายเป็นผู้ต้องหา “คฑาวุธ” เองด้วยความพลั้งเผลอไปสมัครอีเมล์ครั้งแรกได้ใช้ชื่อว่า
“สมเกียรติ สุขช่วง” เกิดปี ค.ศ. 1955 อายุก็ 56 ปีแล้วอย่าทำให้คนอื่นเขาเดือดร้อนอีกเลย

	สมาชิกประชาไทคนหนึ่งที่ “คฑาวุธ” ทำให้ต้องเปลี่ยนอีเมล์

[Geotools-commits] svn - r38450 - in branches/2.7.x/modules/library/coverage/src: main/java/org/geotools/image test/java/org/geotools/image

From: <svn...@os...> - 2011-12-26 16:19:23

Author: aaime
Date: 2011-12-26 08:19:17 -0800 (Mon, 26 Dec 2011)
New Revision: 38450

Modified:
   branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java
   branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
Log:
[GEOT-3991] ImageWorker writePNG forces component color model for images that can be encoded as-is

Modified: branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java
===================================================================
--- branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java	2011-12-26 16:16:58 UTC (rev 38449)
+++ branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java	2011-12-26 16:19:17 UTC (rev 38450)
@@ -2410,10 +2410,12 @@
             throws IOException
     {
         // Reformatting this image for PNG.
-        if (!paletted) {
+        if (paletted && !(image.getColorModel() instanceof IndexColorModel)) {
+            // we have to reduce colors
+        	forceIndexColorModelForGIF(true);
+        } else if(!(image.getColorModel() instanceof ComponentColorModel) && !(image.getColorModel() instanceof IndexColorModel)) {
+            // png supports gray, rgb, rgba and paletted, but not, for example, double and float values
             forceComponentColorModel();
-        }else{
-        	forceIndexColorModelForGIF(true);
         }
         if(LOGGER.isLoggable(Level.FINER))
 			LOGGER.finer("Encoded input image for png writer");

Modified: branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
===================================================================
--- branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2011-12-26 16:16:58 UTC (rev 38449)
+++ branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2011-12-26 16:19:17 UTC (rev 38450)
@@ -387,6 +387,13 @@
         readWorker.setImage(ImageIO.read(outFile));
         show(readWorker, "Pure  PNG8");
         outFile.delete();
+        
+        // Check we are not expanding to RGB a paletted image
+        worker.setImage(sstImage);
+        assertTrue(sstImage.getColorModel() instanceof IndexColorModel);
+        worker.writePNG(outFile, "FILTERED", 0.75f, false, false);
+        readWorker.setImage(ImageIO.read(outFile));
+        assertTrue(readWorker.getRenderedImage().getColorModel() instanceof IndexColorModel);
     }
 
     /**

[Geotools-commits] svn - r38449 - in trunk/modules/library/coverage/src: main/java/org/geotools/image test/java/org/geotools/image

From: <svn...@os...> - 2011-12-26 16:17:05

Author: aaime
Date: 2011-12-26 08:16:58 -0800 (Mon, 26 Dec 2011)
New Revision: 38449

Modified:
   trunk/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java
   trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
Log:
[GEOT-3991] ImageWorker writePNG forces component color model for images that can be encoded as-is

Modified: trunk/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java
===================================================================
--- trunk/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java	2011-12-24 17:03:29 UTC (rev 38448)
+++ trunk/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java	2011-12-26 16:16:58 UTC (rev 38449)
@@ -2411,10 +2411,12 @@
             throws IOException
     {
         // Reformatting this image for PNG.
-        if (!paletted) {
+        if (paletted && !(image.getColorModel() instanceof IndexColorModel)) {
+            // we have to reduce colors
+        	forceIndexColorModelForGIF(true);
+        } else if(!(image.getColorModel() instanceof ComponentColorModel) && !(image.getColorModel() instanceof IndexColorModel)) {
+            // png supports gray, rgb, rgba and paletted, but not, for example, double and float values
             forceComponentColorModel();
-        }else{
-        	forceIndexColorModelForGIF(true);
         }
         if(LOGGER.isLoggable(Level.FINER))
 			LOGGER.finer("Encoded input image for png writer");

Modified: trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
===================================================================
--- trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2011-12-24 17:03:29 UTC (rev 38448)
+++ trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2011-12-26 16:16:58 UTC (rev 38449)
@@ -388,6 +388,13 @@
         readWorker.setImage(ImageIO.read(outFile));
         show(readWorker, "Pure  PNG8");
         outFile.delete();
+        
+        // Check we are not expanding to RGB a paletted image
+        worker.setImage(sstImage);
+        assertTrue(sstImage.getColorModel() instanceof IndexColorModel);
+        worker.writePNG(outFile, "FILTERED", 0.75f, false, false);
+        readWorker.setImage(ImageIO.read(outFile));
+        assertTrue(readWorker.getRenderedImage().getColorModel() instanceof IndexColorModel);
     }
     
     /**

[Geotools-commits] svn - r38448 - trunk/modules/unsupported/process/src/main/java/org/geotools/process/factory

From: <svn...@os...> - 2011-12-24 17:03:36

Author: aaime
Date: 2011-12-24 09:03:29 -0800 (Sat, 24 Dec 2011)
New Revision: 38448

Modified:
   trunk/modules/unsupported/process/src/main/java/org/geotools/process/factory/AnnotationDrivenProcessFactory.java
Log:
Fixing discovery annotated processes working as rendering transformations

Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/factory/AnnotationDrivenProcessFactory.java
===================================================================
--- trunk/modules/unsupported/process/src/main/java/org/geotools/process/factory/AnnotationDrivenProcessFactory.java	2011-12-23 01:23:17 UTC (rev 38447)
+++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/factory/AnnotationDrivenProcessFactory.java	2011-12-24 17:03:29 UTC (rev 38448)
@@ -249,8 +249,8 @@
     	String methodName = name.getLocalPart();
         Method meth = method(methodName);
     	Object process = createProcessBean(name); 
-    	if (process != null && (lookupInvertGridGeometry(process, methodName) != null 
-    	        || lookupInvertQuery(process, methodName) != null)) {
+    	if (process != null && (lookupInvertGridGeometry(process, meth.getName()) != null 
+    	        || lookupInvertQuery(process, meth.getName()) != null)) {
     		return new InvokeMethodRenderingProcess(meth, process);
     	} else {
     		return new InvokeMethodProcess(meth, process);

[Geotools-commits] svn - r38447 - trunk

From: <svn...@os...> - 2011-12-23 01:23:24

Author: jdeolive
Date: 2011-12-22 17:23:17 -0800 (Thu, 22 Dec 2011)
New Revision: 38447

Modified:
   trunk/pom.xml
Log:
adding flag to set max heap size for forked javac processes, with a default value of 256m

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2011-12-23 01:23:03 UTC (rev 38446)
+++ trunk/pom.xml	2011-12-23 01:23:17 UTC (rev 38447)
@@ -97,6 +97,7 @@
     <maven.build.timestamp.format>dd-MMM-yyyy HH:mm</maven.build.timestamp.format>
     <build.timestamp>${maven.build.timestamp}</build.timestamp>
     <fork.javac>true</fork.javac>
+    <javac.maxHeapSize>256M</javac.maxHeapSize>
   </properties>
 
   <!-- Profiles set on the command-line overwrite default properties. -->
@@ -1106,6 +1107,7 @@
                too many classes in the permanent generation, see GEOT-2462  
           -->
           <fork>${fork.javac}</fork> 
+          <maxmem>${javac.maxHeapSize}</maxmem>
         </configuration>
       </plugin>

[Geotools-commits] svn - r38446 - branches/2.7.x

From: <svn...@os...> - 2011-12-23 01:23:09

Author: jdeolive
Date: 2011-12-22 17:23:03 -0800 (Thu, 22 Dec 2011)
New Revision: 38446

Modified:
   branches/2.7.x/pom.xml
Log:
adding flag to set max heap size for forked javac processes, with a default value of 256m

Modified: branches/2.7.x/pom.xml
===================================================================
--- branches/2.7.x/pom.xml	2011-12-23 01:22:27 UTC (rev 38445)
+++ branches/2.7.x/pom.xml	2011-12-23 01:23:03 UTC (rev 38446)
@@ -78,6 +78,7 @@
     <jvm.opts></jvm.opts>
     <maven.build.timestamp.format>dd-MMM-yyyy HH:mm</maven.build.timestamp.format>
     <build.timestamp>${maven.build.timestamp}</build.timestamp>
+    <javac.maxHeapSize>256M</javac.maxHeapSize>
   </properties>
 
   <!-- Profiles set on the command-line overwrite default properties. -->
@@ -1020,6 +1021,7 @@
                too many classes in the permanent generation, see GEOT-2462  
           -->
           <fork>true</fork> 
+          <maxmem>${javac.maxHeapSize}</maxmem>
         </configuration>
       </plugin>

[Geotools-commits] svn - r38445 - tags/2.7.4

From: <svn...@os...> - 2011-12-23 01:22:34

Author: jdeolive
Date: 2011-12-22 17:22:27 -0800 (Thu, 22 Dec 2011)
New Revision: 38445

Modified:
   tags/2.7.4/pom.xml
Log:
adding flag to set max heap size for forked javac processes, with a default value of 256m

Modified: tags/2.7.4/pom.xml
===================================================================
--- tags/2.7.4/pom.xml	2011-12-21 15:20:38 UTC (rev 38444)
+++ tags/2.7.4/pom.xml	2011-12-23 01:22:27 UTC (rev 38445)
@@ -78,6 +78,7 @@
     <jvm.opts></jvm.opts>
     <maven.build.timestamp.format>dd-MMM-yyyy HH:mm</maven.build.timestamp.format>
     <build.timestamp>${maven.build.timestamp}</build.timestamp>
+    <javac.maxHeapSize>256M</javac.maxHeapSize>
   </properties>
 
   <!-- Profiles set on the command-line overwrite default properties. -->
@@ -1020,6 +1021,7 @@
                too many classes in the permanent generation, see GEOT-2462  
           -->
           <fork>true</fork> 
+          <maxmem>${javac.maxHeapSize}</maxmem>
         </configuration>
       </plugin>

[Geotools-commits] svn - r38444 - tags/2.7.4

From: <svn...@os...> - 2011-12-21 15:20:49

Author: jdeolive
Date: 2011-12-21 07:20:38 -0800 (Wed, 21 Dec 2011)
New Revision: 38444

Modified:
   tags/2.7.4/README.html
Log:
updated README for 2.7.4

Modified: tags/2.7.4/README.html
===================================================================
--- tags/2.7.4/README.html	2011-12-21 15:17:43 UTC (rev 38443)
+++ tags/2.7.4/README.html	2011-12-21 15:20:38 UTC (rev 38444)
@@ -2,7 +2,7 @@
 <HTML>
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE>GeoTools @RELEASE@ README</TITLE>
+	<TITLE>GeoTools 2.7.4 README</TITLE>
 	<META NAME="GENERATOR" CONTENT="LibreOffice 3.3  (Linux)">
 	<META NAME="CREATED" CONTENT="0;0">
 	<META NAME="CHANGEDBY" CONTENT="Jody Garnett">
@@ -23,10 +23,10 @@
 </HEAD>
 <BODY LANG="en-AU" DIR="LTR">
 <a href="http://geotools.org"><img src="geotools-logo.png"></a>
-<H1 CLASS="western">GeoTools @RELEASE@</H1>
+<H1 CLASS="western">GeoTools 2.7.4</H1>
 
-<P>Thank you for downloading GeoTools @RELEASE@. This release was
-created on @DATE@.</P>
+<P>Thank you for downloading GeoTools 2.7.4. This release was
+created on Dec 21, 2011.</P>
 
 <P>This release contains only a subset of the current GeoTools code
 base. The full GeoTools code base contains additional unsupported

[Geotools-commits] svn - r38443 - in tags/2.7.4: . build build/maven build/maven/jar-collector build/maven/javadoc build/maven/jjtree-javacc build/maven/xmlcodegen demo demo/example demo/gmlparsing demo/jdbc demo/libraryJTS demo/svgsupport demo/xml-po docs modules modules/extension modules/extension/brewer modules/extension/graph modules/extension/validation modules/extension/wms modules/extension/xsd modules/extension/xsd/xsd-core modules/extension/xsd/xsd-fes modules/extension/xsd/xsd-filter modules/extension/xsd/xsd-gml2 modules/extension/xsd/xsd-gml3 modules/extension/xsd/xsd-kml modules/extension/xsd/xsd-ows modules/extension/xsd/xsd-sld modules/extension/xsd/xsd-wcs modules/extension/xsd/xsd-wfs modules/extension/xsd/xsd-wms modules/extension/xsd/xsd-wps modules/library modules/library/api modules/library/coverage modules/library/cql modules/library/data modules/library/jdbc modules/library/main modules/library/metadata modules/library/metadata/src/main/java/org/geotools/factory modules/library/opengis modules/library/referencing modules/library/render modules/library/sample-data modules/library/temporal modules/library/xml modules/ogc modules/ogc/net.opengis.ows modules/ogc/net.opengis.wcs modules/ogc/net.opengis.wfs modules/ogc/net.opengis.wfsv modules/ogc/net.opengis.wps modules/ogc/org.w3.xlink modules/plugin modules/plugin/arcgrid modules/plugin/arcsde modules/plugin/arcsde/common modules/plugin/arcsde/datastore modules/plugin/arcsde/sde-dummy modules/plugin/charts modules/plugin/epsg-extension modules/plugin/epsg-hsql modules/plugin/epsg-postgresql modules/plugin/epsg-wkt modules/plugin/feature-pregeneralized modules/plugin/geotiff modules/plugin/grassraster modules/plugin/gtopo30 modules/plugin/image modules/plugin/imageio-ext-gdal modules/plugin/imagemosaic modules/plugin/imagemosaic-jdbc modules/plugin/imagepyramid modules/plugin/jdbc modules/plugin/jdbc/jdbc-db2 modules/plugin/jdbc/jdbc-h2 modules/plugin/jdbc/jdbc-mysql modules/plugin/jdbc /jdbc-oracle modules/plugin/jdbc/jdbc-postgis modules/plugin/jdbc/jdbc-spatialite modules/plugin/jdbc/jdbc-sqlserver modules/plugin/jdbc/jdbc-teradata modules/plugin/jp2k modules/plugin/property modules/plugin/referencing3D modules/plugin/shapefile modules/plugin/svg modules/unsupported modules/unsupported/app-schema modules/unsupported/app-schema/app-schema modules/unsupported/app-schema/app-schema-packages modules/unsupported/app-schema/app-schema-resolver modules/unsupported/app-schema/jdbc-regfunc modules/unsupported/app-schema/sample-data-access modules/unsupported/app-schema/sample-data-access-isogeom modules/unsupported/app-schema/webservice modules/unsupported/caching modules/unsupported/coverage-experiment modules/unsupported/coverage-experiment/coverage-api modules/unsupported/coverage-experiment/coverage-core modules/unsupported/coverage-experiment/grib1 modules/unsupported/coverage-experiment/hdf4 modules/unsupported/coverage-experiment/netcdf modules/unsupported /coverageio modules/unsupported/coverageio-netcdf modules/unsupported/coveragetools modules/unsupported/csv modules/unsupported/db2 modules/unsupported/dxf modules/unsupported/edigeo modules/unsupported/epsg-h2 modules/unsupported/epsg-oracle modules/unsupported/example modules/unsupported/excel modules/unsupported/geojson modules/unsupported/geometry modules/unsupported/geometryless modules/unsupported/georest modules/unsupported/geotiff_new modules/unsupported/grassraster modules/unsupported/grid modules/unsupported/jai-tools modules/unsupported/jdbc-ng modules/unsupported/jdbc-ng/jdbc-ingres modules/unsupported/jts-wrapper modules/unsupported/matfile5 modules/unsupported/mysql modules/unsupported/ogr modules/unsupported/oracle-spatial modules/unsupported/postgis modules/unsupported/postgis-versioned modules/unsupported/process modules/unsupported/sfs modules/unsupported/shapefile-renderer modules/unsupported/sql-datastore modules/unsupported/swing modules/unsupported/vpf modules/unsupported/wfs modules/unsupported/wfs-ng modules/unsupported/wps spike/jan/gsoc-transformations

From: <svn...@os...> - 2011-12-21 15:17:59

Author: jdeolive
Date: 2011-12-21 07:17:43 -0800 (Wed, 21 Dec 2011)
New Revision: 38443

Modified:
   tags/2.7.4/build/maven/jar-collector/pom.xml
   tags/2.7.4/build/maven/javadoc/pom.xml
   tags/2.7.4/build/maven/jjtree-javacc/pom.xml
   tags/2.7.4/build/maven/pom.xml
   tags/2.7.4/build/maven/xmlcodegen/pom.xml
   tags/2.7.4/build/pom.xml
   tags/2.7.4/build/rename.xml
   tags/2.7.4/demo/example/pom.xml
   tags/2.7.4/demo/gmlparsing/pom.xml
   tags/2.7.4/demo/jdbc/pom.xml
   tags/2.7.4/demo/libraryJTS/pom.xml
   tags/2.7.4/demo/pom.xml
   tags/2.7.4/demo/svgsupport/pom.xml
   tags/2.7.4/demo/xml-po/pom.xml
   tags/2.7.4/docs/pom.xml
   tags/2.7.4/modules/extension/brewer/pom.xml
   tags/2.7.4/modules/extension/graph/pom.xml
   tags/2.7.4/modules/extension/pom.xml
   tags/2.7.4/modules/extension/validation/pom.xml
   tags/2.7.4/modules/extension/wms/pom.xml
   tags/2.7.4/modules/extension/xsd/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-core/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-fes/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-filter/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-gml2/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-gml3/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-kml/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-ows/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-sld/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-wcs/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-wfs/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-wms/pom.xml
   tags/2.7.4/modules/extension/xsd/xsd-wps/pom.xml
   tags/2.7.4/modules/library/api/pom.xml
   tags/2.7.4/modules/library/coverage/pom.xml
   tags/2.7.4/modules/library/cql/pom.xml
   tags/2.7.4/modules/library/data/pom.xml
   tags/2.7.4/modules/library/jdbc/pom.xml
   tags/2.7.4/modules/library/main/pom.xml
   tags/2.7.4/modules/library/metadata/pom.xml
   tags/2.7.4/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
   tags/2.7.4/modules/library/opengis/pom.xml
   tags/2.7.4/modules/library/pom.xml
   tags/2.7.4/modules/library/referencing/pom.xml
   tags/2.7.4/modules/library/render/pom.xml
   tags/2.7.4/modules/library/sample-data/pom.xml
   tags/2.7.4/modules/library/temporal/pom.xml
   tags/2.7.4/modules/library/xml/pom.xml
   tags/2.7.4/modules/ogc/net.opengis.ows/pom.xml
   tags/2.7.4/modules/ogc/net.opengis.wcs/pom.xml
   tags/2.7.4/modules/ogc/net.opengis.wfs/pom.xml
   tags/2.7.4/modules/ogc/net.opengis.wfsv/pom.xml
   tags/2.7.4/modules/ogc/net.opengis.wps/pom.xml
   tags/2.7.4/modules/ogc/org.w3.xlink/pom.xml
   tags/2.7.4/modules/ogc/pom.xml
   tags/2.7.4/modules/plugin/arcgrid/pom.xml
   tags/2.7.4/modules/plugin/arcsde/common/pom.xml
   tags/2.7.4/modules/plugin/arcsde/datastore/pom.xml
   tags/2.7.4/modules/plugin/arcsde/pom.xml
   tags/2.7.4/modules/plugin/arcsde/sde-dummy/pom.xml
   tags/2.7.4/modules/plugin/charts/pom.xml
   tags/2.7.4/modules/plugin/epsg-extension/pom.xml
   tags/2.7.4/modules/plugin/epsg-hsql/pom.xml
   tags/2.7.4/modules/plugin/epsg-postgresql/pom.xml
   tags/2.7.4/modules/plugin/epsg-wkt/pom.xml
   tags/2.7.4/modules/plugin/feature-pregeneralized/pom.xml
   tags/2.7.4/modules/plugin/geotiff/pom.xml
   tags/2.7.4/modules/plugin/grassraster/pom.xml
   tags/2.7.4/modules/plugin/gtopo30/pom.xml
   tags/2.7.4/modules/plugin/image/pom.xml
   tags/2.7.4/modules/plugin/imageio-ext-gdal/pom.xml
   tags/2.7.4/modules/plugin/imagemosaic-jdbc/pom.xml
   tags/2.7.4/modules/plugin/imagemosaic/pom.xml
   tags/2.7.4/modules/plugin/imagepyramid/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-db2/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-h2/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-mysql/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-oracle/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-postgis/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-spatialite/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-sqlserver/pom.xml
   tags/2.7.4/modules/plugin/jdbc/jdbc-teradata/pom.xml
   tags/2.7.4/modules/plugin/jdbc/pom.xml
   tags/2.7.4/modules/plugin/jp2k/pom.xml
   tags/2.7.4/modules/plugin/pom.xml
   tags/2.7.4/modules/plugin/property/pom.xml
   tags/2.7.4/modules/plugin/referencing3D/pom.xml
   tags/2.7.4/modules/plugin/shapefile/pom.xml
   tags/2.7.4/modules/plugin/svg/pom.xml
   tags/2.7.4/modules/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/app-schema-packages/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/app-schema-resolver/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/app-schema/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/jdbc-regfunc/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/sample-data-access/pom.xml
   tags/2.7.4/modules/unsupported/app-schema/webservice/pom.xml
   tags/2.7.4/modules/unsupported/caching/pom.xml
   tags/2.7.4/modules/unsupported/coverage-experiment/coverage-api/pom.xml
   tags/2.7.4/modules/unsupported/coverage-experiment/coverage-core/pom.xml
   tags/2.7.4/modules/unsupported/coverage-experiment/grib1/pom.xml
   tags/2.7.4/modules/unsupported/coverage-experiment/hdf4/pom.xml
   tags/2.7.4/modules/unsupported/coverage-experiment/netcdf/pom.xml
   tags/2.7.4/modules/unsupported/coverage-experiment/pom.xml
   tags/2.7.4/modules/unsupported/coverageio-netcdf/pom.xml
   tags/2.7.4/modules/unsupported/coverageio/pom.xml
   tags/2.7.4/modules/unsupported/coveragetools/pom.xml
   tags/2.7.4/modules/unsupported/csv/pom.xml
   tags/2.7.4/modules/unsupported/db2/pom.xml
   tags/2.7.4/modules/unsupported/dxf/pom.xml
   tags/2.7.4/modules/unsupported/edigeo/pom.xml
   tags/2.7.4/modules/unsupported/epsg-h2/pom.xml
   tags/2.7.4/modules/unsupported/epsg-oracle/pom.xml
   tags/2.7.4/modules/unsupported/example/pom.xml
   tags/2.7.4/modules/unsupported/excel/pom.xml
   tags/2.7.4/modules/unsupported/geojson/pom.xml
   tags/2.7.4/modules/unsupported/geometry/pom.xml
   tags/2.7.4/modules/unsupported/geometryless/pom.xml
   tags/2.7.4/modules/unsupported/georest/pom.xml
   tags/2.7.4/modules/unsupported/geotiff_new/pom.xml
   tags/2.7.4/modules/unsupported/grassraster/pom.xml
   tags/2.7.4/modules/unsupported/grid/pom.xml
   tags/2.7.4/modules/unsupported/jai-tools/pom.xml
   tags/2.7.4/modules/unsupported/jdbc-ng/jdbc-ingres/pom.xml
   tags/2.7.4/modules/unsupported/jdbc-ng/pom.xml
   tags/2.7.4/modules/unsupported/jts-wrapper/pom.xml
   tags/2.7.4/modules/unsupported/matfile5/pom.xml
   tags/2.7.4/modules/unsupported/mysql/pom.xml
   tags/2.7.4/modules/unsupported/ogr/pom.xml
   tags/2.7.4/modules/unsupported/oracle-spatial/pom.xml
   tags/2.7.4/modules/unsupported/pom.xml
   tags/2.7.4/modules/unsupported/postgis-versioned/pom.xml
   tags/2.7.4/modules/unsupported/postgis/pom.xml
   tags/2.7.4/modules/unsupported/process/pom.xml
   tags/2.7.4/modules/unsupported/sfs/pom.xml
   tags/2.7.4/modules/unsupported/shapefile-renderer/pom.xml
   tags/2.7.4/modules/unsupported/sql-datastore/pom.xml
   tags/2.7.4/modules/unsupported/swing/pom.xml
   tags/2.7.4/modules/unsupported/vpf/pom.xml
   tags/2.7.4/modules/unsupported/wfs-ng/pom.xml
   tags/2.7.4/modules/unsupported/wfs/pom.xml
   tags/2.7.4/modules/unsupported/wps/pom.xml
   tags/2.7.4/pom.xml
   tags/2.7.4/spike/jan/gsoc-transformations/pom.xml
Log:
updating version numbers to 2.7.4

Modified: tags/2.7.4/build/maven/jar-collector/pom.xml
===================================================================
--- tags/2.7.4/build/maven/jar-collector/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/maven/jar-collector/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/build/maven/javadoc/pom.xml
===================================================================
--- tags/2.7.4/build/maven/javadoc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/maven/javadoc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.geotools.maven</groupId>
         <artifactId>maven</artifactId>
-        <version>2.7-SNAPSHOT</version>
+        <version>2.7.4</version>
     </parent>
   
 

Modified: tags/2.7.4/build/maven/jjtree-javacc/pom.xml
===================================================================
--- tags/2.7.4/build/maven/jjtree-javacc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/maven/jjtree-javacc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/build/maven/pom.xml
===================================================================
--- tags/2.7.4/build/maven/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/maven/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.maven</groupId>
     <artifactId>build</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/build/maven/xmlcodegen/pom.xml
===================================================================
--- tags/2.7.4/build/maven/xmlcodegen/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/maven/xmlcodegen/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/build/pom.xml
===================================================================
--- tags/2.7.4/build/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>geotools</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/build/rename.xml
===================================================================
--- tags/2.7.4/build/rename.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/build/rename.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -3,13 +3,13 @@
   <target name="rename">
     <replace dir=".">
       <include name="**/pom.xml"/>
-     <replacefilter token="&lt;version&gt;2.6-SNAPSHOT&lt;/version&gt;"
-                     value="&lt;version&gt;2.6-RC2&lt;/version&gt;"/>
+     <replacefilter token="&lt;version&gt;2.7-SNAPSHOT&lt;/version&gt;"
+                     value="&lt;version&gt;2.7.4&lt;/version&gt;"/>
     </replace>
     <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="2.7.4"/>
     </replace>
   </target>
 </project>

Modified: tags/2.7.4/demo/example/pom.xml
===================================================================
--- tags/2.7.4/demo/example/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/example/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.demo</groupId>
     <artifactId>demo</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/demo/gmlparsing/pom.xml
===================================================================
--- tags/2.7.4/demo/gmlparsing/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/gmlparsing/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.demo</groupId>
     <artifactId>demo</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/demo/jdbc/pom.xml
===================================================================
--- tags/2.7.4/demo/jdbc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/jdbc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.demo</groupId>
     <artifactId>demo</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/demo/libraryJTS/pom.xml
===================================================================
--- tags/2.7.4/demo/libraryJTS/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/libraryJTS/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.demo</groupId>
     <artifactId>demo</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/demo/pom.xml
===================================================================
--- tags/2.7.4/demo/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>geotools</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/demo/svgsupport/pom.xml
===================================================================
--- tags/2.7.4/demo/svgsupport/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/svgsupport/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.demo</groupId>
     <artifactId>demo</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/demo/xml-po/pom.xml
===================================================================
--- tags/2.7.4/demo/xml-po/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/demo/xml-po/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.demo</groupId>
     <artifactId>demo</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/docs/pom.xml
===================================================================
--- tags/2.7.4/docs/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/docs/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>geotools</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/brewer/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/brewer/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/brewer/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>extension</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/graph/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/graph/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/graph/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>extension</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/extension/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>modules</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/validation/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/validation/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/validation/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>extension</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/wms/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/wms/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/wms/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>extension</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/extension/xsd/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>extension</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/extension/xsd/xsd-core/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-core/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-core/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/extension/xsd/xsd-fes/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-fes/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-fes/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/xsd/xsd-filter/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-filter/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-filter/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/xsd/xsd-gml2/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-gml2/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-gml2/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/extension/xsd/xsd-gml3/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-gml3/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-gml3/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/extension/xsd/xsd-kml/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-kml/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-kml/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/extension/xsd/xsd-ows/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-ows/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-ows/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</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.4</version>
     </dependency>
     <dependency>
       <groupId>org.geotools.xsd</groupId>

Modified: tags/2.7.4/modules/extension/xsd/xsd-sld/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-sld/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-sld/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/extension/xsd/xsd-wcs/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-wcs/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-wcs/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/extension/xsd/xsd-wfs/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-wfs/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-wfs/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/extension/xsd/xsd-wms/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-wms/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-wms/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/extension/xsd/xsd-wps/pom.xml
===================================================================
--- tags/2.7.4/modules/extension/xsd/xsd-wps/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/extension/xsd/xsd-wps/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.xsd</groupId>
     <artifactId>xsd</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/library/api/pom.xml
===================================================================
--- tags/2.7.4/modules/library/api/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/api/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/coverage/pom.xml
===================================================================
--- tags/2.7.4/modules/library/coverage/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/coverage/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/library/cql/pom.xml
===================================================================
--- tags/2.7.4/modules/library/cql/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/cql/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/library/data/pom.xml
===================================================================
--- tags/2.7.4/modules/library/data/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/data/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/jdbc/pom.xml
===================================================================
--- tags/2.7.4/modules/library/jdbc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/jdbc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/main/pom.xml
===================================================================
--- tags/2.7.4/modules/library/main/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/main/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/library/metadata/pom.xml
===================================================================
--- tags/2.7.4/modules/library/metadata/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/metadata/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
===================================================================
--- tags/2.7.4/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java	2011-12-21 15:17:43 UTC (rev 38443)
@@ -93,7 +93,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.4"));
 
     /**
      * The version control (svn) revision at which this version of geotools was built.

Modified: tags/2.7.4/modules/library/opengis/pom.xml
===================================================================
--- tags/2.7.4/modules/library/opengis/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/opengis/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/library/pom.xml
===================================================================
--- tags/2.7.4/modules/library/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>modules</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/referencing/pom.xml
===================================================================
--- tags/2.7.4/modules/library/referencing/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/referencing/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/library/render/pom.xml
===================================================================
--- tags/2.7.4/modules/library/render/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/render/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/sample-data/pom.xml
===================================================================
--- tags/2.7.4/modules/library/sample-data/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/sample-data/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/temporal/pom.xml
===================================================================
--- tags/2.7.4/modules/library/temporal/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/temporal/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/library/xml/pom.xml
===================================================================
--- tags/2.7.4/modules/library/xml/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/library/xml/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>library</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/ogc/net.opengis.ows/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/net.opengis.ows/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/net.opengis.ows/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>ogc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</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.4</version>
     </dependency>
   </dependencies>
 

Modified: tags/2.7.4/modules/ogc/net.opengis.wcs/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/net.opengis.wcs/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/net.opengis.wcs/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>ogc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools.ogc</groupId>

Modified: tags/2.7.4/modules/ogc/net.opengis.wfs/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/net.opengis.wfs/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/net.opengis.wfs/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>ogc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools.ogc</groupId>

Modified: tags/2.7.4/modules/ogc/net.opengis.wfsv/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/net.opengis.wfsv/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/net.opengis.wfsv/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>ogc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</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.4</version>
     </dependency>
   </dependencies>
 

Modified: tags/2.7.4/modules/ogc/net.opengis.wps/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/net.opengis.wps/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/net.opengis.wps/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>ogc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools.ogc</groupId>

Modified: tags/2.7.4/modules/ogc/org.w3.xlink/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/org.w3.xlink/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/org.w3.xlink/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>ogc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools.ogc</groupId>

Modified: tags/2.7.4/modules/ogc/pom.xml
===================================================================
--- tags/2.7.4/modules/ogc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/ogc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>modules</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools</groupId>

Modified: tags/2.7.4/modules/plugin/arcgrid/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/arcgrid/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/arcgrid/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/arcsde/common/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/arcsde/common/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/arcsde/common/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>arcsde-plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/arcsde/datastore/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/arcsde/datastore/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/arcsde/datastore/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.geotools</groupId>
 		<artifactId>arcsde-plugin</artifactId>
-		<version>2.7-SNAPSHOT</version>
+		<version>2.7.4</version>
 	</parent>
 
 

Modified: tags/2.7.4/modules/plugin/arcsde/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/arcsde/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/arcsde/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/arcsde/sde-dummy/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/arcsde/sde-dummy/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/arcsde/sde-dummy/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>arcsde-plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/charts/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/charts/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/charts/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/epsg-extension/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/epsg-extension/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/epsg-extension/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/epsg-hsql/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/epsg-hsql/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/epsg-hsql/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/epsg-postgresql/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/epsg-postgresql/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/epsg-postgresql/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/epsg-wkt/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/epsg-wkt/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/epsg-wkt/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/feature-pregeneralized/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/feature-pregeneralized/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/feature-pregeneralized/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/geotiff/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/geotiff/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/geotiff/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/grassraster/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/grassraster/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/grassraster/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/gtopo30/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/gtopo30/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/gtopo30/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/image/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/image/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/image/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/imageio-ext-gdal/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/imageio-ext-gdal/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/imageio-ext-gdal/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/plugin/imagemosaic/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/imagemosaic/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/imagemosaic/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/imagemosaic-jdbc/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/imagemosaic-jdbc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/imagemosaic-jdbc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/imagepyramid/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/imagepyramid/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/imagepyramid/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <!--properties>

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-db2/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-db2/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-db2/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-h2/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-h2/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-h2/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-mysql/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-mysql/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-mysql/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-oracle/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-oracle/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-oracle/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-postgis/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-postgis/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-postgis/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-spatialite/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-spatialite/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-spatialite/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-sqlserver/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-sqlserver/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-sqlserver/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/jdbc-teradata/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/jdbc-teradata/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/jdbc-teradata/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools.jdbc</groupId>
     <artifactId>gt-jdbc</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jdbc/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jdbc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jdbc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/jp2k/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/jp2k/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/jp2k/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>modules</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/plugin/property/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/property/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/property/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/referencing3D/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/referencing3D/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/referencing3D/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/shapefile/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/shapefile/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/shapefile/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/plugin/svg/pom.xml
===================================================================
--- tags/2.7.4/modules/plugin/svg/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/plugin/svg/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/pom.xml
===================================================================
--- tags/2.7.4/modules/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>geotools</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/unsupported/app-schema/app-schema/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/app-schema/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/app-schema/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>app-schema</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/unsupported/app-schema/app-schema-packages/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/app-schema-packages/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/app-schema-packages/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.geotools</groupId>
         <artifactId>app-schema</artifactId>
-        <version>2.7-SNAPSHOT</version>
+        <version>2.7.4</version>
     </parent>
  
     <groupId>org.geotools</groupId>

Modified: tags/2.7.4/modules/unsupported/app-schema/app-schema-resolver/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/app-schema-resolver/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/app-schema-resolver/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.geotools</groupId>
         <artifactId>app-schema</artifactId>
-        <version>2.7-SNAPSHOT</version>
+        <version>2.7.4</version>
     </parent>
 
     <groupId>org.geotools</groupId>

Modified: tags/2.7.4/modules/unsupported/app-schema/jdbc-regfunc/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/jdbc-regfunc/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/jdbc-regfunc/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.geotools</groupId>
 		<artifactId>app-schema</artifactId>
-		<version>2.7-SNAPSHOT</version>
+		<version>2.7.4</version>
 	</parent>
 
 

Modified: tags/2.7.4/modules/unsupported/app-schema/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>unsupported</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/unsupported/app-schema/sample-data-access/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/sample-data-access/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/sample-data-access/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>app-schema</artifactId>
     <groupId>org.geotools</groupId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools</groupId>

Modified: tags/2.7.4/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/sample-data-access-isogeom/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>app-schema</artifactId>
     <groupId>org.geotools</groupId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
   <groupId>org.geotools</groupId>

Modified: tags/2.7.4/modules/unsupported/app-schema/webservice/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/app-schema/webservice/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/app-schema/webservice/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
 		<groupId>org.geotools</groupId>
 		<artifactId>app-schema</artifactId>
-		<version>2.7-SNAPSHOT</version>
+		<version>2.7.4</version>
    </parent>
 
 

Modified: tags/2.7.4/modules/unsupported/caching/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/caching/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/caching/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>unsupported</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
 
 

Modified: tags/2.7.4/modules/unsupported/coverage-experiment/coverage-api/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/coverage-experiment/coverage-api/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/coverage-experiment/coverage-api/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.geotools</groupId>
     <artifactId>gt-coverage-experiment</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
   </parent>
   
 

Modified: tags/2.7.4/modules/unsupported/coverage-experiment/coverage-core/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/coverage-experiment/coverage-core/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/coverage-experiment/coverage-core/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -12,7 +12,7 @@
    <parent>
     <groupId>org.geotools</groupId>
     <artifactId>gt-coverage-experiment</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
    </parent>
 
 

Modified: tags/2.7.4/modules/unsupported/coverage-experiment/grib1/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/coverage-experiment/grib1/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/coverage-experiment/grib1/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -12,7 +12,7 @@
    <parent>
     <groupId>org.geotools</groupId>
     <artifactId>gt-coverage-experiment</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
    </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/unsupported/coverage-experiment/hdf4/pom.xml
===================================================================
--- tags/2.7.4/modules/unsupported/coverage-experiment/hdf4/pom.xml	2011-12-21 15:08:39 UTC (rev 38442)
+++ tags/2.7.4/modules/unsupported/coverage-experiment/hdf4/pom.xml	2011-12-21 15:17:43 UTC (rev 38443)
@@ -12,7 +12,7 @@
    <parent>
     <groupId>org.geotools</groupId>
     <artifactId>gt-coverage-experiment</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7.4</version>
    </parent>
 
   <!-- =========================================================== -->

Modified: tags/2.7.4/modules/unsupported/coverage-experiment/netcdf/pom.xml
========================================================...
 
[truncated message content]

[Geotools-commits] svn - r38442 - in tags: . 2.7.4

From: <svn...@os...> - 2011-12-21 15:08:51

Author: jdeolive
Date: 2011-12-21 07:08:39 -0800 (Wed, 21 Dec 2011)
New Revision: 38442

Added:
   tags/2.7.4/
Log:
tagging 2.7.4


Property changes on: tags/2.7.4
___________________________________________________________________
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

[Geotools-commits] svn - r38441 - trunk/modules/library/main/src/main/java/org/geotools/data/ows

From: <svn...@os...> - 2011-12-21 04:52:59

Author: groldan
Date: 2011-12-20 20:52:53 -0800 (Tue, 20 Dec 2011)
New Revision: 38441

Modified:
   trunk/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java
Log:
Make SimpleHttpClient respect the set connection and read timeouts. It was assuming millisecond while the properties are set in seconds

Modified: trunk/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java	2011-12-21 04:51:54 UTC (rev 38440)
+++ trunk/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java	2011-12-21 04:52:53 UTC (rev 38441)
@@ -34,7 +34,7 @@
  */
 public class SimpleHttpClient implements HTTPClient {
 
-    private static final int DEFAULT_TIMEOUT = 30000;// 30 seconds
+    private static final int DEFAULT_TIMEOUT = 30;// 30 seconds
 
     private String user;
 
@@ -131,8 +131,9 @@
     private HttpURLConnection openConnection(URL finalURL) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) finalURL.openConnection();
         connection.addRequestProperty("Accept-Encoding", "gzip");
-        connection.setConnectTimeout(getConnectTimeout());
-        connection.setReadTimeout(getReadTimeout());
+        // mind, connect timeout is in seconds
+        connection.setConnectTimeout(1000 * getConnectTimeout());
+        connection.setReadTimeout(1000 * getReadTimeout());
 
         final String username = getUser();
         final String password = getPassword();

[Geotools-commits] svn - r38440 - branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows

From: <svn...@os...> - 2011-12-21 04:52:02

Author: groldan
Date: 2011-12-20 20:51:54 -0800 (Tue, 20 Dec 2011)
New Revision: 38440

Modified:
   branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java
Log:
Make SimpleHttpClient respect the set connection and read timeouts. It was assuming millisecond while the properties are set in seconds

Modified: branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java
===================================================================
--- branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java	2011-12-21 03:58:42 UTC (rev 38439)
+++ branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java	2011-12-21 04:51:54 UTC (rev 38440)
@@ -34,7 +34,7 @@
  */
 public class SimpleHttpClient implements HTTPClient {
 
-    private static final int DEFAULT_TIMEOUT = 30000;// 30 seconds
+    private static final int DEFAULT_TIMEOUT = 30;// 30 seconds
 
     private String user;
 
@@ -131,8 +131,9 @@
     private HttpURLConnection openConnection(URL finalURL) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) finalURL.openConnection();
         connection.addRequestProperty("Accept-Encoding", "gzip");
-        connection.setConnectTimeout(getConnectTimeout());
-        connection.setReadTimeout(getReadTimeout());
+        // mind, connect timeout is in seconds
+        connection.setConnectTimeout(1000 * getConnectTimeout());
+        connection.setReadTimeout(1000 * getReadTimeout());
 
         final String username = getUser();
         final String password = getPassword();

[Geotools-commits] svn - r38439 - branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows

From: <svn...@os...> - 2011-12-21 03:58:48

Author: groldan
Date: 2011-12-20 19:58:42 -0800 (Tue, 20 Dec 2011)
New Revision: 38439

Modified:
   branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java
Log:
GEOT-3988: support http proxy system properties in commons-httpclient based wms http backend

Modified: branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java	2011-12-21 03:58:04 UTC (rev 38438)
+++ branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java	2011-12-21 03:58:42 UTC (rev 38439)
@@ -19,11 +19,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.logging.Logger;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
@@ -32,17 +35,25 @@
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+import org.geotools.util.logging.Logging;
 
 /**
  * An Apache commons HTTP client based {@link HTTPClient} backed by a multithreaded connection
  * manager that allows to reuse connections to the backing server and to limit the
  * {@link #setMaxConnections(int) max number of concurrent connections}.
  * 
+ * <p>
+ * Java System properties {@code http.proxyHost}, {@code http.proxyPort}, {@code http.proxyUser},
+ * and {@code http.proxyPassword} are respected.
+ * </p>
+ * 
  * @author groldan
  * @see AbstractOpenWebService#setHttpClient(HTTPClient)
  */
 public class MultithreadedHttpClient implements HTTPClient {
 
+    private static final Logger LOGGER = Logging.getLogger(MultithreadedHttpClient.class);
+    
     private MultiThreadedHttpConnectionManager connectionManager;
 
     private HttpClient client;
@@ -59,12 +70,47 @@
         params.setConnectionTimeout(30000);
         params.setMaxTotalConnections(6);
         params.setDefaultMaxConnectionsPerHost(6);
-
+        
         connectionManager.setParams(params);
 
         client = new HttpClient(connectionManager);
+        
+        applySystemProxySettings();
     }
 
+    private void applySystemProxySettings() {
+        final String proxyHost = System.getProperty("http.proxyHost");
+        final int proxyPort = Integer.parseInt(System.getProperty("http.proxyPort", "80"));
+        // String nonProxyHost = System.getProperty("http.nonProxyHosts");
+
+        if (proxyHost != null) {
+            LOGGER.fine("Found 'http.proxyHost' Java System property. Using it as proxy server. Port: "
+                    + proxyPort);
+            HostConfiguration hostConfig = client.getHostConfiguration();
+            hostConfig.setProxy(proxyHost, proxyPort);
+        }
+
+        final String proxyUser = System.getProperty("http.proxyUser");
+        final String proxyPassword = System.getProperty("http.proxyPassword");
+        if (proxyUser != null) {
+            if (proxyPassword == null || proxyPassword.length() == 0) {
+                LOGGER.warning("System property http.proxyUser provided but http.proxyPassword "
+                        + "not provided or empty. Proxy auth credentials will be passed as is anyway.");
+            } else {
+                LOGGER.fine("System property http.proxyUser and http.proxyPassword found,"
+                        + " setting proxy auth credentials");
+            }
+            HttpState state = client.getState();
+            if (state == null) {
+                state = new HttpState();
+                client.setState(state);
+            }
+            AuthScope authscope = AuthScope.ANY;
+            Credentials credentials = new UsernamePasswordCredentials(proxyUser, proxyPassword);
+            state.setProxyCredentials(authscope, credentials);
+        }
+    }
+
     // @Override
     public HTTPResponse post(final URL url, final InputStream postContent,
             final String postContentType) throws IOException {

[Geotools-commits] svn - r38438 - trunk/modules/extension/wms/src/main/java/org/geotools/data/ows

From: <svn...@os...> - 2011-12-21 03:58:10

Author: groldan
Date: 2011-12-20 19:58:04 -0800 (Tue, 20 Dec 2011)
New Revision: 38438

Modified:
   trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java
Log:
GEOT-3988: support http proxy system properties in commons-httpclient based wms http backend

Modified: trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java
===================================================================
--- trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java	2011-12-20 16:27:34 UTC (rev 38437)
+++ trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/MultithreadedHttpClient.java	2011-12-21 03:58:04 UTC (rev 38438)
@@ -19,11 +19,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.logging.Logger;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
@@ -32,17 +35,25 @@
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+import org.geotools.util.logging.Logging;
 
 /**
  * An Apache commons HTTP client based {@link HTTPClient} backed by a multithreaded connection
  * manager that allows to reuse connections to the backing server and to limit the
  * {@link #setMaxConnections(int) max number of concurrent connections}.
  * 
+ * <p>
+ * Java System properties {@code http.proxyHost}, {@code http.proxyPort}, {@code http.proxyUser},
+ * and {@code http.proxyPassword} are respected.
+ * </p>
+ * 
  * @author groldan
  * @see AbstractOpenWebService#setHttpClient(HTTPClient)
  */
 public class MultithreadedHttpClient implements HTTPClient {
 
+    private static final Logger LOGGER = Logging.getLogger(MultithreadedHttpClient.class);
+    
     private MultiThreadedHttpConnectionManager connectionManager;
 
     private HttpClient client;
@@ -59,12 +70,47 @@
         params.setConnectionTimeout(30000);
         params.setMaxTotalConnections(6);
         params.setDefaultMaxConnectionsPerHost(6);
-
+        
         connectionManager.setParams(params);
 
         client = new HttpClient(connectionManager);
+        
+        applySystemProxySettings();
     }
 
+    private void applySystemProxySettings() {
+        final String proxyHost = System.getProperty("http.proxyHost");
+        final int proxyPort = Integer.parseInt(System.getProperty("http.proxyPort", "80"));
+        // String nonProxyHost = System.getProperty("http.nonProxyHosts");
+
+        if (proxyHost != null) {
+            LOGGER.fine("Found 'http.proxyHost' Java System property. Using it as proxy server. Port: "
+                    + proxyPort);
+            HostConfiguration hostConfig = client.getHostConfiguration();
+            hostConfig.setProxy(proxyHost, proxyPort);
+        }
+
+        final String proxyUser = System.getProperty("http.proxyUser");
+        final String proxyPassword = System.getProperty("http.proxyPassword");
+        if (proxyUser != null) {
+            if (proxyPassword == null || proxyPassword.length() == 0) {
+                LOGGER.warning("System property http.proxyUser provided but http.proxyPassword "
+                        + "not provided or empty. Proxy auth credentials will be passed as is anyway.");
+            } else {
+                LOGGER.fine("System property http.proxyUser and http.proxyPassword found,"
+                        + " setting proxy auth credentials");
+            }
+            HttpState state = client.getState();
+            if (state == null) {
+                state = new HttpState();
+                client.setState(state);
+            }
+            AuthScope authscope = AuthScope.ANY;
+            Credentials credentials = new UsernamePasswordCredentials(proxyUser, proxyPassword);
+            state.setProxyCredentials(authscope, credentials);
+        }
+    }
+
     @Override
     public HTTPResponse post(final URL url, final InputStream postContent,
             final String postContentType) throws IOException {

[Geotools-commits] svn - r38437 - branches/2.7.x/modules/library/metadata

From: <svn...@os...> - 2011-12-20 16:27:45

Author: jdeolive
Date: 2011-12-20 08:27:34 -0800 (Tue, 20 Dec 2011)
New Revision: 38437

Modified:
   branches/2.7.x/modules/library/metadata/pom.xml
Log:
deactivating git info plugin by default

Modified: branches/2.7.x/modules/library/metadata/pom.xml
===================================================================
--- branches/2.7.x/modules/library/metadata/pom.xml	2011-12-20 10:26:36 UTC (rev 38436)
+++ branches/2.7.x/modules/library/metadata/pom.xml	2011-12-20 16:27:34 UTC (rev 38437)
@@ -140,15 +140,6 @@
   <profiles>
     <profile>
        <id>gitinfo</id>
-       <activation>
-         <file>
-           <!-- .git directory specified relative to working directory, so
-                this profile only engaged when building from root. This is
-                changed/fixed in maven 3, so when build server switches to 
-                maven 3 change this to '../../../.git' -->
-           <exists>.git</exists>
-         </file>
-       </activation> 
        <build>
         <plugins>
           <plugin>

[Geotools-commits] svn - r38436 - in trunk/modules: extension/wms extension/wms/src/main/java/org/geotools/data/ows extension/wms/src/main/java/org/geotools/map extension/wms/src/test/java/org/geotools extension/wms/src/test/java/org/geotools/data/ows extension/wms/src/test/java/org/geotools/data/wms extension/wms/src/test/java/org/geotools/data/wms/test extension/wms/src/test/java/org/geotools/map extension/wms/src/test/resources/org/geotools extension/wms/src/test/resources/org/geotools/map library/api/src/main/java/org/geotools/geometry/jts plugin/epsg-extension/src/main/resources/org/geotools/referencing/factory/epsg plugin/epsg-extension/src/test/java/org/geotools/referencing/factory/epsg

From: <svn...@os...> - 2011-12-20 10:26:45

Author: aaime
Date: 2011-12-20 02:26:36 -0800 (Tue, 20 Dec 2011)
New Revision: 38436

Added:
   trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java
   trunk/modules/extension/wms/src/test/java/org/geotools/map/
   trunk/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java
   trunk/modules/extension/wms/src/test/resources/org/geotools/map/
   trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml
   trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml
   trunk/modules/extension/wms/src/test/resources/org/geotools/map/world.png
Modified:
   trunk/modules/extension/wms/pom.xml
   trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java
   trunk/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java
   trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java
   trunk/modules/library/api/src/main/java/org/geotools/geometry/jts/ReferencedEnvelope.java
   trunk/modules/plugin/epsg-extension/src/main/resources/org/geotools/referencing/factory/epsg/esri.properties
   trunk/modules/plugin/epsg-extension/src/test/java/org/geotools/referencing/factory/epsg/EsriExtensionTest.java
Log:
[GEOT-3989] Accessing a WMS 1.3 server advertising only CRS:84 won't work with WMSLayer

Modified: trunk/modules/extension/wms/pom.xml
===================================================================
--- trunk/modules/extension/wms/pom.xml	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/pom.xml	2011-12-20 10:26:36 UTC (rev 38436)
@@ -128,16 +128,27 @@
     </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
-      <artifactId>gt-epsg-wkt</artifactId>
+      <artifactId>gt-epsg-hsql</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
+      <artifactId>gt-epsg-extension</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.geotools</groupId>
       <artifactId>gt-sample-data</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 
@@ -160,7 +171,6 @@
             <exclude>**/WMS1_1_1_OnlineTest.java</exclude>
             <exclude>**/WMS1_3_0_OnlineTest.java</exclude>
             <!-- The following tests fail -->
-            <exclude>**/Geot553Test.java</exclude>
             <exclude>**/WMSSchemaTest.java</exclude>
           </excludes>
         </configuration>

Modified: trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java
===================================================================
--- trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -214,9 +214,13 @@
         if (allBoundingBoxesCache == null) {
             allBoundingBoxesCache = new HashMap<String, CRSEnvelope>();
             
+            for( CRSEnvelope bbox : getLayerBoundingBoxes() ){
+                allBoundingBoxesCache.put( bbox.getSRSName(), bbox );
+            }
+            
             Layer parent = this.getParent();
-            while (parent != null) {
-                for( CRSEnvelope bbox : getLayerBoundingBoxes() ){
+            while (parent != null && allBoundingBoxesCache.size() == 0) {
+                for( CRSEnvelope bbox : parent.getLayerBoundingBoxes() ){
                     allBoundingBoxesCache.put( bbox.getSRSName(), bbox );
                 }
                 parent = parent.getParent();

Modified: trunk/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java
===================================================================
--- trunk/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -34,6 +34,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.ows.ServiceException;
 import org.geotools.referencing.CRS;
+import org.geotools.referencing.CRS.AxisOrder;
 import org.geotools.renderer.lite.RendererUtilities;
 import org.geotools.util.Version;
 import org.opengis.coverage.grid.Format;
@@ -115,11 +116,6 @@
     CoordinateReferenceSystem requestCRS;
     
     /**
-     * Flag telling us if we have to flip geographic bounds before using them
-     */
-    boolean flipGeographic;
-
-    /**
      * Builds a new WMS coverage reader
      * 
      * @param wms
@@ -128,10 +124,6 @@
     public WMSCoverageReader(WebMapServer wms, Layer layer) {
         this.wms = wms;
         
-        // check if we need coordinate flipping
-        Version version = new Version(wms.getCapabilities().getVersion());
-        flipGeographic = version.compareTo(new Version("1.3.0")) >= 0;
-
         // init the reader
         addLayer(layer);
 
@@ -390,7 +382,7 @@
         
         // bbox might need flipping
         ReferencedEnvelope requestEnvelope = gridEnvelope;
-        if(requestCRS instanceof GeographicCRS && flipGeographic) {
+        if(axisFlipped(requestSrs)) {
             requestEnvelope = flipEnvelope(requestEnvelope);
         }
         mapRequest.setBBox(requestEnvelope);
@@ -403,6 +395,29 @@
         return gridEnvelope;
     }
 
+    private boolean axisFlipped(String srsName) {
+        Version version = new Version(wms.getCapabilities().getVersion());
+        if(version.compareTo(new Version("1.3.0")) < 0) {
+            // aah, sheer simplicity
+            return false;
+        } else {
+            // gah, hell gates breaking loose
+            if(srsName.startsWith("EPSG:")) {
+                try {
+                    String epsgNative =  "urn:x-ogc:def:crs:EPSG:".concat(srsName.substring(5));
+                    return CRS.getAxisOrder(CRS.decode(epsgNative)) == AxisOrder.NORTH_EAST;
+                } catch(Exception e) {
+                    LOGGER.log(Level.WARNING, "Failed to determine axis order for " 
+                            + srsName + ", assuming east/north", e);
+                    return false;
+                }
+            } else {
+                // CRS or AUTO, none of them is flipped so far
+                return false;
+            }
+        }
+    }
+
     private ReferencedEnvelope flipEnvelope(ReferencedEnvelope requestEnvelope) {
         double minx = requestEnvelope.getMinX();
         double miny = requestEnvelope.getMinY();
@@ -423,13 +438,14 @@
      * @return
      */
     public void updateBounds() {
+        boolean axisFlipped = axisFlipped(srsName);
         ReferencedEnvelope result = reference(layers.get(0).getEnvelope(crs));
-        if(result.getCoordinateReferenceSystem() instanceof GeographicCRS && flipGeographic) {
+        if(result.getCoordinateReferenceSystem() instanceof GeographicCRS && axisFlipped) {
             result = flipEnvelope(result);
         }
         for (int i = 1; i < layers.size(); i++) {
             ReferencedEnvelope layerEnvelope = reference(layers.get(i).getEnvelope(crs));
-            if(layerEnvelope.getCoordinateReferenceSystem() instanceof GeographicCRS && flipGeographic) {
+            if(layerEnvelope.getCoordinateReferenceSystem() instanceof GeographicCRS && axisFlipped) {
                 layerEnvelope = flipEnvelope(layerEnvelope);
             }
             result.expandToInclude(layerEnvelope);
@@ -462,4 +478,5 @@
         return new ReferencedEnvelope(ge.getMinimum(0), ge.getMaximum(0), ge.getMinimum(1), ge
                 .getMaximum(1), ge.getCoordinateReferenceSystem());
     }
+    
 }
\ No newline at end of file

Added: trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java	                        (rev 0)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -0,0 +1,74 @@
+package org.geotools.data.ows;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.geotools.data.ows.HTTPClient;
+import org.geotools.data.ows.HTTPResponse;
+
+/**
+ * Helper class to test WMS cascading
+ *  
+ * @author Andrea Aime - GeoSolutions
+ */
+public abstract class MockHttpClient implements HTTPClient {
+
+    protected String user;
+
+    protected String password;
+
+    protected int connectTimeout;
+
+    protected int readTimeout;
+
+    public HTTPResponse post(URL url, InputStream postContent, String postContentType)
+            throws IOException {
+        throw new UnsupportedOperationException(
+                "POST not supported, if needed you have to override and implement");
+    }
+
+    public HTTPResponse get(URL url) throws IOException {
+        throw new UnsupportedOperationException(
+                "GET not supported, if needed you have to override and implement");
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+
+    }
+
+    
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+
+    }
+
+    
+    public int getReadTimeout() {
+        return this.readTimeout;
+    }
+
+    
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+}
\ No newline at end of file

Added: trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java	                        (rev 0)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -0,0 +1,74 @@
+package org.geotools.data.ows;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.geotools.data.ows.HTTPResponse;
+
+/**
+ * Helper class to mock HTTP responses
+ * 
+ * @author Andrea Aime - GeoSolutions
+ */
+public class MockHttpResponse implements HTTPResponse {
+
+    String contentType;
+
+    Map<String, String> headers;
+
+    byte[] response;
+
+    public MockHttpResponse(String response, String contentType, String... headers) {
+        this(response.getBytes(), contentType, headers);
+    }
+    
+    public MockHttpResponse(URL response, String contentType, String... headers) throws IOException {
+        this(IOUtils.toByteArray(response.openStream()), contentType, headers);
+    }
+
+    public MockHttpResponse(byte[] response, String contentType, String... headers) {
+        this.response = response;
+        this.contentType = contentType;
+        this.headers = new HashMap<String, String>();
+
+        if (headers != null) {
+            if (headers.length % 2 != 0) {
+                throw new IllegalArgumentException(
+                        "The headers must be a alternated sequence of keys "
+                                + "and values, should have an even number of entries");
+            }
+
+            for (int i = 0; i < headers.length; i += 2) {
+                String key = headers[i];
+                String value = headers[i++];
+                this.headers.put(key, value);
+            }
+        }
+    }
+
+    
+    public void dispose() {
+        // nothing to do
+    }
+
+    
+    public String getContentType() {
+        return this.contentType;
+    }
+
+    
+    public String getResponseHeader(String headerName) {
+        return headers.get(headerName);
+    }
+
+    
+    public InputStream getResponseStream() throws IOException {
+        return new ByteArrayInputStream(response);
+    }
+
+}

Modified: trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -81,7 +81,7 @@
 	public void testMatchEPSG() throws Exception {
 		CoordinateReferenceSystem crs4326 = CRS.decode("EPSG:4326");
 		CoordinateReferenceSystem crs3005 = CRS.decode("EPSG:3005");
-		CoordinateReferenceSystem crs42101 = CRS.decode("EPSG:42101");
+		CoordinateReferenceSystem crs3347 = CRS.decode("EPSG:3347");
 		
 		Set codes = new TreeSet();
 		codes.add("EPSG:4326");
@@ -100,7 +100,7 @@
 		assertNotNull(result2);
 		assertEquals("EPSG:42102", result2);
 		
-		String result3 = WMSUtils.matchEPSG(crs42101, codes);
+		String result3 = WMSUtils.matchEPSG(crs3347, codes);
 		assertNull(result3);
 	}
 

Modified: trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -16,14 +16,22 @@
  */
 package org.geotools.data.wms.test;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
+import org.geotools.data.ows.HTTPResponse;
 import org.geotools.data.ows.Layer;
+import org.geotools.data.ows.MockHttpClient;
+import org.geotools.data.ows.MockHttpResponse;
 import org.geotools.data.wms.WebMapServer;
 import org.geotools.geometry.GeneralDirectPosition;
+import org.geotools.map.WMSCoverageReaderTest;
 import org.geotools.referencing.CRS;
 import org.geotools.test.TestData;
 import org.opengis.geometry.DirectPosition;
@@ -50,18 +58,23 @@
     	CoordinateReferenceSystem epsg26591 = CRS.decode("EPSG:26591");
     	CoordinateReferenceSystem epsg4326 = CRS.decode("EPSG:4326");
     	
-    	MathTransform transform = CRS.findMathTransform(epsg26591, epsg4326, true);
-    	DirectPosition min = transform.transform(new GeneralDirectPosition(minx, miny), null);
-    	DirectPosition max = transform.transform(new GeneralDirectPosition(maxx, maxy), null);
-    	System.out.println(min);
-    	System.out.println(max);
-    	
-    	
-        File getCaps = TestData.file(this, "geot553capabilities.xml");
-    	
-        URL getCapsURL = TestData.getResource(this, "geot553capabilities.xml");
+        // prepare the responses
+        MockHttpClient client = new MockHttpClient() {
+
+            public HTTPResponse get(URL url) throws IOException {
+                if (url.getQuery().contains("GetCapabilities")) {
+                    URL caps = TestData.getResource(this, "geot553capabilities.xml");
+                    return new MockHttpResponse(caps, "text/xml");
+                } else {
+                    throw new IllegalArgumentException(
+                            "Don't know how to handle a get request over " + url.toExternalForm());
+                }
+            }
+
+        };
         
-        WebMapServer wms = new WebMapServer(getCapsURL);
+        
+        WebMapServer wms = new WebMapServer(new URL("http://test.org"), client);
         Layer layer = wms.getCapabilities().getLayer().getChildren()[2];
         
         Envelope env = wms.getEnvelope(layer, CRS.decode("EPSG:3005"));

Modified: trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -44,7 +44,7 @@
     static private URL serverURL;
     static {
         try {
-            serverURL = new URL("http://127.0.0.1:8080/geoserver/wms?SERVICE=WMS&");
+            serverURL = new URL("http://127.0.0.1:8080/geoserver/ows?SERVICE=WMS&");
         } catch (MalformedURLException e) {
             serverURL = null;
         };
@@ -102,7 +102,7 @@
         assertNotNull( info );
         
         assertEquals( serverURL, wms.getCapabilities().getRequest().getGetCapabilities().getGet() );
-        assertEquals( "My GeoServer WMS", info.getTitle() );
+        assertEquals( "GeoServer Web Map Service", info.getTitle() );
         
         assertNotNull( info.getDescription() );        
     }

Modified: trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -162,7 +162,7 @@
             request.setFormat("image/jpeg");
             System.out.println(request.getFinalURL().toExternalForm());
             
-            assertTrue(request.getFinalURL().toExternalForm().indexOf("JPEG") >= 0);
+            assertTrue(request.getFinalURL().toExternalForm().indexOf("jpeg") >= 0);
         } catch(java.net.ConnectException ce){
             if(ce.getMessage().indexOf("timed out")>0){
                 System.err.println("Unable to test - timed out: "+ce);

Modified: trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -263,7 +263,8 @@
             request.setFormat("image/jpeg");
             //System.out.println(request.getFinalURL().toExternalForm());
             
-            assertTrue(request.getFinalURL().toExternalForm().indexOf("image/jpeg") >= 0);
+            String externalForm = request.getFinalURL().toExternalForm();
+            assertTrue(externalForm.indexOf("image%2Fjpeg") >= 0);
         } catch(java.net.ConnectException ce){
             if(ce.getMessage().indexOf("timed out")>0){
                 System.err.println("Unable to test - timed out: "+ce);

Modified: trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -204,7 +204,7 @@
         
         WMSCapabilities caps = wms.getCapabilities();
         
-        Layer layer = (Layer) caps.getLayerList().get(1);
+        Layer layer = (Layer) caps.getLayerList().get(0);
         CoordinateReferenceSystem crs = CRS.decode("EPSG:4326");
         
         GeneralEnvelope envelope = wms.getEnvelope(layer, crs);

Added: trunk/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java
===================================================================
--- trunk/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java	                        (rev 0)
+++ trunk/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java	2011-12-20 10:26:36 UTC (rev 38436)
@@ -0,0 +1,132 @@
+package org.geotools.map;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.util.ParameterParser;
+import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.coverage.grid.GridEnvelope2D;
+import org.geotools.coverage.grid.GridGeometry2D;
+import org.geotools.coverage.grid.io.AbstractGridFormat;
+import org.geotools.data.ows.HTTPResponse;
+import org.geotools.data.ows.Layer;
+import org.geotools.data.ows.MockHttpClient;
+import org.geotools.data.ows.MockHttpResponse;
+import org.geotools.data.wms.WebMapServer;
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.parameter.Parameter;
+import org.geotools.referencing.CRS;
+import org.junit.Test;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+public class WMSCoverageReaderTest {
+
+    Map<String, String> parseParams(String query) {
+        ParameterParser pp = new ParameterParser();
+        List params = pp.parse(query, '&');
+        Map<String, String> result = new HashMap<String, String>();
+        for (Iterator it = params.iterator(); it.hasNext();) {
+            NameValuePair pair = (NameValuePair) it.next();
+            result.put(pair.getName().toUpperCase(), pair.getValue());
+        }
+        return result;
+    };
+
+    @Test
+    public void test4326wms13() throws Exception {
+        // prepare the responses
+        MockHttpClient client = new MockHttpClient() {
+
+            public HTTPResponse get(URL url) throws IOException {
+                if (url.getQuery().contains("GetCapabilities")) {
+                    URL caps130 = WMSCoverageReaderTest.class.getResource("caps130.xml");
+                    return new MockHttpResponse(caps130, "text/xml");
+                } else if (url.getQuery().contains("GetMap")
+                        && url.getQuery().contains("world4326")) {
+                    Map<String, String> params = parseParams(url.getQuery());
+                    assertEquals("1.3.0", params.get("VERSION"));
+                    assertEquals("-90.0,-180.0,90.0,180.0", params.get("BBOX"));
+                    assertEquals("EPSG:4326", params.get("CRS"));
+                    URL world = WMSCoverageReaderTest.class.getResource("world.png");
+                    return new MockHttpResponse(world, "image/png");
+                } else {
+                    throw new IllegalArgumentException(
+                            "Don't know how to handle a get request over " + url.toExternalForm());
+                }
+            }
+
+        };
+        // setup the reader
+        WebMapServer server = new WebMapServer(new URL("http://geoserver.org/geoserver/wms"),
+                client);
+        WMSCoverageReader reader = new WMSCoverageReader(server, getLayer(server, "world4326"));
+
+        // build a getmap request and check it
+        CoordinateReferenceSystem wgs84 = CRS.decode("EPSG:4326", true);
+        ReferencedEnvelope worldEnvelope = new ReferencedEnvelope(-180, 180, -90, 90, wgs84);
+        GridGeometry2D gg = new GridGeometry2D(new GridEnvelope2D(0, 0, 180, 90), worldEnvelope);
+        final Parameter<GridGeometry2D> ggParam = (Parameter<GridGeometry2D>) AbstractGridFormat.READ_GRIDGEOMETRY2D
+                .createValue();
+        ggParam.setValue(gg);
+        GridCoverage2D coverage = reader.read(new GeneralParameterValue[] { ggParam });
+        assertTrue(CRS.equalsIgnoreMetadata(wgs84, coverage.getCoordinateReferenceSystem()));
+        assertEquals(worldEnvelope, new ReferencedEnvelope(coverage.getEnvelope()));
+    }
+
+    @Test
+    public void testCrs84wms13() throws Exception {
+        // prepare the responses
+        MockHttpClient client = new MockHttpClient() {
+
+            public HTTPResponse get(URL url) throws IOException {
+                if (url.getQuery().contains("GetCapabilities")) {
+                    URL caps130 = WMSCoverageReaderTest.class.getResource("caps130_crs84.xml");
+                    return new MockHttpResponse(caps130, "text/xml");
+                } else if (url.getQuery().contains("GetMap") && url.getQuery().contains("world84")) {
+                    Map<String, String> params = parseParams(url.getQuery());
+                    assertEquals("1.3.0", params.get("VERSION"));
+                    assertEquals("CRS:84", params.get("CRS"));
+                    assertEquals("-180.0,-90.0,180.0,90.0", params.get("BBOX"));
+                    URL world = WMSCoverageReaderTest.class.getResource("world.png");
+                    return new MockHttpResponse(world, "image/png");
+                } else {
+                    throw new IllegalArgumentException(
+                            "Don't know how to handle a get request over " + url.toExternalForm());
+                }
+            }
+
+        };
+        WebMapServer server = new WebMapServer(new URL("http://geoserver.org/geoserver/wms"),
+                client);
+        WMSCoverageReader reader = new WMSCoverageReader(server, getLayer(server, "world84"));
+
+        // setup the request and check it
+        CoordinateReferenceSystem wgs84 = CRS.decode("EPSG:4326", true);
+        ReferencedEnvelope worldEnvelope = new ReferencedEnvelope(-180, 180, -90, 90, wgs84);
+        GridGeometry2D gg = new GridGeometry2D(new GridEnvelope2D(0, 0, 180, 90), worldEnvelope);
+        final Parameter<GridGeometry2D> ggParam = (Parameter<GridGeometry2D>) AbstractGridFormat.READ_GRIDGEOMETRY2D
+                .createValue();
+        ggParam.setValue(gg);
+
+        GridCoverage2D coverage = reader.read(new GeneralParameterValue[] { ggParam });
+        assertTrue(CRS.equalsIgnoreMetadata(wgs84, coverage.getCoordinateReferenceSystem()));
+        assertEquals(worldEnvelope, new ReferencedEnvelope(coverage.getEnvelope()));
+    }
+
+    private Layer getLayer(WebMapServer server, String layerName) {
+        for (Layer layer : server.getCapabilities().getLayerList()) {
+            if (layerName.equals(layer.getName())) {
+                return layer;
+            }
+        }
+        throw new IllegalArgumentException("Could not find layer " + layerName);
+    }
+}

Added: trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml
===================================================================
--- trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml	                        (rev 0)
+++ trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml	2011-12-20 10:26:36 UTC (rev 38436)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WMS_Capabilities version="1.3.0" updateSequence="1159"
+  xmlns="http://www.opengis.net/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd">
+  <Service>
+    <Name>WMS</Name>
+    <Title>WMS</Title>
+    <Abstract>Minimal test caps document for a WMS 1.3 server</Abstract>
+    <KeywordList>
+      <Keyword>GEOSERVER</Keyword>
+    </KeywordList>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.geoserver.org" />
+  </Service>
+  <Capability>
+    <Request>
+      <GetCapabilities>
+        <Format>text/xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetCapabilities>
+      <GetMap>
+        <Format>image/png</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetMap>
+      <GetFeatureInfo>
+        <Format>text/plain</Format>
+        <Format>application/vnd.ogc.gml</Format>
+        <Format>application/vnd.ogc.gml/3.1.1</Format>
+        <Format>text/html</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetFeatureInfo>
+    </Request>
+    <Exception>
+      <Format>XML</Format>
+      <Format>INIMAGE</Format>
+      <Format>BLANK</Format>
+    </Exception>
+    <Layer>
+      <Title>Root</Title>
+      <!--Limited list of EPSG projections: -->
+      <CRS>EPSG:4326</CRS>
+      <CRS>CRS:84</CRS>
+      <EX_GeographicBoundingBox>
+        <westBoundLongitude>-180</westBoundLongitude>
+        <eastBoundLongitude>180</eastBoundLongitude>
+        <southBoundLatitude>-90</southBoundLatitude>
+        <northBoundLatitude>90</northBoundLatitude>
+      </EX_GeographicBoundingBox>
+      <Layer queryable="1">
+        <Name>world4326</Name>
+        <Title>world4326</Title>
+        <CRS>EPSG:4326</CRS>
+        <CRS>CRS:84</CRS>
+        <EX_GeographicBoundingBox>
+          <westBoundLongitude>-180</westBoundLongitude>
+          <eastBoundLongitude>180</eastBoundLongitude>
+          <southBoundLatitude>-90</southBoundLatitude>
+          <northBoundLatitude>90</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="EPSG:4326" minx="-90" miny="-180"
+          maxx="90" maxy="180" />
+      </Layer>
+    </Layer>
+  </Capability>
+</WMS_Capabilities>

Added: trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml
===================================================================
--- trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml	                        (rev 0)
+++ trunk/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml	2011-12-20 10:26:36 UTC (rev 38436)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WMS_Capabilities version="1.3.0" updateSequence="1159"
+  xmlns="http://www.opengis.net/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd">
+  <Service>
+    <Name>WMS</Name>
+    <Title>WMS</Title>
+    <Abstract>Minimal test caps document for a WMS 1.3 server</Abstract>
+    <KeywordList>
+      <Keyword>GEOSERVER</Keyword>
+    </KeywordList>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.geoserver.org" />
+  </Service>
+  <Capability>
+    <Request>
+      <GetCapabilities>
+        <Format>text/xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetCapabilities>
+      <GetMap>
+        <Format>image/png</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetMap>
+      <GetFeatureInfo>
+        <Format>text/plain</Format>
+        <Format>application/vnd.ogc.gml</Format>
+        <Format>application/vnd.ogc.gml/3.1.1</Format>
+        <Format>text/html</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetFeatureInfo>
+    </Request>
+    <Exception>
+      <Format>XML</Format>
+      <Format>INIMAGE</Format>
+      <Format>BLANK</Format>
+    </Exception>
+    <Layer>
+      <Title>Root</Title>
+      <CRS>CRS:84</CRS>
+      <EX_GeographicBoundingBox>
+        <westBoundLongitude>-180</westBoundLongitude>
+        <eastBoundLongitude>180</eastBoundLongitude>
+        <southBoundLatitude>-90</southBoundLatitude>
+        <northBoundLatitude>90</northBoundLatitude>
+      </EX_GeographicBoundingBox>
+      <Layer queryable="1">
+        <Name>world84</Name>
+        <Title>world84</Title>
+        <CRS>CRS:84</CRS>
+        <EX_GeographicBoundingBox>
+          <westBoundLongitude>-180</westBoundLongitude>
+          <eastBoundLongitude>180</eastBoundLongitude>
+          <southBoundLatitude>-90</southBoundLatitude>
+          <northBoundLatitude>90</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="CRS:84" minx="-180" miny="-90"
+          maxx="180" maxy="90" />
+      </Layer>
+    </Layer>
+  </Capability>
+</WMS_Capabilities>

Added: trunk/modules/extension/wms/src/test/resources/org/geotools/map/world.png
===================================================================
--- trunk/modules/extension/wms/src/test/resources/org/geotools/map/world.png	                        (rev 0)
+++ trunk/modules/extension/wms/src/test/resources/org/geotools/map/world.png	2011-12-20 10:26:36 UTC (rev 38436)
@@ -0,0 +1,52 @@
+PNG
+
+

[Geotools-commits] svn - r38435 - in branches/2.7.x/modules: extension/wms extension/wms/src/main/java/org/geotools/data/ows extension/wms/src/main/java/org/geotools/map extension/wms/src/test/java/org/geotools extension/wms/src/test/java/org/geotools/data/ows extension/wms/src/test/java/org/geotools/data/wms extension/wms/src/test/java/org/geotools/data/wms/test extension/wms/src/test/java/org/geotools/map extension/wms/src/test/resources/org/geotools extension/wms/src/test/resources/org/geotools/map library/api/src/main/java/org/geotools/geometry/jts plugin/epsg-extension/src/main/resources/org/geotools/referencing/factory/epsg plugin/epsg-extension/src/test/java/org/geotools/referencing/factory/epsg

From: <svn...@os...> - 2011-12-20 08:11:54

Author: aaime
Date: 2011-12-20 00:11:41 -0800 (Tue, 20 Dec 2011)
New Revision: 38435

Added:
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/map/
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java
   branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/
   branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml
   branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml
   branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/world.png
Modified:
   branches/2.7.x/modules/extension/wms/pom.xml
   branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java
   branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java
   branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java
   branches/2.7.x/modules/library/api/src/main/java/org/geotools/geometry/jts/ReferencedEnvelope.java
   branches/2.7.x/modules/plugin/epsg-extension/src/main/resources/org/geotools/referencing/factory/epsg/esri.properties
   branches/2.7.x/modules/plugin/epsg-extension/src/test/java/org/geotools/referencing/factory/epsg/EsriExtensionTest.java
Log:
[GEOT-3989] Accessing a WMS 1.3 server advertising only CRS:84 won't work with WMSLayer

Modified: branches/2.7.x/modules/extension/wms/pom.xml
===================================================================
--- branches/2.7.x/modules/extension/wms/pom.xml	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/pom.xml	2011-12-20 08:11:41 UTC (rev 38435)
@@ -128,16 +128,27 @@
     </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
-      <artifactId>gt-epsg-wkt</artifactId>
+      <artifactId>gt-epsg-hsql</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
+      <artifactId>gt-epsg-extension</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.geotools</groupId>
       <artifactId>gt-sample-data</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 
@@ -160,7 +171,6 @@
             <exclude>**/WMS1_1_1_OnlineTest.java</exclude>
             <exclude>**/WMS1_3_0_OnlineTest.java</exclude>
             <!-- The following tests fail -->
-            <exclude>**/Geot553Test.java</exclude>
             <exclude>**/WMSSchemaTest.java</exclude>
           </excludes>
         </configuration>

Modified: branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/data/ows/Layer.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -213,9 +213,13 @@
         if (allBoundingBoxesCache == null) {
             allBoundingBoxesCache = new HashMap<String, CRSEnvelope>();
             
+            for( CRSEnvelope bbox : getLayerBoundingBoxes() ){
+                allBoundingBoxesCache.put( bbox.getSRSName(), bbox );
+            }
+            
             Layer parent = this.getParent();
-            while (parent != null) {
-                for( CRSEnvelope bbox : getLayerBoundingBoxes() ){
+            while (parent != null && allBoundingBoxesCache.size() == 0) {
+                for( CRSEnvelope bbox : parent.getLayerBoundingBoxes() ){
                     allBoundingBoxesCache.put( bbox.getSRSName(), bbox );
                 }
                 parent = parent.getParent();

Modified: branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/main/java/org/geotools/map/WMSCoverageReader.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -34,6 +34,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.ows.ServiceException;
 import org.geotools.referencing.CRS;
+import org.geotools.referencing.CRS.AxisOrder;
 import org.geotools.renderer.lite.RendererUtilities;
 import org.geotools.util.Version;
 import org.opengis.coverage.grid.Format;
@@ -115,11 +116,6 @@
     CoordinateReferenceSystem requestCRS;
     
     /**
-     * Flag telling us if we have to flip geographic bounds before using them
-     */
-    boolean flipGeographic;
-
-    /**
      * Builds a new WMS coverage reader
      * 
      * @param wms
@@ -128,10 +124,6 @@
     public WMSCoverageReader(WebMapServer wms, Layer layer) {
         this.wms = wms;
         
-        // check if we need coordinate flipping
-        Version version = new Version(wms.getCapabilities().getVersion());
-        flipGeographic = version.compareTo(new Version("1.3.0")) >= 0;
-
         // init the reader
         addLayer(layer);
 
@@ -390,7 +382,7 @@
         
         // bbox might need flipping
         ReferencedEnvelope requestEnvelope = gridEnvelope;
-        if(requestCRS instanceof GeographicCRS && flipGeographic) {
+        if(axisFlipped(requestSrs)) {
             requestEnvelope = flipEnvelope(requestEnvelope);
         }
         mapRequest.setBBox(requestEnvelope);
@@ -403,6 +395,29 @@
         return gridEnvelope;
     }
 
+    private boolean axisFlipped(String srsName) {
+        Version version = new Version(wms.getCapabilities().getVersion());
+        if(version.compareTo(new Version("1.3.0")) < 0) {
+            // aah, sheer simplicity
+            return false;
+        } else {
+            // gah, hell gates breaking loose
+            if(srsName.startsWith("EPSG:")) {
+                try {
+                    String epsgNative =  "urn:x-ogc:def:crs:EPSG:".concat(srsName.substring(5));
+                    return CRS.getAxisOrder(CRS.decode(epsgNative)) == AxisOrder.NORTH_EAST;
+                } catch(Exception e) {
+                    LOGGER.log(Level.WARNING, "Failed to determine axis order for " 
+                            + srsName + ", assuming east/north", e);
+                    return false;
+                }
+            } else {
+                // CRS or AUTO, none of them is flipped so far
+                return false;
+            }
+        }
+    }
+
     private ReferencedEnvelope flipEnvelope(ReferencedEnvelope requestEnvelope) {
         double minx = requestEnvelope.getMinX();
         double miny = requestEnvelope.getMinY();
@@ -423,13 +438,14 @@
      * @return
      */
     public void updateBounds() {
+        boolean axisFlipped = axisFlipped(srsName);
         ReferencedEnvelope result = reference(layers.get(0).getEnvelope(crs));
-        if(result.getCoordinateReferenceSystem() instanceof GeographicCRS && flipGeographic) {
+        if(result.getCoordinateReferenceSystem() instanceof GeographicCRS && axisFlipped) {
             result = flipEnvelope(result);
         }
         for (int i = 1; i < layers.size(); i++) {
             ReferencedEnvelope layerEnvelope = reference(layers.get(i).getEnvelope(crs));
-            if(layerEnvelope.getCoordinateReferenceSystem() instanceof GeographicCRS && flipGeographic) {
+            if(layerEnvelope.getCoordinateReferenceSystem() instanceof GeographicCRS && axisFlipped) {
                 layerEnvelope = flipEnvelope(layerEnvelope);
             }
             result.expandToInclude(layerEnvelope);
@@ -462,4 +478,5 @@
         return new ReferencedEnvelope(ge.getMinimum(0), ge.getMaximum(0), ge.getMinimum(1), ge
                 .getMaximum(1), ge.getCoordinateReferenceSystem());
     }
+    
 }
\ No newline at end of file

Added: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java	                        (rev 0)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpClient.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -0,0 +1,74 @@
+package org.geotools.data.ows;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.geotools.data.ows.HTTPClient;
+import org.geotools.data.ows.HTTPResponse;
+
+/**
+ * Helper class to test WMS cascading
+ *  
+ * @author Andrea Aime - GeoSolutions
+ */
+public abstract class MockHttpClient implements HTTPClient {
+
+    protected String user;
+
+    protected String password;
+
+    protected int connectTimeout;
+
+    protected int readTimeout;
+
+    public HTTPResponse post(URL url, InputStream postContent, String postContentType)
+            throws IOException {
+        throw new UnsupportedOperationException(
+                "POST not supported, if needed you have to override and implement");
+    }
+
+    public HTTPResponse get(URL url) throws IOException {
+        throw new UnsupportedOperationException(
+                "GET not supported, if needed you have to override and implement");
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+
+    }
+
+    
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+
+    }
+
+    
+    public int getReadTimeout() {
+        return this.readTimeout;
+    }
+
+    
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+}
\ No newline at end of file

Added: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java	                        (rev 0)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/ows/MockHttpResponse.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -0,0 +1,74 @@
+package org.geotools.data.ows;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.geotools.data.ows.HTTPResponse;
+
+/**
+ * Helper class to mock HTTP responses
+ * 
+ * @author Andrea Aime - GeoSolutions
+ */
+public class MockHttpResponse implements HTTPResponse {
+
+    String contentType;
+
+    Map<String, String> headers;
+
+    byte[] response;
+
+    public MockHttpResponse(String response, String contentType, String... headers) {
+        this(response.getBytes(), contentType, headers);
+    }
+    
+    public MockHttpResponse(URL response, String contentType, String... headers) throws IOException {
+        this(IOUtils.toByteArray(response.openStream()), contentType, headers);
+    }
+
+    public MockHttpResponse(byte[] response, String contentType, String... headers) {
+        this.response = response;
+        this.contentType = contentType;
+        this.headers = new HashMap<String, String>();
+
+        if (headers != null) {
+            if (headers.length % 2 != 0) {
+                throw new IllegalArgumentException(
+                        "The headers must be a alternated sequence of keys "
+                                + "and values, should have an even number of entries");
+            }
+
+            for (int i = 0; i < headers.length; i += 2) {
+                String key = headers[i];
+                String value = headers[i++];
+                this.headers.put(key, value);
+            }
+        }
+    }
+
+    
+    public void dispose() {
+        // nothing to do
+    }
+
+    
+    public String getContentType() {
+        return this.contentType;
+    }
+
+    
+    public String getResponseHeader(String headerName) {
+        return headers.get(headerName);
+    }
+
+    
+    public InputStream getResponseStream() throws IOException {
+        return new ByteArrayInputStream(response);
+    }
+
+}

Modified: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/WMSUtilsTest.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -76,7 +76,7 @@
 	public void testMatchEPSG() throws Exception {
 		CoordinateReferenceSystem crs4326 = CRS.decode("EPSG:4326");
 		CoordinateReferenceSystem crs3005 = CRS.decode("EPSG:3005");
-		CoordinateReferenceSystem crs42101 = CRS.decode("EPSG:42101");
+		CoordinateReferenceSystem crs3347 = CRS.decode("EPSG:3347");
 		
 		Set codes = new TreeSet();
 		codes.add("EPSG:4326");
@@ -95,7 +95,7 @@
 		assertNotNull(result2);
 		assertEquals("EPSG:42102", result2);
 		
-		String result3 = WMSUtils.matchEPSG(crs42101, codes);
+		String result3 = WMSUtils.matchEPSG(crs3347, codes);
 		assertNull(result3);
 	}
 

Modified: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/Geot553Test.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -16,14 +16,22 @@
  */
 package org.geotools.data.wms.test;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
+import org.geotools.data.ows.HTTPResponse;
 import org.geotools.data.ows.Layer;
+import org.geotools.data.ows.MockHttpClient;
+import org.geotools.data.ows.MockHttpResponse;
 import org.geotools.data.wms.WebMapServer;
 import org.geotools.geometry.GeneralDirectPosition;
+import org.geotools.map.WMSCoverageReaderTest;
 import org.geotools.referencing.CRS;
 import org.geotools.test.TestData;
 import org.opengis.geometry.DirectPosition;
@@ -49,18 +57,23 @@
     	CoordinateReferenceSystem epsg26591 = CRS.decode("EPSG:26591");
     	CoordinateReferenceSystem epsg4326 = CRS.decode("EPSG:4326");
     	
-    	MathTransform transform = CRS.findMathTransform(epsg26591, epsg4326, true);
-    	DirectPosition min = transform.transform(new GeneralDirectPosition(minx, miny), null);
-    	DirectPosition max = transform.transform(new GeneralDirectPosition(maxx, maxy), null);
-    	System.out.println(min);
-    	System.out.println(max);
-    	
-    	
-        File getCaps = TestData.file(this, "geot553capabilities.xml");
-    	
-        URL getCapsURL = TestData.getResource(this, "geot553capabilities.xml");
+        // prepare the responses
+        MockHttpClient client = new MockHttpClient() {
+
+            public HTTPResponse get(URL url) throws IOException {
+                if (url.getQuery().contains("GetCapabilities")) {
+                    URL caps = TestData.getResource(this, "geot553capabilities.xml");
+                    return new MockHttpResponse(caps, "text/xml");
+                } else {
+                    throw new IllegalArgumentException(
+                            "Don't know how to handle a get request over " + url.toExternalForm());
+                }
+            }
+
+        };
         
-        WebMapServer wms = new WebMapServer(getCapsURL);
+        
+        WebMapServer wms = new WebMapServer(new URL("http://test.org"), client);
         Layer layer = wms.getCapabilities().getLayer().getChildren()[2];
         
         Envelope env = wms.getEnvelope(layer, CRS.decode("EPSG:3005"));

Modified: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/LocalGeoServerOnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -43,7 +43,7 @@
     static private URL serverURL;
     static {
         try {
-            serverURL = new URL("http://127.0.0.1:8080/geoserver/wms?SERVICE=WMS&");
+            serverURL = new URL("http://127.0.0.1:8080/geoserver/ows?SERVICE=WMS&");
         } catch (MalformedURLException e) {
             serverURL = null;
         };
@@ -101,7 +101,7 @@
         assertNotNull( info );
         
         assertEquals( serverURL, wms.getCapabilities().getRequest().getGetCapabilities().getGet() );
-        assertEquals( "My GeoServer WMS", info.getTitle() );
+        assertEquals( "GeoServer Web Map Service", info.getTitle() );
         
         assertNotNull( info.getDescription() );        
     }

Modified: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_0_0_OnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -161,7 +161,7 @@
             request.setFormat("image/jpeg");
             System.out.println(request.getFinalURL().toExternalForm());
             
-            assertTrue(request.getFinalURL().toExternalForm().indexOf("JPEG") >= 0);
+            assertTrue(request.getFinalURL().toExternalForm().indexOf("jpeg") >= 0);
         } catch(java.net.ConnectException ce){
             if(ce.getMessage().indexOf("timed out")>0){
                 System.err.println("Unable to test - timed out: "+ce);

Modified: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WMS1_1_0_OnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -262,7 +262,8 @@
             request.setFormat("image/jpeg");
             //System.out.println(request.getFinalURL().toExternalForm());
             
-            assertTrue(request.getFinalURL().toExternalForm().indexOf("image/jpeg") >= 0);
+            String externalForm = request.getFinalURL().toExternalForm();
+            assertTrue(externalForm.indexOf("image%2Fjpeg") >= 0);
         } catch(java.net.ConnectException ce){
             if(ce.getMessage().indexOf("timed out")>0){
                 System.err.println("Unable to test - timed out: "+ce);

Modified: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java	2011-12-19 17:30:08 UTC (rev 38434)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/data/wms/test/WebMapServerOnlineTest.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -203,7 +203,7 @@
         
         WMSCapabilities caps = wms.getCapabilities();
         
-        Layer layer = (Layer) caps.getLayerList().get(1);
+        Layer layer = (Layer) caps.getLayerList().get(0);
         CoordinateReferenceSystem crs = CRS.decode("EPSG:4326");
         
         GeneralEnvelope envelope = wms.getEnvelope(layer, crs);

Added: branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java	                        (rev 0)
+++ branches/2.7.x/modules/extension/wms/src/test/java/org/geotools/map/WMSCoverageReaderTest.java	2011-12-20 08:11:41 UTC (rev 38435)
@@ -0,0 +1,132 @@
+package org.geotools.map;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.util.ParameterParser;
+import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.coverage.grid.GridEnvelope2D;
+import org.geotools.coverage.grid.GridGeometry2D;
+import org.geotools.coverage.grid.io.AbstractGridFormat;
+import org.geotools.data.ows.HTTPResponse;
+import org.geotools.data.ows.Layer;
+import org.geotools.data.ows.MockHttpClient;
+import org.geotools.data.ows.MockHttpResponse;
+import org.geotools.data.wms.WebMapServer;
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.parameter.Parameter;
+import org.geotools.referencing.CRS;
+import org.junit.Test;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+public class WMSCoverageReaderTest {
+
+    Map<String, String> parseParams(String query) {
+        ParameterParser pp = new ParameterParser();
+        List params = pp.parse(query, '&');
+        Map<String, String> result = new HashMap<String, String>();
+        for (Iterator it = params.iterator(); it.hasNext();) {
+            NameValuePair pair = (NameValuePair) it.next();
+            result.put(pair.getName().toUpperCase(), pair.getValue());
+        }
+        return result;
+    };
+
+    @Test
+    public void test4326wms13() throws Exception {
+        // prepare the responses
+        MockHttpClient client = new MockHttpClient() {
+
+            public HTTPResponse get(URL url) throws IOException {
+                if (url.getQuery().contains("GetCapabilities")) {
+                    URL caps130 = WMSCoverageReaderTest.class.getResource("caps130.xml");
+                    return new MockHttpResponse(caps130, "text/xml");
+                } else if (url.getQuery().contains("GetMap")
+                        && url.getQuery().contains("world4326")) {
+                    Map<String, String> params = parseParams(url.getQuery());
+                    assertEquals("1.3.0", params.get("VERSION"));
+                    assertEquals("-90.0,-180.0,90.0,180.0", params.get("BBOX"));
+                    assertEquals("EPSG:4326", params.get("CRS"));
+                    URL world = WMSCoverageReaderTest.class.getResource("world.png");
+                    return new MockHttpResponse(world, "image/png");
+                } else {
+                    throw new IllegalArgumentException(
+                            "Don't know how to handle a get request over " + url.toExternalForm());
+                }
+            }
+
+        };
+        // setup the reader
+        WebMapServer server = new WebMapServer(new URL("http://geoserver.org/geoserver/wms"),
+                client);
+        WMSCoverageReader reader = new WMSCoverageReader(server, getLayer(server, "world4326"));
+
+        // build a getmap request and check it
+        CoordinateReferenceSystem wgs84 = CRS.decode("EPSG:4326", true);
+        ReferencedEnvelope worldEnvelope = new ReferencedEnvelope(-180, 180, -90, 90, wgs84);
+        GridGeometry2D gg = new GridGeometry2D(new GridEnvelope2D(0, 0, 180, 90), worldEnvelope);
+        final Parameter<GridGeometry2D> ggParam = (Parameter<GridGeometry2D>) AbstractGridFormat.READ_GRIDGEOMETRY2D
+                .createValue();
+        ggParam.setValue(gg);
+        GridCoverage2D coverage = reader.read(new GeneralParameterValue[] { ggParam });
+        assertTrue(CRS.equalsIgnoreMetadata(wgs84, coverage.getCoordinateReferenceSystem()));
+        assertEquals(worldEnvelope, new ReferencedEnvelope(coverage.getEnvelope()));
+    }
+
+    @Test
+    public void testCrs84wms13() throws Exception {
+        // prepare the responses
+        MockHttpClient client = new MockHttpClient() {
+
+            public HTTPResponse get(URL url) throws IOException {
+                if (url.getQuery().contains("GetCapabilities")) {
+                    URL caps130 = WMSCoverageReaderTest.class.getResource("caps130_crs84.xml");
+                    return new MockHttpResponse(caps130, "text/xml");
+                } else if (url.getQuery().contains("GetMap") && url.getQuery().contains("world84")) {
+                    Map<String, String> params = parseParams(url.getQuery());
+                    assertEquals("1.3.0", params.get("VERSION"));
+                    assertEquals("CRS:84", params.get("CRS"));
+                    assertEquals("-180.0,-90.0,180.0,90.0", params.get("BBOX"));
+                    URL world = WMSCoverageReaderTest.class.getResource("world.png");
+                    return new MockHttpResponse(world, "image/png");
+                } else {
+                    throw new IllegalArgumentException(
+                            "Don't know how to handle a get request over " + url.toExternalForm());
+                }
+            }
+
+        };
+        WebMapServer server = new WebMapServer(new URL("http://geoserver.org/geoserver/wms"),
+                client);
+        WMSCoverageReader reader = new WMSCoverageReader(server, getLayer(server, "world84"));
+
+        // setup the request and check it
+        CoordinateReferenceSystem wgs84 = CRS.decode("EPSG:4326", true);
+        ReferencedEnvelope worldEnvelope = new ReferencedEnvelope(-180, 180, -90, 90, wgs84);
+        GridGeometry2D gg = new GridGeometry2D(new GridEnvelope2D(0, 0, 180, 90), worldEnvelope);
+        final Parameter<GridGeometry2D> ggParam = (Parameter<GridGeometry2D>) AbstractGridFormat.READ_GRIDGEOMETRY2D
+                .createValue();
+        ggParam.setValue(gg);
+
+        GridCoverage2D coverage = reader.read(new GeneralParameterValue[] { ggParam });
+        assertTrue(CRS.equalsIgnoreMetadata(wgs84, coverage.getCoordinateReferenceSystem()));
+        assertEquals(worldEnvelope, new ReferencedEnvelope(coverage.getEnvelope()));
+    }
+
+    private Layer getLayer(WebMapServer server, String layerName) {
+        for (Layer layer : server.getCapabilities().getLayerList()) {
+            if (layerName.equals(layer.getName())) {
+                return layer;
+            }
+        }
+        throw new IllegalArgumentException("Could not find layer " + layerName);
+    }
+}

Added: branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml	                        (rev 0)
+++ branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130.xml	2011-12-20 08:11:41 UTC (rev 38435)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WMS_Capabilities version="1.3.0" updateSequence="1159"
+  xmlns="http://www.opengis.net/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd">
+  <Service>
+    <Name>WMS</Name>
+    <Title>WMS</Title>
+    <Abstract>Minimal test caps document for a WMS 1.3 server</Abstract>
+    <KeywordList>
+      <Keyword>GEOSERVER</Keyword>
+    </KeywordList>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.geoserver.org" />
+  </Service>
+  <Capability>
+    <Request>
+      <GetCapabilities>
+        <Format>text/xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetCapabilities>
+      <GetMap>
+        <Format>image/png</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetMap>
+      <GetFeatureInfo>
+        <Format>text/plain</Format>
+        <Format>application/vnd.ogc.gml</Format>
+        <Format>application/vnd.ogc.gml/3.1.1</Format>
+        <Format>text/html</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetFeatureInfo>
+    </Request>
+    <Exception>
+      <Format>XML</Format>
+      <Format>INIMAGE</Format>
+      <Format>BLANK</Format>
+    </Exception>
+    <Layer>
+      <Title>Root</Title>
+      <!--Limited list of EPSG projections: -->
+      <CRS>EPSG:4326</CRS>
+      <CRS>CRS:84</CRS>
+      <EX_GeographicBoundingBox>
+        <westBoundLongitude>-180</westBoundLongitude>
+        <eastBoundLongitude>180</eastBoundLongitude>
+        <southBoundLatitude>-90</southBoundLatitude>
+        <northBoundLatitude>90</northBoundLatitude>
+      </EX_GeographicBoundingBox>
+      <Layer queryable="1">
+        <Name>world4326</Name>
+        <Title>world4326</Title>
+        <CRS>EPSG:4326</CRS>
+        <CRS>CRS:84</CRS>
+        <EX_GeographicBoundingBox>
+          <westBoundLongitude>-180</westBoundLongitude>
+          <eastBoundLongitude>180</eastBoundLongitude>
+          <southBoundLatitude>-90</southBoundLatitude>
+          <northBoundLatitude>90</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="EPSG:4326" minx="-90" miny="-180"
+          maxx="90" maxy="180" />
+      </Layer>
+    </Layer>
+  </Capability>
+</WMS_Capabilities>

Added: branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml	                        (rev 0)
+++ branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/caps130_crs84.xml	2011-12-20 08:11:41 UTC (rev 38435)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WMS_Capabilities version="1.3.0" updateSequence="1159"
+  xmlns="http://www.opengis.net/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd">
+  <Service>
+    <Name>WMS</Name>
+    <Title>WMS</Title>
+    <Abstract>Minimal test caps document for a WMS 1.3 server</Abstract>
+    <KeywordList>
+      <Keyword>GEOSERVER</Keyword>
+    </KeywordList>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.geoserver.org" />
+  </Service>
+  <Capability>
+    <Request>
+      <GetCapabilities>
+        <Format>text/xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetCapabilities>
+      <GetMap>
+        <Format>image/png</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetMap>
+      <GetFeatureInfo>
+        <Format>text/plain</Format>
+        <Format>application/vnd.ogc.gml</Format>
+        <Format>application/vnd.ogc.gml/3.1.1</Format>
+        <Format>text/html</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xlink:type="simple"
+                xlink:href="http://geoserver.org/geoserver/ows?SERVICE=WMS&amp;" />
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetFeatureInfo>
+    </Request>
+    <Exception>
+      <Format>XML</Format>
+      <Format>INIMAGE</Format>
+      <Format>BLANK</Format>
+    </Exception>
+    <Layer>
+      <Title>Root</Title>
+      <CRS>CRS:84</CRS>
+      <EX_GeographicBoundingBox>
+        <westBoundLongitude>-180</westBoundLongitude>
+        <eastBoundLongitude>180</eastBoundLongitude>
+        <southBoundLatitude>-90</southBoundLatitude>
+        <northBoundLatitude>90</northBoundLatitude>
+      </EX_GeographicBoundingBox>
+      <Layer queryable="1">
+        <Name>world84</Name>
+        <Title>world84</Title>
+        <CRS>CRS:84</CRS>
+        <EX_GeographicBoundingBox>
+          <westBoundLongitude>-180</westBoundLongitude>
+          <eastBoundLongitude>180</eastBoundLongitude>
+          <southBoundLatitude>-90</southBoundLatitude>
+          <northBoundLatitude>90</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="CRS:84" minx="-180" miny="-90"
+          maxx="180" maxy="90" />
+      </Layer>
+    </Layer>
+  </Capability>
+</WMS_Capabilities>

Added: branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/world.png
===================================================================
--- branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/world.png	                        (rev 0)
+++ branches/2.7.x/modules/extension/wms/src/test/resources/org/geotools/map/world.png	2011-12-20 08:11:41 UTC (rev 38435)
@@ -0,0 +1,52 @@
+PNG
+
+

[Geotools-commits] svn - r38434 - in branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml: . impl

From: <svn...@os...> - 2011-12-19 17:30:18

Author: jdeolive
Date: 2011-12-19 09:30:08 -0800 (Mon, 19 Dec 2011)
New Revision: 38434

Modified:
   branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java
   branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java
   branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java
   branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java
Log:
adding ability to specify URIHandler instances during parsing, GEOT-3987

Modified: branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java
===================================================================
--- branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java	2011-12-19 17:29:34 UTC (rev 38433)
+++ branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java	2011-12-19 17:30:08 UTC (rev 38434)
@@ -32,6 +32,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.eclipse.emf.ecore.resource.URIHandler;
 import org.eclipse.xsd.XSDSchema;
 import org.eclipse.xsd.util.XSDSchemaLocationResolver;
 import org.eclipse.xsd.util.XSDSchemaLocator;

Modified: branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java
===================================================================
--- branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java	2011-12-19 17:29:34 UTC (rev 38433)
+++ branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java	2011-12-19 17:30:08 UTC (rev 38434)
@@ -38,6 +38,7 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.xerces.parsers.SAXParser;
+import org.eclipse.emf.ecore.resource.URIHandler;
 import org.eclipse.xsd.XSDSchema;
 import org.geotools.xml.impl.ParserHandler;
 import org.geotools.xs.XS;
@@ -436,6 +437,18 @@
         return handler.getNamespaceSupport();
     }
 
+    /**
+     * Returns the list of {@link URIHandler} used when parsing schemas.
+     * <p>
+     * URI handlers are invoked to handle external references that occur during parsing.
+     * </p> 
+     * 
+     * @since 2.7
+     */
+    public List<URIHandler> getURIHandlers() {
+        return handler.getURIHandlers();
+    }
+
     protected SAXParser parser() throws ParserConfigurationException, SAXException {
         return parser( isValidating() );
     }

Modified: branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java
===================================================================
--- branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java	2011-12-19 17:29:34 UTC (rev 38433)
+++ branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java	2011-12-19 17:30:08 UTC (rev 38434)
@@ -18,6 +18,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -44,7 +46,11 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.URIHandler;
+import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.resource.impl.URIHandlerImpl;
 import org.eclipse.xsd.XSDAttributeDeclaration;
 import org.eclipse.xsd.XSDAttributeGroupContent;
 import org.eclipse.xsd.XSDAttributeGroupDefinition;
@@ -212,6 +218,7 @@
      * @return The parsed schema, or null if the schema could not be parsed.
      *
      * @throws IOException In the event of a schema parsing error.
+     * @deprecated use {@link #parse(String, List, List)}
      */
     public static final XSDSchema parse(String location, XSDSchemaLocator[] locators,
         XSDSchemaLocationResolver[] resolvers) throws IOException {
@@ -219,9 +226,65 @@
             (resolvers != null) ? Arrays.asList(resolvers) : Collections.EMPTY_LIST);
     }
 
+    /**
+     * Parses a schema at the specified location.
+     *
+     * @param location A uri pointing to the location of the schema.
+     * @param locators A list of schema locator objects to be used when
+     * parsing imports/includes of the main schema.
+     * @param resolvers A list of schema location resolvers used to override
+     * schema locations encountered in an instance document or an imported
+     * schema.
+     *
+     * @return The parsed schema, or null if the schema could not be parsed.
+     *
+     * @throws IOException In the event of a schema parsing error.
+     */
     public static final XSDSchema parse(String location, List locators, List resolvers)
         throws IOException {
+        return parse(location, locators, resolvers, null);
+    }
+
+    /**
+     * Parses a schema at the specified location.
+     *
+     * @param location A uri pointing to the location of the schema.
+     * @param locators A list of schema locator objects to be used when
+     * parsing imports/includes of the main schema.
+     * @param resolvers A list of schema location resolvers used to override
+     * schema locations encountered in an instance document or an imported schema.
+     * @param uriHandlers A list of uri handlers to inject into the parsing chain, to handle 
+     * externally referenced resources, like external schemas, etc...
+     *
+     * @return The parsed schema, or null if the schema could not be parsed.
+     *
+     * @throws IOException In the event of a schema parsing error.
+     */
+    public static final XSDSchema parse(String location, List locators, List resolvers, 
+        List<URIHandler> uriHandlers) throws IOException {
+        ResourceSet resourceSet = new ResourceSetImpl();
         
+        //add the specialized schema location resolvers
+        if ((resolvers != null) && !resolvers.isEmpty()) {
+           AdapterFactory adapterFactory = new SchemaLocationResolverAdapterFactory(resolvers);
+           resourceSet.getAdapterFactories().add(adapterFactory);
+        }
+        
+        //add the specialized schema locators as adapters
+        if ((locators != null) && !locators.isEmpty()) {
+            AdapterFactory adapterFactory = new SchemaLocatorAdapterFactory(locators);
+            resourceSet.getAdapterFactories().add(adapterFactory);
+        }
+
+        //add the specifialized uri handlers
+        if (uriHandlers != null && !uriHandlers.isEmpty()) {
+            resourceSet.getURIConverter().getURIHandlers().addAll(0, uriHandlers);
+        }
+        return parse(location, resourceSet); 
+    }
+    
+    public static final XSDSchema parse(String location, ResourceSet resourceSet)
+        throws IOException {
         //check for case of file url, make sure it is an absolute reference
         File locationFile = null;
         try {
@@ -237,24 +300,11 @@
         }
 
         URI uri = URI.createURI(location);
-        final ResourceSet resourceSet = new ResourceSetImpl();
 
-        //add the specialized schema location resolvers
-        if ((resolvers != null) && !resolvers.isEmpty()) {
-            AdapterFactory adapterFactory = new SchemaLocationResolverAdapterFactory(resolvers);
-            resourceSet.getAdapterFactories().add(adapterFactory);
-        }
-
-        //add the specialized schema locators as adapters
-        if ((locators != null) && !locators.isEmpty()) {
-            AdapterFactory adapterFactory = new SchemaLocatorAdapterFactory(locators);
-            resourceSet.getAdapterFactories().add(adapterFactory);
-        }
-
         XSDResourceImpl xsdMainResource = (XSDResourceImpl) resourceSet.createResource(URI.createURI(
                     ".xsd"));
         xsdMainResource.setURI(uri);
-        
+
         // schema building has effects on referenced schemas, it will alter them -> we need 
         // to synchronize this call so that only one of these operations is active at any time
         synchronized(Schemas.class) {

Modified: branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java
===================================================================
--- branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java	2011-12-19 17:29:34 UTC (rev 38433)
+++ branches/2.7.x/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java	2011-12-19 17:30:08 UTC (rev 38434)
@@ -17,6 +17,8 @@
 package org.geotools.xml.impl;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +28,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.eclipse.emf.ecore.resource.URIHandler;
 import org.eclipse.xsd.XSDElementDeclaration;
 import org.eclipse.xsd.XSDFactory;
 import org.eclipse.xsd.XSDImport;
@@ -114,6 +117,9 @@
     /** whether the parser should maintain order for elements with mixed content */ 
     boolean handleMixedContent = false;
     
+    /** uri handlers for handling uri references during parsing */
+    List<URIHandler> uriHandlers = new ArrayList<URIHandler>();
+
     public ParserHandler(Configuration config) {
         this.config = config;
         namespaces = new NamespaceSupport();
@@ -197,6 +203,10 @@
         return namespaces;
     }
 
+    public List<URIHandler> getURIHandlers() {
+        return uriHandlers;
+    }
+
     public void startPrefixMapping(String prefix, String uri)
         throws SAXException {
         namespaces.declarePrefix(prefix, uri);
@@ -277,8 +287,8 @@
             }
 
             //look up schema overrides
-            XSDSchemaLocator[] locators = findSchemaLocators();
-            XSDSchemaLocationResolver[] resolvers = findSchemaLocationResolvers();
+            List<XSDSchemaLocator> locators = Arrays.asList(findSchemaLocators());
+            List<XSDSchemaLocationResolver> resolvers = Arrays.asList(findSchemaLocationResolvers());
 
             if ((locations != null) && (locations.length > 0)) {
                 //parse each namespace location pair into schema objects
@@ -297,8 +307,8 @@
                     }
 
                     //first check for a location override
-                    for (int j = 0; j < resolvers.length; j++) {
-                        String override = resolvers[j].resolveSchemaLocation(null, namespace,
+                    for (int j = 0; j < resolvers.size(); j++) {
+                        String override = resolvers.get(j).resolveSchemaLocation(null, namespace,
                                 location);
                         if (override != null) {
                             //ensure that override has no spaces
@@ -312,8 +322,8 @@
                     }
 
                     //next check for schema override 
-                    for (int j = 0; j < locators.length; j++) {
-                        XSDSchema schema = locators[j].locateSchema(null, namespace, location, null);
+                    for (int j = 0; j < locators.size(); j++) {
+                        XSDSchema schema = locators.get(j).locateSchema(null, namespace, location, null);
 
                         if (schema != null) {
                             schemas[i / 2] = schema;
@@ -336,7 +346,7 @@
                         
                         //parse the document
                         try {
-                            schemas[i / 2] = Schemas.parse(location, locators, resolvers);
+                            schemas[i / 2] = Schemas.parse(location, locators, resolvers, uriHandlers);
                         } catch (Exception e) {
                             String msg = "Error parsing: " + location;
                             logger.warning(msg);
@@ -351,8 +361,8 @@
             } else {
                 //could not find a schemaLocation attribute, use the locators
                 //look for schema with locators
-                for (int i = 0; i < locators.length; i++) {
-                    XSDSchema schema = locators[i].locateSchema(null, uri, null, null);
+                for (int i = 0; i < locators.size(); i++) {
+                    XSDSchema schema = locators.get(i).locateSchema(null, uri, null, null);
 
                     if (schema != null) {
                         schemas = new XSDSchema[] { schema };

[Geotools-commits] svn - r38433 - in trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml: . impl

From: <svn...@os...> - 2011-12-19 17:29:43

Author: jdeolive
Date: 2011-12-19 09:29:34 -0800 (Mon, 19 Dec 2011)
New Revision: 38433

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/Parser.java
   trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java
   trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java
Log:
adding ability to specify URIHandler instances during parsing, GEOT-3987

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	2011-12-19 17:00:57 UTC (rev 38432)
+++ trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java	2011-12-19 17:29:34 UTC (rev 38433)
@@ -32,6 +32,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.eclipse.emf.ecore.resource.URIHandler;
 import org.eclipse.xsd.XSDSchema;
 import org.eclipse.xsd.util.XSDSchemaLocationResolver;
 import org.eclipse.xsd.util.XSDSchemaLocator;

Modified: trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java
===================================================================
--- trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java	2011-12-19 17:00:57 UTC (rev 38432)
+++ trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Parser.java	2011-12-19 17:29:34 UTC (rev 38433)
@@ -38,6 +38,7 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.xerces.parsers.SAXParser;
+import org.eclipse.emf.ecore.resource.URIHandler;
 import org.eclipse.xsd.XSDSchema;
 import org.geotools.xml.impl.ParserHandler;
 import org.geotools.xs.XS;
@@ -486,6 +487,18 @@
         return handler.getNamespaceSupport();
     }
 
+    /**
+     * Returns the list of {@link URIHandler} used when parsing schemas.
+     * <p>
+     * URI handlers are invoked to handle external references that occur during parsing.
+     * </p> 
+     * 
+     * @since 2.7
+     */
+    public List<URIHandler> getURIHandlers() {
+        return handler.getURIHandlers();
+    }
+
     protected SAXParser parser() throws ParserConfigurationException, SAXException {
         return parser( isValidating() );
     }

Modified: trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java
===================================================================
--- trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java	2011-12-19 17:00:57 UTC (rev 38432)
+++ trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Schemas.java	2011-12-19 17:29:34 UTC (rev 38433)
@@ -18,6 +18,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -45,7 +47,11 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.URIHandler;
+import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.resource.impl.URIHandlerImpl;
 import org.eclipse.xsd.XSDAttributeDeclaration;
 import org.eclipse.xsd.XSDAttributeGroupContent;
 import org.eclipse.xsd.XSDAttributeGroupDefinition;
@@ -214,15 +220,50 @@
      * @return The parsed schema, or null if the schema could not be parsed.
      *
      * @throws IOException In the event of a schema parsing error.
+     * @deprecated use {@link #parse(String, List, List)}
      */
     public static final XSDSchema parse(String location, XSDSchemaLocator[] locators,
         XSDSchemaLocationResolver[] resolvers) throws IOException {
         return parse(location, (locators != null) ? Arrays.asList(locators) : Collections.EMPTY_LIST,
             (resolvers != null) ? Arrays.asList(resolvers) : Collections.EMPTY_LIST);
     }
-    
+
+    /**
+     * Parses a schema at the specified location.
+     *
+     * @param location A uri pointing to the location of the schema.
+     * @param locators A list of schema locator objects to be used when
+     * parsing imports/includes of the main schema.
+     * @param resolvers A list of schema location resolvers used to override
+     * schema locations encountered in an instance document or an imported
+     * schema.
+     *
+     * @return The parsed schema, or null if the schema could not be parsed.
+     *
+     * @throws IOException In the event of a schema parsing error.
+     */
     public static final XSDSchema parse(String location, List locators, List resolvers)
         throws IOException {
+        return parse(location, locators, resolvers, null);
+    }
+
+    /**
+     * Parses a schema at the specified location.
+     *
+     * @param location A uri pointing to the location of the schema.
+     * @param locators A list of schema locator objects to be used when
+     * parsing imports/includes of the main schema.
+     * @param resolvers A list of schema location resolvers used to override
+     * schema locations encountered in an instance document or an imported schema.
+     * @param uriHandlers A list of uri handlers to inject into the parsing chain, to handle 
+     * externally referenced resources, like external schemas, etc...
+     *
+     * @return The parsed schema, or null if the schema could not be parsed.
+     *
+     * @throws IOException In the event of a schema parsing error.
+     */
+    public static final XSDSchema parse(String location, List locators, List resolvers, 
+        List<URIHandler> uriHandlers) throws IOException {
         ResourceSet resourceSet = new ResourceSetImpl();
         
         //add the specialized schema location resolvers
@@ -236,10 +277,14 @@
             AdapterFactory adapterFactory = new SchemaLocatorAdapterFactory(locators);
             resourceSet.getAdapterFactories().add(adapterFactory);
         }
-               
+
+        //add the specifialized uri handlers
+        if (uriHandlers != null && !uriHandlers.isEmpty()) {
+            resourceSet.getURIConverter().getURIHandlers().addAll(0, uriHandlers);
+        }
         return parse(location, resourceSet); 
     }
-      
+    
     public static final XSDSchema parse(String location, ResourceSet resourceSet)
         throws IOException {
         //check for case of file url, make sure it is an absolute reference
@@ -261,7 +306,7 @@
         XSDResourceImpl xsdMainResource = (XSDResourceImpl) resourceSet.createResource(URI.createURI(
                     ".xsd"));
         xsdMainResource.setURI(uri);
-        
+
         // schema building has effects on referenced schemas, it will alter them -> we need 
         // to synchronize this call so that only one of these operations is active at any time
         synchronized(Schemas.class) {

Modified: trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java
===================================================================
--- trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java	2011-12-19 17:00:57 UTC (rev 38432)
+++ trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/impl/ParserHandler.java	2011-12-19 17:29:34 UTC (rev 38433)
@@ -17,6 +17,8 @@
 package org.geotools.xml.impl;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +28,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.eclipse.emf.ecore.resource.URIHandler;
 import org.eclipse.xsd.XSDElementDeclaration;
 import org.eclipse.xsd.XSDFactory;
 import org.eclipse.xsd.XSDImport;
@@ -122,7 +125,10 @@
     
     /** type definition of the root element */
     QName rootElementType = null;
-    
+
+    /** uri handlers for handling uri references during parsing */
+    List<URIHandler> uriHandlers = new ArrayList<URIHandler>();
+
     public ParserHandler(Configuration config) {
         this.config = config;
         namespaces = new NamespaceSupport();
@@ -222,6 +228,10 @@
         return namespaces;
     }
 
+    public List<URIHandler> getURIHandlers() {
+        return uriHandlers;
+    }
+
     public void startPrefixMapping(String prefix, String uri)
         throws SAXException {
         namespaces.declarePrefix(prefix, uri);
@@ -303,8 +313,8 @@
             }
 
             //look up schema overrides
-            XSDSchemaLocator[] locators = findSchemaLocators();
-            XSDSchemaLocationResolver[] resolvers = findSchemaLocationResolvers();
+            List<XSDSchemaLocator> locators = Arrays.asList(findSchemaLocators());
+            List<XSDSchemaLocationResolver> resolvers = Arrays.asList(findSchemaLocationResolvers());
 
             if ((locations != null) && (locations.length > 0)) {
                 //parse each namespace location pair into schema objects
@@ -323,8 +333,8 @@
                     }
 
                     //first check for a location override
-                    for (int j = 0; j < resolvers.length; j++) {
-                        String override = resolvers[j].resolveSchemaLocation(null, namespace,
+                    for (int j = 0; j < resolvers.size(); j++) {
+                        String override = resolvers.get(j).resolveSchemaLocation(null, namespace,
                                 location);
                         if (override != null) {
                             //ensure that override has no spaces
@@ -338,8 +348,8 @@
                     }
 
                     //next check for schema override 
-                    for (int j = 0; j < locators.length; j++) {
-                        XSDSchema schema = locators[j].locateSchema(null, namespace, location, null);
+                    for (int j = 0; j < locators.size(); j++) {
+                        XSDSchema schema = locators.get(j).locateSchema(null, namespace, location, null);
 
                         if (schema != null) {
                             schemas[i / 2] = schema;
@@ -362,7 +372,7 @@
                         
                         //parse the document
                         try {
-                            schemas[i / 2] = Schemas.parse(location, locators, resolvers);
+                            schemas[i / 2] = Schemas.parse(location, locators, resolvers, uriHandlers);
                         } catch (Exception e) {
                             String msg = "Error parsing: " + location;
                             logger.warning(msg);
@@ -377,8 +387,8 @@
             } else {
                 //could not find a schemaLocation attribute, use the locators
                 //look for schema with locators
-                for (int i = 0; i < locators.length; i++) {
-                    XSDSchema schema = locators[i].locateSchema(null, uri, null, null);
+                for (int i = 0; i < locators.size(); i++) {
+                    XSDSchema schema = locators.get(i).locateSchema(null, uri, null, null);
 
                     if (schema != null) {
                         schemas = new XSDSchema[] { schema };

[Geotools-commits] svn - r38432 - in trunk: . modules/library/metadata modules/library/metadata/src/main/java/org/geotools/factory

From: <svn...@os...> - 2011-12-19 17:01:08

Author: jdeolive
Date: 2011-12-19 09:00:57 -0800 (Mon, 19 Dec 2011)
New Revision: 38432

Modified:
   trunk/modules/library/metadata/pom.xml
   trunk/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
   trunk/pom.xml
Log:
GEOT-3983,  bundling git revision info in builds

Modified: trunk/modules/library/metadata/pom.xml
===================================================================
--- trunk/modules/library/metadata/pom.xml	2011-12-19 17:00:34 UTC (rev 38431)
+++ trunk/modules/library/metadata/pom.xml	2011-12-19 17:00:57 UTC (rev 38432)
@@ -137,4 +137,39 @@
     </resources>
   </build>
 
+  <profiles>
+    <profile>
+       <id>gitinfo</id>
+       <activation>
+         <file>
+           <!-- .git directory specified relative to working directory, so
+                this profile only engaged when building from root. This is
+                changed/fixed in maven 3, so when build server switches to 
+                maven 3 change this to '../../../.git' -->
+           <exists>.git</exists>
+         </file>
+       </activation> 
+       <build>
+        <plugins>
+          <plugin>
+            <groupId>pl.project13.maven</groupId>
+            <artifactId>git-commit-id-plugin</artifactId>
+             <executions>
+               <execution>
+                 <phase>generate-resources</phase>
+                 <goals>
+                   <goal>revision</goal>
+                 </goals>
+               </execution>
+            </executions>
+            <configuration>
+              <generateGitPropertiesFile>true</generateGitPropertiesFile>
+              <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: trunk/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
===================================================================
--- trunk/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java	2011-12-19 17:00:34 UTC (rev 38431)
+++ trunk/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java	2011-12-19 17:00:57 UTC (rev 38432)
@@ -82,6 +82,11 @@
         Properties props = new Properties();
         try {
             props.load(GeoTools.class.getResourceAsStream("GeoTools.properties"));
+
+            //load git info if it is avaialble
+            if (GeoTools.class.getResource("/git.properties") != null) {
+                props.load(GeoTools.class.getResourceAsStream("/git.properties"));
+            }
         }
         catch(Exception e) {}
         
@@ -96,8 +101,15 @@
     /**
      * The version control (svn) revision at which this version of geotools was built.
      */
-    private static final String BUILD_REVISION = PROPS.getProperty("build.revision", "-1");
-    
+    private static final String BUILD_REVISION;
+    static {
+        String rev = PROPS.getProperty("build.revision", "-1");
+        if ("-1".equals(rev)) {
+            rev = PROPS.getProperty("git.commit.id", "-1");
+        }
+        BUILD_REVISION = rev;
+    }
+
     /**
      * The timestamp at which this version of geotools was built.
      */
@@ -332,7 +344,7 @@
     public static String getBuildRevision() {
         return BUILD_REVISION;
     }
-    
+
     /**
      * Reports back the timestamp at which the version of GeoTools of built. 
      * 
@@ -343,6 +355,15 @@
     }
 
     /**
+     * Returns the raw properties object containing all properties about this GeoTools build.
+     */
+    public static Properties getBuildProperties() {
+        Properties props = new Properties();
+        props.putAll(PROPS);
+        return props;
+    }
+
+    /**
      * Sets the global {@linkplain LoggerFactory logger factory}.
      *
      * This method is the same as {@code Logging.GEOTOOLS.setLoggerFactory(factory)}.

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2011-12-19 17:00:34 UTC (rev 38431)
+++ trunk/pom.xml	2011-12-19 17:00:57 UTC (rev 38432)
@@ -1241,8 +1241,17 @@
                </entry>
             </entries>
          </configuration>
-     </plugin>
+      </plugin>
       
+      <!-- ======================================================= -->
+      <!--     Git revision info.                                  -->
+      <!-- ======================================================= -->
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <version>1.9</version>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -1404,6 +1413,14 @@
       <name>OpenGeo Maven Repository</name>
       <url>http://repo.opengeo.org</url>
     </pluginRepository> 
+    <pluginRepository>
+     <id>sonatype-snapshots</id>
+     <name>sonatype-snapshots</name>
+     <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+     <snapshots>
+       <enabled>false</enabled>
+     </snapshots>
+    </pluginRepository>
   </pluginRepositories>

[Geotools-commits] svn - r38431 - in branches/2.7.x: . modules/library/metadata modules/library/metadata/src/main/java/org/geotools/factory

From: <svn...@os...> - 2011-12-19 17:00:46

Author: jdeolive
Date: 2011-12-19 09:00:34 -0800 (Mon, 19 Dec 2011)
New Revision: 38431

Modified:
   branches/2.7.x/modules/library/metadata/pom.xml
   branches/2.7.x/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
   branches/2.7.x/pom.xml
Log:
GEOT-3983,  bundling git revision info in builds

Modified: branches/2.7.x/modules/library/metadata/pom.xml
===================================================================
--- branches/2.7.x/modules/library/metadata/pom.xml	2011-12-19 15:10:33 UTC (rev 38430)
+++ branches/2.7.x/modules/library/metadata/pom.xml	2011-12-19 17:00:34 UTC (rev 38431)
@@ -137,4 +137,39 @@
     </resources>
   </build>
 
+  <profiles>
+    <profile>
+       <id>gitinfo</id>
+       <activation>
+         <file>
+           <!-- .git directory specified relative to working directory, so
+                this profile only engaged when building from root. This is
+                changed/fixed in maven 3, so when build server switches to 
+                maven 3 change this to '../../../.git' -->
+           <exists>.git</exists>
+         </file>
+       </activation> 
+       <build>
+        <plugins>
+          <plugin>
+            <groupId>pl.project13.maven</groupId>
+            <artifactId>git-commit-id-plugin</artifactId>
+             <executions>
+               <execution>
+                 <phase>generate-resources</phase>
+                 <goals>
+                   <goal>revision</goal>
+                 </goals>
+               </execution>
+            </executions>
+            <configuration>
+              <generateGitPropertiesFile>true</generateGitPropertiesFile>
+              <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: branches/2.7.x/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java
===================================================================
--- branches/2.7.x/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java	2011-12-19 15:10:33 UTC (rev 38430)
+++ branches/2.7.x/modules/library/metadata/src/main/java/org/geotools/factory/GeoTools.java	2011-12-19 17:00:34 UTC (rev 38431)
@@ -79,6 +79,11 @@
         Properties props = new Properties();
         try {
             props.load(GeoTools.class.getResourceAsStream("GeoTools.properties"));
+
+            //load git info if it is avaialble
+            if (GeoTools.class.getResource("/git.properties") != null) {
+                props.load(GeoTools.class.getResourceAsStream("/git.properties"));
+            }
         }
         catch(Exception e) {}
         
@@ -93,8 +98,15 @@
     /**
      * The version control (svn) revision at which this version of geotools was built.
      */
-    private static final String BUILD_REVISION = PROPS.getProperty("build.revision", "-1");
-    
+    private static final String BUILD_REVISION;
+    static {
+        String rev = PROPS.getProperty("build.revision", "-1");
+        if ("-1".equals(rev)) {
+            rev = PROPS.getProperty("git.commit.id", "-1");
+        }
+        BUILD_REVISION = rev;
+    }
+
     /**
      * The timestamp at which this version of geotools was built.
      */
@@ -321,7 +333,7 @@
     public static String getBuildRevision() {
         return BUILD_REVISION;
     }
-    
+
     /**
      * Reports back the timestamp at which the version of GeoTools of built. 
      * 
@@ -332,6 +344,15 @@
     }
 
     /**
+     * Returns the raw properties object containing all properties about this GeoTools build.
+     */
+    public static Properties getBuildProperties() {
+        Properties props = new Properties();
+        props.putAll(PROPS);
+        return props;
+    }
+
+    /**
      * Sets the global {@linkplain LoggerFactory logger factory}.
      *
      * This method is the same as {@code Logging.GEOTOOLS.setLoggerFactory(factory)}.

Modified: branches/2.7.x/pom.xml
===================================================================
--- branches/2.7.x/pom.xml	2011-12-19 15:10:33 UTC (rev 38430)
+++ branches/2.7.x/pom.xml	2011-12-19 17:00:34 UTC (rev 38431)
@@ -1162,8 +1162,17 @@
                </entry>
             </entries>
          </configuration>
-     </plugin>
+      </plugin>
       
+      <!-- ======================================================= -->
+      <!--     Git revision info.                                  -->
+      <!-- ======================================================= -->
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <version>1.9</version>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -1325,6 +1334,14 @@
       <name>OpenGeo Maven Repository</name>
       <url>http://repo.opengeo.org</url>
     </pluginRepository> 
+    <pluginRepository>
+     <id>sonatype-snapshots</id>
+     <name>sonatype-snapshots</name>
+     <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+     <snapshots>
+       <enabled>false</enabled>
+     </snapshots>
+    </pluginRepository>
   </pluginRepositories>

[Geotools-commits] svn - r38430 - branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid

From: <svn...@os...> - 2011-12-19 15:10:42

Author: simonegiannecchini
Date: 2011-12-19 07:10:33 -0800 (Mon, 19 Dec 2011)
New Revision: 38430

Modified:
   branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridReadWriteTest.java
   branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridVisualizationTest.java
Log:
GEOT-3575

Modified: branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridReadWriteTest.java
===================================================================
--- branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridReadWriteTest.java	2011-12-19 00:51:37 UTC (rev 38429)
+++ branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridReadWriteTest.java	2011-12-19 15:10:33 UTC (rev 38430)
@@ -25,7 +25,9 @@
 
 import org.geotools.TestData;
 import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.coverage.grid.io.AbstractGridCoverage2DReader;
 import org.geotools.coverage.grid.io.AbstractGridFormat;
+import org.geotools.coverage.grid.io.GridFormatFinder;
 import org.geotools.factory.Hints;
 import org.geotools.geometry.GeneralEnvelope;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
@@ -305,5 +307,17 @@
 	public static final void main(String[] args) throws Exception {
 		junit.textui.TestRunner.run(ArcGridReadWriteTest.class);
 	}
-
+    
+        public void testFormatFinder() throws Exception {
+            // get a gzipped ascii grid
+            final File f = TestData.file(this, "arcgrid/arcGrid.asc");
+            // Reading the coverage through a file
+            AbstractGridFormat format = GridFormatFinder.findFormat(f);
+            AbstractGridCoverage2DReader reader = format.getReader(f);
+    
+            GridCoverage2D gc = reader.read(null);
+    
+            assertNotNull(gc);
+    
+        }
 }

Modified: branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridVisualizationTest.java
===================================================================
--- branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridVisualizationTest.java	2011-12-19 00:51:37 UTC (rev 38429)
+++ branches/2.7.x/modules/plugin/arcgrid/src/test/java/org/geotools/gce/arcgrid/ArcGridVisualizationTest.java	2011-12-19 15:10:33 UTC (rev 38430)
@@ -54,7 +54,6 @@
  * @source $URL$
  * @version 1.0
  */
-@SuppressWarnings("deprecation")
 public final class ArcGridVisualizationTest extends ArcGridTestCaseAdapter {

[Geotools-commits] svn - r38429 - branches/2.7.x/modules/plugin/imagepyramid/src/main/java/org/geotools/gce/imagepyramid

From: <svn...@os...> - 2011-12-19 00:51:43

Author: simonegiannecchini
Date: 2011-12-18 16:51:37 -0800 (Sun, 18 Dec 2011)
New Revision: 38429

Modified:
   branches/2.7.x/modules/plugin/imagepyramid/src/main/java/org/geotools/gce/imagepyramid/Utils.java
Log:
fixing build

Modified: branches/2.7.x/modules/plugin/imagepyramid/src/main/java/org/geotools/gce/imagepyramid/Utils.java
===================================================================
--- branches/2.7.x/modules/plugin/imagepyramid/src/main/java/org/geotools/gce/imagepyramid/Utils.java	2011-12-19 00:02:15 UTC (rev 38428)
+++ branches/2.7.x/modules/plugin/imagepyramid/src/main/java/org/geotools/gce/imagepyramid/Utils.java	2011-12-19 00:51:37 UTC (rev 38429)
@@ -283,8 +283,7 @@
         builder.append("exists").append(sourceFile.exists()).append("\n");
         builder.append("isFile").append(sourceFile.isFile()).append("\n");
         builder.append("canRead:").append(sourceFile.canRead()).append("\n");
-        builder.append("canWrite").append(sourceFile.canWrite()).append("\n");
-        builder.append("canExecute").append(sourceFile.canExecute()).append("\n");        
+        builder.append("canWrite").append(sourceFile.canWrite()).append("\n");     
         builder.append("isHidden:").append(sourceFile.isHidden()).append("\n");
         builder.append("lastModified").append(sourceFile.lastModified()).append("\n");

289 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 1187 > >> (Page 19 of 1187)