ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaiki...@apache.org
Subject svn commit: r1808031 [18/25] - in /ant/site/ivy/production/history/master: ./ dev/ ivyfile/ js/ osgi/ resolver/ samples/ samples/eclipse-plugin/ samples/standard-osgi/ settings/ settings/caches/ settings/macrodef/ settings/namespace/ tutorial/ tutorial...
Date Mon, 11 Sep 2017 14:27:23 GMT
Modified: ant/site/ivy/production/history/master/tutorial/defaultconf.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/tutorial/defaultconf.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/tutorial/defaultconf.html (original)
+++ ant/site/ivy/production/history/master/tutorial/defaultconf.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!----><!--  Licensed to the Apache Software Foundation (ASF) under one--><!--  or more contributor license agreements.  See the NOTICE file--><!--  distributed with this work for additional information--><!--  regarding copyright ownership.  The ASF licenses this file--><!--  to you under the Apache License, Version 2.0 (the--><!--  "License"); you may not use this file except in compliance--><!--  with the License.  You may obtain a copy of the License at--><!----><!--    http://www.apache.org/licenses/LICENSE-2.0--><!----><!--  Unless required by applicable law or agreed to in writing,--><!--  software distributed under the License is distributed on an--><!--  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!--  KIND, either express or implied.  See the License for the--><!--  specific language governing permissions and limitations--><!--  under the L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>Adjusting default settings | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/d
 efaultconf.html" class="current">Adjusting default settings</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/d
 efaultconf.html" class="current">Adjusting default settings</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -238,7 +237,7 @@ A repository which is shared between all
 </li>
 <li>
 <p>public<br/>
-A public repository on which most modules, and especially third party modules, can be found</p>
+A public repository in which most modules, and especially third party modules, can be found</p>
 </li>
 </ul>
 </div>
@@ -269,16 +268,16 @@ A public repository on which most module
 <div class="sect2">
 <h3 id="_shared">Shared</h3>
 <div class="paragraph">
-<p>As its name suggest, the shared repository is aimed to be shared among a whole development team. It is a place where you can publish your team&#8217;s private modules, and it&#8217;s also a place where you can put modules not available in the public repository. You can also put modules here that are simply inaccurate in a public repository (bad or incomplete module descriptors for instance).</p>
+<p>As its name suggest, the shared repository is aimed to be shared among the whole development team. It is a place where you can publish your team&#8217;s private modules, and it&#8217;s also a place where you can put modules not available in the public repository. You can also put modules here that are simply inaccurate in a public repository (bad or incomplete module descriptors, for instance).</p>
 </div>
 <div class="paragraph">
-<p>Note that modules can be split across the shared repository and the public one: For example, you can have the module descriptor in the shared repository and the artifacts in the public one.</p>
+<p>Note that modules can be split across the shared repository and the public one: for example, you can have the module descriptor in the shared repository and the artifacts in the public one.</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_public">Public</h3>
 <div class="paragraph">
-<p>The public repository is the place where most modules can be found, but which sometimes lack the information you need. It&#8217;s usually a repository available through an internet connection only, even if this is not mandatory.</p>
+<p>The public repository is the place where most modules can be found, but which sometimes lack the information you need. It&#8217;s usually a repository available through an Internet connection only, even if this is not mandatory.</p>
 </div>
 </div>
 </div>
@@ -287,7 +286,7 @@ A public repository on which most module
 <h2 id="_setting_up_the_repositories">Setting up the repositories</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Now that we have seen the objective of each of the three repositories, let&#8217;s see how they are setup and how to configure them to fit your needs.</p>
+<p>Now that we have seen the objective of each of the three repositories, let&#8217;s see how they are set up and how to configure them to fit your needs.</p>
 </div>
 <div class="paragraph">
 <p>First, several repositories use the same root in your filesystem. Referenced as <code>${ivy.default.ivy.user.dir}</code>, this is by default the directory <code>.ivy2</code> in your user home.</p>
@@ -436,7 +435,7 @@ In <code>1.4</code> version, Ivy was usi
 </div>
 </div>
 <div class="paragraph">
-<p>OK, so not much info here, except a lot of inclusions. These inclusions have been done on purpose so that you can easily change only one part of the ivysettings and easily benefit from the rest. For example, if you want to define your own public resolver, you will just have to configure Ivy with an ivysettings like the following:</p>
+<p>OK, so not much info here, except a lot of inclusions. These inclusions have been done on purpose so that you can easily change only one part of the Ivy settings and easily benefit from the rest. For example, if you want to define your own public resolver, you will just have to configure Ivy with the settings like the following:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -454,7 +453,7 @@ In <code>1.4</code> version, Ivy was usi
 <p>Note that only the <code>ivysettings-public.xml</code> inclusion has changed to include a homemade public resolver. Note also that this can be used like that thanks to the fact that <code>${ivy.default.settings.dir}</code> is a variable which is always set to the place where Ivy&#8217;s default settings files are (i.e. packaged in the jar).</p>
 </div>
 <div class="paragraph">
-<p>To finish this example, you have to write your own ivysettings file (that you will make available at <code><a href="http://myserver/ivy/myivysettings-public.xml" class="bare">http://myserver/ivy/myivysettings-public.xml</a></code> in this example) for defining your own public resolver. For instance, the contents of such a file could be:</p>
+<p>To finish this example, you have to write your own Ivy settings file (that you will make available at <code><a href="http://myserver/ivy/myivysettings-public.xml" class="bare">http://myserver/ivy/myivysettings-public.xml</a></code> in this example) for defining your own public resolver. For instance, the contents of such a file could be:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -469,7 +468,7 @@ In <code>1.4</code> version, Ivy was usi
 </div>
 </div>
 <div class="paragraph">
-<p>Now the last thing you will need in order to properly take advantage of the default settings is the content of each included ivysettings file:</p>
+<p>Now the last thing you will need in order to properly take advantage of the default settings is the content of each included Ivy settings file:</p>
 </div>
 <div class="listingblock">
 <div class="title"><strong>ivysettings-public.xml</strong></div>

Modified: ant/site/ivy/production/history/master/tutorial/dependence.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/tutorial/dependence.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/tutorial/dependence.html (original)
+++ ant/site/ivy/production/history/master/tutorial/dependence.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!----><!--  Licensed to the Apache Software Foundation (ASF) under one--><!--  or more contributor license agreements.  See the NOTICE file--><!--  distributed with this work for additional information--><!--  regarding copyright ownership.  The ASF licenses this file--><!--  to you under the Apache License, Version 2.0 (the--><!--  "License"); you may not use this file except in compliance--><!--  with the License.  You may obtain a copy of the License at--><!----><!--    http://www.apache.org/licenses/LICENSE-2.0--><!----><!--  Unless required by applicable law or agreed to in writing,--><!--  software distributed under the License is distributed on an--><!--  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!--  KIND, either express or implied.  See the License for the--><!--  specific language governing permissions and limitations--><!--  under the L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>Project dependencies | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/d
 ependence.html" class="current">Project dependencies</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/d
 ependence.html" class="current">Project dependencies</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -227,12 +226,12 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </div>
 <div class="sect1">
-<h2 id="_projects_used">projects used</h2>
+<h2 id="_projects_used">Projects used</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_dependee">dependee</h3>
 <div class="paragraph">
-<p>The dependee project is very simple. It depends on the apache library commons-lang and contains only one class: <code>standalone.Main</code> which provides two services:</p>
+<p>The dependee project is very simple. It depends on the Apache library commons-lang and contains only one class: <code>standalone.Main</code> which provides two services:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -250,13 +249,13 @@ hljs.initHighlightingOnLoad();</script><
 <div class="ulist">
 <ul>
 <li>
-<p>build.xml: the ant build file for the project<br/></p>
+<p>build.xml: the Ant build file for the project<br/></p>
 </li>
 <li>
-<p>ivy.xml: the project ivy file<br/></p>
+<p>ivy.xml: the project Ivy file<br/></p>
 </li>
 <li>
-<p>src standalone\Main.java: the only class of the project<br/></p>
+<p>src/standalone/Main.java: the only class of the project<br/></p>
 </li>
 </ul>
 </div>
@@ -274,7 +273,7 @@ hljs.initHighlightingOnLoad();</script><
 </div>
 </div>
 <div class="paragraph">
-<p>The ivy file declares only one dependency, that being the apache commons-lang library.</p>
+<p>The Ivy file declares only one dependency, that being the Apache commons-lang library.</p>
 </div>
 </div>
 <div class="sect2">
@@ -309,7 +308,7 @@ hljs.initHighlightingOnLoad();</script><
 </div>
 </div>
 <div class="sect1">
-<h2 id="_settings">settings</h2>
+<h2 id="_settings">Settings</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The Ivy settings are defined in two files located in the settings directory:</p>
@@ -330,19 +329,19 @@ hljs.initHighlightingOnLoad();</script><
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code>&lt;ivysettings&gt;
-	&lt;properties file="${ivy.settings.dir}/ivysettings.properties"/&gt;
-	&lt;settings defaultResolver="libraries"/&gt;
-	&lt;caches defaultCacheDir="${ivy.settings.dir}/ivy-cache"/&gt;
-	&lt;resolvers&gt;
-		&lt;filesystem name="projects"&gt;
-			&lt;artifact pattern="${repository.dir}/[artifact]-[revision].[ext]"/&gt;
-			&lt;ivy pattern="${repository.dir}/[module]-[revision].xml"/&gt;
-		&lt;/filesystem&gt;
-		&lt;ibiblio name="libraries" m2compatible="true" usepoms="false"/&gt;
-	&lt;/resolvers&gt;
-	&lt;modules&gt;
-		&lt;module organisation="org.apache" name="dependee" resolver="projects"/&gt;
-	&lt;/modules&gt;
+    &lt;properties file="${ivy.settings.dir}/ivysettings.properties"/&gt;
+    &lt;settings defaultResolver="libraries"/&gt;
+    &lt;caches defaultCacheDir="${ivy.settings.dir}/ivy-cache"/&gt;
+    &lt;resolvers&gt;
+        &lt;filesystem name="projects"&gt;
+            &lt;artifact pattern="${repository.dir}/[artifact]-[revision].[ext]"/&gt;
+            &lt;ivy pattern="${repository.dir}/[module]-[revision].xml"/&gt;
+        &lt;/filesystem&gt;
+        &lt;ibiblio name="libraries" m2compatible="true" usepoms="false"/&gt;
+    &lt;/resolvers&gt;
+    &lt;modules&gt;
+        &lt;module organisation="org.apache" name="dependee" resolver="projects"/&gt;
+    &lt;/modules&gt;
 &lt;/ivysettings&gt;</code></pre>
 </div>
 </div>
@@ -367,7 +366,7 @@ The second parameter, tells Ivy to use a
 <div class="paragraph">
 <p>This tag defines the resolvers to use. Here we have two resolvers defined: "projects" and "libraries".
 The filesystem resolver called "projects" is able to resolve the internal dependencies by locating them on the local filesystem.
-The ibiblio resolver called "libraries" is able to find dependencies on the maven 2 repository, but doesn&#8217;t use maven poms.</p>
+The ibiblio resolver called "libraries" is able to find dependencies on the Maven 2 repository, but doesn&#8217;t use Maven POMs.</p>
 </div>
 </div>
 <div class="sect2">
@@ -382,23 +381,23 @@ The ibiblio resolver called "libraries"
 </div>
 </div>
 <div class="sect1">
-<h2 id="_walkthrough">walkthrough</h2>
+<h2 id="_walkthrough">Walkthrough</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_step_1_preparation">step 1: preparation</h3>
+<h3 id="_step_1_preparation">Step 1: Preparation</h3>
 <div class="paragraph">
-<p>Open a DOS or shell window, and go to the <code>src/example/dependence</code> directory.</p>
+<p>Open a shell (or command line) window, and go to the <code>src/example/dependence</code> directory.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_2_clean_directory_tree">step 2: clean directory tree</h3>
+<h3 id="_step_2_clean_directory_tree">Step 2: Clean directory tree</h3>
 <div class="paragraph">
-<p>On the prompt type: <code>ant</code>
+<p>At the prompt, type: <code>ant</code>
 This will clean up the entire project directory tree. You can do this each time you want to clean up this example.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_3_publication_of_dependee_project">step 3: publication of dependee project</h3>
+<h3 id="_step_3_publication_of_dependee_project">Step 3: Publication of dependee project</h3>
 <div class="paragraph">
 <p>Go to <code>dependee</code> directory  and publish the project</p>
 </div>
@@ -471,18 +470,18 @@ Total time: 5 seconds</code></pre>
 <div class="ulist">
 <ul>
 <li>
-<p>the delivery of a resolved ivy file to <code>build/ivy.xml</code>.<br/>
-This has been done because by default, the publish task not only publishes artifacts, but also its ivy file. So it has looked to the path where the ivy file to publish should be, using the artifactspattern: <code>${build.dir}/[artifact].[ext]</code>. For an ivy file, this resolves to <code>build/ivy.xml</code>. Because this file does not exist, it automatically makes a call to the deliver task which delivers a resolved ivy file to this destination.</p>
+<p>the delivery of a resolved Ivy file to <code>build/ivy.xml</code>.<br/>
+This has been done because by default, the publish task not only publishes artifacts, but also its Ivy file. So it has looked to the path where the Ivy file to publish should be, using the artifactspattern: <code>${build.dir}/[artifact].[ext]</code>. For an Ivy file, this resolves to <code>build/ivy.xml</code>. Because this file does not exist, it automatically makes a call to the deliver task which delivers a resolved Ivy file to this destination.</p>
 </li>
 <li>
-<p>the publication of artifact 'dependee' and its resolved ivy file to the repository.<br/>
-Both are just copies of the files found in the current project, or more precisely, those in the <code>build</code> directory. This is because the artifactspattern has been set to <code>${build.dir}/[artifact].[ext]</code>, so the dependee artifact is found at <code>build/dependee.jar</code> and the ivy file in <code>build/ivy.xml</code>. And because we have asked the publish task to publish them using the "projects" resolver, these files are copied to <code>repository\dependee-1.jar</code> and to <code>repository\dependee-1.xml</code>, respecting the artifact and ivy patterns of our settings (see above).</p>
+<p>the publication of artifact 'dependee' and its resolved Ivy file to the repository.<br/>
+Both are just copies of the files found in the current project, or more precisely, those in the <code>build</code> directory. This is because the artifactspattern has been set to <code>${build.dir}/[artifact].[ext]</code>, so the dependee artifact is found at <code>build/dependee.jar</code> and the Ivy file in <code>build/ivy.xml</code>. And because we have asked the publish task to publish them using the "projects" resolver, these files are copied to <code>repository/dependee-1.jar</code> and to <code>repository/dependee-1.xml</code>, respecting the artifact and Ivy file patterns of our settings (see above).</p>
 </li>
 </ul>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_4_running_the_depender_project">step 4: running the depender project</h3>
+<h3 id="_step_4_running_the_depender_project">Step 4: Running the depender project</h3>
 <div class="paragraph">
 <p>Go to directory depender and run <code>ant</code></p>
 </div>
@@ -551,7 +550,7 @@ Total time: 0 seconds</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_5_new_version_of_dependee_project">step 5: new version of dependee project</h3>
+<h3 id="_step_5_new_version_of_dependee_project">Step 5: New version of dependee project</h3>
 <div class="paragraph">
 <p>Like we did before in step 3, publish the dependee project again. This will result in a new version of the project being published.</p>
 </div>
@@ -613,7 +612,7 @@ I:\dependee&gt;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_6_get_the_new_version_in_em_depender_em_project">step 6: get the new version in <em>depender</em> project</h3>
+<h3 id="_step_6_get_the_new_version_in_em_depender_em_project">Step 6: Get the new version in <em>depender</em> project</h3>
 <div class="paragraph">
 <p>What should we expect if we run the depender project again? It should:</p>
 </div>
@@ -675,7 +674,7 @@ Total time: 1 second</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>OK, we got what we expected as the <code>run</code> target shows that we are using version 2 of the main class of the dependee project. If we take a look at the resolve target results, we see that one artifact has been downloaded to the ivy cache. In fact, this file is the same version 2 of the dependee project that is in the repository, but now all future retrievals will pull it from your ivy-cache directory.</p>
+<p>OK, we got what we expected as the <code>run</code> target shows that we are using version 2 of the main class of the dependee project. If we take a look at the resolve target results, we see that one artifact has been downloaded to the Ivy cache. In fact, this file is the same version 2 of the dependee project that is in the repository, but now all future retrievals will pull it from your ivy-cache directory.</p>
 </div>
 </div>
 </div>

Modified: ant/site/ivy/production/history/master/tutorial/dual.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/tutorial/dual.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/tutorial/dual.html (original)
+++ ant/site/ivy/production/history/master/tutorial/dual.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!----><!--  Licensed to the Apache Software Foundation (ASF) under one--><!--  or more contributor license agreements.  See the NOTICE file--><!--  distributed with this work for additional information--><!--  regarding copyright ownership.  The ASF licenses this file--><!--  to you under the Apache License, Version 2.0 (the--><!--  "License"); you may not use this file except in compliance--><!--  with the License.  You may obtain a copy of the License at--><!----><!--    http://www.apache.org/licenses/LICENSE-2.0--><!----><!--  Unless required by applicable law or agreed to in writing,--><!--  software distributed under the License is distributed on an--><!--  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!--  KIND, either express or implied.  See the License for the--><!--  specific language governing permissions and limitations--><!--  under the L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>Dual Resolver | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/d
 ual.html" class="current">Dual Resolver</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/d
 ual.html" class="current">Dual Resolver</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -211,13 +210,13 @@ hljs.initHighlightingOnLoad();</script><
 </ul></li>
 </ul>
 <center><iframe src="http://www.apache.org/ads/buttonbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="135" height="265"></iframe></center></div></div></td><td valign="top"><div id="main"><h1>Dual Resolver</h1><div id="content"><div class="paragraph">
-<p>In some cases, your module descriptions (i.e. Ivy files, maven poms) are located separately from the module artifacts (i.e. jars). So what can you do about it?</p>
+<p>In some cases, your module descriptions (i.e. Ivy files, Maven POMs) are located separately from the module artifacts (i.e. jars). So what can you do about it?</p>
 </div>
 <div class="paragraph">
 <p>Use a Dual resolver! And this tutorial will show you how.</p>
 </div>
 <div class="sect1">
-<h2 id="_project_description">project description</h2>
+<h2 id="_project_description">Project description</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Let&#8217;s have a look at the <code>src/example/dual</code> directory in your Ivy distribution.
@@ -226,10 +225,10 @@ It contains a build file and 3 directori
 <div class="ulist">
 <ul>
 <li>
-<p>settings: contains the ivy settings file<br/></p>
+<p>settings: contains the Ivy settings file<br/></p>
 </li>
 <li>
-<p>repository: a sample repository of ivy files<br/></p>
+<p>repository: a sample repository of Ivy files<br/></p>
 </li>
 <li>
 <p>project: the project making use of Ivy with dual resolver<br/></p>
@@ -237,9 +236,9 @@ It contains a build file and 3 directori
 </ul>
 </div>
 <div class="sect2">
-<h3 id="_the_dual_project">the dual project</h3>
+<h3 id="_the_dual_project">The dual project</h3>
 <div class="paragraph">
-<p>The project is very simple and contains only one simple class: <code>example.Hello</code>
+<p>The project is very simple and contains only one simple class: <code>example.HelloIvy</code>
 It depends on two libraries: Apache commons-lang and Apache commons-httpclient.</p>
 </div>
 <div class="paragraph">
@@ -248,13 +247,13 @@ It depends on two libraries: Apache comm
 <div class="ulist">
 <ul>
 <li>
-<p>build.xml: the ant build file for the project<br/></p>
+<p>build.xml: the Ant build file for the project<br/></p>
 </li>
 <li>
-<p>ivy.xml: the ivy project file<br/></p>
+<p>ivy.xml: the Ivy project file<br/></p>
 </li>
 <li>
-<p>src\example\Hello.java: the only class of the project<br/></p>
+<p>src/example/HelloIvy.java: the only class of the project<br/></p>
 </li>
 </ul>
 </div>
@@ -267,32 +266,32 @@ It depends on two libraries: Apache comm
     &lt;info organisation="org.apache" module="hello-ivy"/&gt;
     &lt;dependencies&gt;
         &lt;dependency org="commons-httpclient" name="commons-httpclient" rev="2.0.2"/&gt;
-        &lt;dependency org="commons-lang" name="commons-lang" rev="2.0"/&gt;
+        &lt;dependency org="commons-lang" name="commons-lang" rev="2.6"/&gt;
     &lt;/dependencies&gt;
 &lt;/ivy-module&gt;</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>As you can see, nothing special here&#8230;&#8203; Indeed, Ivy&#8217;s philosophy is to keep ivy files independent of the way dependencies are resolved.</p>
+<p>As you can see, nothing special here&#8230;&#8203; Indeed, Ivy&#8217;s philosophy is to keep Ivy files independent of the way dependencies are resolved.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_the_strong_ivy_strong_settings">the <strong>ivy</strong> settings</h3>
+<h3 id="_the_strong_ivy_strong_settings">The <strong>Ivy</strong> settings</h3>
 <div class="paragraph">
-<p>The ivy settings are defined in the <code>ivysettings.xml</code> file located in the <code>settings</code> directory. Here is what it contains, followed by an explanation.</p>
+<p>The Ivy settings are defined in the <code>ivysettings.xml</code> file located in the <code>settings</code> directory. Here is what it contains, followed by an explanation.</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code>&lt;ivysettings&gt;
-  &lt;settings defaultResolver="dual-example"/&gt;
-  &lt;resolvers&gt;
-    &lt;dual name="dual-example"&gt;
-      &lt;filesystem name="ivys"&gt;
-        &lt;ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml"/&gt;
-      &lt;/filesystem&gt;
-      &lt;ibiblio name="ibiblio" m2compatible="true" usepoms="false"/&gt;
-    &lt;/dual&gt;
-  &lt;/resolvers&gt;
+    &lt;settings defaultResolver="dual-example"/&gt;
+    &lt;resolvers&gt;
+        &lt;dual name="dual-example"&gt;
+            &lt;filesystem name="ivys"&gt;
+                &lt;ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml"/&gt;
+            &lt;/filesystem&gt;
+            &lt;ibiblio name="ibiblio" m2compatible="true" usepoms="false"/&gt;
+        &lt;/dual&gt;
+    &lt;/resolvers&gt;
 &lt;/ivysettings&gt;</code></pre>
 </div>
 </div>
@@ -300,25 +299,25 @@ It depends on two libraries: Apache comm
 <p>Here we configured one resolver, the default one, which is a dual resolver. This dual resolver has two sub resolvers: the first is what is called the "ivy" or "metadata" resolver of the dual resolver, and the second one is what is called the "artifact" resolver. It is important that the dual resolver has exactly two sub resolvers in this given order.</p>
 </div>
 <div class="paragraph">
-<p>The metadata resolver, here a filesystem one, is used only to find module descriptors, in this case Ivy files. The setting shown here tells Ivy that all ivy files are in the <code>repository</code> directory, named with the pattern: <code>[module]-ivy-[revision].xml</code>. If we check the <code>repository</code> directory, we can confirm that it contains a file named <code>commons-httpclient-ivy-2.0.2.xml</code>. This file matches the pattern, so it will be found by the resolver.</p>
+<p>The metadata resolver, here a filesystem one, is used only to find module descriptors, in this case Ivy files. The setting shown here tells Ivy that all Ivy files are in the <code>repository</code> directory, named according to the pattern: <code>[module]-ivy-[revision].xml</code>. If we check the <code>repository</code> directory, we can confirm that it contains a file named <code>commons-httpclient-ivy-2.0.2.xml</code>. This file matches the pattern, so it will be found by the resolver.</p>
 </div>
 <div class="paragraph">
-<p>The artifact resolver is simply an ibiblio one, configured in m2compatible mode to use the maven 2 repository, with <code>usepoms="false"</code> to make sure it won&#8217;t use maven 2 metadata. Note that this isn&#8217;t necessary, since the second resolver in a dual resolver (the artifact resolver) is never asked to find module metadata.</p>
+<p>The artifact resolver is simply an ibiblio one, configured in m2compatible mode to use the Maven 2 repository, with <code>usepoms="false"</code> to make sure it won&#8217;t use Maven 2 metadata. Note that this isn&#8217;t necessary, since the second resolver in a dual resolver (the artifact resolver) is never asked to find module metadata.</p>
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_walkthrough">walkthrough</h2>
+<h2 id="_walkthrough">Walkthrough</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_step_1_preparation">step 1 : preparation</h3>
+<h3 id="_step_1_preparation">Step 1 : Preparation</h3>
 <div class="paragraph">
-<p>Open a DOS or shell window, and go to the <code>dual</code> directory.</p>
+<p>Open a shell (or command line) window, and go to the <code>dual</code> directory.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_2_clean_up">step 2 : clean up</h3>
+<h3 id="_step_2_clean_up">Step 2 : Clean up</h3>
 <div class="paragraph">
 <p>On the prompt type : <code>ant</code></p>
 </div>
@@ -327,7 +326,7 @@ It depends on two libraries: Apache comm
 </div>
 </div>
 <div class="sect2">
-<h3 id="_step_3_run_the_project">step 3 : run the project</h3>
+<h3 id="_step_3_run_the_project">Step 3 : Run the project</h3>
 <div class="paragraph">
 <p>Go to the project directory. And simply run <code>ant</code>.</p>
 </div>
@@ -384,7 +383,7 @@ Total time: 11 seconds</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>As you can see, Ivy not only downloaded commons-lang and commons-httpclient, but also commons-logging. Indeed, commons-logging is a dependency of httpclient, as we can see in the httpclient ivy file found in the <code>repository</code> directory:</p>
+<p>As you can see, Ivy not only downloaded commons-lang and commons-httpclient, but also commons-logging. Indeed, commons-logging is a dependency of httpclient, as we can see in the httpclient Ivy file found in the <code>repository</code> directory:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -402,10 +401,10 @@ Total time: 11 seconds</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>So everything seemed to work. The ivy file was found in the <code>repository</code> directory and the artifacts have been downloaded from ibiblio.</p>
+<p>So everything seemed to work. The Ivy file was found in the <code>repository</code> directory and the artifacts have been downloaded from ibiblio.</p>
 </div>
 <div class="paragraph">
-<p>This kind of setup can be useful if you don&#8217;t want to rely on the maven 2 repository for metadata, or if you want to take full advantage of Ivy files for some or all modules. Combining chain and dual resolvers should give you enough flexibility to meet almost any requirement.</p>
+<p>This kind of setup can be useful if you don&#8217;t want to rely on the Maven 2 repository for metadata, or if you want to take full advantage of Ivy files for some or all modules. Combining chain and dual resolvers should give you enough flexibility to meet almost any requirement.</p>
 </div>
 <div class="paragraph">
 <p>For full details about the dual resolver, have a look at the corresponding <a href="../resolver/dual.html">reference documentation</a>.</p>

Modified: ant/site/ivy/production/history/master/tutorial/multiple.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/tutorial/multiple.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/tutorial/multiple.html (original)
+++ ant/site/ivy/production/history/master/tutorial/multiple.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!----><!--  Licensed to the Apache Software Foundation (ASF) under one--><!--  or more contributor license agreements.  See the NOTICE file--><!--  distributed with this work for additional information--><!--  regarding copyright ownership.  The ASF licenses this file--><!--  to you under the Apache License, Version 2.0 (the--><!--  "License"); you may not use this file except in compliance--><!--  with the License.  You may obtain a copy of the License at--><!----><!--    http://www.apache.org/licenses/LICENSE-2.0--><!----><!--  Unless required by applicable law or agreed to in writing,--><!--  software distributed under the License is distributed on an--><!--  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!--  KIND, either express or implied.  See the License for the--><!--  specific language governing permissions and limitations--><!--  under the L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>Multiple Resolvers | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/m
 ultiple.html" class="current">Multiple Resolvers</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><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="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="tutorial.html" class="current">Tutorials</a> &gt; <a href="../tutorial/m
 ultiple.html" class="current">Multiple Resolvers</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -235,7 +234,7 @@ hljs.initHighlightingOnLoad();</script><
 <p>In Ivy, the use of multiple resolvers is supported by a compound resolver called the chain resolver.</p>
 </div>
 <div class="paragraph">
-<p>In our example, we will simply show you how to use two resolvers, one on a local repository and one using the Maven2 repository.</p>
+<p>In our example, we will simply show you how to use two resolvers, one for a local repository and one using the Maven 2 repository.</p>
 </div>
 </div>
 </div>
@@ -256,13 +255,13 @@ hljs.initHighlightingOnLoad();</script><
 <div class="ulist">
 <ul>
 <li>
-<p>build.xml: the ant build file for the project<br/></p>
+<p>build.xml: the Ant build file for the project<br/></p>
 </li>
 <li>
 <p>ivy.xml: the Ivy project file<br/></p>
 </li>
 <li>
-<p>src\example\Hello.java: the only class of the project<br/></p>
+<p>src/example/Hello.java: the only class of the project<br/></p>
 </li>
 </ul>
 </div>
@@ -299,7 +298,7 @@ hljs.initHighlightingOnLoad();</script><
 </div>
 </div>
 <div class="paragraph">
-<p>As we&#8217;d expect, the ivy file declares this module to be dependent on the two libraries it uses: <code>commons-lang</code> and <code>test</code>. Note that we didn&#8217;t specify the <code>org</code> for the dependency <code>test</code>. When we exclude <code>org</code>, Ivy assumes it is in the same <code>org</code> as the declaring module. (in this example, it&#8217;s <code>org.apache</code>).</p>
+<p>As we&#8217;d expect, the Ivy file declares this module to be dependent on the two libraries it uses: <code>commons-lang</code> and <code>test</code>. Note that we didn&#8217;t specify the <code>org</code> for the dependency <code>test</code>. When we exclude <code>org</code>, Ivy assumes it is in the same <code>org</code> as the declaring module. (in this example, it&#8217;s <code>org.apache</code>).</p>
 </div>
 </div>
 <div class="sect2">
@@ -377,7 +376,7 @@ hljs.initHighlightingOnLoad();</script><
 <div class="sect2">
 <h3 id="_step_1_preparation">Step 1: Preparation</h3>
 <div class="paragraph">
-<p>Open a DOS or shell window, and go to the <code>src/example/chained-resolvers</code> directory.</p>
+<p>Open a shell (or command line) window, and go to the <code>src/example/chained-resolvers</code> directory.</p>
 </div>
 </div>
 <div class="sect2">
@@ -399,7 +398,7 @@ hljs.initHighlightingOnLoad();</script><
 <p>In almost all examples, we provide a <code>clean</code> target, as the default target. Since most examples use the same Ivy cache, you will clean the whole Ivy cache each time you call this target.</p>
 </div>
 <div class="paragraph">
-<p>Cleaning the Ivy cache is something you can do without fear (except performance): it&#8217;s only a cache, so everything can be (and should be) obtained again from repositories. This may sound strange to those coming from Maven 2 land. But remember that in Ivy, the cache is not a local repository and the two are completely isolated.</p>
+<p>Cleaning the Ivy cache is something you can do without fear (except for performance): it&#8217;s only a cache, so everything can be (and should be) obtained again from repositories. This may sound strange to those coming from Maven 2 land. But remember that in Ivy, the cache is not a local repository and the two are completely isolated.</p>
 </div>
 </td>
 </tr>



Mime
View raw message