Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java Tue Sep 2 05:07:20 2008 @@ -317,8 +317,8 @@ resolver.setName("1"); resolver.setSettings(settings); - resolver - .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern( + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); // second resolver has an ivy pattern and will thus find the real module, which should be @@ -328,9 +328,9 @@ resolver.setSettings(settings); resolver - .addIvyPattern("test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); + .addIvyPattern(settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); resolver - .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + .addArtifactPattern(settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); @@ -453,9 +453,9 @@ resolver.setSettings(settings); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); @@ -473,7 +473,7 @@ resolver.setSettings(settings); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); @@ -513,7 +513,7 @@ resolver.setName("1"); resolver.setSettings(settings); resolver.addArtifactPattern( - "test/repositories/nowhere/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + settings.getBaseDir() + "/test/repositories/nowhere/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); @@ -522,9 +522,9 @@ resolver.setSettings(settings); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java Tue Sep 2 05:07:20 2008 @@ -57,8 +57,9 @@ private static final String FS = System.getProperty("file.separator"); - private static final String IVY_PATTERN = "test" + FS + "repositories" + FS + "1" + FS - + "[organisation]" + FS + "[module]" + FS + "ivys" + FS + "ivy-[revision].xml"; + private static final String REL_IVY_PATTERN = "test" + FS + "repositories" + FS + "1" + FS + + "[organisation]" + FS + "[module]" + FS + "ivys" + FS + "ivy-[revision].xml"; + private static final String IVY_PATTERN = new File(".").getAbsolutePath() + FS + REL_IVY_PATTERN; private IvySettings settings; @@ -110,7 +111,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, @@ -153,16 +154,16 @@ FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); resolver.setSettings(settings); - resolver.addIvyPattern("test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml"); - resolver.addIvyPattern("test/repositories/multi-ivypattern/ivy2/ivy-[revision].xml"); + resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml"); + resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/multi-ivypattern/ivy2/ivy-[revision].xml"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0+"); ResolvedResource ivyRef = resolver.findIvyFileRef( new DefaultDependencyDescriptor(mrid, false), data); // check that the found ivy file is the one from the first pattern! - assertEquals("./test/repositories/multi-ivypattern/ivy1/ivy-1.0.xml", - ivyRef.getResource().getName().replace('\\', '/')); + assertEquals(new File("test/repositories/multi-ivypattern/ivy1/ivy-1.0.xml").getCanonicalPath(), + new File(ivyRef.getResource().getName()).getCanonicalPath()); } private DownloadOptions getDownloadOptions() { @@ -178,11 +179,11 @@ resolver .addIvyPattern( - "test/repositories/m2/" + settings.getBaseDir() + "/test/repositories/m2/" + "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); resolver .addArtifactPattern( - "test/repositories/m2/" + settings.getBaseDir() + "/test/repositories/m2/" + "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0"); @@ -201,10 +202,10 @@ resolver.setName("test"); resolver.setSettings(settings); - resolver.addIvyPattern("test/repositories/checksums/[module]/[artifact]-[revision].[ext]"); + resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/checksums/[module]/[artifact]-[revision].[ext]"); resolver .addArtifactPattern( - "test/repositories/checksums/[module]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/checksums/[module]/[artifact]-[revision].[ext]"); resolver.setChecksums("sha1, md5"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("test", "allright", "1.0"); @@ -249,7 +250,7 @@ settings.addResolver(resolver); assertEquals("test", resolver.getName()); - resolver.addIvyPattern("test" + FS + "repositories" + FS + "checkmodified" + FS + resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "checkmodified" + FS + "ivy-[revision].xml"); File modify = new File("test/repositories/checkmodified/ivy-1.0.xml"); FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-before.xml"), modify, null, @@ -296,9 +297,9 @@ settings.addResolver(resolver); assertEquals("test", resolver.getName()); - resolver.addIvyPattern("test" + FS + "repositories" + FS + "norevision" + FS + resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "norevision" + FS + "ivy-[module].xml"); - resolver.addArtifactPattern("test" + FS + "repositories" + FS + "norevision" + FS + resolver.addArtifactPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "norevision" + FS + "[artifact].[ext]"); File modify = new File("test/repositories/norevision/ivy-mod1.1.xml"); File artifact = new File("test/repositories/norevision/mod1.1.jar"); @@ -367,9 +368,9 @@ settings.addResolver(resolver); assertEquals("test", resolver.getName()); - resolver.addIvyPattern("test" + FS + "repositories" + FS + "checkmodified" + FS + resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "checkmodified" + FS + "ivy-[revision].xml"); - resolver.addArtifactPattern("test" + FS + "repositories" + FS + "checkmodified" + FS + resolver.addArtifactPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "checkmodified" + FS + "[artifact]-[revision].[ext]"); File modify = new File("test/repositories/checkmodified/ivy-1.0.xml"); File artifact = new File("test/repositories/checkmodified/mod1.1-1.0.jar"); @@ -448,7 +449,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + "/test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setLatestStrategy(new LatestTimeStrategy()); @@ -473,7 +474,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + "/test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setLatestStrategy(new LatestRevisionStrategy()); @@ -495,10 +496,10 @@ resolver.setSettings(settings); assertEquals("test", resolver.getName()); - resolver.addIvyPattern(new File("src/java").getAbsolutePath() + "/../../" + IVY_PATTERN); + resolver.addIvyPattern(new File("src/java").getAbsolutePath() + "/../../" + REL_IVY_PATTERN); resolver .addArtifactPattern( - "src/../test/repositories/1/" + settings.getBaseDir() + "/src/../test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setLatestStrategy(new LatestRevisionStrategy()); @@ -523,7 +524,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + "/test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setLatestStrategy(new LatestTimeStrategy()); @@ -547,7 +548,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + "/test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setLatestStrategy(new LatestRevisionStrategy()); @@ -569,11 +570,11 @@ resolver.setSettings(settings); assertEquals("test", resolver.getName()); - resolver.addIvyPattern("test" + FS + "repositories" + FS + "1" + FS + "[organisation]" + resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "1" + FS + "[organisation]" + FS + "[module]" + FS + "[revision]" + FS + "[artifact].[ext]"); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + FS + "test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); @@ -603,9 +604,9 @@ assertEquals("test", resolver.getName()); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); File ivyFile = new File("test/repositories/1/myorg/mymodule/myrevision/ivy.xml"); File artifactFile = new File("test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext"); @@ -642,9 +643,9 @@ resolver.setSettings(settings); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); @@ -681,9 +682,9 @@ resolver.setSettings(settings); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "mybranch", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); @@ -720,9 +721,9 @@ resolver.setSettings(settings); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); @@ -759,9 +760,9 @@ resolver.setSettings(settings); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); @@ -791,7 +792,7 @@ resolver.addArtifactPattern( // this pattern is not supported for transaction publish - "test/repositories/1/[organisation]/[module]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype", @@ -819,9 +820,9 @@ // the two patterns are inconsistent and thus not supported for transactions resolver.addIvyPattern( - "test/repositories/1/[organisation]-[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]-[module]/[revision]/[artifact]-[revision].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); @@ -849,7 +850,7 @@ resolver.setTransactional("true"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype", @@ -877,9 +878,9 @@ resolver.setTransactional("false"); resolver.addIvyPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]"); resolver.addArtifactPattern( - "test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); + settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); @@ -918,7 +919,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + "/test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"); OrganisationEntry[] orgs = resolver.listOrganisations(); @@ -952,7 +953,7 @@ resolver.addIvyPattern(IVY_PATTERN); resolver .addArtifactPattern( - "test/repositories/1/" + settings.getBaseDir() + "/test/repositories/1/" + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"); Modified: ant/ivy/core/trunk/test/repositories/IVY-630/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-630/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/IVY-630/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/IVY-630/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -17,7 +17,7 @@ under the License. --> <ivysettings> - <settings defaultCache="build/cache" defaultResolver="1" checkUpToDate="true" /> + <settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="1" checkUpToDate="true" /> <resolvers> <filesystem allownomd="true" name="1"> <ivy pattern="${ivy.settings.dir}/[module]-[revision]/ivy.xml"/> Modified: ant/ivy/core/trunk/test/repositories/branches/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/branches/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/branches/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/branches/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -24,8 +24,8 @@ <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> </filesystem> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[branch]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[branch]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[branch]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[branch]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/ivysettings-IVY602.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings-IVY602.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings-IVY602.xml (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings-IVY602.xml Tue Sep 2 05:07:20 2008 @@ -37,8 +37,8 @@ </dual> </chain> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/ivysettings-IVY843.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings-IVY843.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings-IVY843.xml (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings-IVY843.xml Tue Sep 2 05:07:20 2008 @@ -37,16 +37,16 @@ </dual> </chain> <filesystem name="dummy"> - <ivy pattern="dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> <filesystem name="install2"> - <ivy pattern="build/test/install2/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install2/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install2/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install2/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/ivysettings-dummydefaultresolver.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings-dummydefaultresolver.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings-dummydefaultresolver.xml (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings-dummydefaultresolver.xml Tue Sep 2 05:07:20 2008 @@ -37,12 +37,12 @@ </dual> </chain> <filesystem name="dummy"> - <ivy pattern="dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/dummy/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/ivysettings-invalidcachepattern.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings-invalidcachepattern.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings-invalidcachepattern.xml (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings-invalidcachepattern.xml Tue Sep 2 05:07:20 2008 @@ -39,8 +39,8 @@ </dual> </chain> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/ivysettings-nodefaultresolver.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings-nodefaultresolver.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings-nodefaultresolver.xml (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings-nodefaultresolver.xml Tue Sep 2 05:07:20 2008 @@ -36,8 +36,8 @@ </dual> </chain> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Added: ant/ivy/core/trunk/test/repositories/ivysettings-url.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings-url.xml?rev=691210&view=auto ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings-url.xml (added) +++ ant/ivy/core/trunk/test/repositories/ivysettings-url.xml Tue Sep 2 05:07:20 2008 @@ -0,0 +1,33 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<ivysettings> + <properties file="${ivy.settings.dir}/ivysettings.properties" /> + <settings defaultResolver="install"/> + <caches defaultCacheDir="${cache.dir}" /> + <resolvers> + <filesystem name="install"> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + </filesystem> + <filesystem name="transactional"> + <ivy pattern="${ivy.basedir}/build/test/transactional/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/transactional/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> + </filesystem> + </resolvers> +</ivysettings> Propchange: ant/ivy/core/trunk/test/repositories/ivysettings-url.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ant/ivy/core/trunk/test/repositories/ivysettings.properties URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings.properties?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings.properties (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings.properties Tue Sep 2 05:07:20 2008 @@ -17,7 +17,7 @@ # * under the License. # *************************************************************** ivy.publish.src.artifacts.pattern=${build}/[artifact]-[revision].[ext] -cache.dir=build/cache +cache.dir=${ivy.basedir}/build/cache vfs.host= vfs.user= vfs.passwd= Modified: ant/ivy/core/trunk/test/repositories/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -37,12 +37,12 @@ </dual> </chain> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> <filesystem name="transactional"> - <ivy pattern="build/test/transactional/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/transactional/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/transactional/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/transactional/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -17,7 +17,7 @@ under the License. --> <ivysettings> - <settings defaultCache="build/cache" defaultResolver="m2"/> + <settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="m2"/> <resolvers> <ibiblio name="m2" m2compatible="true" useMavenMetadata="true" root="${ivy.settings.dir}" /> Modified: ant/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -17,12 +17,12 @@ under the License. --> <ivysettings> - <settings defaultCache="build/cache" defaultResolver="multi-ivy"/> + <settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="multi-ivy"/> <resolvers> <filesystem name="multi-ivy"> - <ivy pattern="test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml" /> - <ivy pattern="test/repositories/multi-ivypattern/ivy2/ivy-[revision].xml" /> - <artifact pattern="test/repositories/multi-ivypattern/jars/mod-[revision].jar" /> + <ivy pattern="${ivy.basedir}/test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml" /> + <ivy pattern="${ivy.basedir}/test/repositories/multi-ivypattern/ivy2/ivy-[revision].xml" /> + <artifact pattern="${ivy.basedir}/test/repositories/multi-ivypattern/jars/mod-[revision].jar" /> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/namespace/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/namespace/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/namespace/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/namespace/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -17,7 +17,7 @@ under the License. --> <ivysettings> - <settings defaultCache="build/cache" defaultResolver="ns"/> + <settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="ns"/> <namespaces> <namespace name="test" chainrules="true"> <rule> @@ -69,8 +69,8 @@ <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/> </filesystem> <filesystem name="install"> - <ivy pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="build/test/install/[organisation]/[module]/[artifact](-[classifier])-[revision].[ext]"/> + <ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact](-[classifier])-[revision].[ext]"/> </filesystem> </resolvers> </ivysettings> Modified: ant/ivy/core/trunk/test/repositories/parentPom/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/parentPom/ivysettings.xml?rev=691210&r1=691209&r2=691210&view=diff ============================================================================== --- ant/ivy/core/trunk/test/repositories/parentPom/ivysettings.xml (original) +++ ant/ivy/core/trunk/test/repositories/parentPom/ivysettings.xml Tue Sep 2 05:07:20 2008 @@ -17,7 +17,7 @@ under the License. --> <ivysettings> - <settings defaultCache="build/cache"/> + <settings defaultCache="${ivy.basedir}/build/cache"/> <resolvers> <filesystem name="m2" m2compatible="true"> <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>