http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/reference.html
----------------------------------------------------------------------
diff --git a/doc/reference.html b/doc/reference.html
deleted file mode 100644
index be42f12..0000000
--- a/doc/reference.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!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: 0};</script>   
-       <script type="text/javascript" src="xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Welcome to the Ivy reference documentation!
-
-If you don't know Ivy at all, take a look at its [[features features]], the 
[[faq]] and the [[tutorial tutorials]] before digging into this reference 
documentation.
-
-<h1>Reference Overview</h1>
-This documentation is broken into several parts:
-<ul>
-<li>Introduction</li>
-<ul>
-<li>[[terminology]]</li>
-This part gives you the meaning of some words used all over the Ivy 
documentation, such as organization, module, configurations, settings, ...
-<li>[[concept]]</li>
-This part introduces the main concepts used in Ivy: dependency resolvers, 
variables, patterns, and also a good introduction to a central ivy concept: 
module configurations.
-<li>[[principle]]</li>
-As the title suggests, here you will find an explanation of how Ivy does work 
internally, which can help to better understand and customize its use.
-<li>[[install]]</li>
-This part describes how to install Ivy.
-<li>[[running]]</li>
-This part describes possibility to control the behavior of Ivy at run time
-</ul>
-<li>[[settings]]</li>
-This part is dedicated to the specification of the settings file of Ivy 
(usually called ivysettings.xml). It also gives the list of built-in dependency 
resolvers available in Ivy.
-<li>[[ivyfile]]</li>
-This part is the reference for the module descriptors, the Ivy files in which 
you describe your dependencies. If you have any questions about what can be 
done or not in an ivy file, you will find the answer here.
-<li>[[ant]]</li>
-This part describes how to use Ivy from ant. It's in this section that all ant 
tasks provided by Ivy are specified.
-<li>[[standalone]]</li>
-Even though Ivy is most often used from ant, it can also be used from the 
command line. This page describes how you can do this.
-</ul></textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/release-notes.html
----------------------------------------------------------------------
diff --git a/doc/release-notes.html b/doc/release-notes.html
deleted file mode 100644
index 6029400..0000000
--- a/doc/release-notes.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!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: 0};</script>   
-       <script type="text/javascript" src="xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-
-<h2>Announcement</h2>
-
-<pre>
-December 21, 2015 - The Apache Ivy project is pleased to announce its 2.5.0 
release.
- 
-Apache Ivy is a tool for managing (recording, tracking, resolving and
-reporting) project dependencies, characterized by flexibility,
-configurability, and tight integration with Apache Ant.
-
-Key features of this 2.5.0 release are
-* Ivy now uses BoucyCastle 1.52. Due to the non backward compatibility of that 
library, earlier versions are not supported.
-* the minimum Java version required is now Java 7
-* TODO
-* TODO
-
-You can download this 2.5.0 release at:
-http://ant.apache.org/ivy/download.cgi
- 
-Issues should be reported to:
-https://issues.apache.org/jira/browse/IVY
- 
-More information can be found on the website:
-http://ant.apache.org/ivy/
-</pre>
- 
-<h2>List of Changes in this Release</h2>
- 
-For details about the following changes, check our JIRA install at 
-http://issues.apache.org/jira/browse/ivy
- 
-List of changes since Ivy 2.4.0:
-
-- FIX: Made the maven 'test' configuration public so we can use the test-jar 
as dependency (IVY-1444)
-- FIX: NullPointerException in dependencytree with no dependencies (IVY-1539)
-- FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task 
(IVY-1549)
-- FIX: ArrayIndexOutOfBoundsException when using a p2 repository for 
dependencies (IVY-1504)
-- FIX: fixdeps remove transitive 'kept' dependencies
-- FIX: PomModuleDescriptorParser should parse licenses from parent POM 
(IVY-1526) (Thanks to Jaikiran Pai)
-- FIX: dynamic revisions are not cached per resolver (IVY-1430) (Thanks to 
Stephen Haberman)
-- FIX: Dependencies failed using branch attribute (and extra attributes) 
(IVY-1141) (Thanks to Stephen Haberman)
-- FIX: useCacheOnly should allow lookup of changing dependencies in cache 
(IVY-1515) (Thanks to Ilya)
-- FIX: Translation of POM to Ivy XML with * exclusion is removing main 
artifact (IVY-1531) (Thanks to Jaikiran Pai)
-- FIX: Have makepom task take description from ivy-module > info > description 
element (IVY-1520)
-- FIX: Fix RetrieveEngine to take into account the correct extension while 
dealing with unpacked artifacts (IVY-1478) (Thanks to Jaikiran Pai)
-- FIX: ParseException "Unsupported repository, resources names are not uris" 
for ivy.xml with parent on Windows (IVY-1448) (Thanks to Riccardo Foschia and 
Jaikiran Pai)
-- FIX: Ivy 2.4.0 improperly handles modules with colon (:) in version 
(IVY-1522) (Thanks to Jaikiran Pai)
-- FIX: Delay the processing of configured cache ttls, until the IvySettings 
object is usable (IVY-1495) (Thanks to Jaikiran Pai)
-- FIX: Including optional ivysettings of type 'file' doesn't work when file 
doesn't exist (IVY-1555) (Thanks to Jaikiran Pai)
-- FIX: Makepom ignores dependency classifiers (IVY-1528) (Thanks to Jaikiran 
Pai)
-- FIX: Infinite loop in dependencytree (IVY-1540) (Thanks to Jaikiran Pai)
-- FIX: ivy:cachefileset fails with String index out of range on Windows 
(IVY-1475)
-
-- IMPROVEMENT: Throw an IllegalStateException when retrieving the 
resolutionCacheRoot on the DefaultResolutionCacheManager if the basedir (or 
IvySettings) is not set (IVY-1482)
-- IMPROVEMENT: Optimization: limit the revision numbers scanned if revision 
prefix is specified (Thanks to Ernestas Vaiciukevi&#269;ius)
-- IMPROVEMENT: Update bouncycastle to 1.52 (IVY-1521) (Thanks to Michal Srb)
-
-- NEW: Lets ssh-based resolvers use an ~/.ssh/config file to find 
username/hostname/keyfile options (Thanks to Colin Stanfill)
-- NEW: Add ivy.maven.lookup.sources and ivy.maven.lookup.javadoc variables to 
control the lookup of the additional artifacts. Defaults to true, for backward 
compatibility (IVY-1529)
-- NEW: Add (conditional) support for SHA-256 SHA-512 and SHA-384 checksum 
algorithms (IVY-1554) (Thanks to Jaikiran Pai)
-
-<!-- Samples :
-- NEW: bla bla bla (IVY-1234) (Thanks to Jane Doe)
-- IMPROVEMENT: bla bla bla (IVY-1234) (Thanks to Jane Doe)
-- FIX: bla bla bla (IVY-1234) (Thanks to Jane Doe)
-- DOCUMENTATION: bla bla bla (IVY-1234) (Thanks to Jane Doe)
--->
-
-<h2>Committers and Contributors</h2>
-
-Here is the list of people who have contributed source code and documentation 
up to this release. Many thanks to all of them, and also to the whole IvyDE 
community contributing ideas and feedback, and promoting the use of Apache Ivy !
-
-<ul>Committers
-<li>Matt Benson</li>
-<li>Jean-Louis Boudart</li>
-<li>Maarten Coene</li>
-<li>Charles Duffy</li>
-<li>Xavier Hanin</li>
-<li>Nicolas Lalevee</li>
-<li>Jon Schneider</li>
-<li>Gilles Scokart</li>
-</ul>
-
-<ul>Contributors:
-<li>Ingo Adler</li>
-<li>alex322</li>
-<li>Mathieu Anquetin</li>
-<li>Andreas Axelsson</li>
-<li>Stephane Bailliez</li>
-<li>Karl Baum</li>
-<li>Andrew Bernhagen</li>
-<li>Mikkel Bjerg</li>
-<li>Per Arnold Blaasmo</li>
-<li>Jeffrey Blattman</li>
-<li>Jasper Blues</li>
-<li>Jim Bonanno</li>
-<li>Joseph Boyd</li>
-<li>Dave Brosius</li>
-<li>Matthieu Brouillard</li>
-<li>Carlton Brown</li>
-<li>Mirko Bulovic</li>
-<li>Ed Burcher</li>
-<li>Jamie Burns</li>
-<li>Wei Chen</li>
-<li>Chris Chilvers</li>
-<li>Kristian Cibulskis</li>
-<li>Andrea Bernardo Ciddio</li>
-<li>Archie Cobbs</li>
-<li>Flavio Coutinho da Costa</li>
-<li>Stefan De Boey</li>
-<li>Mykhailo Delegan</li>
-<li>Charles Duffy</li>
-<li>Martin Eigenbrodt</li>
-<li>Stephen Evanchik</li>
-<li>Robin Fernandes</li>
-<li>Gregory Fernandez</li>
-<li>Danno Ferrin</li>
-<li>Riccardo Foschia</li>
-<li>Benjamin Francisoud</li>
-<li>Wolfgang Frank</li>
-<li>Jacob Grydholt Jensen</li>
-<li>John Gibson</li>
-<li>Mitch Gitman</li>
-<li>Evgeny Goldin</li>
-<li>Scott Goldstein</li>
-<li>Gintautas Grigelionis</li>
-<li>Pierre H&#228;gnestrand</li>
-<li>Scott Hebert</li>
-<li>Tobias Himstedt</li>
-<li>Aaron Hachez</li>
-<li>Ben Hale</li>
-<li>Stephen Haberman</li>
-<li>Peter Hayes</li>
-<li>Scott Hebert</li>
-<li>Payam Hekmat</li>
-<li>Achim Huegen</li>
-<li>Ilya</li>
-<li>Matt Inger</li>
-<li>Anders Jacobsson</li>
-<li>Anders Janmyr</li>
-<li>Steve Jones</li>
-<li>Christer Jonsson</li>
-<li>Michael Kebe</li>
-<li>Matthias Kilian</li>
-<li>Alexey Kiselev</li>
-<li>Gregory Kisling</li>
-<li>Stepan Koltsov</li>
-<li>Heschi Kreinick</li>
-<li>Sebastian Krueger</li>
-<li>Thomas Kurpick</li>
-<li>Tat Leung</li>
-<li>Costin Leau</li>
-<li>Antoine Levy-Lambert</li>
-<li>Tony Likhite</li>
-<li>Andrey Lomakin</li>
-<li>William Lyvers</li>
-<li>Sakari Maaranen</li>
-<li>Jan Materne</li>
-<li>Markus M. May</li>
-<li>Abel Muino</li>
-<li>J. Lewis Muir</li>
-<li>Stephen Nesbitt</li>
-<li>Joshua Nichols</li>
-<li>Bernard Niset</li>
-<li>Ales Nosek</li>
-<li>David Maplesden</li>
-<li>Glen Marchesani</li>
-<li>Phil Messenger</li>
-<li>Steve Miller</li>
-<li>Mathias Muller</li>
-<li>Randy Nott</li>
-<li>Peter Oxenham</li>
-<li>Jaikiran Pai</li>
-<li>Douglas Palmer</li>
-<li>Jesper Pedersen</li>
-<li>Emmanuel Pellereau</li>
-<li>Carsten Pfeiffer</li>
-<li>Yanus Poluektovich</li>
-<li>Roshan Punnoose</li>
-<li>Jean-Baptiste Quenot</li>
-<li>Carl Quinn</li>
-<li>Damon Rand</li>
-<li>Geoff Reedy</li>
-<li>Torkild U. Resheim</li>
-<li>Christian Riege</li>
-<li>Frederic Riviere</li>
-<li>Jens Rohloff</li>
-<li>Andreas Sahlbach</li>
-<li>Brian Sanders</li>
-<li>Adrian Sandor</li>
-<li>Michael Scheetz</li>
-<li>Ben Schmidt</li>
-<li>Ruslan Shevchenko</li>
-<li>John Shields</li>
-<li>Nihal Sinha</li>
-<li>Gene Smith</li>
-<li>Michal Srb</li>
-<li>Colin Stanfill</li>
-<li>Simon Steiner</li>
-<li>Johan Stuyts</li>
-<li>John Tinetti</li>
-<li>Erwin Tratar</li>
-<li>Jason Trump</li>
-<li>David Turner</li>
-<li>Ernestas Vaiciukevi&#269;ius</li>
-<li>Tjeerd Verhagen</li>
-<li>Richard Vowles</li>
-<li>Sven Walter</li>
-<li>James P. White</li>
-<li>Tom Widmer</li>
-<li>John Williams</li>
-<li>Chris Wood</li>
-<li>Patrick Woodworth</li>
-<li>Jaroslaw Wypychowski</li>
-<li>Sven Zethelius</li>
-<li>Aleksey Zhukov</li>
-<li>Zhong Wang</li>
-</ul>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/bintray.html
----------------------------------------------------------------------
diff --git a/doc/resolver/bintray.html b/doc/resolver/bintray.html
deleted file mode 100644
index a3baa01..0000000
--- a/doc/resolver/bintray.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">bintray</td></tr>
-<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>
-
-<span class="tagdoc" id="ivysettings.resolvers.ibiblio">This resolver uses 
Bintray DaaS (Distribution as a Service) platform to retrieve artifacts.</span>
-
-<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>subject</td><td>Bintray username of a repository owner.</td>
-        <td>No, defaults to Bintray</td></tr>
-    <tr><td>repo</td><td>User's repository name.</td>
-        <td>No, defaults to JCenter</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<bintray />
-</code>
-
-A default, defines a <a href="https://bintray.com/bintray/jcenter";>JCenter</a> 
(http://jcenter.bintray.com/) resolver. 
-In most circumstances you won't need any other resolvers as JCenter is already 
a super-set of many other repositories, including Maven Central.
-
-<hr/>
-
-<code type="xml">
-<bintray subject="dsowerby" repo="maven"/>
-<bintray subject="igelgrun" repo="batrak"/>
-</code>
-
-Defines two resolvers to use a <a 
href="https://bintray.com/dsowerby/maven";>repository</a> "maven" of user 
"dsowerby" (https://dl.bintray.com/dsowerby/maven/) 
-and <a href="https://bintray.com/igelgrun/batrak";>repository</a> "batrak" of 
user "igelgrun" (https://dl.bintray.com/igelgrun/batrak/).
-</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/chain.html
----------------------------------------------------------------------
diff --git a/doc/resolver/chain.html b/doc/resolver/chain.html
deleted file mode 100644
index d026791..0000000
--- a/doc/resolver/chain.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">chain</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">depends on sub 
resolvers</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">delegates to first 
sub resolver in chain</td></tr>
-</table>
-
-<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">
-<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>returnFirst</td><td>true if the first found should be 
returned.</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>dual</td><td>true if the chain should behave like a dual chain. 
<span class="since">since 1.3</span></td>
-        <td>No, defaults to false</td></tr>
-</tbody>
-</table>
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th 
class="ivy-chld-desc">Description</th><th 
class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>any resolver</td><td>a sub resolver to use</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<chain name="test">
-  <filesystem name="1">
-    <ivy 
pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>
-    <artifact 
pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-  </filesystem>
-  <ivyrep name="2"/>
-</chain>
-</code>
-Both a filesystem and ivyrep will be used to look for ivy files. If a dynamic 
revision is required, then both the filesystem and ivyrep will be queried to 
find the most recent revision among the two resolvers. Once the most recent 
revision is found in one resolver, it's the same resolver which will be used to 
download artifacts.
-<hr/>
-<code type="xml">
-<chain name="test" returnFirst="true">
-  <filesystem name="1">
-    <ivy 
pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>
-    <artifact 
pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-  </filesystem>
-  <ivyrep name="2"/>
-</chain>
-</code>
-Same as before, except that if a revision is found in the filesystem then 
ivyrep will not be queried: its the filesystem which will be used for both the 
ivy file and the artifacts.
-<hr/>
-<code type="xml">
-<chain name="test" dual="true">
-  <filesystem name="1">
-    <ivy 
pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/>
-    <artifact 
pattern="${ivy.settings.dir}/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-  </filesystem>
-  <ivyrep name="2"/>
-</chain>
-</code>
-Same as first example, except that once a module is found by either filesystem 
or ivyrep, then it's the whole chain which will be queried to download the 
artifacts. So in this case ivy file and artifacts may be split across the two 
resolvers for the same module.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/dual.html
----------------------------------------------------------------------
diff --git a/doc/resolver/dual.html b/doc/resolver/dual.html
deleted file mode 100644
index 809d496..0000000
--- a/doc/resolver/dual.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">dual</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">depends on sub 
resolvers</td></tr>
-<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>
-
-<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.
-
-<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 resolver</td><td>two resolvers, the first being the ivy 
resolver, the second the artifact resolver</td>
-        <td>2</td></tr>
-</tbody>
-</table>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/filesystem.html
----------------------------------------------------------------------
diff --git a/doc/resolver/filesystem.html b/doc/resolver/filesystem.html
deleted file mode 100644
index d0d46d4..0000000
--- a/doc/resolver/filesystem.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">filesystem</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">yes</td></tr>
-</table><br/>
-
-<span class="tagdoc" id="ivysettings.resolvers.filesystem">This resolver uses 
the file system to resolve ivy files and artifacts.</span> An advantage of this 
resolver is that it usually provides very good performance. Moreover, it is 
easy to setup using basic OS file sharing mechanisms.
-
-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. These patterns must be absolute paths (<span class="since">since 
2.0</span>). You can indicate a list of patterns which will be checked one 
after the other.
-
-<span class="since">since 1.3</span> Using the m2compatible attribute, this 
resolver will convert dots found in organisation into slashes like maven2 does 
for groupId. For instance, it will transform the organisation from 
'com.company' into 'com/company' when replacing the token [organisation] in 
your pattern.
-<strong>Limitation</strong>: in m2compatible mode, this resolver is not able 
list available organizations. It means some features like [[ant:repreport]] are 
not available.
-
-<h2>Atomic publish support</h2>
-<span class="since">since 2.0</span> This resolver supports atomic publish, 
which is useful for environments with a lot of concurrent publish and resolve 
actions. The atomic publish relies on the atomicity of the rename operation in 
the underlying filesystem (which includes NTFS and POSIX based filesystems).
-In this case the resolver starts by publishing the module according to the 
pattern, but where a '.part' suffix is appended to the revision. Then the 
publish is committed with a rename to the final location. 
-
-<b>Limitations</b>
-Atomic publish is currently limited in several ways:
-<ul>
-<li>you need to use a pattern for both the artifact and the ivy files which 
uses the revision as a directory. For instance 
"${repository.dir}/[module]/[revision]/[artifact].[ext]" works, 
"${repository.dir}/[module]/[artifact]-[revision].[ext]" doesn't</li>
-<li>both the artifact and ivy pattern should have the same prefix until the 
[revision] token.</li>
-<li>overwrite during publish is not supported</li>
-<li>you should not use revision names ending with '.part'</li>
-</ul>
-
-The <b>transactional</b> attribute can be used to configure the atomicity 
behavior:
-<ul>
-<li>auto</li> use transaction if possible (according to limitation), otherwise 
don't
-<li>true</li> always use transaction, fail the build if a limitation is not 
fulfilled
-<li>false</li> don't use transaction at all
-</ul>
-
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<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>m2compatible</td><td>True if this resolver should be maven2 
compatible, false otherwise <span class="since">since 1.3</span></td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>local</td><td>True if this resolver should be considered local, 
false otherwise <span class="since">since 1.4</span>. See useOrigin attribute 
on the [[settings/caches]] element for details.</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>transactional</td><td>true to force the use of transaction, false 
to prevent the use of transaction, auto to get transaction when possible <span 
class="since">since 2.0</span>. See above for details.</td>
-        <td>No, defaults to auto</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>ivy</td><td>defines a pattern for ivy files, using the pattern 
attribute</td>
-        <td>0..n</td></tr>
-    <tr><td>artifact</td><td>defines a pattern for artifacts, using the 
pattern attribute</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/ibiblio.html
----------------------------------------------------------------------
diff --git a/doc/resolver/ibiblio.html b/doc/resolver/ibiblio.html
deleted file mode 100644
index 80057c4..0000000
--- a/doc/resolver/ibiblio.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">ibiblio</td></tr>
-<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>
-
-<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 
into slashes, search for poms, use transitive dependencies of poms). This 
setting also affects the default place where the resolver looks for its 
artifacts to point to the maven2 repository. So setting this attribute to true 
is sufficient to use maven 2 ibiblio repository.
-
-<span class="since">since 1.4</span> When using the m2compatible flag, you can 
disable the use of poms by setting the usepoms flag to false. It is then 
roughly equivalent to a url resolver configured like this:
-<code type="xml">
-<url name="test" m2compatible="true">
-  <artifact 
pattern="https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
-</url>
-</code>
-
-<span class="since">since 2.0</span> When used in m2compatible mode with the 
default pattern, this resolver uses maven-metadata.xml files (if present) to 
list the revisions available on the repository. This is especially useful when 
using a maven specific proxy, which does not serve directory listing. This can 
be disabled by using the useMavenMetadata flag.
-
-<strong>Limitation</strong>: in m2compatible mode, this resolver is not able 
list available organizations. It means some features like [[ant:repreport]] are 
not available.
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<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>root</td><td>the root of the artifacts repository.</td>
-        <td>No, defaults to ${ivy.ibiblio.default.artifact.root}</td></tr>
-    <tr><td>pattern</td><td>a pattern describing the layout of the artifacts 
repository.</td>
-        <td>No, defaults to ${ivy.ibiblio.default.artifact.pattern}</td></tr>
-    <tr><td>m2compatible</td><td>True if this resolver should be maven2 
compatible, false otherwise <span class="since">since 1.3</span></td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>usepoms</td><td>True if this resolver should use maven poms when 
it is already in m2compatible mode, false otherwise <span class="since">since 
1.4</span></td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>useMavenMetadata</td><td>True if this resolver should use 
maven-metadata.xml files to list available revisions, false to use directory 
listing <span class="since">since 2.0</span></td>
-        <td>No, defaults to true</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<ibiblio name="maven2" m2compatible="true"/>
-</code>
-Defines a resolver called "maven2" using the maven 2 public repository to find 
module metadata (using maven 2 poms) and artifacts.
-
-<hr/>
-<code type="xml">
-<ibiblio name="maven" m2compatible="true" usepoms="false"/>
-</code>
-Same as above, but doesn't use poms, only artifacts.</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/ivyrep.html
----------------------------------------------------------------------
diff --git a/doc/resolver/ivyrep.html b/doc/resolver/ivyrep.html
deleted file mode 100644
index 2683b16..0000000
--- a/doc/resolver/ivyrep.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">ivyrep</td></tr>
-<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>
-<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">
-Since ivyrep is not maintained anymore, the ivyroot attribute is mandatory, 
and the use of this resolver is not recommended (we recommend using 
[[resolver/url url resolver]] as replacement in most cases).
-</div>
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<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>ivyroot</td><td>the root of the ivy repository.</td>
-        <td>Yes, but may be provided through ${ivy.ivyrep.default.ivy.root} 
<span class="since">since 2.0</span></td></tr>
-    <tr><td>ivypattern</td><td>a pattern describing the layout of the ivy 
repository.</td>
-        <td>No, defaults to ${ivy.ivyrep.default.ivy.pattern}</td></tr>
-    <tr><td>artroot</td><td>the root of the artifacts repository.</td>
-        <td>No, defaults to ${ivy.ivyrep.default.artifact.root}</td></tr>
-    <tr><td>artpattern</td><td>a pattern describing the layout of the 
artifacts repository.</td>
-        <td>No, defaults to ${ivy.ivyrep.default.artifact pattern}</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivyrep name="ivyrep" ivyroot="http://ivyrep.mycompany.com"/>
-</code>
-Looks for ivy files on and ivyrep like web site located at 
http://ivyrep.mycompany.com.
-
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/jar.html
----------------------------------------------------------------------
diff --git a/doc/resolver/jar.html b/doc/resolver/jar.html
deleted file mode 100644
index 15533f4..0000000
--- a/doc/resolver/jar.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">jar</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">no</td></tr>
-</table><br/>
-
-<span class="since">since 2.3</span>
-
-<span class="tagdoc" id="ivysettings.resolvers.jar">This resolver uses a 
specified jar resolve ivy files and artifacts.</span>
-
-This kind of resolver helps the packaging of an entire repository. Since the 
entire "repository" jar is expected to be local at some point, the size of a 
such repository should be considered to be not too large if it is expected to 
be remote; hence the artifacts in a such repo should be little in size.
-
-The configuration of such a resolver is done via specifying the location of 
the jar, and through ivy and artifact patterns, indicating where ivy files and 
artifacts can be found in the jar. You can indicate a list of patterns which 
will be checked one after the other. Note that the patterns MUST NOT start with 
a slash.
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>file</td><td>the absolute path of the jar</td>
-        <td>One of 'file' or 'url' is required</td></tr>
-    <tr><td>url</td><td>the url of the jar</td>
-        <td>One of 'file' or 'url' is required</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>ivy</td><td>defines a pattern for ivy files, using the pattern 
attribute</td>
-        <td>0..n</td></tr>
-    <tr><td>artifact</td><td>defines a pattern for artifacts, using the 
pattern attribute</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<jar name="my-local-jar-resolver" file="/home/me/myrepo.jar">
-    <ivy pattern="[organisation]/[module]/ivys/ivy-[revision].xml" />
-    <artifact 
pattern="[organisation]/[module]/[type]s/[artifact]-[revision].[type]" />
-</jar>
-</code>
-A simple local jar repository.
-<hr />
-<code type="xml">
-<jar name="my-remote-jar-resolver" 
url="http://www.mywebsite.com/dist/myrepo.jar";>
-    <ivy 
pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml"
 />
-    <ivy 
pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml"
 />
-    <artifact 
pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"
 />
-    <artifact 
pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"
 />
-    <artifact 
pattern="dir_in_jar/yet_another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"
 />
-</jar>
-</code>
-A remote jar repository with multiple ivy and artifact patterns, patterns 
pointing in some sub directories in the jar.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/mirrored.html
----------------------------------------------------------------------
diff --git a/doc/resolver/mirrored.html b/doc/resolver/mirrored.html
deleted file mode 100644
index f8bfb19..0000000
--- a/doc/resolver/mirrored.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">mirroredurl</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes with http urls 
(and apache server) and with file urls, no with other urls</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">no</td></tr>
-</table>
-
-<span class="since">since 2.3</span>
-
-<br/>
-<span class="tagdoc" id="ivysettings.resolvers.mirroredurl">This resolver can 
resolve dependencies against several mirrors of the same repository. From a 
list of mirror urls, it will iteratively try to resolve the dependencies 
against each one.
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<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>m2compatible</td><td>True if this resolver should be maven2 
compatible, false otherwise</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>mirrorListUrl</td><td>The url where to retrive the list of mirror 
urls.</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>ivy</td><td>defines a pattern for ivy files, using the pattern 
attribute</td>
-        <td>0..n</td></tr>
-    <tr><td>artifact</td><td>defines a pattern for artifacts, using the 
pattern attribute</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Example</h1>
-
-Having the file mavenrepolist.txt content:
-<code>
-https://repo1.maven.org/maven2/
-http://repo2.maven.org/maven2/
-</code>
-And the piece of settings:
-<code type="xml">
-<mirroredurl name="mirrored-maven" m2compatible="true" 
mirrorListUrl="file:///Users/me/dev/repo/mavenrepolist.txt">
-      <artifact 
pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-</mirroredurl>
-</code>
-It will resolve first on the repo1 and if failing it will fall back on repo2.
-
-<hr />
-
-The mirror list can be retrieved from a geo-location aware url:
-<code type="xml">
-<mirroredurl name="mirrored-asf" 
mirrorListUrl="http://www.apache.org/dyn/closer.cgi";>
-  <ivy pattern="repo/[organisation]/[module]/[revision]/ivy.xml" />
-  <artifact 
pattern="repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-</mirroredurl>
-</code>
-</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/obr.html
----------------------------------------------------------------------
diff --git a/doc/resolver/obr.html b/doc/resolver/obr.html
deleted file mode 100644
index 174056c..0000000
--- a/doc/resolver/obr.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">obr</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">no</td></tr>
-</table>
-
-<span class="since">since 2.3</span>
-
-<span class="tagdoc" id="ivysettings.resolvers.obr">This resolver is one of 
the resolver which supports <a href="../osgi.html">OSGi&#153;</a> dependencies. 
As part of the OSGi specification resides the OBR (OSGi Bundle Repository). The 
OBR defines the aggregation of the OSGi metadata of every bundle included in an 
repository. So contrary to the other resolvers, this resolver needs to get the 
descriptor of the repository (an obr.xml) before starting to resolve modules.
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of composite resolvers.
-<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>repoXmlURL</td><td>the URL of the obr.xml to load.</td>
-        <td>Yes</td></tr>
-    <tr><td>repoXmlFile</td><td>the local path of the obr.xml to load.</td>
-        <td>Yes</td></tr>
-    <tr><td>requirementStrategy</td><td>defines how strict should be the OSGi 
resolution. Can be one of <tt>first</tt> or <tt>noambiguity</tt></td>
-        <td>No, default to <tt>noambiguity</tt></td></tr>
-    <tr><td>metadataTtl</td><td>the time in milliseconds the obr.xml is 
considered up to date</td>
-        <td>No, default to 3600000 (1 hour)</td></tr>
-    <tr><td>forceMetadataUpdate</td><td>force the update of the obr.xml 
without checking its freshness</td>
-        <td>No, default to false</td></tr>
-</tbody>
-</table>
-
-The requirement strategy is defining how the resolver should behave in front 
of several choices. In the OSGi dependency model, an <tt>Import-Package</tt> 
requirement can be satisfied by several different bundles. So when resolving 
such requirement, Ivy will first look into the already resolved bundles if one 
provides that package. If it fails to find one, then two behaviours can occur:
-<ul>
-<li>if the requirement strategy is <tt>first</tt>, among the bundles 
statifying the requirement, it will shoose the first one. A warn will be logged 
ahout the choice Ivy has to arbitrarily do.</li>
-<li>if the requirement strategy is <tt>noambiguity</tt>, Ivy will make the 
resolution fail.</li>
-</ul>
-
-<h1>Examples</h1>
-<code type="xml">
-<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"; />
-</code>
-A simple repository configured to use the Felix OBR.
-<hr />
-<code type="xml">
-<obr name="my-osgi-repo" repoXmlFile="${ivy.settings.dir}/obr/obr.xml" 
requirementStrategy="first" />
-</code>
-A local repository which is trusted to always provide correct dependency for 
the <tt>Import-Package</tt> requirements.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/osgiagg.html
----------------------------------------------------------------------
diff --git a/doc/resolver/osgiagg.html b/doc/resolver/osgiagg.html
deleted file mode 100644
index 6a6a6a7..0000000
--- a/doc/resolver/osgiagg.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">osgi-agg</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">no</td></tr>
-</table>
-
-<span class="since">since 2.4</span>
-
-<span class="tagdoc" id="ivysettings.resolvers.osgi-agg">This resolver is one 
of the resolver which supports <a href="../osgi.html">OSGi&#153;</a> 
dependencies.
-
-This resolvers is like a classic <a href="">chain</a> resolver, but which 
better support OSGi metadata.
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of composite resolvers.
-
-<h1>Elements</h1>
-As sub element, this resolver accept any kind of OSGi resolver: <a 
href="../obr.html">obr</a>, <a href="../updatesite.html">updatesite</a>, or any 
other <tt>osgi-agg</tt>.
-
-<h1>Examples</h1>
-<code type="xml">
-<updatesite name="ivyde-updatesite" 
url="http://www.apache.org/dist/ant/ivyde/updatesite"; />
-<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"; />
-<osgi-agg name="all-osgi">
-    <resolver ref="ivyde-updatesite" />
-    <resolver ref="felix-repo" />
-</osgi-agg>
-</code>
-An aggregated OSGi reporsory composed of the Apache IvyDE Eclipse update site 
and the Felix OBR.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/packager.html
----------------------------------------------------------------------
diff --git a/doc/resolver/packager.html b/doc/resolver/packager.html
deleted file mode 100644
index abe3ffe..0000000
--- a/doc/resolver/packager.html
+++ /dev/null
@@ -1,401 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">packager</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes with http urls 
(and apache server) and with file urls, no with other urls</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">no</td></tr>
-</table>
-
-<br/>
-<p>
-<span class="since">Since 2.0</span>.
-</p>
-
-<p>
-<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>
-Packager repositories allow the creation of Ivy repositories that require 
neither the participation of any of the modules' creators nor setting up a huge 
mirror site. One such repository on the web is <a 
href="http://ivyroundup.googlecode.com/";>Ivy RoundUp</a>. Of course, private 
packager repositories are feasible as well.
-</p>
-
-<p>
-The Packager resolver supports a "resource cache", where downloaded archives 
can be stored to avoid duplicate downloads. This cache is entirely separate 
from the <a href="../concept.html#cache">normal Ivy cache</a>: it is "private" 
to the Packager resolver, and it stores unmodified original software archives, 
not Ivy artifacts. See the <span class="ivy-att">resourceCache</span> attribute 
below for details.
-</p>
-
-<p>
-The packaging instructions are contained in "packager.xml" in a simple XML 
format. At resolve time this file gets converted into a "build.xml" file via 
XSLT and then executed using <a href="http://ant.apache.org/";>ant</a>. 
Therefore, ant must be available as an executable on the platform. The ant task 
executes in a separate ant project and so is not affected by properties, etc. 
that may be set in any existing ant environment in which Ivy is running. 
However, Ivy will define a few properties for convenience; see the "Properties" 
listed below.
-</p>
-
-<p>
-For security reasons, the XSLT transform ensures that (a) all downloaded 
archives have verified SHA1 checksums (including cached resources); and (b) 
only a very limited set of ant tasks can be performed during the artifact 
"build" phase; currently these include move, copy, mkdir, zip, unzip, tar, and 
untar (this restriction may be overridden however; see below).
-</p>
-
-<p>
-The Packager resolver is based on the <a href="url.html">URL resolver</a> and 
is configured similarly, except the artifact child tags specify where to find 
the packager.xml files, rather than the artifacts themselves.
-</p>
-
-<p>
-Because the packaging process is relatively slow, it is important to use <a 
href="../concept.html#cache">Ivy's caching support</a> to avoid repeated 
execution of the packaging instructions.
-</p>
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers, plus the following:
-<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>buildRoot</td>
-    <td>Defines the root of the temporary build directory hierarchy</td>
-    <td>Yes</td>
-  </tr>
-  <tr>
-    <td>resourceCache</td>
-    <td>Directory where downloaded resources should be cached</td>
-    <td>No; defaults to none</td>
-  </tr>
-  <tr>
-    <td>resourceURL</td>
-    <td>Ivy pattern that specifies a base URL to use for downloading 
<i>all</i> resources; overrides the URLs in the packaging instructions</td>
-    <td>No; defaults to none</td>
-  </tr>
-  <tr>
-    <td>restricted</td>
-    <td>True if this resolver should only allow "safe" ant tasks in the 
packaging instructions. <strong>Warning:</strong> setting <span 
class="ivy-att">restricted</span> to false creates a security problem due to 
ant tasks like delete, exec, etc. Do not use this setting when your 
configuration points to an untrusted repository.</td>
-    <td>No; defaults to true</td>
-  </tr>
-  <tr>
-    <td>verbose</td>
-    <td>True to run ant with the -verbose flag</td>
-    <td>No; defaults to false</td>
-  </tr>
-  <tr>
-    <td>quiet</td>
-    <td>True to run ant with the -quiet flag</td>
-    <td>No; defaults to false</td>
-  </tr>
-  <tr>
-    <td>validate</td>
-    <td>True if this resolver should validate (via XSD) the downloaded XML 
packaging instructions</td>
-    <td>No; defaults to true</td>
-  </tr>
-  <tr>
-    <td>preserveBuildDirectories</td>
-    <td>True if this resolver should not delete the temporary build 
directories in which the ant tasks are executed (for debugging purposes)</td>
-    <td>No; defaults to false</td>
-  </tr>
-</tbody>
-</table>
-<br />
-<p>
-Setting a resourceURL will cause the resolver to override the URLs for 
resources specified by the packaging instructions. Instead, all resources will 
be downloaded from an URL constructed by first resolving the resourceURL 
pattern into a base URL, and then resolving the resource filename relative to 
that base URL. In other words, the resourceURL pattern specifies the URL 
"directory", so it should always end in a forward slash.
-</p>
-
-<p>
-If a resourceURL download fails, the resolver will fall back to the original 
URL from the packaging instructions.
-</p>
-
-<p>
-Configure a resourceURL in situations where you don't want to rely on (or wait 
for) the web sites configured in the packaging instructions, and have access to 
a better (perhaps private) mirror site.
-</p>
-
-<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>ivy</td><td>Defines a pattern for ivy.xml files, using the pattern 
attribute</td>
-    <td>1..n</td></tr>
-    <tr><td>artifact</td><td>Defines a pattern for packager.xml files, using 
the pattern attribute</td>
-    <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<packager name="ivyroundup"
-         buildRoot="${user.home}/.ivy2/packager/build"
-         resourceCache="${user.home}/.ivy2/packager/cache"
-         
resourceURL="ftp://mirror.example.com/pub/resources/[organisation]/[module]/";>
-    <ivy 
pattern="http://ivyroundup.googlecode.com/svn/trunk/repo/modules/[organisation]/[module]/[revision]/ivy.xml"/>
-    <artifact 
pattern="http://ivyroundup.googlecode.com/svn/trunk/repo/modules/[organisation]/[module]/[revision]/packager.xml"/>
-</packager>
-</code>
-Defines a packager resolver which points to the <a 
href="http://ivyroundup.googlecode.com/";>Ivy RoundUp</a> online repository. 
Builds will occur in a subdirectory of 
<code>${user.home}/.ivy2/packager/build</code> downloaded resources will be 
cached in <code>${user.home}/.ivy2/packager/cache</code> and the mirror site 
<code>ftp://mirror.example.com/pub/resources/[organisation]/[module]/ </code> 
will be tried first for all resources.
-
-<h1>Packaging Instructions</h1>
-<p>
-The goal of the packaging instructions is to download the required archives, 
extract the artifacts, and put the artifacts into a subdirectory. Each artifact 
should be written to artifacts/[type]s/[artifact].[ext] when the ant build 
completes.
-</p>
-
-<p>
-Below is an example of packaging instructions for <a 
href="http://testng.org/";>TestNG 2.5</a>:
-<code type="xml">
-<packager-module version="1.0">
-
-    <property name="name" value="${ivy.packager.module}"/>
-    <property name="version" value="${ivy.packager.revision}"/>
-    <property name="zipname" value="${name}-${version}"/>
-
-    <resource dest="archive" url="http://testng.org/${zipname}.zip"; 
sha1="2ea19275dc17453306f8bb780fe6ef6e9af7756b">
-        <url href="http://mirror.example.com/archives/${zipname}.zip"/>
-        <include name="${zipname}/src/main/**/*"/>
-        <include name="${zipname}/src/jdk15/**/*"/>
-        <include name="${zipname}/javadocs/**/*"/>
-        <include name="${zipname}/*.jar"/>
-    </resource>
-
-    <build>
-
-        <!-- jar  -->
-        <move file="archive/${zipname}/${zipname}-jdk14.jar" 
tofile="artifacts/jars/${name}-jdk14.jar"/>
-        <move file="archive/${zipname}/${zipname}-jdk15.jar" 
tofile="artifacts/jars/${name}-jdk15.jar"/>
-
-        <!-- source -->
-        <zip destfile="artifacts/sources/${name}.zip">
-            <fileset dir="archive/${zipname}/src/main">
-                <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="archive/${zipname}/src/jdk15">
-                <include name="**/*.java"/>
-            </fileset>
-        </zip>
-
-        <!-- javadoc -->
-        <zip destfile="artifacts/javadocs/javadoc.zip">
-            <fileset dir="archive/${zipname}/javadocs"/>
-        </zip>
-    </build>
-</packager-module>
-</code>
-Of course, packaging instructions must produce artifacts consistent with those 
listed in the associated ivy.xml file.
-</p>
-
-<h1>Build-time properties</h1>
-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>
-</thead>
-<tbody>
-  <tr>
-    <td>ivy.packager.organisation</td>
-    <td>Organization of the ivy module whose artifacts are being built</td>
-  </tr>
-  <tr>
-    <td>ivy.packager.module</td>
-    <td>Module of the ivy module whose artifacts are being built</td>
-  </tr>
-  <tr>
-    <td>ivy.packager.revision</td>
-    <td>Revision of the ivy module whose artifacts are being built</td>
-  </tr>
-  <tr>
-    <td>ivy.packager.branch</td>
-    <td>Branch of the ivy module whose artifacts are being built</td>
-  </tr>
-  <tr>
-    <td>ivy.packager.resourceCache</td>
-    <td>The configured <span class="ivy-att">resourceCache</span> if any; 
otherwise not defined</td>
-  </tr>
-  <tr>
-    <td>ivy.packager.resourceURL</td>
-    <td>The resolved <span class="ivy-att">resourceURL</span> pattern if any; 
otherwise not defined</td>
-  </tr>
-</tbody>
-</table>
-
-<h1>Packager XML Elements</h1>
-The packager.xml document element can contain the following child tags.
-<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>property</td>
-    <td>Set an ant property</td>
-    <td>0..n</td>
-  </tr>
-  <tr>
-    <td>resource</td>
-    <td>Define a resource to download and (optionally) unpack</td>
-    <td>0..n</td>
-  </tr>
-  <tr>
-    <td>m2resource</td>
-    <td>Define a Maven2 resource to download and (optionally) unpack</td>
-    <td>0..n</td>
-  </tr>
-  <tr>
-    <td>build</td>
-    <td>Specify ant tasks that ultimately result in each artifact being placed 
into artifacts/[type]s/[artifact].[ext]</td>
-    <td>0..1</td>
-  </tr>
-</tbody>
-</table>
-<br />
-Which ant tasks are allowed within the build tag is controlled by the <span 
class="ivy-att">restricted</span> configuration attribute. When true (the 
default), only the following ant tasks are allowed: copy, jar, mkdir, move, 
tar, unjar, untar, unwar, unzip, war, and zip. When false, all ant tasks are 
allowed.
-
-<p>
-<strong>Warning:</strong> setting <span class="ivy-att">restricted</span> to 
false creates a security problem due to ant tasks like delete, exec, etc. Do 
not use this setting when your configuration points to an untrusted repository.
-</p>
-
-<h1>Resource XML Elements</h1>
-The resource XML tag supports the following attributes:
-<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>Primary URL for the resource</td>
-    <td>Yes</td>
-  </tr>
-  <tr>
-    <td>sha1</td>
-    <td>SHA1 checksum of the resource</td>
-    <td>Yes</td>
-  </tr>
-  <tr>
-    <td>dest</td>
-    <td>Defines the name of the subdirectory into which the artifact should be 
unpacked</td>
-    <td>No; defaults to "archive"</td>
-  </tr>
-  <tr>
-    <td>tofile</td>
-    <td>Where to put the file directly; if present no extraction will be 
performed</td>
-    <td>No; if present, "dest" is ignored</td>
-  </tr>
-  <tr>
-    <td>filename</td>
-    <td>Name of the file to download</td>
-    <td>No; if not present, same as the last component of the URL</td>
-  </tr>
-  <tr>
-    <td>type</td>
-    <td>Type of archive: "zip", "jar", "war", "tar", "tgz", "tar.gz", 
"tar.bz2"</td>
-    <td>No; if not present, will be automatically determined from the filename 
suffix</td>
-  </tr>
-</tbody>
-</table>
-<br />
-The resource XML tag may contain child elements. An url tag with an href 
attribute specifies an alternate URL for the resource (see TestNG example 
above). Any other tags will be included as children of an automatically 
generated fileset tag.
-
-<h1>Maven2 Resources</h1>
-Special support is included for maven2 resources. For these resources, use the 
m2resource tag instead of the resource tag. Each m2resource tag specifies one 
or more artifacts that are downloaded from the Maven2 repository.
-
-<h1>M2Resource XML Elements</h1>
-The m2resource XML tag supports the following attributes:
-<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>groupId</td>
-    <td>Maven group ID</td>
-    <td>No; defaults to ${ivy.packager.organisation}</td>
-  </tr>
-  <tr>
-    <td>artifactId</td>
-    <td>Maven artifact ID</td>
-    <td>No; defaults to ${ivy.packager.module}</td>
-  </tr>
-  <tr>
-    <td>version</td>
-    <td>Maven version</td>
-    <td>No; defaults to ${ivy.packager.revision}</td>
-  </tr>
-  <tr>
-    <td>repo</td>
-    <td>Maven repository URL</td>
-    <td>No; defaults to https://repo1.maven.org/maven2/ </td>
-  </tr>
-</tbody>
-</table>
-<br />
-Each m2resource XML tag must have one or more artifact tags that define the 
artifacts to directly download. The URL for each artifact is constructed 
automatically based on the attributes in the m2resource and artifact tags.
-
-<h1>M2Resource Artifact Attributes</h1>
-The artifact children of m2resource tags support the following attributes:
-<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>ext</td>
-    <td>Maven filename extension</td>
-    <td>No; defaults to "jar"</td>
-  </tr>
-  <tr>
-    <td>classifier</td>
-    <td>Maven classifier (e.g., "sources", "javadoc")</td>
-    <td>No; defaults to none</td>
-  </tr>
-  <tr>
-    <td>sha1</td>
-    <td>SHA1 checksum of the resource</td>
-    <td>Yes</td>
-  </tr>
-  <tr>
-    <td>dest</td>
-    <td>Defines the name of the subdirectory into which the artifact should be 
unpacked</td>
-    <td rowspan="2">Exactly one of "dest" or "tofile" must be supplied</td>
-  </tr>
-  <tr>
-    <td>tofile</td>
-    <td>Where to put the file; no extraction will be performed</td>
-  </tr>
-  <tr>
-    <td>type</td>
-    <td>Type of archive: "zip", "jar", "war", "tar", "tgz", "tar.gz", 
"tar.bz2"</td>
-    <td>No; if not present, will be automatically determined from the filename 
suffix</td>
-  </tr>
-</tbody>
-</table>
-<br />
-Below is an example of packaging instructions for the <a 
href="http://commons.apache.org/email/";>Apache Commons Email</a> module. Note 
that no build tag is required because all of the maven2 artifacts are usable 
directly (i.e., without unpacking anything).
-<code type="xml">
-<packager-module version="1.0">
-    <m2resource>
-        <artifact tofile="artifacts/jars/${ivy.packager.module}.jar" 
sha1="a05c4de7bf2e0579ac0f21e16f3737ec6fa0ff98"/>
-        <artifact classifier="javadoc" tofile="artifacts/javadocs/javadoc.zip" 
sha1="8f09630f1600bcd0472a36fb2fa2d2a6f2836535"/>
-        <artifact classifier="sources" tofile="artifacts/sources/source.zip" 
sha1="15d67ca689a792ed8f29d0d21e2d0116fa117b7e"/>
-    </m2resource>
-</packager-module>
-</code>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/sftp.html
----------------------------------------------------------------------
diff --git a/doc/resolver/sftp.html b/doc/resolver/sftp.html
deleted file mode 100644
index 681e5df..0000000
--- a/doc/resolver/sftp.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">sftp</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">yes</td></tr>
-</table>
-
-<br/>
-<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 widespread 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>.
-
-Note that sftp is also supported by vfs, so you can use a vfs resolver 
instead. The advantage of this resolver is that you have a better control over 
authentication, it can prompt for username/password credentials, or you can use 
private/public key authentication, which is not possible with the vfs resolver. 
When it prompts for username/password, it uses a Swing dialog, which is not 
possible in a headless environment. If you want to prompt for the credentials 
on the command line, use ant input task for example before calling ivy.
-
-All necessary connection parameters can be set here via attributes, or via an 
OpenSSH-style config file specified by sshConfig.
-However all attributes defined in the pattern url of the resolver will have 
higher priority and will overwrite the values given here. To specify connection 
parameters in the pattern, you have to specify a full url and not just a path 
as pattern.
-e.g. pattern="/path/to/my/repos/[artifact].[ext]" will use all connection 
parameters from this class
-e.g. pattern="sftp://myserver.com/path/to/my/repos/[artifact].[ext]"; will use 
all parameters from the attributes with the exception of the host, which will 
be "myserver.com"
-e.g. 
pattern="sftp://user:geh...@myserver.com:8022/path/to/my/repos/[artifact].[ext]";
 will use only the keyFile and keyFilePassword from the attributes (if needed). 
Rest will come from the url.
-
-
-
-Note that the authentication features of this resolver are exactly the same as 
the ssh resolver. Choosing between the two is often a matter of server 
implementation. If your server supports sftp, usually it's preferrable.
-
-Internally this resolver relies on <a 
href="http://www.jcraft.com/jsch/";>jsch</a> as ssh client, which is a popular 
java ssh client, used for example in eclipse.
-
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<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>user</td><td>The username to provide as credential</td>
-        <td>No, defaults to username given on the patterns, or prompt if none 
is set</td></tr>
-    <tr><td>userPassword</td><td>The password to provide as credential</td>
-        <td>No, defaults to password given on the patterns, or prompt if none 
is set</td></tr>
-    <tr><td>keyFile</td><td>Path to the keyfile to use for authentication</td>
-        <td>No, defaults to username/password authentication</td></tr>
-    <tr><td>keyFilePassword</td><td>the password used to protect the key 
file</td>
-        <td>No, will prompt for password if keyFile authentication is used and 
if it is password encrypted</td></tr>
-    <tr><td>host</td><td>The host to connect to</td>
-        <td>No, defaults to host given on the patterns, fail if none is 
set</td></tr>
-    <tr><td>port</td><td>The port to connect to</td>
-        <td>No, defaults to 22</td></tr>
-    <tr><td>sshConfig</td><td>Path to an OpenSSH-style config file containing 
additional
-            configuration</td>
-        <td>No</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>ivy</td><td>defines a pattern for ivy files, using the pattern 
attribute</td>
-        <td>0..n</td></tr>
-    <tr><td>artifact</td><td>defines a pattern for artifacts, using the 
pattern attribute</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Example</h1>
-<code type="xml">
-<sftp user="myuser" host="myhost.com">
-  <ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
-  <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
-</sftp> 
-</code>
-Will connect to myhost.com using myuser and prompt for the password.
-<hr/>
-<code type="xml">
-<sftp user="${myuser}" userPassword="${my.password}" host="myhost.com">
-  <ivy pattern="path/to/ivy/[module]/ivy.xml"/>
-  <artifact pattern="path/to/[organisation]/[module]/[artifact].[ext]"/>
-</sftp>
-</code>
-Will connect to myhost.com using user and password provided with ivy variables.
-<hr/>
-<code type="xml">
-<sftp>
-  <ivy 
pattern="sftp://user:geh...@yourserver.com:8022/path/to/repos/[module]/[revision]/ivy.xml"/>
-  <artifact 
pattern="sftp://user:sec...@myserver.com:8022/path/to/my/repos/[artifact].[ext]"/>
-</sftp>
-</code>
-Will connect to yourserver.com on port 8022 with user 'user' and password 
'geheim' for authentication for ivy files, and to myserver.com on port 8022 
using user 'user' and password 'secret' for the artifacts.
-<hr/>
-<code type="xml">
-<sftp keyFile="path/to/key/file" keyFilePassword="${password}">
-  <ivy 
pattern="sftp://u...@yourserver.com:8022/path/to/repos/[module]/[revision]/ivy.xml"/>
-  <artifact 
pattern="sftp://u...@myserver.com:8022/path/to/my/repos/[artifact].[ext]"/>
-</sftp>
-</code>
-Will connect to yourserver.com on port 8022 with user 'user' and use keyFile 
path/to/key/file for keyFile and the value of password variable for 
keyFilePassword authentication for ivy files, and to myserver.com on port 8022 
using user 'user' with the same keyFile/keyFilePassword pair for the artifacts.
-
-<code type="xml">
-<sftp host="myhost" sshConfig="/path/to/.ssh/config">
-  <ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
-  <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
-</ssh>
-</code>
-Will connect to the host named by myhost according to the config file in 
/path/to/.ssh/config, using the hostname, username, and optionally IdentityFile 
specified in the config section "Host myhost". For example, if the 
corresponding Host section contains "Hostname yourserver.com" and "User 
myremoteusername", it will connect to yourserver.com using username 
myremoteusername.
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/resolver/ssh.html
----------------------------------------------------------------------
diff --git a/doc/resolver/ssh.html b/doc/resolver/ssh.html
deleted file mode 100644
index b1c462e..0000000
--- a/doc/resolver/ssh.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!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>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<table class="resolver">
-<tr><td class="title">Tag</td><td class="value">ssh</td></tr>
-<tr><td class="title">Handle latest</td><td class="value">yes</td></tr>
-<tr><td class="title">Handle publish</td><td class="value">yes</td></tr>
-</table>
-
-<br/>
-<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 widespread 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>.
-
-Internally this resolver shares most of its behaviour with the <a 
href="../resolver/sftp.html">sftp resolver</a>, so refer to its documentation 
for details.
-<h1>Attributes</h1>
-This resolver shares the <a href="../settings/resolvers.html#common">common 
attributes</a> of standard resolvers.
-<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>user</td><td>The username to provide as credential</td>
-        <td>No, defaults to username given on the patterns, or prompt if none 
is set</td></tr>
-    <tr><td>userPassword</td><td>The password to provide as credential</td>
-        <td>No, defaults to password given on the patterns, or prompt if none 
is set</td></tr>
-    <tr><td>keyFile</td><td>Path to the keyfile to use for authentication</td>
-        <td>No, defaults to username/password authentication</td></tr>
-    <tr><td>keyFilePassword</td><td>the password used to protect the key 
file</td>
-        <td>No, will prompt for password if keyFile authentication is used and 
if it is password encrypted</td></tr>
-    <tr><td>host</td><td>The host to connect to</td>
-        <td>No, defaults to host given on the patterns, fail if none is 
set</td></tr>
-    <tr><td>port</td><td>The port to connect to</td>
-        <td>No, defaults to 22</td></tr>
-    <tr><td>sshConfig</td><td>Path to an OpenSSH-style config file containing 
additional
-            configuration</td>
-        <td>No</td></tr>
-
-    <tr><td>publishPermissions</td><td>A four digit string (e.g., 0644, see 
"man chmod", "man open") specifying the permissions of the published files. 
<span class="since">(since 2.0)</span>
-</td><td>No, defaults to scp standard behaviour</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>ivy</td><td>defines a pattern for ivy files, using the pattern 
attribute</td>
-        <td>0..n</td></tr>
-    <tr><td>artifact</td><td>defines a pattern for artifacts, using the 
pattern attribute</td>
-        <td>1..n</td></tr>
-</tbody>
-</table>
-
-<h1>Example</h1>
-<code type="xml">
-<ssh user="myuser" host="myhost.com">
-  <ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
-  <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
-</ssh> 
-</code>
-Will connect to myhost.com using myuser and prompt for the password.
-<hr/>
-<code type="xml">
-<ssh keyFile="path/to/key/file" keyFilePassword="${password}">
-  <ivy 
pattern="ssh://user:geh...@yourserver.com:8022/path/to/repos/[module]/[revision]/ivy.xml"/>
-  <artifact 
pattern="ssh://user:geh...@myserver.com:8022/path/to/my/repos/[artifact].[ext]"/>
-</ssh>
-</code>
-Will connect to yourserver.com on port 8022 with user geheim and use keyFile 
path/to/key/file for keyFile and the value of password variable for 
keyFilePassword authentication for ivy files, and to myserver.com on port 8022 
using user geheim with the same keyFile/keyFilePassword pair for the artifacts.
-
-<code type="xml">
-<ssh host="myhost" sshConfig="/path/to/.ssh/config">
-  <ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
-  <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
-</ssh>
-</code>
-Will connect to the host named by myhost according to the config file in 
/path/to/.ssh/config, using the hostname, username, and optionally IdentityFile 
specified in the config section "Host myhost". For example, if the 
corresponding Host section contains "Hostname yourserver.com" and "User 
myremoteusername", it will connect to yourserver.com using username 
myremoteusername.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

Reply via email to