Bladeren bron

HADOOP-14225. Remove xmlenc dependency

Chris Douglas 8 jaren geleden
bovenliggende
commit
a5e57df3c5

+ 0 - 1
LICENSE.txt

@@ -1711,7 +1711,6 @@ Hamcrest Core 1.3
 ASM Core 5.0.4
 ASM Core 5.0.4
 ASM Commons 5.0.2
 ASM Commons 5.0.2
 ASM Tree 5.0.2
 ASM Tree 5.0.2
-xmlenc Library 0.52
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 (3-clause BSD)
 (3-clause BSD)
 Redistribution and use in source and binary forms, with or without
 Redistribution and use in source and binary forms, with or without

+ 0 - 4
hadoop-client-modules/hadoop-client-minicluster/pom.xml

@@ -218,10 +218,6 @@
           <groupId>javax.servlet</groupId>
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
           <artifactId>javax.servlet-api</artifactId>
         </exclusion>
         </exclusion>
-        <exclusion>
-          <groupId>xmlenc</groupId>
-          <artifactId>xmlenc</artifactId>
-        </exclusion>
       </exclusions>
       </exclusions>
     </dependency>
     </dependency>
     <!-- Add optional runtime dependency on the in-development timeline server module
     <!-- Add optional runtime dependency on the in-development timeline server module

+ 0 - 5
hadoop-common-project/hadoop-common/pom.xml

@@ -60,11 +60,6 @@
       <artifactId>commons-math3</artifactId>
       <artifactId>commons-math3</artifactId>
       <scope>compile</scope>
       <scope>compile</scope>
     </dependency>
     </dependency>
-    <dependency>
-      <groupId>xmlenc</groupId>
-      <artifactId>xmlenc</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <artifactId>httpclient</artifactId>

+ 0 - 62
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/MD5MD5CRC32FileChecksum.java

@@ -27,12 +27,6 @@ import org.apache.hadoop.fs.Options.ChecksumOpt;
 import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.util.DataChecksum;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.znerd.xmlenc.XMLOutputter;
-
-import org.apache.hadoop.fs.MD5MD5CRC32CastagnoliFileChecksum;
-import org.apache.hadoop.fs.MD5MD5CRC32GzipFileChecksum;
 
 
 /** MD5 of MD5 of CRC32. */
 /** MD5 of MD5 of CRC32. */
 @InterfaceAudience.LimitedPrivate({"HDFS"})
 @InterfaceAudience.LimitedPrivate({"HDFS"})
@@ -107,62 +101,6 @@ public class MD5MD5CRC32FileChecksum extends FileChecksum {
     md5.write(out);
     md5.write(out);
   }
   }
 
 
-  /** Write that object to xml output. */
-  public static void write(XMLOutputter xml, MD5MD5CRC32FileChecksum that
-      ) throws IOException {
-    xml.startTag(MD5MD5CRC32FileChecksum.class.getName());
-    if (that != null) {
-      xml.attribute("bytesPerCRC", "" + that.bytesPerCRC);
-      xml.attribute("crcPerBlock", "" + that.crcPerBlock);
-      xml.attribute("crcType", ""+ that.getCrcType().name());
-      xml.attribute("md5", "" + that.md5);
-    }
-    xml.endTag();
-  }
-
-  /** Return the object represented in the attributes. */
-  public static MD5MD5CRC32FileChecksum valueOf(Attributes attrs
-      ) throws SAXException {
-    final String bytesPerCRC = attrs.getValue("bytesPerCRC");
-    final String crcPerBlock = attrs.getValue("crcPerBlock");
-    final String md5 = attrs.getValue("md5");
-    String crcType = attrs.getValue("crcType");
-    DataChecksum.Type finalCrcType;
-    if (bytesPerCRC == null || crcPerBlock == null || md5 == null) {
-      return null;
-    }
-
-    try {
-      // old versions don't support crcType.
-      if (crcType == null || crcType.equals("")) {
-        finalCrcType = DataChecksum.Type.CRC32;
-      } else {
-        finalCrcType = DataChecksum.Type.valueOf(crcType);
-      }
-
-      switch (finalCrcType) {
-        case CRC32:
-          return new MD5MD5CRC32GzipFileChecksum(
-              Integer.parseInt(bytesPerCRC),
-              Integer.parseInt(crcPerBlock),
-              new MD5Hash(md5));
-        case CRC32C:
-          return new MD5MD5CRC32CastagnoliFileChecksum(
-              Integer.parseInt(bytesPerCRC),
-              Integer.parseInt(crcPerBlock),
-              new MD5Hash(md5));
-        default:
-          // we should never get here since finalCrcType will
-          // hold a valid type or we should have got an exception.
-          return null;
-      }
-    } catch (Exception e) {
-      throw new SAXException("Invalid attributes: bytesPerCRC=" + bytesPerCRC
-          + ", crcPerBlock=" + crcPerBlock + ", crcType=" + crcType
-          + ", md5=" + md5, e);
-    }
-  }
-
   @Override
   @Override
   public String toString() {
   public String toString() {
     return getAlgorithmName() + ":" + md5;
     return getAlgorithmName() + ":" + md5;

+ 0 - 5
hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml

@@ -168,11 +168,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>slf4j-log4j12</artifactId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>provided</scope>
       <scope>provided</scope>
     </dependency>
     </dependency>
-    <dependency>
-      <groupId>xmlenc</groupId>
-      <artifactId>xmlenc</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk16</artifactId>
       <artifactId>bcprov-jdk16</artifactId>

+ 0 - 5
hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -163,11 +163,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>slf4j-log4j12</artifactId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>provided</scope>
       <scope>provided</scope>
     </dependency>
     </dependency>
-    <dependency>
-      <groupId>xmlenc</groupId>
-      <artifactId>xmlenc</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
       <artifactId>netty</artifactId>

+ 0 - 21
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java

@@ -25,9 +25,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.server.common.JspHelper;
 import org.apache.hadoop.hdfs.server.common.JspHelper;
-import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.znerd.xmlenc.XMLOutputter;
 
 
 /**
 /**
  * A base class for the servlets in DFS.
  * A base class for the servlets in DFS.
@@ -38,25 +36,6 @@ abstract class DfsServlet extends HttpServlet {
 
 
   static final Log LOG = LogFactory.getLog(DfsServlet.class.getCanonicalName());
   static final Log LOG = LogFactory.getLog(DfsServlet.class.getCanonicalName());
 
 
-  /** Write the object to XML format */
-  protected void writeXml(Exception except, String path, XMLOutputter doc)
-      throws IOException {
-    doc.startTag(RemoteException.class.getSimpleName());
-    doc.attribute("path", path);
-    if (except instanceof RemoteException) {
-      doc.attribute("class", ((RemoteException) except).getClassName());
-    } else {
-      doc.attribute("class", except.getClass().getName());
-    }
-    String msg = except.getLocalizedMessage();
-    int i = msg.indexOf("\n");
-    if (i >= 0) {
-      msg = msg.substring(0, i);
-    }
-    doc.attribute("message", msg.substring(msg.indexOf(":") + 1).trim());
-    doc.endTag();
-  }
-
   protected UserGroupInformation getUGI(HttpServletRequest request,
   protected UserGroupInformation getUGI(HttpServletRequest request,
                                         Configuration conf) throws IOException {
                                         Configuration conf) throws IOException {
     return JspHelper.getUGI(getServletContext(), request, conf);
     return JspHelper.getUGI(getServletContext(), request, conf);

+ 0 - 5
hadoop-project/pom.xml

@@ -545,11 +545,6 @@
         <artifactId>commons-csv</artifactId>
         <artifactId>commons-csv</artifactId>
         <version>1.0</version>
         <version>1.0</version>
       </dependency>
       </dependency>
-      <dependency>
-        <groupId>xmlenc</groupId>
-        <artifactId>xmlenc</artifactId>
-        <version>0.52</version>
-      </dependency>
       <dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <artifactId>httpclient</artifactId>