Author: xavier
Date: Mon Apr 2 22:54:03 2007
New Revision: 525042
URL: http://svn.apache.org/viewvc?view=rev&rev=525042
Log:
improve documentation on usage of expression and pattern matchers
Modified:
incubator/ivy/core/trunk/doc/doc/configuration/module.html
incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude.html
incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html
incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html
Modified: incubator/ivy/core/trunk/doc/doc/configuration/module.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/module.html?view=diff&rev=525042&r1=525041&r2=525042
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/module.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/module.html Mon Apr 2
22:54:03 2007
@@ -23,78 +23,78 @@
<script type="text/javascript" src="../../xooki/xooki.js"></script>
</head>
<body>
- <textarea id="xooki-source">
-<b>Tag:</b> module
-
-Define a module set rule. The tag defines a module set, by giving an
expression and the matcher to use for organisation and name (for instance, you
can use * to specify all).
-
-It also gives the specific setting to use for this module set.
-
-For each module set, you can configure:
-<ul>
-<li>the <a href="../../doc/configuration/resolvers.html">resolver</a> to
use</li>
-<li>the <a href="../../doc/configuration/conflict-managers.html">conflict
manager</a> to use</li>
-<li>the default <a href="../../doc/terminology#branch.html">branch</a> to
use</li>
-</ul>
-
-<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>organisation</td><td>the name of the organisation to which apply
the resolver. May be a regexp.</td>
- <td>Yes</td></tr>
- <tr><td>name</td><td>the name of the module to which apply the resolver.
May be a regexp.</td>
- <td>Yes</td></tr>
- <tr><td>matcher</td><td>the matcher to use to match the modules to which
the resolver should be applied <span class="since">since 1.3</span></td>
- <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
- <tr><td>resolver</td><td>the name of the resolver to apply. The resolver
must have been defined in the resolvers section of the configuration file.</td>
- <td>No</td></tr>
- <tr><td>conflict-manager</td><td>the name of the conflict manager to
apply. <span class="since">since 1.4</span></td>
- <td>No</td></tr>
- <tr><td>branch</td><td>the default branch to apply. <span
class="since">since 1.4</span></td>
- <td>No</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<modules>
- <module organisation="jayasoft" name="*" resolver="myprojectsresolver"/>
-</modules>
-</code>
-Uses myprojectresolver for all modules from jayasoft.
-<hr/>
-<code type="xml">
-<modules>
- <module organisation="apache" name="commons-*" matcher="glob"
resolver="myapachecommonsresolver"/>
-</modules>
-</code>
-Uses myapachecommonsresolver for all modules beginning by commons- from apache.
-<hr/>
-<code type="xml">
-<modules>
- <module organisation="apache" name="commons-[a-z]+" matcher="regexp"
resolver="myapachecommonsresolver"/>
-</modules>
-</code>
-Uses myapachecommonsresolver for all modules from apache beginning by commons-
followed by any number of alphabetic lowercase characters.
-<hr/>
-<code type="xml">
-<modules>
- <module organisation="apache" name="ivy*" matcher="glob"
conflict-manager="latest-time"/>
-</modules>
-</code>
-Uses latest-time conflict manager for all modules from apache which name
begins with ivy.
-<hr/>
-<code type="xml">
-<modules>
- <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/>
-</modules>
-</code>
-Uses 'fix-103' as default branch for all modules from apache which name begins
with ivy.
-
-
-
+ <textarea id="xooki-source">
+<b>Tag:</b> module
+
+Define a module set rule. The tag defines a module set, by giving an
expression and the matcher to use for organisation and name (for instance, you
can use * to specify all).
+
+It also gives the specific setting to use for this module set.
+
+For each module set, you can configure:
+<ul>
+<li>the <a href="../../doc/configuration/resolvers.html">resolver</a> to
use</li>
+<li>the <a href="../../doc/configuration/conflict-managers.html">conflict
manager</a> to use</li>
+<li>the default <a href="../../doc/terminology#branch.html">branch</a> to
use</li>
+</ul>
+
+<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>organisation</td><td>the name of the organisation to which apply
the resolver. May be an expression depending on the matcher used (see matcher
attribute below).</td>
+ <td>Yes</td></tr>
+ <tr><td>name</td><td>the name of the module to which apply the resolver.
May be an expression depending on the matcher used (see matcher attribute
below).</td>
+ <td>Yes</td></tr>
+ <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a>
to use to match the modules to which the resolver should be applied <span
class="since">since 1.3</span></td>
+ <td>No, defaults to exactOrRegexp</td></tr>
+ <tr><td>resolver</td><td>the name of the resolver to apply. The resolver
must have been defined in the resolvers section of the configuration file.</td>
+ <td>No</td></tr>
+ <tr><td>conflict-manager</td><td>the name of the conflict manager to
apply. <span class="since">since 1.4</span></td>
+ <td>No</td></tr>
+ <tr><td>branch</td><td>the default branch to apply. <span
class="since">since 1.4</span></td>
+ <td>No</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<modules>
+ <module organisation="jayasoft" name="*" resolver="myprojectsresolver"/>
+</modules>
+</code>
+Uses myprojectresolver for all modules from jayasoft.
+<hr/>
+<code type="xml">
+<modules>
+ <module organisation="apache" name="commons-*" matcher="glob"
resolver="myapachecommonsresolver"/>
+</modules>
+</code>
+Uses myapachecommonsresolver for all modules beginning by commons- from apache.
+<hr/>
+<code type="xml">
+<modules>
+ <module organisation="apache" name="commons-[a-z]+" matcher="regexp"
resolver="myapachecommonsresolver"/>
+</modules>
+</code>
+Uses myapachecommonsresolver for all modules from apache beginning by commons-
followed by any number of alphabetic lowercase characters.
+<hr/>
+<code type="xml">
+<modules>
+ <module organisation="apache" name="ivy*" matcher="glob"
conflict-manager="latest-time"/>
+</modules>
+</code>
+Uses latest-time conflict manager for all modules from apache which name
begins with ivy.
+<hr/>
+<code type="xml">
+<modules>
+ <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/>
+</modules>
+</code>
+Uses 'fix-103' as default branch for all modules from apache which name begins
with ivy.
+
+
+
</textarea>
<script type="text/javascript">xooki.postProcess();</script>
</body>
Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude.html?view=diff&rev=525042&r1=525041&r2=525042
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude.html Mon Apr 2
22:54:03 2007
@@ -23,57 +23,57 @@
<script type="text/javascript" src="../../xooki/xooki.js"></script>
</head>
<body>
- <textarea id="xooki-source">
-<b>Tag:</b> exclude <b>Parent:</b> <a
href="../../doc/ivyfile/dependency.html">dependency</a>
-
-This feature gives you more control on a dependency for which you do not
control its ivy file.
-It enables to restrict the artifacts required, by excluding artifacts being
published by the dependency or any of its transitive dependencies,
-even if configuration does not a good separation of published artifacts
-
-The same principle concerning configuration as for include applies to this
exclude feature (see above the include feature).
-
-Note that exclusion is always done AFTER inclusion has been done.
-
-<span class="since">since 1.3</span> This exclude feature can also be used not
only to exclude artifacts but also to exclude whole modules. Indeed when you
exclude artifacts, it doesn't avoid ivy to search for the module itself, and to
resolve the dependencies of the module. But you can also exclude the whole
module, which means that the module will not be downloaded at all, and so its
own dependencies will not be resolved. For sure, this is usually done to
exclude not a direct dependency but an indirect one. To exclude a whole module,
you just have to not specify any artifact name, type and ext in your exclude
rule. For instance:
-<code type="xml">
-<dependency name="A" rev="1.0">
- <exclude module="B"/>
-</dependency>
-</code>
-<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>org</td><td>the organisation of the dependency module or artifact
to exclude, or a regexp matching this organisation <span class="since">since
1.3</span></td>
- <td>No, defaults to *</td></tr>
- <tr><td>module</td><td>the name of the dependency module or the artifact
to exclude, or a regexp matching this module name <span class="since">since
1.3</span></td>
- <td>No, defaults to *</td></tr>
- <tr><td>name</td><td>the name of an artifact of the dependency module to
add to the exclude list, or a regexp matching this name</td>
- <td>No, defaults to *</td></tr>
- <tr><td>type</td><td>the type of the artifact of the dependency module to
add to the exclude list, or a regexp matching this name</td>
- <td>No, defaults to *</td></tr>
- <tr><td>ext</td><td>the extension of the artifact of the dependency module
to add to the exclude list, or a regexp matching this name</td>
- <td>No, defaults to type</td></tr>
- <tr><td>matcher</td><td>the matcher to use to match the modules to
excludes <span class="since">since 1.3</span></td>
- <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
- <tr><td>conf</td><td>comma separated list of the master configurations in
which this artifact should be included.
- '*' wildcard can be used to designate all configurations of this
module</td>
- <td>No, defaults to '*', unless nested conf are specified</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="../../doc/ivyfile/artifact-exclude-conf.html">conf</a></td><td>configuration
in which the artifact should be included</td>
- <td>0..n</td></tr>
-</tbody>
-</table>
-
+ <textarea id="xooki-source">
+<b>Tag:</b> exclude <b>Parent:</b> <a
href="../../doc/ivyfile/dependency.html">dependency</a>
+
+This feature gives you more control on a dependency for which you do not
control its ivy file.
+It enables to restrict the artifacts required, by excluding artifacts being
published by the dependency or any of its transitive dependencies,
+even if configuration does not a good separation of published artifacts
+
+The same principle concerning configuration as for include applies to this
exclude feature (see above the include feature).
+
+Note that exclusion is always done AFTER inclusion has been done.
+
+<span class="since">since 1.3</span> This exclude feature can also be used not
only to exclude artifacts but also to exclude whole modules. Indeed when you
exclude artifacts, it doesn't avoid ivy to search for the module itself, and to
resolve the dependencies of the module. But you can also exclude the whole
module, which means that the module will not be downloaded at all, and so its
own dependencies will not be resolved. For sure, this is usually done to
exclude not a direct dependency but an indirect one. To exclude a whole module,
you just have to not specify any artifact name, type and ext in your exclude
rule. For instance:
+<code type="xml">
+<dependency name="A" rev="1.0">
+ <exclude module="B"/>
+</dependency>
+</code>
+<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>org</td><td>the organisation of the dependency module or artifact
to exclude, or a regexp matching this organisation <span class="since">since
1.3</span></td>
+ <td>No, defaults to *</td></tr>
+ <tr><td>module</td><td>the name of the dependency module or the artifact
to exclude, or a regexp matching this module name <span class="since">since
1.3</span></td>
+ <td>No, defaults to *</td></tr>
+ <tr><td>name</td><td>the name of an artifact of the dependency module to
add to the exclude list, or an expression matching this name (see matcher
attribute below)</td>
+ <td>No, defaults to *</td></tr>
+ <tr><td>type</td><td>the type of the artifact of the dependency module to
add to the exclude list, or a regexp matching this name</td>
+ <td>No, defaults to *</td></tr>
+ <tr><td>ext</td><td>the extension of the artifact of the dependency module
to add to the exclude list, or an expression matching this name (see matcher
attribute below)</td>
+ <td>No, defaults to type</td></tr>
+ <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a>
to use to match the modules to excludes <span class="since">since
1.3</span></td>
+ <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
+ <tr><td>conf</td><td>comma separated list of the master configurations in
which this artifact should be included.
+ '*' wildcard can be used to designate all configurations of this
module</td>
+ <td>No, defaults to '*', unless nested conf are specified</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="../../doc/ivyfile/artifact-exclude-conf.html">conf</a></td><td>configuration
in which the artifact should be included</td>
+ <td>0..n</td></tr>
+</tbody>
+</table>
+
</textarea>
<script type="text/javascript">xooki.postProcess();</script>
</body>
Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html?view=diff&rev=525042&r1=525041&r2=525042
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html Mon Apr 2
22:54:03 2007
@@ -23,54 +23,54 @@
<script type="text/javascript" src="../../xooki/xooki.js"></script>
</head>
<body>
- <textarea id="xooki-source">
-<b>Tag:</b> include <b>Parent:</b> <a
href="../../doc/ivyfile/dependency.html">dependency</a>
-
-This feature gives you more control on a dependency for which you do not
control its ivy file.
-It enables to restrict the artifacts required by including only the artifacts
given here, even if configuration does not a good separation of published
artifacts.
-
-Each artifact restriction can be given in the context of particular master
configurations. By default, if no configuration is specified, artifacts
restriction apply to all master configurations. But you can specify that a
restriction applies only to one or several master configurations, using either
inline or nested conf specification. In this case, do not forget that if you do
not specify any restriction for a particular configuration, then no restriction
will apply for this configuration and it will be resolved not taking into
account any restriction.
-
-For instance, imagine you have A, B & C master configurations. If you restrict
to art1 in A & B and art2 in A, then C will not be restricted at all, and will
thus get all artifacts of all dependency configurations if you do not specify a
configuration mapping. To prevent this, you have to specify a configuration
mapping for the dependency, mapping only A & B to some or all dependency
configurations.
-
-Example:
-<code type="xml">
-<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="A,B->default">
- <include name="art1" type="jar" conf="A,B"/>
- <include name="art2" type="jar" conf="A"/>
-</dependency>
-</code>
-
-<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 an artifact of the dependency module to
add to the include list, or a regexp matching this name</td>
- <td>No, defaults to .*</td></tr>
- <tr><td>type</td><td>the type of the artifact of the dependency module to
add to the include list, or a regexp matching this name</td>
- <td>No, defaults to .*</td></tr>
- <tr><td>ext</td><td>the extension of the artifact of the dependency module
to add to the include list, or a regexp matching this name</td>
- <td>No, defaults to type</td></tr>
- <tr><td>matcher</td><td>the matcher to use to match the modules to include
<span class="since">since 2.0</span></td>
- <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
- <tr><td>conf</td><td>comma separated list of the master configurations in
which this artifact should be included.
- '*' wildcard can be used to designate all configurations of this
module</td>
- <td>No, defaults to '*', unless nested conf are specified</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="../../doc/ivyfile/dependency-include-conf.html">conf</a></td><td>configuration
in which the artifact should be included</td>
- <td>0..n</td></tr>
-</tbody>
-</table>
-
+ <textarea id="xooki-source">
+<b>Tag:</b> include <b>Parent:</b> <a
href="../../doc/ivyfile/dependency.html">dependency</a>
+
+This feature gives you more control on a dependency for which you do not
control its ivy file.
+It enables to restrict the artifacts required by including only the artifacts
given here, even if configuration does not a good separation of published
artifacts.
+
+Each artifact restriction can be given in the context of particular master
configurations. By default, if no configuration is specified, artifacts
restriction apply to all master configurations. But you can specify that a
restriction applies only to one or several master configurations, using either
inline or nested conf specification. In this case, do not forget that if you do
not specify any restriction for a particular configuration, then no restriction
will apply for this configuration and it will be resolved not taking into
account any restriction.
+
+For instance, imagine you have A, B & C master configurations. If you restrict
to art1 in A & B and art2 in A, then C will not be restricted at all, and will
thus get all artifacts of all dependency configurations if you do not specify a
configuration mapping. To prevent this, you have to specify a configuration
mapping for the dependency, mapping only A & B to some or all dependency
configurations.
+
+Example:
+<code type="xml">
+<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="A,B->default">
+ <include name="art1" type="jar" conf="A,B"/>
+ <include name="art2" type="jar" conf="A"/>
+</dependency>
+</code>
+
+<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 an artifact of the dependency module to
add to the include list, or an expression matching this name (see matcher
attribute below)</td>
+ <td>No, defaults to .*</td></tr>
+ <tr><td>type</td><td>the type of the artifact of the dependency module to
add to the include list, or an expression matching this name (see matcher
attribute below)</td>
+ <td>No, defaults to .*</td></tr>
+ <tr><td>ext</td><td>the extension of the artifact of the dependency module
to add to the include list, or an expression matching this name (see matcher
attribute below)</td>
+ <td>No, defaults to type</td></tr>
+ <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a>
to use to match the modules to include <span class="since">since 2.0</span></td>
+ <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
+ <tr><td>conf</td><td>comma separated list of the master configurations in
which this artifact should be included.
+ '*' wildcard can be used to designate all configurations of this
module</td>
+ <td>No, defaults to '*', unless nested conf are specified</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="../../doc/ivyfile/dependency-include-conf.html">conf</a></td><td>configuration
in which the artifact should be included</td>
+ <td>0..n</td></tr>
+</tbody>
+</table>
+
</textarea>
<script type="text/javascript">xooki.postProcess();</script>
</body>
Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html?view=diff&rev=525042&r1=525041&r2=525042
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html Mon Apr 2 22:54:03
2007
@@ -23,35 +23,35 @@
<script type="text/javascript" src="../../xooki/xooki.js"></script>
</head>
<body>
- <textarea id="xooki-source">
-<b>Tag:</b> manager <b>Parent:</b> <a
href="../../doc/ivyfile/conflicts.html">conflicts</a><br/>
-<br/>
-Specify a a conflict manager for one or several dependencies.<br/>
-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.<br/><br/>
-
-See <a href="../../doc/ivyfile/conflicts.html">Conflicts Manager</a> for
details on conflicts manager in general.
-
-<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>org</td><td>the name, or a regexp matching the name of
organisation to which this conflict manager should apply</td>
- <td>No, defaults to * (match all)</td></tr>
- <tr><td>module</td><td>the name, or a regexp matching the name of module
to which this conflict manager should apply</td>
- <td>No, defaults to * (match all)</td></tr>
- <tr><td>name</td><td>the name of the conflict manager to use</td>
- <td rowspan="2">Exactly one of two</td></tr>
- <tr><td>rev</td><td>a comma separated list of revisions this conflict
manager should select</td></tr>
- <tr><td>matcher</td><td>the matcher to use to match the modules for which
the conflict manager should be used <span class="since">since 1.3</span></td>
- <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
-</tbody>
-</table>
-
+ <textarea id="xooki-source">
+<b>Tag:</b> manager <b>Parent:</b> <a
href="../../doc/ivyfile/conflicts.html">conflicts</a><br/>
+<br/>
+Specify a a conflict manager for one or several dependencies.<br/>
+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.<br/><br/>
+
+See <a href="../../doc/ivyfile/conflicts.html">Conflicts Manager</a> for
details on conflicts manager in general.
+
+<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>org</td><td>the name, or an expression matching the name of
organisation to which this conflict manager should apply (see matcher attribute
below)</td>
+ <td>No, defaults to * (match all)</td></tr>
+ <tr><td>module</td><td>the name, or an expression matching the name of
module to which this conflict manager should apply (see matcher attribute
below)</td>
+ <td>No, defaults to * (match all)</td></tr>
+ <tr><td>name</td><td>the name of the conflict manager to use</td>
+ <td rowspan="2">Exactly one of two</td></tr>
+ <tr><td>rev</td><td>a comma separated list of revisions this conflict
manager should select</td></tr>
+ <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a>
to use to match the modules for which the conflict manager should be used <span
class="since">since 1.3</span></td>
+ <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
+</tbody>
+</table>
+
</textarea>
<script type="text/javascript">xooki.postProcess();</script>
</body>
