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 [3/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/configuration/classpath.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/classpath.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/classpath.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/classpath.html Wed May  9 03:58:10 2007
@@ -1,72 +1,72 @@
-<!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> classpath
-
-Includes a jar in the classpath used to load plugins. <span class="since">since 1.4</span>
-
-This let you add ivy plugins without relying on ant classpath for instance, easing therefore the use of ivy in multiple execution environment (ant, standalone, IDE plugins, ...).
-
-<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>url</td><td>the url of a jar to add to the classpath</td>
-        <td>Yes, unless file is specified</td></tr>
-    <tr><td>file</td><td>a jar to add to the classpath</td>
-        <td>Yes, unless url is specified</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivysettings>
-  <classpath file="${ivy.settings.dir}/custom-resolver.jar"/>
-  <typedef name="custom" classname="fr.jayasoft.ivy.resolver.CustomResolver"/>
-  <resolvers>
-    <custom name="custom"/>
-  </resolvers>
-</ivysettings>
-</code>
-Adds custom-resolver.jar found in the same directory as the ivysettings.xml file itself to the classpath, then define a custom resolver and use it.
-
-<hr/>
-<code type="xml">
-<ivysettings>
-  <classpath url="http://www.myserver.com/ivy/custom-resolver.jar"/>
-  <typedef name="custom" classname="fr.jayasoft.ivy.resolver.CustomResolver"/>
-  <resolvers>
-    <custom name="custom"/>
-  </resolvers>
-</ivysettings>
-</code>
-Same as above, but find the jar on a web server.
-	</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> classpath
+
+Includes a jar in the classpath used to load plugins. <span class="since">since 1.4</span>
+
+This let you add ivy plugins without relying on ant classpath for instance, easing therefore the use of ivy in multiple execution environment (ant, standalone, IDE plugins, ...).
+
+<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>url</td><td>the url of a jar to add to the classpath</td>
+        <td>Yes, unless file is specified</td></tr>
+    <tr><td>file</td><td>a jar to add to the classpath</td>
+        <td>Yes, unless url is specified</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<ivysettings>
+  <classpath file="${ivy.settings.dir}/custom-resolver.jar"/>
+  <typedef name="custom" classname="fr.jayasoft.ivy.resolver.CustomResolver"/>
+  <resolvers>
+    <custom name="custom"/>
+  </resolvers>
+</ivysettings>
+</code>
+Adds custom-resolver.jar found in the same directory as the ivysettings.xml file itself to the classpath, then define a custom resolver and use it.
+
+<hr/>
+<code type="xml">
+<ivysettings>
+  <classpath url="http://www.myserver.com/ivy/custom-resolver.jar"/>
+  <typedef name="custom" classname="fr.jayasoft.ivy.resolver.CustomResolver"/>
+  <resolvers>
+    <custom name="custom"/>
+  </resolvers>
+</ivysettings>
+</code>
+Same as above, but find the jar on a web server.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/configuration/conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/conf.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/conf.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/conf.html Wed May  9 03:58:10 2007
@@ -1,81 +1,81 @@
-<!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> settings
-
-Configures some important ivy info: default cache, default resolver, ...
-
-Default cache is used whenever a cache is not provided. It usually points to a directory in your filesystem. <strong>This should not point to a directory used as a repository!</strong>
-
-Default resolver is used whenever nothing else is configured in the modules section of the configuration file. It should give the name of a dependency resolver defined in the resolvers section of the configuration file.
-
-Default latest strategy and conflict manager can also be configured here.
-
-validate indicates if ivy files should generally be validate against xsd or not. This setting is only a default value, and can be overriden :
-1) in ant tasks
-2) in resolvers
-So if there is a setting in the resolver, it always win against all other settings.
-
-checkUpToDate indicates to ivy if it must check date of artifacts before retrieving them (i.e. copying them from
-cache to another place in your filesystem). Usually it is a good thing to check date to avoid unnecessary copy, even if it's most of the time a local copy.
-
-cacheIvyPattern and cacheArtifactPattern are used to configure the way ivy stores ivy files and artifacts in the cache. Usually you do not have to change this, unless you want to use the cache directly from another tool, which is not recommended.
-<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>defaultCache</td><td>a path to a directory to use as default cache</td>
-        <td>No, defaults to .ivy/cache in user home</td></tr>
-    <tr><td>defaultResolver</td><td>the name of the default resolver to use</td>
-        <td>No, but all modules should be configured in the modules section if not provided</td></tr>
-    <tr><td>defaultLatestStrategy</td><td>the name of the default latest strategy to use</td>
-        <td>No, defaults to latest-revision</td></tr>
-    <tr><td>defaultConflictManager</td><td>the name of the default conflict manager to use</td>
-        <td>No, defaults to latest-revision</td></tr>
-    <tr><td>defaultBranch</td><td>the default branch to use for all modules, except if they have a <a href="../../doc/configuration/module.html"> module specific branch setting</a>. <span class="since">since 1.4</span></td>
-        <td>No, defaults to no default branch</td></tr>
-    <tr><td>circularDependencyStrategy</td><td>the name of the <a href="../../doc/concept#circular.html">circular dependency strategy</a> to use <span class="since">since 1.4</span></td>
-        <td>No, defaults to warn</td></tr>
-    <tr><td>validate</td><td>Indicates if ivy files should be validated against ivy.xsd or not.</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>checkUpToDate</td><td>Indicates if date should be checked before retrieving artifacts from cache</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>cacheIvyPattern</td><td>a pattern to indicate where ivy files should be put in cache</td>
-        <td>No, defaults to [organisation]/[module]/ivy-[revision].xml</td></tr>
-    <tr><td>cacheArtifactPattern</td><td>a pattern to indicate where artifact files should be put in cache</td>
-        <td>No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]</td></tr>
-    <tr><td>useRemoteConfig</td><td>true to configure ivyrep and ibiblio resolver from a remote configuration file (updated with changes in those repository structure if any) (<span class="since">since 1.2</span>)</td>
-        <td>No, defaults to false</td></tr>
-</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> settings
+
+Configures some important ivy info: default cache, default resolver, ...
+
+Default cache is used whenever a cache is not provided. It usually points to a directory in your filesystem. <strong>This should not point to a directory used as a repository!</strong>
+
+Default resolver is used whenever nothing else is configured in the modules section of the configuration file. It should give the name of a dependency resolver defined in the resolvers section of the configuration file.
+
+Default latest strategy and conflict manager can also be configured here.
+
+validate indicates if ivy files should generally be validate against xsd or not. This setting is only a default value, and can be overriden :
+1) in ant tasks
+2) in resolvers
+So if there is a setting in the resolver, it always win against all other settings.
+
+checkUpToDate indicates to ivy if it must check date of artifacts before retrieving them (i.e. copying them from
+cache to another place in your filesystem). Usually it is a good thing to check date to avoid unnecessary copy, even if it's most of the time a local copy.
+
+cacheIvyPattern and cacheArtifactPattern are used to configure the way ivy stores ivy files and artifacts in the cache. Usually you do not have to change this, unless you want to use the cache directly from another tool, which is not recommended.
+<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>defaultCache</td><td>a path to a directory to use as default cache</td>
+        <td>No, defaults to .ivy/cache in user home</td></tr>
+    <tr><td>defaultResolver</td><td>the name of the default resolver to use</td>
+        <td>No, but all modules should be configured in the modules section if not provided</td></tr>
+    <tr><td>defaultLatestStrategy</td><td>the name of the default latest strategy to use</td>
+        <td>No, defaults to latest-revision</td></tr>
+    <tr><td>defaultConflictManager</td><td>the name of the default conflict manager to use</td>
+        <td>No, defaults to latest-revision</td></tr>
+    <tr><td>defaultBranch</td><td>the default branch to use for all modules, except if they have a <a href="../../doc/configuration/module.html"> module specific branch setting</a>. <span class="since">since 1.4</span></td>
+        <td>No, defaults to no default branch</td></tr>
+    <tr><td>circularDependencyStrategy</td><td>the name of the <a href="../../doc/concept#circular.html">circular dependency strategy</a> to use <span class="since">since 1.4</span></td>
+        <td>No, defaults to warn</td></tr>
+    <tr><td>validate</td><td>Indicates if ivy files should be validated against ivy.xsd or not.</td>
+        <td>No, defaults to true</td></tr>
+    <tr><td>checkUpToDate</td><td>Indicates if date should be checked before retrieving artifacts from cache</td>
+        <td>No, defaults to true</td></tr>
+    <tr><td>cacheIvyPattern</td><td>a pattern to indicate where ivy files should be put in cache</td>
+        <td>No, defaults to [organisation]/[module]/ivy-[revision].xml</td></tr>
+    <tr><td>cacheArtifactPattern</td><td>a pattern to indicate where artifact files should be put in cache</td>
+        <td>No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]</td></tr>
+    <tr><td>useRemoteConfig</td><td>true to configure ivyrep and ibiblio resolver from a remote configuration file (updated with changes in those repository structure if any) (<span class="since">since 1.2</span>)</td>
+        <td>No, defaults to false</td></tr>
+</tbody>
+</table>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/configuration/conflict-managers.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/conflict-managers.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/conflict-managers.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/conflict-managers.html Wed May  9 03:58:10 2007
@@ -1,65 +1,65 @@
-<!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> conflict-managers
-
-Defines a list of <a href="../../doc/concept#conflict.html">conflicts managers</a> usable in ivy. Each conflict manager is identified by its name, given as an attribute.
-The child tag used for the conflict manager must be equal to a name of a conflict manager type (either built-in
-or added with the typedef tag).
-
-Here is a list of predefined conflicts managers (which do not require anything in the configuration file):
-<ul>
-<li>all</li> this conflicts manager resolve conflicts by selecting all revisions. Also called NoConflictManager, it does evict any module.
-<li>latest-time</li> this conflict manager selects only the 'latest' revision, latest being defined as the latest in time. Note that latest in time is costly to compute, so prefer latest-revision if you can.
-<li>latest-revision</li> this conflict manager selects only the 'latest' revision, latest being defined by a string comparison of revisions.
-<li>strict</li> this conflict manager throws an exception (i.e. causes a build failure) whenever a conflict is found.
-</ul>
-The two "latest" conflict managers also take into account the force attribute of the dependencies.
-Indeed direct dependencies can declare a force attribute (see <a href="../../doc/ivyfile/dependency.html">dependency</a>), which indicates the the revision given in the direct dependency should be prefered over indirect dependencies.
-
-Here is a list of conflict manager types available, which can be used to define your own custom conflict managers:
-<ul>
-<li>latest-cm</li>The latest conflict manager uses a latest strategy to select the latest revision among several ones. Both latest-time and latest-revision conflict managers are based on this conflict manager type. It takes 'latest' as attribute to define which latest strategy should be used. Example:
-<code><latest-cm name="mylatest-conflict-manager" latest="my-latest-strategy"/></code>
-<li>regexp-cm</li>This conflict manager is based on a regular expression and throw an exception (i.e. causes a build failure) when a conflict is found with versions with different matching group. For instance if a conflict is found between 1.2.x and 1.3.y it will throw an exception if the regular exception is (.*)\.\d, because the matching group will match different string (1.2 and 1.3). 1.2.1 and 1.2.2 won't throw an exception with the same regular expression. The regular expression is set using the 'regexp' attribute. A 'ignoreNonMatching' attribute can also be set to simply warrn when a version is found which does not match the regular expression, instead of throwing an exception.
-</ul>
-
-<h3>Child elements</h3>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any conflict manager</td><td>adds a conflict manager to the list of available conflict managers</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> conflict-managers
+
+Defines a list of <a href="../../doc/concept#conflict.html">conflicts managers</a> usable in ivy. Each conflict manager is identified by its name, given as an attribute.
+The child tag used for the conflict manager must be equal to a name of a conflict manager type (either built-in
+or added with the typedef tag).
+
+Here is a list of predefined conflicts managers (which do not require anything in the configuration file):
+<ul>
+<li>all</li> this conflicts manager resolve conflicts by selecting all revisions. Also called NoConflictManager, it does evict any module.
+<li>latest-time</li> this conflict manager selects only the 'latest' revision, latest being defined as the latest in time. Note that latest in time is costly to compute, so prefer latest-revision if you can.
+<li>latest-revision</li> this conflict manager selects only the 'latest' revision, latest being defined by a string comparison of revisions.
+<li>strict</li> this conflict manager throws an exception (i.e. causes a build failure) whenever a conflict is found.
+</ul>
+The two "latest" conflict managers also take into account the force attribute of the dependencies.
+Indeed direct dependencies can declare a force attribute (see <a href="../../doc/ivyfile/dependency.html">dependency</a>), which indicates the the revision given in the direct dependency should be prefered over indirect dependencies.
+
+Here is a list of conflict manager types available, which can be used to define your own custom conflict managers:
+<ul>
+<li>latest-cm</li>The latest conflict manager uses a latest strategy to select the latest revision among several ones. Both latest-time and latest-revision conflict managers are based on this conflict manager type. It takes 'latest' as attribute to define which latest strategy should be used. Example:
+<code><latest-cm name="mylatest-conflict-manager" latest="my-latest-strategy"/></code>
+<li>regexp-cm</li>This conflict manager is based on a regular expression and throw an exception (i.e. causes a build failure) when a conflict is found with versions with different matching group. For instance if a conflict is found between 1.2.x and 1.3.y it will throw an exception if the regular exception is (.*)\.\d, because the matching group will match different string (1.2 and 1.3). 1.2.1 and 1.2.2 won't throw an exception with the same regular expression. The regular expression is set using the 'regexp' attribute. A 'ignoreNonMatching' attribute can also be set to simply warrn when a version is found which does not match the regular expression, instead of throwing an exception.
+</ul>
+
+<h3>Child elements</h3>
+<table class="ivy-children">
+<thead>
+    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
+</thead>
+<tbody>
+    <tr><td>any conflict manager</td><td>adds a conflict manager to the list of available conflict managers</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/configuration/conflict-managers.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/configuration/include.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/include.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/include.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/include.html Wed May  9 03:58:10 2007
@@ -1,77 +1,77 @@
-<!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
-
-Includes another ivysettings file as if it were part of this one. <span class="since">since 1.3</span>
-
-The included ivysettings file has to be a complete well formed ivysettings file, i.e. it does have to include the <code><ivysettings></code> tag.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>file</td><td>a path to the ivysettings file to include</td>
-        <td>Yes</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivysettings>
-  <property name="myrepository" value="path/to/my/real/rep"/>
-  <conf defaultResolver="default"/>
-  <include file="path/to/ivysettings-default.xml"/>
-</ivysettings>
-</code>
-with ivysettings-default.xml:
-<code type="xml">
-<ivysettings>
-  <property name="myrepository" value="path/to/rep" overwrite="false"/>
-  <resolvers>
-    <ivyrep name="default" ivyroot="${myrepository}"/>
-  </resolvers>
-</ivysettings>
-</code>
-
-The included ivysettings defines a resolver named default, which is an ivyrep resolver, with its root configured as being the value of myrepository variable. This variable is given the value path/to/rep in the included file, but because the attribute overwrite is set to false, it will not overide the value given in the main ivysettings including this one, so the value used for myrepository will be path/to/my/real/rep.
-<hr/>
-<code type="xml">
-<ivysettings>
-  <include file="ivysettings-macro.xml"/>
-  <resolvers>
-    <mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
-  </resolvers>
-</ivysettings> 
-</code>
-with ivysettings-macro.xml being the ivysettings example given on the <a href="../../doc/configuration/macrodef.html">macrodef documentation page</a>.
-This let reusing macro resolver easy.
-	</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
+
+Includes another ivysettings file as if it were part of this one. <span class="since">since 1.3</span>
+
+The included ivysettings file has to be a complete well formed ivysettings file, i.e. it does have to include the <code><ivysettings></code> tag.
+
+<h1>Attributes</h1>
+<table class="ivy-attributes">
+<thead>
+    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
+</thead>
+<tbody>
+    <tr><td>file</td><td>a path to the ivysettings file to include</td>
+        <td>Yes</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<ivysettings>
+  <property name="myrepository" value="path/to/my/real/rep"/>
+  <conf defaultResolver="default"/>
+  <include file="path/to/ivysettings-default.xml"/>
+</ivysettings>
+</code>
+with ivysettings-default.xml:
+<code type="xml">
+<ivysettings>
+  <property name="myrepository" value="path/to/rep" overwrite="false"/>
+  <resolvers>
+    <ivyrep name="default" ivyroot="${myrepository}"/>
+  </resolvers>
+</ivysettings>
+</code>
+
+The included ivysettings defines a resolver named default, which is an ivyrep resolver, with its root configured as being the value of myrepository variable. This variable is given the value path/to/rep in the included file, but because the attribute overwrite is set to false, it will not overide the value given in the main ivysettings including this one, so the value used for myrepository will be path/to/my/real/rep.
+<hr/>
+<code type="xml">
+<ivysettings>
+  <include file="ivysettings-macro.xml"/>
+  <resolvers>
+    <mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
+  </resolvers>
+</ivysettings> 
+</code>
+with ivysettings-macro.xml being the ivysettings example given on the <a href="../../doc/configuration/macrodef.html">macrodef documentation page</a>.
+This let reusing macro resolver easy.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/configuration/latest-strategies.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/latest-strategies.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/latest-strategies.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/latest-strategies.html Wed May  9 03:58:10 2007
@@ -1,91 +1,91 @@
-<!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> latest-strategies
-
-Defines a list of <a href="../../doc/concept#latest.html">latest strategies</a> usable in ivy. Each latest strategy is identified by its name, given as an attribute.
-The child tag used for the latest strategy must be equal to a name of a latest strategy type (usually added with the typedef tag).
-
-The latest strategies which are always included in ivy (and do not require anything in the configuration file) are:
-<ul>
-<li>latest-time</li> compares the revisions date to know which is the latest. While this is often a good 
-strategy in terms of pertinence, it has the drawback to be costful to compute with distant repositories. If you use ivyrep, 
-for example, ivy has to ask the http server what is the date of each ivy file before knowing which is the latest.
-<li>latest-revision</li> compares the revisions as string, using an algorithm close to the one used in the php version_compare function.
-This algorithm takes into account special meaning of some text. For instance, with this strategy, 1.0-dev1 is considered
-before 1.0-alpha1, which in turn is before 1.0-rc1, which is before 1.0, which is before 1.0.1.
-<li>latest-lexico</li> compares the revisions as string, using lexicographic order (the one used by java string comparison).
-</ul>
-
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any latest strategy</td><td>adds a latest strategy to the list of available strategies</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>latest-revision</h1>
-<span class="since">since 1.4</span> The latest-revision can now be configured to handle more words with special meanings than the one defined in php version_compare function.
-
-Here is an example of how you can do so:
-<code type="xml">
-<latest-strategies>
-  <latest-revision name="mylatest-revision">
-    <specialMeaning name="PRE" value="-2"/>
-    <specialMeaning name="QA" value="4"/>
-    <specialMeaning name="PROD" value="5"/>
-  </latest-revision>
-</latest-strategies> 
-</code>
-Knowing that the default special meaning words are the following:
-<code type="xml">
-    <specialMeaning name="dev" value="-1"/>
-    <specialMeaning name="rc" value="1"/>
-    <specialMeaning name="final" value="2"/>
-</code>
-You can even get rid or redefine the default special meanings by setting usedefaultspecialmeanings="false" on the latest-revision tag.
-Example:
-<code type="xml">
-<latest-strategies>
-  <latest-revision name="mylatest-revision" usedefaultspecialmeanings="false">
-    <specialMeaning name="pre" value="-2"/>
-    <specialMeaning name="m" value="1"/>
-    <specialMeaning name="rc" value="2"/>
-    <specialMeaning name="prod" value="3"/>
-  </latest-revision>
-</latest-strategies> 
-</code>
-
-
-	</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> latest-strategies
+
+Defines a list of <a href="../../doc/concept#latest.html">latest strategies</a> usable in ivy. Each latest strategy is identified by its name, given as an attribute.
+The child tag used for the latest strategy must be equal to a name of a latest strategy type (usually added with the typedef tag).
+
+The latest strategies which are always included in ivy (and do not require anything in the configuration file) are:
+<ul>
+<li>latest-time</li> compares the revisions date to know which is the latest. While this is often a good 
+strategy in terms of pertinence, it has the drawback to be costful to compute with distant repositories. If you use ivyrep, 
+for example, ivy has to ask the http server what is the date of each ivy file before knowing which is the latest.
+<li>latest-revision</li> compares the revisions as string, using an algorithm close to the one used in the php version_compare function.
+This algorithm takes into account special meaning of some text. For instance, with this strategy, 1.0-dev1 is considered
+before 1.0-alpha1, which in turn is before 1.0-rc1, which is before 1.0, which is before 1.0.1.
+<li>latest-lexico</li> compares the revisions as string, using lexicographic order (the one used by java string comparison).
+</ul>
+
+<h1>Child elements</h1>
+<table class="ivy-children">
+<thead>
+    <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
+</thead>
+<tbody>
+    <tr><td>any latest strategy</td><td>adds a latest strategy to the list of available strategies</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+
+<h1>latest-revision</h1>
+<span class="since">since 1.4</span> The latest-revision can now be configured to handle more words with special meanings than the one defined in php version_compare function.
+
+Here is an example of how you can do so:
+<code type="xml">
+<latest-strategies>
+  <latest-revision name="mylatest-revision">
+    <specialMeaning name="PRE" value="-2"/>
+    <specialMeaning name="QA" value="4"/>
+    <specialMeaning name="PROD" value="5"/>
+  </latest-revision>
+</latest-strategies> 
+</code>
+Knowing that the default special meaning words are the following:
+<code type="xml">
+    <specialMeaning name="dev" value="-1"/>
+    <specialMeaning name="rc" value="1"/>
+    <specialMeaning name="final" value="2"/>
+</code>
+You can even get rid or redefine the default special meanings by setting usedefaultspecialmeanings="false" on the latest-revision tag.
+Example:
+<code type="xml">
+<latest-strategies>
+  <latest-revision name="mylatest-revision" usedefaultspecialmeanings="false">
+    <specialMeaning name="pre" value="-2"/>
+    <specialMeaning name="m" value="1"/>
+    <specialMeaning name="rc" value="2"/>
+    <specialMeaning name="prod" value="3"/>
+  </latest-revision>
+</latest-strategies> 
+</code>
+
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/configuration/latest-strategies.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/configuration/macrodef.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/macrodef.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/macrodef.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/macrodef.html Wed May  9 03:58:10 2007
@@ -1,109 +1,109 @@
-<!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> macrodef
-
-Defines a new dependency resolver type based upon an other one. This definition is very similar to the macrodef feature of ant for defining macro tasks. <span class="since">since 1.3</span>
-
-This task eases the lot the process of creating new dependency resolver, because it avoid writing java code.
-
-It is generally used in combination with the <a href="../../doc/configuration/include.html">include</a> feature to help reusing macro at several places.
-
-A macro is defined by writing the resolver it is equivalent to as if it were written in the resolver place, except that you can use attributes to pass parameters to the newly defined resolver type. Attributes are defined with a name and sometimes a default value, and are used using the following syntax: <code>@{attributename}</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>name of the resover type created</td>
-        <td>Yes</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/configuration/macrodef/attribute.html">attribute</a></td><td>defines an attribute for the macro resolver</td>
-        <td>0..n</td></tr>
-    <tr><td>any resolver</td><td>defines the base resolver upon which this macro is defined</td>
-        <td>1</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-Defining a simple macro:
-<code type="xml">
-  <macrodef name="mymacro">
-    <attribute name="mymainrep"/>
-      <filesystem name="fs1">
-        <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-        <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-      </filesystem>
-  </macrodef>
-</code>
-Using it:
-<code type="xml">
-  <resolvers>
-    <mymacro name="default" mymainrep="path/to/myrep"/>
-  </resolvers>
-</code>
-<hr/>
-A complete example:
-<code type="xml">
-<ivysettings>
-  <macrodef name="mymacro">
-    <attribute name="mymainrep"/>
-    <attribute name="mysecondrep"/>
-    <attribute name="myseconddirlayout" default="[organisation]/[module]/[type]s"/>
-    <chain>
-      <filesystem name="fs1">
-        <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-        <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-      </filesystem>
-      <filesystem name="fs2" latest="latest-time">
-        <ivy pattern="@{mysecondrep}/@{myseconddirlayout}/ivy-[revision].xml"/>
-        <artifact pattern="@{mysecondrep}/@{myseconddirlayout}/[artifact]-[revision].[ext]"/>
-      </filesystem>
-    </chain>
-  </macrodef>
-	
-  <resolvers>
-    <mymacro name="default" mymainrep="path/to/myrep" mysecondrep="path/to/secondrep"/>
-    <mymacro name="other" 
-       mymainrep="path/to/myrep" 
-       mysecondrep="path/to/secondrep" 
-       myseconddirlayout="[module]/[type]s"/>
-   </resolvers>
-</ivysettings>
-</code>
-
-	</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> macrodef
+
+Defines a new dependency resolver type based upon an other one. This definition is very similar to the macrodef feature of ant for defining macro tasks. <span class="since">since 1.3</span>
+
+This task eases the lot the process of creating new dependency resolver, because it avoid writing java code.
+
+It is generally used in combination with the <a href="../../doc/configuration/include.html">include</a> feature to help reusing macro at several places.
+
+A macro is defined by writing the resolver it is equivalent to as if it were written in the resolver place, except that you can use attributes to pass parameters to the newly defined resolver type. Attributes are defined with a name and sometimes a default value, and are used using the following syntax: <code>@{attributename}</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>name of the resover type created</td>
+        <td>Yes</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/configuration/macrodef/attribute.html">attribute</a></td><td>defines an attribute for the macro resolver</td>
+        <td>0..n</td></tr>
+    <tr><td>any resolver</td><td>defines the base resolver upon which this macro is defined</td>
+        <td>1</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+Defining a simple macro:
+<code type="xml">
+  <macrodef name="mymacro">
+    <attribute name="mymainrep"/>
+      <filesystem name="fs1">
+        <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+        <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+      </filesystem>
+  </macrodef>
+</code>
+Using it:
+<code type="xml">
+  <resolvers>
+    <mymacro name="default" mymainrep="path/to/myrep"/>
+  </resolvers>
+</code>
+<hr/>
+A complete example:
+<code type="xml">
+<ivysettings>
+  <macrodef name="mymacro">
+    <attribute name="mymainrep"/>
+    <attribute name="mysecondrep"/>
+    <attribute name="myseconddirlayout" default="[organisation]/[module]/[type]s"/>
+    <chain>
+      <filesystem name="fs1">
+        <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+        <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+      </filesystem>
+      <filesystem name="fs2" latest="latest-time">
+        <ivy pattern="@{mysecondrep}/@{myseconddirlayout}/ivy-[revision].xml"/>
+        <artifact pattern="@{mysecondrep}/@{myseconddirlayout}/[artifact]-[revision].[ext]"/>
+      </filesystem>
+    </chain>
+  </macrodef>
+	
+  <resolvers>
+    <mymacro name="default" mymainrep="path/to/myrep" mysecondrep="path/to/secondrep"/>
+    <mymacro name="other" 
+       mymainrep="path/to/myrep" 
+       mysecondrep="path/to/secondrep" 
+       myseconddirlayout="[module]/[type]s"/>
+   </resolvers>
+</ivysettings>
+</code>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/configuration/macrodef/attribute.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/macrodef/attribute.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/macrodef/attribute.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/macrodef/attribute.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: 3};</script>	
-	<script type="text/javascript" src="../../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> attribute
-
-Defines a macrodef attribute. See macrodef for details.
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the attribute</td>
-        <td>Yes</td></tr>
-    <tr><td>default</td><td>the default value of the attribute if none is specified</td>
-        <td>No, by default attribute are required</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: 3};</script>	
+	<script type="text/javascript" src="../../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> attribute
+
+Defines a macrodef attribute. See macrodef for details.
+<h1>Attributes</h1>
+<table class="ivy-attributes">
+<thead>
+    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
+</thead>
+<tbody>
+    <tr><td>name</td><td>the name of the attribute</td>
+        <td>Yes</td></tr>
+    <tr><td>default</td><td>the default value of the attribute if none is specified</td>
+        <td>No, by default attribute are required</td></tr>
+</tbody>
+</table>
+
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/configuration/macrodef/attribute.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/configuration/module.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/module.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/module.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/module.html Wed May  9 03:58:10 2007
@@ -1,102 +1,102 @@
-<!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> module
-
-Define a module set rule. The tag defines a module set, by giving an expression and the matcher to use for organisation and name (for instance, you can use * to specify all). 
-
-It also gives the specific setting to use for this module set.
-
-For each module set, you can configure:
-<ul>
-<li>the <a href="../../doc/configuration/resolvers.html">resolver</a> to use</li>
-<li>the <a href="../../doc/configuration/conflict-managers.html">conflict manager</a> to use</li>
-<li>the default <a href="../../doc/terminology#branch.html">branch</a> to use</li>
-</ul>
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>organisation</td><td>the name of the organisation to which apply the resolver. May be an expression depending on the matcher used (see matcher attribute below).</td>
-        <td>Yes</td></tr>
-    <tr><td>name</td><td>the name of the module to which apply the resolver. May be an expression depending on the matcher used (see matcher attribute below).</td>
-        <td>Yes</td></tr>
-    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> to use to match the modules to which the resolver should be applied <span class="since">since 1.3</span></td>
-        <td>No, defaults to exactOrRegexp</td></tr>
-    <tr><td>resolver</td><td>the name of the resolver to apply. The resolver must have been defined in the resolvers section of the configuration file.</td>
-        <td>No</td></tr>
-    <tr><td>conflict-manager</td><td>the name of the conflict manager to apply. <span class="since">since 1.4</span></td>
-        <td>No</td></tr>
-    <tr><td>branch</td><td>the default branch to apply. <span class="since">since 1.4</span></td>
-        <td>No</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<modules>
-  <module organisation="jayasoft" name="*" resolver="myprojectsresolver"/>
-</modules>
-</code>
-Uses myprojectresolver for all modules from jayasoft.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="commons-*" matcher="glob" resolver="myapachecommonsresolver"/>
-</modules>
-</code>
-Uses myapachecommonsresolver for all modules beginning by commons- from apache.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="commons-[a-z]+" matcher="regexp" resolver="myapachecommonsresolver"/>
-</modules>
-</code>
-Uses myapachecommonsresolver for all modules from apache beginning by commons- followed by any number of alphabetic lowercase characters.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/> 
-</modules>
-</code>
-Uses latest-time conflict manager for all modules from apache which name begins with ivy.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/> 
-</modules>
-</code>
-Uses 'fix-103' as default branch for all modules from apache which name begins with ivy.
-
-
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</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> module
+
+Define a module set rule. The tag defines a module set, by giving an expression and the matcher to use for organisation and name (for instance, you can use * to specify all). 
+
+It also gives the specific setting to use for this module set.
+
+For each module set, you can configure:
+<ul>
+<li>the <a href="../../doc/configuration/resolvers.html">resolver</a> to use</li>
+<li>the <a href="../../doc/configuration/conflict-managers.html">conflict manager</a> to use</li>
+<li>the default <a href="../../doc/terminology#branch.html">branch</a> to use</li>
+</ul>
+
+<h1>Attributes</h1>
+<table class="ivy-attributes">
+<thead>
+    <tr><th class="ivy-att">Attribute</th><th class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
+</thead>
+<tbody>
+    <tr><td>organisation</td><td>the name of the organisation to which apply the resolver. May be an expression depending on the matcher used (see matcher attribute below).</td>
+        <td>Yes</td></tr>
+    <tr><td>name</td><td>the name of the module to which apply the resolver. May be an expression depending on the matcher used (see matcher attribute below).</td>
+        <td>Yes</td></tr>
+    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> to use to match the modules to which the resolver should be applied <span class="since">since 1.3</span></td>
+        <td>No, defaults to exactOrRegexp</td></tr>
+    <tr><td>resolver</td><td>the name of the resolver to apply. The resolver must have been defined in the resolvers section of the configuration file.</td>
+        <td>No</td></tr>
+    <tr><td>conflict-manager</td><td>the name of the conflict manager to apply. <span class="since">since 1.4</span></td>
+        <td>No</td></tr>
+    <tr><td>branch</td><td>the default branch to apply. <span class="since">since 1.4</span></td>
+        <td>No</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+<modules>
+  <module organisation="jayasoft" name="*" resolver="myprojectsresolver"/>
+</modules>
+</code>
+Uses myprojectresolver for all modules from jayasoft.
+<hr/>
+<code type="xml">
+<modules>
+  <module organisation="apache" name="commons-*" matcher="glob" resolver="myapachecommonsresolver"/>
+</modules>
+</code>
+Uses myapachecommonsresolver for all modules beginning by commons- from apache.
+<hr/>
+<code type="xml">
+<modules>
+  <module organisation="apache" name="commons-[a-z]+" matcher="regexp" resolver="myapachecommonsresolver"/>
+</modules>
+</code>
+Uses myapachecommonsresolver for all modules from apache beginning by commons- followed by any number of alphabetic lowercase characters.
+<hr/>
+<code type="xml">
+<modules>
+  <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/> 
+</modules>
+</code>
+Uses latest-time conflict manager for all modules from apache which name begins with ivy.
+<hr/>
+<code type="xml">
+<modules>
+  <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/> 
+</modules>
+</code>
+Uses 'fix-103' as default branch for all modules from apache which name begins with ivy.
+
+
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/configuration/modules.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/modules.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/modules.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/modules.html Wed May  9 03:58:10 2007
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> modules
-
-Defines per module or module set settings.
-
-The rules are given by defining a module set, using pattern for module organisation and name, and giving some settings for the set, like the name of the corresponding resolver to use.
-
-If no rule match a given module, the default setting will be used.
-
-Even if not required, because the use of a default big resolver (chain, for instance) able to resolve all dependencies can answer all the needs, the configuration of smaller resolvers used for different cases can improve performances a lot. For instance, if you have a local repository for your modules and a distant repository for third party libraries, it is a good idea to have two separate resolvers, and configure ivy to use one for all your modules and another for the rest (the default one).
-
-<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/configuration/module.html">module</a></td><td>defines a module set rule</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> modules
+
+Defines per module or module set settings.
+
+The rules are given by defining a module set, using pattern for module organisation and name, and giving some settings for the set, like the name of the corresponding resolver to use.
+
+If no rule match a given module, the default setting will be used.
+
+Even if not required, because the use of a default big resolver (chain, for instance) able to resolve all dependencies can answer all the needs, the configuration of smaller resolvers used for different cases can improve performances a lot. For instance, if you have a local repository for your modules and a distant repository for third party libraries, it is a good idea to have two separate resolvers, and configure ivy to use one for all your modules and another for the rest (the default one).
+
+<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/configuration/module.html">module</a></td><td>defines a module set rule</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/configuration/modules.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/doc/configuration/namespace.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/namespace.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/namespace.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/namespace.html Wed May  9 03:58:10 2007
@@ -1,128 +1,128 @@
-<!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> namespace
-
-Defines a new namespace. A namespace is identified by a name, which is used to reference the namespace in the resolvers using the namespace.
-
-Namespaces overview is given in the <a href="../../doc/configuration/namespaces.html">namespaces</a> documentation.
-
-A namespace mainly consists of a list of rules, each rule defining a translation between system namespace and the defined namespace, and vice versa.
-
-There are two main possibilities for using these rules. By default, a namespace iterate through the rules, and when it finds one that translate the given name, it returns the translated name. But the namespace can be configured to do use the list as a translator chain: in this case, all rules are applied in order, the result of the first rule translation being passed to the second, and so on.
-<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 namespace name</td>
-        <td>Yes</td></tr>
-    <tr><td>chainrules</td><td>true to indicate that namespaces rules should be chained, false otherwise</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/configuration/namespace/rule.html">rule</a></td><td>defines a new namespace rule</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Example</h1>
-<code type="xml">
-<namespace name="test">
-  <rule>
-    <fromsystem>
-      <src org="systemorg"/>
-      <dest org="A"/>
-    </fromsystem>
-    <tosystem>
-      <src org="A"/>
-      <dest org="systemorg"/>
-    </tosystem>
-  </rule>
-</namespace>
-</code>
-
-<code type="xml">
-<namespace name="test">
-  <rule>
-    <fromsystem>
-      <src org="systemorg2" module="system\-(.+)"/>
-      <dest org="B" module="$m1"/>
-    </fromsystem>
-    <tosystem>
-      <src org="B" module=".+"/>
-      <dest org="systemorg2" module="system-$m0"/>
-    </tosystem>
-  </rule>
-</namespace>
-</code>
-
-<code type="xml">
-<namespace name="test" chainrules="true">
-  <rule>
-    <fromsystem>
-      <src org="systemorg"/>
-      <dest org="A"/>
-    </fromsystem>
-    <tosystem>
-      <src org="A"/>
-      <dest org="systemorg"/>
-    </tosystem>
-  </rule>
-  <rule>
-    <fromsystem>
-      <src module="systemmod"/>
-      <dest module="A"/>
-    </fromsystem>
-    <tosystem>
-      <src module="A"/>
-      <dest module="systemmod"/>
-    </tosystem>
-  </rule>
-  <rule>
-    <fromsystem>
-      <src module="systemmod2"/>
-      <dest module="B"/>
-    </fromsystem>
-    <tosystem>
-      <src module="B"/>
-      <dest module="systemmod2"/>
-    </tosystem>
-  </rule>
-</namespace>
-</code>
-
-	</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> namespace
+
+Defines a new namespace. A namespace is identified by a name, which is used to reference the namespace in the resolvers using the namespace.
+
+Namespaces overview is given in the <a href="../../doc/configuration/namespaces.html">namespaces</a> documentation.
+
+A namespace mainly consists of a list of rules, each rule defining a translation between system namespace and the defined namespace, and vice versa.
+
+There are two main possibilities for using these rules. By default, a namespace iterate through the rules, and when it finds one that translate the given name, it returns the translated name. But the namespace can be configured to do use the list as a translator chain: in this case, all rules are applied in order, the result of the first rule translation being passed to the second, and so on.
+<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 namespace name</td>
+        <td>Yes</td></tr>
+    <tr><td>chainrules</td><td>true to indicate that namespaces rules should be chained, false otherwise</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/configuration/namespace/rule.html">rule</a></td><td>defines a new namespace rule</td>
+        <td>0..n</td></tr>
+</tbody>
+</table>
+<h1>Example</h1>
+<code type="xml">
+<namespace name="test">
+  <rule>
+    <fromsystem>
+      <src org="systemorg"/>
+      <dest org="A"/>
+    </fromsystem>
+    <tosystem>
+      <src org="A"/>
+      <dest org="systemorg"/>
+    </tosystem>
+  </rule>
+</namespace>
+</code>
+
+<code type="xml">
+<namespace name="test">
+  <rule>
+    <fromsystem>
+      <src org="systemorg2" module="system\-(.+)"/>
+      <dest org="B" module="$m1"/>
+    </fromsystem>
+    <tosystem>
+      <src org="B" module=".+"/>
+      <dest org="systemorg2" module="system-$m0"/>
+    </tosystem>
+  </rule>
+</namespace>
+</code>
+
+<code type="xml">
+<namespace name="test" chainrules="true">
+  <rule>
+    <fromsystem>
+      <src org="systemorg"/>
+      <dest org="A"/>
+    </fromsystem>
+    <tosystem>
+      <src org="A"/>
+      <dest org="systemorg"/>
+    </tosystem>
+  </rule>
+  <rule>
+    <fromsystem>
+      <src module="systemmod"/>
+      <dest module="A"/>
+    </fromsystem>
+    <tosystem>
+      <src module="A"/>
+      <dest module="systemmod"/>
+    </tosystem>
+  </rule>
+  <rule>
+    <fromsystem>
+      <src module="systemmod2"/>
+      <dest module="B"/>
+    </fromsystem>
+    <tosystem>
+      <src module="B"/>
+      <dest module="systemmod2"/>
+    </tosystem>
+  </rule>
+</namespace>
+</code>
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/configuration/namespace/dest.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/configuration/namespace/dest.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/configuration/namespace/dest.html (original)
+++ incubator/ivy/core/trunk/doc/doc/configuration/namespace/dest.html Wed May  9 03:58:10 2007
@@ -1,63 +1,63 @@
-<!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: 3};</script>	
-	<script type="text/javascript" src="../../../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-<b>Tag:</b> dest
-
-Defines the translation part of a translation rule. If a name has matched a corresponding src, it will be translated using this dest part.
-
-The new names can contain references to groups of the matched name, using a slightly modified regexp syntax. Indeed, referenced groups can be part of either the organisation, module or revision part of the original name. So, to reference the groups, you just have to add a letter identifying the part in which the group should be selected: o for organisation, m for module, and r for revision.
-
-For instance, $o0 matches the whole matched organisation, and $m0 the whole matched module name. $o1 matches the first group of the matched organisation.
-
-For details about regexp and groups, see the <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html">Pattern class documentation</a> in the jdk.
-<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 new organisation name</td>
-        <td>No, defaults to $o0</td></tr>
-    <tr><td>module</td><td>the new module name</td>
-        <td>No, defaults to $m0</td></tr>
-    <tr><td>rev</td><td>the new revision</td>
-        <td>No, defaults to $r0</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-    <fromsystem>
-      <src org="systemorg2" module="system\-(.+)"/>
-      <dest org="B" module="$m1"/>
-    </fromsystem>
-</code>
-Matches modules from systemorg2 which have a name beginning with system followed by a minus and anything else, and translate it to organisation B and module the part following <code>system-</code> of the original name.
-
-	</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: 3};</script>	
+	<script type="text/javascript" src="../../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<b>Tag:</b> dest
+
+Defines the translation part of a translation rule. If a name has matched a corresponding src, it will be translated using this dest part.
+
+The new names can contain references to groups of the matched name, using a slightly modified regexp syntax. Indeed, referenced groups can be part of either the organisation, module or revision part of the original name. So, to reference the groups, you just have to add a letter identifying the part in which the group should be selected: o for organisation, m for module, and r for revision.
+
+For instance, $o0 matches the whole matched organisation, and $m0 the whole matched module name. $o1 matches the first group of the matched organisation.
+
+For details about regexp and groups, see the <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html">Pattern class documentation</a> in the jdk.
+<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 new organisation name</td>
+        <td>No, defaults to $o0</td></tr>
+    <tr><td>module</td><td>the new module name</td>
+        <td>No, defaults to $m0</td></tr>
+    <tr><td>rev</td><td>the new revision</td>
+        <td>No, defaults to $r0</td></tr>
+</tbody>
+</table>
+<h1>Examples</h1>
+<code type="xml">
+    <fromsystem>
+      <src org="systemorg2" module="system\-(.+)"/>
+      <dest org="B" module="$m1"/>
+    </fromsystem>
+</code>
+Matches modules from systemorg2 which have a name beginning with system followed by a minus and anything else, and translate it to organisation B and module the part following <code>system-</code> of the original name.
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/core/trunk/doc/doc/configuration/namespace/dest.html
------------------------------------------------------------------------------
    svn:eol-style = LF



Mime
View raw message