From conor@m64.com  Wed Feb 16 14:09:24 2000
Return-Path: <conor@m64.com>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 45814 invoked from network); 16 Feb 2000 14:09:24 -0000
Received: from fep8.mail.ozemail.net (203.2.192.102)
  by locus.apache.org with SMTP; 16 Feb 2000 14:09:24 -0000
Received: from cognetnt (1Cust28.tnt3.syd2.da.uu.net [63.12.2.28]) by fep8.mail.ozemail.net (8.9.0/8.6.12) with SMTP id BAA21311 for <ant-dev@jakarta.apache.org>; Thu, 17 Feb 2000 01:09:19 +1100 (EST)
From: "Conor MacNeill" <conor@m64.com>
To: "Ant-Dev Apache." <ant-dev@jakarta.apache.org>
Subject: [PATCH] Support for JDK 1.3RC1
Date: Thu, 17 Feb 2000 01:08:33 +1100
Message-ID: <004001bf7887$4f54d160$80dc1fcb@cognetnt.cognet.com.au>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook 8.5, Build 4.71.2173.0
Importance: Normal
X-MimeOLE: Produced By Microsoft MimeOLE V4.72.3612.1700

Hi,

This is a simple patch which adds an attribute "classname" as an alias for
the "class" attribute in various taskdefs. This is required for use under
JDK 1.3 (RC1) due to changes in the way introspection works. Don't know
about the final version of 1.3 but changing to "classname" is probably a
good idea in any case. By leaving the setClass method in place, current
build files can continue to be used under JDKs prior to 1.3. It also allows
time for build files to be migrated. Eventually setClass should be removed.

Cheers
Conor


Index: src/main/org/apache/tools/ant/taskdefs/Available.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available
.java
retrieving revision 1.1
diff -u -r1.1 Available.java
--- Available.java      2000/02/11 01:31:24     1.1
+++ Available.java      2000/02/16 14:01:03
@@ -79,6 +79,10 @@
         this.classname = classname;
     }

+    public void setClassname(String classname) {
+        this.classname = classname;
+    }
+
     public void setFile(String filename) {
         this.file = file;
     }
Index: src/main/org/apache/tools/ant/taskdefs/Java.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
,v
retrieving revision 1.4
diff -u -r1.4 Java.java
--- Java.java   2000/02/13 18:20:00     1.4
+++ Java.java   2000/02/16 14:01:03
@@ -125,6 +125,13 @@
     }

     /**
+     * Set the source file.
+     */
+    public void setClassname(String s) {
+        this.classname = s;
+    }
+
+    /**
      * Set the destination file.
      */
     public void setArgs(String s) {
Index: src/main/org/apache/tools/ant/taskdefs/Rmic.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
,v
retrieving revision 1.4
diff -u -r1.4 Rmic.java
--- Rmic.java   2000/02/14 12:19:27     1.4
+++ Rmic.java   2000/02/16 14:01:03
@@ -92,6 +92,10 @@
         this.classname = classname;
     }

+    public void setClassname(String classname) {
+        this.classname = classname;
+    }
+
     public void setSourceBase(String sourceBase) {
         this.sourceBase = sourceBase;
     }
Index: src/main/org/apache/tools/ant/taskdefs/Taskdef.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.j
ava,v
retrieving revision 1.2
diff -u -r1.2 Taskdef.java
--- Taskdef.java        2000/01/14 02:13:19     1.2
+++ Taskdef.java        2000/02/16 14:01:03
@@ -92,4 +92,8 @@
     public void setClass(String v) {
        value = v;
     }
+
+    public void setClassname(String v) {
+       value = v;
+    }
 }




--
Conor MacNeill
conor@m64.com
M64 Pty Limited