Author: maartenc
Date: Fri Mar 23 23:22:16 2012
New Revision: 1304659
URL: http://svn.apache.org/viewvc?rev=1304659&view=rev
Log:
DOCUMENTATION: remove deprecated defaultCache setting from examples (IVY-1273)
(thanks to Joseph Boyd)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/doc/settings.html
ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html
ant/ivy/core/trunk/doc/tutorial/dependence.html
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml
ant/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Mar 23 23:22:16 2012
@@ -124,6 +124,7 @@ for detailed view of each issue, please
trunk
=====================================
+- DOCUMENTATION: remove deprecated defaultCache setting from examples
(IVY-1273) (thanks to Joseph Boyd)
- DOCUMENTATION: link to FAQ is incorrect in distribution files (IVY-793)
(thanks to Joseph Boyd)
- DOCUMENTATION: The tag version-matchers is missing attribute in
documentation (IVY-1292) (thanks to Per Arnold Blaasmo)
- DOCUMENTATION: wrong default resolver documented on the 'How does it work'
page (IVY-1265)
Modified: ant/ivy/core/trunk/doc/settings.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings.html?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings.html (original)
+++ ant/ivy/core/trunk/doc/settings.html Fri Mar 23 23:22:16 2012
@@ -33,7 +33,8 @@ Here is an example of the settings file:
<code type="xml">
<ivysettings>
<properties file="${ivy.settings.dir}/ivysettings-file.properties" />
- <settings defaultCache="${cache.dir}" defaultResolver="ibiblio"
checkUpToDate="false" />
+ <settings defaultResolver="ibiblio" />
+ <caches defaultCacheDir="${cache.dir}" checkUpToDate="false" />
<resolvers>
<ibiblio name="ibiblio" />
<filesystem name="internal">
Modified: ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html Fri Mar 23
23:22:16 2012
@@ -32,9 +32,9 @@ The ivy settings file that we will use i
<code type="xml">
<ivysettings>
- <settings defaultCache="${ivy.cache.dir}/no-namespace"
- defaultResolver="libraries"
+ <settings defaultResolver="libraries"
defaultConflictManager="all" /> <!-- in order
to get all revisions without any eviction -->
+ <caches defaultCacheDir="${ivy.cache.dir}/no-namespace" />
<resolvers>
<ibiblio name="libraries" m2compatible="true" />
<filesystem name="my-repository">
Modified: ant/ivy/core/trunk/doc/tutorial/dependence.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/dependence.html?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/dependence.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/dependence.html Fri Mar 23 23:22:16 2012
@@ -83,7 +83,8 @@ Let's have a look at the <tt>ivysettings
<code>
<ivysettings>
<properties file="${ivy.settings.dir}/ivysettings.properties"/>
- <settings defaultCache="${ivy.settings.dir}/ivy-cache"
defaultResolver="libraries"/>
+ <settings defaultResolver="libraries" />
+ <caches defaultCacheDir="${ivy.settings.dir}/ivy-cache" />
<resolvers>
<filesystem name="projects">
<artifact
pattern="${repository.dir}/[artifact]-[revision].[ext]" />
Modified:
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
(original)
+++
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
Fri Mar 23 23:22:16 2012
@@ -17,9 +17,9 @@
under the License.
-->
<ivysettings>
- <settings defaultCache="${ivy.cache.dir}/advanced"
- defaultResolver="my-repository"
+ <settings defaultResolver="my-repository"
defaultConflictManager="all" /> <!-- in order to get
all revisions without any eviction -->
+ <caches defaultCacheDir="${ivy.cache.dir}/advanced" />
<!--
You can override this property to use one of the mirrors listed on
Modified:
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml
(original)
+++
ant/ivy/core/trunk/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml
Fri Mar 23 23:22:16 2012
@@ -17,9 +17,9 @@
under the License.
-->
<ivysettings>
- <settings defaultCache="${ivy.cache.dir}/no-namespace"
- defaultResolver="libraries"
+ <settings defaultResolver="libraries"
defaultConflictManager="all" /> <!-- in order
to get all revisions without any eviction -->
+ <caches defaultCacheDir="${ivy.cache.dir}/no-namespace" />
<resolvers>
<ibiblio name="libraries" m2compatible="true" />
<filesystem name="my-repository">
Modified: ant/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml?rev=1304659&r1=1304658&r2=1304659&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
(original)
+++ ant/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml Fri Mar
23 23:22:16 2012
@@ -18,7 +18,8 @@
-->
<ivysettings>
<properties file="${ivy.settings.dir}/ivysettings.properties"/>
- <settings defaultCache="${ivy.settings.dir}/ivy-cache"
defaultResolver="libraries"/>
+ <settings defaultResolver="libraries" />
+ <caches defaultCacheDir="${ivy.settings.dir}/ivy-cache" />
<resolvers>
<filesystem name="projects">
<artifact
pattern="${repository.dir}/[artifact]-[revision].[ext]" />
