[Geotools-commits] svn - r38646 - in trunk/modules/extension/app-schema/app-schema: . src/main/java/org/geotools/data/complex/config

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

Author: bencaradocdavies
Date: 2012-03-25 21:15:48 -0700 (Sun, 25 Mar 2012)
New Revision: 38646

Modified:
   trunk/modules/extension/app-schema/app-schema/pom.xml
   trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/EmfAppSchemaReader.java
Log:
GEOT-4088: Use xpp3_min in app-schema

Modified: trunk/modules/extension/app-schema/app-schema/pom.xml
===================================================================
--- trunk/modules/extension/app-schema/app-schema/pom.xml	2012-03-25 09:54:07 UTC (rev 38645)
+++ trunk/modules/extension/app-schema/app-schema/pom.xml	2012-03-26 04:15:48 UTC (rev 38646)
@@ -112,7 +112,7 @@
         </dependency>
         <dependency>
             <groupId>xpp3</groupId>
-            <artifactId>xpp3</artifactId>
+            <artifactId>xpp3_min</artifactId>
         </dependency>
         <dependency>
             <!-- for FilenameUtils -->

Modified: trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/EmfAppSchemaReader.java
===================================================================
--- trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/EmfAppSchemaReader.java	2012-03-25 09:54:07 UTC (rev 38645)
+++ trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/config/EmfAppSchemaReader.java	2012-03-26 04:15:48 UTC (rev 38646)
@@ -38,9 +38,9 @@
 import org.geotools.xml.Schemas;
 import org.opengis.feature.type.AttributeDescriptor;
 import org.opengis.feature.type.AttributeType;
+import org.xmlpull.mxp1.MXParser;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
 
 /**
  * Parses an application schema given by a gtxml {@link Configuration} into a set of
@@ -167,12 +167,9 @@
         XmlPullParser parser = null;
 
         try {
-            XmlPullParserFactory 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(input, "UTF-8");
             parser.nextTag();