ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r675856 [2/4] - in /ant/ivy/core/trunk/doc: ./ configuration/ configuration/caches/ configuration/macrodef/ configuration/namespace/ ivyfile/ resolver/ settings/ settings/caches/ settings/macrodef/ settings/namespace/ tutorial/ tutorial/bui...
Date Fri, 11 Jul 2008 08:03:28 GMT
Modified: ant/ivy/core/trunk/doc/configuration/parsers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/parsers.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/parsers.html (original)
+++ ant/ivy/core/trunk/doc/configuration/parsers.html Fri Jul 11 01:03:23 2008
@@ -22,32 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/parsers.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> parsers
-
-Defines a list of module descriptor parsers usable in ivy. Each parser defines which resources (which descriptor file) it accepts.
-The child tag used for the parser must be equal to a name of a parser type (added with the typedef tag).
-
-Note that when looking for a parser, ivy queries the parsers list in the reverse order. So the last parser in the list will be queried first. Consequently, if the last parser accepts all resources, the other parsers will never have a chance to parse the resource.
-
-Two parsers are available by default and thus do not need to be declared in this section:
-<ul>
-<li>ivy file parser</li> this is the parser used for ivy xml files. This parser is used for resources that aren't accepted by any other parser.
-<li>pom parser</li>this parser is able to parse maven2 pom files
-</ul>
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any module descriptor parser</td><td>adds a module descriptor parser to the list of available parsers</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/parsers.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/properties.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/properties.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/properties.html (original)
+++ ant/ivy/core/trunk/doc/configuration/properties.html Fri Jul 11 01:03:23 2008
@@ -22,30 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/properties.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> properties<br/>
-<br/>
-Loads a properties file into ivy variables. See variables chapter above for details about ivy variables.
-
-<span class="since">Since 2.0</span>: it is possible to access environment variables. This can be done by specifying the environment attribute. This attribute specifies the prefix which can be used to access these environment variables. For instance, if you specify environment="env", you can access the PATH environment variable with the env.PATH property name.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>file</td><td>a path to a properties file to load</td>
-        <td rowspan="2">One of these</td></tr>
-    <tr><td>environment</td><td>the prefix to use when retrieving environment variables <span class="since">(since 2.0)</span></td>
-    <tr><td>override</td><td>indicates if the variable found in the properties file should override their previous value, if any <span class="since">(since 1.3)</span></td>
-        <td>No, defaults to true</td></tr>
-</tbody>
-</table>
-
-
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/properties.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/property.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/property.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/property.html (original)
+++ ant/ivy/core/trunk/doc/configuration/property.html Fri Jul 11 01:03:23 2008
@@ -22,40 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/property.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> property
-
-Defines an ivy variable. <span class="since">since 1.3</span>
-
-The optional override attribute enables to avoid overriding the previous value of the varable, which makes the definition behave like ant properties, which is particularly useful to define default values (values which are used only if they haven't been defined yet).
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the variable to define</td>
-        <td>Yes</td></tr>
-    <tr><td>value</td><td>the new value the variable must take</td>
-        <td>Yes</td></tr>
-    <tr><td>override</td><td>true if the previous value (if any) of the variable should overriden, false otherwise</td>
-        <td>No, defaults to true</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<property name="myvar" value="myvalue"/>
-</code>
-Sets the variable myvar to the value myvalue.
-<hr/>
-<code type="xml">
-<property name="myvar" value="myvalue" override="false"/>
-</code>
-Sets the variable myvar to the value myvalue only if myvar has not been set yet.
-
-
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/property.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/resolvers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/resolvers.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/resolvers.html (original)
+++ ant/ivy/core/trunk/doc/configuration/resolvers.html Fri Jul 11 01:03:23 2008
@@ -22,175 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/resolvers.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> resolvers
-
-Defines a list of dependency resolvers usable in ivy. Each dependency resolver is identified by its name, given as an attribute.
-
-The child tag used for the dependency resolver must be equal to a name of a dependency resolver type (either built-in or added with the typedef tag).
-
-<span class="since">since 1.3</span> Once defined, resolvers can be referenced by their name, using the following syntax:
-<code type="xml">
-<resolver ref="alreadydefinedresolver"/>
-</code>
-Note that this works only if the resolver has been already defined, and not if it is defined later in the ivysettings file.
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any resolver</td><td>adds a resolver to the list of available resolvers</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Built-in Resolvers</h1>
-Ivy comes with a set of built-in dependency resolvers able to answer to the most common needs. 
-
-If you don't find the one you want here, you can also check if some one has not contributed it in the [[links links page]], or even <a href="../extend.html">write your own</a>.
-
-There are basically two types of resolver in Ivy: composite and standard resolvers. A composite resolver is a resolver which delegates the work to other resolvers. The other resolvers are standard resolvers.
-
-Here is the list of built-in resolvers:
-
-<table class="ivy-attributes">
-<thead>
-    <tr><th>Name</th><th>Type</th><th>Description</th></tr>
-</thead>
-<tbody>
-<tr><td><a href="../resolver/ivyrep.html">IvyRep</a></td><td>Standard</td><td>Finds ivy files on ivyrep and artifacts on ibiblio.</td></tr>
-<tr><td><a href="../resolver/ibiblio.html">IBiblio</a></td><td>Standard</td><td>Finds artifacts on ibiblio.</td></tr>
-<tr><td><a href="../resolver/packager.html">Packager</a></td><td>Standard</td><td>Finds ivy files and packaging instructions via URLs, then creates artifacts by following the instructions.</td></tr>
-<tr><td><a href="../resolver/filesystem.html">FileSystem</a></td><td>Standard</td><td>This very performant resolver finds ivy files and artifacts in your file system.</td></tr>
-<tr><td><a href="../resolver/url.html">Url</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with urls.</td></tr>
-<tr><td><a href="../resolver/vfs.html">Vfs</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with <a href="http://jakarta.apache.org/commons/vfs/">apache commons vfs</a>.</td></tr>
-<tr><td><a href="../resolver/ssh.html">ssh</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with ssh.</td></tr>
-<tr><td><a href="../resolver/sftp.html">sftp</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with sftp.</td></tr>
-<tr><td><a href="../resolver/chain.html">Chain</a></td><td>Composite</td><td>Delegates the finding to a chain of sub resolvers.</td></tr>
-<tr><td><a href="../resolver/dual.html">Dual</a></td><td>Composite</td><td>Delegates the finding of ivy files to one resolver and of artifacts to another.</td></tr>
-</tbody>
-</table>
-
-<h1><a name="common">Common features and attributes</a></h1>
-All resolvers of the same type share some common features and attributes detailed here.
-<h2>Features</h2>
-<h3>validation</h3>
-All standard resolvers support several options for validation.
-
-The validate attribute is used to configure if Ivy files should be checked against the Ivy file xml schema.
-
-The checkconsistency attribute allow to enable or disable consistency checking between what is expected by Ivy when it finds a module descriptor, and what the module descriptor actually contains.
-
-The descriptor attribute let one define if module descriptors are mandatory or optional.
-
-The checksums attribute is used to define the list of checksums files to use to check the content of downloaded files has not been corrupted (eg during transfer).
-<h3>force</h3>
-Any standard resolver can be used in force mode, which is used mainly to handle local development builds. In force mode, the resolver attempts to find a dependency whatever the requested revision is (internally it replace the requested revision by 'latest.integration'), and if it finds one, it forces this revision to be returned, even when used in a chain with returnFirst=false.
-
-By using such a resolver at the beginning of a chain, you can be sure that Ivy will pick up whatever module is available in this resolver (usually a private local build) instead of the real requested revision. This allows to handle use case like a developer working on modules A and C, where A -> B -> C, and pick up the local build for C without having to publish a local version of B.
-<span class="since">since 2.0</span>
-
-<h2>Attributes</h2>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th><th>Composite</th><th>Standard</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name which identify the resolver</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>validate</td><td>indicates if resolved ivy files should be validated against ivy xsd</td>
-        <td>No, defaults to call setting</td>
-        <td>Yes</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>force</td><td>Indicates if this resolver should be used in force mode (see above). <span class="since">since 2.0</span></td>
-        <td>No, defaults to false</td>
-        <td>No</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>checkmodified</td><td>Indicates if this resolver should check lastmodified date to know if an ivy file is up to date.</td>
-        <td>No, defaults to ${ivy.resolver.default.check.modified}</td>
-        <td>No</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>changingPattern</td><td>Indicates for which revision pattern this resolver should check lastmodified date to know if an artifact file is up to date. <span class="since">since 1.4</span>. See <a href="../concept.html#change">cache and change management</a> for details.</td>
-        <td>No, defaults to none</td>
-        <td>Yes</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>changingMatcher</td><td>The name of the <a href="../concept.html#matcher">pattern matcher</a> to use to match a revision against the configured changingPattern. <span class="since">since 1.4</span>. See <a href="../concept.html#change">cache and change management</a> for details.</td>
-        <td>No, defaults to exactOrRegexp</td>
-        <td>Yes</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>alwaysCheckExactRevision</td><td>Indicates if this resolver should check the given revision even if it's a special one (like latest.integration). <span class="since">since 1.3</span></td>
-        <td>No, defaults to ${ivy.default.always.check.exact.revision}</td>
-        <td>No</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>namespace</td><td>The name of the namespace to which this resolver belong <span class="since">since 1.3</span></td>
-        <td>No, defaults to 'system'</td>
-        <td>Yes</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>checkconsistency</td><td>true to check consistency of module descriptors found by this resolver, false to avoid consistency check <span class="since">since 1.3</span></td>
-        <td>No, defaults to true</td>
-        <td>No</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>descriptor</td><td>'optional' if a module descriptor (usually an ivy file) is optional for this resolver, 'required' to refuse modules without module descriptor <span class="since">since 2.0</span></td>
-        <td>No, defaults to 'optional'</td>
-        <td>No (except dual)</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>allownomd</td><td><em>DEPRECATED. Use descriptor="required | optional" instead.</em>
-    true if the absence of module descriptor (usually an ivy file) is authorised for this resolver, false to refuse modules without module descriptor <span class="since">since 1.4</span></td>
-        <td>No, defaults to true</td>
-        <td>No (except dual)</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>checksums</td><td>a comma separated list of <a href="../concept.html#checksum">checksum algorithms</a> to use both for publication and checking <span class="since">since 1.4</span></td>
-        <td>No, defaults to ${ivy.checksums}</td>
-        <td>No</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>latest</td><td>The name of the latest strategy to use.</td>
-        <td>No, defaults to 'default'</td>
-        <td>Yes</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>cache</td><td>The name of the cache manager to use.</td>
-        <td>No, defaults to the value of the default attribute of caches</td>
-        <td>No</td>
-        <td>Yes</td>
-    </tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<resolvers>
-  <filesystem name="1" cache="cache-1">
-    <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>
-    <artifact pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-  </filesystem>
-  <chain name="chain1">
-    <resolver ref="1"/>
-    <ivyrep name="ivyrep"/>
-  </chain>
-  <chain name="chain2" returnFirst="true" dual="true">
-    <resolver ref="1"/>
-    <ibiblio name="ibiblio"/>
-  </chain>
-</resolvers>
-</code>
-Defines a filesystem resolver, named '1', which is then used in two chains, the first which seconds the filesystem resolver with an ivyrep resolver, and second which seconds the filesystem resolver with an ibiblio resolver, and which returns the first module found, and uses the whole chain to download artifacts (see corresponding resolvers documentation for details about them).   Resolver 1 will use a cache named 'cache-1' which should have been defined under the caches element.
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/resolvers.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/status.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/status.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/status.html (original)
+++ ant/ivy/core/trunk/doc/configuration/status.html Fri Jul 11 01:03:23 2008
@@ -22,27 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/status.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> status
-
-Define one available module status.
-
-See <a href="../configuration/statuses.html">statuses</a> page for details about how statuses are defined.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>name of status defined</td>
-        <td>Yes</td></tr>
-    <tr><td>integration</td><td>true if this is an integration status, false otherwise</td>
-        <td>No, defaults to false</td></tr>
-</tbody>
-</table>
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/status.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/statuses.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/statuses.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/statuses.html (original)
+++ ant/ivy/core/trunk/doc/configuration/statuses.html Fri Jul 11 01:03:23 2008
@@ -22,51 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/statuses.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> statuses
-
-Defines the list of available statuses. <span class="since">since 1.4</span>
-
-By default, ivy has 3 statuses: release, milestone and integration. By adding a statuses section to your ivysettings file, you define the statuses you want to use. Note that in this case if you still want to have ivy default statuses you will have to declare them.
-
-The integration property on each status is only used for recursive delivery, an integration dependency being delivered if the caller is not in integration state itself.
-
-The default status is the one used when none is defined in a module descriptor. If not specified, it defaults to the last defined status.
-
-The statuses order is important, the first is considered the more mature, the last the less mature. This is used to know if a status is compatible with a latest.<status> version matcher.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>default</td><td>the name of the status to use when none is declared in an ivy file</td>
-        <td>No, defaults to the last status declared</td></tr>
-</tbody>
-</table>
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td><a href="../configuration/status.html">status</a></td><td>defines a new status</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<statuses default="bronze">
-  <status name="gold" integration="false"/>
-  <status name="silver" integration="false"/>
-  <status name="bronze" integration="true"/>
-</statuses> 
-</code>
-Defines 3 statuses, gold, silver and bronze. The default status used when none is declared in an ivy file will be bronze. 
-It is also considered as an integration status, and thus doesn't trigger any recrusive delivery.
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/statuses.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/triggers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/triggers.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/triggers.html (original)
+++ ant/ivy/core/trunk/doc/configuration/triggers.html Fri Jul 11 01:03:23 2008
@@ -22,290 +22,13 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/triggers.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> triggers
-<span class="since">since 1.4</span>
-
-Defines a list of triggers to activate on some Ivy events.
-
-A trigger is an action which is performed whenever a particular event occurs.
-Ivy supports two type of triggers out of the box: ant-call and ant-build. The first calls a target in the same build as the original one whenever a particular event occurs, the second call an ant build which may be in another ant build script.
-
-If you want to use a different trigger, you can <a href="../extend.html">implement your own</a>.
-
-The event available in Ivy are the following ones:
-<table class="ivy-children">
-<thead>
-    <tr><th>Name</th><th>Attributes</th><th>Description</th></tr>
-</thead>
-<tbody>
-    <tr><td>pre-resolve</td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the module for which the dependencies will be resolved
-            <li>module</li>the name of the module for which the dependencies will be resolved
-            <li>revision</li>the revision of the module for which the dependencies will be resolved
-            <li>conf</li>comma separated list of configurations which will be resolved
-          </ul>
-        </td>
-        <td>Fired at the beginning of the resolve process, before a module dependencies and transitive dependencies are resolved.</td>
-    </tr>
-    <tr><td>pre-resolve-dependency</td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the dependency resolved
-            <li>module</li>the name of the dependency resolved
-            <li>req-revision</li>the requested revision for the dependency <span class="since">since 2.0</span> (provided for consistency with post-resolve-dependency)
-            <li>req-revision-default</li>the default requested revision constraint for the dependency <span class="since">since 2.0</span>
-            <li>req-revision-dynamic</li>the requested revision dynamic constraint for the dependency <span class="since">since 2.0</span>
-            <li>revision</li>the requested revision for the dependency
-            <li>resolver</li>the name of the resolver used to resolve the dependency
-          </ul>
-        </td>
-        <td>Fired before each dependency is resolved. In this case resolved means resolving the actual revision if the requested revision is a version constraint and not a static version, and downloading all necessary metadata information.</td>
-    </tr>
-    <tr><td>post-resolve-dependency</td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the dependency resolved
-            <li>module</li>the name of the dependency resolved
-            <li>req-revision</li>the requested revision for the dependency <span class="since">since 2.0</span>
-            <li>req-revision-default</li>the default requested revision constraint for the dependency <span class="since">since 2.0</span>
-            <li>req-revision-dynamic</li>the requested revision dynamic constraint for the dependency <span class="since">since 2.0</span>
-            <li>revision</li>the revision of the dependency resolved, or the requested revision if the resolution was not successful
-            <li>resolved</li>true if the resolution was successful, false otherwise
-            <li>duration</li>the time elapsed to resolve the dependency (in ms) <span class="since">since 2.0</span>
-            <li>resolver</li>the name of the resolver used to resolve the dependency
-            <li>any extra attribute</li>all extra attributes found on the info tag of the resolved dependency are available <span class="since">since 2.0</span>
-          </ul>
-        </td>
-        <td>Fired after each dependency is resolved</td>
-    </tr>
-    <tr><td>post-resolve</td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the module for which the dependencies have been resolved
-            <li>module</li>the name of the module for which the dependencies have been resolved
-            <li>revision</li>the revision of the module for which the dependencies have been resolved
-            <li>conf</li>comma separated list of configurations resolved
-            <li>resolve-id</li>the identifier of the resolution process <span class="since">since 2.0</span>
-            <li>nb-dependencies</li>total number of dependencies, including transitive and evicted ones <span class="since">since 2.0</span>
-            <li>nb-artifacts</li>total number of artifacts resolved, excluding metadata artifacts <span class="since">since 2.0</span>
-            <li>resolve-duration</li>the time (in ms) elapsed to resolve dependencies, before dowloading artifacts <span class="since">since 2.0</span>
-            <li>download-duration</li>the time (in ms) elapsed to download all artifacts, excluding metadata artifacts downloaded during the first phase of the resolution process <span class="since">since 2.0</span>
-            <li>download-size</li>the total size (in bytes) of all downloaded artifacts, excluding metadata artifacts. Only artifacts actually downloaded (not in cache or used from their original location) are considered <span class="since">since 2.0</span>
-          </ul>
-        </td>
-        <td>Fired at the end of the resolve process, when all module dependencies have been resolved</td>
-    </tr>
-    <tr><td>pre-download-artifact</td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the artifact which is about to be downloaded
-            <li>module</li>the name of the module of the artifact which is about to be downloaded
-            <li>revision</li>the revision of the the artifact which is about to be downloaded
-            <li>artifact</li>the name of the the artifact which is about to be downloaded
-            <li>type</li>the type of the the artifact which is about to be downloaded
-            <li>ext</li>the extension of the the artifact which is about to be downloaded
-            <li>metadata</li>true if the artifact to be downloaded is a metadata artifact, false for published artifacts <span class="since">since 2.0</span>
-            <li>resolver</li>the name of the resolver used to download the artifact
-            <li>origin</li>the origin location from which it will be downloaded
-            <li>local</li>true if it's a local artifact, false otherwise
-          </ul>
-        </td>
-        <td>Fired before an artifact is downloaded from a repository to the cache</td>
-    </tr>
-    <tr><td>post-download-artifact</td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the artifact which was just downloaded
-            <li>module</li>the name of the module of the artifact which was just downloaded
-            <li>revision</li>the revision of the the artifact which was just downloaded
-            <li>artifact</li>the name of the the artifact which was just downloaded
-            <li>type</li>the type of the the artifact which was just downloaded
-            <li>ext</li>the extension of the the artifact which was just downloaded
-            <li>metadata</li>true if the downloaded artifact is a metadata artifact, false for published artifacts <span class="since">since 2.0</span>
-            <li>resolver</li>the name of the resolver used to download the artifact
-            <li>origin</li>the origin location from which it was downloaded
-            <li>local</li>true if it's a local artifact, false otherwise
-            <li>size</li>the size in bytes of the downloaded artifact
-            <li>duration</li>the time elapsed to download the artifact (in ms) <span class="since">since 2.0</span>
-            <li>file</li>the file to which it has been downloaded
-          </ul>
-        </td>
-        <td>Fired after an artifact has been downloaded from a repository to the cache</td>
-    </tr>
-    <tr><td>pre-retrieve <br><span class="since">since 2.0</span></td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the module for which the dependencies will be retrieved
-            <li>module</li>the name of the module for which the dependencies will be retrieved
-            <li>revision</li>the revision of the module for which the dependencies will be retrieved
-            <li>conf</li>comma separated list of configurations which will be retrieved
-            <li>symlink</li>true if Ivy will use symbolic links instead of copies on supported platforms, false otherwise
-            <li>sync</li>true if the retrieve process will be performed in sync mode, false otherwise
-          </ul>
-        </td>
-        <td>Fired at the beginning of the retrieve process.</td>
-    </tr>
-    <tr><td>post-retrieve <br><span class="since">since 2.0</span></td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the module for which the dependencies have been retrieved
-            <li>module</li>the name of the module for which the dependencies will be retrieved
-            <li>revision</li>the revision of the module for which the dependencies have been retrieved
-            <li>conf</li>comma separated list of configurations which have been retrieved
-            <li>symlink</li>true if Ivy used symbolic links instead of copies on supported platforms, false otherwise
-            <li>sync</li>true if the retrieve process has been performed in sync mode, false otherwise
-            <li>duration</li>the time elapsed in ms during the retrieve process
-            <li>size</li>the total size of artifacts which have actually been copied (or symlinked)
-            <li>nbCopied</li>the number of artifacts copied or symlinked
-            <li>nbUptodate</li>the number of artifacts which were already present and up to date at the destination location
-          </ul>
-        </td>
-        <td>Fired at the end of the retrieve process.</td>
-    </tr>
-    <tr><td>pre-publish-artifact <br><span class="since">since 2.0</span></td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the artifact which is about to be published
-            <li>module</li>the name of the module of the artifact which is about to be published
-            <li>revision</li>the revision of the the artifact which is about to be published
-            <li>artifact</li>the name of the the artifact which is about to be published
-            <li>type</li>the type of the the artifact which is about to be published
-            <li>ext</li>the extension of the the artifact which is about to be published
-            <li>resolver</li>the name of the resolver into which the artifact is about to be published
-            <li>file</li>the absolute path of the source file for the artifact
-            <li>overwrite</li>"true" if the new data will overwrite existing artifacts, "false" otherwise
-          </ul>
-        </td>
-        <td>Fired before an artifact is published into a repository</td>
-    </tr>
-    <tr><td>post-publish-artifact <br><span class="since">since 2.0</span></td>
-        <td>
-          <ul>
-            <li>organisation</li>the organisation of the artifact that was published
-            <li>module</li>the name of the module of the artifact that was published
-            <li>revision</li>the revision of the the artifact that was published
-            <li>artifact</li>the name of the the artifact that was published
-            <li>type</li>the type of the the artifact that was published
-            <li>ext</li>the extension of the the artifact that was published
-            <li>resolver</li>the name of the resolver into which the artifact was published
-            <li>file</li>the absolute path of the source file for the artifact
-            <li>overwrite</li>"true" if the new data overwrote existing artifacts, "false" otherwise
-            <li>status</li>"successful" if the artifact published successfully; "failed" if the artifact failed to publish, or if the status is unknown
-          </ul>
-        </td>
-        <td>Fired after an artifact is published into a repository.  Note that this event is fired
-        whether or not the publication succeeded.  The "status" property can be checked to 
-        verify success.</td>
-    </tr>
-</tbody>
-</table>
-
-
-The child tag used for the dependency resolver must be equal to a name of a trigger type (either built-in or added with the typedef tag).
-
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any trigger</td><td>adds a trigger to the list of registered triggers</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Built-in Triggers</h1>
-Ivy comes with two built-in triggers: 
-
-<table class="ivy-attributes">
-<thead>
-    <tr><th>Name</th><th>Description</th></tr>
-</thead>
-<tbody>
-<tr><td>ant-build</td><td>Triggers an ant build.</td></tr>
-<tr><td>ant-call</td><td>Calls a target in the current ant build.</td></tr>
-<tr><td>log</td><td>Logs a message on the console or in a log file.</td></tr>
-</tbody>
-</table>
-
-
-<h1><a name="common">Common attributes</a></h1>
-All triggers share some common attributes detailed here.
-
-Among these attributes, you will find how to select when the trigger should be performed. You have to provide an event name, which is simple, but you can also use a filter expression. The syntax for this expression is very simple and limited: 
-you can use the = operator to compare an attribute (left operande) with a value (right operande).
-you can use AND OR NOT as boolean operators
-you cannot use parenthesis to change the precedence
-
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the trigger for identification purpose only</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>event</td><td>the name of the event on which the trigger should be performed</td>
-        <td>Yes</td>
-    </tr>
-    <tr><td>filter</td><td>a filter expression used to restrict when the trigger should be performed</td>
-        <td>No, defaults to no filter</td>
-    </tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<triggers>
-    <ant-build antfile="${ivy.settings.dir}/[module]/build.xml" target="publish"
-           event="pre-resolve-dependency" filter="revision=latest.integration"/>
-</triggers>
-</code>
-Triggers an ant build of the ant file ${ivy.settings.dir}/[module]/build.xml (where [module] is replaced by the name of the dependency resolved) with the target "publish", just before resolving a dependency with a latest.integration revision.
-<hr/>
-<code type="xml">
-<triggers>
-    <ant-call target="unzip" prefix="dep"
-          event="post-download-artifact" filter="type=zip AND status=successful"/>
-</triggers>
-</code>
-Triggers an ant call of the target unzip just after downloading a zip artifact, prefixing all parameters to the target with 'dep'.
-Here is how the target can look like:
-<code type="xml">
-<target name="unzip">
-     <echo>
-        unzipping artifact: 
-        organisation=${dep.organisation} 
-        module=${dep.module} 
-        revision=${dep.revision}
-        artifact=${dep.artifact}
-        type=${dep.type}
-        ext=${dep.ext}
-        origin=${dep.origin}
-        local=${dep.local}
-        size=${dep.size}
-        file=${dep.file}
-     </echo>
-     <mkdir dir="${basedir}/out"/>
-     <unzip src="${dep.file}" dest="${basedir}/out"/>
-</target>
-</code>
-<hr/>
-<code type="xml">
-<triggers>
-    <log file="ivy.log" 
-          message='downloaded "${origin}" to "${file}" (${duration}ms - ${size}B)'
-          event="post-download-artifact" filter="status=successful"/>
-</triggers>
-</code>
-Logs any successful artifact download, with information on the source and destination, and details on download size and duration.
-
-The file attribute is optional, the log trigger will output messages to console if it isn't provided.</textarea>
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/triggers.html">here</a>.
+</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>
 </html>

Modified: ant/ivy/core/trunk/doc/configuration/typedef.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/typedef.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/typedef.html (original)
+++ ant/ivy/core/trunk/doc/configuration/typedef.html Fri Jul 11 01:03:23 2008
@@ -22,26 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/typedef.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> typedef<br/>
-<br/>
-Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.
-See <a href="../extend.html">how to write and plug your own dependency resolver</a> for details.
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the type to define. This name is then used as an xml tag.</td>
-        <td>Yes</td></tr>
-    <tr><td>classname</td><td>the fully qualified class name of the type to define.</td>
-        <td>Yes</td></tr>
-</tbody>
-</table>
-
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/typedef.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/configuration/version-matchers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/configuration/version-matchers.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/configuration/version-matchers.html (original)
+++ ant/ivy/core/trunk/doc/configuration/version-matchers.html Fri Jul 11 01:03:23 2008
@@ -22,30 +22,12 @@
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
+	<meta HTTP-EQUIV="REFRESH" content="3; url=../settings/version-matchers.html">
 </head>
 <body>
-	<textarea id="xooki-source">
-<b>Tag:</b> version-matchers
-
-Defines a list of version matchers. <span class="since">since 1.4</span> 
-
-The child tag used for the version matcher must be equal to a name of a report outputter type (added with the typedef tag).
-
-A version matcher is used to evaluate if a a dependency version contraint matches a dependency version.
-
-See <a href="../ivyfile/dependency.html">dependency</a> doc for details about built-in version matchers.
-
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any version matcher</td><td>adds a version matcher to the list of available ones</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
+<textarea id="xooki-source">
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+<a href="../settings/version-matchers.html">here</a>.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/index.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/index.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/index.html (original)
+++ ant/ivy/core/trunk/doc/index.html Fri Jul 11 01:03:23 2008
@@ -71,7 +71,7 @@
   <li>[[reference]]</li> 
 The reference documentation gives you all the details of Ivy. 
 The introduction part is particularly useful: it defines some vocabulary, explains main concepts such as dependency resolvers and patterns, and give an overview on how ivy works internally. 
-It's also in the reference doc that you will find all you always dreamed to know about ivy configuration, ivy files, and ivy use (especially with ant).
+It's also in the reference doc that you will find all you always dreamed to know about ivy settings, ivy files, and ivy use (especially with ant).
   <li>[[dev]]</li> 
 The developers's doc is useful for users who would like to extend Ivy or build it from source. It's also the documentation used by the Ivy team, so you will also find information about how we make releases.
 </ul>

Modified: ant/ivy/core/trunk/doc/ivyfile/conf.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/conf.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/conf.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/conf.html Fri Jul 11 01:03:23 2008
@@ -25,9 +25,9 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/configurations.html">configurations</a>
+<b>Tag:</b> conf <b>Parent:</b> [[ivyfile/configurations]]
 
-Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in ivy configurations.
+Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in Ivy module configurations.
 
 The conf element in the configurations section declares one configuration. This declaration gives the name of the configuration declared, its visibility and the other configurations of the module it extends.
 

Modified: ant/ivy/core/trunk/doc/ivyfile/conflict.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/conflict.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/conflict.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/conflict.html Fri Jul 11 01:03:23 2008
@@ -32,7 +32,7 @@
 Specify a a conflict manager for one or several dependencies.
 The way to specify a conflict manager is by giving indication to which dependencies the conflict manager applies (by giving organisation and module names or name regexp), and then specifying the conflict manager, either by giving its name or by specifying a fixed revision list, in which case a fixed conflicts manager is used.
 
-The list of built-in conflict managers available is listed on the <a href="../configuration/conflict-managers.html">conflict manager configuration page</a>.
+The list of built-in conflict managers available is listed on the [[settings/conflict-managers conflict manager configuration page]].
 
 Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.
 

Modified: ant/ivy/core/trunk/doc/ivyfile/conflicts.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/conflicts.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/conflicts.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/conflicts.html Fri Jul 11 01:03:23 2008
@@ -32,7 +32,7 @@
 Container for conflict manager elements, used to indicate how conflicts should be resolved
 for this module. <br/><br/>
 
-The list of built-in conflict managers available is listed on the <a href="../configuration/conflict-managers.html">conflict manager configuration page</a>.<br/><br/>
+The list of built-in conflict managers available is listed on the [[settings/conflict-managers conflict manager configuration page]].<br/><br/>
 
 Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies
 and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time

Modified: ant/ivy/core/trunk/doc/ivyfile/dependencies.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/dependencies.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/dependencies.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/dependencies.html Fri Jul 11 01:03:23 2008
@@ -34,7 +34,7 @@
 
 <code>defaultconf</code> exists since Ivy 1.1 and enables to define the default conf attribute to use when no conf is defined for a dependency in this ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.
 
-<code>defaultconfmapping</code> exists since Ivy 1.3 and enables not only to define the default conf mapping when no conf is specified for a dependency in this ivy file, but it also influence the way conf mapping with no mapped conf are interpreted (see <a href="../ivyfile/configurations.html">configurations doc page</a> for details about this).
+<code>defaultconfmapping</code> exists since Ivy 1.3 and enables not only to define the default conf mapping when no conf is specified for a dependency in this ivy file, but it also influence the way conf mapping with no mapped conf are interpreted (see [[ivyfile/configurations configurations doc page]] for details about this).
 
 Note that if both defaultconf and defaultconfmapping are defined, it's the defaultconfmapping that is used. Note also that if several defaultconfmapping are defined (one in the configurations tag, one or several in included configurations file, and/or one in the dependency tag, then it's only the last which is taken into account, the others will have no effect at all.
 <h1>Attributes</h1>

Modified: ant/ivy/core/trunk/doc/ivyfile/dependency.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/dependency.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/dependency.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/dependency.html Fri Jul 11 01:03:23 2008
@@ -35,7 +35,7 @@
 <li>latest.integration</li> selects the latest revision of the dependency module.
 <li>latest.[any status]</li> selects the latest revision of the dependency module with at least the specified status. <span class="since">since 1.4</span>
 For instance latest.milestone will select the latest version being either a milestone or a release, and latest.release will only selects the latest release. Note that in order to find the latest revision with the appropriate status Ivy has to parse all the ivy files in your repository from the last one until it finds such a revision. Hence don't be surprised if the resolution slow down.
-See also [[configuration/statuses]] to see how to configure module statuses.
+See also [[settings/statuses]] to see how to configure module statuses.
 <li>end the revision with a +</li> selects the latest sub-revision of the dependency module. For instance, 
 if the dependency module exists in revision 1.0.3, 1.0.7 and 1.1.2, "1.0.+" will select 1.0.7.
 <li>version ranges</li> mathematical notation for ranges can be used to match a range of version. <span class="since">since 1.4</span>  
@@ -49,7 +49,7 @@
 (,2.0] matches all versions lower or equal to 2.0
 (,2.0[ matches all versions lower than 2.0 
 </ul>
-<span class="since">since 1.4</span> If you don't find a way to expression your dependency version constraint among these, you can <a href="../configuration/version-matchers.html">plug your own</a>.
+<span class="since">since 1.4</span> If you don't find a way to expression your dependency version constraint among these, you can [[settings/version-matchers plug your own]].
 The way to determine which revision is the "latest" between two is configurable through the use of pluggable LatestStrategy. See <a href="../reference.html">ivy main concepts</a> for details about this.
 
 <h2><a name="revision-constraint">Revision constraint</a></h2>
@@ -65,11 +65,11 @@
 The first way to declare this mapping is called the inline mapping. It is maybe the less natural at first, but it's powerful and concise. Inline mapping can take several forms.
 
 <ul>
-<li>Specify one configuration name</li> This means that in this master configuration the same dependency configuration is needed (except if a defaultconfmapping has been specified in this ivy file, see <a href="../ivyfile/configurations.html">configurations</a> for details, or table below for examples).
+<li>Specify one configuration name</li> This means that in this master configuration the same dependency configuration is needed (except if a defaultconfmapping has been specified in this ivy file, see [[ivyfile/configurations configurations]] for details, or table below for examples).
 For instance, if the current module has defined a configuration named 'runtime', and the dependency too, then having an inline mapping configuration set to 'runtime' means that in the runtime master configuration the runtime dependency configuration is required.
 
 <a name="defaultconfmapping"/>More examples:
-The table below indicates how ivy interpret the conf attribute according to how <a href="../ivyfile/configurations.html">defaultconfmapping</a> is set:<table class="ivy-attributes"><thead><tr><th>defaultconfmapping</th><th>conf</th><th>ivy interpretation</th></tr>
+The table below indicates how ivy interpret the conf attribute according to how [[ivyfile/configurations defaultconfmapping]] is set:<table class="ivy-attributes"><thead><tr><th>defaultconfmapping</th><th>conf</th><th>ivy interpretation</th></tr>
 </thead>
 <tbody>
 <tr><td></td><td></td><td><code>*->*</code></td></tr>
@@ -138,7 +138,7 @@
     <tr><td>name</td><td>the module name of the dependency</td>
         <td>Yes</td></tr>
     <tr><td>branch</td><td>the branch of the dependency. <span class="since">since 1.4</span></td>
-        <td>No, defaults to the default branch <a href="../configuration/conf.html">configured</a> for the dependency.</td></tr>
+        <td>No, defaults to the default branch [[settings/conf.html setting]] for the dependency.</td></tr>
     <tr><td>rev</td><td>the revision of the dependency. See <a href="#revision">above</a> for details.</td>
         <td>Yes</td></tr>
     <tr><td>revConstraint</td><td>the dynamic revision constraint originally used for this dependency. See <a href="#revision-constraint">above</a> for details.</td>

Modified: ant/ivy/core/trunk/doc/ivyfile/include.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/include.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/include.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/include.html Fri Jul 11 01:03:23 2008
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> include <b>Parent:</b> <a href="../ivyfile/configurations.html">configurations</a>
+<b>Tag:</b> include <b>Parent:</b> [[ivyfile/configurations]]
 
 Include configurations specified in another file. <span class="since">since 1.3</span>
 

Modified: ant/ivy/core/trunk/doc/ivyfile/info.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/info.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/info.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/info.html Fri Jul 11 01:03:23 2008
@@ -42,7 +42,7 @@
     <tr><td>module</td><td>the name of the module described by this ivy file.</td>
         <td>Yes</td></tr>
     <tr><td>branch</td><td>the branch of this module. <span class="since">since 1.4</span></td>
-        <td>No, defaults to the default branch <a href="../configuration/conf.html">configured</a>, or nothing if no default branch is configured</td></tr>
+        <td>No, defaults to the default branch [[settings/conf setting]], or nothing if no default branch is configured</td></tr>
     <tr><td>revision</td><td>the revision of this module.</td>
         <td>Yes in repository ivy files, no in ivy files to resolve</td></tr>
     <tr><td>status</td><td>the status of this module. See <a href="../reference.html">terminology</a> section for details</td>

Modified: ant/ivy/core/trunk/doc/reference.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/reference.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/reference.html (original)
+++ ant/ivy/core/trunk/doc/reference.html Fri Jul 11 01:03:23 2008
@@ -43,7 +43,7 @@
 <li>[[install]]</li>
 This part describe how to install Ivy
 </ul>
-<li>[[configuration]]</li>
+<li>[[settings]]</li>
 This part is dedicated to the specification of the settings file of Ivy (usually called ivysettings.xml). It also gives the list of built-in dependency resolvers available in ivy.
 <li>[[ivyfile]]</li>
 This part is the reference of the specification of the module descriptors, the ivy files in which you describe your dependencies. If you have any question of what can be done or not in an ivy file, you will have the answer here.

Modified: ant/ivy/core/trunk/doc/resolver/chain.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/chain.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/chain.html (original)
+++ ant/ivy/core/trunk/doc/resolver/chain.html Fri Jul 11 01:03:23 2008
@@ -33,7 +33,7 @@
 
 This resolver is only a container of a chain of other resolvers. The sub resolvers can be any resolver, including a chain. An attribute enable to indicate if the chain must be iterated after the first found or not (at least when asking for a latest revision). If the chain is iterated, then it's the latest among the ones found that is returned. If the chain is not iterated, then it's the first found which is returned.
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of composite resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of composite resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/dual.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/dual.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/dual.html (original)
+++ ant/ivy/core/trunk/doc/resolver/dual.html Fri Jul 11 01:03:23 2008
@@ -34,7 +34,7 @@
 This resolver delegates its job to one resolver for ivy files and another for artifacts.
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of composite resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of composite resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/filesystem.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/filesystem.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/filesystem.html (original)
+++ ant/ivy/core/trunk/doc/resolver/filesystem.html Fri Jul 11 01:03:23 2008
@@ -60,7 +60,7 @@
 
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
@@ -68,7 +68,7 @@
 <tbody>
     <tr><td>m2compatible</td><td>True if this resolver should be maven2 compatible, false otherwise <span class="since">since 1.3</span></td>
         <td>No, defaults to false</td></tr>
-    <tr><td>local</td><td>True if this resolver should be considered local, false otherwise <span class="since">since 1.4</span>. See useOrigin attribute on the [[configuration/caches]] element for details.</td>
+    <tr><td>local</td><td>True if this resolver should be considered local, false otherwise <span class="since">since 1.4</span>. See useOrigin attribute on the [[settings/caches]] element for details.</td>
         <td>No, defaults to true</td></tr>
     <tr><td>transactional</td><td>true to force the use of transaction, false to prevent the use of transaction, auto to get transaction when possible <span class="since">since 2.0</span>. See above for details.</td>
         <td>No, defaults to auto</td></tr>

Modified: ant/ivy/core/trunk/doc/resolver/ibiblio.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/ibiblio.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/ibiblio.html (original)
+++ ant/ivy/core/trunk/doc/resolver/ibiblio.html Fri Jul 11 01:03:23 2008
@@ -47,7 +47,7 @@
 <strong>Limitation</strong>: in m2compatible mode, this resolver is not able list available organizations. It means some features like [[ant:repreport]] are not available.
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/ivyrep.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/ivyrep.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/ivyrep.html (original)
+++ ant/ivy/core/trunk/doc/resolver/ivyrep.html Fri Jul 11 01:03:23 2008
@@ -38,7 +38,7 @@
 </div>
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/packager.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/packager.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/packager.html (original)
+++ ant/ivy/core/trunk/doc/resolver/packager.html Fri Jul 11 01:03:23 2008
@@ -69,7 +69,7 @@
 </p>
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/sftp.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/sftp.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/sftp.html (original)
+++ ant/ivy/core/trunk/doc/resolver/sftp.html Fri Jul 11 01:03:23 2008
@@ -50,7 +50,7 @@
 Internally this resolver relies on <a href="http://www.jcraft.com/jsch/">jsch</a> as ssh client, which is a popular java ssh client, used for example in eclipse.
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/ssh.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/ssh.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/ssh.html (original)
+++ ant/ivy/core/trunk/doc/resolver/ssh.html Fri Jul 11 01:03:23 2008
@@ -38,7 +38,7 @@
 
 Internally this resolver shares most of its behaviour with the <a href="../resolver/sftp.html">sftp resolver</a>, so refer to its documentation for details.
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/url.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/url.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/url.html (original)
+++ ant/ivy/core/trunk/doc/resolver/url.html Fri Jul 11 01:03:23 2008
@@ -37,7 +37,7 @@
 <strong>Limitation</strong>: in m2compatible mode, this resolver is not able list available organizations. It means some features like [[ant:repreport]] are not available.
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <table class="ivy-attributes">
 <thead>
     <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>

Modified: ant/ivy/core/trunk/doc/resolver/vfs.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/vfs.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/vfs.html (original)
+++ ant/ivy/core/trunk/doc/resolver/vfs.html Fri Jul 11 01:03:23 2008
@@ -36,7 +36,7 @@
 <i>Note: commons vfs has not released a stable version yet, hence Ivy relies on a nightly build. Stability should thus be considered carefully before using this resolver in a production environment</i>
 
 <h1>Attributes</h1>
-This resolver shares the <a href="../configuration/resolvers.html#common">common attributes</a> of standard resolvers.
+This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of standard resolvers.
 <h1>Child elements</h1>
 <table class="ivy-children">
 <thead>

Added: ant/ivy/core/trunk/doc/settings.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings.html (added)
+++ ant/ivy/core/trunk/doc/settings.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.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 License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
+	<script type="text/javascript" src="xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+In order to work as you want, ivy sometimes need some settings. Actually, ivy can work with no specific settings at all, see the <a href="tutorial/defaultconf.html">default settings documentation</a> for details about that. But ivy is able to work in very different contexts. You just have to configure it properly.
+
+Settings are specified through an xml file, usually called ivysettings.xml. To configure ivy from ant, you just have to use the [[ant:settings]] datatype with the path of your settings file.
+
+Here is an example of settings file :
+<code type="xml">
+<ivysettings>
+        <properties file="${ivy.settings.dir}/ivysettings-file.properties" />
+        <settings defaultCache="${cache.dir}" defaultResolver="ibiblio" checkUpToDate="false" />
+        <resolvers>
+                <ibiblio name="ibiblio" />
+                <filesystem name="internal">
+                        <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml" />
+                        <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]" />
+                </filesystem>
+        </resolvers>
+        <modules>
+                <module organisation="jayasoft" name=".*" resolver="internal" />
+        </modules>
+</ivysettings>
+</code>
+
+<br/>
+Mainly, the settings enable to configure the default cache directory used by ivy and the dependency resolvers that it will use to resolve dependencies.
+<i>Note: To work, this settings file needs a property file named ivysettings-file.properties in the same directory as the settings file, with ivy variables you want in it.</i>
+
+Some useful variables are available in settings files:
+<ul>
+<li>ivy.settings.dir</li> this variable references the directory in which the ivysettings itself is. This is available if the settings has been loaded as a file. In case of an url, it takes the part before the last slash of the url, if any. If the url has no slash, then this variable is not set.
+<li>ivy.settings.file</li>the path of the settings file itself, it has been loaded as a file only. If it has been loaded as an url, this variable is not set
+<li>ivy.settings.url</li>the url pointing to the settings file. This is set both when it has been loaded as a file or an url
+</ul>
+
+<span class="since">since 1.4</span> Note that all <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/System.html#getProperties()">java system properties</a> are available as ivy variables in your settings file.
+
+<h1>Settings file structure</h1>
+
+The settings file is structured in some parts and left other open. Indeed each resolver has its own structure, thus it's not the settings file itself which define the structure for the resolvers.
+
+<pre>
+ivysettings
+    <a href="settings/property.html">property</a>
+    <a href="settings/properties.html">properties</a>
+    <a href="settings/conf.html">settings</a>
+    <a href="settings/include.html">include</a>
+    <a href="settings/classpath.html">classpath</a>
+    <a href="settings/typedef.html">typedef</a>
+    <a href="settings/lock-strategies.html">lock-strategies</a>
+    <a href="settings/caches.html">caches</a>
+        <a href="settings/caches/cache.html">cache</a>
+    <a href="settings/latest-strategies.html">latest-strategies</a>
+    <a href="settings/version-matchers.html">version-matchers</a>
+    <a href="settings/triggers.html">triggers</a>
+    <a href="settings/parsers.html">parsers</a>
+    <a href="settings/conflict-managers.html">conflict-managers</a>
+    <a href="settings/outputters.html">outputters</a>
+    <a href="settings/namespaces.html">namespaces</a>
+        <a href="settings/namespace.html">namespace</a>
+            <a href="settings/namespace/rule.html">rule</a>
+                <a href="settings/namespace/fromtosystem.html">fromsystem</a>
+                    <a href="settings/namespace/src.html">src</a>
+                    <a href="settings/namespace/dest.html">dest</a>
+                <a href="settings/namespace/fromtosystem.html">tosystem</a>
+                    <a href="settings/namespace/src.html">src</a>
+                    <a href="settings/namespace/dest.html">dest</a>
+    <a href="settings/macrodef.html">macrodef</a>
+        <a href="settings/macrodef/attribute.html">attribute</a>
+        any resolver
+    <a href="settings/resolvers.html">resolvers</a>
+        any resolver
+    <a href="settings/modules.html">modules</a>
+        <a href="settings/module.html">module</a>
+    <a href="settings/statuses.html">statuses</a>
+        <a href="settings/status.html">status</a>
+</pre>
+
+<h1>ivysettings</h1>
+<b>Tag:</b> ivysettings
+
+Root tag of any ivysettings file.
+<h2>Child elements</h2>
+<table class="ivy-children">
+<thead>
+    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
+</thead>
+<tbody>
+    <tr><td><a href="settings/property.html">property</a></td><td>set an ivy variable</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="settings/properties.html">properties</a></td><td>loads a properties file as ivy variables</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="settings/conf.html">settings</a></td><td>configures ivy with some defaults</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/include.html">include</a></td><td>includes another settings file</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="settings/classpath.html">classpath</a></td><td>add a location in the classpath used to load plugins</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="settings/typedef.html">typedef</a></td><td>defines new types in ivy</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="settings/lock-strategies.html">lock-strategies</a></td><td>defines lock strategies</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/caches.html">caches</a></td><td>defines repository cache managers</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/latest-strategies.html">latest-strategies</a></td><td>defines latest strategies</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/parsers.html">parsers</a></td><td>defines module descriptor parsers</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/version-matchers.html">version-matchers</a></td><td>defines new version matchers</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/triggers.html">triggers</a></td><td>register triggers on ivy events</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/namespaces.html">namespaces</a></td><td>defines new namespaces</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/macrodef.html">macrodef</a></td><td>defines a new macro resolver</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="settings/resolvers.html">resolvers</a></td><td>defines dependency resolvers</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/conflict-managers.html">conflict-managers</a></td><td>defines conflicts managers</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/modules.html">modules</a></td><td>defines rules between modules and dependency resolvers</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/outputters.html">outputters</a></td><td>defines the list of available report outputters</td>
+        <td>0..1</td></tr>
+    <tr><td><a href="settings/statuses.html">statuses</a></td><td>defines the list of available statuses</td>
+        <td>0..1</td></tr>
+</tbody>
+</table></textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: ant/ivy/core/trunk/doc/settings.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/doc/settings.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/doc/settings/caches.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/caches.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/caches.html (added)
+++ ant/ivy/core/trunk/doc/settings/caches.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.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 License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
+	<script type="text/javascript" src="../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> caches
+
+Configures the Ivy cache system. <span class="since">since 2.0</span>.
+See <a href="../concept.html#cache">cache concept</a> for details on the Ivy cache concept.
+
+By default, Ivy defines one repository cache instance, called 'default-cache', which uses the default cache settings defined using attributes on this tag. This default instance is defined as long as you don't define your own default cache using the 'default' attribute, and have at least one dependency resolver which doesn't specify which cache instance to use.
+
+<em>defaultCacheDir</em> is the default directory used for both the resolution and repository cache(s). It usually points to a directory in your filesystem. If you want to isolate resolution cache from repository cache, we recommend setting both the resolutionCacheDir and repositoryCacheDir attributes on this tag instead of using defaultCacheDir.
+
+Since repository cache implementations are pluggable, you can either define new cache instances based on the default implementation provided in Ivy using the [[settings/caches/cache]] child element, or use custom cache implementations using child elements as you have defined using [[settings/typedef]].
+
+<em>ivyPattern</em> and <em>artifactPattern</em> are used to configure the default way Ivy stores ivy files and artifacts in repository cache(s). Usually you do not have to change this, unless you want to use the cache directly from another tool, which is not recommended. These patterns are relative to the repository cache base directory.
+
+<em>checkUpToDate</em> indicates to ivy if it must check date of artifacts before retrieving them (i.e. copying them from
+cache to another place in your filesystem). Usually it is a good thing to check date to avoid unnecessary copy, even if it's most of the time a local copy.
+
+<h1>Attributes</h1>
+<table class="ivy-attributes">
+<thead>
+    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
+</thead>
+<tbody>
+    <tr><td>default</td><td>the name of the default cache to use on all resolvers not defining the cache instance to use</td>
+        <td>No, defaults to a default cache manager instance named 'default-cache'</td></tr>
+    <tr><td>defaultCacheDir</td><td>a path to a directory to use as default basedir for both resolution and repository cache(s)</td>
+        <td>No, defaults to .ivy2/cache in the user's home directory</td></tr>
+    <tr><td>resolutionCacheDir</td><td>the path of the directory to use for all resolution cache data</td>
+        <td>No, defaults to defaultCacheDir</td></tr>
+    <tr><td>repositoryCacheDir</td><td>the path of the default directory to use for repository cache data. <strong>This should not point to a directory used as a repository!</strong></td>
+        <td>No, defaults to defaultCacheDir</td></tr>
+    <tr><td>ivyPattern</td><td>default pattern used to indicate where ivy files should be put in the repository cache(s)</td>
+        <td>No, defaults to [organisation]/[module]/ivy-[revision].xml</td></tr>
+    <tr><td>artifactPattern</td><td>default pattern used to indicate where artifact files should be put in the repository cache(s)</td>
+        <td>No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]</td></tr>
+    <tr><td>checkUpToDate</td><td>Indicates if date should be checked before retrieving artifacts from cache</td>
+        <td>No, defaults to true</td></tr>
+    <tr><td>useOrigin</td><td>the default value to use for useOrigin for caches in which it isn't specifically defined.
+    	Use true to avoid the copy of local artifacts to the cache and use directly their original location.</td>
+        <td>No, defaults to false</td></tr>
+    <tr><td>lockStrategy</td><td>the name of the default [[settings/lock-strategies lock strategy]] to use when accessing repository cache(s)</td>
+        <td>No, defaults to <em>no-lock</em></td></tr>
+</tbody>
+</table>
+<h1>Child elements</h1>
+<table class="ivy-children">
+<thead>
+    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
+</thead>
+<tbody>
+    <tr><td><a href="caches/cache.html">cache</a></td><td>defines a new repository cache instance, based on the default repository cache implementation</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<caches>
+  <cache name="mycache" basedir="path/to/my/cache/1" />
+  <cache name="mycache2" basedir="path/to/my/cache/2" />
+</caches> 
+</code>
+Define 2 cache instances, named mycache and mycache2, using two different directories as base directory, and using the default patterns and lock strategies. The default cache instance will still be defined as long as at least one dependency resolver does not declare which cache manager to use.
+<hr/></textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: ant/ivy/core/trunk/doc/settings/caches.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/doc/settings/caches.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message