Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-outputter.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-outputter.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-outputter.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-outputter.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-outputter.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-outputter.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-outputter.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> <typedef name="myoutputter" classname="org.apache.ivy.core.settings.XmlSettingsParserTest$MyOutputter"/> <outputters> <myoutputter /> </outputters> -</ivyconf> +</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-parser.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-parser.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-parser.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-parser.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-parser.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-parser.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-parser.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> <typedef name="myparser" classname="org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistryTest$MyParser"/> <parsers> <myparser /> </parsers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-ref.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-ref.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-ref.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-ref.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-ref.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-ref.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-ref.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> - <properties file="test/java/org/apache/ivy/core/settings/ivyconf.properties"/> - <conf defaultCache="mycache"/> +<ivysettings> + <properties file="test/java/org/apache/ivy/core/settings/ivysettings.properties"/> + <settings defaultCache="mycache"/> <resolvers> <filesystem name="fs" latest="latest-time"> <ivy pattern="sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml"/> @@ -14,4 +14,4 @@ <resolver ref="fs"/> </chain> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-status.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-status.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-status.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-status.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-status.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-status.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-status.xml Mon Mar 19 02:47:57 2007 @@ -1,7 +1,7 @@ -<ivyconf> +<ivysettings> <statuses default="bronze"> <status name="gold" integration="false"/> <status name="silver" integration="false"/> <status name="bronze" integration="true"/> </statuses> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-test.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-test.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-test.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-test.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-test.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-test.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-test.xml Mon Mar 19 02:47:57 2007 @@ -1,7 +1,7 @@ -<ivyconf> +<ivysettings> <property name="shared" value="sharedrep"/> - <properties file="test/java/org/apache/ivy/core/settings/ivyconf.properties"/> - <conf defaultCache="mycache" + <properties file="test/java/org/apache/ivy/core/settings/ivysettings.properties"/> + <settings defaultCache="mycache" defaultResolver="libraries" validate="false" checkUpToDate="false" @@ -30,4 +30,4 @@ <module organisation="apache" name="ivy*" matcher="glob" resolver="int1"/> <module organisation="apache" name=".*" resolver="internal"/> </modules> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-typedef.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-typedef.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-typedef.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-typedef.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-typedef.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-typedef.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-typedef.xml Mon Mar 19 02:47:57 2007 @@ -1,4 +1,4 @@ -<ivyconf> +<ivysettings> <typedef name="mock" classname="org.apache.ivy.plugins.resolver.MockResolver"/> <resolvers> <chain name="internal"> @@ -7,4 +7,4 @@ </chain> <mock name="mock3"/> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher1.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-vmatcher1.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher1.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-vmatcher1.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher1.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-vmatcher1.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher1.xml Mon Mar 19 02:47:57 2007 @@ -1,7 +1,7 @@ -<ivyconf> +<ivysettings> <typedef name="mock" classname="org.apache.ivy.plugins.version.MockVersionMatcher"/> <version-matchers> <latest-vm name="latest"/> <mock name="vmock"/> </version-matchers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher2.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-vmatcher2.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher2.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-vmatcher2.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher2.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-vmatcher2.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher2.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> <typedef name="mock" classname="org.apache.ivy.plugins.version.MockVersionMatcher"/> <version-matchers usedefaults="true"> <mock name="vmock"/> </version-matchers> -</ivyconf> +</ivysettings> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java Mon Mar 19 02:47:57 2007 @@ -40,7 +40,7 @@ protected void setUp() throws Exception { ivy = new Ivy(); ivy.configure(LatestConflictManagerTest.class - .getResource("ivyconf-latest.xml")); + .getResource("ivysettings-latest.xml")); _cache = new File("build/cache"); _cache.mkdirs(); } @@ -96,7 +96,7 @@ public void testLatestTime1() throws Exception { ivy = new Ivy(); ivy.configure(LatestConflictManagerTest.class - .getResource("ivyconf-latest-time.xml")); + .getResource("ivysettings-latest-time.xml")); ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true); // set timestamps, because svn is not preserving this information, @@ -125,7 +125,7 @@ public void testLatestTime2() throws Exception { ivy = new Ivy(); ivy.configure(LatestConflictManagerTest.class - .getResource("ivyconf-latest-time.xml")); + .getResource("ivysettings-latest-time.xml")); ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true); // set timestamps, because svn is not preserving this information, @@ -165,7 +165,7 @@ public void testLatestTimeTransitivity() throws Exception { ivy = new Ivy(); ivy.configure(LatestConflictManagerTest.class - .getResource("ivyconf-latest-time-transitivity.xml")); + .getResource("ivysettings-latest-time-transitivity.xml")); ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true); // set timestamps, because svn is not preserving this information, Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java Mon Mar 19 02:47:57 2007 @@ -40,7 +40,7 @@ { ivy = new Ivy(); ivy.configure( RegexpConflictManagerTest.class - .getResource( "ivyconf-regexp-test.xml" ) ); + .getResource( "ivysettings-regexp-test.xml" ) ); _cache = new File("build/cache"); _cache.mkdirs(); } Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java Mon Mar 19 02:47:57 2007 @@ -32,7 +32,7 @@ protected void setUp() throws Exception { ivy = new Ivy(); - ivy.configure(StrictConflictManagerTest.class.getResource("ivyconf-strict-test.xml")); + ivy.configure(StrictConflictManagerTest.class.getResource("ivysettings-strict-test.xml")); _cache = new File("build/cache"); _cache.mkdirs(); } Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time-transitivity.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest-time-transitivity.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time-transitivity.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest-time-transitivity.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time-transitivity.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest-time-transitivity.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time-transitivity.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> - <conf defaultCache="build/cache" defaultResolver="test" defaultConflictManager="latest-time" /> + <settings defaultCache="build/cache" defaultResolver="test" defaultConflictManager="latest-time" /> <resolvers> <filesystem name="test" latest="latest-time" checkmodified="true"> @@ -9,4 +9,4 @@ </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest-time.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest-time.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest-time.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> - <conf defaultCache="build/cache" defaultResolver="test" defaultConflictManager="latest-time" /> + <settings defaultCache="build/cache" defaultResolver="test" defaultConflictManager="latest-time" /> <resolvers> <filesystem name="test"> @@ -9,4 +9,4 @@ <ivy pattern="test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-latest.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> - <conf defaultCache="build/cache" defaultResolver="test"/> + <settings defaultCache="build/cache" defaultResolver="test"/> <resolvers> <filesystem name="test"> @@ -9,4 +9,4 @@ <ivy pattern="test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-regexp-test.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-regexp-test.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-regexp-test.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-regexp-test.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-regexp-test.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-regexp-test.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-regexp-test.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> - <conf defaultCache="build/cache" + <settings defaultCache="build/cache" defaultResolver="test" defaultConflictManager="regexp" /> @@ -16,4 +16,4 @@ <conflict-managers> <regexp-cm name="regexp" regexp="(.*)\.\d"/> </conflict-managers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-strict-test.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-strict-test.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-strict-test.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-strict-test.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-strict-test.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivyconf-strict-test.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-strict-test.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> +<ivysettings> - <conf defaultCache="build/cache" + <settings defaultCache="build/cache" defaultResolver="test" defaultConflictManager="strict" /> @@ -12,4 +12,4 @@ </filesystem> </resolvers> -</ivyconf> +</ivysettings> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java Mon Mar 19 02:47:57 2007 @@ -36,7 +36,7 @@ public XmlReportOutputterTest() throws Exception { _ivy = new Ivy(); - _ivy.configure(new File("test/repositories/ivyconf.xml")); + _ivy.configure(new File("test/repositories/ivysettings.xml")); } protected void setUp() throws Exception { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java Mon Mar 19 02:47:57 2007 @@ -35,7 +35,7 @@ public XmlReportParserTest() throws Exception { _ivy = new Ivy(); - _ivy.configure(new File("test/repositories/ivyconf.xml")); + _ivy.configure(new File("test/repositories/ivysettings.xml")); } protected void setUp() throws Exception { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java Mon Mar 19 02:47:57 2007 @@ -42,7 +42,7 @@ static final public String CWD = System.getProperty("user.dir"); static final public String TEST_REPO_DIR = "test/repositories"; static final private String IVY_CONFIG_FILE = - FileUtil.concat(TEST_REPO_DIR, "ivyconf.xml"); + FileUtil.concat(TEST_REPO_DIR, "ivysettings.xml"); static final public String TEST_IVY_XML = "2/mod5.1/ivy-4.2.xml"; static final public String SCRATCH_DIR = "_vfsScratchArea"; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java Mon Mar 19 02:47:57 2007 @@ -493,7 +493,7 @@ ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision"); Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml"); Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype", "myext"); - File src = new File("test/repositories/ivyconf.xml"); + File src = new File("test/repositories/ivysettings.xml"); resolver.publish(ivyArtifact, src, false); resolver.publish(artifact, src, false); Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/chainresolverconf.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/chainresolverconf.xml?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/chainresolverconf.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/chainresolverconf.xml Mon Mar 19 02:47:57 2007 @@ -1,4 +1,4 @@ -<ivyconf> +<ivysettings> <conf defaultResolver="chain"/> <resolvers> <chain name="chain"> @@ -7,4 +7,4 @@ <ibiblio name="3" /> </chain> </resolvers> -</ivyconf> +</ivysettings> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf-bad.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf-bad.xml?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf-bad.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf-bad.xml Mon Mar 19 02:47:57 2007 @@ -1,4 +1,4 @@ -<ivyconf> +<ivysettings> <resolvers> <dual name="dualtoomany"> <ibiblio name="1" /> @@ -6,4 +6,4 @@ <ibiblio name="3" /> </dual> </resolvers> -</ivyconf> +</ivysettings> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf.xml?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf.xml Mon Mar 19 02:47:57 2007 @@ -1,4 +1,4 @@ -<ivyconf> +<ivysettings> <resolvers> <dual name="dualok"> <ibiblio name="ivy" /> @@ -8,4 +8,4 @@ <ibiblio name="1" /> </dual> </resolvers> -</ivyconf> +</ivysettings> 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=519887&r1=519886&r2=519887 ============================================================================== --- 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 Mon Mar 19 02:47:57 2007 @@ -1,4 +1,4 @@ -<ivyconf> +<ivysettings> <resolvers> <ibiblio name="ibiblioA" root="${my.ibiblio.root}" pattern="${my.ibiblio.pattern}" /> <ibiblio name="ibiblioB" root="${my.ibiblio.root}" pattern="[organisation]/jars/[artifact]-[revision].jar" /> @@ -7,4 +7,4 @@ <ibiblio name="ibiblioE" m2compatible="true" root="${my.ibiblio.root}"/> <ibiblio name="ibiblioF" root="${my.ibiblio.root}" m2compatible="true"/> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/IVY-258/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/IVY-258/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/IVY-258/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,12 +1,12 @@ -<ivyconf> - <conf defaultResolver="myresolver"/> +<ivysettings> + <settings defaultResolver="myresolver"/> <resolvers> <url name="myresolver"> - <ivy pattern="${ivy.conf.dir}/[module]/ivy.xml" /> - <artifact pattern="${ivy.conf.dir}/[module]/[artifact].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[module]/ivy.xml" /> + <artifact pattern="${ivy.settings.dir}/[module]/[artifact].[ext]" /> </url> </resolvers> <modules> <module organisation="myorg" name=".*" resolver="myresolver" /> </modules> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/IVY-264/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/IVY-264/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/IVY-264/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/IVY-264/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/IVY-264/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/IVY-264/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/IVY-264/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,9 +1,9 @@ -<ivyconf> - <conf defaultResolver="myresolver"/> +<ivysettings> + <settings defaultResolver="myresolver"/> <resolvers> <filesystem name="myresolver"> - <ivy pattern="${ivy.conf.dir}/[module]/ivy-[revision].xml" /> - <artifact pattern="${ivy.conf.dir}/[module]/[artifact]-[revision].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[module]/ivy-[revision].xml" /> + <artifact pattern="${ivy.settings.dir}/[module]/[artifact]-[revision].[ext]" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/IVY-283/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/IVY-283/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/IVY-283/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/IVY-283/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/IVY-283/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/IVY-283/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/IVY-283/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,9 +1,9 @@ -<ivyconf> - <conf defaultResolver="myresolver"/> +<ivysettings> + <settings defaultResolver="myresolver"/> <resolvers> <filesystem name="myresolver"> - <ivy pattern="${ivy.conf.dir}/[module]/ivy-[revision].xml" /> - <artifact pattern="${ivy.conf.dir}/[module]/[artifact]-[revision].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[module]/ivy-[revision].xml" /> + <artifact pattern="${ivy.settings.dir}/[module]/[artifact]-[revision].[ext]" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/IVY-84/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/IVY-84/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/IVY-84/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/IVY-84/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/IVY-84/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/IVY-84/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/IVY-84/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,12 +1,12 @@ -<ivyconf> - <conf defaultResolver="LOCAL"/> +<ivysettings> + <settings defaultResolver="LOCAL"/> <latest-strategies>latest-revision</latest-strategies> <resolvers> <filesystem name="LOCAL"> - <artifact pattern="${ivy.conf.dir}/repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> - <ivy pattern="${ivy.conf.dir}/repo/[organisation]/[module]/ivy-[revision].xml" /> + <artifact pattern="${ivy.settings.dir}/repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> + <ivy pattern="${ivy.settings.dir}/repo/[organisation]/[module]/ivy-[revision].xml" /> </filesystem> </resolvers> <modules> </modules> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/badfile/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/badfile/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/badfile/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/badfile/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/badfile/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/badfile/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/badfile/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,8 +1,8 @@ -<ivyconf> - <conf defaultResolver="test"/> +<ivysettings> + <settings defaultResolver="test"/> <resolvers> <filesystem name="test"> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/ivy-[revision].xml"/> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/ivy-[revision].xml"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/branches/ivysettings-defaultbranch1.xml (from r519871, incubator/ivy/core/trunk/test/repositories/branches/ivyconf-defaultbranch1.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/branches/ivysettings-defaultbranch1.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/branches/ivyconf-defaultbranch1.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/branches/ivysettings-defaultbranch1.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/branches/ivyconf-defaultbranch1.xml (original) +++ incubator/ivy/core/trunk/test/repositories/branches/ivysettings-defaultbranch1.xml Mon Mar 19 02:47:57 2007 @@ -1,9 +1,9 @@ -<ivyconf> - <conf defaultResolver="default" defaultBranch="branch1" /> +<ivysettings> + <settings defaultResolver="default" defaultBranch="branch1" /> <resolvers> <filesystem name="default"> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> - <artifact pattern="${ivy.conf.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> + <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/branches/ivysettings-fooonbranch1.xml (from r519871, incubator/ivy/core/trunk/test/repositories/branches/ivyconf-fooonbranch1.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/branches/ivysettings-fooonbranch1.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/branches/ivyconf-fooonbranch1.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/branches/ivysettings-fooonbranch1.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/branches/ivyconf-fooonbranch1.xml (original) +++ incubator/ivy/core/trunk/test/repositories/branches/ivysettings-fooonbranch1.xml Mon Mar 19 02:47:57 2007 @@ -1,12 +1,12 @@ -<ivyconf> - <conf defaultResolver="default" defaultBranch="trunk" /> +<ivysettings> + <settings defaultResolver="default" defaultBranch="trunk" /> <resolvers> <filesystem name="default"> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> - <artifact pattern="${ivy.conf.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> + <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> </filesystem> </resolvers> <modules> <module organisation="foo" name="foo1" branch="branch1" /> </modules> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/branches/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/branches/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/branches/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/branches/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/branches/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/branches/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/branches/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,9 +1,9 @@ -<ivyconf> - <conf defaultResolver="default" defaultBranch="trunk" /> +<ivysettings> + <settings defaultResolver="default" defaultBranch="trunk" /> <resolvers> <filesystem name="default"> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> - <artifact pattern="${ivy.conf.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> + <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.properties (from r519871, incubator/ivy/core/trunk/test/repositories/bug148/ivyconf.properties) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.properties?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/bug148/ivyconf.properties&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.properties&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/bug148/ivyconf.properties (original) +++ incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.properties Mon Mar 19 02:47:57 2007 @@ -1,2 +1,2 @@ -lib.jtv=${ivy.conf.dir}/jtv -lib.3rd=${ivy.conf.dir}/3rd +lib.jtv=${ivy.settings.dir}/jtv +lib.3rd=${ivy.settings.dir}/3rd Copied: incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/bug148/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/bug148/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/bug148/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/bug148/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,6 +1,6 @@ -<ivyconf> - <properties file="${ivy.conf.dir}/ivyconf.properties"/> - <conf defaultCache="${ivy.conf.dir}/cache" +<ivysettings> + <properties file="${ivy.settings.dir}/ivysettings.properties"/> + <settings defaultCache="${ivy.settings.dir}/cache" defaultResolver="chain-resolvers" /> <resolvers> <chain name="chain-resolvers" > @@ -14,4 +14,4 @@ </filesystem> </chain> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/bugIVY-56/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,10 +1,10 @@ -<ivyconf> - <conf defaultCache="${ivy.conf.dir}/cache" +<ivysettings> + <settings defaultCache="${ivy.settings.dir}/cache" defaultResolver="default" /> <resolvers> <filesystem name="default"> - <artifact pattern="${ivy.conf.dir}/[module]/[artifact].[ext]" /> - <ivy pattern="${ivy.conf.dir}/[module]/ivy.xml" /> + <artifact pattern="${ivy.settings.dir}/[module]/[artifact].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[module]/ivy.xml" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/external-artifacts/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/external-artifacts/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/external-artifacts/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/external-artifacts/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/external-artifacts/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/external-artifacts/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/external-artifacts/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,8 +1,8 @@ -<ivyconf> - <conf defaultResolver="r"/> +<ivysettings> + <settings defaultResolver="r"/> <resolvers> <filesystem name="r"> - <ivy pattern="${ivy.conf.dir}/[module]/ivy-[revision].xml" /> + <ivy pattern="${ivy.settings.dir}/[module]/ivy-[revision].xml" /> </filesystem> </resolvers> -</ivyconf> \ No newline at end of file +</ivysettings> \ No newline at end of file Copied: incubator/ivy/core/trunk/test/repositories/extra-attributes/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/extra-attributes/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/extra-attributes/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/extra-attributes/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/extra-attributes/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/extra-attributes/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/extra-attributes/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,14 +1,14 @@ -<ivyconf> - <conf - defaultCache="${ivy.conf.dir}/cache" +<ivysettings> + <settings + defaultCache="${ivy.settings.dir}/cache" cacheIvyPattern="[organisation]/[module]/[eatt]/[revision]/ivy.xml" cacheArtifactPattern="[organisation]/[module]/[eatt]/[revision]/[artifact]-[platform].[ext]" defaultResolver="default" /> <resolvers> <filesystem name="default"> - <ivy pattern="${ivy.conf.dir}/[module]/[eatt]/[revision]/ivy.xml" /> - <artifact pattern="${ivy.conf.dir}/[module]/[eatt]/[revision]/[artifact]-[platform].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[module]/[eatt]/[revision]/ivy.xml" /> + <artifact pattern="${ivy.settings.dir}/[module]/[eatt]/[revision]/[artifact]-[platform].[ext]" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/ivysettings-1.xml (from r519871, incubator/ivy/core/trunk/test/repositories/ivyconf-1.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/ivysettings-1.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/ivyconf-1.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/ivysettings-1.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/ivyconf-1.xml (original) +++ incubator/ivy/core/trunk/test/repositories/ivysettings-1.xml Mon Mar 19 02:47:57 2007 @@ -1,10 +1,10 @@ -<ivyconf> - <properties file="${ivy.conf.dir}/ivyconf.properties" /> - <conf defaultCache="${cache.dir}" defaultResolver="1"/> +<ivysettings> + <properties file="${ivy.settings.dir}/ivysettings.properties" /> + <settings defaultCache="${cache.dir}" defaultResolver="1"/> <resolvers> <filesystem name="1"> - <ivy pattern="${ivy.conf.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> - <artifact pattern="${ivy.conf.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> + <artifact pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,19 +1,19 @@ -<ivyconf> - <properties file="${ivy.conf.dir}/ivyconf.properties" /> - <conf defaultCache="${cache.dir}" defaultResolver="test"/> +<ivysettings> + <properties file="${ivy.settings.dir}/ivysettings.properties" /> + <settings defaultCache="${cache.dir}" defaultResolver="test"/> <resolvers> <chain name="test"> <filesystem name="1"> - <ivy pattern="${ivy.conf.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> - <artifact pattern="${ivy.conf.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/> + <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> + <artifact pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/> </filesystem> <dual name="2"> <filesystem name="2-ivy"> - <ivy pattern="${ivy.conf.dir}/2/[module]/ivy-[revision].xml"/> + <ivy pattern="${ivy.settings.dir}/2/[module]/ivy-[revision].xml"/> </filesystem> <filesystem name="2-artifact"> - <artifact pattern="${ivy.conf.dir}/2/[module]/[artifact]-[revision].[ext]"/> - <artifact pattern="${ivy.conf.dir}/2/[module]/[artifact].[ext]"/> + <artifact pattern="${ivy.settings.dir}/2/[module]/[artifact]-[revision].[ext]"/> + <artifact pattern="${ivy.settings.dir}/2/[module]/[artifact].[ext]"/> </filesystem> </dual> </chain> @@ -22,4 +22,4 @@ <artifact pattern="build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/m2/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/m2/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/m2/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/m2/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/m2/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/m2/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/m2/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,9 +1,9 @@ -<ivyconf> - <conf defaultCache="build/cache" defaultResolver="m2"/> +<ivysettings> + <settings defaultCache="build/cache" defaultResolver="m2"/> <resolvers> <filesystem name="m2" m2compatible="true"> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/> - <artifact pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/> + <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/multi-ivypattern/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,5 +1,5 @@ -<ivyconf> - <conf defaultCache="build/cache" defaultResolver="multi-ivy"/> +<ivysettings> + <settings defaultCache="build/cache" defaultResolver="multi-ivy"/> <resolvers> <filesystem name="multi-ivy"> <ivy pattern="test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml" /> @@ -7,4 +7,4 @@ <artifact pattern="test/repositories/multi-ivypattern/jars/mod-[revision].jar" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/multirevisions/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/multirevisions/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/multirevisions/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/multirevisions/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/multirevisions/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/multirevisions/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/multirevisions/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,9 +1,9 @@ -<ivyconf> - <conf defaultResolver="LOCAL" /> +<ivysettings> + <settings defaultResolver="LOCAL" /> <resolvers> <filesystem name="LOCAL"> - <ivy pattern="${ivy.conf.dir}/ivy/[module]-[revision].xml" /> - <artifact pattern="${ivy.conf.dir}/jars/[artifact]-[revision].[ext]" /> + <ivy pattern="${ivy.settings.dir}/ivy/[module]-[revision].xml" /> + <artifact pattern="${ivy.settings.dir}/jars/[artifact]-[revision].[ext]" /> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/namespace/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/namespace/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/namespace/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/namespace/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/namespace/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/namespace/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/namespace/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,5 +1,5 @@ -<ivyconf> - <conf defaultCache="build/cache" defaultResolver="ns"/> +<ivysettings> + <settings defaultCache="build/cache" defaultResolver="ns"/> <namespaces> <namespace name="test" chainrules="true"> <rule> @@ -46,9 +46,9 @@ </namespaces> <resolvers> <filesystem name="ns" namespace="test" m2compatible="true"> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/ivy.xml"/> - <ivy pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/> - <artifact pattern="${ivy.conf.dir}/[organisation]/[module]/[revision]/[artifact].[ext]"/> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/ivy.xml"/> + <ivy pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/> + <artifact pattern="${ivy.settings.dir}/[organisation]/[module]/[revision]/[artifact].[ext]"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Copied: incubator/ivy/core/trunk/test/repositories/norev/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/repositories/norev/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/norev/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/repositories/norev/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/repositories/norev/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/repositories/norev/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/repositories/norev/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,12 +1,12 @@ -<ivyconf> - <conf defaultResolver="myresolver"/> +<ivysettings> + <settings defaultResolver="myresolver"/> <resolvers> <url name="myresolver"> - <ivy pattern="${ivy.conf.dir}/[module]/ivy.xml" /> - <artifact pattern="${ivy.conf.dir}/[module]/[artifact].[ext]" /> + <ivy pattern="${ivy.settings.dir}/[module]/ivy.xml" /> + <artifact pattern="${ivy.settings.dir}/[module]/[artifact].[ext]" /> </url> </resolvers> <modules> <module organisation="myorg" name=".*" resolver="myresolver" /> </modules> -</ivyconf> +</ivysettings> Modified: incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml (original) +++ incubator/ivy/core/trunk/test/triggers/ant-build/A/build.xml Mon Mar 19 02:47:57 2007 @@ -6,7 +6,7 @@ <tstamp><format property="tstamp" pattern="yyyyMMDDHHmmss"/></tstamp> <mkdir dir="${basedir}/build"/> <echo message="${tstamp}" file="${basedir}/build/A.jar"/> - <ivy:configure file="${basedir}/../ivyconf.xml"/> + <ivy:configure file="${basedir}/../ivysettings.xml"/> <ivy:resolve file="${basedir}/ivy.xml" /> <ivy:publish resolver="local" artifactspattern="${basedir}/build/[artifact].[ext]" pubrevision="${tstamp}" /> <delete dir="build" /> Copied: incubator/ivy/core/trunk/test/triggers/ant-build/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/triggers/ant-build/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/triggers/ant-build/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/triggers/ant-build/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/triggers/ant-build/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/triggers/ant-build/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/triggers/ant-build/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,15 +1,15 @@ -<ivyconf> - <conf defaultCache="${ivy.conf.dir}/cache" defaultResolver="local"/> +<ivysettings> + <settings defaultCache="${ivy.settings.dir}/cache" defaultResolver="local"/> <triggers> <!-- triggers an ant build just before resolving a dependency with a latest.integration revision --> - <ant-build antfile="${ivy.conf.dir}/[module]/build.xml" target="publish" + <ant-build antfile="${ivy.settings.dir}/[module]/build.xml" target="publish" event="pre-resolve-dependency" filter="revision=latest.integration"/> </triggers> <resolvers> <filesystem name="local"> - <ivy pattern="${ivy.conf.dir}/local/[module]/[artifact].[ext]"/> - <artifact pattern="${ivy.conf.dir}/local/[module]/[artifact].[ext]"/> + <ivy pattern="${ivy.settings.dir}/local/[module]/[artifact].[ext]"/> + <artifact pattern="${ivy.settings.dir}/local/[module]/[artifact].[ext]"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings> Modified: incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml?view=diff&rev=519887&r1=519886&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml (original) +++ incubator/ivy/core/trunk/test/triggers/ant-call/A/build.xml Mon Mar 19 02:47:57 2007 @@ -3,7 +3,7 @@ uri="antlib:org.apache.ivy.ant" /> <target name="resolve"> - <ivy:configure file="../ivyconf.xml"/> + <ivy:configure file="../ivysettings.xml"/> <ivy:resolve file="${basedir}/ivy.xml" /> </target> Copied: incubator/ivy/core/trunk/test/triggers/ant-call/ivysettings.xml (from r519871, incubator/ivy/core/trunk/test/triggers/ant-call/ivyconf.xml) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/triggers/ant-call/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/triggers/ant-call/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/test/triggers/ant-call/ivysettings.xml&r2=519887 ============================================================================== --- incubator/ivy/core/trunk/test/triggers/ant-call/ivyconf.xml (original) +++ incubator/ivy/core/trunk/test/triggers/ant-call/ivysettings.xml Mon Mar 19 02:47:57 2007 @@ -1,5 +1,5 @@ -<ivyconf> - <conf defaultCache="${ivy.conf.dir}/cache" defaultResolver="local"/> +<ivysettings> + <settings defaultCache="${ivy.settings.dir}/cache" defaultResolver="local"/> <triggers> <!-- triggers an ant call just after downloading a zip artifact, prefixing all parameters to the target with 'dep' --> @@ -8,8 +8,8 @@ </triggers> <resolvers> <filesystem name="local"> - <ivy pattern="${ivy.conf.dir}/local/[module]/[artifact].[ext]"/> - <artifact pattern="${ivy.conf.dir}/local/[module]/[artifact].[ext]"/> + <ivy pattern="${ivy.settings.dir}/local/[module]/[artifact].[ext]"/> + <artifact pattern="${ivy.settings.dir}/local/[module]/[artifact].[ext]"/> </filesystem> </resolvers> -</ivyconf> +</ivysettings>
