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 [6/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/artifact.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/artifact.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/artifact.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/artifact.html Wed May  9 03:58:10 2007
@@ -1,94 +1,94 @@
-<!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> artifact <b>Parent:</b> <a href="../../doc/ivyfile/publications.html">publications</a>
-
-Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see <a href="../../doc/ivyfile/conf.html">configuration declaration</a>).
-
-The configurations in which an artifact is published can be configured in two ways:
-<ul>
-<li>conf attribute on artifact element</li>
-<li>conf subelement</li>
-</ul>
-The twos are equivalent, it is only a matter of preference. However, do not mix both for one artifact.
-
-<span class="since">since 1.4</span> The artifact element as default values for all its attributes, so if you want to declare a default artifact you can just declare it like that:<code type="xml">
-<artifact />
-</code>If this is the only artifact declared, then it's equivalent to having no publication section at all.
-
-<span class="since">since 1.4</span> It is possible to give a url at which artifacts can be found. This is not mandatory, and even not recommended. This is only a convenient way to deal with an existing repository with a bad layout, but should not be avoided in an enterprise repository.
-
-<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 published artifact. This name must not include revision.</td>
-        <td>No, defaults to the name of the module</td></tr>
-    <tr><td>type</td><td>the type of the published artifact. It's usually its extension, but not necessarily. For instance, ivy files are of type 'ivy' but have 'xml' extension</td>
-        <td>No, defaults to jar</td></tr>
-    <tr><td>ext</td><td>the extension of the published artifact</td>
-        <td>No, defaults to type</td></tr>
-    <tr><td>conf</td><td>comma separated list of public configurations in which this artifact is published.
-    	'*' wildcard can be used to designate all public configurations of this module</td>
-        <td>No, defaults to '*' if neither conf attribute nor conf children element is given</td></tr>
-    <tr><td>url</td><td>a url at which this artifact can be found if it isn't located at the standard location in the repository <span class="since">since 1.4</span></td>
-        <td>No, defaults to no url</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-conf.html">conf</a></td><td>indicates a public configuration in which this artifact is published</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<artifact />
-</code>
-Declares an artifact with the name of the module as name, type and ext jar, and published in all configurations.
-
-<hr />
-<code type="xml">
-<artifact name="foo-src" type="source" ext="zip" conf="src" />
-</code>
-Declares an artifact foo-src, of type 'source' with extension 'zip', and published in the src configuration.
-
-<hr />
-<code type="xml">
-<artifact name="foo" url="http://www.acme.com/repository/barbaz/foo-1.2-bar.jar" />
-</code>
-Declares an artifact foo, of type and extension 'jar' located at the url http://www.acme.com/repository/barbaz/foo-1.2-bar.jar. This url will only be used if the artifact cannot be found at its standard location.
-	</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> artifact <b>Parent:</b> <a href="../../doc/ivyfile/publications.html">publications</a>
+
+Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see <a href="../../doc/ivyfile/conf.html">configuration declaration</a>).
+
+The configurations in which an artifact is published can be configured in two ways:
+<ul>
+<li>conf attribute on artifact element</li>
+<li>conf subelement</li>
+</ul>
+The twos are equivalent, it is only a matter of preference. However, do not mix both for one artifact.
+
+<span class="since">since 1.4</span> The artifact element as default values for all its attributes, so if you want to declare a default artifact you can just declare it like that:<code type="xml">
+<artifact />
+</code>If this is the only artifact declared, then it's equivalent to having no publication section at all.
+
+<span class="since">since 1.4</span> It is possible to give a url at which artifacts can be found. This is not mandatory, and even not recommended. This is only a convenient way to deal with an existing repository with a bad layout, but should not be avoided in an enterprise repository.
+
+<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 published artifact. This name must not include revision.</td>
+        <td>No, defaults to the name of the module</td></tr>
+    <tr><td>type</td><td>the type of the published artifact. It's usually its extension, but not necessarily. For instance, ivy files are of type 'ivy' but have 'xml' extension</td>
+        <td>No, defaults to jar</td></tr>
+    <tr><td>ext</td><td>the extension of the published artifact</td>
+        <td>No, defaults to type</td></tr>
+    <tr><td>conf</td><td>comma separated list of public configurations in which this artifact is published.
+    	'*' wildcard can be used to designate all public configurations of this module</td>
+        <td>No, defaults to '*' if neither conf attribute nor conf children element is given</td></tr>
+    <tr><td>url</td><td>a url at which this artifact can be found if it isn't located at the standard location in the repository <span class="since">since 1.4</span></td>
+        <td>No, defaults to no url</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-conf.html">conf</a></td><td>indicates a public configuration in which this artifact is published</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<artifact />
+</code>
+Declares an artifact with the name of the module as name, type and ext jar, and published in all configurations.
+
+<hr />
+<code type="xml">
+<artifact name="foo-src" type="source" ext="zip" conf="src" />
+</code>
+Declares an artifact foo-src, of type 'source' with extension 'zip', and published in the src configuration.
+
+<hr />
+<code type="xml">
+<artifact name="foo" url="http://www.acme.com/repository/barbaz/foo-1.2-bar.jar" />
+</code>
+Declares an artifact foo, of type and extension 'jar' located at the url http://www.acme.com/repository/barbaz/foo-1.2-bar.jar. This url will only be used if the artifact cannot be found at its standard location.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/conf.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/conf.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/conf.html Wed May  9 03:58:10 2007
@@ -1,86 +1,86 @@
-<!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> conf <b>Parent:</b> <a href="../../doc/ivyfile/configurations.html">configurations</a>
-
-Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in ivy configurations.
-
-The conf element in the configurations section declares one configuration. This declaration gives the name of the configuration declared, its visibility and the other configurations of the module it extends.
-
-Visibility is used to indicate whether or not a configuration can be used from other modules depending on this one. Thus a private configuration is only used for internal purpose (maybe at build time), and other modules cannot declare to depend on it. 
-
-A configuration can also extend one or several other ones of the same module. When a configuration extends another one, then all artifacts required in the extended configuration will also be required in the configuration that extends the other one. For instance, if configuration B extends configuration A, and if artifacts art1 and art2 are required in configuration A, then they will be automatically required in configuration B. On the other hand, artifacts required in configuration B are not necessarily required in configuration A.
-
-This notion is very helpful to define configurations which are similar with some differences.
-
-<span class="since">since 1.4</span> The extends attribute can use the following wildcards:<table class="ivy-attributes">
-<tr><td>*</td><td>all other configurations</td></tr>
-<tr><td>*(public)</td><td>all other public configurations</td></tr>
-<tr><td>*(private)</td><td>all other private configurations</td></tr>
-</table>
-<br/>
-
-<span class="since">since 1.4</span> A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivityy enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
-This is very useful to build a compile configuration, for instance, forcing the dependency declaration on each direct dependency, with no risk to forget some because of transitivity.
-
-<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>name</td><td>the name of the declared configuration</td>
-        <td>Yes</td></tr>
-    <tr><td>description</td><td>a description for the declared configuration</td>
-        <td>No</td></tr>
-    <tr><td>visibility</td><td>the visibility of the declared configuration. 
-    'public' means that this configuration can be used by other modules, while 'private' means that this configuration is used only in the module itself, and is not exposed to other modules</td>
-        <td>No, defaults to public</td></tr>
-    <tr><td>extends</td><td>a comma separated list of configurations of this module that the 
-    current configuration extends</td>
-        <td>No, defaults to none</td></tr>
-    <tr><td>transitive</td><td>a boolean to indicate if this conf is transitive or not <span class="since">since 1.4</span></td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>deprecated</td><td>indicates that this conf has been deprecated by giving the date of the deprecation. 
-    	It should be given in this format: yyyyMMddHHmmss</td>
-        <td>No, by default the conf is not deprecated</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<conf name="core" visibility="private" />
-<conf name="compile" extends="core" transitive="false" visibility="private" />
-<conf name="runtime" extends="compile" description="everything needed to run this module" />
-</code>
-Declares three configurations, core compile and runtime, with only the runtime one accessible from other modules, and with the compile one being non transitive.
-Therefore the core configuration will only be composed of dependencies declared in the core configuration itself, the compile configuration will be composed of all dependencies required in either core or compile configuration, but without transivity (neither for core nor compile dependencies), and runtime will be composed of all dependencies, all transitively, including the dependencies declared only in compile.
-	</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> conf <b>Parent:</b> <a href="../../doc/ivyfile/configurations.html">configurations</a>
+
+Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in ivy configurations.
+
+The conf element in the configurations section declares one configuration. This declaration gives the name of the configuration declared, its visibility and the other configurations of the module it extends.
+
+Visibility is used to indicate whether or not a configuration can be used from other modules depending on this one. Thus a private configuration is only used for internal purpose (maybe at build time), and other modules cannot declare to depend on it. 
+
+A configuration can also extend one or several other ones of the same module. When a configuration extends another one, then all artifacts required in the extended configuration will also be required in the configuration that extends the other one. For instance, if configuration B extends configuration A, and if artifacts art1 and art2 are required in configuration A, then they will be automatically required in configuration B. On the other hand, artifacts required in configuration B are not necessarily required in configuration A.
+
+This notion is very helpful to define configurations which are similar with some differences.
+
+<span class="since">since 1.4</span> The extends attribute can use the following wildcards:<table class="ivy-attributes">
+<tr><td>*</td><td>all other configurations</td></tr>
+<tr><td>*(public)</td><td>all other public configurations</td></tr>
+<tr><td>*(private)</td><td>all other private configurations</td></tr>
+</table>
+<br/>
+
+<span class="since">since 1.4</span> A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivityy enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
+This is very useful to build a compile configuration, for instance, forcing the dependency declaration on each direct dependency, with no risk to forget some because of transitivity.
+
+<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>name</td><td>the name of the declared configuration</td>
+        <td>Yes</td></tr>
+    <tr><td>description</td><td>a description for the declared configuration</td>
+        <td>No</td></tr>
+    <tr><td>visibility</td><td>the visibility of the declared configuration. 
+    'public' means that this configuration can be used by other modules, while 'private' means that this configuration is used only in the module itself, and is not exposed to other modules</td>
+        <td>No, defaults to public</td></tr>
+    <tr><td>extends</td><td>a comma separated list of configurations of this module that the 
+    current configuration extends</td>
+        <td>No, defaults to none</td></tr>
+    <tr><td>transitive</td><td>a boolean to indicate if this conf is transitive or not <span class="since">since 1.4</span></td>
+        <td>No, defaults to true</td></tr>
+    <tr><td>deprecated</td><td>indicates that this conf has been deprecated by giving the date of the deprecation. 
+    	It should be given in this format: yyyyMMddHHmmss</td>
+        <td>No, by default the conf is not deprecated</td></tr>
+</tbody>
+</table>
+
+<h1>Examples</h1>
+<code type="xml">
+<conf name="core" visibility="private" />
+<conf name="compile" extends="core" transitive="false" visibility="private" />
+<conf name="runtime" extends="compile" description="everything needed to run this module" />
+</code>
+Declares three configurations, core compile and runtime, with only the runtime one accessible from other modules, and with the compile one being non transitive.
+Therefore the core configuration will only be composed of dependencies declared in the core configuration itself, the compile configuration will be composed of all dependencies required in either core or compile configuration, but without transivity (neither for core nor compile dependencies), and runtime will be composed of all dependencies, all transitively, including the dependencies declared only in compile.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/configurations.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/configurations.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/configurations.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/configurations.html Wed May  9 03:58:10 2007
@@ -1,92 +1,92 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> configurations <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a>
-
-Container for configuration element. If this container is not present, it is assumed that the module has one public configuration called 'default'.
-
-<span class="since">since 1.3</span> You can define a new default conf mapping on this container by specifying the defaultconfmapping attribute.
-
-A default conf mapping is very similar to the defaultconf which can be set on the dependencies tag, but it has a slightly different behaviour. 
-The default conf mapping not only defines the conf mapping to use when no conf mapping is specified for a dependency in this ivy file, but it also modify the way ivy interprets conf mapping with no mapped conf. In this case, Ivy will look in the default conf mapping and use the conf mapping defined in the default conf mapping for the conf for which there is no mapped conf.
-
-See <a href="../../doc/ivyfile/dependency#defaultconfmapping.html">examples on the dependency</a> page.
-
-<span class="since">since 1.4</span> You can activate a confmappingoverride mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
-
-
-<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>defaultconfmapping</td><td>the default conf mapping to use in this ivy file <span class="since">since 1.3</span></td>
-        <td>No, defaults to no default conf mapping</td></tr>
-    <tr><td>confmappingoverride</td><td>true to activate configuration mapping override, false otherwise <span class="since">since 1.4</span></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/conf.html">conf</a></td><td>declares a configuration of this module</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/include.html">include</a></td><td>include configurations from another file</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Configuration mappings details</h1>
-When Ivy parses your Ivy file, it will create (internally) modify the configuration mapping of your dependencies.
-For instance, say you have:
-<code type="xml">
-<configurations defaultconfmapping="conf1->other1;conf2->other2">
-   <conf name="conf1" />
-   <conf name="conf2" extends="conf1" />
-</configurations>
-<dependencies>
-   <dependency name="other-module" conf="conf1" />
-</dependencies>
-</code>
-When Ivy parses this file, it will construct the following dependency (in-memory only):
-<code type="xml"><dependency name="other-module" conf="conf1->other1" /></code>
-
-So, if you now resolve the conf2 configuration, you will only get the other1 dependencies of your other-module.
-
-But when you set confmappingoverride to true, Ivy will construct the following dependency in memory:
-<code type="xml"><dependency name="other-module" conf="conf1->other1;conf2->other2" /></code>
-As you can see, the defaultmappings of the extending configurations are also added (although you didn't explicitly defined them)
-
-When you now resolve the conf2 configuration, you'll get the other2 dependencies of your other-module. 
-</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> configurations <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a>
+
+Container for configuration element. If this container is not present, it is assumed that the module has one public configuration called 'default'.
+
+<span class="since">since 1.3</span> You can define a new default conf mapping on this container by specifying the defaultconfmapping attribute.
+
+A default conf mapping is very similar to the defaultconf which can be set on the dependencies tag, but it has a slightly different behaviour. 
+The default conf mapping not only defines the conf mapping to use when no conf mapping is specified for a dependency in this ivy file, but it also modify the way ivy interprets conf mapping with no mapped conf. In this case, Ivy will look in the default conf mapping and use the conf mapping defined in the default conf mapping for the conf for which there is no mapped conf.
+
+See <a href="../../doc/ivyfile/dependency#defaultconfmapping.html">examples on the dependency</a> page.
+
+<span class="since">since 1.4</span> You can activate a confmappingoverride mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
+
+
+<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>defaultconfmapping</td><td>the default conf mapping to use in this ivy file <span class="since">since 1.3</span></td>
+        <td>No, defaults to no default conf mapping</td></tr>
+    <tr><td>confmappingoverride</td><td>true to activate configuration mapping override, false otherwise <span class="since">since 1.4</span></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/conf.html">conf</a></td><td>declares a configuration of this module</td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../../doc/ivyfile/include.html">include</a></td><td>include configurations from another file</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+
+<h1>Configuration mappings details</h1>
+When Ivy parses your Ivy file, it will create (internally) modify the configuration mapping of your dependencies.
+For instance, say you have:
+<code type="xml">
+<configurations defaultconfmapping="conf1->other1;conf2->other2">
+   <conf name="conf1" />
+   <conf name="conf2" extends="conf1" />
+</configurations>
+<dependencies>
+   <dependency name="other-module" conf="conf1" />
+</dependencies>
+</code>
+When Ivy parses this file, it will construct the following dependency (in-memory only):
+<code type="xml"><dependency name="other-module" conf="conf1->other1" /></code>
+
+So, if you now resolve the conf2 configuration, you will only get the other1 dependencies of your other-module.
+
+But when you set confmappingoverride to true, Ivy will construct the following dependency in memory:
+<code type="xml"><dependency name="other-module" conf="conf1->other1;conf2->other2" /></code>
+As you can see, the defaultmappings of the extending configurations are also added (although you didn't explicitly defined them)
+
+When you now resolve the conf2 configuration, you'll get the other2 dependencies of your other-module. 
+</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/conflicts.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/conflicts.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/conflicts.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/conflicts.html Wed May  9 03:58:10 2007
@@ -1,67 +1,67 @@
-<!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> conflicts <b>Parent:</b> <a href="../../doc/ivyfile/ivy-module.html">ivy-module</a><br/><br/>
-
-Container for conflict manager elements, used to indicate how conflicts should be resolved
-for this module. <br/><br/>
-
-The list of built-in conflict managers available is listed on the <a href="../../doc/configuration/conflict-managers.html">conflict manager configuration page</a>.<br/><br/>
-
-Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies
-and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time
-enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.<br/><br/>
-
-There are two things optimized during conflict resolution: download of artifacts and download
-of ivy files. The first is always ensured by ivy, i.e. artifacts of a module evicted will never
-be downloaded. The second is not as simple to handle because to know what are the conflicts
-ivy needs to know the dependency graph, and to know the dependency graph, it has to download
-ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.<br/>
-That's why the order of dependencies is important for download optimization. Indeed ivy
-traverses the dependency graph in the order in which dependencies are declared in the ivy files, 
-and each time it encounters a dependency on a module, it first check if there is a conflict on this module, 
-and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted,
-it does not download its ivy file, and the whole branch is not traversed, which can saves
-a lot of time.<br/><br/>
-
-If this container is not present, a default conflict manager is used for all modules. 
-The current default conflict manager is the "latest-revision" conflict manager.
-<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/manager.html">manager</a></td><td>declares a conflict manager for this module</td>
-        <td>1..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> conflicts <b>Parent:</b> <a href="../../doc/ivyfile/ivy-module.html">ivy-module</a><br/><br/>
+
+Container for conflict manager elements, used to indicate how conflicts should be resolved
+for this module. <br/><br/>
+
+The list of built-in conflict managers available is listed on the <a href="../../doc/configuration/conflict-managers.html">conflict manager configuration page</a>.<br/><br/>
+
+Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies
+and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time
+enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.<br/><br/>
+
+There are two things optimized during conflict resolution: download of artifacts and download
+of ivy files. The first is always ensured by ivy, i.e. artifacts of a module evicted will never
+be downloaded. The second is not as simple to handle because to know what are the conflicts
+ivy needs to know the dependency graph, and to know the dependency graph, it has to download
+ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.<br/>
+That's why the order of dependencies is important for download optimization. Indeed ivy
+traverses the dependency graph in the order in which dependencies are declared in the ivy files, 
+and each time it encounters a dependency on a module, it first check if there is a conflict on this module, 
+and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted,
+it does not download its ivy file, and the whole branch is not traversed, which can saves
+a lot of time.<br/><br/>
+
+If this container is not present, a default conflict manager is used for all modules. 
+The current default conflict manager is the "latest-revision" conflict manager.
+<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/manager.html">manager</a></td><td>declares a conflict manager for this module</td>
+        <td>1..n</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependencies.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependencies.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependencies.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependencies.html Wed May  9 03:58:10 2007
@@ -1,66 +1,66 @@
-<!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> dependencies <b>Parent:</b> <a href="../../doc/ivyfile/.html">ivy-module</a>
-
-Container for dependency elements, used to describe the dependencies of this module. 
-If this container is not present, it is assumed that the module has no dependency at all.
-
-This container let the possibility to defines two very similar things: defaultconf and defaultconfmapping.
-
-<code>defaultconf</code> exists since Ivy 1.1 and enables to define the default conf attribute to use when no conf is defined for a dependency in this ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.
-
-<code>defaultconfmapping</code> exists since Ivy 1.3 and enables not only to define the default conf mapping when no conf is specified for a dependency in this ivy file, but it also influence the way conf mapping with no mapped conf are interpreted (see <a href="../../doc/ivyfile/configurations.html">configurations doc page</a> for details about this).
-
-Note that if both defaultconf and defaultconfmapping are defined, it's the defaultconfmapping that is used. Note also that if several defaultconfmapping are defined (one in the configurations tag, one or several in included configurations file, and/or one in the dependency tag, then it's only the last which is taken into account, the others will have no effect at all.
-<h1>Attributes</h1>
-<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>defaultconf</td><td>the default configuration to use when none is specified in a dependency. <span class="since">since 1.1</span></em></td>
-        <td>No, defaults to *->*</td></tr>
-    <tr><td>defaultconfmapping</td><td>the default configuration mapping to use in this ivy fie. <span class="since">since 1.3</span></em></td>
-        <td>No, defaults to no default conf mapping</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.html">dependency</a></td><td>declares a dependency 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> dependencies <b>Parent:</b> <a href="../../doc/ivyfile/.html">ivy-module</a>
+
+Container for dependency elements, used to describe the dependencies of this module. 
+If this container is not present, it is assumed that the module has no dependency at all.
+
+This container let the possibility to defines two very similar things: defaultconf and defaultconfmapping.
+
+<code>defaultconf</code> exists since Ivy 1.1 and enables to define the default conf attribute to use when no conf is defined for a dependency in this ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.
+
+<code>defaultconfmapping</code> exists since Ivy 1.3 and enables not only to define the default conf mapping when no conf is specified for a dependency in this ivy file, but it also influence the way conf mapping with no mapped conf are interpreted (see <a href="../../doc/ivyfile/configurations.html">configurations doc page</a> for details about this).
+
+Note that if both defaultconf and defaultconfmapping are defined, it's the defaultconfmapping that is used. Note also that if several defaultconfmapping are defined (one in the configurations tag, one or several in included configurations file, and/or one in the dependency tag, then it's only the last which is taken into account, the others will have no effect at all.
+<h1>Attributes</h1>
+<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>defaultconf</td><td>the default configuration to use when none is specified in a dependency. <span class="since">since 1.1</span></em></td>
+        <td>No, defaults to *->*</td></tr>
+    <tr><td>defaultconfmapping</td><td>the default configuration mapping to use in this ivy fie. <span class="since">since 1.3</span></em></td>
+        <td>No, defaults to no default conf mapping</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.html">dependency</a></td><td>declares a dependency 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/dependencies.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact-conf.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact-conf.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact-conf.html Wed May  9 03:58:10 2007
@@ -1,46 +1,46 @@
-<!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> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency-artifact.html">artifact</a>
-
-Specify a configuration in which the enclosing artifact specification should be included.
-
-<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 master configuration in which the enclosing artifact should be included</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> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency-artifact.html">artifact</a>
+
+Specify a configuration in which the enclosing artifact specification should be included.
+
+<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 master configuration in which the enclosing artifact should be included</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/dependency-artifact-conf.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html Wed May  9 03:58:10 2007
@@ -1,107 +1,107 @@
-<!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> artifact <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 specify the artifacts required, if the dependency has no ivy file. 
-
-Indeed, when a module has no ivy file, it is assumed that it publishes exactly one artifact having the same name as the module itself. But when this module publishes more artifacts, or simply does not respect the name rule, and if you cannot deliver an ivy file for it (because you do not control the repository, for instance - think about maven ibiblio repository, to give no name), then this feature let you specify the artifacts names you want to get.
-
-Each artifact specification can be given in the context of particular master configurations. By default, if no configuration is specified, artifacts specification apply to all master configurations. But you can specify that a specification 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 specification for a particular configuration, then no specification will apply for this configuration and it will be resolved not taking into account any specification.
-
-For instance, imagine you have A, B & C master configurations. If you specify art1 in A & B and art2 in A, then C will not be specified at all, and will thus assume the default artifact. 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">
-  <artifact name="art1" type="jar" conf="A,B"/>
-  <artifact name="art2" type="jar" conf="A"/>
-</dependency>	
-</code>
-
-<span class="since">since 1.4</span> It's possible to indicate the url at which the artifact can be found. This is not mandatory, and even not recommended with an enterprise repository. Note that Ivy will always look at the location where the artifact should be and only use the url if it cannot be found at the standard location in the repository.
-
-<span class="since">since 2.0</span> This feature can also be used for modules having their own module descriptor, but which doesn't declare an artifact you know that is published. Note that in this case artifacts declared to be published by the dependency will be ignored, so do not forget to include all artifacts you want.
-
-<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</td>
-        <td>Yes</td></tr>
-    <tr><td>type</td><td>the type of the artifact of the dependency module</td>
-        <td>Yes</td></tr>
-    <tr><td>ext</td><td>the extension of the artifact of the dependency module</td>
-        <td>No, defaults to type</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>
-    <tr><td>url</td><td>an url where this artifact can be found if it isn't present at the standard location in the repository <span class="since">since 1.4</span></td>
-        <td>No, defaults to no url</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-artifact-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<dependency org="foo" name="bar" rev="1.0">
-  <artifact name="baz" type="jar"/>
-</dependency>
-</code>
-Declares a dependency on module bar which only publish one artifact: baz.jar.
-
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" rev="1.0">
-  <artifact name="baz" type="jar" url="http://www.acme.com/repository/bar/baz-1.0-acme.jar"/>
-</dependency>
-</code>
-Same as above, except that if the artifact is not found at its standard location, Ivy will use http://www.acme.com/repository/bar/baz-1.0-acme.jar to download it.
-
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" rev="1.0">
-  <include name="*"/>
-  <artifact name="baz" type="source" ext="jar"/>
-</dependency>
-</code>
-Declares a dependency on module bar for which all artifacts declared will be used (thanks to the include tag) plus an artifact baz of type source and ext jar (which is not declared in module bar module descriptor).
-</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> artifact <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 specify the artifacts required, if the dependency has no ivy file. 
+
+Indeed, when a module has no ivy file, it is assumed that it publishes exactly one artifact having the same name as the module itself. But when this module publishes more artifacts, or simply does not respect the name rule, and if you cannot deliver an ivy file for it (because you do not control the repository, for instance - think about maven ibiblio repository, to give no name), then this feature let you specify the artifacts names you want to get.
+
+Each artifact specification can be given in the context of particular master configurations. By default, if no configuration is specified, artifacts specification apply to all master configurations. But you can specify that a specification 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 specification for a particular configuration, then no specification will apply for this configuration and it will be resolved not taking into account any specification.
+
+For instance, imagine you have A, B & C master configurations. If you specify art1 in A & B and art2 in A, then C will not be specified at all, and will thus assume the default artifact. 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">
+  <artifact name="art1" type="jar" conf="A,B"/>
+  <artifact name="art2" type="jar" conf="A"/>
+</dependency>	
+</code>
+
+<span class="since">since 1.4</span> It's possible to indicate the url at which the artifact can be found. This is not mandatory, and even not recommended with an enterprise repository. Note that Ivy will always look at the location where the artifact should be and only use the url if it cannot be found at the standard location in the repository.
+
+<span class="since">since 2.0</span> This feature can also be used for modules having their own module descriptor, but which doesn't declare an artifact you know that is published. Note that in this case artifacts declared to be published by the dependency will be ignored, so do not forget to include all artifacts you want.
+
+<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</td>
+        <td>Yes</td></tr>
+    <tr><td>type</td><td>the type of the artifact of the dependency module</td>
+        <td>Yes</td></tr>
+    <tr><td>ext</td><td>the extension of the artifact of the dependency module</td>
+        <td>No, defaults to type</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>
+    <tr><td>url</td><td>an url where this artifact can be found if it isn't present at the standard location in the repository <span class="since">since 1.4</span></td>
+        <td>No, defaults to no url</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-artifact-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<dependency org="foo" name="bar" rev="1.0">
+  <artifact name="baz" type="jar"/>
+</dependency>
+</code>
+Declares a dependency on module bar which only publish one artifact: baz.jar.
+
+<hr/>
+<code type="xml">
+<dependency org="foo" name="bar" rev="1.0">
+  <artifact name="baz" type="jar" url="http://www.acme.com/repository/bar/baz-1.0-acme.jar"/>
+</dependency>
+</code>
+Same as above, except that if the artifact is not found at its standard location, Ivy will use http://www.acme.com/repository/bar/baz-1.0-acme.jar to download it.
+
+<hr/>
+<code type="xml">
+<dependency org="foo" name="bar" rev="1.0">
+  <include name="*"/>
+  <artifact name="baz" type="source" ext="jar"/>
+</dependency>
+</code>
+Declares a dependency on module bar for which all artifacts declared will be used (thanks to the include tag) plus an artifact baz of type source and ext jar (which is not declared in module bar module descriptor).
+</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-conf.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-conf.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-conf.html Wed May  9 03:58:10 2007
@@ -1,61 +1,61 @@
-<!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> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency.html">dependency</a><br/>
-<br/>
-Describes a configuration mapping for a dependency. See also the inline configuration mapping
-in dependency element.
-
-<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 master configuration to map. 
-    	'*' wildcard can be used to designate all configurations of this module</td>
-        <td>Yes</td></tr>
-    <tr><td>mapped</td><td>a comma separated list of dependency configurations to which this
-    master configuration should be mapped</td>
-        <td>No, default to the same configuration as master one, unless nested mapped elements 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/mapped.html">mapped</a></td><td>map dependency configurations for this master configuration</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> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency.html">dependency</a><br/>
+<br/>
+Describes a configuration mapping for a dependency. See also the inline configuration mapping
+in dependency element.
+
+<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 master configuration to map. 
+    	'*' wildcard can be used to designate all configurations of this module</td>
+        <td>Yes</td></tr>
+    <tr><td>mapped</td><td>a comma separated list of dependency configurations to which this
+    master configuration should be mapped</td>
+        <td>No, default to the same configuration as master one, unless nested mapped elements 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/mapped.html">mapped</a></td><td>map dependency configurations for this master configuration</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/dependency-conf.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include-conf.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include-conf.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include-conf.html Wed May  9 03:58:10 2007
@@ -1,46 +1,46 @@
-<!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> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency-include.html">include</a>
-
-Specify a configuration in which the enclosing artifact inclusion should be included.
-
-<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 master configuration in which the enclosing artifact should be included</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> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency-include.html">include</a>
+
+Specify a configuration in which the enclosing artifact inclusion should be included.
+
+<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 master configuration in which the enclosing artifact should be included</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/dependency-include-conf.html
------------------------------------------------------------------------------
    svn:eol-style = LF

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

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



Mime
View raw message