From 3f83402148a7468047c2d49eb6958fe12d9b6294 Mon Sep 17 00:00:00 2001
From: Gaston Dombiak <gaston@jivesoftware.com>
Date: Wed, 23 Mar 2005 02:36:19 +0000
Subject: [PATCH] Modified to be compatible with latest minimal version of XPP.
 SMACK-49

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2466 b35dd754-fafc-0310-a699-88a17e54d16e
---
 source/org/jivesoftware/smack/PacketReader.java           | 7 +++----
 source/org/jivesoftware/smack/SmackConfiguration.java     | 8 +++-----
 .../org/jivesoftware/smack/provider/ProviderManager.java  | 7 +++----
 test/org/jivesoftware/smack/test/SmackTestCase.java       | 7 +++----
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/source/org/jivesoftware/smack/PacketReader.java b/source/org/jivesoftware/smack/PacketReader.java
index f3d739c1e..25948a5c0 100644
--- a/source/org/jivesoftware/smack/PacketReader.java
+++ b/source/org/jivesoftware/smack/PacketReader.java
@@ -21,6 +21,7 @@
 package org.jivesoftware.smack;
 
 import org.xmlpull.v1.*;
+import org.xmlpull.mxp1.MXParser;
 
 import java.util.*;
 import java.util.List;
@@ -74,10 +75,8 @@ class PacketReader {
         listenerThread.setDaemon(true);
 
         try {
-            XmlPullParserFactory factory = XmlPullParserFactory.newInstance(
-                    "org.xmlpull.mxp1.MXParserFactory", null);
-            factory.setNamespaceAware(true);
-            parser = factory.newPullParser();
+            parser = new MXParser();
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(connection.reader);
         }
         catch (XmlPullParserException xppe) {
diff --git a/source/org/jivesoftware/smack/SmackConfiguration.java b/source/org/jivesoftware/smack/SmackConfiguration.java
index 24a4ebbf0..1fa3eceaa 100644
--- a/source/org/jivesoftware/smack/SmackConfiguration.java
+++ b/source/org/jivesoftware/smack/SmackConfiguration.java
@@ -25,6 +25,7 @@ import java.net.*;
 import java.util.*;
 
 import org.xmlpull.v1.*;
+import org.xmlpull.mxp1.MXParser;
 
 /**
  * Represents the configuration of Smack. The configuration is used for:
@@ -69,11 +70,8 @@ public final class SmackConfiguration {
                     InputStream systemStream = null;
                     try {
                         systemStream = url.openStream();
-                        XmlPullParserFactory factory =
-                            XmlPullParserFactory.newInstance(
-                                "org.xmlpull.mxp1.MXParserFactory", null);
-                        factory.setNamespaceAware(true);
-                        XmlPullParser parser = factory.newPullParser();
+                        XmlPullParser parser = new MXParser();
+                        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
                         parser.setInput(systemStream, "UTF-8");
                         int eventType = parser.getEventType();
                         do {
diff --git a/source/org/jivesoftware/smack/provider/ProviderManager.java b/source/org/jivesoftware/smack/provider/ProviderManager.java
index 79f0c6399..2a97f4068 100644
--- a/source/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/source/org/jivesoftware/smack/provider/ProviderManager.java
@@ -23,6 +23,7 @@ package org.jivesoftware.smack.provider;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.xmlpull.v1.*;
+import org.xmlpull.mxp1.MXParser;
 
 import java.util.*;
 import java.net.URL;
@@ -124,10 +125,8 @@ public class ProviderManager {
                     java.io.InputStream providerStream = null;
                     try {
                         providerStream = url.openStream();
-                        XmlPullParserFactory factory = XmlPullParserFactory.newInstance(
-                                "org.xmlpull.mxp1.MXParserFactory", null);
-                        factory.setNamespaceAware(true);
-                        XmlPullParser parser = factory.newPullParser();
+                        XmlPullParser parser = new MXParser();
+                        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
                         parser.setInput(providerStream, "UTF-8");
                         int eventType = parser.getEventType();
                         do {
diff --git a/test/org/jivesoftware/smack/test/SmackTestCase.java b/test/org/jivesoftware/smack/test/SmackTestCase.java
index b2da0ea03..511603759 100644
--- a/test/org/jivesoftware/smack/test/SmackTestCase.java
+++ b/test/org/jivesoftware/smack/test/SmackTestCase.java
@@ -59,6 +59,7 @@ import javax.net.SocketFactory;
 
 import org.jivesoftware.smack.XMPPConnection;
 import org.xmlpull.v1.*;
+import org.xmlpull.mxp1.MXParser;
 
 import junit.framework.TestCase;
 
@@ -292,10 +293,8 @@ public abstract class SmackTestCase extends TestCase {
         InputStream systemStream = null;
         try {
             systemStream = url.openStream();
-            XmlPullParserFactory factory =
-                XmlPullParserFactory.newInstance("org.xmlpull.mxp1.MXParserFactory", null);
-            factory.setNamespaceAware(true);
-            XmlPullParser parser = factory.newPullParser();
+            XmlPullParser parser = new MXParser();
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(systemStream, "UTF-8");
             int eventType = parser.getEventType();
             do {