Rename org.kxml2 code to com.android.org.kxml2
org.kxml2 code is heavily modified in Android so renaming it to a
reserved package name will not make it less maintainable. This rename
should also flush out users who are depending on the parser
package name.
Bug: 111055375
Test: build
Change-Id: Idfe871ef7b24fd60d706b932ff2dc52eb9fbf4b6
diff --git a/benchmarks/src/benchmarks/XmlParseBenchmark.java b/benchmarks/src/benchmarks/XmlParseBenchmark.java
index 69ab7a5..1029616 100644
--- a/benchmarks/src/benchmarks/XmlParseBenchmark.java
+++ b/benchmarks/src/benchmarks/XmlParseBenchmark.java
@@ -65,7 +65,8 @@
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
documentBuilder = builderFactory.newDocumentBuilder();
- kxmlConstructor = (Constructor) Class.forName("org.kxml2.io.KXmlParser").getConstructor();
+ kxmlConstructor = (Constructor) Class.forName("com.android.org.kxml2.io.KXmlParser")
+ .getConstructor();
expatConstructor = (Constructor) Class.forName("org.apache.harmony.xml.ExpatPullParser")
.getConstructor();
}
diff --git a/benchmarks/src/benchmarks/XmlSerializeBenchmark.java b/benchmarks/src/benchmarks/XmlSerializeBenchmark.java
index c542e87..a8c51b3 100644
--- a/benchmarks/src/benchmarks/XmlSerializeBenchmark.java
+++ b/benchmarks/src/benchmarks/XmlSerializeBenchmark.java
@@ -81,7 +81,7 @@
@SuppressWarnings("unchecked")
@BeforeExperiment
protected void setUp() throws Exception {
- kxmlConstructor = (Constructor) Class.forName("org.kxml2.io.KXmlSerializer")
+ kxmlConstructor = (Constructor) Class.forName("com.android.org.kxml2.io.KXmlSerializer")
.getConstructor();
fastConstructor = (Constructor) Class.forName("com.android.internal.util.FastXmlSerializer")
.getConstructor();
diff --git a/luni/src/main/java/libcore/util/XmlObjectFactory.java b/luni/src/main/java/libcore/util/XmlObjectFactory.java
index ec90f67..139f3a0 100644
--- a/luni/src/main/java/libcore/util/XmlObjectFactory.java
+++ b/luni/src/main/java/libcore/util/XmlObjectFactory.java
@@ -16,9 +16,9 @@
package libcore.util;
+import com.android.org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlSerializer;
import org.apache.harmony.xml.ExpatReader;
-import org.kxml2.io.KXmlParser;
-import org.kxml2.io.KXmlSerializer;
import org.xml.sax.XMLReader;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlSerializer;
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
index 4f54fb5..b6ed988 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
@@ -16,6 +16,7 @@
package org.apache.harmony.xml.parsers;
+import com.android.org.kxml2.io.KXmlParser;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
@@ -26,7 +27,6 @@
import org.apache.harmony.xml.dom.DocumentImpl;
import org.apache.harmony.xml.dom.DocumentTypeImpl;
import org.apache.harmony.xml.dom.TextImpl;
-import org.kxml2.io.KXmlParser;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
diff --git a/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java b/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java
index 3175b37..0803c58 100644
--- a/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java
+++ b/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java
@@ -16,7 +16,7 @@
package libcore.xml;
-import org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlParser;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/luni/src/test/java/libcore/xml/KxmlPullParserTest.java b/luni/src/test/java/libcore/xml/KxmlPullParserTest.java
index 71f25e9..760668d 100644
--- a/luni/src/test/java/libcore/xml/KxmlPullParserTest.java
+++ b/luni/src/test/java/libcore/xml/KxmlPullParserTest.java
@@ -16,7 +16,7 @@
package libcore.xml;
-import org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlParser;
import org.xmlpull.v1.XmlPullParser;
public class KxmlPullParserTest extends PullParserTest {
diff --git a/luni/src/test/java/libcore/xml/KxmlSerializerTest.java b/luni/src/test/java/libcore/xml/KxmlSerializerTest.java
index fffb3f1..4c4075b 100644
--- a/luni/src/test/java/libcore/xml/KxmlSerializerTest.java
+++ b/luni/src/test/java/libcore/xml/KxmlSerializerTest.java
@@ -16,11 +16,11 @@
package libcore.xml;
+import com.android.org.kxml2.io.KXmlSerializer;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import junit.framework.TestCase;
-import org.kxml2.io.KXmlSerializer;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java b/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java
index 7194414..0431a16 100644
--- a/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java
+++ b/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java
@@ -16,14 +16,14 @@
package libcore.xml;
+import com.android.org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlSerializer;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import junit.framework.TestCase;
-import org.kxml2.io.KXmlParser;
-import org.kxml2.io.KXmlSerializer;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index c99d25b..de4cff4 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -355,8 +355,8 @@
"luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java",
"libart/src/main/java/java/lang/CaseMapper.java",
"libart/src/main/java/java/lang/StringFactory.java",
- "xml/src/main/java/org/kxml2/io/KXmlParser.java",
- "xml/src/main/java/org/kxml2/io/KXmlSerializer.java",
+ "xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java",
+ "xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java",
":non_openjdk_javadoc_files",
],
}
diff --git a/xml/src/main/java/org/kxml2/io/KXmlParser.java b/xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java
similarity index 99%
rename from xml/src/main/java/org/kxml2/io/KXmlParser.java
rename to xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java
index e010f1d..3814e63 100644
--- a/xml/src/main/java/org/kxml2/io/KXmlParser.java
+++ b/xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java
@@ -20,7 +20,7 @@
// Contributors: Paul Hackenberger (unterminated entity handling in relaxed mode)
-package org.kxml2.io;
+package com.android.org.kxml2.io;
import java.io.Closeable;
import java.io.IOException;
diff --git a/xml/src/main/java/org/kxml2/io/KXmlSerializer.java b/xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java
similarity index 99%
rename from xml/src/main/java/org/kxml2/io/KXmlSerializer.java
rename to xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java
index 25f0924..795448d 100644
--- a/xml/src/main/java/org/kxml2/io/KXmlSerializer.java
+++ b/xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java
@@ -19,7 +19,7 @@
* IN THE SOFTWARE. */
-package org.kxml2.io;
+package com.android.org.kxml2.io;
import java.io.*;
import java.util.Locale;
diff --git a/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java b/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
index 7215b3e..6190777 100644
--- a/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
+++ b/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
@@ -37,8 +37,8 @@
serializerClasses = new ArrayList<String>();
try {
- parserClasses.add(Class.forName("org.kxml2.io.KXmlParser"));
- serializerClasses.add(Class.forName("org.kxml2.io.KXmlSerializer"));
+ parserClasses.add(Class.forName("com.android.org.kxml2.io.KXmlParser"));
+ serializerClasses.add(Class.forName("com.android.org.kxml2.io.KXmlSerializer"));
} catch (ClassNotFoundException e) {
throw new AssertionError();
}