Author: xavier
Date: Sat Mar 17 03:14:04 2007
New Revision: 519279
URL: http://svn.apache.org/viewvc?view=rev&rev=519279
Log:
FIX: setting m2compatible on ibiblio resolver overwrite root and pattern
settings (IVY-437)
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=519279&r1=519278&r2=519279
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Sat Mar 17 03:14:04 2007
@@ -16,6 +16,7 @@
- IMPROVE: Add a unit test to verify that latest.integration accepts released
modules (IVY-394) (thanks to Gilles Scokart)
- IMPROVE: New "modules in use" section in console report at the end of
resolve (IVY-373) (thanks to John Wiliams)
+- FIX: setting m2compatible on ibiblio resolver overwrite root and pattern
settings (IVY-437)
- FIX: ivy.revision property not set correctly for second resolve (IVY-429)
- FIX: NPE when no organisation or no name is provided in module element of
ivyconf (IVY-422)
- FIX: FileUtil#copy(File src, File dest, CopyProgressListener l, boolean
overwrite) (IVY-420)
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java?view=diff&rev=519279&r1=519278&r2=519279
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
Sat Mar 17 03:14:04 2007
@@ -38,6 +38,7 @@
import org.apache.ivy.core.search.RevisionEntry;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.resolver.util.ResolvedResource;
+import org.apache.ivy.util.Message;
/**
@@ -78,8 +79,12 @@
public void setM2compatible(boolean m2compatible) {
super.setM2compatible(m2compatible);
if (m2compatible) {
- _root = "http://www.ibiblio.org/maven2/";;
- _pattern =
"[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]";
+ if (_root == null) {
+ _root = "http://www.ibiblio.org/maven2/";;
+ }
+ if (_pattern == null) {
+ _pattern =
"[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]";
+ }
updateWholePattern();
}
}
@@ -213,5 +218,13 @@
public void setUsepoms(boolean usepoms) {
_usepoms = usepoms;
updateWholePattern();
+ }
+
+ public void dumpConfig() {
+ ensureConfigured(getSettings());
+ super.dumpConfig();
+ Message.debug("\t\troot: "+getRoot());
+ Message.debug("\t\tpattern: "+getPattern());
+ Message.debug("\t\tusepoms: "+_usepoms);
}
}
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java?view=diff&rev=519279&r1=519278&r2=519279
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
Sat Mar 17 03:14:04 2007
@@ -118,7 +118,23 @@
assertNotNull(l);
assertEquals(1, l.size());
assertEquals("http://www.ibiblio.org/maven/[module]/jars/[artifact]-[revision].jar";,
l.get(0));
-}
+
+ resolver = (IBiblioResolver)_settings.getResolver("ibiblioE");
+ assertTrue(resolver.isM2compatible());
+ assertNotNull(resolver);
+ l = resolver.getArtifactPatterns();
+ assertNotNull(l);
+ assertEquals(1, l.size());
+
assertEquals("http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
l.get(0));
+
+ resolver = (IBiblioResolver)_settings.getResolver("ibiblioF");
+ assertTrue(resolver.isM2compatible());
+ assertNotNull(resolver);
+ l = resolver.getArtifactPatterns();
+ assertNotNull(l);
+ assertEquals(1, l.size());
+
assertEquals("http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
l.get(0));
+ }
public void testIBiblio() throws Exception {
String ibiblioRoot = IBiblioHelper.getIBiblioMirror();
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml?view=diff&rev=519279&r1=519278&r2=519279
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml
Sat Mar 17 03:14:04 2007
@@ -4,5 +4,7 @@
<ibiblio name="ibiblioB" root="${my.ibiblio.root}"
pattern="[organisation]/jars/[artifact]-[revision].jar" />
<ibiblio name="ibiblioC" m2compatible="true"/>
<ibiblio name="ibiblioD"/>
+ <ibiblio name="ibiblioE" m2compatible="true" root="${my.ibiblio.root}"/>
+ <ibiblio name="ibiblioF" root="${my.ibiblio.root}" m2compatible="true"/>
</resolvers>
</ivyconf>
