incubator-ivy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r536488 [7/19] - in /incubator/ivy/core/trunk: ./ doc/ doc/doc/ doc/doc/configuration/ doc/doc/configuration/macrodef/ doc/doc/configuration/namespace/ doc/doc/ivyfile/ doc/doc/releasenotes/ doc/doc/resolver/ doc/doc/tutorial/ doc/doc/tutor...
Date Wed, 09 May 2007 10:58:16 GMT
Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency.html Wed May  9 03:58:10 2007
@@ -1,199 +1,199 @@
-<!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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> dependency <b>Parent:</b> <a href="../../doc/ivyfile/dependencies.html">dependencies</a>
-
-Declares a dependency for this module. A dependency is described by the module on which the current module depends (identified by its name, organisation and revision), and a mapping of configurations.
-
-<h2><a name="revision">Fixed and dynamic revisions</a></h2>
-The revision can be given as a fixed one (1.5.2, for instance) or as a latest (or dynamic) one. Several possibilities for dynamic revisions are implemented in Ivy:
-<ul>
-<li>latest.integration</li> selects the latest revision of the dependency module.
-<li>latest.[any status]</li> selects the latest revision of the dependency module with at least the specified status. <span class="since">since 1.4</span>
-For instance latest.milestone will select the latest version being either a milestone or a release, and latest.release will only selects the latest release. Note that in order to find the latest revision with the appropriate status Ivy has to parse all the ivy files in your repository from the last one until it finds such a revision. Hence don't be surprised if the resolution slow down.
-See also [[doc/configuration/statuses]] to see how to configure module statuses.
-<li>end the revision with a +</li> selects the latest sub-revision of the dependency module. For instance, 
-if the dependency module exists in revision 1.0.3, 1.0.7 and 1.1.2, "1.0.+" will select 1.0.7.
-<li>version ranges</li> mathematical notation for ranges can be used to match a range of version. <span class="since">since 1.4</span>  
-Examples:
-[1.0,2.0] matches all versions greater or equal to 1.0 and lower or equal to 2.0
-[1.0,2.0[ matches all versions greater or equal to 1.0 and lower than 2.0
-]1.0,2.0] matches all versions greater than 1.0 and lower or equal to 2.0
-]1.0,2.0[ matches all versions greater than 1.0 and lower than 2.0
-[1.0,) matches all versions greater or equal to 1.0
-]1.0,) matches all versions greater than 1.0
-(,2.0] matches all versions lower or equal to 2.0
-(,2.0[ matches all versions lower than 2.0 
-</ul>
-<span class="since">since 1.4</span> If you don't find a way to expression your dependency version constraint among these, you can <a href="../../doc/configuration/version-matchers.html">plug your own</a>.
-The way to determine which revision is the "latest" between two is configurable through the use of pluggable LatestStrategy. See <a href="../../doc/reference.html">ivy main concepts</a> for details about this.
-
-<h2>Configurations mapping</h2>
-This mapping indicates which configurations of the dependency are required in which configurations of the current module, also called master configurations.
-
-There are several ways to declare this mapping of configurations, choose depending more on preference than on possibilities. Try to avoid mixing usage in a single dependency element: do not use both nested and inline mapping declaration.
-
-The first way to declare this mapping is called the inline mapping. It is maybe the less natural at first, but it's powerful and concise. Inline mapping can take several forms.
-
-<ul>
-<li>Specify one configuration name</li> This means that in this master configuration the same dependency configuration is needed (except if a defaultconfmapping has been specified in this ivy file, see <a href="../../doc/ivyfile/configurations.html">configurations</a> for details, or table below for examples).
-For instance, if the current module has defined a configuration named 'runtime', and the dependency too, then having an inline mapping configuration set to 'runtime' means that in the runtime master configuration the runtime dependency configuration is required.
-
-<a name="defaultconfmapping"/>More examples:
-The table below indicates how ivy interpret the conf attribute according to how <a href="../../doc/ivyfile/configurations.html">defaultconfmapping</a> is set:<table class="ivy-attributes"><thead><tr><th>defaultconfmapping</th><th>conf</th><th>ivy interpretation</th></tr>
-</thead>
-<tbody>
-<tr><td></td><td></td><td><code>*->*</code></td></tr>
-<tr><td></td><td>runtime</td><td><code>runtime->runtime</code></td></tr>
-<tr><td></td><td>test</td><td><code>test->test</code></td></tr>
-<tr><td><code>runtime->*;test->default</code></td><td></td><td><code>runtime->*;test->default</code></td></tr>
-<tr><td><code>runtime->*;test->default</code></td><td>runtime</td><td><code>runtime->*</code></td></tr>
-<tr><td><code>runtime->*;test->default</code></td><td>test</td><td><code>test->default</code></td></tr>
-</tbody>
-</table>
-<br/>
-<li>Specify a configuration mapping using the '->' operator separating a comma separated list of master configurations (left operand) of a comma separated list of dependency configurations (right operand).</li>
-A good way to remember which side is for the master configuration (i.e. the configuration of the module defining the dependency) and which side is for the dependency configuration is to read the '->' as 'depends on'.
-
-In this case, all specified dependency configurations are required in all specified master configurations.
-For instance, 'A, B, C -> E, F' means that dependency configurations E & F are required in master configurations A, B and C.
-
-Note that you can use the wildcard '*' as a configuration name, meaning that all configurations (either master or dependency public ones depending on the side) are wanted. For instance, '* -> B, C' means that B & C dependency configurations are required in all master configurations.
-
-<span class="since">since 1.4</span> you can use * wildcard followed by negated configurations to mean all but xxx. For instance, '*, !A, !B -> X' means that X dependency configuration is required in all master configurations except A and B.
-
-<span class="since">since 1.2</span> '@' also has a special meaning as a right operand of the dependency mapping, it means map to self. This is particularly useful with '*', '*->@' meaning that all configurations of the module maps to their equivalent (same name) in the dependency.
-
-<span class="since">since 1.4</span> '#' can be used as right side operand to mean 'this' configuration, and thus refers to the configuration being resolved. It is slightly similar to @, except that it takes into account the configuration being actually resolved in case of a configuration extending another one.
-
-Example:
-Let's foo be a module with two configurations, A and B, B extending A.
-Then a dependency declaring conf A-># will get A dep conf in its confs A (when resolving A, ivy will find interpret the # symbol as A) and B dep conf in its conf B (when resolving B, ivy will interpret the # symbol as B, even if this dependency is only required because of the A dependency).
-
-See <a href="./node/514">this thread</a> on the forum for a more detailed motivation behind this keyword.
-If you don't understand really how this works, do not use :-)
-
-<span class="since">since 1.4</span> '%' can be used as left side operand to mean 'all the other configurations'. This can be usefull when you only have a specific mapping for some configurations and a default mapping for all the others.
-
-Example:
-<code>test->runtime;%->default</code> means that the <code>test</code> configuration is mapped to the <code>runtime</code> configuration, but all the other configurations are mapped to the <code>default</code> configuration.
-
-<span class="since">since 1.3</span> a fallback mechanism can be used when you are not sure that the dependency will have the required conf. You can indicate to ivy that you want one configuration, but if it isn't present, use another one. 
-The syntax for specifying this adds the fallback conf between parenthesis right after the required conf. 
-For instance, <code>test->runtime(default)</code> means that in the test configuration of the module the <code>runtime</code> conf of the dependency is required, but if doesn't exist, it will use the <code>default</code> conf instead. If <code>default</code> conf doesn't exist then it will be considered as an error. Note that the <code>*</code> wildcard can be used as fallback conf.
-
-<span class="since">since 1.4</span> you can add simple conditions in the dependency mapping. This is done by adding a condition between '[' and ']'. If the condition evaluates to <code>true</code>, the mapping is performed. If the condition evaluates to <code>false</code>, the mapping will be ignored. For instance, <code>test->[org=A]runtime,[org=B]default</code> means that the <code>test</code> configuration will be mapped to the <code>runtime</code> conf for the dependencies of organisation 'A' and to the <code>default</code> conf for dependencies of organisation 'B'.
-
-<li>Specify a semi-column separated list of any of the previous specs.</li> In this case, it is the union of the mapping which is kept. For instance, 'A -> B; * -> C' means that B conf is needed in A conf and C conf is need in all master conf... so both B & C dep conf are required in A master conf
-</ul>
-
-If you prefer more verbose mapping declaration, everything is also possible with sub elements mapping declaration. 
-
-<h2>Artifact restriction</h2>
-Moreover, the dependency element also supports an artifact restriction feature (since 0.6).
-See <a href="#dependency-artifact">dependency artifact restriction</a> for details. <br/><br/>
-
-<h2>Forcing revision</h2>
-Finally, the dependency element also supports an a force attribute (since 0.8), which gives an indication
-to conflicts manager to force the revision of a dependency to the one given here.<br/>
-See <a href="../../doc/ivyfile/conflicts.html">conflicts manager</a> for details. <br/><br/>
-
-<span class="since">since 1.4</span> this tag supports <a href="../../doc/concept#extra.html">extra attributes</a>
-<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 of the organisation of the dependency.</td>
-        <td>No, defaults to the master module organisation</td></tr>
-    <tr><td>name</td><td>the module name of the dependency</td>
-        <td>Yes</td></tr>
-    <tr><td>branch</td><td>the branch of the dependency. <span class="since">since 1.4</span></td>
-        <td>No, defaults to the default branch <a href="../../doc/configuration/conf.html">configured</a> for the dependency.</td></tr>
-    <tr><td>rev</td><td>the revision of the dependency. See <a href="#revision">above</a> for details.</td>
-        <td>Yes</td></tr>
-    <tr><td>force</td><td>a boolean to give an indication to conflict manager that this dependency 
-     should be forced to this revision (see <a href="../../doc/ivyfile/conflicts.html">conflicts manager</a>)</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>conf</td><td>an inline mapping configuration spec (see above for details)</td>
-        <td>No, defaults to defaultconf attribute of dependencies element if neither conf attribute nor conf children element is given</td></tr>
-    <tr><td>transitive</td><td>true to resolve this dependency transitively, false otherwise (<span class="since">since 1.2</span>)</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>changing</td><td>true if the dependency artifacts may change without revision change, false otherwise (<span class="since">since 1.2</span>). Artifacts update will be looked after only if the publication date of the ivy file has changed. Note that this is not a recommended use and that it avoid some cache optimization in ivy.</td>
-        <td>No, defaults to false</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-conf.html">conf</a></td><td>defines configuration mapping has sub element</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/dependency-artifact.html">artifact / include</a></td><td>defines artifacts inclusion - use only if you do not control dependency ivy file</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/artifact-exclude.html">exclude</a></td><td>defines artifacts exclusion - use only if you do not control dependency ivy file</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<dependency org="jayasoft" name="swtbinding" revision="0.2"/>
-</code>
-Declares a dependency on the module swtbinding from jayasoft in its revision 0.2. All the configuration of this dependency will be included in all configurations of the module in which the dependency is declared.
-<hr/>
-<code type="xml">
-<dependency org="jayasoft" name="swtbinding" branch="fix-103" revision="latest.integration"/>
-</code>
-Same as above except that it will take the latest revision on the branch 'fix-103' instead of revision '0.2'.
-<hr/>
-<code type="xml">
-<dependency name="mymodule" revision="latest.integration" conf="test->default"/>
-</code>
-Declares a dependency on the module <code>mymodule</code> from the same organisation as the module in which the dependency is declared. The latest available revision of this dependency will be used. This dependency will only be included in the test configuration of the module, and it's only the default configuration of the dependency which will be included.
-<hr/>
-<code type="xml">
-<dependency org="apache" name="commons-lang" revision="2.0" force="true" conf="default"/>
-</code>
-Declares a dependency on the module <code>commons-lang</code> from apache, in revision 2.0. The revision 2.0 will be used even if another dependency declares itself a dependency on another version of commons-lang. Moreover, if no defaultconfmapping is defined, only the <code>default</code> conf of commons-lang will be used in the <code>default</code> conf of the master module. If <code>*->runtime</code> was declared as defaultconfmapping, then the runtime conf of commons-lang would be included in the default conf of the master module. Note that whatever the defaultconfmapping is, the dependency only be included in the default conf of the master module. The defaultconfmapping only changes the required dependency confs.
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" revision="3.0" transitive="false" conf="default->@;runtime,test->runtime"/>
-</code>
-Declares a dependency on the module <code>bar</code> from foo, in revision 3.0. The dependencies of bar will themselves not be included due to the setting of transitive. The default dependency conf will be included in the default master conf, and the runtime dependency conf will be included in both the runtime and test master conf.
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" revision="3.0" changing="true" conf="compile->runtime(default)"/>
-</code>
-Declares a dependency on the module <code>bar</code> from foo, in revision 3.0. This revision is considered to be able to change (<code>changing="true"</code>), so even if it is already in ivy cache, Ivy will check if a revision is a more recent last modified date is available on the repository. The runtime conf of bar is required in the compile conf of the master module, but if bar doesn't define a runtime conf, then the <code>default</code> conf will be used.
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> dependency <b>Parent:</b> <a href="../../doc/ivyfile/dependencies.html">dependencies</a>
+
+Declares a dependency for this module. A dependency is described by the module on which the current module depends (identified by its name, organisation and revision), and a mapping of configurations.
+
+<h2><a name="revision">Fixed and dynamic revisions</a></h2>
+The revision can be given as a fixed one (1.5.2, for instance) or as a latest (or dynamic) one. Several possibilities for dynamic revisions are implemented in Ivy:
+<ul>
+<li>latest.integration</li> selects the latest revision of the dependency module.
+<li>latest.[any status]</li> selects the latest revision of the dependency module with at least the specified status. <span class="since">since 1.4</span>
+For instance latest.milestone will select the latest version being either a milestone or a release, and latest.release will only selects the latest release. Note that in order to find the latest revision with the appropriate status Ivy has to parse all the ivy files in your repository from the last one until it finds such a revision. Hence don't be surprised if the resolution slow down.
+See also [[doc/configuration/statuses]] to see how to configure module statuses.
+<li>end the revision with a +</li> selects the latest sub-revision of the dependency module. For instance, 
+if the dependency module exists in revision 1.0.3, 1.0.7 and 1.1.2, "1.0.+" will select 1.0.7.
+<li>version ranges</li> mathematical notation for ranges can be used to match a range of version. <span class="since">since 1.4</span>  
+Examples:
+[1.0,2.0] matches all versions greater or equal to 1.0 and lower or equal to 2.0
+[1.0,2.0[ matches all versions greater or equal to 1.0 and lower than 2.0
+]1.0,2.0] matches all versions greater than 1.0 and lower or equal to 2.0
+]1.0,2.0[ matches all versions greater than 1.0 and lower than 2.0
+[1.0,) matches all versions greater or equal to 1.0
+]1.0,) matches all versions greater than 1.0
+(,2.0] matches all versions lower or equal to 2.0
+(,2.0[ matches all versions lower than 2.0 
+</ul>
+<span class="since">since 1.4</span> If you don't find a way to expression your dependency version constraint among these, you can <a href="../../doc/configuration/version-matchers.html">plug your own</a>.
+The way to determine which revision is the "latest" between two is configurable through the use of pluggable LatestStrategy. See <a href="../../doc/reference.html">ivy main concepts</a> for details about this.
+
+<h2>Configurations mapping</h2>
+This mapping indicates which configurations of the dependency are required in which configurations of the current module, also called master configurations.
+
+There are several ways to declare this mapping of configurations, choose depending more on preference than on possibilities. Try to avoid mixing usage in a single dependency element: do not use both nested and inline mapping declaration.
+
+The first way to declare this mapping is called the inline mapping. It is maybe the less natural at first, but it's powerful and concise. Inline mapping can take several forms.
+
+<ul>
+<li>Specify one configuration name</li> This means that in this master configuration the same dependency configuration is needed (except if a defaultconfmapping has been specified in this ivy file, see <a href="../../doc/ivyfile/configurations.html">configurations</a> for details, or table below for examples).
+For instance, if the current module has defined a configuration named 'runtime', and the dependency too, then having an inline mapping configuration set to 'runtime' means that in the runtime master configuration the runtime dependency configuration is required.
+
+<a name="defaultconfmapping"/>More examples:
+The table below indicates how ivy interpret the conf attribute according to how <a href="../../doc/ivyfile/configurations.html">defaultconfmapping</a> is set:<table class="ivy-attributes"><thead><tr><th>defaultconfmapping</th><th>conf</th><th>ivy interpretation</th></tr>
+</thead>
+<tbody>
+<tr><td></td><td></td><td><code>*->*</code></td></tr>
+<tr><td></td><td>runtime</td><td><code>runtime->runtime</code></td></tr>
+<tr><td></td><td>test</td><td><code>test->test</code></td></tr>
+<tr><td><code>runtime->*;test->default</code></td><td></td><td><code>runtime->*;test->default</code></td></tr>
+<tr><td><code>runtime->*;test->default</code></td><td>runtime</td><td><code>runtime->*</code></td></tr>
+<tr><td><code>runtime->*;test->default</code></td><td>test</td><td><code>test->default</code></td></tr>
+</tbody>
+</table>
+<br/>
+<li>Specify a configuration mapping using the '->' operator separating a comma separated list of master configurations (left operand) of a comma separated list of dependency configurations (right operand).</li>
+A good way to remember which side is for the master configuration (i.e. the configuration of the module defining the dependency) and which side is for the dependency configuration is to read the '->' as 'depends on'.
+
+In this case, all specified dependency configurations are required in all specified master configurations.
+For instance, 'A, B, C -> E, F' means that dependency configurations E & F are required in master configurations A, B and C.
+
+Note that you can use the wildcard '*' as a configuration name, meaning that all configurations (either master or dependency public ones depending on the side) are wanted. For instance, '* -> B, C' means that B & C dependency configurations are required in all master configurations.
+
+<span class="since">since 1.4</span> you can use * wildcard followed by negated configurations to mean all but xxx. For instance, '*, !A, !B -> X' means that X dependency configuration is required in all master configurations except A and B.
+
+<span class="since">since 1.2</span> '@' also has a special meaning as a right operand of the dependency mapping, it means map to self. This is particularly useful with '*', '*->@' meaning that all configurations of the module maps to their equivalent (same name) in the dependency.
+
+<span class="since">since 1.4</span> '#' can be used as right side operand to mean 'this' configuration, and thus refers to the configuration being resolved. It is slightly similar to @, except that it takes into account the configuration being actually resolved in case of a configuration extending another one.
+
+Example:
+Let's foo be a module with two configurations, A and B, B extending A.
+Then a dependency declaring conf A-># will get A dep conf in its confs A (when resolving A, ivy will find interpret the # symbol as A) and B dep conf in its conf B (when resolving B, ivy will interpret the # symbol as B, even if this dependency is only required because of the A dependency).
+
+See <a href="./node/514">this thread</a> on the forum for a more detailed motivation behind this keyword.
+If you don't understand really how this works, do not use :-)
+
+<span class="since">since 1.4</span> '%' can be used as left side operand to mean 'all the other configurations'. This can be usefull when you only have a specific mapping for some configurations and a default mapping for all the others.
+
+Example:
+<code>test->runtime;%->default</code> means that the <code>test</code> configuration is mapped to the <code>runtime</code> configuration, but all the other configurations are mapped to the <code>default</code> configuration.
+
+<span class="since">since 1.3</span> a fallback mechanism can be used when you are not sure that the dependency will have the required conf. You can indicate to ivy that you want one configuration, but if it isn't present, use another one. 
+The syntax for specifying this adds the fallback conf between parenthesis right after the required conf. 
+For instance, <code>test->runtime(default)</code> means that in the test configuration of the module the <code>runtime</code> conf of the dependency is required, but if doesn't exist, it will use the <code>default</code> conf instead. If <code>default</code> conf doesn't exist then it will be considered as an error. Note that the <code>*</code> wildcard can be used as fallback conf.
+
+<span class="since">since 1.4</span> you can add simple conditions in the dependency mapping. This is done by adding a condition between '[' and ']'. If the condition evaluates to <code>true</code>, the mapping is performed. If the condition evaluates to <code>false</code>, the mapping will be ignored. For instance, <code>test->[org=A]runtime,[org=B]default</code> means that the <code>test</code> configuration will be mapped to the <code>runtime</code> conf for the dependencies of organisation 'A' and to the <code>default</code> conf for dependencies of organisation 'B'.
+
+<li>Specify a semi-column separated list of any of the previous specs.</li> In this case, it is the union of the mapping which is kept. For instance, 'A -> B; * -> C' means that B conf is needed in A conf and C conf is need in all master conf... so both B & C dep conf are required in A master conf
+</ul>
+
+If you prefer more verbose mapping declaration, everything is also possible with sub elements mapping declaration. 
+
+<h2>Artifact restriction</h2>
+Moreover, the dependency element also supports an artifact restriction feature (since 0.6).
+See <a href="#dependency-artifact">dependency artifact restriction</a> for details. <br/><br/>
+
+<h2>Forcing revision</h2>
+Finally, the dependency element also supports an a force attribute (since 0.8), which gives an indication
+to conflicts manager to force the revision of a dependency to the one given here.<br/>
+See <a href="../../doc/ivyfile/conflicts.html">conflicts manager</a> for details. <br/><br/>
+
+<span class="since">since 1.4</span> this tag supports <a href="../../doc/concept#extra.html">extra attributes</a>
+<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 of the organisation of the dependency.</td>
+        <td>No, defaults to the master module organisation</td></tr>
+    <tr><td>name</td><td>the module name of the dependency</td>
+        <td>Yes</td></tr>
+    <tr><td>branch</td><td>the branch of the dependency. <span class="since">since 1.4</span></td>
+        <td>No, defaults to the default branch <a href="../../doc/configuration/conf.html">configured</a> for the dependency.</td></tr>
+    <tr><td>rev</td><td>the revision of the dependency. See <a href="#revision">above</a> for details.</td>
+        <td>Yes</td></tr>
+    <tr><td>force</td><td>a boolean to give an indication to conflict manager that this dependency 
+     should be forced to this revision (see <a href="../../doc/ivyfile/conflicts.html">conflicts manager</a>)</td>
+        <td>No, defaults to false</td></tr>
+    <tr><td>conf</td><td>an inline mapping configuration spec (see above for details)</td>
+        <td>No, defaults to defaultconf attribute of dependencies element if neither conf attribute nor conf children element is given</td></tr>
+    <tr><td>transitive</td><td>true to resolve this dependency transitively, false otherwise (<span class="since">since 1.2</span>)</td>
+        <td>No, defaults to true</td></tr>
+    <tr><td>changing</td><td>true if the dependency artifacts may change without revision change, false otherwise (<span class="since">since 1.2</span>). Artifacts update will be looked after only if the publication date of the ivy file has changed. Note that this is not a recommended use and that it avoid some cache optimization in ivy.</td>
+        <td>No, defaults to false</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-conf.html">conf</a></td><td>defines configuration mapping has sub element</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../../doc/ivyfile/dependency-artifact.html">artifact / include</a></td><td>defines artifacts inclusion - use only if you do not control dependency ivy file</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../../doc/ivyfile/artifact-exclude.html">exclude</a></td><td>defines artifacts exclusion - use only if you do not control dependency ivy file</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+
+<h1>Examples</h1>
+<code type="xml">
+<dependency org="jayasoft" name="swtbinding" revision="0.2"/>
+</code>
+Declares a dependency on the module swtbinding from jayasoft in its revision 0.2. All the configuration of this dependency will be included in all configurations of the module in which the dependency is declared.
+<hr/>
+<code type="xml">
+<dependency org="jayasoft" name="swtbinding" branch="fix-103" revision="latest.integration"/>
+</code>
+Same as above except that it will take the latest revision on the branch 'fix-103' instead of revision '0.2'.
+<hr/>
+<code type="xml">
+<dependency name="mymodule" revision="latest.integration" conf="test->default"/>
+</code>
+Declares a dependency on the module <code>mymodule</code> from the same organisation as the module in which the dependency is declared. The latest available revision of this dependency will be used. This dependency will only be included in the test configuration of the module, and it's only the default configuration of the dependency which will be included.
+<hr/>
+<code type="xml">
+<dependency org="apache" name="commons-lang" revision="2.0" force="true" conf="default"/>
+</code>
+Declares a dependency on the module <code>commons-lang</code> from apache, in revision 2.0. The revision 2.0 will be used even if another dependency declares itself a dependency on another version of commons-lang. Moreover, if no defaultconfmapping is defined, only the <code>default</code> conf of commons-lang will be used in the <code>default</code> conf of the master module. If <code>*->runtime</code> was declared as defaultconfmapping, then the runtime conf of commons-lang would be included in the default conf of the master module. Note that whatever the defaultconfmapping is, the dependency only be included in the default conf of the master module. The defaultconfmapping only changes the required dependency confs.
+<hr/>
+<code type="xml">
+<dependency org="foo" name="bar" revision="3.0" transitive="false" conf="default->@;runtime,test->runtime"/>
+</code>
+Declares a dependency on the module <code>bar</code> from foo, in revision 3.0. The dependencies of bar will themselves not be included due to the setting of transitive. The default dependency conf will be included in the default master conf, and the runtime dependency conf will be included in both the runtime and test master conf.
+<hr/>
+<code type="xml">
+<dependency org="foo" name="bar" revision="3.0" changing="true" conf="compile->runtime(default)"/>
+</code>
+Declares a dependency on the module <code>bar</code> from foo, in revision 3.0. This revision is considered to be able to change (<code>changing="true"</code>), so even if it is already in ivy cache, Ivy will check if a revision is a more recent last modified date is available on the repository. The runtime conf of bar is required in the compile conf of the master module, but if bar doesn't define a runtime conf, then the <code>default</code> conf will be used.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/description.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/description.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/description.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/description.html Wed May  9 03:58:10 2007
@@ -1,49 +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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> description <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
-<br/>
-Describes the current module. This tag is the only one which can contain free text,
-including html. It is used to describe the module itself, usually in a single short phrase
-(it is not meant to replace the module description on the corresponding web site), and then
-gives all information necessary to use the module, especially information about
-public configurations, how and when to use them.
-<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>homepage</td><td>the url of the homepage of the module</td>
-        <td>No, but it's recommended to indicate it.</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> description <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
+<br/>
+Describes the current module. This tag is the only one which can contain free text,
+including html. It is used to describe the module itself, usually in a single short phrase
+(it is not meant to replace the module description on the corresponding web site), and then
+gives all information necessary to use the module, especially information about
+public configurations, how and when to use them.
+<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>homepage</td><td>the url of the homepage of the module</td>
+        <td>No, but it's recommended to indicate it.</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/description.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/include.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/include.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/include.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/include.html Wed May  9 03:58:10 2007
@@ -1,75 +1,75 @@
-<!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: 2};</script>	
-	<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/configurations.html">configurations</a>
-
-Include configurations specified in another file. <span class="since">since 1.3</span>
-
-The included file should have a configurations tag as root tag, which follow the same specification as the <a href="../../doc/ivyfile/configurations.html">configurations</a> tag of the ivy file. 
-
-This means that it can contain conf declarations, other file inclusion, and also a defaultconfmapping.
-
-When delivering an ivy file with such an inclusion, the included configuration file is inlined, i.e. ivy remove the dependency on the external file.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>file</td><td>the file to include</td>
-        <td>Yes</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivy-module version="1.0">
-  <info organisation="myorg"
-         module="mymodule"
-  />
-  <configurations>
-    <include file="path/to/included-configurations.xml"/>
-    <conf name="conf3"/>
-  </configurations>
-  <dependencies>
-    <dependency name="mymodule1" rev="1.0"/>
-    <dependency name="mymodule2" rev="2.0" conf="conf2,conf3->*"/>
-  </dependencies>
-</ivy-module>
-</code>
-with included-configurations.xml like this:
-<code type="xml">
-<configurations defaultconfmapping="*->@">
-  <conf name="conf1" visibility="public"/>
-  <conf name="conf2" visibility="private"/>
-</configurations>
-</code>
-Defines 3 configurations, conf1, conf2 and conf3. mymodule1 is required in each configuration, with for each the same configuration (conf1 is needed in conf1, conf2 in conf2, and conf3 in conf3) due to the defaultconfmapping defined in the included file.
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<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/configurations.html">configurations</a>
+
+Include configurations specified in another file. <span class="since">since 1.3</span>
+
+The included file should have a configurations tag as root tag, which follow the same specification as the <a href="../../doc/ivyfile/configurations.html">configurations</a> tag of the ivy file. 
+
+This means that it can contain conf declarations, other file inclusion, and also a defaultconfmapping.
+
+When delivering an ivy file with such an inclusion, the included configuration file is inlined, i.e. ivy remove the dependency on the external file.
+
+<h1>Attributes</h1>
+<table class="ivy-attributes">
+<thead>
+    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
+</thead>
+<tbody>
+    <tr><td>file</td><td>the file to include</td>
+        <td>Yes</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<ivy-module version="1.0">
+  <info organisation="myorg"
+         module="mymodule"
+  />
+  <configurations>
+    <include file="path/to/included-configurations.xml"/>
+    <conf name="conf3"/>
+  </configurations>
+  <dependencies>
+    <dependency name="mymodule1" rev="1.0"/>
+    <dependency name="mymodule2" rev="2.0" conf="conf2,conf3->*"/>
+  </dependencies>
+</ivy-module>
+</code>
+with included-configurations.xml like this:
+<code type="xml">
+<configurations defaultconfmapping="*->@">
+  <conf name="conf1" visibility="public"/>
+  <conf name="conf2" visibility="private"/>
+</configurations>
+</code>
+Defines 3 configurations, conf1, conf2 and conf3. mymodule1 is required in each configuration, with for each the same configuration (conf1 is needed in conf1, conf2 in conf2, and conf3 in conf3) due to the defaultconfmapping defined in the included file.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/include.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/info.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/info.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/info.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/info.html Wed May  9 03:58:10 2007
@@ -1,74 +1,74 @@
-<!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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> info <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a>
-
-Gives information about the module this ivy file describe.
-
-<span class="since">since 1.4</span> This tag supports <a href="../../doc/concept#extra.html">extra attributes</a>.
-
-<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 that is the owner of this module.</td>
-        <td>Yes</td></tr>
-    <tr><td>module</td><td>the name of the module described by this ivy file.</td>
-        <td>Yes</td></tr>
-    <tr><td>branch</td><td>the branch of this module. <span class="since">since 1.4</span></td>
-        <td>No, defaults to the default branch <a href="../../doc/configuration/conf.html">configured</a>, or nothing if no default branch is configured</td></tr>
-    <tr><td>revision</td><td>the revision of this module.</td>
-        <td>Yes in repository ivy files, no in ivy files to resolve</td></tr>
-    <tr><td>status</td><td>the status of this module. See <a href="../../doc/reference.html">terminology</a> section for details</td>
-        <td>No, default to 'integration'</td></tr>
-    <tr><td>publication</td><td>the date of publication of this module. It should be given in this format: yyyyMMddHHmmss</td>
-        <td>No, but it's a good practice to set it with delivered ivy files</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/license.html">license</a></td><td>contains information about the licenses of the described module</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/ivyauthor.html">ivyauthor</a></td><td>describes who has contributed to write the ivy file</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/repository.html">repository</a></td><td>describes on which public repositories this module can be found</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/.html">description</a></td><td>describes how to use the module</td>
-        <td>0..1</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> info <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a>
+
+Gives information about the module this ivy file describe.
+
+<span class="since">since 1.4</span> This tag supports <a href="../../doc/concept#extra.html">extra attributes</a>.
+
+<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 that is the owner of this module.</td>
+        <td>Yes</td></tr>
+    <tr><td>module</td><td>the name of the module described by this ivy file.</td>
+        <td>Yes</td></tr>
+    <tr><td>branch</td><td>the branch of this module. <span class="since">since 1.4</span></td>
+        <td>No, defaults to the default branch <a href="../../doc/configuration/conf.html">configured</a>, or nothing if no default branch is configured</td></tr>
+    <tr><td>revision</td><td>the revision of this module.</td>
+        <td>Yes in repository ivy files, no in ivy files to resolve</td></tr>
+    <tr><td>status</td><td>the status of this module. See <a href="../../doc/reference.html">terminology</a> section for details</td>
+        <td>No, default to 'integration'</td></tr>
+    <tr><td>publication</td><td>the date of publication of this module. It should be given in this format: yyyyMMddHHmmss</td>
+        <td>No, but it's a good practice to set it with delivered ivy files</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/license.html">license</a></td><td>contains information about the licenses of the described module</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../../doc/ivyfile/ivyauthor.html">ivyauthor</a></td><td>describes who has contributed to write the ivy file</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../../doc/ivyfile/repository.html">repository</a></td><td>describes on which public repositories this module can be found</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../../doc/ivyfile/.html">description</a></td><td>describes how to use the module</td>
+        <td>0..1</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/info.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/ivyauthor.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/ivyauthor.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/ivyauthor.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/ivyauthor.html Wed May  9 03:58:10 2007
@@ -1,48 +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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> ivyauthor <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
-<br/>
-Gives information about who has contributed to write this ivy file. It does NOT indicate who 
-is the author of the module itself.
-<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 author, as a person or a company.</td>
-        <td>Yes</td></tr>
-    <tr><td>url</td><td>an url pointing to where the author can bea reached.</td>
-        <td>No, but it's a good practice to indicate it</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> ivyauthor <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
+<br/>
+Gives information about who has contributed to write this ivy file. It does NOT indicate who 
+is the author of the module itself.
+<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 author, as a person or a company.</td>
+        <td>Yes</td></tr>
+    <tr><td>url</td><td>an url pointing to where the author can bea reached.</td>
+        <td>No, but it's a good practice to indicate it</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/ivyauthor.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/license.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/license.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/license.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/license.html Wed May  9 03:58:10 2007
@@ -1,47 +1,47 @@
-<!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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> license <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
-<br/>
-Gives information about a license of the described module.
-<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 license. Try to respect spelling when using a classical license.</td>
-        <td>Yes</td></tr>
-    <tr><td>url</td><td>an url pointing to the license text.</td>
-        <td>No, but it's a good practice to indicate it</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> license <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
+<br/>
+Gives information about a license of the described module.
+<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 license. Try to respect spelling when using a classical license.</td>
+        <td>Yes</td></tr>
+    <tr><td>url</td><td>an url pointing to the license text.</td>
+        <td>No, but it's a good practice to indicate it</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/license.html
------------------------------------------------------------------------------
    svn:eol-style = LF

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=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html Wed May  9 03:58:10 2007
@@ -1,59 +1,59 @@
-<!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: 2};</script>	
-	<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 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>
-</html>
+<!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: 2};</script>	
+	<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 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>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/mapped.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/mapped.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/mapped.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/mapped.html Wed May  9 03:58:10 2007
@@ -1,47 +1,47 @@
-<!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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> mapped <b>Parent:</b> <a href="../../doc/ivyfile/dependency-conf.html">conf</a><br/>
-<br/>
-Describes a mapped dependency configuration for a master configuration.
-
-<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 dependency configuration mapped. 
-    	'*' wildcard can be used to designate all configurations of this module</td>
-        <td>Yes</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> mapped <b>Parent:</b> <a href="../../doc/ivyfile/dependency-conf.html">conf</a><br/>
+<br/>
+Describes a mapped dependency configuration for a master configuration.
+
+<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 dependency configuration mapped. 
+    	'*' wildcard can be used to designate all configurations of this module</td>
+        <td>Yes</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/mapped.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/publications.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/publications.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/publications.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/publications.html Wed May  9 03:58:10 2007
@@ -1,50 +1,50 @@
-<!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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> publications <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a><br/><br/>
-
-Container for artifact elements, used to describe the artifacts published by this module. 
-If this container is not present, it is assumed that the module has one artifact, with the same name
-as the module, and published in all module configurations.<br/>
-Thus if you have a module which publishes no artifacts (a sort of virtual module, 
-made only to integrate several other modules as a whole), you have to include
-a publications element with no artifact sub element.
-<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>artifact</td><td>declares a published artifact for this module</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> publications <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a><br/><br/>
+
+Container for artifact elements, used to describe the artifacts published by this module. 
+If this container is not present, it is assumed that the module has one artifact, with the same name
+as the module, and published in all module configurations.<br/>
+Thus if you have a module which publishes no artifacts (a sort of virtual module, 
+made only to integrate several other modules as a whole), you have to include
+a publications element with no artifact sub element.
+<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>artifact</td><td>declares a published artifact for this module</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/publications.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/repository.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/repository.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/repository.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/repository.html Wed May  9 03:58:10 2007
@@ -1,54 +1,54 @@
-<!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: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> repository <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
-<br/>
-Gives information about a public repository where the module can be found. This information
-is given as an indication, repositories being able to be down over time.
-<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 repository. Try to respect spelling for common repositories (ibiblio, ivyrep, ...)</td>
-        <td>Yes</td></tr>
-    <tr><td>url</td><td>an url pointing to the repository.</td>
-        <td>Yes</td></tr>
-    <tr><td>pattern</td><td>an ivy pattern to find modules on this repository</td>
-        <td>No, but it's recommended to indicate it.</td></tr>
-    <tr><td>ivys</td><td>true if ivy file can be found on this repository</td>
-        <td>No, defaults to false.</td></tr>
-    <tr><td>artifacts</td><td>true if module artifacts can be found on this repository</td>
-        <td>No, defaults to false.</td></tr>
-</tbody>
-</table>
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!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: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> repository <b>Parent:</b> <a href="../../doc/ivyfile/info.html">info</a><br/>
+<br/>
+Gives information about a public repository where the module can be found. This information
+is given as an indication, repositories being able to be down over time.
+<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 repository. Try to respect spelling for common repositories (ibiblio, ivyrep, ...)</td>
+        <td>Yes</td></tr>
+    <tr><td>url</td><td>an url pointing to the repository.</td>
+        <td>Yes</td></tr>
+    <tr><td>pattern</td><td>an ivy pattern to find modules on this repository</td>
+        <td>No, but it's recommended to indicate it.</td></tr>
+    <tr><td>ivys</td><td>true if ivy file can be found on this repository</td>
+        <td>No, defaults to false.</td></tr>
+    <tr><td>artifacts</td><td>true if module artifacts can be found on this repository</td>
+        <td>No, defaults to false.</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/ivyfile/repository.html
------------------------------------------------------------------------------
    svn:eol-style = LF



Mime
View raw message