From d7b8f63f01aff39fbb6a868d85b27f482cc1c831 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 16 Mar 2001 09:48:12 +0000
Subject: [PATCH] Make <style> search relative to the project's basedir first -
 if it cannot be found, fall back to the task's basedir and print a
 deprecation warning.

Submitted by:	Jesse Glick <Jesse.Glick@netbeans.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268850 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/style.html                        | 5 ++++-
 src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/manual/CoreTasks/style.html b/docs/manual/CoreTasks/style.html
index a9212cf1f..6f3ae76e0 100644
--- a/docs/manual/CoreTasks/style.html
+++ b/docs/manual/CoreTasks/style.html
@@ -53,7 +53,10 @@ inclusion/exclusion of files works, and how to write patterns.</p>
   <tr>
     <td valign="top">style</td>
     <td valign="top">name of the stylesheet to use - given either relative
-      to the basedir attribute or as an absolute path.</td>
+      to the project's basedir or as an absolute path
+      <em><strong>DEPRECATED</strong> - can be specified as a path relative
+          to the basedir attribute of this task as well</em>.
+    </td>
     <td align="center" valign="top">Yes</td>
   </tr>
   <tr>
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 813a96520..5180bdfde 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -153,7 +153,14 @@ public class XSLTProcess extends MatchingTask {
         long styleSheetLastModified = 0;
         if (xslFile != null) {
             try {
-                File file = project.resolveFile(xslFile, baseDir);
+                File file = project.resolveFile(xslFile, project.getBaseDir());
+
+                if (!file.exists()) {
+                    log("DEPRECATED - the style attribute should be relative to the project\'s");
+                    log("             basedir, not the tasks\'s basedir.");
+                    file = project.resolveFile(xslFile, baseDir);
+                }
+                
                 // Create a new XSL processor with the specified stylesheet
                 styleSheetLastModified = file.lastModified();
                 log( "Loading stylesheet " + file, Project.MSG_INFO);