DOCUMENTATION: remove deprecated defaultCache setting from examples (IVY-1273) (thanks to Joseph Boyd)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1304659 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -124,6 +124,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
 	
    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)

doc/settings.html

@@ -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">

doc/tutorial/build-repository/basic.html

@@ -32,9 +32,9 @@ The ivy settings file that we will use is very simple here. It defines two resol
 
 <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">

doc/tutorial/dependence.html

@@ -83,7 +83,8 @@ Let's have a look at the <tt>ivysettings.xml</tt> file:
 <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]" />

src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml

@@ -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

src/example/build-a-ivy-repository/settings/ivysettings-basic.xml

@@ -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">

src/example/dependence/settings/ivysettings.xml

@@ -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]" />