From 653124c46b538acb4d6caf265851fa991578d42d Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@apache.org>
Date: Wed, 16 Feb 2000 14:31:45 +0000
Subject: [PATCH] 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.

Note: I added a deprecation warning to the output whenever the class
      attribute is used.

Submitted by: Conor MacNeill <conor@m64.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267611 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/taskdefs/Available.java     |  7 +++++++
 src/main/org/apache/tools/ant/taskdefs/Java.java     | 12 +++++++++++-
 src/main/org/apache/tools/ant/taskdefs/Rmic.java     |  7 +++++++
 src/main/org/apache/tools/ant/taskdefs/Taskdef.java  |  7 +++++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 3a7c01ace..ec58b4313 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -76,6 +76,13 @@ public class Available extends Task {
     }
 
     public void setClass(String classname) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        this.classname = classname;
+    }
+
+    public void setClassname(String classname) {
         this.classname = classname;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index 37b18ecfc..feba88e2e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -118,9 +118,19 @@ public class Java extends Exec {
     }
     
     /**
-     * Set the source file.
+     * Set the source file (deprecated).
      */
     public void setClass(String s) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        this.classname = s;
+    }
+
+    /**
+     * Set the source file.
+     */
+    public void setClassname(String s) {
         this.classname = s;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 6215d1956..f4f41c523 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -89,6 +89,13 @@ public class Rmic extends Task {
     }
 
     public void setClass(String classname) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        this.classname = classname;
+    }
+
+    public void setClassname(String classname) {
         this.classname = classname;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
index d338bfcec..231b2e506 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
@@ -90,6 +90,13 @@ public class Taskdef extends Task {
     }
 
     public void setClass(String v) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        value = v;
+    }
+
+    public void setClassname(String v) {
 	value = v;
     }
 }