diff --git a/WHATSNEW b/WHATSNEW index c55446bce..35787f176 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -78,7 +78,7 @@ Changes that could break older environments: receive an error if Ant itself would not start * All .NET tasks are now deprecated in favor of the new .NET Antlib: - http://ant.apache.org/antlibs/proper.html + http://ant.apache.org/antlibs/dotnet/index.html Fixed bugs: ----------- diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html index 7b214b310..8c5b76afe 100644 --- a/docs/manual/OptionalTasks/dotnet.html +++ b/docs/manual/OptionalTasks/dotnet.html @@ -10,7 +10,7 @@

These tasks are deprecated and will be removed in a future release of Ant. They are now part of the .NET +href="http://ant.apache.org/antlibs/dotnet/index.html">.NET Antlib.

Ant support for .NET goes back to before .NET was released, and diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java index 9da6a1e75..2a2583645 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java @@ -811,7 +811,8 @@ public abstract class DotnetCompile throws BuildException { log("This task is deprecated and will be removed in a future version\n" + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR); + + "http://ant.apache.org/antlibs/dotnet/index.html", + Project.MSG_WARN); validate(); NetCommand command = createNetCommand(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 8eae19bf9..b30310282 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -458,7 +458,8 @@ public class Ilasm throws BuildException { log("This task is deprecated and will be removed in a future version\n" + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR); + + "http://ant.apache.org/antlibs/dotnet/index.html", + Project.MSG_WARN); NetCommand command = buildIlasmCommand(); addFilesAndExecute(command, false); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java index ef0a37d3b..99099f397 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java @@ -347,7 +347,8 @@ public class Ildasm extends Task { public void execute() throws BuildException { log("This task is deprecated and will be removed in a future version\n" + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR); + + "http://ant.apache.org/antlibs/dotnet/index.html", + Project.MSG_WARN); validate(); if (!isDisassemblyNeeded()) { return; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java index d1468174d..96b616f9c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java @@ -184,9 +184,10 @@ public class ImportTypelib extends Task { * @exception BuildException if something goes wrong with the build */ public void execute() throws BuildException { - if ("WsdlToDotnet".equals(getTaskType())) { - log("Warning: the task name is deprecated. Use (all lowercase) instead.", Project.MSG_WARN); - } + log("This task is deprecated and will be removed in a future version\n" + + "of Ant. It is now part of the .NET Antlib:\n" + + "http://ant.apache.org/antlibs/dotnet/index.html", + Project.MSG_WARN); validate(); log("Importing typelib " + srcFile + " to assembly " + destFile diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java index e59bd42af..46b5567b7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java @@ -278,7 +278,8 @@ public class WsdlToDotnet extends Task { throws BuildException { log("This task is deprecated and will be removed in a future version\n" + "of Ant. It is now part of the .NET Antlib:\n" - + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR); + + "http://ant.apache.org/antlibs/dotnet/index.html", + Project.MSG_WARN); if (compiler == null) { compiler = Compiler.createDefaultCompiler();