You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2012/08/15 23:27:41 UTC
svn commit: r1373635 - in /ant/ivy/core/branches/2.3.x: ./
src/java/org/apache/ivy/ant/IvyAntSettings.java
Author: maartenc
Date: Wed Aug 15 21:27:40 2012
New Revision: 1373635
URL: http://svn.apache.org/viewvc?rev=1373635&view=rev
Log:
Fix API backwards compatibility (merged from trunk)
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyAntSettings.java
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1336088-1336547
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyAntSettings.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyAntSettings.java?rev=1373635&r1=1373634&r2=1373635&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyAntSettings.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyAntSettings.java Wed Aug 15 21:27:40 2012
@@ -36,6 +36,7 @@ import org.apache.ivy.util.url.URLHandle
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectComponent;
+import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Property;
import org.apache.tools.ant.types.DataType;
@@ -136,6 +137,13 @@ public class IvyAntSettings extends Data
return (IvyAntSettings) defaultInstanceObj;
}
}
+
+ /*
+ * Keep this for backwards compatibility!
+ */
+ public static IvyAntSettings getDefaultInstance(Task task) {
+ return getDefaultInstance((ProjectComponent) task);
+ }
public File getFile() {
return file;
@@ -239,6 +247,13 @@ public class IvyAntSettings extends Data
return ivyEngine;
}
+ /*
+ * Keep this for backwards compatibility!
+ */
+ public Ivy getConfiguredIvyInstance(Task task) {
+ return getConfiguredIvyInstance((ProjectComponent) task);
+ }
+
void createIvyEngine(final ProjectComponent task) {
Project project = task.getProject();
Property prop = new Property() {