Index: test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
===================================================================
--- test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java	(revision 1518042)
+++ test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java	(working copy)
@@ -33,33 +33,9 @@
     private static URLHandler handler = URLHandlerRegistry.getHttp();
 
     public static String getIBiblioMirror() throws Exception {
-        if (!_checked) {
-            String[] mirrors = new String[] {"http://repo1.maven.org/maven/REPOSITORY-V1.txt",
-                    "http://www.ibiblio.org/maven"};
-            String[] mirrorsRoot = new String[] {"http://repo1.maven.org/maven",
-                    "http://www.ibiblio.org/maven"};
-
-            long best = -1;
-            for (int i = 0; i < mirrors.length; i++) {
-                long start = System.currentTimeMillis();
-                if (handler.isReachable(new URL(mirrors[i]), 300)) {
-                    long took = System.currentTimeMillis() - start;
-                    System.out.println("reached " + mirrors[i] + " in " + took + "ms");
-                    if (best == -1 || took < best) {
-                        best = took;
-                        _mirror = mirrorsRoot[i];
-                        if (took < 400) {
-                            // this mirror is good enough
-                            break;
-                        }
-                    }
-                }
-            }
-            if (_mirror == null) {
-                System.out.println("No ibiblio mirror available: no ibiblio test done");
-            }
-        }
-        return _mirror;
+        // skips the check that had been here before, which is now outdated
+        _mirror = "http://repo1.maven.org/maven2";
+        _checked = true;
     }
 
     public static void main(String[] args) throws Exception {
Index: test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
===================================================================
--- test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java	(revision 1518042)
+++ test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java	(working copy)
@@ -166,11 +166,11 @@
 
         URLResolver resolver = new URLResolver();
         resolver.setSettings(settings);
-        resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]");
+        resolver.addArtifactPattern(ibiblioRoot + "/[organisation]/[module]/[revision]/[artifact]-[revision].[type]");
         resolver.setName("test");
         assertEquals("test", resolver.getName());
 
-        ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-fileupload", "1.0");
+        ModuleRevisionId mrid = ModuleRevisionId.newInstance("commons-fileupload", "commons-fileupload", "1.0");
         ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
                 false), data);
         assertNotNull(rmr);
@@ -210,24 +210,30 @@
 
         URLResolver resolver = new URLResolver();
         resolver.setSettings(settings);
-        resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]");
+        resolver.addArtifactPattern(ibiblioRoot + "/[organisation]/[module]/[revision]/[artifact]-[revision].[type]");
         resolver.setName("test");
         assertEquals("test", resolver.getName());
 
-        ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "nanning", "0.9");
-        DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(mrid, false);
-        dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(),
+        ModuleRevisionId mridProfiler = ModuleRevisionId.newInstance("nanning", "nanning-profiler", "0.9");
+        DefaultDependencyDescriptor ddProfiler = new DefaultDependencyDescriptor(mridProfiler, false);
+        ddProfiler.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mridProfiler.getModuleId(),
                 "nanning-profiler", "jar", "jar"), ExactPatternMatcher.INSTANCE, null));
-        dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(),
+        ResolvedModuleRevision rmrProfiler = resolver.getDependency(ddProfiler, data);
+        assertNotNull(rmrProfiler);
+        assertEquals(mridProfiler, rmrProfiler.getId());
+        DefaultArtifact profiler = new DefaultArtifact(mridProfiler, rmrProfiler.getPublicationDate(),
+                "nanning-profiler", "jar", "jar");
+        
+        ModuleRevisionId mridTrace = ModuleRevisionId.newInstance("nanning", "nanning-trace", "0.9");
+        DefaultDependencyDescriptor ddTrace = new DefaultDependencyDescriptor(mridTrace, false);
+        ddTrace.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mridTrace.getModuleId(),
                 "nanning-trace", "jar", "jar"), ExactPatternMatcher.INSTANCE, null));
-        ResolvedModuleRevision rmr = resolver.getDependency(dd, data);
-        assertNotNull(rmr);
-        assertEquals(mrid, rmr.getId());
-
-        DefaultArtifact profiler = new DefaultArtifact(mrid, rmr.getPublicationDate(),
-                "nanning-profiler", "jar", "jar");
-        DefaultArtifact trace = new DefaultArtifact(mrid, rmr.getPublicationDate(),
+        ResolvedModuleRevision rmrTrace = resolver.getDependency(ddTrace, data);
+        assertNotNull(rmrTrace);
+        assertEquals(mridTrace, rmrTrace.getId());
+        DefaultArtifact trace = new DefaultArtifact(mridTrace, rmrTrace.getPublicationDate(),
                 "nanning-trace", "jar", "jar");
+        
         DownloadReport report = resolver.download(new Artifact[] {profiler, trace},
             downloadOptions());
         assertNotNull(report);
@@ -238,6 +244,7 @@
         assertNotNull(ar);
 
         assertEquals(profiler, ar.getArtifact());
+        System.out.println(profiler.getAttributes());
         assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
 
         ar = report.getArtifactReport(trace);
@@ -273,11 +280,11 @@
 
         URLResolver resolver = new URLResolver();
         resolver.setSettings(settings);
-        resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]");
+        resolver.addArtifactPattern(ibiblioRoot + "/[organisation]/[module]/[revision]/[artifact]-[revision].[type]");
         resolver.setName("test");
         assertEquals("test", resolver.getName());
 
-        ModuleRevisionId mrid = ModuleRevisionId.newInstance("objectweb", "asm", "1.4+");
+        ModuleRevisionId mrid = ModuleRevisionId.newInstance("asm", "asm", "1.4+");
         ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
                 false), data);
         assertNotNull(rmr);
@@ -293,8 +300,8 @@
         URLResolver resolver = new URLResolver();
         resolver.setSettings(settings);
         resolver.setAlwaysCheckExactRevision(true);
-        resolver.addIvyPattern(ibiblioRoot + "/[module]/poms/[module]-[revision].pom");
-        resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]");
+        resolver.addIvyPattern(ibiblioRoot + "/[organisation]/[module]/[revision]/[module]-[revision].pom");
+        resolver.addArtifactPattern(ibiblioRoot + "/[organisation]/[module]/[revision]/[artifact]-[revision].[type]");
         resolver.setName("test");
         assertEquals("test", resolver.getName());