You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ni...@apache.org on 2001/07/10 21:54:57 UTC

cvs commit: jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/xml/dtd ANTDocumentType.java

nickdavis    01/07/10 12:54:56

  Modified:    src/java/org/apache/tools/ant/gui/xml/dtd
                        ANTDocumentType.java
  Log:
  make xerces.jar the default parser; remove use of com.sun.*
  
  Revision  Changes    Path
  1.2       +3 -7      jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/xml/dtd/ANTDocumentType.java
  
  Index: ANTDocumentType.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/xml/dtd/ANTDocumentType.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ANTDocumentType.java	2001/05/04 18:57:31	1.1
  +++ ANTDocumentType.java	2001/07/10 19:54:51	1.2
  @@ -88,7 +88,7 @@
   /**
    * Reads the ANT DTD and provides information about it.
    *
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * @author Nick Davis<a href="mailto:nick_home_account@yahoo.com">mailto</a>
    */
   public class ANTDocumentType {
  @@ -215,7 +215,7 @@
           
           // Look for the crimson parser
           try {
  -            className = "org.apache.crimson.parser.XMLReaderImpl";
  +            className = "org.apache.xerces.parsers.SAXParser";
               Class.forName(className);
               System.setProperty(prop, className);
               return;
  @@ -223,7 +223,7 @@
           
           // Look for the xerces parser
           try {
  -            className = "org.apache.xerces.parsers.SAXParser";
  +            className = "org.apache.crimson.parser.XMLReaderImpl";
               Class.forName(className);
               System.setProperty(prop, className);
               return;
  @@ -576,10 +576,6 @@
                   if (url != null) {
                       is = new InputSource(url.openStream());
                       is.setSystemId(url.toExternalForm());
  -                } else {
  -                    // Otherwise, use the default impl.
  -                    com.sun.xml.parser.Resolver r = new com.sun.xml.parser.Resolver();
  -                    is = r.resolveEntity(publicId, systemId);
                   }
               } catch (IOException e) {
                   e.printStackTrace();