Author: maartenc
Date: Fri Apr 10 21:35:34 2009
New Revision: 764065
URL: http://svn.apache.org/viewvc?rev=764065&view=rev
Log:
FIX: Wrong BuildException messages (findmodules) (IVY-1056)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=764065&r1=764064&r2=764065&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Apr 10 21:35:34 2009
@@ -86,6 +86,10 @@
trunk
=====================================
+- FIX: Wrong BuildException messages (findmodules) (IVY-1056)
+
+ 2.1.0-rc1
+=====================================
- IMPROVEMENT: Fail the retrieve when multiple artifacts of same module are
mapped to same file (IVY-1050)
- IMPROVEMENT: ivy initialization shouldn't fail if properties file doesn't
exist (IVY-1038)
- IMPROVEMENT: ivy:resolve ant task does not support "branch" attribute
(IVY-1035)
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java?rev=764065&r1=764064&r2=764065&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java Fri Apr
10 21:35:34 2009
@@ -135,10 +135,10 @@
public void doExecute() throws BuildException {
if (organisation == null) {
- throw new BuildException("no organisation provided for ivy
findmodules");
+ throw new BuildException("no organisation provided for ivy
buildnumber task");
}
if (module == null) {
- throw new BuildException("no module name provided for ivy
findmodules");
+ throw new BuildException("no module name provided for ivy
buildnumber task");
}
if (prefix == null) {
throw new BuildException("null prefix not allowed");
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java?rev=764065&r1=764064&r2=764065&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java Fri Apr
10 21:35:34 2009
@@ -81,13 +81,13 @@
public void doExecute() throws BuildException {
if (organisation == null) {
- throw new BuildException("no organisation provided for ivy
findmodules");
+ throw new BuildException("no organisation provided for ivy
findrevision task");
}
if (module == null) {
- throw new BuildException("no module name provided for ivy
findmodules");
+ throw new BuildException("no module name provided for ivy
findrevision task");
}
if (revision == null) {
- throw new BuildException("no revision provided for ivy
findmodules");
+ throw new BuildException("no revision provided for ivy
findrevision task");
}
Ivy ivy = getIvyInstance();
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java?rev=764065&r1=764064&r2=764065&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java Fri Apr 10
21:35:34 2009
@@ -109,13 +109,13 @@
try {
if (organisation != null || module != null || revision != null ||
branch != null) {
if (organisation == null) {
- throw new BuildException("no organisation provided for ivy
findmodules");
+ throw new BuildException("no organisation provided for ivy
info task");
}
if (module == null) {
- throw new BuildException("no module name provided for ivy
findmodules");
+ throw new BuildException("no module name provided for ivy
info task");
}
if (revision == null) {
- throw new BuildException("no revision provided for ivy
findmodules");
+ throw new BuildException("no revision provided for ivy
info task");
}
if (branch == null) {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java?rev=764065&r1=764064&r2=764065&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java Fri Apr
10 21:35:34 2009
@@ -101,19 +101,19 @@
public void doExecute() throws BuildException {
if (organisation == null) {
- throw new BuildException("no organisation provided for ivy
findmodules");
+ throw new BuildException("no organisation provided for ivy
listmodules task");
}
if (module == null) {
- throw new BuildException("no module name provided for ivy
findmodules");
+ throw new BuildException("no module name provided for ivy
listmodules task");
}
if (revision == null) {
- throw new BuildException("no revision provided for ivy
findmodules");
+ throw new BuildException("no revision provided for ivy listmodules
task");
}
if (property == null) {
- throw new BuildException("no property provided for ivy
findmodules");
+ throw new BuildException("no property provided for ivy listmodules
task");
}
if (value == null) {
- throw new BuildException("no value provided for ivy findmodules");
+ throw new BuildException("no value provided for ivy listmodules
task");
}
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
