ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1582080 [17/27] - in /ant/site/ivy/production: ./ history/ history/latest-milestone/ history/latest-milestone/configuration/ history/latest-milestone/configuration/caches/ history/latest-milestone/configuration/macrodef/ history/latest-mil...
Date Wed, 26 Mar 2014 21:44:19 GMT
Modified: ant/site/ivy/production/history/latest-milestone/settings/caches.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/caches.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/caches.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/caches.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/caches.html" class="current">caches</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/caches.html" class="current">caches</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -353,7 +359,7 @@ Define 2 cache instances, named mycache 
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/caches/cache.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/caches/cache.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/caches/cache.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/caches/cache.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../../history/latest-milestone/settings/caches.html" >caches</a> &gt; <a href="../../../../history/latest-milestone/settings/caches/cache.html" class="current">cache</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../../history/latest-milestone/settings/caches.html" >caches</a> &gt; <a href="../../../../history/latest-milestone/settings/caches/cache.html" class="current">cache</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -354,7 +360,7 @@ Defines a cache called 'mycache', storin
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/caches/ttl.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/caches/ttl.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/caches/ttl.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/caches/ttl.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../../history/latest-milestone/settings/caches.html" >caches</a> &gt; <a href="../../../../history/latest-milestone/settings/caches/cache.html" >cache</a> &gt; <a href="../../../../history/latest-milestone/settings/caches/ttl.html" class="current">ttl</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../../history/latest-milestone/settings/caches.html" >caches</a> &gt; <a href="../../../../history/latest-milestone/settings/caches/cache.html" >cache</a> &gt; <a href="../../../../history/latest-milestone/settings/caches/ttl.html" class="current">ttl</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -340,7 +346,7 @@ Where 'd' stands for days, 'h' for hours
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/classpath.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/classpath.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/classpath.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/classpath.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/classpath.html" class="current">classpath</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/classpath.html" class="current">classpath</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -335,7 +341,7 @@ Same as above, but finds the jar on a we
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/conflict-managers.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/conflict-managers.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/conflict-managers.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/conflict-managers.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/conflict-managers.html" class="current">conflict-managers</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/conflict-managers.html" class="current">conflict-managers</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -341,7 +347,7 @@ The two "latest" conflict managers also 
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/credentials.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/credentials.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/credentials.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/credentials.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/credentials.html" class="current">credentials</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/credentials.html" class="current">credentials</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -329,7 +335,7 @@
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/include.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/include.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/include.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/include.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/include.html" class="current">include</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/include.html" class="current">include</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -302,6 +308,8 @@ The included ivysettings file has to be 
         <td>Yes, unless file is specified</td></tr>
     <tr><td>file</td><td>a path to the ivysettings file to include</td>
         <td>Yes, unless url is specified</td></tr>
+    <tr><td>optional</td><td>indicates whether Ivy should throw an error if the specified file doesn't exist. <span class="since">(Since 2.4)</span>.</td>
+        <td>No, default to false</td></tr>
 </tbody>
 </table>
 <h1>Examples</h1>
@@ -340,7 +348,7 @@ with ivysettings-macro.xml being the ivy
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/latest-strategies.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/latest-strategies.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/latest-strategies.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/latest-strategies.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/latest-strategies.html" class="current">latest-strategies</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/latest-strategies.html" class="current">latest-strategies</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -346,7 +352,7 @@ You can even remove or redefine the defa
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>

Modified: ant/site/ivy/production/history/latest-milestone/settings/lock-strategies.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/latest-milestone/settings/lock-strategies.html?rev=1582080&r1=1582079&r2=1582080&view=diff
==============================================================================
--- ant/site/ivy/production/history/latest-milestone/settings/lock-strategies.html (original)
+++ ant/site/ivy/production/history/latest-milestone/settings/lock-strategies.html Wed Mar 26 21:44:14 2014
@@ -66,7 +66,7 @@
         </div>
 
 		<div id="navcontainer">
-		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/lock-strategies.html" class="current">lock-strategies</a></span>
+		<a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt; <span class="breadCrumb"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a> &gt; <a href="../../../history/latest-milestone/reference.html" >Reference</a> &gt; <a href="../../../history/latest-milestone/settings.html" >Settings Files</a> &gt; <a href="../../../history/latest-milestone/settings/lock-strategies.html" class="current">lock-strategies</a></span>
 		</div>
 		</td>
 	</tr>
@@ -92,7 +92,7 @@
 </ul></li>
 <li id="xooki-download" class="submenu"><a href="../../../download.html" >Download</a><ul class="closed"><li id="xooki-choose-distrib"><a href="../../../choose-distrib.html" >Choose distribution</a></li>
 </ul></li>
-<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.3.0)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
+<li id="xooki-history/latest-milestone/index" class="submenu"><a href="../../../history/latest-milestone/index.html" >Documentation (2.4.0-rc1)</a><ul class="open"><li id="xooki-history/latest-milestone/release-notes"><a href="../../../history/latest-milestone/release-notes.html" >Release Notes</a></li>
 <li id="xooki-history/latest-milestone/tutorial" class="submenu"><a href="../../../history/latest-milestone/tutorial.html" >Tutorials</a><ul class="closed"><li id="xooki-history/latest-milestone/tutorial/start"><a href="../../../history/latest-milestone/tutorial/start.html" >Quick Start</a></li>
 <li id="xooki-history/latest-milestone/tutorial/defaultconf"><a href="../../../history/latest-milestone/tutorial/defaultconf.html" >Adjusting default settings</a></li>
 <li id="xooki-history/latest-milestone/tutorial/multiple"><a href="../../../history/latest-milestone/tutorial/multiple.html" >Multiple Resolvers</a></li>
@@ -110,6 +110,7 @@
 <li id="xooki-history/latest-milestone/textual"><a href="../../../history/latest-milestone/textual.html" >Text Conventions</a></li>
 <li id="xooki-history/latest-milestone/principle"><a href="../../../history/latest-milestone/principle.html" >How does it work ?</a></li>
 <li id="xooki-history/latest-milestone/bestpractices"><a href="../../../history/latest-milestone/bestpractices.html" >Best practices</a></li>
+<li id="xooki-history/latest-milestone/compatibility"><a href="../../../history/latest-milestone/compatibility.html" >Compatibility</a></li>
 <li id="xooki-history/latest-milestone/install"><a href="../../../history/latest-milestone/install.html" >Installation</a></li>
 </ul></li>
 <li id="xooki-history/latest-milestone/settings" class="submenu"><a href="../../../history/latest-milestone/settings.html" >Settings Files</a><ul class="open"><li id="xooki-history/latest-milestone/settings/property"><a href="../../../history/latest-milestone/settings/property.html" >property</a></li>
@@ -146,6 +147,7 @@
 <li id="xooki-history/latest-milestone/resolver/vfs"><a href="../../../history/latest-milestone/resolver/vfs.html" >vfs resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/jar"><a href="../../../history/latest-milestone/resolver/jar.html" >Jar resolver</a></li>
 <li id="xooki-history/latest-milestone/resolver/obr"><a href="../../../history/latest-milestone/resolver/obr.html" >OSGi Bundle Repository</a></li>
+<li id="xooki-history/latest-milestone/resolver/osgiagg"><a href="../../../history/latest-milestone/resolver/osgiagg.html" >Aggregated OSGi Repository</a></li>
 <li id="xooki-history/latest-milestone/resolver/updatesite"><a href="../../../history/latest-milestone/resolver/updatesite.html" >Eclipse updatesite</a></li>
 <li id="xooki-history/latest-milestone/resolver/mirrored"><a href="../../../history/latest-milestone/resolver/mirrored.html" >Mirrored Resolver</a></li>
 </ul></li>
@@ -194,12 +196,15 @@
 <li id="xooki-history/latest-milestone/use/buildnumber"><a href="../../../history/latest-milestone/use/buildnumber.html" >buildnumber</a></li>
 <li id="xooki-history/latest-milestone/use/cachefileset"><a href="../../../history/latest-milestone/use/cachefileset.html" >cachefileset</a></li>
 <li id="xooki-history/latest-milestone/use/cachepath"><a href="../../../history/latest-milestone/use/cachepath.html" >cachepath</a></li>
+<li id="xooki-history/latest-milestone/use/checkdepsupdate"><a href="../../../history/latest-milestone/use/checkdepsupdate.html" >checkdepsupdate</a></li>
 <li id="xooki-history/latest-milestone/use/cleancache"><a href="../../../history/latest-milestone/use/cleancache.html" >cleancache</a></li>
 <li id="xooki-history/latest-milestone/use/configure"><a href="../../../history/latest-milestone/use/configure.html" >configure</a></li>
 <li id="xooki-history/latest-milestone/use/convertmanifest"><a href="../../../history/latest-milestone/use/convertmanifest.html" >convertmanifest</a></li>
 <li id="xooki-history/latest-milestone/use/convertpom"><a href="../../../history/latest-milestone/use/convertpom.html" >convertpom</a></li>
 <li id="xooki-history/latest-milestone/use/deliver"><a href="../../../history/latest-milestone/use/deliver.html" >deliver</a></li>
+<li id="xooki-history/latest-milestone/use/dependencytree"><a href="../../../history/latest-milestone/use/dependencytree.html" >dependencytree</a></li>
 <li id="xooki-history/latest-milestone/use/findrevision"><a href="../../../history/latest-milestone/use/findrevision.html" >findrevision</a></li>
+<li id="xooki-history/latest-milestone/use/fixdeps"><a href="../../../history/latest-milestone/use/fixdeps.html" >fixdeps</a></li>
 <li id="xooki-history/latest-milestone/use/info"><a href="../../../history/latest-milestone/use/info.html" >info</a></li>
 <li id="xooki-history/latest-milestone/use/install"><a href="../../../history/latest-milestone/use/install.html" >install</a></li>
 <li id="xooki-history/latest-milestone/use/listmodules"><a href="../../../history/latest-milestone/use/listmodules.html" >listmodules</a></li>
@@ -228,7 +233,8 @@
 </ul></li>
 </ul></li>
 <li id="xooki-history" class="submenu"><a href="../../../history.html" >History</a><ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/trunk/index.html" >Trunk</a></li>
-<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
+<li id="xooki-2.x" class="submenu">2.x<ul class="closed"><li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.4.0-rc1/index.html" >2.4.0-rc1</a></li>
+<li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.3.0/index.html" >2.3.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.2.0/index.html" >2.2.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.1.0/index.html" >2.1.0</a></li>
 <li id="xooki-undefined"><a href="http://ant.apache.org/ivy/history/2.0.0/index.html" >2.0.0</a></li>
@@ -294,10 +300,11 @@
 
 <span class="tagdoc" id="ivysettings.lock-strategies">Defines a list of lock strategies usable in Ivy.</span>
 
-A lock strategy is used by a cache manager to decide when and how locking should be performed (see settings/cache to see how to configure the lock strategy to use).<br class="xooki-br"/><br class="xooki-br"/>Two lock strategies are registered by default:
+A lock strategy is used by a cache manager to decide when and how locking should be performed (see settings/cache to see how to configure the lock strategy to use).<br class="xooki-br"/><br class="xooki-br"/>The following strategies are registered by default:
 <ul>
-<li><b>no-lock</b></li> This lock strategy actually performs no locking at all, and thus should not be used in an environment where the cache is shared by multiple processes. <br class="xooki-br"/><br class="xooki-br"/>This strategy is implemented by (<a href="https://svn.apache.org/repos/asf/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/lock/NoLockStrategy.java">NoLockStrategy</a>)<br class="xooki-br"/><br class="xooki-br"/>
-<li><b>artifact-lock</b></li> This strategy acquires a lock whenever a module descriptor or an artifact is downloaded to the cache, which makes a good solution when you want to share your repository cache.<br class="xooki-br"/><br class="xooki-br"/>Note that this strategy is based on file locking, performed by default using the java.io.File.createNewFile() atomicity (which is documented as atomic in the javadoc, but not recommended to perform locks). A java.nio.FileLock based implementation is also provided, but according to our tests the createNewFile based one performs better and more reliably. We heavily recommend making your own testing in your target environment before relying on this lock strategy for heavily concurrent operations.<br class="xooki-br"/><br class="xooki-br"/>This strategy is implemented by (<a href="https://svn.apache.org/repos/asf/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/lock/ArtifactLockStrategy.java">ArtifactLockStrategy</a>)
+<li><b>no-lock</b></li> This lock strategy actually performs no locking at all, and thus should not be used in an environment where the cache is shared by multiple processes.<br class="xooki-br"/>
+<li><b>artifact-lock</b></li> This strategy acquires a lock whenever a module descriptor or an artifact is downloaded to the cache, which makes a good solution when you want to share your repository cache.<br class="xooki-br"/>Note that this strategy is based on file locking, performed by default using the java.io.File.createNewFile() atomicity (which is documented as atomic in the javadoc, but not recommended to perform locks). <br class="xooki-br"/>
+<li><b>artifact-lock-nio (<span class="since">since 2.4</span>)</b></li> Like the <i>artifact-lock</i>-strategy, this one also acquires a lock whenever a module descriptor or artifact is downloaded to the cache. But here the implementation is done with a java.nio.FileLock.
 </ul>
 
 The child tag used for the lock strategy must be equal to a name of a lock strategy type (added with the typedef tag).<br class="xooki-br"/><br class="xooki-br"/><h1>Child elements</h1>
@@ -332,7 +339,7 @@ The child tag used for the lock strategy
 
 <div id="footer-message" class="footer">
     <hr />
-    <i>Copyright &#169; 2013 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
+    <i>Copyright &#169; 2014 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>.</i><br />
     <i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br />
     <i>All other marks mentioned may be trademarks or registered trademarks of their respective owners. </i>
 </div>



Mime
View raw message