[Geotools-commits] svn - r38581 - in branches/2.7.x: . modules/unsupported/wfs modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_1_0/parsers

[<svn...@os...>]

Author: groldan
Date: 2012-02-29 07:18:45 -0800 (Wed, 29 Feb 2012)
New Revision: 38581

Modified:
   branches/2.7.x/modules/unsupported/wfs/pom.xml
   branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_1_0/parsers/XmlSimpleFeatureParser.java
   branches/2.7.x/pom.xml
Log:
use xpp3_min instead of the full xpp3 dependency in wfs. The later has a QName class that conflicts with the one in the JDK

Modified: branches/2.7.x/modules/unsupported/wfs/pom.xml
===================================================================
--- branches/2.7.x/modules/unsupported/wfs/pom.xml	2012-02-29 08:07:52 UTC (rev 38580)
+++ branches/2.7.x/modules/unsupported/wfs/pom.xml	2012-02-29 15:18:45 UTC (rev 38581)
@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
       <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
+      <artifactId>xpp3_min</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>

Modified: branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_1_0/parsers/XmlSimpleFeatureParser.java
===================================================================
--- branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_1_0/parsers/XmlSimpleFeatureParser.java	2012-02-29 08:07:52 UTC (rev 38580)
+++ branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_1_0/parsers/XmlSimpleFeatureParser.java	2012-02-29 15:18:45 UTC (rev 38581)
@@ -45,9 +45,9 @@
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.xmlpull.mxp1.MXParser;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Geometry;
@@ -102,14 +102,10 @@
         this.targetType = targetType;
         this.builder = new SimpleFeatureBuilder(targetType);
 
-        XmlPullParserFactory factory;
         try {
-            factory = XmlPullParserFactory.newInstance();
-            factory.setNamespaceAware(true);
-            factory.setValidating(false);
-
             // parse root element
-            parser = factory.newPullParser();
+            parser = new MXParser();
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(inputStream, "UTF-8");
             parser.nextTag();
             parser.require(XmlPullParser.START_TAG, WFS.NAMESPACE, WFS.FeatureCollection
@@ -549,7 +545,7 @@
                 parser.nextTag();
                 tagName = parser.getName();
                 eventType = parser.getEventType();
-            } while (eventType == XmlPullParser.START_TAG && tagName == GML.pos.getLocalPart());
+            } while (eventType == XmlPullParser.START_TAG && GML.pos.getLocalPart().equals(tagName));
 
             shellCoords = coords.toArray(new Coordinate[coords.size()]);
 

Modified: branches/2.7.x/pom.xml
===================================================================
--- branches/2.7.x/pom.xml	2012-02-29 08:07:52 UTC (rev 38580)
+++ branches/2.7.x/pom.xml	2012-02-29 15:18:45 UTC (rev 38581)
@@ -825,6 +825,11 @@
        <artifactId>xpp3</artifactId>
        <version>1.1.3.4.O</version>
      </dependency>
+     <dependency>
+       <groupId>xpp3</groupId>
+       <artifactId>xpp3_min</artifactId>
+       <version>1.1.4c</version>
+     </dependency>
 
       <!-- Databases -->
       <dependency>