ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r675856 [4/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
Added: ant/ivy/core/trunk/doc/settings/resolvers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/resolvers.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/resolvers.html (added)
+++ ant/ivy/core/trunk/doc/settings/resolvers.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,197 @@
+<!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> 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>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Added: ant/ivy/core/trunk/doc/settings/settings.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/settings.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/settings.html (added)
+++ ant/ivy/core/trunk/doc/settings/settings.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,80 @@
+<!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> settings
+
+Configures some important ivy info: default resolver, latest strategy, conflict manager...
+
+Default resolver is used whenever nothing else is configured in the modules section of the settings file. It should give the name of a dependency resolver defined in the [[settings/resolvers]] section of the settings file.
+
+Default latest strategy and conflict manager can also be configured here.
+
+<em>validate</em> indicates if ivy files should generally be validated against the xsd or not. This setting is only a default value, and can be overridden:
+1) in ant tasks
+2) in resolvers
+So if there is a setting in the resolver, it always wins against all other settings.
+
+<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>defaultResolver</td><td>the name of the default resolver to use</td>
+        <td>No, but all modules should be configured in the modules section if not provided</td></tr>
+    <tr><td>defaultLatestStrategy</td><td>the name of the default latest strategy to use</td>
+        <td>No, defaults to latest-revision</td></tr>
+    <tr><td>defaultConflictManager</td><td>the name of the default conflict manager to use</td>
+        <td>No, defaults to latest-revision</td></tr>
+    <tr><td>defaultBranch</td><td>the default branch to use for all modules, except if they have a [[settings/module module specific branch setting]]. <span class="since">since 1.4</span></td>
+        <td>No, defaults to no default branch</td></tr>
+    <tr><td>defaultResolveMode</td><td>the default [[ant:resolve resolve mode]] to use for all modules, except if they have a [[settings/module module specific resolve mode setting]]. <span class="since">since 2.0</span></td>
+        <td>No, defaults to 'default'</td></tr>
+    <tr><td><a name="circularDependencyStrategy"></a>circularDependencyStrategy</td><td>the name of the <a href="../concept.html#circular">circular dependency strategy</a> to use <span class="since">since 1.4</span></td>
+        <td>No, defaults to warn</td></tr>
+    <tr><td>validate</td><td>Indicates if ivy files should be validated against ivy.xsd or not.</td>
+        <td>No, defaults to true</td></tr>
+    <tr><td>useRemoteConfig</td><td>true to configure ivyrep and ibiblio resolver from a remote configuration file (updated with changes in those repository structure if any) (<span class="since">since 1.2</span>)</td>
+        <td>No, defaults to false</td></tr>
+    <tr><td><s>defaultCache</s></td><td>a path to a directory to use as default basedir for both resolution and repository cache(s).
+	    <i>Deprecated, we recommend using defaultCacheDir on the [[settings/caches]] tag instead</i></td>
+        <td>No, defaults to .ivy2/cache in user home</td></tr>
+    <tr><td><s>checkUpToDate</s></td><td>Indicates if date should be checked before retrieving artifacts from cache.
+    	<i>Deprecated, we recommend using checkUpToDate on the [[settings/caches]] tag instead</i></td>
+        <td>No, defaults to true</td></tr>
+    <tr><td><s>cacheIvyPattern</s></td><td>a pattern to indicate where ivy files should be put in cache.
+    	<i>Deprecated, we recommend using ivyPattern on the [[settings/caches]] tag instead</i></td>
+        <td>No, defaults to [organisation]/[module]/ivy-[revision].xml</td></tr>
+    <tr><td><s>cacheArtifactPattern</s></td><td>a pattern to indicate where artifact files should be put in cache.
+    	<i>Deprecated, we recommend using artifactPattern on the [[settings/caches]] tag instead</i></td>
+        <td>No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]</td></tr>
+</tbody>
+</table>
+</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Added: ant/ivy/core/trunk/doc/settings/status.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/status.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/status.html (added)
+++ ant/ivy/core/trunk/doc/settings/status.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,49 @@
+<!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> status
+
+Define one available module status.
+
+See [[settings/statuses]] 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>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Added: ant/ivy/core/trunk/doc/settings/statuses.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/statuses.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/statuses.html (added)
+++ ant/ivy/core/trunk/doc/settings/statuses.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,73 @@
+<!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> 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>[[settings/status]]</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>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Added: ant/ivy/core/trunk/doc/settings/triggers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/triggers.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/triggers.html (added)
+++ ant/ivy/core/trunk/doc/settings/triggers.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,311 @@
+<!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> 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>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Added: ant/ivy/core/trunk/doc/settings/typedef.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/typedef.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/typedef.html (added)
+++ ant/ivy/core/trunk/doc/settings/typedef.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,48 @@
+<!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> 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>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Added: ant/ivy/core/trunk/doc/settings/version-matchers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/version-matchers.html?rev=675856&view=auto
==============================================================================
--- ant/ivy/core/trunk/doc/settings/version-matchers.html (added)
+++ ant/ivy/core/trunk/doc/settings/version-matchers.html Fri Jul 11 01:03:23 2008
@@ -0,0 +1,52 @@
+<!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> 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>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

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

Modified: ant/ivy/core/trunk/doc/terminology.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/terminology.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/terminology.html (original)
+++ ant/ivy/core/trunk/doc/terminology.html Fri Jul 11 01:03:23 2008
@@ -117,7 +117,7 @@
 A <em>module configuration</em> is a way to use or construct a module. If the same module has different dependencies based on how it's used, those distinct dependency-sets are called its configurations in Ivy.
 
 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. 
+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 module configurations in ivy. 
 
 For more details on configurations and how they are used in ivy, please refer to the <a href="concept.html">main concepts page</a>.
 <h1><a name="settings">Ivy Settings</a></h1>

Modified: ant/ivy/core/trunk/doc/toc.json
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/toc.json?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/toc.json (original)
+++ ant/ivy/core/trunk/doc/toc.json Fri Jul 11 01:03:23 2008
@@ -52,7 +52,7 @@
                   },
                   {
                     "id":"tutorial/conf",
-                    "title":"Using Ivy Configurations",
+                    "title":"Using Ivy Module Configurations",
                     "children": [
 
                       ]
@@ -140,68 +140,68 @@
                       ]
                   },
                   {
-                    "id":"configuration",
+                    "id":"settings",
                     "title":"Settings Files",
                     "children": [
                         {
-                          "id":"configuration/property",
+                          "id":"settings/property",
                           "title":"property",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/properties",
+                          "id":"settings/properties",
                           "title":"properties",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/conf",
+                          "id":"settings/settings",
                           "title":"settings",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/include",
+                          "id":"settings/include",
                           "title":"include",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/classpath",
+                          "id":"settings/classpath",
                           "title":"classpath",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/typedef",
+                          "id":"settings/typedef",
                           "title":"typedef",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/lock-strategies",
+                          "id":"settings/lock-strategies",
                           "title":"lock-strategies",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/caches",
+                          "id":"settings/caches",
                           "title":"caches",
                           "children": [
                               {
-                                "id":"configuration/caches/cache",
+                                "id":"settings/caches/cache",
                                 "title":"cache",
                                 "children": [
                                     {
-                                      "id":"configuration/caches/ttl",
+                                      "id":"settings/caches/ttl",
                                       "title":"ttl",
                                       "children": [
 
@@ -212,44 +212,44 @@
                             ]
                         },
                         {
-                          "id":"configuration/latest-strategies",
+                          "id":"settings/latest-strategies",
                           "title":"latest-strategies",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/parsers",
+                          "id":"settings/parsers",
                           "title":"parsers",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/namespaces",
+                          "id":"settings/namespaces",
                           "title":"namespaces",
                           "children": [
                               {
-                                "id":"configuration/namespace",
+                                "id":"settings/namespace",
                                 "title":"namespace",
                                 "children": [
                                     {
-                                      "id":"configuration/namespace/rule",
+                                      "id":"settings/namespace/rule",
                                       "title":"rule",
                                       "children": [
                                           {
-                                            "id":"configuration/namespace/fromtosystem",
+                                            "id":"settings/namespace/fromtosystem",
                                             "title":"fromsystem / tosystem",
                                             "children": [
                                                 {
-                                                  "id":"configuration/namespace/src",
+                                                  "id":"settings/namespace/src",
                                                   "title":"src",
                                                   "children": [
 
                                                     ]
                                                 },
                                                 {
-                                                  "id":"configuration/namespace/dest",
+                                                  "id":"settings/namespace/dest",
                                                   "title":"dest",
                                                   "children": [
 
@@ -264,11 +264,11 @@
                             ]
                         },
                         {
-                          "id":"configuration/macrodef",
+                          "id":"settings/macrodef",
                           "title":"macrodef",
                           "children": [
                               {
-                                "id":"configuration/macrodef/attribute",
+                                "id":"settings/macrodef/attribute",
                                 "title":"attribute",
                                 "children": [
 
@@ -277,7 +277,7 @@
                             ]
                         },
                         {
-                          "id":"configuration/resolvers",
+                          "id":"settings/resolvers",
                           "title":"resolvers",
                           "children": [
                               {
@@ -353,18 +353,18 @@
                             ]
                         },
                         {
-                          "id":"configuration/conflict-managers",
+                          "id":"settings/conflict-managers",
                           "title":"conflict-managers",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/modules",
+                          "id":"settings/modules",
                           "title":"modules",
                           "children": [
                               {
-                                "id":"configuration/module",
+                                "id":"settings/module",
                                 "title":"module",
                                 "children": [
 
@@ -373,18 +373,18 @@
                             ]
                         },
                         {
-                          "id":"configuration/outputters",
+                          "id":"settings/outputters",
                           "title":"outputters",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/statuses",
+                          "id":"settings/statuses",
                           "title":"statuses",
                           "children": [
                               {
-                                "id":"configuration/status",
+                                "id":"settings/status",
                                 "title":"status",
                                 "children": [
 
@@ -393,14 +393,14 @@
                             ]
                         },
                         {
-                          "id":"configuration/triggers",
+                          "id":"settings/triggers",
                           "title":"triggers",
                           "children": [
 
                             ]
                         },
                         {
-                          "id":"configuration/version-matchers",
+                          "id":"settings/version-matchers",
                           "title":"version-matchers",
                           "children": [
 

Modified: ant/ivy/core/trunk/doc/tutorial.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial.html (original)
+++ ant/ivy/core/trunk/doc/tutorial.html Fri Jul 11 01:03:23 2008
@@ -51,9 +51,9 @@
 a very first step toward using Ivy in a multi project environment.
 <li>[[tutorial/multiproject]]</li> 
 a more complex example demonstrating the use of Ant+Ivy in a multi project environment.
-<li><a href="tutorial/conf.html">Using Ivy Configurations</a></li> 
+<li>[[tutorial/conf]]</li> 
 show how to use configurations in ivy file to define set of artifacts.
-<li><a href="tutorial/build-repository.html">Building a repository</a></li> 
+<li>[[tutorial/build-repository]]</li> 
 show how to build your own enterprise repository.
 </ul>
 	</textarea>

Modified: ant/ivy/core/trunk/doc/tutorial/build-repository.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/build-repository.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/build-repository.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/build-repository.html Fri Jul 11 01:03:23 2008
@@ -29,7 +29,7 @@
 
 Fortunately the [[ant:install]] task is here to help: you can use specific settings for your repository maintenance build which will be used to maintain your target enterprise repository. These settings will point to another repository (for instance the maven 2 public repository) so that you will just have to ask Ivy to install the modules you want with a simple command line.
 
-To demonstrate this we will first use some basic ivy settings files to show how it works, and then we will use the advanced [[configuration/namespaces]] feature  to demonstrate how to deal with naming mismatch between the source and target repository.
+To demonstrate this we will first use some basic ivy settings files to show how it works, and then we will use the advanced [[settings/namespaces]] feature  to demonstrate how to deal with naming mismatch between the source and target repository.
 
 <h1>The project used</h1>
 The project that we will use is pretty simple.

Modified: ant/ivy/core/trunk/doc/tutorial/build-repository/advanced.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/build-repository/advanced.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/build-repository/advanced.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/build-repository/advanced.html Fri Jul 11 01:03:23 2008
@@ -35,7 +35,7 @@
 
 This problem is pretty usual when you have an existing repository, and want to benefit from a large public repositories which do not follow the same naming conventions. Or simply because you find the public repository you use as a basis is not consistent enough - why all apache commons module aren't don't use the org.apache.commons organization? For historical reasons. But if you setup your own repository you may not want to suffer from history.
 
-Fortunately Ivy has a very powerful answer to this kind of problem: [[configuration/namespaces namespaces]].
+Fortunately Ivy has a very powerful answer to this kind of problem: [[settings/namespaces namespaces]].
 
 <h1>Using namespaces</h1>
 If you look at the repository built with the [[tutorial/build-repository/basic previous tutorial]], you will see exactly what we were talking about: all apache commons module use their own name as organization.

Modified: ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/build-repository/basic.html Fri Jul 11 01:03:23 2008
@@ -28,7 +28,7 @@
 In this first step we use the [[ant:install]] task to install modules from the maven 2 repository to a file system based repository. We first install a module with no dependency, then a module with its dependencies.
 
 <h1>Basic: ivysettings.xml file used</h1>
-The ivy settings file that we will use is very simple here. It defines two resolvers, libraries and my-repository. The first one is used as the source, the second one as the destination. In a typical setup the second one would be configured using [[configuration:include included]] settings, used by the development team.
+The ivy settings file that we will use is very simple here. It defines two resolvers, libraries and my-repository. The first one is used as the source, the second one as the destination. In a typical setup the second one would be configured using [[settings/include included]] settings, used by the development team.
 
 <code type="xml">
 <ivysettings>
@@ -95,7 +95,7 @@
 
 As you can see the installation has failed, if you look at the log you will see that there are missing artifacts on the source repository. This means that you will need to download those artifacts manually, and copy them to your destination repository to complete the installation. Fortunately Ivy use a best effort algorithm during install, so that you have everything installed but the missing artifacts.
 
-You may also have notice that Ivy has installed 2 different revisions of commons-logging (1.0.2, 1.0.4). This is due to the fact that we use the "no conflict" [[configuration/conflict-managers conflict manager]] in the ivysettings file.
+You may also have notice that Ivy has installed 2 different revisions of commons-logging (1.0.2, 1.0.4). This is due to the fact that we use the "no conflict" [[settings/conflict-managers conflict manager]] in the ivysettings file.
 
 We do not want to evict any modules because we are building our own repository. Indeed if we get both commons-logging 1.0.2 and 1.0.4 it's because some modules among the transitive dependencies of hibernate depend on 1.0.2 and other on 1.0.4. If we got only 1.0.4, the module depending on 1.0.2 would be inconsistent in your own repository (depending on a version you don't have installed). Thus developers using this module directly would run into a problem.
 

Modified: ant/ivy/core/trunk/doc/tutorial/conf.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/conf.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/conf.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/conf.html Fri Jul 11 01:03:23 2008
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-This tutorial introduces the use of configuration in ivy files. Ivy configurations is indeed a very important concept. Someone even told me one day that using Ivy without using configurations is like eating a good cheese without touching the glass of Chateau Margaux 1976 you have just aside :-)
+This tutorial introduces the use of module configurations in ivy files. Ivy module configurations is indeed a very important concept. Someone even told me one day that using Ivy without using configurations is like eating a good cheese without touching the glass of Chateau Margaux 1976 you have just aside :-)
 
 More seriously, configurations in ivy can be better understood as views on your module, and you will see how they can be used efficiently here.
 

Modified: ant/ivy/core/trunk/doc/tutorial/defaultconf.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/defaultconf.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/defaultconf.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/defaultconf.html Fri Jul 11 01:03:23 2008
@@ -27,7 +27,7 @@
 	<textarea id="xooki-source">
 Ivy comes bundled with some default settings which makes it pretty simple to use in common environment. This tutorial, which is close to a reference documentation, explains what are those default settings and how they can be adjusted to your needs. 
 
-To fully understand the concept of settings and what you can do with them, we suggest reading other tutorial related to settings (like [[tutorial/multiple]] and [[tutorial/dual]]) or the <a href="../configuration.html">settings</a> reference documentation.
+To fully understand the concept of settings and what you can do with them, we suggest reading other tutorial related to settings (like [[tutorial/multiple]] and [[tutorial/dual]]) or the [[settings]] reference documentation.
 
 <h1>Concept</h1>
 This default settings mainly consist of 3 kind of repositories:
@@ -209,7 +209,7 @@
 </ivysettings>
 </code>
 
-Here you are, you have enough clues to configure that the way you want... check the <a href="../configuration.html">settings documentation</a> to see if what you want to do is possible, and go ahead!
+Here you are, you have enough clues to configure that the way you want... check the [[settings settings documentation]] to see if what you want to do is possible, and go ahead!
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: ant/ivy/core/trunk/doc/tutorial/dependence.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/tutorial/dependence.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/tutorial/dependence.html (original)
+++ ant/ivy/core/trunk/doc/tutorial/dependence.html Fri Jul 11 01:03:23 2008
@@ -101,7 +101,7 @@
 This tag only load some properties for the ivy process in the same manner as ant would do it.
 <h2>settings</h2>
 This tag is in charge of initializing some parameters for ivy process. The directory that ivy will use to cache artifacts will be in a sub directory called ivy-cache of the directory containing the ivysettings.xml file itself. 
-The second parameter, tells ivy to use a resolver called "libraries" as its default resolver. More information can be found in the [[configuration settings reference documentation]].
+The second parameter, tells ivy to use a resolver called "libraries" as its default resolver. More information can be found in the [[settings settings reference documentation]].
 <h2>resolvers</h2>
 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. 

Modified: ant/ivy/core/trunk/doc/use/buildlist.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/buildlist.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/buildlist.html (original)
+++ ant/ivy/core/trunk/doc/use/buildlist.html Fri Jul 11 01:03:23 2008
@@ -41,7 +41,7 @@
 <span class="since">since 2.0</span> The root and leaf attributes can be a delimited list of modules to use as roots.  These modules, and all their dependencies will be included in the build list.
 
 <span class="since">since 2.0</span> By default, all the modules included in a circular dependency are grouped together so that any dependency of any module in the loop will apear before the modules in the loop.  This garantee that if there is a depedendency path between a module A and a module B (but no dependency path from B to A), B will alway apear before A even if A is included in a loop in the provided set of modules to sort.
-Note that circular dependency can also trigger a failure depending on the value configured in the circularDependencyStrategy of your <a href="../configuration/conf.html#circularDependencyStrategy">settings</a>
+Note that circular dependency can also trigger a failure depending on the value configured in the circularDependencyStrategy of your <a href="../settings/conf.html#circularDependencyStrategy">settings</a>
 
 <span class="since">since 2.0</span> When you are specifying root or leaf modules you can limit the resulting list to only direct dependencies of the roots modules or to modules that directly depends on your leaf modules.
 

Modified: ant/ivy/core/trunk/doc/use/configure.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/configure.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/configure.html (original)
+++ ant/ivy/core/trunk/doc/use/configure.html Fri Jul 11 01:03:23 2008
@@ -28,7 +28,7 @@
 <span class="since">(since 2.0)</span> the configure task is deprecated.  Use the <a href="settings.html">setting</a> declaration<br/>
 
 The configure task is used to configure ivy with an xml settings file.<br/><br/>
-See <a href="../configuration.html">settings</a> for details about the settings file itself.<br/><br/>
+See [[settings]] for details about the settings file itself.<br/><br/>
 <i>Note for developers:<br/>
 After the call to this task, a reference to the configured ivy instance used by all subsequent ant tasks is put in the ant project, under the id "ivy.instance".</i>
 

Modified: ant/ivy/core/trunk/doc/use/makepom.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/makepom.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/makepom.html (original)
+++ ant/ivy/core/trunk/doc/use/makepom.html Fri Jul 11 01:03:23 2008
@@ -52,7 +52,7 @@
 </thead>
 <tbody>
     <tr><td>mapping</td>
-        <td>describes the mapping from an Ivy configuration to a POM scope.<br/>These elements takes two attributes: <ul><li>conf</li> the configuration to map<li>scope</li>the scope to which it should be mapped</ul></td>
+        <td>describes the mapping from an Ivy module configuration to a Maven POM scope.<br/>These elements takes two attributes: <ul><li>conf</li> the configuration to map<li>scope</li>the scope to which it should be mapped</ul></td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: ant/ivy/core/trunk/doc/use/publish.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/publish.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/publish.html (original)
+++ ant/ivy/core/trunk/doc/use/publish.html Fri Jul 11 01:03:23 2008
@@ -31,7 +31,7 @@
 
 All the artifacts must have been created <em>before</em> calling this task. It does not create the artifacts themselves, but expects to find them at the location indicated by the artifacts pattern.
 
-The target repository is given through the name of a resolver declared in current ivy settings. See <a href="../configuration.html">settings</a> for details about resolver supporting artifact publishing.
+The target repository is given through the name of a resolver declared in current ivy settings. See [[settings]] for details about resolver supporting artifact publishing.
 
 It also publishes the delivered ivy file (except if you don't want), and even deliver it, if it has not been done with a previous deliver call or if forcedeliver is set to true. That's why this task takes some parameters useful only for delivery. See the illustration below:
 
@@ -58,7 +58,7 @@
     <tr><td>update</td><td>true to update ivy file metadata (revision, branch, publication date and status) before publishing, false otherwise. This is usually not necessary when using deliver before publish.</td>
         <td>No. Defaults to false</td></tr>
     <tr><td>validate</td><td>true to force ivy files validation against ivy.xsd, false to force no validation</td>
-        <td>No. Defaults to default ivy value (as configured in [[configuration settings file]])</td></tr>
+        <td>No. Defaults to default ivy value (as configured in [[settings settings file]])</td></tr>
     <tr><td>replacedynamicrev</td><td>true to replace dynmic revisions by static ones in the delivered file, false to avoid this replacement <span class="since">since 1.3</span></td>
         <td>No. Defaults to true</td></tr>
     <tr><td>publishivy</td><td>True to publish delivered ivy file, false otherwise</td>

Modified: ant/ivy/core/trunk/doc/use/resolve.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/resolve.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/resolve.html (original)
+++ ant/ivy/core/trunk/doc/use/resolve.html Fri Jul 11 01:03:23 2008
@@ -96,7 +96,7 @@
 </ul>
 
 <h2>Concurrency</h2>
-During resolve, Ivy creates a file in the [[configuration/caches resolution cache]]. The creation of this file is not aimed to support concurrency, meaning that you can't have two concurrent resolve of the same module, in the same resolution cache, with the same resolveId. 
+During resolve, Ivy creates a file in the [[settings/caches resolution cache]]. The creation of this file is not aimed to support concurrency, meaning that you can't have two concurrent resolve of the same module, in the same resolution cache, with the same resolveId. 
 
 <i>Note for developers:
 After the call to this task, a reference to the module descriptor resolved is put in the ant project under the id <code>"ivy.resolved.descriptor"</code>.</i>
@@ -115,7 +115,7 @@
 
     <tr><td>refresh</td><td>true to force Ivy to resolve dynamic revision in this resolve process, false to use cached resolved revision <span class="since">since 2.0</span></td><td>No. defaults to false</td></tr>
 
-    <tr><td>resolveMode</td><td>the resolve mode to use for this dependency resolution process <span class="since">since 2.0</span></td><td>No. defaults to using the resolve mode set in the [[configuration settings]]</td></tr>
+    <tr><td>resolveMode</td><td>the resolve mode to use for this dependency resolution process <span class="since">since 2.0</span></td><td>No. defaults to using the resolve mode set in the [[settings settings]]</td></tr>
 
     <tr><td>inline</td><td>true to use inline mode, false to resolve an ivy file <span class="since">since 1.4</span></td><td>No. defaults to false</td></tr>
 

Modified: ant/ivy/core/trunk/doc/use/settings.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/settings.html?rev=675856&r1=675855&r2=675856&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/settings.html (original)
+++ ant/ivy/core/trunk/doc/use/settings.html Fri Jul 11 01:03:23 2008
@@ -28,7 +28,7 @@
 
 The settings declaration is used to configure ivy with an xml settings file.
 
-See [[configuration Settings Files]] for details about the settings file itself.<br/><br/>
+See [[settings]] for details about the settings file itself.<br/><br/>
 
 Multiple settings can be defined in a build script.  Every task can reference its own settings.
 



Mime
View raw message