ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/util JavaEnvUtils.java
Date Tue, 12 Apr 2005 20:59:06 GMT
stevel      2005/04/12 13:59:06

  Modified:    src/main/org/apache/tools/ant/util JavaEnvUtils.java
  Log:
  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
  
  Revision  Changes    Path
  1.28      +16 -8     ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
  
  Index: JavaEnvUtils.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- JavaEnvUtils.java	29 Mar 2005 18:35:45 -0000	1.27
  +++ JavaEnvUtils.java	12 Apr 2005 20:59:06 -0000	1.28
  @@ -285,11 +285,16 @@
           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 @@
           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");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message