mirror of https://github.com/apache/ant-ivy
FIX issue with cache path and cache fileset
git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/trunk@484082 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
028572d7f2
commit
5f1ed4448c
|
|
@ -23,6 +23,7 @@ public class IvyCacheFileset extends IvyCacheTask {
|
|||
}
|
||||
|
||||
public void execute() throws BuildException {
|
||||
prepareAndCheck();
|
||||
if (_setid == null) {
|
||||
throw new BuildException("setid is required in ivy cachefileset");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ public class IvyCachePath extends IvyCacheTask {
|
|||
}
|
||||
|
||||
public void execute() throws BuildException {
|
||||
prepareAndCheck();
|
||||
if (_pathid == null) {
|
||||
throw new BuildException("pathid is required in ivy classpath");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public abstract class IvyCacheTask extends IvyTask {
|
|||
_type = type;
|
||||
}
|
||||
|
||||
protected List getPaths() throws BuildException, ParseException, IOException {
|
||||
protected void prepareAndCheck() {
|
||||
Ivy ivy = getIvyInstance();
|
||||
|
||||
ensureResolved(isHaltonfailure());
|
||||
|
|
@ -96,6 +96,10 @@ public abstract class IvyCacheTask extends IvyTask {
|
|||
throw new BuildException("no module name provided for ivy cachefileset: It can either be set explicitely via the attribute 'module' or via 'ivy.module' property or a prior call to <resolve/>");
|
||||
}
|
||||
_artifactFilter = FilterHelper.getArtifactTypeFilter(_type);
|
||||
}
|
||||
|
||||
protected List getPaths() throws BuildException, ParseException, IOException {
|
||||
Ivy ivy = getIvyInstance();
|
||||
|
||||
XmlReportParser parser = new XmlReportParser();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue