natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not search for poms explicitly 

git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/trunk@484149 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Xavier Hanin 2006-01-24 10:38:02 +00:00
parent 8d01ea69a6
commit 3091e264b0
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/fr/jayasoft/ivy/resolver/AbstractResourceResolver.java
View File

@ -48,9 +48,9 @@ public abstract class AbstractResourceResolver extends BasicResolver {
mrid = convertM2IdForResourceSearch(mrid);
}
ResolvedResource rres = findResourceUsingPatterns(mrid, _ivyPatterns, "ivy", "ivy", "xml", data.getDate());
if (rres == null && isM2compatible()) {
rres = findResourceUsingPatterns(mrid, _ivyPatterns, mrid.getName(), "pom", "pom", data.getDate());
}
// if (rres == null && isM2compatible()) {
// rres = findResourceUsingPatterns(mrid, _ivyPatterns, mrid.getName(), "pom", "pom", data.getDate());
// }
return rres;
}
@ -209,7 +209,7 @@ public abstract class AbstractResourceResolver extends BasicResolver {
_m2compatible = m2compatible;
}
private ModuleRevisionId convertM2IdForResourceSearch(ModuleRevisionId mrid) {
protected ModuleRevisionId convertM2IdForResourceSearch(ModuleRevisionId mrid) {
if (mrid.getOrganisation().indexOf('.') == -1) {
return mrid;
}

12
src/java/fr/jayasoft/ivy/resolver/IBiblioResolver.java
View File

@ -14,6 +14,7 @@ import java.util.List;
import fr.jayasoft.ivy.Artifact;
import fr.jayasoft.ivy.DependencyDescriptor;
import fr.jayasoft.ivy.Ivy;
import fr.jayasoft.ivy.ModuleRevisionId;
import fr.jayasoft.ivy.ResolveData;
import fr.jayasoft.ivy.ResolvedModuleRevision;
import fr.jayasoft.ivy.report.DownloadReport;
@ -32,6 +33,17 @@ public class IBiblioResolver extends URLResolver {
public IBiblioResolver() {
}
protected ResolvedResource findIvyFileRef(DependencyDescriptor dd, ResolveData data) {
if (isM2compatible()) {
ModuleRevisionId mrid = dd.getDependencyRevisionId();
mrid = convertM2IdForResourceSearch(mrid);
ResolvedResource rres = findResourceUsingPatterns(mrid, getIvyPatterns(), mrid.getName(), "pom", "pom", data.getDate());
return rres;
} else {
return null;
}
}
public void setM2compatible(boolean m2compatible) {
super.setM2compatible(m2compatible);
if (m2compatible) {

2
test/repositories/m2/ivyconf.xml
View File

@ -2,7 +2,7 @@
<conf defaultCache="build/cache" defaultResolver="m2"/>
<resolvers>
<filesystem name="m2" m2compatible="true">
<ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
<ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
<artifact pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>