Index: test/java/org/apache/ivy/core/resolve/ResolveTest.java =================================================================== --- test/java/org/apache/ivy/core/resolve/ResolveTest.java (revision 649801) +++ test/java/org/apache/ivy/core/resolve/ResolveTest.java (working copy) @@ -3511,8 +3511,13 @@ // dependencies assertTrue(getIvyFileInCache( ModuleRevisionId.newInstance("org.apache", "test-classified", "1.0")).exists()); - assertTrue(getArchiveFileInCache(ivy, "org.apache", "test-classified", - "1.0", "test-classified", "jar", "jar").exists()); + +// assertTrue(getArchiveFileInCache(ivy, "org.apache", "test-classified", +// "1.0", "test-classified", "jar", "jar").exists()); + Map cmap = new HashMap(); + cmap.put("classifier", "asl"); + assertTrue(getArchiveFileInCache(ivy, "org.apache", "test-classified", null /* branch */ + , "1.0", "test-classified", "jar", "jar", cmap).exists()); } public void testResolveMaven2WithVersionProperty() throws Exception { @@ -4163,6 +4168,14 @@ ivy, organisation, module, revision, artifactName, type, ext); } + private File getArchiveFileInCache(Ivy ivy, String organisation, String module, String branch, String revision, + String artifactName, String type, String ext, Map extraAttrs) { + ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation, module, + branch, revision); + DefaultArtifact artifact = new DefaultArtifact(mrid, new Date(), artifactName, type, ext, extraAttrs); + return TestHelper.getRepositoryCacheManager(ivy, mrid).getArchiveFileInCache(artifact); + } + private File getArchiveFileInCache(Ivy ivy, String mrid, String artifactName, String type, String ext) { return TestHelper.getArchiveFileInCache( Index: src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java =================================================================== --- src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java (revision 649801) +++ src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java (working copy) @@ -60,7 +60,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, IvySettingsAware { private static final String DEFAULT_ARTIFACT_PATTERN = - "[organisation]/[module](/[branch])/[type]s/[artifact]-[revision](.[ext])"; + "[organisation]/[module](/[branch])/[type]s/[artifact]-[revision](-[classifier])(.[ext])"; private static final String DEFAULT_DATA_FILE_PATTERN = "[organisation]/[module](/[branch])/ivydata-[revision].properties"; Index: build.properties =================================================================== --- build.properties (revision 649801) +++ build.properties (working copy) @@ -47,6 +47,8 @@ status=integration test.class.pattern = *Test +#test.class.pattern = **/org/apache/ivy/core/resolve/ResolveTest +#test.class.pattern = ResolveTest source.. = src/java/ output.. = bin/