You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/03/19 09:48:05 UTC
svn commit: r519887 [2/3] - in /incubator/ivy/core/trunk: ./ .settings/ doc/
doc/doc/ doc/doc/configuration/ doc/doc/releasenotes/ doc/doc/resolver/
doc/doc/tutorial/ doc/doc/tutorial/build-repository/ doc/doc/use/
doc/presentations/apache-con-2007/dem...
Copied: incubator/ivy/core/trunk/ivysettings.xml (from r519871, incubator/ivy/core/trunk/ivyconf.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/ivysettings.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/ivyconf.xml (original)
+++ incubator/ivy/core/trunk/ivysettings.xml Mon Mar 19 02:47:57 2007
@@ -1,5 +1,5 @@
-<ivyconf>
- <conf defaultResolver="public" />
+<ivysettings>
+ <settings defaultResolver="public" />
<resolvers>
<!--
we use ivyrep for ivy and some artifacts, and ibiblio for other artifacts
@@ -13,4 +13,4 @@
<artifact pattern="http://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
</url>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivysettings>
\ No newline at end of file
Modified: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml Mon Mar 19 02:47:57 2007
@@ -75,28 +75,28 @@
target: init-advanced
- - - - - - - - - - - - - - - - - -->
<target name="init-advanced">
- <ivy:configure file="${configuration-dir}/ivy-conf-advanced.xml"/>
+ <ivy:configure file="${configuration-dir}/ivysettings-advanced.xml"/>
</target>
<!-- - - - - - - - - - - - - - - - - -
target: init-maven1
- - - - - - - - - - - - - - - - - -->
<target name="init-maven1">
- <ivy:configure file="${configuration-dir}/ivy-conf-maven1.xml"/>
+ <ivy:configure file="${configuration-dir}/ivysettings-maven1.xml"/>
</target>
<!-- - - - - - - - - - - - - - - - - -
target: init-maven2
- - - - - - - - - - - - - - - - - -->
<target name="init-maven2">
- <ivy:configure file="${configuration-dir}/ivy-conf-maven2.xml"/>
+ <ivy:configure file="${configuration-dir}/ivysettings-maven2.xml"/>
</target>
<!-- - - - - - - - - - - - - - - - - -
target: init-basic
- - - - - - - - - - - - - - - - - -->
<target name="init-basic">
- <ivy:configure file="${configuration-dir}/ivy-conf-basic.xml"/>
+ <ivy:configure file="${configuration-dir}/ivysettings-basic.xml"/>
</target>
<!-- =================================
Copied: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivysettings.xml (from r519871, incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivyconf.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivysettings.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivyconf.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven1-ivysettings.xml Mon Mar 19 02:47:57 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<!-- you can override this property to use mirrors
http://mirrors.dotsrc.org/maven2
http://ftp.ggi-project.org/pub/packages/maven2
@@ -102,5 +102,5 @@
namespace="ibiblio-maven"
/>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivysettings.xml (from r519871, incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivyconf.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivysettings.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivyconf.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-maven2-ivysettings.xml Mon Mar 19 02:47:57 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<!-- you can override this property to use mirrors
http://mirrors.dotsrc.org/maven2
http://ftp.ggi-project.org/pub/packages/maven2
@@ -121,4 +121,4 @@
m2compatible="true"
/>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-advanced.xml (from r519871, incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-advanced.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-advanced.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-advanced.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-advanced.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-advanced.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-advanced.xml Mon Mar 19 02:47:57 2007
@@ -1,10 +1,10 @@
-<ivyconf>
- <conf defaultCache="${ivy.cache.dir}"
+<ivysettings>
+ <settings defaultCache="${ivy.cache.dir}"
defaultResolver="local-repository"
defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
- <include file="${ivy.conf.dir}/ivy-maven1-ivyconf.xml" />
- <include file="${ivy.conf.dir}/ivy-maven2-ivyconf.xml" />
+ <include file="${ivy.settings.dir}/ivy-maven1-ivysettings.xml" />
+ <include file="${ivy.settings.dir}/ivy-maven2-ivysettings.xml" />
<resolvers>
<filesystem name="local-repository">
@@ -18,4 +18,4 @@
<resolver ref="ibiblio-maven2" />
</chain>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-basic.xml (from r519871, incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-basic.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-basic.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-basic.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-basic.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-basic.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-basic.xml Mon Mar 19 02:47:57 2007
@@ -1,5 +1,5 @@
-<ivyconf>
- <conf defaultCache="${ivy.cache.dir}"
+<ivysettings>
+ <settings defaultCache="${ivy.cache.dir}"
defaultResolver="libraries"
defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
<resolvers>
@@ -9,4 +9,4 @@
<artifact pattern="${dest.repo.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven1.xml (from r519871, incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-maven1.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven1.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-maven1.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven1.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-maven1.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven1.xml Mon Mar 19 02:47:57 2007
@@ -1,9 +1,9 @@
-<ivyconf>
- <conf defaultCache="${ivy.cache.dir}"
+<ivysettings>
+ <settings defaultCache="${ivy.cache.dir}"
defaultResolver="local-repository"
defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
- <include file="${ivy.conf.dir}/ivy-maven1-ivyconf.xml" />
+ <include file="${ivy.settings.dir}/ivy-maven1-ivysettings.xml" />
<resolvers>
<resolver ref="ibiblio-maven"/>
@@ -12,4 +12,4 @@
<artifact pattern="${dest.repo.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven2.xml (from r519871, incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-maven2.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven2.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-maven2.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven2.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivy-conf-maven2.xml (original)
+++ incubator/ivy/core/trunk/src/example/build-a-ivy-repository/config/ivysettings-maven2.xml Mon Mar 19 02:47:57 2007
@@ -1,9 +1,9 @@
-<ivyconf>
- <conf defaultCache="${ivy.cache.dir}"
+<ivysettings>
+ <settings defaultCache="${ivy.cache.dir}"
defaultResolver="local-repository"
defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
- <include file="${ivy.conf.dir}/ivy-maven2-ivyconf.xml" />
+ <include file="${ivy.settings.dir}/ivy-maven2-ivysettings.xml" />
<resolvers>
<resolver ref="ibiblio-maven2"/>
@@ -12,4 +12,4 @@
<artifact pattern="${dest.repo.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml Mon Mar 19 02:47:57 2007
@@ -5,7 +5,7 @@
<property name="src.dir" value="${basedir}/src" />
<!-- ivy properties used -->
- <property name="ivy.conf.dir" value="../config" />
+ <property name="ivy.settings.dir" value="../config" />
<!-- paths used for compilation and run -->
<path id="lib.path.id">
@@ -20,7 +20,7 @@
target: configure
- - - - - - - - - - - - - - - - - -->
<target name="configure">
- <ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
+ <ivy:configure file="${ivy.settings.dir}/ivysettings.xml" />
</target>
<!-- =================================
Copied: incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivysettings.xml (from r519871, incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivyconf.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivysettings.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivyconf.xml (original)
+++ incubator/ivy/core/trunk/src/example/chained-resolvers/config/ivysettings.xml Mon Mar 19 02:47:57 2007
@@ -1,11 +1,11 @@
-<ivyconf>
- <conf defaultResolver="chain-example"/>
+<ivysettings>
+ <settings defaultResolver="chain-example"/>
<resolvers>
<chain name="chain-example">
<filesystem name="libraries">
- <artifact pattern="${ivy.conf.dir}/repository/[artifact]-[revision].[ext]" />
+ <artifact pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]" />
</filesystem>
<ibiblio name="ibiblio" />
</chain>
</resolvers>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/src/example/dependence/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/build.xml Mon Mar 19 02:47:57 2007
@@ -5,7 +5,7 @@
================================= -->
<target name="clean" description="--> clean directories">
<delete includeemptydirs="true">
- <fileset dir="config" excludes="ivyconf.*" />
+ <fileset dir="config" excludes="ivysettings.*" />
</delete>
<ant dir="standalone" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false" />
<ant dir="depending" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false" />
Copied: incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.properties (from r519871, incubator/ivy/core/trunk/src/example/dependence/config/ivyconf.properties)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.properties?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/dependence/config/ivyconf.properties&r1=519871&p2=incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.properties&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/config/ivyconf.properties (original)
+++ incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.properties Mon Mar 19 02:47:57 2007
@@ -1 +1 @@
-repository.dir=${ivy.conf.dir}/repository
+repository.dir=${ivy.settings.dir}/repository
Copied: incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml (from r519871, incubator/ivy/core/trunk/src/example/dependence/config/ivyconf.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/dependence/config/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/config/ivyconf.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/config/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}/ivy-cache" defaultResolver="libraries"/>
+<ivysettings>
+ <properties file="${ivy.settings.dir}/ivysettings.properties"/>
+ <settings defaultCache="${ivy.settings.dir}/ivy-cache" defaultResolver="libraries"/>
<resolvers>
<filesystem name="projects">
<artifact pattern="${repository.dir}/[artifact]-[revision].[ext]" />
@@ -11,4 +11,4 @@
<modules>
<module organisation="apache" name=".*" resolver="projects"/>
</modules>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/src/example/dependence/depending/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/depending/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/depending/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/depending/build.xml Mon Mar 19 02:47:57 2007
@@ -6,8 +6,8 @@
<property name="src.dir" value="${basedir}/src" />
<!-- ivy properties used -->
- <property name="ivy.conf.dir" value="../config" />
- <property file="${ivy.conf.dir}/ivyconf.properties" />
+ <property name="ivy.settings.dir" value="../config" />
+ <property file="${ivy.settings.dir}/ivysettings.properties" />
<!-- paths used for compilation and run -->
<path id="lib.path.id">
@@ -21,7 +21,7 @@
target: configure
- - - - - - - - - - - - - - - - - -->
<target name="configure">
- <ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
+ <ivy:configure file="${ivy.settings.dir}/ivysettings.xml" />
</target>
<!-- =================================
Modified: incubator/ivy/core/trunk/src/example/dependence/standalone/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/standalone/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/standalone/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/standalone/build.xml Mon Mar 19 02:47:57 2007
@@ -6,8 +6,8 @@
<property name="src.dir" value="${basedir}/src" />
<!-- ivy properties used -->
- <property name="ivy.conf.dir" value="../config" />
- <property file="${ivy.conf.dir}/ivyconf.properties" />
+ <property name="ivy.settings.dir" value="../config" />
+ <property file="${ivy.settings.dir}/ivysettings.properties" />
<!-- paths used for compilation and run -->
<path id="lib.path.id">
@@ -22,7 +22,7 @@
target: configure
- - - - - - - - - - - - - - - - - -->
<target name="configure">
- <ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
+ <ivy:configure file="${ivy.settings.dir}/ivysettings.xml" />
</target>
<!-- =================================
Copied: incubator/ivy/core/trunk/src/example/dual/config/ivysettings.xml (from r519871, incubator/ivy/core/trunk/src/example/dual/config/ivyconf.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/config/ivysettings.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/src/example/dual/config/ivyconf.xml&r1=519871&p2=incubator/ivy/core/trunk/src/example/dual/config/ivysettings.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dual/config/ivyconf.xml (original)
+++ incubator/ivy/core/trunk/src/example/dual/config/ivysettings.xml Mon Mar 19 02:47:57 2007
@@ -1,11 +1,11 @@
-<ivyconf>
- <conf defaultResolver="dual-example"/>
+<ivysettings>
+ <settings defaultResolver="dual-example"/>
<resolvers>
<dual name="dual-example">
<filesystem name="ivys">
- <ivy pattern="${ivy.conf.dir}/../repository/[module]-ivy-[revision].xml" />
+ <ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml" />
</filesystem>
<ibiblio name="ibiblio" />
</dual>
</resolvers>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/src/example/dual/project/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/dual/project/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dual/project/build.xml Mon Mar 19 02:47:57 2007
@@ -5,7 +5,7 @@
<property name="src.dir" value="${basedir}/src" />
<!-- ivy properties used -->
- <property name="ivy.conf.dir" value="../config" />
+ <property name="ivy.settings.dir" value="../config" />
<!-- paths used for compilation and run -->
<path id="lib.path.id">
@@ -18,10 +18,10 @@
<!-- - - - - - - - - - - - - - - - - -
target: configure
- configures ivy with the appropriate ivyconf.xml file
+ configures ivy with the appropriate ivysettings.xml file
- - - - - - - - - - - - - - - - - -->
<target name="configure">
- <ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
+ <ivy:configure file="${ivy.settings.dir}/ivysettings.xml" />
</target>
<!-- =================================
Modified: incubator/ivy/core/trunk/src/example/go-ivy/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/go-ivy/build.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/go-ivy/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/go-ivy/build.xml Mon Mar 19 02:47:57 2007
@@ -48,7 +48,7 @@
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
</target>
Modified: incubator/ivy/core/trunk/src/example/multi-project/common/common.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/common/common.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/example/multi-project/common/common.xml (original)
+++ incubator/ivy/core/trunk/src/example/multi-project/common/common.xml Mon Mar 19 02:47:57 2007
@@ -28,8 +28,8 @@
<property name="ivy.local.default.root" value="${repository.dir}/local"/>
<property name="ivy.shared.default.root" value="${repository.dir}/shared"/>
- <!-- here is how we would have configured ivy if we had our own ivyconf file
- <ivy:configure file="${common.dir}/ivyconf.xml" />
+ <!-- here is how we would have configured ivy if we had our own ivysettings file
+ <ivy:configure file="${common.dir}/ivysettings.xml" />
-->
</target>
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy.java Mon Mar 19 02:47:57 2007
@@ -74,7 +74,7 @@
*
* Here is one typical usage:
* Ivy ivy = Ivy.newInstance();
- * ivy.configure(new URL("ivyconf.xml"));
+ * ivy.configure(new URL("ivysettings.xml"));
* ivy.resolve(new URL("ivy.xml"));
*
* @author Xavier Hanin
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java Mon Mar 19 02:47:57 2007
@@ -66,7 +66,7 @@
* class used to launch ivy as a standalone tool
* arguments are :
* -conf <conffile> : indicates the path to the ivy configuration file
- * ivyconf.xml is assumed if not given
+ * ivysettings.xml is assumed if not given
* -cache <cachedir> : indicates the path to the cache directory
* cache is assumed if not given
* -ivy <ivyfile> : indicates the path to the ivy file to use
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntCallTrigger.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntCallTrigger.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntCallTrigger.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntCallTrigger.java Mon Mar 19 02:47:57 2007
@@ -40,7 +40,7 @@
* This trigger only works when ivy is called from an ant build file, otherwise the trigger
* only log a failure.
*
- * Example of use in an ivyconf file:
+ * Example of use in an ivysettings file:
* <ant-call-trigger event="post-download-artifact" filter="type=zip"
* target="unzip"/>
* Triggers a call to the target "unzip" for any downloaded artifact of type zip
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java Mon Mar 19 02:47:57 2007
@@ -36,7 +36,7 @@
/**
- * Configure Ivy with an ivyconf.xml file
+ * Configure Ivy with an ivysettings.xml file
*
* @author Xavier Hanin
*
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java Mon Mar 19 02:47:57 2007
@@ -299,8 +299,8 @@
}
private String getDefaultSettingsDir() {
- String ivyconfLocation = getDefaultSettingsURL().toExternalForm();
- return ivyconfLocation.substring(0, ivyconfLocation.length() - "ivysettings.xml".length() - 1);
+ String ivysettingsLocation = getDefaultSettingsURL().toExternalForm();
+ return ivysettingsLocation.substring(0, ivysettingsLocation.length() - "ivysettings.xml".length() - 1);
}
private static URL getSettingsURL(String file) {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java Mon Mar 19 02:47:57 2007
@@ -30,7 +30,7 @@
assertFalse(new File("test/triggers/ant-build/A/A.jar").exists());
Ivy ivy = new Ivy();
- ivy.configure(new File("test/triggers/ant-build/ivyconf.xml"));
+ ivy.configure(new File("test/triggers/ant-build/ivysettings.xml"));
ResolveReport r = ivy.resolve(new File("test/triggers/ant-build/B/ivy.xml"));
assertFalse(r.hasError());
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java Mon Mar 19 02:47:57 2007
@@ -33,7 +33,7 @@
protected void setUp() throws Exception {
createCache();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_prop = new IvyArtifactProperty();
_prop.setProject(_project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java Mon Mar 19 02:47:57 2007
@@ -31,7 +31,7 @@
protected void setUp() throws Exception {
createCache();
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_buildNumber = new IvyBuildNumber();
_buildNumber.setProject(project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java Mon Mar 19 02:47:57 2007
@@ -36,7 +36,7 @@
protected void setUp() throws Exception {
createCache();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_fileset = new IvyCacheFileset();
_fileset.setProject(_project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java Mon Mar 19 02:47:57 2007
@@ -35,7 +35,7 @@
protected void setUp() throws Exception {
createCache();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_path = new IvyCachePath();
_path.setProject(_project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java Mon Mar 19 02:47:57 2007
@@ -39,7 +39,7 @@
}
public void testFile() throws Exception {
- _configure.setFile(new File("test/repositories/ivyconf.xml"));
+ _configure.setFile(new File("test/repositories/ivysettings.xml"));
_configure.execute();
@@ -49,14 +49,14 @@
assertNotNull(settings);
assertEquals(new File("build/cache"), settings.getDefaultCache());
- assertEquals(new File("test/repositories/ivyconf.xml").getAbsolutePath(), settings.getVariables().get("ivy.conf.file"));
- assertEquals(new File("test/repositories/ivyconf.xml").toURL().toExternalForm(), settings.getVariables().get("ivy.conf.url"));
- assertEquals(new File("test/repositories").getAbsolutePath(), settings.getVariables().get("ivy.conf.dir"));
+ assertEquals(new File("test/repositories/ivysettings.xml").getAbsolutePath(), settings.getVariables().get("ivy.settings.file"));
+ assertEquals(new File("test/repositories/ivysettings.xml").toURL().toExternalForm(), settings.getVariables().get("ivy.settings.url"));
+ assertEquals(new File("test/repositories").getAbsolutePath(), settings.getVariables().get("ivy.settings.dir"));
assertEquals("myvalue", settings.getVariables().get("myproperty"));
}
public void testURL() throws Exception {
- String confUrl = new File("test/repositories/ivyconf.xml").toURL().toExternalForm();
+ String confUrl = new File("test/repositories/ivysettings.xml").toURL().toExternalForm();
String confDirUrl = new File("test/repositories").toURL().toExternalForm();
if (confDirUrl.endsWith("/")) {
confDirUrl = confDirUrl.substring(0, confDirUrl.length() - 1);
@@ -68,13 +68,13 @@
IvySettings settings = getIvyInstance().getSettings();
assertEquals(new File("build/cache"), settings.getDefaultCache());
- assertEquals(confUrl, settings.getVariables().get("ivy.conf.url"));
- assertEquals(confDirUrl, settings.getVariables().get("ivy.conf.dir"));
+ assertEquals(confUrl, settings.getVariables().get("ivy.settings.url"));
+ assertEquals(confDirUrl, settings.getVariables().get("ivy.settings.dir"));
assertEquals("myvalue", settings.getVariables().get("myproperty"));
}
public void testAntProperties() throws Exception {
- String confUrl = IvyConfigureTest.class.getResource("ivyconf-test.xml").toExternalForm();
+ String confUrl = IvyConfigureTest.class.getResource("ivysettings-test.xml").toExternalForm();
_configure.setUrl(confUrl);
_configure.execute();
@@ -87,7 +87,7 @@
}
public void testOverrideVariables() throws Exception {
- String confUrl = IvyConfigureTest.class.getResource("ivyconf-props.xml").toExternalForm();
+ String confUrl = IvyConfigureTest.class.getResource("ivysettings-props.xml").toExternalForm();
_configure.setUrl(confUrl);
_configure.execute();
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java Mon Mar 19 02:47:57 2007
@@ -45,7 +45,7 @@
cleanRep();
createCache();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_project.setProperty("build", "build/test/deliver");
_deliver = new IvyDeliver();
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java Mon Mar 19 02:47:57 2007
@@ -31,7 +31,7 @@
protected void setUp() throws Exception {
createCache();
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_findRevision = new IvyFindRevision();
_findRevision.setProject(project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java Mon Mar 19 02:47:57 2007
@@ -31,7 +31,7 @@
protected void setUp() throws Exception {
createCache();
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_findModules = new IvyListModules();
_findModules.setProject(project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java Mon Mar 19 02:47:57 2007
@@ -44,7 +44,7 @@
cleanRep();
createCache();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_project.setProperty("build", "build/test/publish");
_publish = new IvyPublish();
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java Mon Mar 19 02:47:57 2007
@@ -32,7 +32,7 @@
protected void setUp() throws Exception {
createCache();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_report = new IvyReport();
_report.setTaskName("report");
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java Mon Mar 19 02:47:57 2007
@@ -31,7 +31,7 @@
protected void setUp() throws Exception {
createCache();
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf-1.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings-1.xml");
_report = new IvyRepositoryReport();
_report.setProject(project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java Mon Mar 19 02:47:57 2007
@@ -36,7 +36,7 @@
protected void setUp() throws Exception {
createCache();
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_resolve = new IvyResolve();
_resolve.setProject(project);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java Mon Mar 19 02:47:57 2007
@@ -40,7 +40,7 @@
createCache();
cleanTestLib();
_project = new Project();
- _project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_retrieve = new IvyRetrieve();
_retrieve.setProject(_project);
@@ -155,7 +155,7 @@
public void testWithAPreviousResolve() throws Exception {
// first we do a resolve in another project
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
@@ -176,7 +176,7 @@
// test case for IVY-304
// first we do a resolve with useOrigin=true in another project
Project project = new Project();
- project.setProperty("ivy.conf.file", "test/repositories/ivyconf.xml");
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-props.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivyconf-props.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-props.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivyconf-props.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-props.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivyconf-props.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-props.xml Mon Mar 19 02:47:57 2007
@@ -1,3 +1,3 @@
-<ivyconf>
- <properties file="${ivy.conf.dir}/ivyconf-props.properties"/>
-</ivyconf>
+<ivysettings>
+ <properties file="${ivy.settings.dir}/ivysettings-props.properties"/>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-test.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivyconf-test.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-test.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivyconf-test.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-test.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivyconf-test.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivysettings-test.xml Mon Mar 19 02:47:57 2007
@@ -1,11 +1,11 @@
-<ivyconf>
- <conf defaultCache="${myproperty}" defaultResolver="test"/>
+<ivysettings>
+ <settings defaultCache="${myproperty}" defaultResolver="test"/>
<resolvers>
<filesystem name="test">
- <ivy pattern="${ivy.conf.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>
- <artifact pattern="${ivy.conf.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
- <ivy pattern="${ivy.conf.dir}/2/[module]/ivy-[revision].xml"/>
- <artifact pattern="${ivy.conf.dir}/2/[module]/[artifact]-[revision].[type]"/>
+ <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ <ivy pattern="${ivy.settings.dir}/2/[module]/ivy-[revision].xml"/>
+ <artifact pattern="${ivy.settings.dir}/2/[module]/[artifact]-[revision].[type]"/>
</filesystem>
</resolvers>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java Mon Mar 19 02:47:57 2007
@@ -31,7 +31,7 @@
public void testSimple() throws Exception {
Ivy ivy = Ivy.newInstance();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"),
ivy.getSettings().getDefaultResolver().getName(),
@@ -43,7 +43,7 @@
public void testDependencies() throws Exception {
Ivy ivy = Ivy.newInstance();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),
ivy.getSettings().getDefaultResolver().getName(),
@@ -58,7 +58,7 @@
public void testNotTransitive() throws Exception {
Ivy ivy = Ivy.newInstance();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),
ivy.getSettings().getDefaultResolver().getName(),
@@ -73,7 +73,7 @@
public void testRegexpMatcher() throws Exception {
Ivy ivy = Ivy.newInstance();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", ".*", ".*"),
"1",
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Mon Mar 19 02:47:57 2007
@@ -74,7 +74,7 @@
protected void setUp() throws Exception {
_ivy = Ivy.newInstance();
- _ivy.configure(new File("test/repositories/ivyconf.xml"));
+ _ivy.configure(new File("test/repositories/ivysettings.xml"));
_settings = _ivy.getSettings();
_cache = new File("build/cache");
_cacheManager = _ivy.getCacheManager(_cache);
@@ -213,7 +213,7 @@
public void testResolveNoRevisionInPattern() throws Exception {
// module1 depends on latest version of module2, for which there is no revision in the pattern
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/norev/ivyconf.xml").toURL());
+ ivy.configure(new File("test/repositories/norev/ivysettings.xml").toURL());
ResolveReport report = ivy.resolve(new File("test/repositories/norev/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -232,7 +232,7 @@
// test case for IVY-258
// module1 depends on latest version of module2, which contains no revision in its ivy file, nor in the pattern
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-258/ivyconf.xml").toURL());
+ ivy.configure(new File("test/repositories/IVY-258/ivysettings.xml").toURL());
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-258/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertFalse(report.hasError());
@@ -246,7 +246,7 @@
public void testResolveRequiresIvyFile() throws Exception {
// mod1.1 depends on mod1.2, mod1.2 has no ivy file
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
((FileSystemResolver)ivy.getSettings().getResolver("1")).setAllownomd(false);
ResolveReport report = ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
getResolveOptions(new String[] {"*"}));
@@ -294,7 +294,7 @@
// we now use a badly configured ivy, so that it can't find module in repository
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/bugIVY-56/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/bugIVY-56/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
getResolveOptions(ivy.getSettings(), new String[] {"*"}));
@@ -364,7 +364,7 @@
public void testFromCacheOnly() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/bugIVY-56/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/bugIVY-56/ivysettings.xml"));
// ResolveReport report = ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
// getResolveOptions(new String[] {"*"}));
@@ -384,7 +384,7 @@
public void testChangeCacheLayout() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
ivy.getSettings().setCacheIvyPattern("[module]/ivy.xml");
ivy.getSettings().setCacheArtifactPattern("[artifact].[ext]");
@@ -648,7 +648,7 @@
public void testResolveSeveralDefaultWithArtifactsAndConfs() throws Exception {
// test case for IVY-283
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-283/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-283/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-283/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertFalse(report.hasError());
@@ -666,7 +666,7 @@
public void testResolveSeveralDefaultWithArtifactsAndConfs2() throws Exception {
// second test case for IVY-283
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-283/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-283/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-283/ivy-d.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertFalse(report.hasError());
@@ -1206,7 +1206,7 @@
// x and z depends on commons-lang 1.0.1
// y depends on commons-lang 2.0
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-264/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-264/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-264/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertFalse(report.hasError());
@@ -1904,7 +1904,7 @@
public void testVersionRange2() throws Exception {
// mod 1.4 depends on mod1.2 [1.5,2.0[
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/1/org1/mod1.4/ivys/ivy-1.0.3.xml").toURL(),
getResolveOptions(new String[] {"default"}));
assertTrue(report.hasError());
@@ -1942,7 +1942,7 @@
public void testIVY56() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/bugIVY-56/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/bugIVY-56/ivysettings.xml"));
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-56.xml"),
getResolveOptions(new String[] {"default"}));
@@ -2059,7 +2059,7 @@
public void testBug148() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/bug148/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/bug148/ivysettings.xml"));
ivy.resolve(ResolveTest.class.getResource("ivy-148.xml"), getResolveOptions(new String[] {"*"}));
@@ -2071,7 +2071,7 @@
public void testBug148b() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/bug148/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/bug148/ivysettings.xml"));
ivy.resolve(ResolveTest.class.getResource("ivy-148b.xml"), getResolveOptions(new String[] {"*"}));
@@ -2083,7 +2083,7 @@
public void testBadFiles() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/badfile/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/badfile/ivysettings.xml"));
try {
ivy.resolve(new File("test/repositories/badfile/ivys/ivy-badorg.xml").toURL(), getResolveOptions(new String[] {"*"}));
@@ -2185,7 +2185,7 @@
public void testConfigurationMapping1() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/1/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
@@ -2201,7 +2201,7 @@
public void testConfigurationMapping2() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/2/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
@@ -2217,7 +2217,7 @@
public void testConfigurationMapping3() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/3/ivy.xml").toURL(),
getResolveOptions(new String[] {"buildtime"}));
@@ -2233,7 +2233,7 @@
public void testConfigurationMapping4() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/4/ivy.xml").toURL(),
getResolveOptions(new String[] {"default"}));
@@ -2249,7 +2249,7 @@
public void testConfigurationMapping5() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/5/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}));
@@ -2265,7 +2265,7 @@
public void testConfigurationMapping6() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/6/ivy.xml").toURL(),
getResolveOptions(new String[] {"default","buildtime"}));
@@ -2281,7 +2281,7 @@
public void testConfigurationMapping7() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/IVY-84/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/IVY-84/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/IVY-84/tests/7/ivy.xml").toURL(),
getResolveOptions(new String[] {"buildtime","default"}));
@@ -2444,7 +2444,7 @@
public void testResolveMaven2() throws Exception {
// test3 depends on test2 which depends on test
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/m2/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/m2/org/apache/test3/1.0/test3-1.0.pom").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -2467,7 +2467,7 @@
// test case for IVY-418
// test-classifier depends on test-classified with classifier asl
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/m2/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/m2/org/apache/test-classifier/1.0/test-classifier-1.0.pom").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -2486,7 +2486,7 @@
public void testNamespaceMapping() throws Exception {
// the dependency is in another namespace
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/namespace/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/namespace/ivysettings.xml"));
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-namespace.xml"),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -2505,7 +2505,7 @@
public void testNamespaceMapping2() throws Exception {
// the dependency is in another namespace and has itself a dependency on a module available in the same namespace
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/namespace/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/namespace/ivysettings.xml"));
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-namespace2.xml"),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -2527,7 +2527,7 @@
public void testNamespaceMapping3() throws Exception {
// same as 2 but with poms
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/namespace/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/namespace/ivysettings.xml"));
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-namespace3.xml"),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -2550,7 +2550,7 @@
// same as 2 but with incorrect dependency asked: the first ivy file asks for a dependency
// in the resolver namespace and not the system one: this should fail
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/namespace/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/namespace/ivysettings.xml"));
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-namespace4.xml"),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -2564,7 +2564,7 @@
public void testIVY151() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/multirevisions/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/multirevisions/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/multirevisions/ivy.xml").toURL(),
getResolveOptions(new String[] {"compile", "test"}));
@@ -2626,7 +2626,7 @@
public void testExtraAttributes() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/extra-attributes/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/extra-attributes/ivysettings.xml"));
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-extra-att.xml"),
getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false));
@@ -2639,7 +2639,7 @@
public void testBranches1() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/branches/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/branches/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/branches/bar/bar1/trunk/1/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}).setValidate(false));
@@ -2650,7 +2650,7 @@
public void testBranches2() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/branches/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/branches/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/branches/bar/bar1/trunk/2/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}).setValidate(false));
@@ -2661,7 +2661,7 @@
public void testBranches3() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/branches/ivyconf-defaultbranch1.xml"));
+ ivy.configure(new File("test/repositories/branches/ivysettings-defaultbranch1.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/branches/bar/bar1/trunk/1/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}).setValidate(false));
@@ -2672,7 +2672,7 @@
public void testBranches4() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/branches/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/branches/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/branches/bar/bar1/trunk/3/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}).setValidate(false));
@@ -2684,7 +2684,7 @@
public void testBranches5() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/branches/ivyconf-fooonbranch1.xml"));
+ ivy.configure(new File("test/repositories/branches/ivysettings-fooonbranch1.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/branches/bar/bar1/trunk/3/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}).setValidate(false));
@@ -2697,7 +2697,7 @@
public void testExternalArtifacts() throws Exception {
Ivy ivy = Ivy.newInstance();
ivy.getSettings().setVariable("test.base.url", new File("test/repositories/external-artifacts").toURL().toString());
- ivy.configure(new File("test/repositories/external-artifacts/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/external-artifacts/ivysettings.xml"));
ResolveReport report = ivy.resolve(new File("test/repositories/external-artifacts/ivy.xml").toURL(),
getResolveOptions(new String[] {"*"}).setValidate(false));
@@ -2743,7 +2743,7 @@
public void testResolveWithMultipleIvyPatterns() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/multi-ivypattern/ivyconf.xml"));
+ ivy.configure(new File("test/repositories/multi-ivypattern/ivysettings.xml"));
ModuleRevisionId module = ModuleRevisionId.newInstance("org1", "mod1.1", "1.+");
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/badcacheconf.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/badcacheconf.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/badcacheconf.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/badcacheconf.xml Mon Mar 19 02:47:57 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<conf defaultCache="build/cache" defaultResolver="default"/>
<resolvers>
<filesystem name="default">
@@ -6,4 +6,4 @@
<artifact pattern="[organisation]/[module]/[type]s/[artifact]-[revision].[ext]" />
</filesystem>
</resolvers>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/dualchainresolverconf.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/dualchainresolverconf.xml?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/dualchainresolverconf.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/dualchainresolverconf.xml Mon Mar 19 02:47:57 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<conf defaultCache="build/cache" defaultResolver="default"/>
<resolvers>
<dual name="default">
@@ -20,4 +20,4 @@
</chain>
</dual>
</resolvers>
-</ivyconf>
+</ivysettings>
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java Mon Mar 19 02:47:57 2007
@@ -37,7 +37,7 @@
public RetrieveTest() 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/core/settings/ConfigureTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java Mon Mar 19 02:47:57 2007
@@ -37,7 +37,7 @@
public void testTypedefWithCustomClasspath() throws Exception {
Ivy ivy = new Ivy();
ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings").toURL().toString());
- ivy.configure(ConfigureTest.class.getResource("ivyconf-custom-typedef.xml"));
+ ivy.configure(ConfigureTest.class.getResource("ivysettings-custom-typedef.xml"));
DependencyResolver custom = ivy.getSettings().getResolver("custom");
assertNotNull(custom);
@@ -47,7 +47,7 @@
public void testTypedefWithCustomClasspathWithFile() throws Exception {
Ivy ivy = new Ivy();
ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings").toString());
- ivy.configure(ConfigureTest.class.getResource("ivyconf-custom-typedef2.xml"));
+ ivy.configure(ConfigureTest.class.getResource("ivysettings-custom-typedef2.xml"));
DependencyResolver custom = ivy.getSettings().getResolver("custom");
assertNotNull(custom);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java Mon Mar 19 02:47:57 2007
@@ -37,7 +37,7 @@
configureURLHandler();
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(new URL("http://incubator.apache.org/ivy/test/ivyconf-include-http-url.xml"));
+ parser.parse(new URL("http://incubator.apache.org/ivy/test/ivysettings-include-http-url.xml"));
DependencyResolver resolver = settings.getResolver("ivyrep");
assertNotNull(resolver);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java?view=diff&rev=519887&r1=519886&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java Mon Mar 19 02:47:57 2007
@@ -47,7 +47,7 @@
public void test() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-test.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-test.xml"));
File defaultCache = settings.getDefaultCache();
assertNotNull(defaultCache);
@@ -107,7 +107,7 @@
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
try {
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-no-org-in-module.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-no-org-in-module.xml"));
fail("no organisation in module is supposed to raise an exception");
} catch (ParseException e) {
assertTrue("bad exception message: "+e.getMessage(), e.getMessage().indexOf("'organisation'") != -1);
@@ -118,7 +118,7 @@
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
try {
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-no-name-in-module.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-no-name-in-module.xml"));
fail("no name in module is supposed to raise an exception");
} catch (ParseException e) {
assertTrue("bad exception message: "+e.getMessage(), e.getMessage().indexOf("'name'") != -1);
@@ -128,7 +128,7 @@
public void testTypedef() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-typedef.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-typedef.xml"));
DependencyResolver mock = settings.getResolver("mock3");
assertNotNull(mock);
@@ -151,7 +151,7 @@
public void testStatuses() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-status.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-status.xml"));
assertEquals("bronze", settings.getStatusManager().getDefaultStatus());
assertEquals(0, settings.getStatusManager().getPriority("gold"));
@@ -165,7 +165,7 @@
public void testConflictManager() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-conflict-manager.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-conflict-manager.xml"));
assertEquals("latest-time", settings.getConflictManager(new ModuleId("apache", "ivyde")).getName());
assertEquals("all", settings.getConflictManager(new ModuleId("apache", "ant")).getName());
@@ -174,7 +174,7 @@
public void testVersionMatchers1() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-vmatcher1.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-vmatcher1.xml"));
VersionMatcher mock = settings.getVersionMatcher("vmock");
assertNotNull(mock);
@@ -192,7 +192,7 @@
public void testVersionMatchers2() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-vmatcher2.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-vmatcher2.xml"));
VersionMatcher mock = settings.getVersionMatcher("vmock");
assertNotNull(mock);
@@ -208,7 +208,7 @@
public void testRef() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-ref.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-ref.xml"));
DependencyResolver internal = settings.getResolver("internal");
assertNotNull(internal);
@@ -244,7 +244,7 @@
public void testMacro() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-macro.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro.xml"));
DependencyResolver def = settings.getResolver("default");
assertNotNull(def);
@@ -290,7 +290,7 @@
// test case for IVY-319
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-macro+ref.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro+ref.xml"));
DependencyResolver shared = settings.getResolver("shared");
assertNotNull(shared);
@@ -311,7 +311,7 @@
public void testInclude() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-include.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-include.xml"));
DependencyResolver def = settings.getResolver("default");
assertNotNull(def);
@@ -348,14 +348,14 @@
public void testParser() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-parser.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-parser.xml"));
assertEquals(ModuleDescriptorParserRegistryTest.MyParser.class.getName(), ModuleDescriptorParserRegistry.getInstance().getParsers()[0].getClass().getName());
}
public void testOutputter() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivyconf-outputter.xml"));
+ parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-outputter.xml"));
//System.out.println(Arrays.asList(ivy.getReportOutputters()));
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-conflict-manager.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-conflict-manager.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-conflict-manager.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-conflict-manager.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-conflict-manager.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-conflict-manager.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-conflict-manager.xml Mon Mar 19 02:47:57 2007
@@ -1,6 +1,6 @@
-<ivyconf>
+<ivysettings>
<modules>
<module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
<module organisation="apache" name=".*" conflict-manager="all"/>
</modules>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-custom-typedef.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-custom-typedef.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-custom-typedef.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef.xml Mon Mar 19 02:47:57 2007
@@ -1,7 +1,7 @@
-<ivyconf>
+<ivysettings>
<classpath url="${ivy.custom.test.dir}/custom-resolver.jar"/>
<typedef name="custom" classname="org.apache.ivy.plugins.resolver.CustomResolver"/>
<resolvers>
<custom name="custom"/>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef2.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-custom-typedef2.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef2.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-custom-typedef2.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef2.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-custom-typedef2.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef2.xml Mon Mar 19 02:47:57 2007
@@ -1,7 +1,7 @@
-<ivyconf>
+<ivysettings>
<classpath file="${ivy.custom.test.dir}/custom-resolver.jar"/>
<typedef name="custom" classname="org.apache.ivy.plugins.resolver.CustomResolver"/>
<resolvers>
<custom name="custom"/>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-include.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-include.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-include.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include.xml Mon Mar 19 02:47:57 2007
@@ -1,6 +1,6 @@
-<ivyconf>
- <include file="test/java/org/apache/ivy/core/settings/ivyconf-macro.xml"/>
+<ivysettings>
+ <include file="test/java/org/apache/ivy/core/settings/ivysettings-macro.xml"/>
<resolvers>
<mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro+ref.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-macro+ref.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro%2Bref.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-macro%2Bref.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro%2Bref.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-macro+ref.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro+ref.xml Mon Mar 19 02:47:57 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<macrodef name="myresolver">
<attribute name="name"/>
<filesystem name="@{name}" m2compatible="true" checkconsistency="true" checkmodified="true" allownomd="false">
@@ -13,4 +13,4 @@
<resolver ref="shared"/>
</chain>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-macro.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-macro.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-macro.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro.xml Mon Mar 19 02:47:57 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<macrodef name="mymacro">
<attribute name="mymainrep"/>
<attribute name="mysecondrep"/>
@@ -22,4 +22,4 @@
mysecondrep="path/to/secondrep"
myseconddirlayout="[module]/[type]s"/>
</resolvers>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-name-in-module.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-no-name-in-module.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-name-in-module.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-no-name-in-module.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-name-in-module.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-no-name-in-module.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-name-in-module.xml Mon Mar 19 02:47:57 2007
@@ -1,5 +1,5 @@
-<ivyconf>
+<ivysettings>
<modules>
<module organisation=".*" branch="internal"/>
</modules>
-</ivyconf>
+</ivysettings>
Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-org-in-module.xml (from r519871, incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-no-org-in-module.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-org-in-module.xml?view=diff&rev=519887&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-no-org-in-module.xml&r1=519871&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-org-in-module.xml&r2=519887
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-no-org-in-module.xml (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-no-org-in-module.xml Mon Mar 19 02:47:57 2007
@@ -1,5 +1,5 @@
-<ivyconf>
+<ivysettings>
<modules>
<module name=".*" branch="internal"/>
</modules>
-</ivyconf>
+</ivysettings>