From 0c39b52b1db728d525a162ea310a772cb68af26f Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Tue, 12 Apr 2005 20:59:06 +0000 Subject: [PATCH] Java1.5 has different classes in the parent. i've blocked off the xml parser stuff; i worry if that is the right thing to do, but it adheres to the spec. This may be something to go into 1.6.3 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278135 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/util/JavaEnvUtils.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index 186b41152..354dbce81 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java @@ -285,11 +285,16 @@ public final class JavaEnvUtils { jrePackages = new Vector(); switch(javaVersionNumber) { case 15: + //In Java1.5, the apache stuff moved. + jrePackages.addElement("com.sun.org.apache"); + //fall through. case 14: - jrePackages.addElement("org.apache.crimson"); - jrePackages.addElement("org.apache.xalan"); - jrePackages.addElement("org.apache.xml"); - jrePackages.addElement("org.apache.xpath"); + if(javaVersionNumber == 14) { + jrePackages.addElement("org.apache.crimson"); + jrePackages.addElement("org.apache.xalan"); + jrePackages.addElement("org.apache.xml"); + jrePackages.addElement("org.apache.xpath"); + } jrePackages.addElement("org.ietf.jgss"); jrePackages.addElement("org.w3c.dom"); jrePackages.addElement("org.xml.sax"); @@ -329,12 +334,15 @@ public final class JavaEnvUtils { tests.addElement("java.lang.Object"); switch(javaVersionNumber) { case 15: + tests.addElement("com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl "); case 14: tests.addElement("sun.audio.AudioPlayer"); - tests.addElement("org.apache.crimson.parser.ContentModel"); - tests.addElement("org.apache.xalan.processor.ProcessorImport"); - tests.addElement("org.apache.xml.utils.URI"); - tests.addElement("org.apache.xpath.XPathFactory"); + if(javaVersionNumber == 14) { + tests.addElement("org.apache.crimson.parser.ContentModel"); + tests.addElement("org.apache.xalan.processor.ProcessorImport"); + tests.addElement("org.apache.xml.utils.URI"); + tests.addElement("org.apache.xpath.XPathFactory"); + } tests.addElement("org.ietf.jgss.Oid"); tests.addElement("org.w3c.dom.Attr"); tests.addElement("org.xml.sax.XMLReader");