ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r425879 - in /ant/core/trunk/src/main/org/apache/tools/ant/helper: ProjectHelper2.java ProjectHelperImpl.java
Date Wed, 26 Jul 2006 22:29:52 GMT
Author: jglick
Date: Wed Jul 26 15:29:50 2006
New Revision: 425879

URL: http://svn.apache.org/viewvc?rev=425879&view=rev
Log:
People should not think that "file:../master.xml" is a meaningful URI.
Ant historically supports it but normal XML parsers do not.

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
    ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java?rev=425879&r1=425878&r2=425879&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Wed Jul 26 15:29:50
2006
@@ -477,6 +477,11 @@
                 File file = new File(path);
                 if (!file.isAbsolute()) {
                     file = FILE_UTILS.resolveFile(context.getBuildFileParent(), path);
+                    context.getProject().log(
+                            "Warning: '" + systemId + "' in " + context.getBuildFile() +
+                            " should be expressed simply as '" + path.replace('\\', '/')
+
+                            "' for compliance with other XML tools",
+                            Project.MSG_WARN);
                 }
                 context.getProject().log("file=" + file, Project.MSG_DEBUG);
                 try {

Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java?rev=425879&r1=425878&r2=425879&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java Wed Jul 26
15:29:50 2006
@@ -296,6 +296,11 @@
                 File file = new File(path);
                 if (!file.isAbsolute()) {
                     file = FILE_UTILS.resolveFile(helperImpl.buildFileParent, path);
+                    helperImpl.project.log(
+                            "Warning: '" + systemId + "' in " + helperImpl.buildFile +
+                            " should be expressed simply as '" + path.replace('\\', '/')
+
+                            "' for compliance with other XML tools",
+                            Project.MSG_WARN);
                 }
                 try {
                     InputSource inputSource = new InputSource(new FileInputStream(file));



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


Mime
View raw message