ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r679838 - in /ant/ivy: core/trunk/doc/resolver/ core/trunk/doc/settings/ core/trunk/doc/settings/caches/ core/trunk/doc/settings/macrodef/ core/trunk/doc/settings/namespace/ site/
Date Fri, 25 Jul 2008 15:42:06 GMT
Author: xavier
Date: Fri Jul 25 08:42:03 2008
New Revision: 679838

URL: http://svn.apache.org/viewvc?rev=679838&view=rev
Log:
implement tag documentation generation for settings files, based on xpath to locate useful data in files, and therefore requiring doc files to be valid xhtml

Modified:
    ant/ivy/core/trunk/doc/resolver/chain.html
    ant/ivy/core/trunk/doc/resolver/dual.html
    ant/ivy/core/trunk/doc/resolver/filesystem.html
    ant/ivy/core/trunk/doc/resolver/ibiblio.html
    ant/ivy/core/trunk/doc/resolver/ivyrep.html
    ant/ivy/core/trunk/doc/resolver/packager.html
    ant/ivy/core/trunk/doc/resolver/sftp.html
    ant/ivy/core/trunk/doc/resolver/ssh.html
    ant/ivy/core/trunk/doc/resolver/url.html
    ant/ivy/core/trunk/doc/resolver/vfs.html
    ant/ivy/core/trunk/doc/settings/caches.html
    ant/ivy/core/trunk/doc/settings/caches/cache.html
    ant/ivy/core/trunk/doc/settings/caches/ttl.html
    ant/ivy/core/trunk/doc/settings/classpath.html
    ant/ivy/core/trunk/doc/settings/conflict-managers.html
    ant/ivy/core/trunk/doc/settings/include.html
    ant/ivy/core/trunk/doc/settings/latest-strategies.html
    ant/ivy/core/trunk/doc/settings/lock-strategies.html
    ant/ivy/core/trunk/doc/settings/macrodef.html
    ant/ivy/core/trunk/doc/settings/macrodef/attribute.html
    ant/ivy/core/trunk/doc/settings/module.html
    ant/ivy/core/trunk/doc/settings/modules.html
    ant/ivy/core/trunk/doc/settings/namespace.html
    ant/ivy/core/trunk/doc/settings/namespace/dest.html
    ant/ivy/core/trunk/doc/settings/namespace/fromtosystem.html
    ant/ivy/core/trunk/doc/settings/namespace/rule.html
    ant/ivy/core/trunk/doc/settings/namespace/src.html
    ant/ivy/core/trunk/doc/settings/namespaces.html
    ant/ivy/core/trunk/doc/settings/outputters.html
    ant/ivy/core/trunk/doc/settings/parsers.html
    ant/ivy/core/trunk/doc/settings/properties.html
    ant/ivy/core/trunk/doc/settings/property.html
    ant/ivy/core/trunk/doc/settings/resolvers.html
    ant/ivy/core/trunk/doc/settings/settings.html
    ant/ivy/core/trunk/doc/settings/status.html
    ant/ivy/core/trunk/doc/settings/statuses.html
    ant/ivy/core/trunk/doc/settings/triggers.html
    ant/ivy/core/trunk/doc/settings/typedef.html
    ant/ivy/core/trunk/doc/settings/version-matchers.html
    ant/ivy/site/build.xml
    ant/ivy/site/template.html

Modified: ant/ivy/core/trunk/doc/resolver/chain.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/chain.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/chain.html (original)
+++ ant/ivy/core/trunk/doc/resolver/chain.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -31,7 +30,7 @@
 <tr><td class="title">Handle publish</td><td class="value">delegates to first sub resolver in chain</td></tr>
 </table>
 
-This resolver is only a container of a chain of other resolvers. The sub resolvers can be any resolver, including a chain. An attribute enable to indicate if the chain must be iterated after the first found or not (at least when asking for a latest revision). If the chain is iterated, then it's the latest among the ones found that is returned. If the chain is not iterated, then it's the first found which is returned.
+<span class="tagdoc" id="ivysettings.resolvers.chain">This resolver is only a container of a chain of other resolvers.</span> The sub resolvers can be any resolver, including a chain. An attribute enable to indicate if the chain must be iterated after the first found or not (at least when asking for a latest revision). If the chain is iterated, then it's the latest among the ones found that is returned. If the chain is not iterated, then it's the first found which is returned.
 <h1>Attributes</h1>
 This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of composite resolvers.
 <table class="ivy-attributes">

Modified: ant/ivy/core/trunk/doc/resolver/dual.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/dual.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/dual.html (original)
+++ ant/ivy/core/trunk/doc/resolver/dual.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -31,7 +30,7 @@
 <tr><td class="title">Handle publish</td><td class="value">delegates to ivy sub resolver if artifact to publish is of "ivy" type, to artifact sub resolver otherwise</td></tr>
 </table>
 
-This resolver delegates its job to one resolver for ivy files and another for artifacts.
+<span class="tagdoc" id="ivysettings.resolvers.dual">This resolver delegates its job to one resolver for ivy files and another for artifacts.</span>
 
 <h1>Attributes</h1>
 This resolver shares the <a href="../settings/resolvers.html#common">common attributes</a> of composite resolvers.

Modified: ant/ivy/core/trunk/doc/resolver/filesystem.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/filesystem.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/filesystem.html (original)
+++ ant/ivy/core/trunk/doc/resolver/filesystem.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -31,7 +30,7 @@
 <tr><td class="title">Handle publish</td><td class="value">yes</td></tr>
 </table><br/>
 
-This resolver uses the file system to resolve ivy files and artifacts. It presents the advantage to usually have very good performances. Moreover, it is easy to setup using basic OS file sharing mechanism.
+<span class="tagdoc" id="ivysettings.resolvers.filesystem">This resolver uses the file system to resolve ivy files and artifacts.</span> It presents the advantage to usually have very good performances. Moreover, it is easy to setup using basic OS file sharing mechanism.
 
 The configuration of such a resolver is mainly done through ivy and artifact patterns, indicating where ivy files and artifacts can be found in the file system. You can indicate a list of pattern which will be checked one after the other.
 

Modified: ant/ivy/core/trunk/doc/resolver/ibiblio.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/ibiblio.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/ibiblio.html (original)
+++ ant/ivy/core/trunk/doc/resolver/ibiblio.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -31,7 +30,7 @@
 <tr><td class="title">Handle publish</td><td class="value">no</td></tr>
 </table>
 
-This resolver usually uses ibiblio to find artifacts. 
+<span class="tagdoc" id="ivysettings.resolvers.ibiblio">This resolver usually uses ibiblio to find artifacts. </span>
 
 <span class="since">since 1.3</span> Using the m2compatible attribute, you can benefit from maven 2 repository compatibility (convert dots in organisation in slashes, search for poms, use transitive dependencies of poms). This setting also affects the default place where the resolver look for its artifacts to point to the maven2 repository. So setting this attribute to true is sufficient to use maven 2 ibiblio repository.
 

Modified: ant/ivy/core/trunk/doc/resolver/ivyrep.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/ivyrep.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/ivyrep.html (original)
+++ ant/ivy/core/trunk/doc/resolver/ivyrep.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -30,7 +29,7 @@
 <tr><td class="title">Handle latest</td><td class="value">yes, at least if the repository server is apache based</td></tr>
 <tr><td class="title">Handle publish</td><td class="value">no</td></tr>
 </table>
-This resolver usually uses an URL based repository usually similar in structure to <a href="http://ivyrep.jayasoft.org/">ivyrep</a> to find ivy files, and ibiblio to find artifacts.
+<span class="tagdoc" id="ivysettings.resolvers.ivyrep">This resolver usually uses an URL based repository usually similar in structure to <a href="http://ivyrep.jayasoft.org/">ivyrep</a> to find ivy files, and ibiblio to find artifacts.</span>
 It can also be configured to use other similar repositories.
 
 <div class="tip">

Modified: ant/ivy/core/trunk/doc/resolver/packager.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/packager.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/packager.html (original)
+++ ant/ivy/core/trunk/doc/resolver/packager.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -37,7 +36,7 @@
 </p>
 
 <p>
-This resolver accesses ivy files and "packaging instructions" from an online "packager" repository. "Packager" repositories contain no actual artifacts. To get the artifacts, the packaging instructions are downloaded from the repository and executed locally. These instructions specify additional resource(s) to download and how to create the artifacts from them, for example, by downloading a project's original distribution archive directly from their web site and extracting the desired artifacts.
+<span class="tagdoc" id="ivysettings.resolvers.packager">This resolver accesses ivy files and "packaging instructions" from an online "packager" repository.</span> "Packager" repositories contain no actual artifacts. To get the artifacts, the packaging instructions are downloaded from the repository and executed locally. These instructions specify additional resource(s) to download and how to create the artifacts from them, for example, by downloading a project's original distribution archive directly from their web site and extracting the desired artifacts.
 </p>
 
 <p>
@@ -202,7 +201,7 @@
 This resolver ensures following ant properties are defined when it executes the ant build task.
 <table class="ivy-attributes">
 <thead>
-    <tr><th class="ivy-att">Property</th><th class="ivy-att-desc">Description</th>
+    <tr><th class="ivy-att">Property</th><th class="ivy-att-desc">Description</th></tr>
 </thead>
 <tbody>
   <tr>
@@ -388,7 +387,6 @@
     </m2resource>
 </packager-module>
 </code>
-</p>
 
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>

Modified: ant/ivy/core/trunk/doc/resolver/sftp.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/sftp.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/sftp.html (original)
+++ ant/ivy/core/trunk/doc/resolver/sftp.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -32,7 +31,7 @@
 </table>
 
 <br/>
-This resolver can be used when your ivy repository is located on a server accessible via sftp. The secured nature of sftp and its wide spread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. <span class="since">since 1.4</span>
+<span class="tagdoc" id="ivysettings.resolvers.sftp">This resolver can be used when your ivy repository is located on a server accessible via sftp.</span> The secured nature of sftp and its wide spread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. <span class="since">since 1.4</span>
 
 If your server supports ssh but not sftp, there is also an <a href="../resolver/ssh.html">ssh resolver</a>.
 

Modified: ant/ivy/core/trunk/doc/resolver/ssh.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/ssh.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/ssh.html (original)
+++ ant/ivy/core/trunk/doc/resolver/ssh.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -32,7 +31,7 @@
 </table>
 
 <br/>
-This resolver can be used when your ivy repository is located on a server accessible via ssh. The secured nature of ssh and its wide spread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. <span class="since">since 1.4</span>
+<span class="tagdoc" id="ivysettings.resolvers.ssh">This resolver can be used when your ivy repository is located on a server accessible via ssh.</span> The secured nature of ssh and its wide spread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. <span class="since">since 1.4</span>
 
 If your server supports sftp, you can consider using the <a href="../resolver/sftp.html">sftp resolver</a>.
 

Modified: ant/ivy/core/trunk/doc/resolver/url.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/url.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/url.html (original)
+++ ant/ivy/core/trunk/doc/resolver/url.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -32,7 +31,7 @@
 </table>
 
 <br/>
-This resolver is one of the most generic, in fact most of the previous resolvers can be obtained by a particular configuration of this one. Indeed it uses urls to find ivy files and artifacts. The urls it uses are defined through ivy and artifact children, each giving a pattern to find ivy files or artifacts.
+<span class="tagdoc" id="ivysettings.resolvers.url">This resolver is one of the most generic, in fact most of the previous resolvers can be obtained by a particular configuration of this one.</span> Indeed it uses urls to find ivy files and artifacts. The urls it uses are defined through ivy and artifact children, each giving a pattern to find ivy files or artifacts.
 
 <strong>Limitation</strong>: in m2compatible mode, this resolver is not able list available organizations. It means some features like [[ant:repreport]] are not available.
 

Modified: ant/ivy/core/trunk/doc/resolver/vfs.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/resolver/vfs.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/resolver/vfs.html (original)
+++ ant/ivy/core/trunk/doc/resolver/vfs.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -31,7 +30,7 @@
 <tr><td class="title">Handle publish</td><td class="value">depend on vfs capacity, usually yes</td></tr>
 </table>
 <br/>
-This resolver is certainly the most capable, since it relies on <a href="http://jakarta.apache.org/commons/vfs/">Apache commons VFS</a>, which gives an uniform access to <a href="http://jakarta.apache.org/commons/vfs/filesystems.html">a good number of file systems</a>, including ftp, webdav, zip, ... <span class="since">since 1.4</span>
+<span class="tagdoc" id="ivysettings.resolvers.vfs">This resolver is certainly the most capable, since it relies on <a href="http://jakarta.apache.org/commons/vfs/">Apache commons VFS</a>, which gives an uniform access to <a href="http://jakarta.apache.org/commons/vfs/filesystems.html">a good number of file systems</a>, including ftp, webdav, zip, ...</span> <span class="since">since 1.4</span>
 
 <i>Note: commons vfs has not released a stable version yet, hence Ivy relies on a nightly build. Stability should thus be considered carefully before using this resolver in a production environment</i>
 

Modified: ant/ivy/core/trunk/doc/settings/caches.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/caches.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/caches.html (original)
+++ ant/ivy/core/trunk/doc/settings/caches.html Fri Jul 25 08:42:03 2008
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> caches
 
-Configures the Ivy cache system. <span class="since">since 2.0</span>.
+<span class="tagdoc" id="ivysettings.caches">Configures the Ivy cache system.</span> <span class="since">since 2.0</span>.
 See <a href="../concept.html#cache">cache concept</a> for details on the Ivy cache concept.
 
 By default, Ivy defines one repository cache instance, called 'default-cache', which uses the default cache settings defined using attributes on this tag. This default instance is defined as long as you don't define your own default cache using the 'default' attribute, and have at least one dependency resolver which doesn't specify which cache instance to use.

Modified: ant/ivy/core/trunk/doc/settings/caches/cache.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/caches/cache.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/caches/cache.html (original)
+++ ant/ivy/core/trunk/doc/settings/caches/cache.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> cache
 
-Defines a repository cache instance based on the default repository cache implementation.
+<span class="tagdoc" id="ivysettings.caches.cache">Defines a repository cache instance based on the default repository cache implementation.</span>
 
 The default repository cache implementation caches files on the local filesystem in subdirectories of a configured base directory.
 

Modified: ant/ivy/core/trunk/doc/settings/caches/ttl.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/caches/ttl.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/caches/ttl.html (original)
+++ ant/ivy/core/trunk/doc/settings/caches/ttl.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> ttl
 
-<span class="since">Since 2.0</span> Defines a TTL (Time To Live) rule for resolved revision caching.
+<span class="since">Since 2.0</span> <span class="tagdoc" id="ivysettings.caches.cache.TTL">Defines a TTL (Time To Live) rule for resolved revision caching.</span>
 
 When Ivy resolves a dynamic version constraint (like latest.integration or a version range), it can store the result of the resolution (like latest.integration=1.5.1) for a given time, called TTL. It means that Ivy will reuse this dynamic revision resolution result without accessing the repositories for the duration of the TTL, unless running [[ant:resolve]] in refresh mode.
 

Modified: ant/ivy/core/trunk/doc/settings/classpath.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/classpath.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/classpath.html (original)
+++ ant/ivy/core/trunk/doc/settings/classpath.html Fri Jul 25 08:42:03 2008
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<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>
+<span class="tagdoc" id="ivysettings.classpath">Includes a jar in the classpath used to load plugins.</span> <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, ...).
 

Modified: ant/ivy/core/trunk/doc/settings/conflict-managers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/conflict-managers.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/conflict-managers.html (original)
+++ ant/ivy/core/trunk/doc/settings/conflict-managers.html Fri Jul 25 08:42:03 2008
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> conflict-managers
 
-Defines a list of <a href="../concept.html#conflict">conflicts managers</a> usable in ivy. Each conflict manager is identified by its name, given as an attribute.
+<span class="tagdoc" id="ivysettings.conflict-managers">Defines a list of <a href="../concept.html#conflict">conflicts managers</a> usable in ivy.</span> 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).
 

Modified: ant/ivy/core/trunk/doc/settings/include.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/include.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/include.html (original)
+++ ant/ivy/core/trunk/doc/settings/include.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<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>
+<span class="tagdoc" id="ivysettings.include">Includes another ivysettings file as if it were part of this one.</span> <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.
 

Modified: ant/ivy/core/trunk/doc/settings/latest-strategies.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/latest-strategies.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/latest-strategies.html (original)
+++ ant/ivy/core/trunk/doc/settings/latest-strategies.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> latest-strategies
 
-Defines a list of <a href="../concept.html#latest">latest strategies</a> usable in ivy. Each latest strategy is identified by its name, given as an attribute.
+<span class="tagdoc" id="ivysettings.latest-strategies">Defines a list of <a href="../concept.html#latest">latest strategies</a> usable in ivy.</span> 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:

Modified: ant/ivy/core/trunk/doc/settings/lock-strategies.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/lock-strategies.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/lock-strategies.html (original)
+++ ant/ivy/core/trunk/doc/settings/lock-strategies.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> lock-strategies <span class="since">since 2.0</span>
 
-Defines a list of lock strategies usable in Ivy. 
+<span class="tagdoc" id="ivysettings.lock-strategies">Defines a list of lock strategies usable in Ivy.</span>
 
 A lock strategy is used by a cache manager to decide when and how locking should be performed (see [[settings/cache]] to see how to configure the lock strategy to use).
 

Modified: ant/ivy/core/trunk/doc/settings/macrodef.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/macrodef.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/macrodef.html (original)
+++ ant/ivy/core/trunk/doc/settings/macrodef.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<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>
+<span class="tagdoc" id="ivysettings.macrodef">Defines a new dependency resolver type based upon an other one.</span> 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.
 
@@ -42,7 +41,7 @@
 <ul>
 <li>if there is no name attribute on a resolver in the macrodef, then Ivy will use the name given when using the macro. This is what usually should be done for the main resolver defined in the macro</li>
 <li>if there is a name attribute on a resolver in the macrodef, but this name doesn't contain a @{name} inside, then Ivy will use the provided name prefixed with the name of the macro separated by a dash</li>
-<li>if there is a name attribute on a resolver in the macrodef, and this name contains @{name} somewhere, then Ivy will use this name, and replace @{name} with the name provided when using the macro.
+<li>if there is a name attribute on a resolver in the macrodef, and this name contains @{name} somewhere, then Ivy will use this name, and replace @{name} with the name provided when using the macro.</li>
 </ul>
 
 Example:

Modified: ant/ivy/core/trunk/doc/settings/macrodef/attribute.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/macrodef/attribute.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/macrodef/attribute.html (original)
+++ ant/ivy/core/trunk/doc/settings/macrodef/attribute.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> attribute
 
-Defines a macrodef attribute. See macrodef for details.
+<span class="tagdoc" id="ivysettings.macrodef.attribute">Defines a macrodef attribute.</span> See macrodef for details.
 <h1>Attributes</h1>
 <table class="ivy-attributes">
 <thead>

Modified: ant/ivy/core/trunk/doc/settings/module.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/module.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/module.html (original)
+++ ant/ivy/core/trunk/doc/settings/module.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<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, name, revision and any extra attribute identifying your modules. The rule matching is performed in order, and is using a pattern matcher. Hence you can use * to specify all, or simply avoid specifying the attribute. 
+<span class="tagdoc" id="ivysettings.modules.module">Define a module set rule.</span> The tag defines a module set, by giving an expression and the matcher to use for organisation, name, revision and any extra attribute identifying your modules. The rule matching is performed in order, and is using a pattern matcher. Hence you can use * to specify all, or simply avoid specifying the attribute. 
 
 The revision and extra attributes are only used for rules defining the resolver to use. For other settings, use only organisation and module name.
 

Modified: ant/ivy/core/trunk/doc/settings/modules.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/modules.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/modules.html (original)
+++ ant/ivy/core/trunk/doc/settings/modules.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> modules
 
-Defines per module or module set settings.
+<span class="tagdoc" id="ivysettings.modules">Defines per module or module set settings.</span>
 
 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.
 

Modified: ant/ivy/core/trunk/doc/settings/namespace.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/namespace.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/namespace.html (original)
+++ ant/ivy/core/trunk/doc/settings/namespace.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<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.
+<span class="tagdoc" id="ivysettings.namespaces.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.</span>
 
 Namespaces overview is given in the [[settings/namespaces]] documentation.
 

Modified: ant/ivy/core/trunk/doc/settings/namespace/dest.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/namespace/dest.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/namespace/dest.html (original)
+++ ant/ivy/core/trunk/doc/settings/namespace/dest.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<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.
+<span class="tagdoc" id="ivysettings.namespaces.namespace.rule.fromsystem.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.</span>
 
 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.
 

Modified: ant/ivy/core/trunk/doc/settings/namespace/fromtosystem.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/namespace/fromtosystem.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/namespace/fromtosystem.html (original)
+++ ant/ivy/core/trunk/doc/settings/namespace/fromtosystem.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> fromsystem / tosystem
 
-Defines a one way translation rule, i.e. a translation from system namespace to the defined namespace or vice versa.
+<span class="tagdoc" id="ivysettings.namespaces.namespace.fromsystem">Defines a one way translation rule, i.e. a translation from system namespace to the defined namespace or vice versa.</span>
 <h1>Child elements</h1>
 <table class="ivy-children">
 <thead>

Modified: ant/ivy/core/trunk/doc/settings/namespace/rule.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/namespace/rule.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/namespace/rule.html (original)
+++ ant/ivy/core/trunk/doc/settings/namespace/rule.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> rule
 
-Defines a new namespace rule. A rule defines a translation between system namespace and the defined namespace, and vice versa.
+<span class="tagdoc" id="ivysettings.namespaces.namespace.rule">Defines a new namespace rule. A rule defines a translation between system namespace and the defined namespace, and vice versa.</span>
 
 See [[settings/namespace]] doc for details.
 
@@ -37,7 +36,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td>[[settings/namespace/fromtosystem fromsystem]]</a></td><td>defines the translation to apply from system namespace to the defined namespace</td>
+    <tr><td>[[settings/namespace/fromtosystem fromsystem]]</td><td>defines the translation to apply from system namespace to the defined namespace</td>
         <td>1</td></tr>
     <tr><td>[[settings/namespace/fromtosystem tosystem]]</td><td>defines the translation to apply from the defined namespace to system namespace</td>
         <td>1</td></tr>

Modified: ant/ivy/core/trunk/doc/settings/namespace/src.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/namespace/src.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/namespace/src.html (original)
+++ ant/ivy/core/trunk/doc/settings/namespace/src.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <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>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> src
 
-Defines the acceptation part of a translation rule. If a name matches this src, it will be translated using the dest part.
+<span class="tagdoc" id="ivysettings.namespaces.namespace.rule.fromsystem.src">Defines the acceptation part of a translation rule.</span> If a name matches this src, it will be translated using the dest part.
 <h1>Attributes</h1>
 <table class="ivy-attributes">
 <thead>

Modified: ant/ivy/core/trunk/doc/settings/namespaces.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/namespaces.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/namespaces.html (original)
+++ ant/ivy/core/trunk/doc/settings/namespaces.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> namespaces
 
-Namespaces are an advanced feature of Ivy which let you use resolvers in which module names and organisations are not consistent between each other.
+<span class="tagdoc" id="ivysettings.namespaces">Namespaces are an advanced feature of Ivy which let you use resolvers in which module names and organisations are not consistent between each other.</span>
 
 For instance, if you want to use maven2 repository and ivyrep collectively, you will face some naming issues. For example all apache commons projects are declared to be part of the organisation apache in ivyrep whereas in maven2 ibiblio repository, they are declared to be part of the organisation of the same name of the module.
 

Modified: ant/ivy/core/trunk/doc/settings/outputters.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/outputters.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/outputters.html (original)
+++ ant/ivy/core/trunk/doc/settings/outputters.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> outputters
 
-Defines a list of report outputters usable in ivy. 
+<span class="tagdoc" id="ivysettings.outputters">Defines a list of report outputters usable in ivy. </span>
 
 A report outputter is used at the end of the resolve process to generate a report of how the resolve has been performed.
 

Modified: ant/ivy/core/trunk/doc/settings/parsers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/parsers.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/parsers.html (original)
+++ ant/ivy/core/trunk/doc/settings/parsers.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> parsers
 
-Defines a list of module descriptor parsers usable in ivy. Each parser defines which resources (which descriptor file) it accepts.
+<span class="tagdoc" id="ivysettings.parsers">Defines a list of module descriptor parsers usable in ivy.</span> Each parser defines which resources (which descriptor file) it accepts.
 The child tag used for the parser must be equal to a name of a parser type (added with the typedef tag).
 
 Note that when looking for a parser, ivy queries the parsers list in the reverse order. So the last parser in the list will be queried first. Consequently, if the last parser accepts all resources, the other parsers will never have a chance to parse the resource.

Modified: ant/ivy/core/trunk/doc/settings/properties.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/properties.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/properties.html (original)
+++ ant/ivy/core/trunk/doc/settings/properties.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> properties<br/>
 <br/>
-Loads a properties file into ivy variables. See variables chapter above for details about ivy variables.
+<span class="tagdoc" id="ivysettings.properties">Loads a properties file into ivy variables.</span> See variables chapter above for details about ivy variables.
 
 <span class="since">Since 2.0</span>: it is possible to access environment variables. This can be done by specifying the environment attribute. This attribute specifies the prefix which can be used to access these environment variables. For instance, if you specify environment="env", you can access the PATH environment variable with the env.PATH property name.
 
@@ -39,7 +38,7 @@
 <tbody>
     <tr><td>file</td><td>a path to a properties file to load</td>
         <td rowspan="2">One of these</td></tr>
-    <tr><td>environment</td><td>the prefix to use when retrieving environment variables <span class="since">(since 2.0)</span></td>
+    <tr><td>environment</td><td>the prefix to use when retrieving environment variables <span class="since">(since 2.0)</span></td></tr>
     <tr><td>override</td><td>indicates if the variable found in the properties file should override their previous value, if any <span class="since">(since 1.3)</span></td>
         <td>No, defaults to true</td></tr>
 </tbody>

Modified: ant/ivy/core/trunk/doc/settings/property.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/property.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/property.html (original)
+++ ant/ivy/core/trunk/doc/settings/property.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> property
 
-Defines an ivy variable. <span class="since">since 1.3</span>
+<span class="tagdoc" id="ivysettings.property">Defines an ivy variable.</span> <span class="since">since 1.3</span>
 
 The optional override attribute enables to avoid overriding the previous value of the varable, which makes the definition behave like ant properties, which is particularly useful to define default values (values which are used only if they haven't been defined yet).
 <h1>Attributes</h1>

Modified: ant/ivy/core/trunk/doc/settings/resolvers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/resolvers.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/resolvers.html (original)
+++ ant/ivy/core/trunk/doc/settings/resolvers.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> resolvers
 
-Defines a list of dependency resolvers usable in ivy. Each dependency resolver is identified by its name, given as an attribute.
+<span class="tagdoc" id="ivysettings.resolvers">Defines a list of dependency resolvers usable in ivy.</span> Each dependency resolver is identified by its name, given as an attribute.
 
 The child tag used for the dependency resolver must be equal to a name of a dependency resolver type (either built-in or added with the typedef tag).
 

Modified: ant/ivy/core/trunk/doc/settings/settings.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/settings.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/settings.html (original)
+++ ant/ivy/core/trunk/doc/settings/settings.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> settings
 
-Configures some important ivy info: default resolver, latest strategy, conflict manager...
+<span class="tagdoc" id="ivysettings.settings">Configures some important ivy info: default resolver, latest strategy, conflict manager...</span>
 
 Default resolver is used whenever nothing else is configured in the modules section of the settings file. It should give the name of a dependency resolver defined in the [[settings/resolvers]] section of the settings file.
 

Modified: ant/ivy/core/trunk/doc/settings/status.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/status.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/status.html (original)
+++ ant/ivy/core/trunk/doc/settings/status.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> status
 
-Define one available module status.
+<span class="tagdoc" id="ivysettings.statuses.status">Define one available module status.</span>
 
 See [[settings/statuses]] page for details about how statuses are defined.
 

Modified: ant/ivy/core/trunk/doc/settings/statuses.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/statuses.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/statuses.html (original)
+++ ant/ivy/core/trunk/doc/settings/statuses.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> statuses
 
-Defines the list of available statuses. <span class="since">since 1.4</span>
+<span class="tagdoc" id="ivysettings.statuses">Defines the list of available statuses.</span> <span class="since">since 1.4</span>
 
 By default, ivy has 3 statuses: release, milestone and integration. By adding a statuses section to your ivysettings file, you define the statuses you want to use. Note that in this case if you still want to have ivy default statuses you will have to declare them.
 
@@ -35,7 +34,7 @@
 
 The default status is the one used when none is defined in a module descriptor. If not specified, it defaults to the last defined status.
 
-The statuses order is important, the first is considered the more mature, the last the less mature. This is used to know if a status is compatible with a latest.<status> version matcher.
+The statuses order is important, the first is considered the more mature, the last the less mature. This is used to know if a status is compatible with a latest.<em>&lt;status&gt;</em> version matcher.
 
 <h1>Attributes</h1>
 <table class="ivy-attributes">

Modified: ant/ivy/core/trunk/doc/settings/triggers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/triggers.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/triggers.html (original)
+++ ant/ivy/core/trunk/doc/settings/triggers.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -28,7 +27,7 @@
 <b>Tag:</b> triggers
 <span class="since">since 1.4</span>
 
-Defines a list of triggers to activate on some Ivy events.
+<span class="tagdoc" id="ivysettings.triggers">Defines a list of triggers to activate on some Ivy events.</span>
 
 A trigger is an action which is performed whenever a particular event occurs.
 Ivy supports two type of triggers out of the box: ant-call and ant-build. The first calls a target in the same build as the original one whenever a particular event occurs, the second call an ant build which may be in another ant build script.
@@ -137,7 +136,7 @@
         </td>
         <td>Fired after an artifact has been downloaded from a repository to the cache</td>
     </tr>
-    <tr><td>pre-retrieve <br><span class="since">since 2.0</span></td>
+    <tr><td>pre-retrieve <br/><span class="since">since 2.0</span></td>
         <td>
           <ul>
             <li>organisation</li>the organisation of the module for which the dependencies will be retrieved
@@ -150,7 +149,7 @@
         </td>
         <td>Fired at the beginning of the retrieve process.</td>
     </tr>
-    <tr><td>post-retrieve <br><span class="since">since 2.0</span></td>
+    <tr><td>post-retrieve <br/><span class="since">since 2.0</span></td>
         <td>
           <ul>
             <li>organisation</li>the organisation of the module for which the dependencies have been retrieved
@@ -167,7 +166,7 @@
         </td>
         <td>Fired at the end of the retrieve process.</td>
     </tr>
-    <tr><td>pre-publish-artifact <br><span class="since">since 2.0</span></td>
+    <tr><td>pre-publish-artifact <br/><span class="since">since 2.0</span></td>
         <td>
           <ul>
             <li>organisation</li>the organisation of the artifact which is about to be published
@@ -183,7 +182,7 @@
         </td>
         <td>Fired before an artifact is published into a repository</td>
     </tr>
-    <tr><td>post-publish-artifact <br><span class="since">since 2.0</span></td>
+    <tr><td>post-publish-artifact <br/><span class="since">since 2.0</span></td>
         <td>
           <ul>
             <li>organisation</li>the organisation of the artifact that was published

Modified: ant/ivy/core/trunk/doc/settings/typedef.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/typedef.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/typedef.html (original)
+++ ant/ivy/core/trunk/doc/settings/typedef.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> typedef<br/>
 <br/>
-Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.
+<span class="tagdoc" id="ivysettings.typedef">Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.</span>
 See <a href="../extend.html">how to write and plug your own dependency resolver</a> for details.
 <h1>Attributes</h1>
 <table class="ivy-attributes">

Modified: ant/ivy/core/trunk/doc/settings/version-matchers.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/version-matchers.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/settings/version-matchers.html (original)
+++ ant/ivy/core/trunk/doc/settings/version-matchers.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
@@ -27,7 +26,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> version-matchers
 
-Defines a list of version matchers. <span class="since">since 1.4</span> 
+<span class="tagdoc" id="ivysettings.version-matchers">Defines a list of version matchers.</span> <span class="since">since 1.4</span> 
 
 The child tag used for the version matcher must be equal to a name of a report outputter type (added with the typedef tag).
 

Modified: ant/ivy/site/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/site/build.xml?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/site/build.xml (original)
+++ ant/ivy/site/build.xml Fri Jul 25 08:42:03 2008
@@ -172,4 +172,72 @@
         <init-imported-version basepath="ivyde" version="2.0.0.alpha1" />
         <init-imported-version basepath="ivyde" version="1.2.0" />
     </target>
+
+    <target name="tagsdoc" 
+            description="--> Generates tagsdoc.properties file which can be used in IvyDE for code completion documentation">
+        <scriptdef name="generate-tagsdoc" language="javascript">
+            <element name="fileset" type="fileset"/>
+            <attribute name="destFile"/>
+            <![CDATA[
+                importPackage(java.io);
+                importPackage(javax.xml.xpath);
+                importPackage(org.xml.sax);
+                importPackage(javax.xml.parsers);
+
+                fs = elements.get("fileset").get(0);
+                srcDir = elements.get("fileset").get(0).getDir(project);
+
+                // Get the files (array) of that fileset
+                ds = fs.getDirectoryScanner(project);
+                srcFiles = ds.getIncludedFiles();
+
+
+                // iterate over that array
+                print('processing '+srcFiles.length+' source files...');
+                var xpath = XPathFactory.newInstance().newXPath();
+
+                out = new FileWriter(self.getProject().resolveFile(attributes.get("destfile")));
+                for (i=0; i<srcFiles.length; i++) {
+                    try {
+                        // get the values via Java API
+                        var file = new File(fs.getDir(project), srcFiles[i]);
+                        print('processing '+ file + '...');
+                    
+                        // skip DOCTYPE in source
+                        r = new BufferedReader(new FileReader(file));
+                        r.readLine();
+                        inputSource = new InputSource(r);
+
+                        builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+                        document = builder.parse(inputSource);
+
+                        var expression = "//span[@class='tagdoc']";
+                        var t = xpath.evaluate(expression, document, XPathConstants.NODE);
+                        if (t == null) {
+                            print('\tno tagdoc span found: ignored');
+                            continue;
+                        }
+                        var id = t.getAttributes().getNamedItem("id").getTextContent();
+
+                        out.write('##### ' + id + '\n');
+                        out.write(id + ' = ' + t.getTextContent() + '\n');
+
+                        expression = "//table[@class='ivy-attributes'][1]/tbody/tr/td[1]";
+                        var atts = xpath.evaluate(expression, document, XPathConstants.NODESET);
+                        for (j=0; j<atts.getLength(); j++) {
+                            out.write(id + '.@' + atts.item(j).getTextContent() + ' = ' 
+                                + xpath.evaluate("../td[2]", atts.item(j), XPathConstants.NODE).getTextContent() + '\n');
+                        }
+                    } catch (e) {
+                        print('\terror: ' + e);
+                    }
+                }
+                out.close();
+            ]]>
+        </scriptdef>
+        <property name="ivydoc" value="${basedir}/target/history/trunk/" />
+        <generate-tagsdoc destFile="tagsdoc.properties">
+            <fileset dir="${ivydoc}" includes="settings/**/*.html,resolver/**/*.html" />
+        </generate-tagsdoc>
+    </target>        
 </project>

Modified: ant/ivy/site/template.html
URL: http://svn.apache.org/viewvc/ant/ivy/site/template.html?rev=679838&r1=679837&r2=679838&view=diff
==============================================================================
--- ant/ivy/site/template.html (original)
+++ ant/ivy/site/template.html Fri Jul 25 08:42:03 2008
@@ -19,7 +19,6 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <title>${title} | Apache Ivy</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" type="text/css" href="style/style.css" />



Mime
View raw message