Merge pull request #1719 from mprins/jdom-upgrade

[GEOT-5846] Upgrade JDom to version 2.0.6
geotools · Nov 14, 2017 · f860d4a · f860d4a
2 parents 08e3620 + 3dc164f
commit f860d4a
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 69 deletions.
diff --git a/...ension/app-schema/app-schema/src/main/java/org/geotools/data/complex/xml/XmlResponse.java b/...ension/app-schema/app-schema/src/main/java/org/geotools/data/complex/xml/XmlResponse.java
@@ -19,7 +19,7 @@
 
 import java.util.List;
 
-import org.jdom.Document;
+import org.jdom2.Document;
 
 /**
  * The xml object returned for processing via a backend xmlDataStore. 

diff --git a/...app-schema/app-schema/src/main/java/org/geotools/data/complex/xml/XmlXpathFilterData.java b/...app-schema/app-schema/src/main/java/org/geotools/data/complex/xml/XmlXpathFilterData.java
@@ -17,7 +17,7 @@
 
 package org.geotools.data.complex.xml;
 
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.xml.sax.helpers.NamespaceSupport;
 
 /**

diff --git a/...les/extension/app-schema/app-schema/src/main/java/org/geotools/util/XmlXpathUtilites.java b/...les/extension/app-schema/app-schema/src/main/java/org/geotools/util/XmlXpathUtilites.java
@@ -23,7 +23,7 @@
 import java.util.Scanner;
 
 import org.apache.commons.jxpath.JXPathContext;
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.xml.sax.helpers.NamespaceSupport;
 
 /**
@@ -150,10 +150,10 @@ private static List<String> getXPathValues(String xpathString, JXPathContext con
             for (int i = 0; i < values.size(); i++) {
                 Object value = values.get(i);
                 String unwrappedValue = "";
-                if (value instanceof org.jdom.Attribute) {
-                    unwrappedValue = ((org.jdom.Attribute) value).getValue();
-                } else if (value instanceof org.jdom.Element) {
-                    unwrappedValue = ((org.jdom.Element) value).getValue();
+                if (value instanceof org.jdom2.Attribute) {
+                    unwrappedValue = ((org.jdom2.Attribute) value).getValue();
+                } else if (value instanceof org.jdom2.Element) {
+                    unwrappedValue = ((org.jdom2.Element) value).getValue();
                 }
                 ls.add(unwrappedValue);
             }    

diff --git a/...rc/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoTiffIIOMetadataEncoder.java b/...rc/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoTiffIIOMetadataEncoder.java
@@ -26,7 +26,7 @@
 import java.util.Map;
 
 import org.geotools.util.KeySortedList;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 
 

diff --git a/modules/library/main/pom.xml b/modules/library/main/pom.xml
@@ -211,7 +211,7 @@
     </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
       <!-- The version number is specified in the parent POM. -->
     </dependency>
     <dependency>

diff --git a/modules/library/main/src/main/java/org/geotools/data/ows/Response.java b/modules/library/main/src/main/java/org/geotools/data/ows/Response.java
@@ -20,7 +20,7 @@
 import java.io.InputStream;
 
 import org.geotools.ows.ServiceException;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
 
 
 /**

diff --git a/modules/library/main/src/main/java/org/geotools/data/ows/ServiceExceptionParser.java b/modules/library/main/src/main/java/org/geotools/data/ows/ServiceExceptionParser.java
@@ -22,10 +22,10 @@
 import java.util.List;
 
 import org.geotools.ows.ServiceException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * Utility class that will parse ServiceExceptions out of an inputStream.

diff --git a/...coverage-multidim/netcdf/src/test/java/org/geotools/coverage/io/netcdf/CreateIndexer.java b/...coverage-multidim/netcdf/src/test/java/org/geotools/coverage/io/netcdf/CreateIndexer.java
@@ -41,11 +41,11 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.geotools.imageio.netcdf.NetCDFImageReaderSpi;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
 
 /**
  * CommandLine Utility to be used in order to create an ImageMosaic indexer.xml as well as 
@@ -218,11 +218,13 @@ private static void setParameters(String auxiliaryFilePath, StringBuilder builde
 
     private static boolean setCoverages(Element root, StringBuilder builder) throws JDOMException {
         builder.append("  <coverages>\n");
-        List<Element> coverages = XPath.selectNodes(root, "coverages/coverage");
+        List<?> coverages = XPath.selectNodes(root, "coverages/coverage");
         boolean longName = false;
-        for (Element cov : coverages) {
-            if (setCoverage(cov, builder)) {
-                longName = true;
+        for (Object cov : coverages) {
+            if (cov instanceof Element) {
+                if (setCoverage(((Element)cov), builder)) {
+                    longName = true;
+                }
             }
         }
         builder.append("  </coverages>\n");
@@ -279,29 +281,32 @@ private static void addDomainsToCoverage(String schemaAttribs, StringBuilder bui
 
     private static void getAttributes(Set<String> timeAttributes, Set<String> elevationAttributes,
             Element root) throws JDOMException {
-        List<Element> schemaAttributes = XPath.selectNodes(root,
+        List<?> schemaAttributes = XPath.selectNodes(root,
                 "coverages/coverage/schema/attributes");
-        for (Element e : schemaAttributes) {
-            String attributes = e.getText();
-            String[] attribs = attributes.split(",");
-            for (String attrib : attribs) {
-                if (attrib.contains(TIME_ATTRIB_TYPE)) {
-                    String[] nameTypePair = attrib.split(":");
-                    String name = nameTypePair[0];
-                    if (!timeAttributes.contains(name)) {
-                        timeAttributes.add(name);
-                    }
 
-                } else if (attrib.contains(ELEVATION_ATTRIB_TYPE_FLOAT) || attrib.contains(ELEVATION_ATTRIB_TYPE_DOUBLE)) {
-                    String[] nameTypePair = attrib.split(":");
-                    String name = nameTypePair[0];
-                    if (!elevationAttributes.contains(name)) {
-                        elevationAttributes.add(name);
+        for (Object e : schemaAttributes) {
+            if (e instanceof Element) {
+                String attributes = ((Element)e).getText();
+                String[] attribs = attributes.split(",");
+                for (String attrib : attribs) {
+                    if (attrib.contains(TIME_ATTRIB_TYPE)) {
+                        String[] nameTypePair = attrib.split(":");
+                        String name = nameTypePair[0];
+                        if (!timeAttributes.contains(name)) {
+                            timeAttributes.add(name);
+                        }
+
+                    } else if (attrib.contains(ELEVATION_ATTRIB_TYPE_FLOAT)
+                                || attrib.contains(ELEVATION_ATTRIB_TYPE_DOUBLE)) {
+                        String[] nameTypePair = attrib.split(":");
+                        String name = nameTypePair[0];
+                        if (!elevationAttributes.contains(name)) {
+                            elevationAttributes.add(name);
+                        }
                     }
                 }
             }
         }
-
     }
 
     private static void setDomains(Set<String> timeAttributes, Set<String> elevationAttributes,

diff --git a/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/GeoTiffWriter.java b/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/GeoTiffWriter.java
@@ -60,12 +60,12 @@
 import org.geotools.resources.coverage.CoverageUtilities;
 import org.geotools.util.URLs;
 import org.geotools.util.logging.Logging;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Parent;
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.DOMOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Parent;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.output.DOMOutputter;
 import org.opengis.coverage.grid.Format;
 import org.opengis.coverage.grid.GridCoverage;
 import org.opengis.coverage.grid.GridCoverageWriter;

diff --git a/modules/plugin/shapefile/pom.xml b/modules/plugin/shapefile/pom.xml
@@ -140,7 +140,7 @@
 
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
     </dependency>
 
     <dependency>

diff --git a/.../plugin/shapefile/src/main/java/org/geotools/data/shapefile/shp/xml/ShpXmlFileReader.java b/.../plugin/shapefile/src/main/java/org/geotools/data/shapefile/shp/xml/ShpXmlFileReader.java
@@ -22,10 +22,10 @@
 import org.geotools.data.shapefile.files.FileReader;
 import org.geotools.data.shapefile.files.ShpFileType;
 import org.geotools.data.shapefile.files.ShpFiles;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 import com.vividsolutions.jts.geom.Envelope;
 

diff --git a/...es/unsupported/app-schema/webservice/src/main/java/org/geotools/data/ws/WS_DataStore.java b/...es/unsupported/app-schema/webservice/src/main/java/org/geotools/data/ws/WS_DataStore.java
@@ -36,11 +36,11 @@
 import org.geotools.data.ws.protocol.ws.WSResponse;
 import org.geotools.util.XmlXpathUtilites;
 import org.geotools.util.logging.Logging;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.feature.type.Name;

diff --git a/...ed/app-schema/webservice/src/main/java/org/geotools/filter/AsXpathFunctionExpression.java b/...ed/app-schema/webservice/src/main/java/org/geotools/filter/AsXpathFunctionExpression.java
@@ -22,7 +22,7 @@
 import org.geotools.filter.FunctionExpressionImpl;
 import org.geotools.filter.capability.FunctionNameImpl;
 import org.geotools.util.XmlXpathUtilites;
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.opengis.filter.capability.FunctionName;
 import org.xml.sax.helpers.NamespaceSupport;
 

diff --git a/...orted/app-schema/webservice/src/test/java/org/geotools/data/complex/XmlDataStoreTest.java b/...orted/app-schema/webservice/src/test/java/org/geotools/data/complex/XmlDataStoreTest.java
@@ -51,9 +51,9 @@
 import org.geotools.filter.FilterFactoryImplNamespaceAware;
 import org.geotools.gml3.bindings.GML3EncodingUtils;
 import org.geotools.util.Converters;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 import org.opengis.feature.Attribute;
 import org.opengis.feature.ComplexAttribute;
 import org.opengis.feature.Feature;

diff --git a/...n/java/org/geotools/coverage/grid/imageio/geotiff/metadata/GeoTiffIIOMetadataEncoder.java b/...n/java/org/geotools/coverage/grid/imageio/geotiff/metadata/GeoTiffIIOMetadataEncoder.java
@@ -30,7 +30,7 @@
 import org.geotools.coverage.grid.io.imageio.geotiff.PixelScale;
 import org.geotools.coverage.grid.io.imageio.geotiff.TiePoint;
 import org.geotools.util.KeySortedList;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 
 

diff --git a/modules/unsupported/geotiff_new/src/main/java/org/geotools/gce/geotiff/GeoTiffUtils.java b/modules/unsupported/geotiff_new/src/main/java/org/geotools/gce/geotiff/GeoTiffUtils.java
@@ -33,12 +33,12 @@
 import org.geotools.data.PrjFileReader;
 import org.geotools.data.WorldFileReader;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Parent;
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.DOMOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Parent;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.output.DOMOutputter;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.operation.MathTransform;

diff --git a/pom.xml b/pom.xml
@@ -858,8 +858,8 @@
       <!-- XML -->
       <dependency>
         <groupId>org.jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <version>1.1.3</version>
+        <artifactId>jdom2</artifactId>
+        <version>2.0.6</version>
       </dependency>
 
       <!-- Apache -->