You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2017/06/19 01:58:44 UTC
[01/29] ant-ivy git commit: Experimental xooki to asciidoc convertor
Repository: ant-ivy
Updated Branches:
refs/heads/master aed63ae84 -> 7ac1170c8
Experimental xooki to asciidoc convertor
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/879ac405
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/879ac405
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/879ac405
Branch: refs/heads/master
Commit: 879ac405ee80f91b574517355f029a406d123302
Parents: 0354231
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sat Dec 27 23:42:13 2014 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Mon Dec 29 18:37:46 2014 +0100
----------------------------------------------------------------------
asciidoc-template/document.html.slim | 87 ++
asciidoc-template/helpers.rb | 168 +++
build-doc.xml | 58 ++
doc/xooki2asciidoc/antlib.xml | 82 ++
doc/xooki2asciidoc/xooki2asciidoc.js | 1569 +++++++++++++++++++++++++++++
5 files changed, 1964 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/879ac405/asciidoc-template/document.html.slim
----------------------------------------------------------------------
diff --git a/asciidoc-template/document.html.slim b/asciidoc-template/document.html.slim
new file mode 100644
index 0000000..81e99a8
--- /dev/null
+++ b/asciidoc-template/document.html.slim
@@ -0,0 +1,87 @@
+doctype transitional
+/!
+/! 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.
+- page = IvyDocHelpers.page(attr("basedir"), attr("docfile"))
+html lang=(attr :lang, 'en' unless attr? :nolang)
+ head
+ meta http-equiv="Content-Type" content="text/html; charset=utf-8"
+ meta name='generator' content="Asciidoctor #{attr 'asciidoctor-version'}"
+ title=((doctitle :sanitize => true) || (attr 'untitled-label'))
+ link rel="stylesheet" type="text/css" href="#{page.relativeRoot}style/style.css"
+ script src="#{page.relativeRoot}js/jquery.pack.js" type="text/javascript"
+ script src="#{page.relativeRoot}js/jquery.treeview.js" type="text/javascript"
+ javascript:
+ $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
+ body
+ div id="body"
+ table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td id="home" width="30%"
+ a href="http://ant.apache.org/" title="Apache Ant"
+ img src="#{page.relativeRoot}images/ant-group-logo.gif" alt="Apache Ant" border="0"/
+ td class="product" width="70%" align="right" valign="middle"
+ img src="#{page.relativeRoot}images/logo.png" alt="ivy" border="0"/
+ table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td
+ div id="navcontainer"
+ a<> href="http://www.apache.org/" Apache™
+ | >
+ a<> href="http://ant.apache.org/" Apache Ant™
+ | >
+ a<> href="http://ant.apache.org/ivy/" Apache Ivy™
+ | >
+ = page.breadCrumb
+ table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td id="sidebar-left"
+ div class="block block-book" id="block-book-0"
+ h2 Apache Ivy™
+ div class="content"
+ = page.menu()
+ center
+ iframe src="http://www.apache.org/ads/buttonbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="135" height="265"
+ td valign="top"
+ div id="main"
+ h1 class="title" = page.title
+ #content=content
+ table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td align="center" valign="middle"
+ div class="primary-links"
+ | ::
+ a href="index.html" Home
+ | ::
+ a href="reference.html" Reference
+ | ::
+ a href="tutorial.html" Tutorials
+ | ::
+ a href="dev.html" Developer's doc
+ | ::
+ div id="footer-message" class="footer"
+ hr/
+ i
+ | Copyright © 2014 The Apache Software Foundation, Licensed under the
+ a href="http://www.apache.org/licenses/LICENSE-2.0.txt" Apache License, Version 2.0
+ | .
+ br/
+ i
+ | Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.
+ br/
+ i
+ | All other marks mentioned may be trademarks or registered trademarks of their respective owners.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/879ac405/asciidoc-template/helpers.rb
----------------------------------------------------------------------
diff --git a/asciidoc-template/helpers.rb b/asciidoc-template/helpers.rb
new file mode 100644
index 0000000..b11768b
--- /dev/null
+++ b/asciidoc-template/helpers.rb
@@ -0,0 +1,168 @@
+# Add custom functions to this module that you want to use in your Slim
+# templates. Within the template you must namespace the function
+# (unless someone can show me how to include them in the evaluation context).
+# You can change the namespace to whatever you want.
+
+require 'json'
+
+module IvyDocHelpers
+
+ class Page
+ attr_accessor :id, :title, :url, :allChildIds, :children, :parent
+
+ def initialize()
+ @id = ""
+ @title = ""
+ @url = ""
+ @allChildIds = []
+ @children = []
+ @parent = nil
+ end
+
+ def link(printpage)
+ l = ''
+ if self.url
+ l += '<a href="' + printpage.relativeRoot + self.url + '"'
+ if self.id == printpage.id
+ l += ' class="current"'
+ end
+ l += '>' + self.title + '</a>'
+ else
+ l += self.title
+ end
+ return l
+ end
+
+ def relativeRoot()
+ p = ''
+ (self.id.split("/").length-1).times do |e|
+ p += '../'
+ end
+ return p
+ end
+
+ def breadCrumb()
+ b = '<span class="breadCrumb">'
+ b += breadCrumbStep(self)
+ b += '</span>'
+ return b
+ end
+
+ def breadCrumbStep(page)
+ b = ' '
+ if page.parent && page.parent.parent
+ b += breadCrumbStep(page.parent)
+ b += ' > '
+ end
+ b += page.link(page)
+ return b
+ end
+
+ def rootpage()
+ if self.parent
+ return self.parent.rootpage()
+ else
+ return self
+ end
+ end
+
+ def menu()
+ return innermenu(rootpage())
+ end
+
+ def innermenu(page)
+ m = '<ul id="treemenu" class="treeview">' + "\n"
+ page.children.each do |p|
+ m += '<li id="xooki-' + p.id + '"'
+ if p.children.length > 0
+ m += ' class="submenu"'
+ end
+ m += '>'
+ m += p.link(self)
+ if p.children.length > 0
+ m += '<ul class="'
+ if p.allChildIds.include? self.id
+ m += 'open'
+ else
+ m += 'closed'
+ end
+ m += '">'
+ m += innermenu(p)
+ m += '</ul>'
+ end
+ m += "</li>\n"
+ end
+ m += "</ul>\n"
+ return m
+ end
+
+ end
+
+ def self.page(basedir, docfile)
+ rootpage = loadPages(basedir)
+ pageId = docfile[basedir.length+1..docfile.rindex(/\./)-1]
+ p = findPage(rootpage, pageId)
+ if !p
+ p = Page.new
+ end
+ return p
+ end
+
+ def self.loadPages(basedir)
+ rootpage = Page.new
+ toc = JSON.parse(IO.read(basedir + "/toc.json"))
+ toc['children'].each do |child|
+ rootpage.children << loadPage(basedir, rootpage, child, "")
+ end
+ return rootpage
+ end
+
+ def self.loadPage(basedir, parent, node, path)
+ p = Page.new
+ p.title = node['title']
+ p.parent = parent
+ if node.has_key?("importRoot")
+ p.id = path + child['importRoot'] + '/' + node['importNode']
+ p.url = p.id + ".html"
+ toc = JSON.parse(IO.read(basedir + '/' + child['importRoot'] + "/toc.json"))
+ toc['children'].each do |child|
+ p.children << loadPage(basedir, p, child, path + child['importRoot'] + '/')
+ end
+ else
+ p.id = node['id']
+ if !(node.has_key?("isAbstract"))
+ if node.has_key?("url")
+ p.url = node['url']
+ else
+ p.url = path + node['id'] + ".html"
+ end
+ end
+ if node.has_key?("children")
+ node['children'].each do |child|
+ p.children << loadPage(basedir, p, child, path)
+ end
+ end
+ end
+ p.children.each { |cp| p.allChildIds += cp.allChildIds }
+ if p.id
+ p.allChildIds << p.id
+ end
+ return p
+ end
+
+ def self.findPage(parent, pageId)
+ parent.children.each do |p|
+ if p.id == pageId
+ return p
+ end
+ if p.children.length > 0
+ found = findPage(p, pageId)
+ if found
+ return found
+ end
+ end
+ end
+ return nil
+ end
+
+end
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/879ac405/build-doc.xml
----------------------------------------------------------------------
diff --git a/build-doc.xml b/build-doc.xml
new file mode 100644
index 0000000..e9316f9
--- /dev/null
+++ b/build-doc.xml
@@ -0,0 +1,58 @@
+<!--
+ 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.
+-->
+<project name="doc" xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:xooki="antlib:xooki"
+ xmlns:asciidoctor="antlib:org.asciidoctor.ant">
+ <import file="build-release.xml"/>
+
+ <target name="generate-asciidoc" depends="generate-doc-init">
+ <mkdir dir="${build.dir}/asciidoc" />
+ <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
+ <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki2asciidoc/antlib.xml" />
+ <xooki:toAsciidoc destDir="${build.dir}/asciidoc" checkUpToDate="true" xookidir="${doc.src.dir}/xooki2asciidoc">
+ <fileset dir="${doc.tmp.dir}">
+ <include name="**/*.html"/>
+ <exclude name="template*.html"/>
+ <exclude name="*Template.html"/>
+ <exclude name="conflict-solving-algo.html"/>
+ <exclude name="use.html"/>
+ <exclude name="samples/**"/>
+ <exclude name="js/**"/>
+ <exclude name="reports/**"/>
+ <exclude name="xooki/**"/>
+ </fileset>
+ </xooki:toAsciidoc>
+ <copy file="${doc.tmp.dir}/toc.json" todir="${build.dir}/asciidoc" />
+ </target>
+
+ <target name="generate-doc" depends="init-ivy,generate-doc-init">
+ <ivy:cachepath pathid="asciidoctor.path">
+ <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.0" />
+ </ivy:cachepath>
+ <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
+ <asciidoctor:convert sourceDirectory="${build.dir}/asciidoc" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="asciidoc-template" preserveDirectories="true">
+ <attribute key="basedir" value="${build.dir}/asciidoc" />
+ </asciidoctor:convert>
+ <copy todir="${doc.build.dir}">
+ <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
+ <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
+ </copy>
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/879ac405/doc/xooki2asciidoc/antlib.xml
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/antlib.xml b/doc/xooki2asciidoc/antlib.xml
new file mode 100644
index 0000000..8f4d2e2
--- /dev/null
+++ b/doc/xooki2asciidoc/antlib.xml
@@ -0,0 +1,82 @@
+<!--
+ 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.
+-->
+<antlib>
+ <scriptdef name="toAsciidoc" language="javascript">
+ <element name="fileset" type="fileset"/>
+ <attribute name="destDir"/>
+ <attribute name="xookidir"/>
+ <attribute name="checkUpToDate"/>
+ <attribute name="printerFriendly"/>
+ <![CDATA[
+ importClass(java.io.File);
+
+ var xookidir = attributes.get("xookidir");
+ if (xookidir == null) {
+ xookidir = project.getProperty("basedir") + "/xooki";
+ }
+
+ filesets = elements.get("fileset")
+ for (j = 0; j < filesets.size(); j++) {
+ fs = filesets.get(j);
+ srcDir = fs.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...');
+ for (i = 0; i < srcFiles.length; i++) {
+
+ // get the values via Java API
+ var file = new File(fs.getDir(project), srcFiles[i]);
+
+ var basedir = file.getParent();
+ var filename = file.getName();
+ var filepath = srcFiles[i].substring(0, srcFiles[i].lastIndexOf(project.getProperty("file.separator")) + 1);
+
+ if (attributes.get("checkuptodate") == "true") {
+ p = "xooki." + file.getAbsolutePath().replace(' ','_') + ".uptodate";
+ upToDate = project.createTask("uptodate");
+ upToDate.setProperty(p);
+ upToDate.setSrcfile(file);
+ upToDate.setTargetFile(new File(attributes.get("destdir") + "/" + filepath + "/" + filename));
+ upToDate.perform();
+ if (project.getProperty(p) != null) {
+ self.log(srcFiles[i]+" is up to date", 3);
+ continue;
+ }
+ }
+
+ exec = project.createTask("exec");
+ exec.setDir(new File(basedir));
+ exec.setExecutable("jrunscript");
+ exec.setTaskName("generate");
+ exec.createArg().setValue(xookidir + "/xooki2asciidoc.js");
+ exec.createArg().setValue(filename);
+ exec.createArg().setValue(attributes.get("destdir") + "/" + filepath);
+ if (attributes.get("printerfriendly") == "true") {
+ exec.createArg().setValue("print");
+ }
+ exec.perform();
+ }
+ }
+ ]]>
+ </scriptdef>
+</antlib>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/879ac405/doc/xooki2asciidoc/xooki2asciidoc.js
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/xooki2asciidoc.js b/doc/xooki2asciidoc/xooki2asciidoc.js
new file mode 100644
index 0000000..554924e
--- /dev/null
+++ b/doc/xooki2asciidoc/xooki2asciidoc.js
@@ -0,0 +1,1569 @@
+/*
+ Copyright (c) 2006-2007, The Xooki project
+ http://xooki.sourceforge.net/
+
+ Licensed 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.
+
+ Some code is largely inspired by code found in the dojo toolkit,
+ see http://dojotoolkit.org/ for more information.
+*/
+
+/*
+This script can be either embedded in a xooki page for in browser processing, or used in batch using rhino or java 6 javascript tool:
+jrunscript path/to/xooki.js inputFileFromXookiSite.html [path/to/dir/to/put/generated/file]
+
+Be sure to be in the directory where the html input to process is when running this command.
+ */
+var batchMode = (typeof arguments != 'undefined');
+
+var xooki = {};
+xooki.console = ""; // used for debugging purpose only, and only when the debug div is not yet created
+xooki.config = {};
+xooki.c = xooki.config;
+
+function t(msg) {
+ // returns the internationalized version of the message, or the message if no translation is available
+ // t stands for translate
+// FIXME
+// if (typeof xooki.c == "object"
+// && typeof xooki.c.messages == "object"
+// && typeof xooki.c.messages[msg] == "string") {
+// msg = xooki.c.messages[msg];
+// }
+ var arr = [];
+ for (var i=1; i<arguments.length; i++) {
+ arr.push(arguments[i]);
+ }
+ return xooki.string.substituteParams(msg, arr);
+}
+
+function css(clss) {
+ // returns the css class or id configured, or the given class (or id) if no one is configured
+ if (typeof xooki.c.css[clss] != "undefined") {
+ return xooki.c.css[clss];
+ } else {
+ return clss;
+ }
+}
+function u(path) {
+ // convert a path relative to the root to a full URL
+ // u stands for Url
+ if (batchMode) {
+ return xooki.c.relativeRoot+path;
+ } else {
+ return xooki.c.root + path;
+ }
+}
+function lu(path) {
+ // convert a path relative to the local root to a full URL
+ // l stands for local, u stands for Url
+ if (batchMode) {
+ return xooki.c.localRelativeRoot+path;
+ } else {
+ return xooki.c.localRoot + path;
+ }
+}
+function cu(urlCfgProp) {
+ // get a path from a configuration path and convert it to an URL
+ // cu stands for Configured Url
+ if (typeof xooki.c.path[urlCfgProp] == "undefined") {
+ xooki.warn(t("path not configured in xooki: '${0}'", urlCfgProp));
+ return "";
+ }
+ return u(xooki.c.path[urlCfgProp]);
+}
+function pu(id) {
+ // returns the url of the page identified by id
+ // pu stands for Page Url
+ return u(id+".html");
+}
+xooki.p = function(path) {
+ // get a xooki full path from a xooki relative path
+ // p stands for path
+ return xooki.c.path.install+"/"+path;
+}
+xooki.u = function(path) {
+ // convert a path relative to the xooki installation dir to a full URL
+ return u(xooki.p(path));
+}
+xooki.cu = function(urlCfgProp) {
+ // get a xooki path from a configuration path and convert it to an URL
+ if (typeof xooki.c.path[urlCfgProp] == "undefined") {
+ xooki.warn(t("path not configured in xooki: '${0}'", urlCfgProp));
+ }
+ return xooki.u(xooki.c.path[urlCfgProp]);
+}
+
+xooki.util = {
+ isArray: function(it) {
+ return (it && it instanceof Array || typeof it == "array"); // Boolean
+ },
+ mix: function(src, into, override) {
+ if (typeof override == "undefined") {
+ override = true;
+ }
+ if (typeof into == "undefined") {
+ into = {};
+ }
+ for (var k in src) {
+ if (typeof src[k] == "object" && !xooki.util.isArray(src[k])) {
+ if (override || typeof into[k] == "object" || typeof into[k] == "undefined") {
+ if (typeof into[k] != "object") {
+ into[k] = {};
+ }
+ xooki.util.mix(src[k], into[k], override);
+ }
+ } else if (override || typeof into[k] == "undefined") {
+ into[k] = src[k];
+ }
+ }
+ return into;
+ },
+ initArray: function(a) {
+ if (this.isArray(a)) return a;
+ else return {};
+ }
+}
+
+xooki.url = {
+ newXmlHttpRequest: function() {
+ // we first try to use ActiveX, because IE7 has a direct support for XmlHttpRequest object,
+ // but which doesn't work with file urls
+ if(window.ActiveXObject)
+ {
+ try { req = new ActiveXObject("Msxml2.XMLHTTP");
+ } catch(e) {
+ try { req = new ActiveXObject("Microsoft.XMLHTTP");
+ } catch(e) { req = false; }
+ }
+ }
+ else if(window.XMLHttpRequest) {
+ try { req = new XMLHttpRequest();
+ } catch(e) { req = false; }
+ }
+
+ return req;
+ },
+
+ loadURL: function( url, warnOnError ) {
+ req = this.newXmlHttpRequest();
+ if(req) {
+ try {
+ req.open("GET", url, false);
+ req.send("");
+
+ return req.responseText;
+ } catch (e) {
+ if (warnOnError != false)
+ xooki.error(e, t("problem while loading URL ${0}", url));
+ else
+ xooki.debug(t("problem while loading URL ${0}: ${1}", url, e));
+ }
+ }
+ return null;
+ },
+
+ asyncLoadURL: function( url, callback, obj ) {
+ var req = this.newXmlHttpRequest();
+ if(req) {
+ try {
+ req.open("GET", url, true);
+ req.onreadystatechange=function() {
+ if (req.readyState == 4) {
+ if (req.status == 200 || req.status == 0) {
+ callback(req.responseText, obj);
+ }
+ }
+ };
+ req.send("");
+ } catch (e) {
+ xooki.error(e, t("problem while loading URL ${0}", url));
+ }
+ }
+ },
+
+ include: function(script_filename) {
+ document.write('<' + 'script');
+ document.write(' language="javascript"');
+ document.write(' type="text/javascript"');
+ document.write(' src="' + xooki.u(script_filename) + '">');
+ document.write('</' + 'script' + '>');
+ },
+
+ evalURL: function( url, warnOnErrorUrl ) {
+ script = this.loadURL(url, warnOnErrorUrl);
+ if (script != null) {
+ try {
+ eval(script);
+ } catch (e) {
+ xooki.error(e, t("error while executing script from URL ${0}", url));
+ }
+ }
+ },
+
+ action: function(action) {
+ // returns the url for an action on the same page
+ loc = batchMode?'':xooki.pageURL;
+ if (loc.indexOf("#") != -1) {
+ loc = loc.substring(0, loc.indexOf("#"));
+ }
+ return loc+"?action="+action;
+ }
+
+ };
+
+xooki.string = {
+
+ substituteParams: function(/*string*/template, /* object - optional or ... */hash) {
+ // borrowed from dojo
+ // summary:
+ // Performs parameterized substitutions on a string. Throws an exception if any parameter is unmatched.
+ //
+ // description:
+ // For example,
+ // dojo.string.substituteParams("File '${0}' is not found in directory '${1}'.","foo.html","/temp");
+ // returns
+ // "File 'foo.html' is not found in directory '/temp'."
+ //
+ // template: the original string template with ${values} to be replaced
+ // hash: name/value pairs (type object) to provide substitutions. Alternatively, substitutions may be
+ // included as an array
+
+ var map;
+ if (typeof hash == "object" && hash.length) { // array
+ map = {};
+ for (var i in hash) {
+ map[i+""] = hash[i];
+ }
+ } else {
+ map = hash;
+ }
+
+ return template.replace(/\$\{(\w+)\}/g, function(match, key){
+ if(typeof(map[key]) != "undefined" && map[key] != null){
+ return map[key];
+ }
+ xooki.warn("Substitution not found: " + key);
+ return key;
+ }); // string
+ },
+
+ processTemplate: function(/*string*/template, /* object */hash) {
+ if (typeof template.process == "function") {
+ return template.process(hash);
+ } else {
+ return this.substituteParams(template, hash);
+ }
+ },
+
+ exceptionText: function(e, message) {
+ var s = e.description ? e.description : e.toString();
+ return message ? message+":\n"+s : s;
+ },
+
+ findXmlSection: function(str, element, from) {
+ return this.findSection(str, new RegExp('<'+element+'(\\s*\\w+="[^\\"]*")*>'), new RegExp('</'+element+'>'), from);
+ },
+
+ find: function(/*string*/str, /*string or regexp*/exp, /*number, optional*/from) {
+ // find an expression (string or regexp) in a string, from an optional index
+ // the object returned has two properties:
+ // begin: the index in str of the matching find
+ // end: the index in str of the end of the matching find
+ // returns null if no match is found
+ if (typeof from != "number") {
+ from = 0;
+ }
+ if (typeof exp == "string") {
+ var result = {};
+ result.begin = str.indexOf(exp,from);
+ if (result.begin >= 0) {
+ result.end = result.begin + exp.length;
+ return result;
+ }
+ } else {
+ var m;
+ if (from > 0) {
+ // I haven't found any other way to start from the given index
+ m = exp.exec(str.substring(from));
+ } else {
+ m = exp.exec(str);
+ }
+ if (m != null) {
+ var result = {};
+ result.begin = m.index + from;
+ result.end = result.begin + m[0].length;
+ result.matcher = m;
+ return result;
+ }
+ }
+ return null;
+ },
+
+ findSection: function(/*string*/str, /*string or regexp*/open, /*string or regexp*/close, /*number, optional*/from) {
+ // finds a section delimited by open and close tokens in the given string
+ // the algorithm looks for matching open and close tokens
+ // the returned object has the following properties:
+ // outerStart: the index in str where the first open token was found
+ // innerStart: the index in str just after the found open token
+ // innerEnd: the index in str where the matching close token was found
+ // outerEnd: the index in str just after the matching close token
+ // children: an array of similar objects if nested sections where found
+ // if no section is found (no open token, an open token with no matching
+ // close token, or a close token before an open token), null is returned
+ //
+ // for instance if open=='(' and close==')' then the section will find
+ // a section delimited by the first found open parenthesis and the matching
+ // close parentethis, taking into account other opening parentethis
+ // examples:
+ // findSection("a(test)b", "(", ")") == {outerStart: 1, innerStart:2, innerEnd:6, outerEnd:7, children:[]}
+ // findSection("a(te(s)(t))b", "(", ")") == {outerStart: 1, innerStart:2, innerEnd:10, outerEnd:11,
+ // children:[
+ // {outerStart: 4, innerStart:5, innerEnd:6, outerEnd:7, children:[]},
+ // {outerStart: 7, innerStart:8, innerEnd:9, outerEnd:10, children:[]}
+ // ]}
+
+ var openResult = this.find(str, open, from);
+ if (openResult == null) {
+ print('no open\n');
+ return null;
+ }
+ if (openResult.end <= openResult.begin) {
+ print('empty open\n');
+ // empty match are not allowed
+ return null;
+ }
+ var closeResult = this.find(str, close, openResult.end);
+ if (closeResult == null) {
+ print('no close\n');
+ return null;
+ }
+ if (closeResult.end <= closeResult.begin) {
+ print('empty close\n');
+ // empty match are not allowed
+ return null;
+ }
+
+ //print('matched !' + str.substring(openResult.begin, closeResult.end) + '\n');
+
+ var children = [];
+ var child = this.findSection(str, open, close, openResult.end);
+ while (child != null) {
+ if (child.outerStart > closeResult.begin) {
+ break;
+ }
+ if (child.outerEnd > closeResult.begin) {
+ closeResult = this.find(str, close, child.outerEnd);
+ if (closeResult == null) {
+ // unmatched open token
+ return null;
+ }
+ }
+ children.push(child);
+ child = this.findSection(str, open, close, child.outerEnd);
+ }
+
+ //print('found !' + str.substring(openResult.begin, closeResult.end) + '\n');
+
+ return {
+ outerStart: openResult.begin,
+ innerStart: openResult.end,
+ matcherStart: openResult.matcher,
+ innerEnd: closeResult.begin,
+ outerEnd: closeResult.end,
+ matcherEnd: closeResult.matcher,
+ children: children
+ };
+ },
+
+ mul: function (/*string*/ s, /*int*/ n) {
+ r = '';
+ for (var i=0; i < n; i++) {
+ r += s;
+ }
+ return r;
+ }
+};
+
+xooki.json = {
+ evalJson: function (str) {
+ try {
+ return eval("("+str+")");
+ } catch (e) {
+ return null;
+ }
+ },
+
+ loadURL: function (url) {
+ return this.evalJson(xooki.url.loadURL(url));
+ }
+ };
+
+// Displays an alert of an exception description with optional message
+xooki.warn = function(e, message) {
+ xooki.display(xooki.string.exceptionText(e, message), "#eecccc");
+}
+
+// Displays an alert of an exception description with optional message
+xooki.error = function(e, message) {
+ xooki.display(xooki.string.exceptionText(e, message), "#ffdddd");
+}
+
+xooki.info = function(message) {
+ xooki.display(message, "#ddddff");
+}
+
+xooki.display = function(message, background) {
+ var messages = document.getElementById('xooki-messages');
+ if (messages) {
+ messages.innerHTML = '<table width="100%" border="0"><tr><td align="center">'+message+'</td></tr></table>';
+ messages.style.background = background;
+ messages.style.display = "inline";
+ } else {
+ alert(message);
+ }
+}
+
+xooki.debug = function(message) {
+ var console = typeof document == 'undefined' ? false : document.getElementById('xooki-console');
+ if (console) {
+ console.value += message + "\n";
+ } else {
+ xooki.console += message + "\n";
+ }
+}
+
+xooki.debugShowDetail = function (message) {
+ var detail = typeof document == 'undefined' ? false : document.getElementById('xooki-debug-detail');
+ if (detail) {
+ detail.value=message;
+ } else {
+ alert(message);
+ }
+}
+
+
+xooki.html = {
+ hide: function(divid) {
+ document.getElementById(divid).style.display = 'none';
+ },
+
+ show: function (divid) {
+ document.getElementById(divid).style.display = '';
+ },
+
+ pageLink: function(page) {
+ if (page.isAbstract) {
+ return page.title;
+ } else {
+ return '<a href="'+(page.url != null ? page.url : pu(page.id))+'" '+(page.id == xooki.page.id?'class="current"':'')+'>'+page.title+'</a>';
+ }
+ },
+
+ // insert the given header in the html head
+ // can be used only when the browser is still in the head !
+ addHeader: function(/* string */ head) {
+ document.write(head);
+ },
+
+ setBody: function( /* string */ body) {
+ document.body.innerHTML = body;
+ }
+};
+
+xooki.component = {
+ childrenList: function () {
+ if (xooki.page.children.length > 0) {
+ childrenList = '<ul class="'+css('childrenList')+'">\n';
+ for (var i in xooki.page.children) {
+ childrenList+='<li>'+xooki.html.pageLink(xooki.page.children[i])+'</li>\n';
+ }
+ childrenList += "</ul>\n";
+ return childrenList;
+ } else {
+ return "";
+ }
+ },
+
+ menu: function () {
+ var menu = '<ul id="'+css("treemenu")+'" class="treeview">\n';
+ menu += (function (page) {
+ var menu = '';
+ for (var i in page.children) {
+ if (typeof page.children[i] == 'object') {
+ smenu = arguments.callee(page.children[i]);
+ if (smenu != '') {
+ menu += '<li id="xooki-'+page.children[i].id+'" class="submenu">'+xooki.html.pageLink(page.children[i]);
+ if (smenu.indexOf('id="xooki-'+xooki.page.id+'"') != -1
+ || page.children[i].id == xooki.page.id) {
+ // either a descendant or the node processed is the current page node
+ // we specify that the menu must be opened by default
+ menu += '<ul class="open"';
+ menu += '>'+smenu+'</ul>';
+ } else {
+ menu += '<ul class="closed"';
+ menu += '>'+smenu+'</ul>';
+ }
+ } else {
+ menu += '<li id="xooki-'+page.children[i].id+'">'+xooki.html.pageLink(page.children[i]);
+ }
+ menu += '</li>\n';
+ }
+ }
+ return menu;
+ })(xooki.toc);
+ menu += '</ul>\n';
+ return menu;
+ },
+
+ messages: function () {
+ return '<div id="xooki-messages" onclick="xooki.html.hide(\'xooki-messages\')" style="zIndex:999;display:none;position:absolute;top:30px;padding:10px;border-style:solid;background:#eeeeee;"></div>';
+ },
+
+ debugPanel: function () {
+ return '<div id="xooki-debug" style="display:none;margin-top:15px;padding:10px;border-style:solid;background:#eeeeee;"><strong>Xooki Console</strong><br/><textarea cols="100" rows="15" id="xooki-console">'+xooki.console+'</textarea><hr/><a href="javascript:xooki.debugShowDetail(document.getElementById(\'xooki-body\').innerHTML)">content</a> <a href="javascript:xooki.debugShowDetail(xooki.c.body)">xooki body</a> <a href="javascript:xooki.debugShowDetail(document.body.innerHTML)">whole body</a> <a href="javascript:xooki.action.evaluate()">evaluate</a><br/><textarea cols="100" rows="15" id="xooki-debug-detail"></textarea></div>';
+ },
+
+ printerFriendlyLocation: function () {
+ return xooki.url.action("print");
+ },
+
+ printerFriendlyLink: function () {
+ return '<a href="'+this.printerFriendlyLocation()+'">'+t('Printer Friendly')+'</a>';
+ },
+
+ breadCrumb: function () {
+ var breadCrumb = '<span class="breadCrumb">';
+ breadCrumb += (function (page) {
+ var breadCrumb = xooki.html.pageLink(page);
+ if (page.meta.level >= 1) {
+ breadCrumb = arguments.callee(page.meta.parent) + " > " + breadCrumb;
+ }
+ return breadCrumb;
+ })(xooki.page);
+ breadCrumb += '</span>';
+ return breadCrumb;
+ }
+};
+
+xooki.render = {};
+xooki.render.printerFriendlyAsyncLoader = function(source, arr) {
+ var root = arr[0];
+ var page = arr[1];
+ if (source == null) {
+ return;
+ }
+ var level = page.meta.level - root.meta.level + 1;
+
+ // compute printer friendly block
+ var beginIndex = source.indexOf('<textarea id="xooki-source">');
+ beginIndex += '<textarea id="xooki-source">'.length;
+ var endIndex = source.lastIndexOf('</textarea>');
+ source = source.substring(beginIndex, endIndex);
+
+ var printerFriendly = "<h"+level+">"+page.title+"</h"+level+">";
+ printerFriendly += xooki.input.format.main(source, level) + "<hr/>";
+ // inject block in page
+ var pf = document.getElementById('xooki-printerFriendly');
+ pf.innerHTML += printerFriendly;
+
+ // continue recursive loading
+ var nextPage = xooki.toc.getNextPage(page, root);
+ if (nextPage != null) {
+ xooki.url.asyncLoadURL(pu(nextPage.id), xooki.render.printerFriendlyAsyncLoader, [root, nextPage]);
+ }
+};
+
+xooki.render.printerFriendlyAsync = function() {
+ xooki.c.body = xooki.c.messages
+ + "<div id='xooki-printerFriendly'></div>" // div where printer friendly content will be put
+ + xooki.c.debugPanel;
+
+ document.body.innerHTML = xooki.string.processTemplate(xooki.template.body, xooki.c);
+
+ // start async loading of content
+ xooki.url.asyncLoadURL(pu(xooki.page.id), xooki.render.printerFriendlyAsyncLoader, [xooki.page, xooki.page]);
+};
+
+xooki.render.printerFriendlySync = function() {
+ xooki.c.body = xooki.c.messages
+ + (function (page, level) {
+ var source = xooki.url.loadURL(pu(page.id));
+ if (source == null) {
+ return "";
+ }
+ var beginIndex = source.indexOf('<textarea id="xooki-source">');
+ beginIndex += '<textarea id="xooki-source">'.length;
+ var endIndex = source.lastIndexOf('</textarea>');
+ source = source.substring(beginIndex, endIndex);
+
+ var printerFriendly = "<div class='toc-title toc-title-"+level+"'>"+page.title+"</div>";
+ printerFriendly += xooki.input.format.main(source, level);
+ for (var i=0; i <page.children.length; i++) {
+ printerFriendly += "<hr/>";
+ printerFriendly += arguments.callee(page.children[i], level+1);
+ }
+ return printerFriendly;
+ })(xooki.page, 1);
+
+ xooki.html.setBody(xooki.string.processTemplate(xooki.template.body, xooki.c));
+};
+
+xooki.render.printerFriendly = function() {
+ for (var k in xooki.component) {
+ xooki.c[k] = xooki.component[k]();
+ }
+
+ if (batchMode) {
+ xooki.render.printerFriendlySync();
+ } else {
+ xooki.render.printerFriendlyAsync();
+ }
+};
+
+
+xooki.render.page = function() {
+ // realize all components available
+ for (var k in xooki.component) {
+ xooki.c[k] = xooki.component[k]();
+ }
+
+ xooki.input.source();
+
+ if (xooki.c.allowEdit) {
+ xooki.c.body = xooki.c.messages
+ + xooki.c.toolbar
+ + '<div id="xooki-content">'
+ + '<div id="xooki-body"></div>'
+ + '</div>'
+ + xooki.c.editZone
+ + xooki.c.debugPanel;
+ } else {
+ xooki.c.body = xooki.c.messages
+ + '<div id="xooki-content">'
+ + '<div id="xooki-body"></div>'
+ + '</div>'
+ + xooki.c.debugPanel;
+ }
+
+ xooki.html.setBody(xooki.string.processTemplate(xooki.template.body, xooki.c));
+
+ xooki.input.applyChanges();
+};
+
+xooki.render.main = function() {
+ if (xooki.c.action == "print") {
+ // render the printer friendly version of the page
+ this.printerFriendly();
+ } else {
+ // render the page normally
+ this.page();
+ }
+};
+
+xooki.input = {
+ source: function() {
+ if (typeof document != 'undefined' && document.getElementById('xooki-source') != null) {
+ this._source = document.getElementById('xooki-source').value;
+ }
+ return this._source;
+ },
+ processed: function() {
+ return this.format.main(this.source());
+ },
+
+ format: {
+ getInputFilters: function (inputFormat) {
+ return xooki.c[inputFormat+"InputFormat"];
+ },
+ define: function (inputFormat, filters) {
+ // define a new inputFormat
+ // inputFormat: the new input format name
+ // filters: an array of input filter names
+ xooki.c[inputFormat+"InputFormat"] = filters;
+ },
+ main: function(source, level) {
+ // formats an input source
+ if (xooki.c.inputFormat && typeof this.getInputFilters(xooki.c.inputFormat) != "undefined") {
+ format = xooki.c.inputFormat;
+ } else {
+ format = xooki.c.defaultInputFormat;
+ }
+ filters = this.getInputFilters(format);
+ for (var i in filters) {
+ if (typeof filters[i] == 'string') {
+ xooki.debug('processing filter '+filters[i]);
+ f = xooki.input.filters[filters[i]];
+ if (typeof f == "function") {
+ try {
+ source = f(source, level); // process filter
+ } catch (e) {
+ xooki.error(e, t("error occurred while processing filter ${0}", filters[i]));
+ }
+ } else {
+ xooki.error(t("unknown filter ${0} used in input format ${1}", filters[i], format));
+ }
+ }
+ }
+ return source;
+ }
+ },
+
+ filters: {
+ shortcuts: function (input) {
+ // handle shortcut links like this:
+ // [[svn:build.xml]] => <a href="https://xooki.svn.sourceforge.net/svnroot/xooki/trunk/build.xml">build.xml</a>
+ // [[svn:test/example.js a good example]] => <a href="https://xooki.svn.sourceforge.net/svnroot/xooki/trunk/test/example.js">a good example</a>
+ // needs to be configured in xooki config like this
+ // xooki.c.shortcuts.<any shortcut>.url = base url of the shortcut.
+ // ex: xooki.c.shortcuts.svn.url = https://xooki.svn.sourceforge.net/svnroot/xooki/trunk/
+ return input.replace(new RegExp("\\[\\[([^:\n]+):([^\\]\n]+)\\]\\]", "g"), function (str, prefix, code, offset, s) {
+ if (typeof xooki.c.shortcuts == "undefined" || typeof xooki.c.shortcuts[prefix] == "undefined") {
+ xooki.debug('unknown shortcut '+prefix);
+ return str;
+ }
+ var index = code.indexOf(' ');
+ var path = index>0?code.substring(0,index):code;
+
+ var title = index>0?code.substring(index+1):path;
+ var pre = typeof xooki.c.shortcuts[prefix].pre == "undefined"?'':xooki.c.shortcuts[prefix].pre;
+ var post = typeof xooki.c.shortcuts[prefix].post == "undefined"?'':xooki.c.shortcuts[prefix].post;
+ return 'link:'+pre+path+post+'['+title+']';
+ });
+ },
+
+ xookiLinks: function (input) {
+ // handle xooki links like this:
+ // [[page/id]]
+ // [[page/id My Title]]
+ return input.replace(new RegExp("\\[\\[([^\\]]+)\\]\\]", "g"), function (str, code, offset, s) {
+ var index = code.indexOf(' ');
+ var id = (index>0?code.substring(0,index):code);
+
+ var title;
+ var url;
+ var invalid = false;
+
+ if (typeof xooki.toc.pages[xooki.toc.importRoot + id] != "undefined") {
+ title = xooki.toc.pages[xooki.toc.importRoot + id].title;
+ url = pu(xooki.toc.importRoot + id);
+ } else if (xooki.toc.importRoot.length > 0 && typeof xooki.toc.pages[id] != "undefined") {
+ title = xooki.toc.pages[id].title;
+ url = pu(id);
+ } else {
+ invalid = true;
+ title = code;
+ url = u(id);
+ }
+ if (index>0) {
+ title = code.substring(index+1);
+ }
+ if (invalid) {
+ if (batchMode) {
+ // do not output invalid links as links in batch mode
+ return title;
+ } else {
+ return title+'link:'+url+'[?]';
+ }
+ } else {
+ return 'link:'+url+'['+title+']';
+ }
+ });
+ },
+
+ wikiMarkup: function (input) {
+ // handle italic
+ input = input.replace(new RegExp("\\_([^\n]+)\\_", "g"), "<em>$1</em>");
+
+ return input;
+ },
+
+ jira: function (input) {
+ // auto replace jira issue ids (like IVY-12) by a link to the issue
+ // needs to be configured in xooki config like this
+ // xooki.c.jira.ids = an array of jira projects ids (ex: ["IVY", "ANT"])
+ // xooki.c.jira.url = the url of the jira server (ex: "http://issues.apache.org/jira")
+ if (typeof xooki.c.jira != "object") {
+ return input;
+ }
+ input = input.replace(new RegExp("(("+xooki.c.jira.ids.join("|")+")-\\d+)([^\"\\d])", "g"), 'link:'+xooki.c.jira.url+'/browse/$1[$1]$3');
+
+ return input;
+ },
+
+ code: function (input) {
+ codeSection = xooki.string.findXmlSection(input, "code");
+ from = 0;
+ while (codeSection != null) {
+ processedSection = "\n[source]\n----\n"
+ + input.substring(codeSection.innerStart, codeSection.innerEnd)
+ + "\n----\n\n";
+ input = input.substring(0, codeSection.outerStart)
+ + processedSection
+ + input.substring(codeSection.outerEnd);
+ from = codeSection.outerStart + processedSection.length;
+
+ codeSection = xooki.string.findXmlSection(input, "code", from);
+ }
+ return input;
+ },
+
+ includes: function (input) {
+ //[<url>] replaced by the content of the url
+ result = "";
+ lastStart = 0;
+ nextPos = input.indexOf("[<" , lastStart);
+ while( nextPos > 0 ) {
+ result = result + input.slice(lastStart,nextPos);
+ lastStart = nextPos;
+ nextPos = input.indexOf(">]" , lastStart);
+ result = result + xooki.url.loadURL(lu(input.slice(lastStart+2,nextPos)));
+ lastStart = nextPos + 2;
+ nextPos = input.indexOf("[<" , lastStart);
+ }
+ return result + input.slice(lastStart);
+ },
+
+ printFormatImgFix: function (input, level) {
+ if (level == undefined || level < 3) {
+ return input;
+ }
+ return input.replace(new RegExp('<img +src *= *\\"([^\\"]*)\\"', "g"), function (str, img, offset, s) {
+ l = level;
+ while (l > 2) {
+ if (img.indexOf("../") >= 0) {
+ img = img.substring(3);
+ } else {
+ break;
+ }
+ l--;
+ }
+ return '<img src="'+img+'"';
+ });
+ },
+
+ htmltags: function(input) {
+ print('search href\n')
+ var s = xooki.string.findSection(input, new RegExp('<a\\s*href\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'));
+ var from = 0;
+ while (s != null) {
+ var href = s.matcherStart[1];
+ processedSection = "link:" + href + "[" + input.substring(s.innerStart, s.innerEnd) + "]";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<a\\s*href\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'), from);
+ }
+
+ print('search name\n')
+ s = xooki.string.findSection(input, new RegExp('<a\\s*name\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'));
+ from = 0;
+ while (s != null) {
+ var name = s.matcherStart[1];
+ processedSection = "[[" + name + "]]" + input.substring(s.innerStart, s.innerEnd);
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<a\\s*name\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'), from);
+ }
+
+ print('search img\n')
+ s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*/>'));
+ from = 0;
+ while (s != null) {
+ processedSection = " image:" + s.matcher[1] + "[]"
+ input = input.substring(0, s.begin)
+ + processedSection
+ + input.substring(s.end);
+ from = s.begin + processedSection.length;
+ s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*/>'), from);
+ }
+
+ print('search br\n')
+ s = xooki.string.find(input, new RegExp('<br\\s*/>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "\n"
+ input = input.substring(0, s.begin)
+ + processedSection
+ + input.substring(s.end);
+ from = s.begin + processedSection.length;
+ s = xooki.string.find(input, new RegExp('<br\\s*/>'), from);
+ }
+
+ print('search b\n')
+ s = xooki.string.findXmlSection(input, "b");
+ from = 0;
+ print("found=" + (s != null) + "\n")
+ while (s != null) {
+ processedSection = "*" + input.substring(s.innerStart, s.innerEnd) + "*";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findXmlSection(input, "b", from);
+ print("found=" + (s != null) + "\n")
+ }
+
+ print('search strong\n')
+ s = xooki.string.findXmlSection(input, "strong");
+ from = 0;
+ print("found=" + (s != null) + "\n")
+ while (s != null) {
+ processedSection = "*" + input.substring(s.innerStart, s.innerEnd) + "*";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findXmlSection(input, "strong", from);
+ print("found=" + (s != null) + "\n")
+ }
+
+ print('search i\n')
+ s = xooki.string.findXmlSection(input, "i");
+ from = 0;
+ while (s != null) {
+ processedSection = "__" + input.substring(s.innerStart, s.innerEnd) + "__";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "i", from);
+ }
+
+ print('search h1\n')
+ s = xooki.string.findXmlSection(input, "h1");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n== " + input.substring(s.innerStart, s.innerEnd) + "\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "h1", from);
+ }
+
+ print('search h2\n')
+ s = xooki.string.findXmlSection(input, "h2");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n=== " + input.substring(s.innerStart, s.innerEnd) + "\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "h2", from);
+ }
+
+ print('search h3\n')
+ s = xooki.string.findXmlSection(input, "h3");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n==== " + input.substring(s.innerStart, s.innerEnd) + "\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "h3", from);
+ }
+
+ print('search h4\n')
+ s = xooki.string.findXmlSection(input, "h4");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n." + input.substring(s.innerStart, s.innerEnd) + "\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "h4", from);
+ }
+
+ print('search center\n')
+ s = xooki.string.findXmlSection(input, "center");
+ from = 0;
+ while (s != null) {
+ processedSection = input.substring(s.innerStart, s.innerEnd);
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "center", from);
+ }
+
+ print('search tt\n')
+ s = xooki.string.findXmlSection(input, "tt");
+ from = 0;
+ while (s != null) {
+ processedSection = "`" + input.substring(s.innerStart, s.innerEnd) + "`";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "tt", from);
+ }
+
+ print('search em\n')
+ s = xooki.string.findXmlSection(input, "em");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n[NOTE]\n===============================\n" + input.substring(s.innerStart, s.innerEnd) + "\n===============================\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "em", from);
+ }
+
+ print('search span-since\n')
+ s = xooki.string.findSection(input, new RegExp('<span\\s*class\\s*=\\s*\\"\\s*since\\s*\\"[^>]*>'), new RegExp('</span>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "*__" + input.substring(s.innerStart, s.innerEnd) + "__*";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<span\\s*class\\s*=\\s*\\"\\s*since\\s*\\"[^>]*>'), new RegExp('</span>'), from);
+ }
+
+ print('search ul/ol\n')
+ var htmllisttag = function(input, from, indent) {
+ var sul = xooki.string.find(input, '<ul>', from);
+ var sol = xooki.string.find(input, '<ol>', from);
+ var endtag;
+ var innerindent;
+ var s;
+ if (sul != null && (sol == null || sul.begin < sol.begin)) {
+ s = sul;
+ innerindent = "*" + indent
+ endtag = "</ul>";
+ } else {
+ s = sol;
+ innerindent = "." + indent
+ endtag = "</ol>";
+ }
+ if (s == null) {
+ return input;
+ }
+ input = input.substring(0, s.begin) + input.substring(s.end);
+ from = s.begin;
+ var lastEnd = s.begin;
+ var first = true;
+ var sli = xooki.string.findXmlSection(input, "li", from);
+ while (sli != null) {
+ s = xooki.string.find(input, endtag, from);
+ if (s != null && s.begin < sli.outerStart) {
+ break;
+ }
+ start = sli.outerStart;
+ if (!first) {
+ start = lastEnd;
+ }
+ processedSection = "\n" + innerindent + input.substring(sli.innerStart, sli.innerEnd).replace(/\\s/, ' ');
+ input = input.substring(0, start)
+ + processedSection
+ + input.substring(sli.outerEnd);
+ from = start + processedSection.length;
+ lastEnd = from;
+ sli = xooki.string.findXmlSection(input, "li", from);
+ first = false;
+ }
+ s = xooki.string.find(input, endtag, from);
+ if (s == null) {
+ print(input.substring(from, from + 100));
+ return input;
+ }
+ input = input.substring(0, s.begin) + input.substring(s.end);
+ from = s.begin;
+ return htmllisttag(input, from, indent);
+ }
+
+ input = htmllisttag(input, 0, " ");
+
+ print('search table\n')
+ s = xooki.string.findXmlSection(input, "table");
+ from = 0;
+ print("found=" + (s != null) + "\n")
+ while (s != null) {
+ tableContent = input.substring(s.innerStart, s.innerEnd);
+ processedSection = "\n"
+
+ print('search tablehead\n')
+ s2 = xooki.string.findXmlSection(tableContent, "thead");
+ from2 = 0
+ print("found=" + (s2 != null) + "\n")
+ if (s2 != null) {
+ tableHead = tableContent.substring(s2.innerStart, s2.innerEnd);
+ processedSection += '[options="header"]\n'
+ processedSection += '|=======\n'
+
+ print('search th\n')
+ s3 = xooki.string.findXmlSection(tableHead, "th");
+ while (s3 != null) {
+ processedSection += "|" + tableHead.substring(s3.innerStart, s3.innerEnd);
+ s3 = xooki.string.findXmlSection(tableHead, "th", s3.outerEnd);
+ }
+ processedSection += "\n"
+ from2 = s2.outerEnd
+ } else {
+ processedSection += '|=======\n'
+ }
+
+ print('search tr\n')
+ s2 = xooki.string.findXmlSection(tableContent, "tr", from2);
+ while (s2 != null) {
+ trContent = tableContent.substring(s2.innerStart, s2.innerEnd);
+
+ print('search td\n')
+ s3 = xooki.string.findXmlSection(trContent, "td");
+ while (s3 != null) {
+ processedSection += "|" + trContent.substring(s3.innerStart, s3.innerEnd);
+ s3 = xooki.string.findXmlSection(trContent, "td", s3.outerEnd);
+ }
+ processedSection += "\n"
+
+ from2 = s2.outerEnd;
+ s2 = xooki.string.findXmlSection(tableContent, "tr", from2);
+ }
+
+ processedSection += '|=======\n'
+
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findXmlSection(input, "table", from);
+ print("found=" + (s != null) + "\n")
+ }
+
+ return input;
+ },
+ },
+
+
+ applyChanges: function() {
+ document.getElementById('xooki-body').innerHTML = xooki.input.processed();
+ }
+};
+
+
+xooki.postProcess = function() {
+ xooki.render.main();
+ window.onkeypress = keyCtrl;
+};
+
+
+if (typeof xooki.io == "undefined") {
+ xooki.io = {};
+}
+
+
+xooki.action = {}
+xooki.action.toggleDebug = function() {
+ if (xooki.c.debug) {
+ if (document.getElementById('xooki-debug').style.display == 'none') {
+ xooki.html.show('xooki-debug');
+ } else {
+ xooki.html.hide('xooki-debug');
+ }
+ }
+}
+xooki.action.evaluate = function () {
+ var exp = prompt("Please enter javascript expression to evaluate");
+ xooki.debugShowDetail(eval(exp));
+}
+
+// TODO, review use registration
+function keyCtrl(evt) {
+ var code = xooki.c.browser.NS ? evt.which : event.keyCode;
+ var ctrl = xooki.c.browser.NS ? evt.ctrlKey : event.ctrlKey;
+ var key = String.fromCharCode(code);
+ if (xooki.c.debug && ctrl && "d" == key) {
+ xooki.action.toggleDebug();
+ return false;
+ }
+ if (xooki.c.allowEdit && ctrl && "s" == key) {
+ xooki.action.saveChanges();
+ return false;
+ }
+ if (xooki.c.allowEdit && ctrl && "e" == key) {
+ xooki.action.toggleEdit();
+ return false;
+ }
+}
+
+// xooki engine init function
+xooki.init = function() {
+ ////////////////////////////////////////////////////////////////////////////
+ ////////////////// config init
+ ////////////////////////////////////////////////////////////////////////////
+ initConfigProperty = function(prop, value, defaultValue) {
+ if (typeof this[prop] == "undefined") {
+ if (typeof value == "undefined") {
+ this[prop] = defaultValue;
+ } else if (typeof value == "function") {
+ this[prop] = value();
+ } else {
+ this[prop] = value;
+ }
+ }
+ };
+ if (typeof xookiConfig != "undefined") {xooki.util.mix(xookiConfig, xooki.config);}
+ xooki.c.initProperty = initConfigProperty;
+ xooki.c.computeRoot = function() {
+ root = xooki.pageURL;
+ // remove trailing parts of the URL to go the root depending on level
+ for (var i=0; i < xooki.c.level + 1; i++) {
+ root = root.substring(0, root.lastIndexOf('/'));
+ }
+ return root + '/';
+ };
+ xooki.c.computeRelativeRoot = function() {
+ return xooki.string.mul('../', xooki.c.level);
+ };
+ xooki.c.setImportLevel = function(level) {
+ // compute roots with old level value, for paths relative to the local (non imported) root
+ this.localRoot = this.computeRoot();
+ this.localRelativeRoot = this.computeRelativeRoot();
+ // change level and update roots
+ this.level+=level;
+ this.root = this.computeRoot();
+ this.relativeRoot = this.computeRelativeRoot();
+ };
+ xooki.c.initProperty("level", 0);
+ xooki.c.initProperty("root", xooki.c.computeRoot);
+ xooki.c.initProperty("relativeRoot", xooki.c.computeRelativeRoot);
+ xooki.c.initProperty("localRoot", xooki.c.root);
+ xooki.c.initProperty("localRelativeRoot", xooki.c.relativeRoot);
+ globalConfig = xooki.url.loadURL(u("config.json"), false);
+ if (globalConfig != null && globalConfig.length != 0) {
+ globalConfig = eval('('+globalConfig+')');
+ xooki.util.mix(globalConfig, xooki.c, false);
+ }
+ xooki.url.evalURL(u("config.js"), false);
+ xooki.url.evalURL(u("config.extra.js"), false);
+
+
+ xooki.c.initProperty("defaultInputFormat", "xooki");
+ xooki.c.initProperty("xookiInputFormat", ["xooki"]);
+ xooki.c.initProperty("allowEdit", !batchMode && xooki.pageURL.substr(0,5) == "file:");
+
+ xooki.input.format.define("xooki", ["code", "shortcuts", "xookiLinks", "jira", "includes", "printFormatImgFix", "htmltags"]);
+
+ xooki.c.path = (typeof xooki.c.path != "undefined")?xooki.c.path:{};
+ xooki.c.path.initProperty = initConfigProperty;
+ xooki.c.path.initProperty("install", "xooki");
+ xooki.c.path.initProperty("messages", xooki.p("messages.json"));
+ xooki.c.path.initProperty("template", "template.html");
+ xooki.c.path.initProperty("printTemplate", "printTemplate.html");
+ xooki.c.path.initProperty("toc", "toc.json");
+ xooki.c.path.initProperty("blankPageTpl", xooki.p("blankPageTpl.html"));
+
+
+ xooki.c.css = (typeof xooki.c.css != "undefined")?xooki.c.css:{};
+
+ xooki.c.messages = xooki.json.loadURL(cu("messages"));
+ if (!batchMode) {
+ xooki.c.browser = {
+ NS: (window.Event) ? 1 : 0
+ };
+
+ // action
+ if (! xooki.c.action) xooki.c.action = 'render';
+ // TODO: better handle action extraction
+ xooki.c.action = window.location.search == '?action=print'?'print':xooki.c.action;
+ }
+
+ var match = new RegExp("^.*\\/((?:.*\\/){"+xooki.c.level+"}[^\\/]*)(?:\\.\\w+)(?:\\?.+)?$", "g").exec(xooki.pageURL);
+ if (match == null || match[1] == '') {
+ xooki.c.curPageId = "index";
+ } else {
+ xooki.c.curPageId = match[1];
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
+ ////////////////// TOC init
+ ////////////////////////////////////////////////////////////////////////////
+ xooki.toc = xooki.json.loadURL(cu("toc"));
+ xooki.toc.url = cu("toc");
+ xooki.toc.pages = {}; // to store a by id map of pages objects
+ xooki.toc.importRoot = '';
+ xooki.toc.actualRoot = xooki.toc; // this is the real root of the TOC, in case of a TOC imported, it will point to the root of the TOC on which import has been performed
+
+ // populate meta data
+ (function(page, parent, index, level, prefix) {
+ if (prefix.length > 0) {
+ page.meta = xooki.util.mix({id: page.id}, page.meta);
+ page.id = prefix + page.id;
+ }
+ xooki.toc.pages[page.id] = page;
+
+ page.meta = xooki.util.mix({
+ index: index,
+ level: level,
+ getSerializeValue: function(o, k) {
+ if (k == 'id' && typeof this.id != 'undefined') {
+ return this.id;
+ } else {
+ return o[k];
+ }
+ }
+ }, page.meta);
+ page.meta.parent = parent;
+ if (typeof page.importNode != 'undefined' && !page.isImported) {
+ // this node requires to import another xooki TOC
+ importedTocUrl = u(page.importRoot + '/toc.json');
+ importedToc = xooki.json.loadURL(importedTocUrl);
+ // look for the imported node in the importedTOC and import it in main TOC
+ (function(page, parent, index, level, prefix, importedToc, node, id, populateFunction) {
+ if (node.id == id) {
+ xooki.util.mix(node, page, false);
+ page.id = id;
+ page.isImported = true;
+ page.meta = xooki.util.mix({
+ isTransient: function(k) {
+ // only title, importRoot and importNode should be serialized
+ return k != 'title' && k != 'importRoot' && k != 'importNode';
+ }
+ }, page.meta);
+ if (xooki.c.curPageId.indexOf(prefix) == 0) {
+ // the current page is in this imported TOC
+ xooki.toc.actualRoot = importedToc;
+ xooki.toc.url = u(page.importRoot + '/toc.json');
+ xooki.toc.importRoot = prefix;
+ }
+ populateFunction(page, parent, index, level, prefix);
+ return true;
+ } else if (typeof node.children != 'undefined') {
+ for (var i=0; i<node.children.length; i++) {
+ if (arguments.callee(page, parent, index, level, prefix, importedToc, node.children[i], id, populateFunction)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ })(page, parent, index, level, page.importRoot+'/', importedToc, importedToc, page.importNode, arguments.callee);
+ }
+ if (typeof page.children == 'undefined') {
+ page.children = [];
+ } else {
+ for (var i=0; i<page.children.length; i++) {
+ arguments.callee(page.children[i], page, i, level+1, prefix); // recurse
+ }
+ }
+ })(xooki.toc, null, 0, -1, '');
+
+ xooki.toc.getNextPage = function(page, root) {
+ if (page.children.length > 0) {
+ return page.children[0];
+ } else if (page.meta.parent != null) {
+ var cur = page;
+ var next = xooki.toc.getNextSibling(cur);
+ while (next == null) {
+ cur = cur.meta.parent;
+ if (cur == null || cur == root) {
+ return null;
+ }
+ next = xooki.toc.getNextSibling(cur);
+ }
+ return next;
+ } else {
+ return null;
+ }
+ };
+ xooki.toc.getNextSibling = function(page) {
+ if (page.meta.parent == null) {
+ return null;
+ }
+ if (page.meta.parent.children.length > page.meta.index) {
+ return page.meta.parent.children[page.meta.index+1];
+ } else {
+ return null;
+ }
+ };
+ xooki.page = xooki.toc.pages[xooki.c.curPageId];
+
+ if (xooki.page == null) {
+ xooki.warn(t('page id not found in TOC: ${0}',xooki.c.curPageId));
+ xooki.page = xooki.toc.children[0];
+ }
+ if (typeof xooki.config.title == 'undefined') {
+ xooki.config.title = xooki.page.title;
+ }
+ xooki.config.page = xooki.page;
+
+ ////////////////////////////////////////////////////////////////////////////
+ ////////////////// main template loading + head output
+ ////////////////////////////////////////////////////////////////////////////
+ xooki.template = {};
+ xooki.template.source = xooki.url.loadURL(xooki.c.action == "print"?cu("printTemplate"):cu("template"));
+ if(xooki.template.source != null) {
+ xooki.template.head = '';
+ xooki.template.body = '${title}\n====================\n\n${body}';
+ }
+
+
+ ////////////////////////////////////////////////////////////////////////////
+ ////////////////// includes
+ ////////////////////////////////////////////////////////////////////////////
+ if (xooki.c.allowEdit) {
+ xooki.url.include("xookiEdit.js");
+ }
+
+ for (var k in xooki.c) {
+ if (typeof xooki.c[k] == "string" || typeof xooki.c[k] == "number" || typeof xooki.c[k] == "boolean") {
+ xooki.debug(k+": "+xooki.c[k]);
+ }
+ }
+};
+
+if (batchMode) {
+ importPackage(java.io);
+
+ xooki.io.loadFile = function( url, warnOnError ) {
+ var str = '';
+ try {
+ var r = new BufferedReader(new FileReader(url));
+ line = r.readLine();
+ while (line != null) {
+ str += line + '\n';
+ line = r.readLine();
+ }
+ r.close();
+ } catch (e) {
+ if (warnOnError) {
+ throw e;
+ } else {
+ xooki.debug("error occurred while loading "+url);
+ }
+ }
+ return str;
+ };
+
+ xooki.io.saveFile = function (fileUrl, content) {
+ p = new File(fileUrl).getParentFile();
+ if (p != null) {
+ p.mkdirs();
+ }
+ pw = new PrintWriter(new FileWriter(fileUrl));
+ pw.write(content);
+ pw.close();
+ return true;
+ }
+
+ xooki.url.loadURL = function( url, warnOnError ) {
+ return xooki.io.loadFile(url, warnOnError );
+ };
+
+ xooki.html.addHeader = function (head) {
+ xooki.pageContent = xooki.pageContent.replace(/<\/head>/, head+'\n</head>');
+ };
+
+ xooki.html.setBody = function(body) {
+ xooki.pageContent = xooki.pageContent.replace(/<body>(.|[^,])*<\/body>/gm, '<body>'+body+'</body>');
+ }
+
+ xooki.url.include = function(script_filename) {
+ xooki.html.addHeader('<script language="javascript" type="text/javascript" src="'+xooki.c.relativeRoot+'xooki/'+script_filename+'"></script>');
+ };
+
+ xooki.input.source = function() {
+ if (typeof this._source == 'undefined') {
+ xooki.debug('searching source');
+ var beg = xooki.pageContent.indexOf('<textarea id="xooki-source">');
+ beg += '<textarea id="xooki-source">'.length;
+ var end = xooki.pageContent.lastIndexOf('</textarea>');
+ this._source = xooki.pageContent.substring(beg, end);
+ xooki.debug('source found');
+ }
+ return this._source;
+ }
+
+ xooki.render.page = function() {
+ // realize all components available
+ xooki.debug('realizing components');
+ for (var k in xooki.component) {
+ xooki.c[k] = xooki.component[k]();
+ }
+
+ xooki.debug('processing body');
+ xooki.c.body = xooki.input.processed();
+
+ xooki.debug('updating body');
+ var body = xooki.string.processTemplate(xooki.template.body, xooki.c);
+ xooki.html.setBody(body);
+ };
+
+ xooki.display = function(message, background) {
+ print(message);
+ };
+
+ xooki.debug = function (message) {
+ if (xooki.c.debug) {
+ print(message+'\n');
+ }
+ };
+ var i=0;
+ if (arguments.length > i && arguments[0] == '-debug') {
+ xooki.c.debug = true;
+ i++;
+ } else {
+ xooki.c.debug = false;
+ }
+
+ var file = 'index.html';
+ if (arguments.length > i) {
+ file = arguments[i];
+ i++;
+ }
+ var generateTo = "gen";
+ if (arguments.length > i) {
+ generateTo = arguments[i];
+ i++;
+ }
+ xooki.c.action = 'render';
+ if (arguments.length > i) {
+ xooki.c.action = arguments[i];
+ i++;
+ }
+
+ xooki.pageURL = new File(file).toURL().toExternalForm();
+
+ print('processing '+new File(file).getAbsolutePath()+'...\n');
+ xooki.pageContent = xooki.io.loadFile(file);
+
+ if (xooki.pageContent.match(/<textarea\s+id="xooki\-source">/) == null) {
+ print(file + ' is not a valid xooki source. ignored.');
+ } else {
+ var m = /var\s+xookiConfig\s+=\s+{.*};/.exec(xooki.pageContent);
+ if (typeof m != 'undefined' && m != null) {
+ eval(m[0]);
+ }
+
+ xooki.init();
+
+ xooki.pageContent = xooki.pageContent.replace(/<script type="text\/javascript" src="[^"]*xooki.js"><\/script>/g, '');
+
+ xooki.render.main();
+
+ var dest = generateTo.endsWith(".html") ? generateTo : generateTo+'/'+file;
+ dest = dest.substring(0, dest.length-5) + ".adoc";
+ print('generating to '+dest);
+ xooki.pageContent = xooki.pageContent.replace(/[\s\S]*<body>/i, '');
+ xooki.pageContent = xooki.pageContent.replace(/<\/body>[\s\S]*/i, '');
+ xooki.io.saveFile(dest, xooki.pageContent);
+ }
+} else {
+ xooki.pageURL = window.location.toString();
+ xooki.init();
+}
+
[12/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/chained-resolvers.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/chained-resolvers.txt b/asciidoc/tutorial/log/chained-resolvers.txt
new file mode 100644
index 0000000..25e3a12
--- /dev/null
+++ b/asciidoc/tutorial/log/chained-resolvers.txt
@@ -0,0 +1,38 @@
+[ivy@apache:/ivy/chained-resolvers/chainedresolvers-project]$ ant
+Buildfile: /ivy/chained-resolvers/chainedresolvers-project/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: file = /ivy/chained-resolvers/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#chained-resolvers;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in ibiblio
+[ivy:retrieve] found org.apache#test;1.0 in libraries
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
+[ivy:retrieve] ............................. (277kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2303ms)
+[ivy:retrieve] downloading /ivy/chained-resolvers/settings/repository/test-1.0.jar ...
+[ivy:retrieve] .. (1kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache#test;1.0!test.jar (1ms)
+[ivy:retrieve] :: resolution report :: resolve 8989ms :: artifacts dl 2306ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 2 | 2 | 1 | 0 || 2 | 2 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#chained-resolvers
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (278kB/10ms)
+
+run:
+ [mkdir] Created dir: /ivy/chained-resolvers/chainedresolvers-project/build
+ [javac] /ivy/chained-resolvers/chainedresolvers-project/build.xml:58: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
+ [javac] Compiling 1 source file to /ivy/chained-resolvers/chainedresolvers-project/build
+ [java] standard message :example world !
+ [java] capitalized by org.apache.commons.lang.WordUtils : Example World !
+ [java] upperCased by test.StringUtils : EXAMPLE WORLD !
+
+BUILD SUCCESSFUL
+Total time: 12 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/configurations-lib.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-lib.txt b/asciidoc/tutorial/log/configurations-lib.txt
new file mode 100644
index 0000000..46ba5a8
--- /dev/null
+++ b/asciidoc/tutorial/log/configurations-lib.txt
@@ -0,0 +1,72 @@
+[ivy@apache:/ivy/configurations/multi-projects/filter-framework]$ ant
+Buildfile: /ivy/configurations/multi-projects/filter-framework/build.xml
+
+clean:
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#filter-framework;working@apache
+[ivy:retrieve] confs: [api, homemade-impl, cc-impl, test]
+[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
+[ivy:retrieve] found junit#junit;4.12 in public
+[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar ...
+[ivy:retrieve] ...........................................
+[ivy:retrieve] ............... (733kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (3229ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar ...
+[ivy:retrieve] ............................... (307kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (1837ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...
+[ivy:retrieve] .............. (43kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1275ms)
+[ivy:retrieve] :: resolution report :: resolve 14647ms :: artifacts dl 6347ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | api | 0 | 0 | 0 | 0 || 0 | 0 |
+ | homemade-impl | 0 | 0 | 0 | 0 || 0 | 0 |
+ | cc-impl | 1 | 1 | 1 | 0 || 1 | 1 |
+ | test | 3 | 3 | 3 | 0 || 3 | 3 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#filter-framework
+[ivy:retrieve] confs: [api, homemade-impl, cc-impl, test]
+[ivy:retrieve] 4 artifacts copied, 0 already retrieved (1818kB/19ms)
+
+build:
+ [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build
+ [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/distrib
+ [javac] Compiling 4 source files to /ivy/configurations/multi-projects/filter-framework/build
+ [jar] Building jar: /ivy/configurations/multi-projects/filter-framework/distrib/filter-api.jar
+ [jar] Building jar: /ivy/configurations/multi-projects/filter-framework/distrib/filter-hmimpl.jar
+ [jar] Building jar: /ivy/configurations/multi-projects/filter-framework/distrib/filter-ccimpl.jar
+
+test:
+ [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build/test-report
+ [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build/test-classes
+ [javac] /ivy/configurations/multi-projects/filter-framework/build.xml:82: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
+ [javac] Compiling 3 source files to /ivy/configurations/multi-projects/filter-framework/build/test-classes
+ [junit] Running filter.ccimpl.CCFilterTest
+ [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec
+ [junit] Running filter.hmimpl.HMFilterTest
+ [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec
+
+publish:
+[ivy:publish] :: delivering :: org.apache#filter-framework;working@apache :: 1.3 :: release :: Thu Jun 15 16:46:53 IST 2017
+[ivy:publish] delivering ivy file to /ivy/configurations/multi-projects/filter-framework/distrib/ivy.xml
+[ivy:publish] :: publishing :: org.apache#filter-framework
+[ivy:publish] published filter-api to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-api.jar
+[ivy:publish] published filter-hmimpl to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-hmimpl.jar
+[ivy:publish] published filter-ccimpl to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-ccimpl.jar
+[ivy:publish] published ivy to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part
+[ivy:publish] to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3
+ [echo] project filter-framework released with version 1.3
+
+BUILD SUCCESSFUL
+Total time: 23 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/configurations-runcc.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-runcc.txt b/asciidoc/tutorial/log/configurations-runcc.txt
new file mode 100644
index 0000000..e943c57
--- /dev/null
+++ b/asciidoc/tutorial/log/configurations-runcc.txt
@@ -0,0 +1,46 @@
+[ivy@apache:/ivy/configurations/multi-projects/myapp]$ ant
+Buildfile: /ivy/configurations/multi-projects/myapp/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#myapp;working@apache
+[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
+[ivy:retrieve] found org.apache#filter-framework;1.3 in local
+[ivy:retrieve] [1.3] org.apache#filter-framework;latest.integration
+[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
+[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-hmimpl.jar ...
+[ivy:retrieve] .. (1kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-hmimpl.jar (7ms)
+[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-ccimpl.jar ...
+[ivy:retrieve] .. (1kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-ccimpl.jar (8ms)
+[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-api.jar ...
+[ivy:retrieve] .. (1kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-api.jar (7ms)
+[ivy:retrieve] :: resolution report :: resolve 132ms :: artifacts dl 31ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | build | 1 | 1 | 1 | 0 || 1 | 1 |
+ | noexternaljar | 1 | 1 | 1 | 0 || 2 | 2 |
+ | withexternaljar | 2 | 1 | 1 | 0 || 3 | 2 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#myapp
+[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
+[ivy:retrieve] 6 artifacts copied, 0 already retrieved (739kB/33ms)
+
+build:
+ [mkdir] Created dir: /ivy/configurations/multi-projects/myapp/build
+ [javac] Compiling 1 source file to /ivy/configurations/multi-projects/myapp/build
+
+run-cc:
+ [java] Filtering with:class filter.ccimpl.CCFilter
+ [java] Result :[two, tree]
+
+BUILD SUCCESSFUL
+Total time: 1 second
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/configurations-runhm.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-runhm.txt b/asciidoc/tutorial/log/configurations-runhm.txt
new file mode 100644
index 0000000..62377fb
--- /dev/null
+++ b/asciidoc/tutorial/log/configurations-runhm.txt
@@ -0,0 +1,32 @@
+[ivy@apache:/ivy/configurations/multi-projects/myapp]$ ant run-hm
+Buildfile: /ivy/configurations/multi-projects/myapp/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#myapp;working@apache
+[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
+[ivy:retrieve] found org.apache#filter-framework;1.3 in local
+[ivy:retrieve] [1.3] org.apache#filter-framework;latest.integration
+[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
+[ivy:retrieve] :: resolution report :: resolve 144ms :: artifacts dl 8ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | build | 1 | 1 | 0 | 0 || 1 | 0 |
+ | noexternaljar | 1 | 1 | 0 | 0 || 2 | 0 |
+ | withexternaljar | 2 | 1 | 0 | 0 || 3 | 0 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#myapp
+[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
+[ivy:retrieve] 0 artifacts copied, 6 already retrieved (0kB/6ms)
+
+build:
+
+run-hm:
+ [java] Filtering with:class filter.hmimpl.HMFilter
+ [java] Result :[two, tree]
+
+BUILD SUCCESSFUL
+Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/dependence-depending-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-depending-2.txt b/asciidoc/tutorial/log/dependence-depending-2.txt
new file mode 100644
index 0000000..2ddae45
--- /dev/null
+++ b/asciidoc/tutorial/log/dependence-depending-2.txt
@@ -0,0 +1,40 @@
+[ivy@apache:/ivy/dependence/depender]$ ant
+Buildfile: /ivy/dependence/depender/build.xml
+
+clean:
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#depender;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found org.apache#dependee;2 in projects
+[ivy:retrieve] [2] org.apache#dependee;latest.integration
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
+[ivy:retrieve] downloading /ivy/dependence/settings/repository/dependee-2.jar ...
+[ivy:retrieve] .. (1kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache#dependee;2!dependee.jar (3ms)
+[ivy:retrieve] :: resolution report :: resolve 80ms :: artifacts dl 6ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 2 | 1 | 1 | 0 || 2 | 1 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#depender
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/5ms)
+
+compile:
+ [mkdir] Created dir: /ivy/dependence/depender/build/classes
+ [javac] Compiling 1 source file to /ivy/dependence/depender/build/classes
+
+run:
+ [java] you are using version 1 of class standalone.Main
+ [java] standard message : i am depending.Main and standalone.Main will do the job for me
+ [java] [standalone.Main] capitalizing string "i am depending.Main and standalone.Main will do the job for me" using org.apache.commons.lang.WordUtils
+ [java] capitalized message : I Am Depending.main And Standalone.main Will Do The Job For Me
+
+BUILD SUCCESSFUL
+Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/dependence-depending.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-depending.txt b/asciidoc/tutorial/log/dependence-depending.txt
new file mode 100644
index 0000000..8e2fdbb
--- /dev/null
+++ b/asciidoc/tutorial/log/dependence-depending.txt
@@ -0,0 +1,40 @@
+[ivy@apache:/ivy/dependence/depender]$ ant
+Buildfile: /ivy/dependence/depender/build.xml
+
+clean:
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#depender;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found org.apache#dependee;1 in projects
+[ivy:retrieve] [1] org.apache#dependee;latest.integration
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
+[ivy:retrieve] downloading /ivy/dependence/settings/repository/dependee-1.jar ...
+[ivy:retrieve] .. (1kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.apache#dependee;1!dependee.jar (3ms)
+[ivy:retrieve] :: resolution report :: resolve 75ms :: artifacts dl 6ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 2 | 1 | 1 | 0 || 2 | 1 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#depender
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/7ms)
+
+compile:
+ [mkdir] Created dir: /ivy/dependence/depender/build/classes
+ [javac] Compiling 1 source file to /ivy/dependence/depender/build/classes
+
+run:
+ [java] you are using version 1 of class standalone.Main
+ [java] standard message : i am depending.Main and standalone.Main will do the job for me
+ [java] [standalone.Main] capitalizing string "i am depending.Main and standalone.Main will do the job for me" using org.apache.commons.lang.WordUtils
+ [java] capitalized message : I Am Depending.main And Standalone.main Will Do The Job For Me
+
+BUILD SUCCESSFUL
+Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/dependence-standalone-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-standalone-2.txt b/asciidoc/tutorial/log/dependence-standalone-2.txt
new file mode 100644
index 0000000..c09baa2
--- /dev/null
+++ b/asciidoc/tutorial/log/dependence-standalone-2.txt
@@ -0,0 +1,36 @@
+[ivy@apache:/ivy/dependence/dependee]$ ant publish
+Buildfile: /ivy/dependence/dependee/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#dependee;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
+[ivy:retrieve] :: resolution report :: resolve 79ms :: artifacts dl 2ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 1 | 0 | 0 | 0 || 1 | 0 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#dependee
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 0 artifacts copied, 1 already retrieved (0kB/3ms)
+
+compile:
+
+jar:
+[propertyfile] Updating property file: /ivy/dependence/dependee/build/classes/version.properties
+
+publish:
+ [delete] Deleting: /ivy/dependence/dependee/build/ivy.xml
+[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 2 :: release :: Thu Jun 15 16:46:29 IST 2017
+[ivy:publish] delivering ivy file to /ivy/dependence/dependee/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache#dependee
+[ivy:publish] published dependee to /ivy/dependence/settings/repository/dependee-2.jar
+[ivy:publish] published ivy to /ivy/dependence/settings/repository/dependee-2.xml
+ [echo] project dependee released with version 2
+
+BUILD SUCCESSFUL
+Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/dependence-standalone.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-standalone.txt b/asciidoc/tutorial/log/dependence-standalone.txt
new file mode 100644
index 0000000..0fbdafa
--- /dev/null
+++ b/asciidoc/tutorial/log/dependence-standalone.txt
@@ -0,0 +1,43 @@
+[ivy@apache:/ivy/dependence/dependee]$ ant publish
+Buildfile: /ivy/dependence/dependee/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#dependee;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
+[ivy:retrieve] ......................
+[ivy:retrieve] ....... (277kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (3127ms)
+[ivy:retrieve] :: resolution report :: resolve 1426ms :: artifacts dl 3129ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 1 | 1 | 0 | 0 || 1 | 1 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#dependee
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 1 artifacts copied, 0 already retrieved (277kB/5ms)
+
+compile:
+ [mkdir] Created dir: /ivy/dependence/dependee/build/classes
+ [javac] Compiling 1 source file to /ivy/dependence/dependee/build/classes
+
+jar:
+[propertyfile] Creating new property file: /ivy/dependence/dependee/build/classes/version.properties
+ [jar] Building jar: /ivy/dependence/dependee/build/dependee.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 1 :: release :: Thu Jun 15 16:46:27 IST 2017
+[ivy:publish] delivering ivy file to /ivy/dependence/dependee/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache#dependee
+[ivy:publish] published dependee to /ivy/dependence/settings/repository/dependee-1.jar
+[ivy:publish] published ivy to /ivy/dependence/settings/repository/dependee-1.xml
+ [echo] project dependee released with version 1
+
+BUILD SUCCESSFUL
+Total time: 5 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/dual.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dual.txt b/asciidoc/tutorial/log/dual.txt
new file mode 100644
index 0000000..518ee57
--- /dev/null
+++ b/asciidoc/tutorial/log/dual.txt
@@ -0,0 +1,48 @@
+[ivy@apache:/ivy/dual/project]$ ant
+Buildfile: /ivy/dual/project/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: file = /ivy/dual/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found commons-httpclient#commons-httpclient;2.0.2 in ivys
+[ivy:retrieve] found commons-logging#commons-logging;1.0.4 in ibiblio
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in ibiblio
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar ...
+[ivy:retrieve] .......................
+[ivy:retrieve] .. (220kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-httpclient#commons-httpclient;2.0.2!commons-httpclient.jar (3081ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
+[ivy:retrieve] ............................. (277kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2464ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar ...
+[ivy:retrieve] ................ (37kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1290ms)
+[ivy:retrieve] :: resolution report :: resolve 2211ms :: artifacts dl 6841ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 3 | 3 | 1 | 0 || 3 | 3 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 3 artifacts copied, 0 already retrieved (534kB/14ms)
+
+run:
+ [mkdir] Created dir: /ivy/dual/project/build
+ [javac] Compiling 1 source file to /ivy/dual/project/build
+ [java] standard message : Hello Ivy!
+ [java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy!
+ [java] Jun 15, 2017 4:46:21 PM org.apache.commons.httpclient.HttpMethodBase processRedirectResponse
+ [java] WARNING: Redirect from protocol http to https is not supported
+ [java] head status code with httpclient: 301
+ [java] now check if httpclient dependency on commons-logging has been realized
+ [java] found logging class in classpath: interface org.apache.commons.logging.Log
+
+BUILD SUCCESSFUL
+Total time: 13 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/hello-ivy-1.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/hello-ivy-1.txt b/asciidoc/tutorial/log/hello-ivy-1.txt
new file mode 100644
index 0000000..9e7ca67
--- /dev/null
+++ b/asciidoc/tutorial/log/hello-ivy-1.txt
@@ -0,0 +1,69 @@
+[ivy@apache:/ivy/hello-ivy]$ ant
+Buildfile: /ivy/hello-ivy/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in public
+[ivy:retrieve] found junit#junit;3.8.1 in public
+[ivy:retrieve] found commons-cli#commons-cli;1.4 in public
+[ivy:retrieve] found junit#junit;4.12 in public
+[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar ...
+[ivy:retrieve] ....................................
+[ivy:retrieve] ...............................
+[ivy:retrieve] .......................................
+[ivy:retrieve] ..... (1585kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(javadoc) (5831ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
+[ivy:retrieve] ............................. (277kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (1834ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar ...
+[ivy:retrieve] .................................. (364kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(source) (1746ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
+[ivy:retrieve] ............... (52kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1105ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4-sources.jar ...
+[ivy:retrieve] ............... (61kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(source) (1240ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4-javadoc.jar ...
+[ivy:retrieve] ...................... (174kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(javadoc) (1434ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar ...
+[ivy:retrieve] ............................... (307kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (1739ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...
+[ivy:retrieve] .............. (43kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1227ms)
+[ivy:retrieve] :: resolution report :: resolve 23372ms :: artifacts dl 16165ms
+[ivy:retrieve] :: evicted modules:
+[ivy:retrieve] junit#junit;3.8.1 by [junit#junit;4.12] in [default]
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 5 | 5 | 5 | 1 || 8 | 8 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 8 artifacts copied, 0 already retrieved (2868kB/12ms)
+
+run:
+ [mkdir] Created dir: /ivy/hello-ivy/build
+ [javac] Compiling 1 source file to /ivy/hello-ivy/build
+ [java] standard message : hello ivy !
+ [java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy !
+
+BUILD SUCCESSFUL
+Total time: 40 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/hello-ivy-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/hello-ivy-2.txt b/asciidoc/tutorial/log/hello-ivy-2.txt
new file mode 100644
index 0000000..4e012a6
--- /dev/null
+++ b/asciidoc/tutorial/log/hello-ivy-2.txt
@@ -0,0 +1,32 @@
+[ivy@apache:/ivy/hello-ivy]$ ant
+Buildfile: /ivy/hello-ivy/build.xml
+
+resolve:
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] found commons-lang#commons-lang;2.6 in public
+[ivy:retrieve] found junit#junit;3.8.1 in public
+[ivy:retrieve] found commons-cli#commons-cli;1.4 in public
+[ivy:retrieve] found junit#junit;4.12 in public
+[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
+[ivy:retrieve] :: resolution report :: resolve 139ms :: artifacts dl 8ms
+[ivy:retrieve] :: evicted modules:
+[ivy:retrieve] junit#junit;3.8.1 by [junit#junit;4.12] in [default]
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 5 | 0 | 0 | 1 || 8 | 0 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 0 artifacts copied, 8 already retrieved (0kB/4ms)
+
+run:
+ [java] standard message : hello ivy !
+ [java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy !
+
+BUILD SUCCESSFUL
+Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/install-deps.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install-deps.txt b/asciidoc/tutorial/log/install-deps.txt
new file mode 100644
index 0000000..1427e5e
--- /dev/null
+++ b/asciidoc/tutorial/log/install-deps.txt
@@ -0,0 +1,249 @@
+[ivy@apache:/ivy/build-a-ivy-repository]$ ant maven2-deps
+Buildfile: /ivy/build-a-ivy-repository/build.xml
+
+load-ivy:
+
+init-ivy:
+
+maven2-deps:
+[ivy:install] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-basic.xml
+[ivy:install] :: installing org.hibernate#hibernate;3.2.5.ga ::
+[ivy:install] :: resolving dependencies ::
+[ivy:install] found org.hibernate#hibernate;3.2.5.ga in libraries
+[ivy:install] found net.sf.ehcache#ehcache;1.2.3 in libraries
+[ivy:install] found commons-logging#commons-logging;1.0.4 in libraries
+[ivy:install] found commons-collections#commons-collections;2.1 in libraries
+[ivy:install] found javax.transaction#jta;1.0.1B in libraries
+[ivy:install] found asm#asm-attrs;1.5.3 in libraries
+[ivy:install] found dom4j#dom4j;1.6.1 in libraries
+[ivy:install] found antlr#antlr;2.7.6 in libraries
+[ivy:install] found cglib#cglib;2.1_3 in libraries
+[ivy:install] found asm#asm;1.5.3 in libraries
+[ivy:install] found commons-collections#commons-collections;2.1.1 in libraries
+[ivy:install] found ant#ant;1.6.5 in libraries
+[ivy:install] found swarmcache#swarmcache;1.0RC2 in libraries
+[ivy:install] found commons-logging#commons-logging;1.0.2 in libraries
+[ivy:install] found jgroups#jgroups-all;2.2.8 in libraries
+[ivy:install] found jboss#jboss-cache;1.2.2 in libraries
+[ivy:install] found jboss#jboss-system;4.0.2 in libraries
+[ivy:install] found jboss#jboss-common;4.0.2 in libraries
+[ivy:install] found slide#webdavlib;2.0 in libraries
+[ivy:install] found xerces#xercesImpl;2.6.2 in libraries
+[ivy:install] found jboss#jboss-minimal;4.0.2 in libraries
+[ivy:install] found jboss#jboss-j2se;200504122039 in libraries
+[ivy:install] found concurrent#concurrent;1.3.4 in libraries
+[ivy:install] found jgroups#jgroups-all;2.2.7 in libraries
+[ivy:install] found c3p0#c3p0;0.9.1 in libraries
+[ivy:install] found javax.security#jacc;1.0 in libraries
+[ivy:install] found opensymphony#oscache;2.1 in libraries
+[ivy:install] found proxool#proxool;0.8.3 in libraries
+[ivy:install] :: downloading artifacts to cache ::
+[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-sources.jar ...
+[ivy:install] ...........................
+[ivy:install] ......................
+[ivy:install] ...........................
+[ivy:install] .......................
+[ivy:install] ..... (1470kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(source) (7476ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga.jar ...
+[ivy:install] ..........................................
+[ivy:install] ..............................
+[ivy:install] ................................
+[ivy:install] ..................................
+[ivy:install] ............ (2202kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar (7618ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-javadoc.jar ...
+[ivy:install] .....................................................................................................................................................
+[ivy:install] ...........................................................................
+[ivy:install] ..................................................................................................................
+[ivy:install] ................................................................................................
+[ivy:install] .............................................................................................................................
+[ivy:install] ... (7352kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(javadoc) (8997ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar ...
+[ivy:install] ........................ (203kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] net.sf.ehcache#ehcache;1.2.3!ehcache.jar (1500ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar ...
+[ivy:install] ................ (37kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1320ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar ...
+[ivy:install] ........ (16kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] asm#asm-attrs;1.5.3!asm-attrs.jar (1339ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar ...
+[ivy:install] ............................... (306kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] dom4j#dom4j;1.6.1!dom4j.jar (1435ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6.jar ...
+[ivy:install] ....................................... (433kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] antlr#antlr;2.7.6!antlr.jar (1640ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/cglib/cglib/2.1_3/cglib-2.1_3.jar ...
+[ivy:install] ............................. (275kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] cglib#cglib;2.1_3!cglib.jar (1534ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/asm/asm/1.5.3/asm-1.5.3.jar ...
+[ivy:install] ........... (25kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] asm#asm;1.5.3!asm.jar (1226ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar ...
+[ivy:install] ....................... (171kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1.1!commons-collections.jar (1313ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.jar ...
+[ivy:install] ...................... (161kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1!commons-collections.jar (1348ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar ...
+[ivy:install] ............................................................................ (1009kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] ant#ant;1.6.5!ant.jar (2154ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/swarmcache/swarmcache/1.0RC2/swarmcache-1.0RC2.jar ...
+[ivy:install] ............. (29kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] swarmcache#swarmcache;1.0RC2!swarmcache.jar (1223ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-cache/1.2.2/jboss-cache-1.2.2.jar ...
+[ivy:install] .................................. (365kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-cache;1.2.2!jboss-cache.jar (1413ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jgroups/jgroups-all/2.2.8/jgroups-all-2.2.8.jar ...
+[ivy:install] .............................................................................................................. (1573kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.8!jgroups-all.jar (2277ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar ...
+[ivy:install] ................................................. (594kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] c3p0#c3p0;0.9.1!c3p0.jar (1637ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/opensymphony/oscache/2.1/oscache-2.1.jar ...
+[ivy:install] ................... (111kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] opensymphony#oscache;2.1!oscache.jar (1303ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/proxool/proxool/0.8.3/proxool-0.8.3.jar ...
+[ivy:install] ......................................... (464kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] proxool#proxool;0.8.3!proxool.jar (1562ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar ...
+[ivy:install] ........... (25kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.2!commons-logging.jar (1223ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-system/4.0.2/jboss-system-4.0.2.jar ...
+[ivy:install] .......................... (227kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-system;4.0.2!jboss-system.jar (1438ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-common/4.0.2/jboss-common-4.0.2.jar ...
+[ivy:install] ........................................ (457kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-common;4.0.2!jboss-common.jar (1537ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-minimal/4.0.2/jboss-minimal-4.0.2.jar ...
+[ivy:install] ...................... (163kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-minimal;4.0.2!jboss-minimal.jar (1533ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-j2se/200504122039/jboss-j2se-200504122039.jar ...
+[ivy:install] .................................. (350kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-j2se;200504122039!jboss-j2se.jar (1435ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar ...
+[ivy:install] ....................... (184kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] concurrent#concurrent;1.3.4!concurrent.jar (1310ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/jgroups/jgroups-all/2.2.7/jgroups-all-2.2.7.jar ...
+[ivy:install] .................................................................................................................. (1613kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.7!jgroups-all.jar (2689ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/slide/webdavlib/2.0/webdavlib-2.0.jar ...
+[ivy:install] .................... (128kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] slide#webdavlib;2.0!webdavlib.jar (1321ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar ...
+[ivy:install] ......................................................................... (986kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] xerces#xercesImpl;2.6.2!xercesImpl.jar (1914ms)
+[ivy:install] :: installing in my-repository ::
+[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar
+[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar
+[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml
+[ivy:install] published ehcache to /ivy/build-a-ivy-repository/myrepository/no-namespace/net.sf.ehcache/ehcache/jars/ehcache-1.2.3.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/net.sf.ehcache/ehcache/ivys/ivy-1.2.3.xml
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/javax.transaction/jta/ivys/ivy-1.0.1B.xml
+[ivy:install] published commons-logging to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/jars/commons-logging-1.0.4.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/ivys/ivy-1.0.4.xml
+[ivy:install] published asm-attrs to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm-attrs/jars/asm-attrs-1.5.3.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm-attrs/ivys/ivy-1.5.3.xml
+[ivy:install] published dom4j to /ivy/build-a-ivy-repository/myrepository/no-namespace/dom4j/dom4j/jars/dom4j-1.6.1.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/dom4j/dom4j/ivys/ivy-1.6.1.xml
+[ivy:install] published antlr to /ivy/build-a-ivy-repository/myrepository/no-namespace/antlr/antlr/jars/antlr-2.7.6.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/antlr/antlr/ivys/ivy-2.7.6.xml
+[ivy:install] published cglib to /ivy/build-a-ivy-repository/myrepository/no-namespace/cglib/cglib/jars/cglib-2.1_3.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/cglib/cglib/ivys/ivy-2.1_3.xml
+[ivy:install] published asm to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm/jars/asm-1.5.3.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm/ivys/ivy-1.5.3.xml
+[ivy:install] published commons-collections to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/jars/commons-collections-2.1.1.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/ivys/ivy-2.1.1.xml
+[ivy:install] published commons-collections to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/jars/commons-collections-2.1.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/ivys/ivy-2.1.xml
+[ivy:install] published ant to /ivy/build-a-ivy-repository/myrepository/no-namespace/ant/ant/jars/ant-1.6.5.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/ant/ant/ivys/ivy-1.6.5.xml
+[ivy:install] published swarmcache to /ivy/build-a-ivy-repository/myrepository/no-namespace/swarmcache/swarmcache/jars/swarmcache-1.0RC2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/swarmcache/swarmcache/ivys/ivy-1.0RC2.xml
+[ivy:install] published jboss-cache to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-cache/jars/jboss-cache-1.2.2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-cache/ivys/ivy-1.2.2.xml
+[ivy:install] published jgroups-all to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/jars/jgroups-all-2.2.8.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/ivys/ivy-2.2.8.xml
+[ivy:install] published c3p0 to /ivy/build-a-ivy-repository/myrepository/no-namespace/c3p0/c3p0/jars/c3p0-0.9.1.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/c3p0/c3p0/ivys/ivy-0.9.1.xml
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/javax.security/jacc/ivys/ivy-1.0.xml
+[ivy:install] published oscache to /ivy/build-a-ivy-repository/myrepository/no-namespace/opensymphony/oscache/jars/oscache-2.1.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/opensymphony/oscache/ivys/ivy-2.1.xml
+[ivy:install] published proxool to /ivy/build-a-ivy-repository/myrepository/no-namespace/proxool/proxool/jars/proxool-0.8.3.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/proxool/proxool/ivys/ivy-0.8.3.xml
+[ivy:install] published commons-logging to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/jars/commons-logging-1.0.2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/ivys/ivy-1.0.2.xml
+[ivy:install] published jboss-system to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-system/jars/jboss-system-4.0.2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-system/ivys/ivy-4.0.2.xml
+[ivy:install] published jboss-common to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-common/jars/jboss-common-4.0.2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-common/ivys/ivy-4.0.2.xml
+[ivy:install] published jboss-minimal to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-minimal/jars/jboss-minimal-4.0.2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-minimal/ivys/ivy-4.0.2.xml
+[ivy:install] published jboss-j2se to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-j2se/jars/jboss-j2se-200504122039.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-j2se/ivys/ivy-200504122039.xml
+[ivy:install] published concurrent to /ivy/build-a-ivy-repository/myrepository/no-namespace/concurrent/concurrent/jars/concurrent-1.3.4.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/concurrent/concurrent/ivys/ivy-1.3.4.xml
+[ivy:install] published jgroups-all to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/jars/jgroups-all-2.2.7.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/ivys/ivy-2.2.7.xml
+[ivy:install] published webdavlib to /ivy/build-a-ivy-repository/myrepository/no-namespace/slide/webdavlib/jars/webdavlib-2.0.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/slide/webdavlib/ivys/ivy-2.0.xml
+[ivy:install] published xercesImpl to /ivy/build-a-ivy-repository/myrepository/no-namespace/xerces/xercesImpl/jars/xercesImpl-2.6.2.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/xerces/xercesImpl/ivys/ivy-2.6.2.xml
+[ivy:install] :: install resolution report ::
+[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 62734ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 28 | 28 | 28 | 0 || 30 | 28 |
+ ---------------------------------------------------------------------
+[ivy:install]
+[ivy:install] :: problems summary ::
+[ivy:install] :::: WARNINGS
+[ivy:install] [NOT FOUND ] javax.transaction#jta;1.0.1B!jta.jar (0ms)
+[ivy:install] ==== libraries: tried
+[ivy:install] https://repo1.maven.org/maven2/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar
+[ivy:install] [NOT FOUND ] javax.security#jacc;1.0!jacc.jar (0ms)
+[ivy:install] ==== libraries: tried
+[ivy:install] https://repo1.maven.org/maven2/javax/security/jacc/1.0/jacc-1.0.jar
+[ivy:install] ::::::::::::::::::::::::::::::::::::::::::::::
+[ivy:install] :: FAILED DOWNLOADS ::
+[ivy:install] :: ^ see resolution messages for details ^ ::
+[ivy:install] ::::::::::::::::::::::::::::::::::::::::::::::
+[ivy:install] :: javax.transaction#jta;1.0.1B!jta.jar
+[ivy:install] :: javax.security#jacc;1.0!jacc.jar
+[ivy:install] ::::::::::::::::::::::::::::::::::::::::::::::
+[ivy:install]
+[ivy:install] :: USE VERBOSE OR DEBUG MESSAGE LEVEL FOR MORE DETAILS
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/install-namespace.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install-namespace.txt b/asciidoc/tutorial/log/install-namespace.txt
new file mode 100644
index 0000000..b9a222b
--- /dev/null
+++ b/asciidoc/tutorial/log/install-namespace.txt
@@ -0,0 +1,37 @@
+[ivy@apache:/ivy/build-a-ivy-repository]$ ant maven2-namespace
+Buildfile: /ivy/build-a-ivy-repository/build.xml
+
+load-ivy:
+
+init-ivy:
+
+maven2-namespace:
+[ivy:install] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-advanced.xml
+[ivy:install] :: installing apache#commons-lang;1.0 ::
+[ivy:install] :: resolving dependencies ::
+[ivy:install] found apache#commons-lang;1.0 in libraries
+[ivy:install] :: downloading artifacts to cache ::
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0.jar ...
+[ivy:install] ............... (62kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar (2032ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
+[ivy:install] ...................... (170kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar(javadoc) (2254ms)
+[ivy:install] :: installing in my-repository ::
+[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar
+[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml
+[ivy:install] :: install resolution report ::
+[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 4288ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 1 | 1 | 1 | 0 || 2 | 2 |
+ ---------------------------------------------------------------------
+
+BUILD SUCCESSFUL
+Total time: 9 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/install.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install.txt b/asciidoc/tutorial/log/install.txt
new file mode 100644
index 0000000..d4fabc3
--- /dev/null
+++ b/asciidoc/tutorial/log/install.txt
@@ -0,0 +1,37 @@
+[ivy@apache:/ivy/build-a-ivy-repository]$ ant maven2
+Buildfile: /ivy/build-a-ivy-repository/build.xml
+
+load-ivy:
+
+init-ivy:
+
+maven2:
+[ivy:install] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-basic.xml
+[ivy:install] :: installing commons-lang#commons-lang;1.0 ::
+[ivy:install] :: resolving dependencies ::
+[ivy:install] found commons-lang#commons-lang;1.0 in libraries
+[ivy:install] :: downloading artifacts to cache ::
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
+[ivy:install] ...................... (170kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar(javadoc) (2255ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0.jar ...
+[ivy:install] ............... (62kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar (1413ms)
+[ivy:install] :: installing in my-repository ::
+[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar
+[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar
+[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml
+[ivy:install] :: install resolution report ::
+[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 3670ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 1 | 1 | 1 | 0 || 2 | 2 |
+ ---------------------------------------------------------------------
+
+BUILD SUCCESSFUL
+Total time: 8 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/multi-project-find-antp.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-find-antp.txt b/asciidoc/tutorial/log/multi-project-find-antp.txt
new file mode 100644
index 0000000..d3a0883
--- /dev/null
+++ b/asciidoc/tutorial/log/multi-project-find-antp.txt
@@ -0,0 +1,17 @@
+[ivy@apache:/ivy/multi-project/projects/find]$ ant -p
+Buildfile: /ivy/multi-project/projects/find/build.xml
+
+Main targets:
+
+ clean --> clean the project
+ clean-build --> clean the project built files
+ clean-lib --> clean the project libraries directory (dependencies)
+ clean-local --> cleans the local repository for the current module
+ compile --> compile the project
+ jar --> make a jar file for this project
+ publish --> publish this project in the ivy repository
+ publish-local --> publish this project in the local ivy repository
+ report --> generates a report of dependencies
+ resolve --> resolve and retrieve dependencies with ivy
+ run --> compile and run the project
+Default target: compile
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/multi-project-general-antp.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-general-antp.txt b/asciidoc/tutorial/log/multi-project-general-antp.txt
new file mode 100644
index 0000000..6ed2034
--- /dev/null
+++ b/asciidoc/tutorial/log/multi-project-general-antp.txt
@@ -0,0 +1,8 @@
+[ivy@apache:/ivy/multi-project]$ ant -p
+Buildfile: /ivy/multi-project/build.xml
+
+Main targets:
+
+ clean clean tutorial: delete repository, ivy cache, and all projects
+ clean-all clean all projects
+ publish-all compile, jar and publish all projects in the right order
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/multi-project-general-publishall.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-general-publishall.txt b/asciidoc/tutorial/log/multi-project-general-publishall.txt
new file mode 100644
index 0000000..b05fbce
--- /dev/null
+++ b/asciidoc/tutorial/log/multi-project-general-publishall.txt
@@ -0,0 +1,337 @@
+[ivy@apache:/ivy/multi-project]$ ant publish-all
+Buildfile: /ivy/multi-project/build.xml
+
+load-ivy:
+
+buildlist:
+[ivy:buildlist] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:buildlist] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+publish-all:
+
+clean-build:
+
+load-ivy:
+
+ivy-new-version:
+ [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+version:
+ [mkdir] Created dir: /ivy/multi-project/projects/version/build/classes
+
+clean-lib:
+
+resolve:
+ [mkdir] Created dir: /ivy/multi-project/projects/version/lib
+[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#version;working@apache
+[ivy:resolve] confs: [default]
+[ivy:resolve] :: resolution report :: resolve 18ms :: artifacts dl 0ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 0 | 0 | 0 | 0 || 0 | 0 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache.ivy.example#version
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 0 artifacts copied, 0 already retrieved (0kB/2ms)
+
+compile:
+ [javac] Compiling 1 source file to /ivy/multi-project/projects/version/build/classes
+
+jar:
+ [jar] Building jar: /ivy/multi-project/projects/version/build/version.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache.ivy.example#version;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:49:36 IST 2017
+[ivy:publish] delivering ivy file to /ivy/multi-project/projects/version/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache.ivy.example#version
+[ivy:publish] published version to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part/jars/version.jar
+[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part
+[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1
+ [echo] project version released with version 1.0-dev-b1
+
+clean-build:
+
+load-ivy:
+
+ivy-new-version:
+ [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+version:
+ [mkdir] Created dir: /ivy/multi-project/projects/list/build/classes
+
+clean-lib:
+
+resolve:
+ [mkdir] Created dir: /ivy/multi-project/projects/list/lib
+[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#list;working@apache
+[ivy:resolve] confs: [core, standalone]
+[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
+[ivy:resolve] found commons-cli#commons-cli;1.4 in public
+[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1/jars/version.jar ...
+[ivy:resolve] .. (1kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#version;1.0-dev-b1!version.jar (3ms)
+[ivy:resolve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
+[ivy:resolve] ............... (52kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1826ms)
+[ivy:resolve] :: resolution report :: resolve 9015ms :: artifacts dl 1830ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | core | 1 | 1 | 1 | 0 || 1 | 1 |
+ | standalone | 2 | 2 | 2 | 0 || 2 | 2 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache.ivy.example#list
+[ivy:retrieve] confs: [core, standalone]
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (54kB/4ms)
+
+compile:
+ [javac] Compiling 2 source files to /ivy/multi-project/projects/list/build/classes
+
+jar:
+ [jar] Building jar: /ivy/multi-project/projects/list/build/list.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache.ivy.example#list;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:49:48 IST 2017
+[ivy:publish] delivering ivy file to /ivy/multi-project/projects/list/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache.ivy.example#list
+[ivy:publish] published list to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part/jars/list.jar
+[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part
+[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1
+ [echo] project list released with version 1.0-dev-b1
+
+clean-build:
+
+load-ivy:
+
+ivy-new-version:
+ [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+version:
+ [mkdir] Created dir: /ivy/multi-project/projects/find/build/classes
+
+clean-lib:
+
+resolve:
+ [mkdir] Created dir: /ivy/multi-project/projects/find/lib
+[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#find;working@apache
+[ivy:resolve] confs: [core, standalone]
+[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
+[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
+[ivy:resolve] found org.apache.commons#commons-collections4;4.1 in public
+[ivy:resolve] found commons-cli#commons-cli;1.4 in public
+[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1/jars/list.jar ...
+[ivy:resolve] .. (2kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#list;1.0-dev-b1!list.jar (2ms)
+[ivy:resolve] downloading https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar ...
+[ivy:resolve] ............................
+[ivy:resolve] ......................
+[ivy:resolve] ........ (733kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (4794ms)
+[ivy:resolve] :: resolution report :: resolve 9842ms :: artifacts dl 4799ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | core | 3 | 3 | 2 | 0 || 3 | 2 |
+ | standalone | 4 | 3 | 2 | 0 || 4 | 2 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache.ivy.example#find
+[ivy:retrieve] confs: [core, standalone]
+[ivy:retrieve] 4 artifacts copied, 0 already retrieved (790kB/6ms)
+
+compile:
+ [javac] Compiling 2 source files to /ivy/multi-project/projects/find/build/classes
+
+jar:
+ [jar] Building jar: /ivy/multi-project/projects/find/build/find.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache.ivy.example#find;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:04 IST 2017
+[ivy:publish] delivering ivy file to /ivy/multi-project/projects/find/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache.ivy.example#find
+[ivy:publish] published find to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part/jars/find.jar
+[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part
+[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1
+ [echo] project find released with version 1.0-dev-b1
+
+clean-build:
+
+load-ivy:
+
+ivy-new-version:
+ [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+version:
+ [mkdir] Created dir: /ivy/multi-project/projects/size/build/classes
+
+clean-lib:
+
+resolve:
+ [mkdir] Created dir: /ivy/multi-project/projects/size/lib
+[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#size;working@apache
+[ivy:resolve] confs: [default]
+[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
+[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
+[ivy:resolve] :: resolution report :: resolve 2045ms :: artifacts dl 1ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 2 | 2 | 0 | 0 || 2 | 0 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache.ivy.example#size
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (4kB/2ms)
+
+compile:
+ [javac] Compiling 1 source file to /ivy/multi-project/projects/size/build/classes
+
+jar:
+ [jar] Building jar: /ivy/multi-project/projects/size/build/size.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache.ivy.example#size;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:08 IST 2017
+[ivy:publish] delivering ivy file to /ivy/multi-project/projects/size/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache.ivy.example#size
+[ivy:publish] published size to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part/jars/size.jar
+[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part
+[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1
+ [echo] project size released with version 1.0-dev-b1
+
+clean-build:
+
+load-ivy:
+
+ivy-new-version:
+ [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+version:
+ [mkdir] Created dir: /ivy/multi-project/projects/sizewhere/build/classes
+
+clean-lib:
+
+resolve:
+ [mkdir] Created dir: /ivy/multi-project/projects/sizewhere/lib
+[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#sizewhere;working@apache
+[ivy:resolve] confs: [core, standalone]
+[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
+[ivy:resolve] found org.apache.ivy.example#size;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#size;latest.integration
+[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
+[ivy:resolve] found org.apache.ivy.example#find;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#find;latest.integration
+[ivy:resolve] found org.apache.commons#commons-collections4;4.1 in public
+[ivy:resolve] found commons-cli#commons-cli;1.4 in public
+[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1/jars/size.jar ...
+[ivy:resolve] .. (1kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#size;1.0-dev-b1!size.jar (2ms)
+[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1/jars/find.jar ...
+[ivy:resolve] .. (3kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#find;1.0-dev-b1!find.jar (2ms)
+[ivy:resolve] :: resolution report :: resolve 3198ms :: artifacts dl 5ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | core | 5 | 3 | 2 | 0 || 5 | 2 |
+ | standalone | 6 | 3 | 2 | 0 || 6 | 2 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache.ivy.example#sizewhere
+[ivy:retrieve] confs: [core, standalone]
+[ivy:retrieve] 6 artifacts copied, 0 already retrieved (795kB/6ms)
+
+compile:
+ [javac] Compiling 2 source files to /ivy/multi-project/projects/sizewhere/build/classes
+
+jar:
+ [jar] Building jar: /ivy/multi-project/projects/sizewhere/build/sizewhere.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache.ivy.example#sizewhere;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:12 IST 2017
+[ivy:publish] delivering ivy file to /ivy/multi-project/projects/sizewhere/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache.ivy.example#sizewhere
+[ivy:publish] published sizewhere to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part/jars/sizewhere.jar
+[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part
+[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1
+ [echo] project sizewhere released with version 1.0-dev-b1
+
+clean-build:
+
+load-ivy:
+
+ivy-new-version:
+ [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
+
+version:
+ [mkdir] Created dir: /ivy/multi-project/projects/console/build/classes
+
+clean-lib:
+
+resolve:
+ [mkdir] Created dir: /ivy/multi-project/projects/console/lib
+[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#console;working@apache
+[ivy:resolve] confs: [default]
+[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
+[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
+[ivy:resolve] found commons-cli#commons-cli;1.4 in public
+[ivy:resolve] found org.apache.ivy.example#find;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#find;latest.integration
+[ivy:resolve] found org.apache.commons#commons-collections4;4.1 in public
+[ivy:resolve] found org.apache.ivy.example#sizewhere;1.0-dev-b1 in shared
+[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#sizewhere;latest.integration
+[ivy:resolve] found org.apache.ivy.example#size;1.0-dev-b1 in shared
+[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1/jars/sizewhere.jar ...
+[ivy:resolve] .. (2kB)
+[ivy:resolve] .. (0kB)
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#sizewhere;1.0-dev-b1!sizewhere.jar (2ms)
+[ivy:resolve] :: resolution report :: resolve 4611ms :: artifacts dl 7ms
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 7 | 4 | 1 | 0 || 7 | 1 |
+ ---------------------------------------------------------------------
+[ivy:retrieve] :: retrieving :: org.apache.ivy.example#console
+[ivy:retrieve] confs: [default]
+[ivy:retrieve] 7 artifacts copied, 0 already retrieved (798kB/5ms)
+
+compile:
+ [javac] Compiling 1 source file to /ivy/multi-project/projects/console/build/classes
+
+jar:
+ [jar] Building jar: /ivy/multi-project/projects/console/build/console.jar
+
+publish:
+[ivy:publish] :: delivering :: org.apache.ivy.example#console;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:19 IST 2017
+[ivy:publish] delivering ivy file to /ivy/multi-project/projects/console/build/ivy.xml
+[ivy:publish] :: publishing :: org.apache.ivy.example#console
+[ivy:publish] published console to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part/jars/console.jar
+[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part/ivys/ivy.xml
+[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part
+[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1
+ [echo] project console released with version 1.0-dev-b1
+
+BUILD SUCCESSFUL
+Total time: 46 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/myrepository-content-deps.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/myrepository-content-deps.txt b/asciidoc/tutorial/log/myrepository-content-deps.txt
new file mode 100644
index 0000000..ce37429
--- /dev/null
+++ b/asciidoc/tutorial/log/myrepository-content-deps.txt
@@ -0,0 +1,13 @@
+[ivy@apache:/]$ find /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate -type f -print
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml.sha1
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar.sha1
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar.sha1
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar.sha1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/myrepository-content-namespace.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/myrepository-content-namespace.txt b/asciidoc/tutorial/log/myrepository-content-namespace.txt
new file mode 100644
index 0000000..1766f87
--- /dev/null
+++ b/asciidoc/tutorial/log/myrepository-content-namespace.txt
@@ -0,0 +1,10 @@
+$ find /ivy/build-a-ivy-repository/myrepository/advanced -type f -print
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml.md5
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml.sha1
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar.md5
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar.sha1
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar.md5
+/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar.sha1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/log/myrepository-content.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/myrepository-content.txt b/asciidoc/tutorial/log/myrepository-content.txt
new file mode 100644
index 0000000..39206c6
--- /dev/null
+++ b/asciidoc/tutorial/log/myrepository-content.txt
@@ -0,0 +1,10 @@
+[ivy@apache:/]$ find /ivy/build-a-ivy-repository/myrepository/no-namespace -type f -print
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml.sha1
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar.sha1
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar.md5
+/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar.sha1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/multiple.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/multiple.adoc b/asciidoc/tutorial/multiple.adoc
new file mode 100644
index 0000000..8e4e29f
--- /dev/null
+++ b/asciidoc/tutorial/multiple.adoc
@@ -0,0 +1,156 @@
+
+This tutorial is an example of how modules can be retrieved by multiple resolvers. Using multiple resolvers can be useful in many contexts. For example:
+
+
+* separating integration builds from releases +
+
+* using a public repository for third party modules and a private one for internal modules +
+
+* use a repository for storing modules which are not accurate in an unmanaged public repository +
+
+* use a local repository to expose builds made on one developer's station +
+
+
+In Ivy, the use of multiple resolvers is supported by a compound resolver called the chain resolver.
+
+In our example, we will simply show you how to use two resolvers, one on a local repository and one using the maven2 repository.
+
+
+== project description
+
+
+=== the project: chained-resolvers
+
+The project is very simple and contains only one simple class: example.Hello.
+
+It depends on two libraries: Apache's commons-lang and a custom library named test (sources are included in test-1.0jar file). The test library is used by the project to uppercase a string, and commons-lang is used to capitalize the same string.
+
+Here is the content of the project:
+
+
+* build.xml: the ant build file for the project +
+
+* ivy.xml: the Ivy project file +
+
+* src\example\Hello.java: the only class of the project +
+
+Let's have a look at the *ivy.xml* file:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org.apache" module="chained-resolvers"/>
+ <dependencies>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
+ <dependency name="test" rev="1.0"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+As we'd expect, the ivy file declares this module to be dependent on the two libraries it uses: 'commons-lang' and 'test'. Note that we didn't specify the org for the dependency 'test'. When we exclude org, Ivy assumes it is in the same org as the declaring module. (i.e. 'org.apache').
+
+
+=== the *ivy settings*
+
+The settings are defined in the ivysettings.xml file located in the settings directory of the project. Below are its contents, followed by an explanation of what it's doing.
+
+
+[source]
+----
+
+<ivysettings>
+ <settings defaultResolver="chain-example"/>
+ <resolvers>
+ <chain name="chain-example">
+ <filesystem name="libraries">
+ <artifact pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]" />
+ </filesystem>
+ <ibiblio name="ibiblio" m2compatible="true" />
+ </chain>
+ </resolvers>
+</ivysettings>
+
+----
+
+
+=== the *settings* tag
+
+This tag initializes Ivy with some parameters. Here only one parameter is set, the name of the resolver to use by default.
+
+
+=== the *resolvers* tag
+
+The resolvers section defines the list of resolvers that Ivy will use to locate artifacts. In our example, we have only one resolver named "chain-example", which is unique in that it defines a list (hence a chain) of resolvers.
+The resolvers in this chain are:
+
+
+* libraries : It is a filesystem resolver, so looks at a directory structure to retrieve the artifacts. This one is configured to look in the `repository` sub directory of the directory that contains the `ivysettings.xml` file. +
+
+* ibiblio : It looks in the ibiblio maven repository to retrieve the artifacts. +
+
+
+That's it, we have just configured a chain of resolvers!
+
+
+== walkthrough
+
+
+
+=== step 1: preparation
+
+Open a DOS or shell window, and go to the "chained-resolvers" directory.
+
+
+
+=== step 2: clean directory tree
+
+On the prompt type: ant
+
+This will clean up the entire project directory tree and Ivy cache. You can do this each time you want to clean up this example.
+
+
+[NOTE]
+====
+
+In almost all examples, we provide a clean target as default target. Since most examples use the same Ivy cache, you will clean the whole Ivy cache each time you call this target.
+
+Cleaning the Ivy cache is something you can do without fear (except performance): it's only a cache, so everything can be (and should be) obtained again from repositories. This may sound strange to those coming from maven 2 land. But remember that in Ivy, the cache is not a local repository and the two are completely isolated.
+
+====
+
+
+
+
+=== step 3: run the project
+
+Go to `chained-resolvers` project directory. And simply run `ant`.
+
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/chained-resolvers.txt[]
+
+----
+
+
+
+We can see in the log of the resolve task, that the two dependencies have been retrieved (2 artifacts) and copied to the Ivy cache directory (2 downloaded).
+
+Also notice that the 'run' Ant target succeeded in using both commons-lang.jar coming from the ibiblio repository and test.jar coming from the local repository.
+
+
+== Going further
+
+This very simple example helps us see how to set up two resolvers in a chain. The link:../resolver/chain.html[chain resolver's reference documentation] is available for those who would like to know all the features offered by this resolver.
+
+Below are a few more interesting things worth knowing about chain resolvers. After reading them, go ahead and try tweaking this example using your new wealth of knowledge!
+
+
+* a chain is not limited to two nested resolvers, you can use as many as you want +
+
+* by setting `returnFirst="true"`, you can have a chain which stops as soon as it has found a result for a given module +
+
+* by setting `dual="true"`, the full chain will be used both for module descriptors and artifacts, while setting `dual="false"`, the resolver in the chain which found the module descriptor (if any) is also used for artifacts +
[07/29] ant-ivy git commit: Merge branch 'master' into xooki2asciidoc
Posted by ja...@apache.org.
Merge branch 'master' into xooki2asciidoc
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5d6131a3
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5d6131a3
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5d6131a3
Branch: refs/heads/master
Commit: 5d6131a3012135602ecbd9b7894a622ec5f75782
Parents: 1760b26 239bc0b
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Thu May 25 15:04:39 2017 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Thu May 25 15:04:39 2017 +0200
----------------------------------------------------------------------
.classpath.default | 90 +--
NOTICE | 2 +-
build-release.xml | 599 +++++++++----------
build.xml | 287 ++++-----
doap_Ivy.rdf | 30 +-
doc/concept.html | 17 +-
doc/ivyfile/dependencies.html | 3 +
doc/printTemplate.html | 2 +-
doc/release-notes.html | 29 +-
doc/resolver/bintray.html | 2 +-
doc/resolver/sftp.html | 14 +-
doc/resolver/ssh.html | 11 +
doc/settings/resolvers.html | 7 +
doc/template.html | 2 +-
doc/use/makepom.html | 2 +-
ivy.xml | 96 ++-
src/java/org/apache/ivy/Ivy.java | 23 +-
.../apache/ivy/ant/AntWorkspaceResolver.java | 236 ++++++++
src/java/org/apache/ivy/ant/FixDepsTask.java | 10 +-
src/java/org/apache/ivy/ant/IvyAntSettings.java | 9 +
src/java/org/apache/ivy/ant/IvyBuildList.java | 123 ++--
src/java/org/apache/ivy/ant/IvyBuildNumber.java | 18 +-
src/java/org/apache/ivy/ant/IvyConfigure.java | 5 +
src/java/org/apache/ivy/ant/IvyDependency.java | 25 +-
.../org/apache/ivy/ant/IvyDependencyTree.java | 5 +-
.../ivy/ant/IvyDependencyUpdateChecker.java | 7 +
src/java/org/apache/ivy/ant/IvyMakePom.java | 30 +-
src/java/org/apache/ivy/ant/IvyPublish.java | 29 +-
src/java/org/apache/ivy/ant/IvyResolve.java | 27 +-
src/java/org/apache/ivy/ant/IvyTask.java | 2 +
src/java/org/apache/ivy/ant/antlib.xml | 1 +
.../ivy/core/cache/CacheMetadataOptions.java | 11 +
.../cache/DefaultRepositoryCacheManager.java | 201 ++++---
.../cache/DefaultResolutionCacheManager.java | 12 +-
.../ivy/core/cache/ParserSettingsMonitor.java | 4 +
.../ivy/core/cache/RepositoryCacheManager.java | 15 +
.../core/module/descriptor/Configuration.java | 20 +-
.../descriptor/DefaultModuleDescriptor.java | 119 ++--
.../DefaultWorkspaceModuleDescriptor.java | 42 ++
.../descriptor/WorkspaceModuleDescriptor.java | 26 +
.../ivy/core/module/id/MatcherLookup.java | 38 +-
.../org/apache/ivy/core/module/id/ModuleId.java | 25 +-
.../ivy/core/module/id/ModuleRevisionId.java | 46 +-
.../apache/ivy/core/module/id/ModuleRules.java | 72 +--
.../ivy/core/module/status/StatusManager.java | 23 +-
.../apache/ivy/core/pack/PackagingManager.java | 14 +-
.../apache/ivy/core/publish/PublishEngine.java | 38 +-
.../ivy/core/report/ArtifactDownloadReport.java | 10 +
.../apache/ivy/core/report/ResolveReport.java | 166 +++--
.../org/apache/ivy/core/resolve/IvyNode.java | 117 ++--
.../apache/ivy/core/resolve/IvyNodeUsage.java | 5 +
.../apache/ivy/core/resolve/ResolveData.java | 48 +-
.../apache/ivy/core/resolve/ResolveEngine.java | 107 ++--
.../apache/ivy/core/resolve/ResolveOptions.java | 7 +-
.../org/apache/ivy/core/resolve/VisitData.java | 10 +-
.../org/apache/ivy/core/resolve/VisitNode.java | 43 +-
.../ivy/core/retrieve/RetrieveEngine.java | 28 +-
.../apache/ivy/core/search/SearchEngine.java | 196 +++---
.../apache/ivy/core/settings/IvySettings.java | 239 ++++----
.../ivy/osgi/core/OSGiManifestParser.java | 18 +-
.../org/apache/ivy/osgi/filter/AndFilter.java | 1 +
.../apache/ivy/osgi/filter/CompareFilter.java | 20 +-
.../ivy/osgi/filter/MultiOperatorFilter.java | 3 +
.../org/apache/ivy/osgi/filter/NotFilter.java | 1 +
.../org/apache/ivy/osgi/filter/OSGiFilter.java | 1 +
.../ivy/osgi/filter/OSGiFilterParser.java | 36 +-
.../org/apache/ivy/osgi/filter/OrFilter.java | 1 +
.../ivy/osgi/filter/UniOperatorFilter.java | 3 +
.../org/apache/ivy/osgi/obr/OBRResolver.java | 6 +-
.../apache/ivy/osgi/obr/xml/OBRXMLParser.java | 20 +-
.../apache/ivy/osgi/p2/P2ArtifactParser.java | 8 +
.../apache/ivy/osgi/p2/P2CompositeParser.java | 4 +
.../apache/ivy/osgi/p2/P2MetadataParser.java | 30 +
.../apache/ivy/osgi/p2/PropertiesParser.java | 3 +
.../ivy/osgi/repo/AbstractOSGiResolver.java | 75 ++-
.../updatesite/xml/EclipseUpdateSiteParser.java | 7 +-
.../ivy/osgi/updatesite/xml/FeatureParser.java | 15 +-
.../updatesite/xml/UpdateSiteDigestParser.java | 6 +-
.../apache/ivy/osgi/util/DelegatingHandler.java | 19 +-
.../conflict/AbstractConflictManager.java | 5 +-
.../ivy/plugins/conflict/ConflictManager.java | 5 +-
.../plugins/conflict/FixedConflictManager.java | 13 +-
.../LatestCompatibleConflictManager.java | 67 ++-
.../plugins/conflict/LatestConflictManager.java | 24 +-
.../ivy/plugins/conflict/NoConflictManager.java | 2 +-
.../plugins/conflict/RegexpConflictManager.java | 6 +-
.../plugins/conflict/StrictConflictManager.java | 7 +-
.../plugins/latest/AbstractLatestStrategy.java | 7 +-
.../latest/ComparatorLatestStrategy.java | 12 +-
.../latest/LatestLexicographicStrategy.java | 8 +-
.../plugins/latest/LatestRevisionStrategy.java | 36 +-
.../ivy/plugins/latest/LatestStrategy.java | 2 +-
.../ivy/plugins/latest/LatestTimeStrategy.java | 8 +-
.../plugins/latest/WorkspaceLatestStrategy.java | 57 ++
.../plugins/matcher/AbstractPatternMatcher.java | 1 +
.../matcher/ExactOrRegexpPatternMatcher.java | 1 +
.../plugins/matcher/ExactPatternMatcher.java | 1 +
.../ivy/plugins/matcher/GlobPatternMatcher.java | 1 +
.../apache/ivy/plugins/matcher/MapMatcher.java | 25 +-
.../plugins/matcher/RegexpPatternMatcher.java | 1 +
.../parser/AbstractModuleDescriptorParser.java | 9 +-
.../parser/ModuleDescriptorParserRegistry.java | 9 +-
.../ivy/plugins/parser/ParserSettings.java | 3 +-
.../ivy/plugins/parser/m2/PomDependencyMgt.java | 4 +-
.../parser/m2/PomModuleDescriptorBuilder.java | 146 ++---
.../parser/m2/PomModuleDescriptorParser.java | 230 ++++---
.../parser/m2/PomModuleDescriptorWriter.java | 5 +-
.../apache/ivy/plugins/parser/m2/PomReader.java | 245 +++++---
.../ivy/plugins/parser/m2/PomWriterOptions.java | 17 +-
.../parser/xml/XmlModuleDescriptorParser.java | 46 +-
.../plugins/repository/AbstractRepository.java | 1 +
.../ivy/plugins/repository/Repository.java | 4 +-
.../ssh/AbstractSshBasedRepository.java | 42 +-
.../resolver/AbstractPatternsBasedResolver.java | 137 +++--
.../ivy/plugins/resolver/AbstractResolver.java | 20 +-
.../resolver/AbstractSshBasedResolver.java | 12 +
.../resolver/AbstractWorkspaceResolver.java | 239 ++++++++
.../ivy/plugins/resolver/BasicResolver.java | 199 +++---
.../ivy/plugins/resolver/BintrayResolver.java | 2 -
.../ivy/plugins/resolver/CacheResolver.java | 14 +-
.../ivy/plugins/resolver/ChainResolver.java | 74 +--
.../plugins/resolver/DependencyResolver.java | 6 +-
.../ivy/plugins/resolver/DualResolver.java | 7 +
.../plugins/resolver/FileSystemResolver.java | 28 +-
.../ivy/plugins/resolver/IBiblioResolver.java | 55 +-
.../ivy/plugins/resolver/IvyRepResolver.java | 29 +-
.../ivy/plugins/resolver/JarResolver.java | 2 +
.../plugins/resolver/MirroredURLResolver.java | 16 +-
.../plugins/resolver/RepositoryResolver.java | 24 +-
.../ivy/plugins/resolver/ResolverSettings.java | 2 +-
.../ivy/plugins/resolver/SFTPResolver.java | 1 +
.../ivy/plugins/resolver/SshResolver.java | 1 +
.../ivy/plugins/resolver/URLResolver.java | 1 +
.../ivy/plugins/resolver/VfsResolver.java | 2 +
.../ivy/plugins/resolver/VsftpResolver.java | 1 +
.../resolver/WorkspaceChainResolver.java | 37 ++
.../resolver/util/ApacheHttpURLLister.java | 3 +-
.../plugins/resolver/util/FileURLLister.java | 7 +-
.../plugins/resolver/util/ResolvedResource.java | 1 +
.../plugins/resolver/util/ResolverHelper.java | 34 +-
.../ivy/plugins/resolver/util/URLLister.java | 2 +-
.../bouncycastle/OpenPGPSignatureGenerator.java | 43 +-
.../plugins/version/LatestVersionMatcher.java | 9 +-
.../apache/ivy/util/AbstractMessageLogger.java | 82 +--
.../org/apache/ivy/util/ChecksumHelper.java | 25 +
.../apache/ivy/util/ContextualSAXHandler.java | 9 +-
.../apache/ivy/util/MessageLoggerEngine.java | 29 +-
.../apache/ivy/util/cli/CommandLineParser.java | 29 +-
.../ivy/util/extendable/ExtendableItem.java | 6 +-
.../util/extendable/ExtendableItemHelper.java | 22 +-
.../extendable/UnmodifiableExtendableItem.java | 34 +-
.../apache/ivy/util/url/ApacheURLLister.java | 10 +-
.../apache/ivy/util/url/BasicURLHandler.java | 1 +
.../apache/ivy/util/url/IvyAuthenticator.java | 38 +-
test/java/org/apache/ivy/IvyTest.java | 4 +-
test/java/org/apache/ivy/MainTest.java | 4 +-
test/java/org/apache/ivy/TestHelper.java | 30 +-
.../apache/ivy/ant/AntBuildResolverTest.java | 193 ++++++
.../org/apache/ivy/ant/AntBuildTriggerTest.java | 4 +-
.../org/apache/ivy/ant/AntCallTriggerTest.java | 4 +-
test/java/org/apache/ivy/ant/AntTestHelper.java | 34 --
.../org/apache/ivy/ant/BuildOBRTaskTest.java | 31 +-
.../org/apache/ivy/ant/FixDepsTaskTest.java | 28 +-
.../apache/ivy/ant/IvyArtifactPropertyTest.java | 27 +-
.../apache/ivy/ant/IvyArtifactReportTest.java | 27 +-
.../org/apache/ivy/ant/IvyBuildListTest.java | 7 +-
.../org/apache/ivy/ant/IvyBuildNumberTest.java | 29 +-
.../org/apache/ivy/ant/IvyCacheFilesetTest.java | 25 +-
.../org/apache/ivy/ant/IvyCachePathTest.java | 30 +-
.../org/apache/ivy/ant/IvyCleanCacheTest.java | 7 +-
.../org/apache/ivy/ant/IvyConfigureTest.java | 11 +-
.../org/apache/ivy/ant/IvyConvertPomTest.java | 6 +-
.../java/org/apache/ivy/ant/IvyDeliverTest.java | 28 +-
.../apache/ivy/ant/IvyDependencyTreeTest.java | 28 +-
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 21 +-
.../org/apache/ivy/ant/IvyFindRevisionTest.java | 25 +-
.../apache/ivy/ant/IvyInfoRepositoryTest.java | 25 +-
test/java/org/apache/ivy/ant/IvyInfoTest.java | 7 +-
.../java/org/apache/ivy/ant/IvyInstallTest.java | 7 +-
.../org/apache/ivy/ant/IvyListModulesTest.java | 25 +-
.../apache/ivy/ant/IvyPostResolveTaskTest.java | 9 +-
.../java/org/apache/ivy/ant/IvyPublishTest.java | 7 +-
test/java/org/apache/ivy/ant/IvyReportTest.java | 61 +-
.../apache/ivy/ant/IvyRepositoryReportTest.java | 39 +-
.../java/org/apache/ivy/ant/IvyResolveTest.java | 30 +-
.../org/apache/ivy/ant/IvyResourcesTest.java | 33 +-
.../org/apache/ivy/ant/IvyRetrieveTest.java | 12 +-
test/java/org/apache/ivy/ant/IvyTaskTest.java | 11 +-
test/java/org/apache/ivy/ant/IvyVarTest.java | 14 +-
test/java/org/apache/ivy/ant/ivy-empty.xml | 26 +
.../ivy/ant/testutil/AntTaskTestCase.java | 8 +-
.../org/apache/ivy/core/TestPerformance.java | 19 +-
.../DefaultRepositoryCacheManagerTest.java | 85 ++-
.../cache/ModuleDescriptorMemoryCacheTest.java | 6 +-
.../apache/ivy/core/deliver/DeliverTest.java | 7 +-
.../ivy/core/event/IvyEventFilterTest.java | 4 +-
.../apache/ivy/core/install/InstallTest.java | 23 +-
.../apache/ivy/core/module/id/ModuleIdTest.java | 13 -
.../ivy/core/module/id/ModuleRulesTest.java | 4 +-
.../ivy/core/publish/PublishEngineTest.java | 4 +-
.../ivy/core/publish/PublishEventsTest.java | 4 +-
.../ivy/core/report/ResolveReportTest.java | 64 +-
.../RepositoryManagementEngineTest.java | 4 +-
.../ivy/core/resolve/ResolveEngineTest.java | 4 +-
.../apache/ivy/core/resolve/ResolveTest.java | 230 +++----
.../apache/ivy/core/retrieve/RetrieveTest.java | 54 +-
.../org/apache/ivy/core/search/SearchTest.java | 4 +-
.../apache/ivy/core/settings/ConfigureTest.java | 4 +-
.../ivy/core/settings/IvySettingsTest.java | 4 +-
.../settings/OnlineXmlSettingsParserTest.java | 4 +-
.../core/settings/XmlSettingsParserTest.java | 4 +-
.../java/org/apache/ivy/core/sort/SortTest.java | 6 +-
.../osgi/core/AggregatedOSGiResolverTest.java | 4 +-
.../ivy/osgi/core/ManifestParserTest.java | 4 +-
.../ivy/osgi/core/OSGiManifestParserTest.java | 23 +
.../ivy/osgi/core/OsgiLatestStrategyTest.java | 4 +-
.../apache/ivy/osgi/filter/OSGiFilterTest.java | 4 +-
.../org/apache/ivy/osgi/obr/OBRParserTest.java | 4 +-
.../apache/ivy/osgi/obr/OBRResolverTest.java | 6 +-
.../apache/ivy/osgi/obr/OBRXMLWriterTest.java | 4 +-
.../apache/ivy/osgi/p2/P2DescriptorTest.java | 4 +-
.../apache/ivy/osgi/repo/BundleRepoTest.java | 4 +-
.../UpdateSiteAndIbiblioResolverTest.java | 4 +-
.../osgi/updatesite/UpdateSiteLoaderTest.java | 4 +-
.../osgi/updatesite/UpdateSiteResolverTest.java | 4 +-
.../IgnoreCircularDependencyStrategyTest.java | 4 +-
.../WarnCircularDependencyStrategyTest.java | 4 +-
.../LatestCompatibleConflictManagerTest.java | 4 +-
.../conflict/LatestConflictManagerTest.java | 4 +-
.../conflict/RegexpConflictManagerTest.java | 4 +-
.../conflict/StrictConflictManagerTest.java | 4 +-
.../plugins/lock/ArtifactLockStrategyTest.java | 4 +-
.../namespace/MRIDTransformationRuleTest.java | 4 +-
.../plugins/namespace/NameSpaceHelperTest.java | 4 +-
.../AbstractModuleDescriptorParserTester.java | 4 +-
.../ModuleDescriptorParserRegistryTest.java | 4 +-
.../m2/PomModuleDescriptorParserTest.java | 184 +++++-
.../m2/PomModuleDescriptorWriterTest.java | 4 +-
.../apache/ivy/plugins/parser/m2/depmgt/bom.pom | 52 ++
.../ivy/plugins/parser/m2/depmgt/child.pom | 36 ++
.../ivy/plugins/parser/m2/depmgt/grandchild.pom | 36 ++
.../ivy/plugins/parser/m2/depmgt/parent.pom | 38 ++
.../parser/m2/depmgt/profile-parent-child.pom | 36 ++
.../plugins/parser/m2/depmgt/profile-parent.pom | 46 ++
.../ivy/plugins/parser/m2/test-exclusion.pom | 11 +
.../parser/m2/test-parent-with-licenses.pom | 36 ++
.../test-project-with-overridden-licenses.pom | 43 ++
.../m2/test-project-with-parent-licenses.pom | 34 ++
.../parser/xml/XmlModuleUpdaterTest.java | 4 +-
.../xml/test-write-extrainfo-from-maven.xml | 2 +-
.../ivy/plugins/report/XmlReportParserTest.java | 34 +-
.../ivy/plugins/report/XmlReportWriterTest.java | 4 +-
.../repository/vfs/VfsRepositoryTest.java | 4 +-
.../plugins/repository/vfs/VfsResourceTest.java | 4 +-
.../AbstractDependencyResolverTest.java | 4 +-
.../plugins/resolver/BintrayResolverTest.java | 16 +-
.../ivy/plugins/resolver/ChainResolverTest.java | 17 +-
.../resolver/FileSystemResolverTest.java | 58 ++
.../ivy/plugins/resolver/IBiblioHelper.java | 8 +-
.../plugins/resolver/IBiblioResolverTest.java | 16 +-
.../plugins/resolver/IvyRepResolverTest.java | 15 +-
.../ivy/plugins/resolver/JarResolverTest.java | 4 +-
.../ivy/plugins/resolver/Maven2LocalTest.java | 4 +-
.../resolver/MirroredURLResolverTest.java | 21 +-
.../plugins/resolver/ResolverTestHelper.java | 4 +-
.../ivy/plugins/resolver/URLResolverTest.java | 15 +-
.../resolver/util/ResolverHelperTest.java | 4 +-
.../ivy/plugins/trigger/LogTriggerTest.java | 4 +-
.../version/LatestVersionMatcherTest.java | 46 +-
.../version/PatternVersionMatcherTest.java | 4 +-
.../version/VersionRangeMatcherTest.java | 4 +-
.../apache/ivy/util/IvyPatternHelperTest.java | 4 +-
.../ivy/util/url/AbstractURLHandlerTest.java | 4 +-
.../ivy/util/url/BasicURLHandlerTest.java | 15 +-
.../ivy/util/url/HttpclientURLHandlerTest.java | 4 +-
.../repositories/1/org2/mod2.9/ivys/ivy-0.6.xml | 32 +
.../1/packaging/module10/ivys/ivy-1.0.xml | 27 +
.../1/packaging/module9/ivys/ivy-1.0.xml | 27 +
.../module9/jars/module9-1.0.jar.pack.gz | Bin 0 -> 274 bytes
.../1/usecacheonly/mod4/ivys/ivy-1.0.xml | 27 +
.../1/usecacheonly/mod4/jars/mod4-1.0.jar | 1 +
.../mod5/ivys/ivy-1.0.0-SNAPSHOT.xml | 24 +
.../mod5/jars/mod5-1.0.0-SNAPSHOT.jar | 1 +
test/repositories/checksums/.gitattributes | 2 +
.../checksums/allright/2.0/allright-2.0.jar | 1 +
.../allright/2.0/allright-2.0.jar.SHA-256 | 1 +
.../checksums/allright/2.0/ivy-2.0.xml | 28 +
.../checksums/allright/2.0/ivy-2.0.xml.SHA-256 | 1 +
.../checksums/allright/3.0/allright-3.0.jar | 1 +
.../allright/3.0/allright-3.0.jar.SHA-512 | 1 +
.../checksums/allright/3.0/ivy-3.0.xml | 28 +
.../checksums/allright/3.0/ivy-3.0.xml.SHA-512 | 1 +
.../osgi/module1/META-INF/MANIFEST.MF | 3 +
test/workspace/ivysettings.xml | 30 +
test/workspace/project1/ivy.xml | 24 +
test/workspace/project2/ivy.xml | 24 +
test/workspace/project3/ivy.xml | 26 +
.../workspace/repo/org.acme/module1/1.1/ivy.xml | 21 +
.../repo/org.acme/module1/1.1/module1.jar | 0
.../workspace/repo/org.acme/module2/1.2/ivy.xml | 21 +
.../repo/org.acme/module2/1.2/module2.jar | 0
301 files changed, 5514 insertions(+), 3347 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d6131a3/build-release.xml
----------------------------------------------------------------------
diff --cc build-release.xml
index 65c13c5,752e8d2..af39676
--- a/build-release.xml
+++ b/build-release.xml
@@@ -17,75 -17,75 +17,75 @@@
under the License.
-->
<project name="IvyRelease" default="snapshot"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ivy2="antlib:org.apache.ivy.ant_2"
- xmlns:xooki="antlib:xooki"
+ xmlns:asciidoctor="antlib:org.asciidoctor.ant"
- xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
- <import file="build.xml"/>
-
- <macrodef name="run-tutorial">
- <attribute name="antfile" />
- <attribute name="output" />
- <attribute name="target" default="" />
- <attribute name="failonerror" default="true" />
- <sequential>
- <echo>Running @{antfile} @{target} > @{output}</echo>
-
+ xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+ <import file="build.xml"/>
+
+ <macrodef name="run-tutorial">
+ <attribute name="antfile" />
+ <attribute name="output" />
+ <attribute name="target" default="" />
+ <attribute name="failonerror" default="true" />
+ <sequential>
+ <echo>Running @{antfile} @{target} > @{output}</echo>
+
<local name="antfile.dir" />
<dirname property="antfile.dir" file="@{antfile}" />
-
- <local name="antfile.name" />
- <basename property="antfile.name" file="@{antfile}" />
-
- <echo file="@{output}">[ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator}</echo>
- <java classname="org.apache.tools.ant.launch.Launcher"
- fork="true"
- failonerror="@{failonerror}"
- logerror="true"
- append="true"
- output="@{output}">
- <classpath>
- <fileset file="${artifacts.build.dir}/jars/${final.name}" />
-
- <!--
- We need to set the classpath like this, otherwise the invoked
- build scripts are not capable of compiling sources ???
- -->
- <path path="${java.class.path}" />
- </classpath>
- <sysproperty key="ivy.cache.dir" value="${tutorial.cache}" />
- <sysproperty key="ivy.local.default.root" value="${tutorial.local-repo}" />
+
+ <local name="antfile.name" />
+ <basename property="antfile.name" file="@{antfile}" />
+
+ <echo file="@{output}">[ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator}</echo>
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ fork="true"
+ failonerror="@{failonerror}"
+ logerror="true"
+ append="true"
+ output="@{output}">
+ <classpath>
+ <fileset file="${artifacts.build.dir}/jars/${final.name}" />
+
+ <!--
+ We need to set the classpath like this, otherwise the invoked
+ build scripts are not capable of compiling sources ???
+ -->
+ <path path="${java.class.path}" />
+ </classpath>
+ <sysproperty key="ivy.cache.dir" value="${tutorial.cache}" />
+ <sysproperty key="ivy.local.default.root" value="${tutorial.local-repo}" />
<sysproperty key="ivy.cache.ttl.default" value="1s" />
- <sysproperty key="skip.download" value="true" />
- <arg line="-f @{antfile}" />
- <arg line="@{target}" />
- </java>
- </sequential>
- </macrodef>
-
- <target name="generate-tutorial-output" depends="jar" unless="skip.generate-tutorial-output">
+ <sysproperty key="skip.download" value="true" />
+ <arg line="-f @{antfile}" />
+ <arg line="@{target}" />
+ </java>
+ </sequential>
+ </macrodef>
+
- <target name="generate-tutorial-output" depends="jar, generate-doc-init">
- <property name="output.dir" value="${build.dir}/output" />
++ <target name="generate-tutorial-output" depends="jar" unless="skip.generate-tutorial-output">
+ <property name="output.dir" value="${basedir}/asciidoc/tutorial/log" />
- <delete dir="${output.dir}" />
+ <delete dir="${output.dir}" />
<mkdir dir="${output.dir}" />
-
- <!-- create a copy of the tutorials so we can easily get rid of the generated files -->
- <property name="tutorial.src.dir" value="${build.dir}/examples" />
- <delete dir="${tutorial.src.dir}" />
- <mkdir dir="${tutorial.src.dir}" />
- <copy todir="${tutorial.src.dir}">
- <fileset dir="src/example" />
- </copy>
-
- <!-- create a cache and local-repository for the tutorials -->
- <property name="tutorial.build.dir" value="${build.dir}/tutorial" />
- <property name="tutorial.cache" value="${tutorial.build.dir}/cache" />
- <property name="tutorial.local-repo" value="${tutorial.build.dir}/local" />
-
- <!-- go-ivy : not logged, but run in order to check if it still run -->
- <run-tutorial antfile="${tutorial.src.dir}/go-ivy/build.xml" output="${output.dir}/dummy.txt" />
+
+ <!-- create a copy of the tutorials so we can easily get rid of the generated files -->
+ <property name="tutorial.src.dir" value="${build.dir}/examples" />
+ <delete dir="${tutorial.src.dir}" />
+ <mkdir dir="${tutorial.src.dir}" />
+ <copy todir="${tutorial.src.dir}">
+ <fileset dir="src/example" />
+ </copy>
+
+ <!-- create a cache and local-repository for the tutorials -->
+ <property name="tutorial.build.dir" value="${build.dir}/tutorial" />
+ <property name="tutorial.cache" value="${tutorial.build.dir}/cache" />
+ <property name="tutorial.local-repo" value="${tutorial.build.dir}/local" />
+
+ <!-- go-ivy : not logged, but run in order to check if it still run -->
+ <run-tutorial antfile="${tutorial.src.dir}/go-ivy/build.xml" output="${output.dir}/dummy.txt" />
<delete file="${output.dir}/dummy.txt" />
<delete dir="${tutorial.build.dir}" />
-
+
<!-- hello-ivy : Quick Start - start.html -->
<run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-1.txt" />
<run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-2.txt" />
@@@ -158,195 -158,223 +158,188 @@@
</pathconvert>
<replace dir="${output.dir}" token="\" value="/" />
- <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
+ <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
<replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local" />
<replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar" />
- <replace dir="${output.dir}" token="-f build.xml " value="" />
- <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
-
- </target>
-
+ <replace dir="${output.dir}" token="-f build.xml " value="" />
+ <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
-
- <copy todir="${doc.tmp.dir}/tutorial/log">
- <fileset dir="${output.dir}" />
- </copy>
- </target>
-
- <target name="generate-doc-init" depends="release-version">
- <!-- copy documentation to temp dir to replace version tokens -->
- <property name="doc.tmp.dir" value="${build.dir}/tempdoc" />
- <mkdir dir="${doc.tmp.dir}" />
- <copy todir="${doc.tmp.dir}" preservelastmodified="true" overwrite="true">
- <fileset dir="${doc.src.dir}" />
- <filterset>
- <filter token="version" value="${build.version}"/>
- </filterset>
- </copy>
+ </target>
+
- <target name="generate-doc" depends="generate-doc-init, generate-tutorial-output">
+ <target name="generate-doc" depends="init-ivy">
+ <ivy:cachepath pathid="asciidoctor.path">
- <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.4" />
++ <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.4" />
+ </ivy:cachepath>
+ <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
+ <asciidoctor:convert sourceDirectory="${doc.src.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
+ <attribute key="basedir" value="${doc.src.dir}" />
+ <attribute key="imagesdir" value="" />
+ </asciidoctor:convert>
- <!-- the basedir seems to fuck up the path to the output directory, let's fix that manually >
- <delete dir="${doc.build.dir}" />
- <mkdir dir="${doc.build.dir}" />
- <copy todir="${doc.build.dir}">
- <fileset dir="${doc.src.dir}/${doc.build.dir}" />
- </copy-->
+ <!-- copy static resources -->
<copy todir="${doc.build.dir}">
<fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
- <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
+ <fileset dir="${doc.src.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
</copy>
-
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
- <xooki:generate destDir="${doc.build.dir}" checkUpToDate="true" xookidir="${doc.src.dir}/xooki">
- <fileset dir="${doc.tmp.dir}">
- <include name="**/*.html"/>
- <exclude name="template.html"/>
- <exclude name="*Template.html"/>
- <exclude name="conflict-solving-algo.html"/>
- <exclude name="use.html"/>
- <exclude name="samples/**"/>
- <exclude name="js/**"/>
- <exclude name="reports/**"/>
- <exclude name="xooki/**"/>
- </fileset>
- </xooki:generate>
-
- <!-- generate print-friendly doc -->
- <!-- modify the basedir because othwise xooki.js will not be found! -->
- <ant antfile="../build-release.xml" target="generate-print-doc" dir="doc" />
- </target>
-
- <target name="generate-print-doc">
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
- <xooki:print src="${doc.tmp.dir}/index.html"
- dest="${doc.build.dir}/book.html"
- xookidir="${doc.src.dir}/xooki" />
</target>
- <target name="all-doc" depends="javadoc, generate-doc" />
-
- <target name="init-snapshot" depends="default-version">
- <property name="snapshot.full.name" value="apache-ivy-${build.version}" />
- </target>
-
- <target name="snapshot-metadata" depends="init-snapshot, resolve">
- <mkdir dir="${artifacts.build.dir}"/>
- <ivy:deliver
- deliverpattern="${artifacts.build.dir}/ivy.xml"
- pubrevision="${build.version}"
- pubdate="${pubdate}"
- status="${status}"/>
- </target>
-
- <target name="snapshot-src" depends="init-snapshot">
- <delete dir="${build.dir}/snapshot-src" failonerror="false" />
- <exec executable="git" failonerror="true">
- <arg line="clone ${basedir} ${build.dir}/snapshot-src" />
- </exec>
- <exec dir="${build.dir}/snapshot-src" executable="git" failonerror="true">
- <arg line="clean -d -x -f" />
- </exec>
- <mkdir dir="${distrib.dir}/dist/${build.version}"/>
- <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip">
- <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" />
- </zip>
- <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
- compression="gzip" longfile="gnu">
- <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip"/>
- </tar>
- </target>
-
- <target name="snapshot-bin-without-dependencies" depends="snapshot-metadata, jar, all-doc">
- <mkdir dir="${distrib.dir}/dist/${build.version}"/>
- <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip">
- <zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
- <zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
- <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
- <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
- <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
- <zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
- <zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
- <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
- <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
- <zipfileset dir="${basedir}" includes="build-for-bin-distrib.xml" fullpath="${snapshot.full.name}/build.xml"/>
-
- <zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- </zip>
- <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.tar.gz"
- compression="gzip" longfile="gnu">
- <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip"/>
- </tar>
- </target>
-
- <target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
- <mkdir dir="${distrib.dir}/dist/${build.version}"/>
- <delete dir="${build.dir}/lib" />
- <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
- <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip">
- <zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
- <zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
- <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
- <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
- <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
- <zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
- <zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
- <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
- <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
-
- <zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
-
- <zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar" />
- </zip>
- <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
- compression="gzip" longfile="gnu">
- <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
- </tar>
- </target>
-
- <target name="snapshot-bin"
- depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies" />
-
- <target name="release-xsd" depends="init-snapshot">
- <!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
- <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}" />
- </target>
-
-
- <target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
- <property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}" />
- <ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml"
- pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
- templatefile="${basedir}/src/etc/makepom/pom.template">
- <mapping conf="core" scope="compile"/>
- <mapping conf="test" scope="test"/>
- </ivy:makepom>
- <copy file="${artifacts.build.dir}/jars/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}.jar" />
- <!-- jar javadocs -->
- <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
- <fileset dir="${javadoc.build.dir}" />
- </jar>
- <!-- copy sources jar -->
- <copy file="${artifacts.build.dir}/sources/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar" />
-
- <checksum algorithm="md5">
- <fileset dir="${m2.distrib.dir}">
- <include name="*.pom"/>
- <include name="*.jar"/>
- </fileset>
- </checksum>
- <checksum algorithm="sha1">
- <fileset dir="${m2.distrib.dir}">
- <include name="*.pom"/>
- <include name="*.jar"/>
- </fileset>
- </checksum>
- </target>
-
-
- <target name="snapshot-checksums">
- <checksum algorithm="md5">
- <fileset dir="${distrib.dir}/dist/${build.version}">
- <include name="*.pom"/>
- <include name="*.jar"/>
- <include name="*.zip"/>
- <include name="*.gz"/>
- </fileset>
- </checksum>
- <checksum algorithm="sha">
- <fileset dir="${distrib.dir}/dist/${build.version}">
- <include name="*.pom"/>
- <include name="*.jar"/>
- <include name="*.zip"/>
- <include name="*.gz"/>
- </fileset>
- </checksum>
- </target>
-
- <target name="snapshot-version">
- <property name="version.prefix" value="${target.ivy.version}-dev-"/>
- </target>
-
- <target name="release-version">
- <property name="build.version" value="${target.ivy.version}" />
- <echo>Setting version to ${build.version}</echo>
- <condition property="status" value="release">
- <matches pattern="^\d+\.\d+\.\d+$" string="${build.version}"/>
- </condition>
- <condition property="status" value="milestone">
- <matches pattern="^\d+\.\d+\.\d+-(alpha|beta|rc)\d+$" string="${build.version}"/>
- </condition>
- <property name="status" value="integration" />
- <echo>Setting status to ${status}</echo>
- </target>
-
- <target name="sign" depends="init-ivy">
+ <target name="all-doc" depends="javadoc, generate-doc" />
+
+ <target name="init-snapshot" depends="default-version">
+ <property name="snapshot.full.name" value="apache-ivy-${build.version}" />
+ </target>
+
+ <target name="snapshot-metadata" depends="init-snapshot, resolve">
+ <mkdir dir="${artifacts.build.dir}"/>
+ <ivy:deliver
+ deliverpattern="${artifacts.build.dir}/ivy.xml"
+ pubrevision="${build.version}"
+ pubdate="${pubdate}"
+ status="${status}"/>
+ </target>
+
+ <target name="snapshot-src" depends="init-snapshot">
+ <delete dir="${build.dir}/snapshot-src" failonerror="false" />
+ <exec executable="git" failonerror="true">
+ <arg line="clone ${basedir} ${build.dir}/snapshot-src" />
+ </exec>
+ <exec dir="${build.dir}/snapshot-src" executable="git" failonerror="true">
+ <arg line="clean -d -x -f" />
+ </exec>
+ <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+ <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip">
+ <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" />
+ </zip>
+ <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
+ compression="gzip" longfile="gnu">
+ <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip"/>
+ </tar>
+ </target>
+
+ <target name="snapshot-bin-without-dependencies" depends="snapshot-metadata, jar, all-doc">
+ <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+ <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip">
+ <zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
+ <zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
+ <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
+ <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
+ <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
+ <zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
+ <zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
+ <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+ <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+ <zipfileset dir="${basedir}" includes="build-for-bin-distrib.xml" fullpath="${snapshot.full.name}/build.xml"/>
+
+ <zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
+ </zip>
+ <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.tar.gz"
+ compression="gzip" longfile="gnu">
+ <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip"/>
+ </tar>
+ </target>
+
+ <target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
+ <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+ <delete dir="${build.dir}/lib" />
+ <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
+ <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip">
+ <zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
+ <zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
+ <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
+ <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
+ <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
+ <zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
+ <zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
+ <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+ <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+
+ <zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
+
+ <zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar" />
+ </zip>
+ <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
+ compression="gzip" longfile="gnu">
+ <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
+ </tar>
+ </target>
+
+ <target name="snapshot-bin"
+ depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies" />
+
+ <target name="release-xsd" depends="init-snapshot">
+ <!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
+ <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}" />
+ </target>
+
+
+ <target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
+ <property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}" />
+ <ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml"
+ pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
+ templatefile="${basedir}/src/etc/makepom/pom.template">
+ <mapping conf="core" scope="compile"/>
+ <mapping conf="test" scope="test"/>
+ </ivy:makepom>
+ <copy file="${artifacts.build.dir}/jars/${final.name}"
+ tofile="${m2.distrib.dir}/ivy-${build.version}.jar" />
+ <!-- jar javadocs -->
+ <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
+ <fileset dir="${javadoc.build.dir}" />
+ </jar>
+ <!-- copy sources jar -->
+ <copy file="${artifacts.build.dir}/sources/${final.name}"
+ tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar" />
+
+ <checksum algorithm="md5">
+ <fileset dir="${m2.distrib.dir}">
+ <include name="*.pom"/>
+ <include name="*.jar"/>
+ </fileset>
+ </checksum>
+ <checksum algorithm="sha1">
+ <fileset dir="${m2.distrib.dir}">
+ <include name="*.pom"/>
+ <include name="*.jar"/>
+ </fileset>
+ </checksum>
+ </target>
+
+
+ <target name="snapshot-checksums">
+ <checksum algorithm="md5">
+ <fileset dir="${distrib.dir}/dist/${build.version}">
+ <include name="*.pom"/>
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ <include name="*.gz"/>
+ </fileset>
+ </checksum>
+ <checksum algorithm="sha">
+ <fileset dir="${distrib.dir}/dist/${build.version}">
+ <include name="*.pom"/>
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ <include name="*.gz"/>
+ </fileset>
+ </checksum>
+ </target>
+
+ <target name="snapshot-version">
+ <property name="version.prefix" value="${target.ivy.version}-dev-"/>
+ </target>
+
+ <target name="release-version">
+ <property name="build.version" value="${target.ivy.version}" />
+ <echo>Setting version to ${build.version}</echo>
+ <condition property="status" value="release">
+ <matches pattern="^\d+\.\d+\.\d+$" string="${build.version}"/>
+ </condition>
+ <condition property="status" value="milestone">
+ <matches pattern="^\d+\.\d+\.\d+-(alpha|beta|rc)\d+$" string="${build.version}"/>
+ </condition>
+ <property name="status" value="integration" />
+ <echo>Setting status to ${status}</echo>
+ </target>
+
+ <target name="sign" depends="init-ivy">
<property file="${user.home}/ivybuild.properties" />
<input message="please enter your PGP password: " addproperty="pgp.password"/>
<input message="please enter your PGP keyId: " addproperty="pgp.keyId"/>
[21/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-publish-fc.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-publish-fc.svg b/asciidoc/images/ivy-publish-fc.svg
new file mode 100644
index 0000000..0640267
--- /dev/null
+++ b/asciidoc/images/ivy-publish-fc.svg
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 485 638" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill="#fff">
+ <path d="m166.05 267.99 22.771-7.711v7.65h168.48v0.09l63.721-63.899-7.561-22.86h7.471v-15.211h-191.25v-0.089l-63.72 63.72h0.089v38.31zm169.98-26.087c0.85-0.91 1.951-1.366 3.305-1.366 1.309 0 2.381 0.446 3.211 1.339 0.828 0.891 1.244 2.146 1.244 3.766 0 0.1-0.002 0.246-0.008 0.443h-7.311c0.062 1.075 0.367 1.9 0.914 2.474 0.549 0.569 1.23 0.857 2.049 0.857 0.609 0 1.129-0.16 1.559-0.48 0.43-0.321 0.773-0.829 1.025-1.531l1.717 0.212c-0.273 1.004-0.773 1.782-1.506 2.334-0.732 0.554-1.666 0.83-2.805 0.83-1.434 0-2.572-0.44-3.412-1.324-0.838-0.883-1.258-2.121-1.258-3.713 0.003-1.65 0.429-2.931 1.276-3.841zm-4.965 5.067c-0.227-0.148-0.795-0.337-1.697-0.562-1.221-0.309-2.064-0.574-2.533-0.797-0.473-0.226-0.828-0.535-1.07-0.934-0.242-0.396-0.367-0.835-0.367-1.314 0-0.438 0.102-0.839 0.303-1.212 0.197-0.372 0.471-0.681 0.816-0.928 0.258-0.19 0.609-0.352 1.057-0.484 0.447-0.134 0.924-0.198 1.434-0.198 0.77 0 1.445 0.113 2.025 0.333 0.582 0.223 1.01 0.522 1.287 0.9s0.469 0.884 0.572 1.518l-
1.623 0.222c-0.074-0.504-0.289-0.898-0.641-1.181s-0.854-0.425-1.498-0.425c-0.764 0-1.309 0.126-1.635 0.377-0.328 0.253-0.488 0.549-0.488 0.886 0 0.217 0.066 0.409 0.203 0.581 0.135 0.179 0.348 0.326 0.635 0.443 0.166 0.061 0.656 0.204 1.469 0.426 1.176 0.312 1.996 0.57 2.459 0.77 0.465 0.2 0.83 0.49 1.094 0.871 0.264 0.383 0.398 0.855 0.398 1.422 0 0.555-0.162 1.075-0.486 1.564-0.322 0.488-0.787 0.867-1.398 1.134-0.609 0.269-1.299 0.401-2.066 0.401-1.273 0-2.244-0.265-2.912-0.793-0.668-0.529-1.094-1.313-1.279-2.354l1.645-0.259c0.092 0.659 0.35 1.163 0.77 1.515 0.422 0.349 1.012 0.524 1.77 0.524 0.76 0 1.328-0.154 1.697-0.466 0.369-0.311 0.553-0.676 0.553-1.093-0.003-0.376-0.169-0.672-0.494-0.887zm-9.457-9.94h1.664v13.529h-1.664v-13.529zm-9.771 4.84c0.34-0.426 0.826-0.756 1.467-0.985 0.639-0.23 1.381-0.346 2.225-0.346 0.834 0 1.518 0.099 2.041 0.296 0.523 0.195 0.908 0.443 1.154 0.741 0.244 0.3 0.416 0.675 0.516 1.132 0.057 0.281 0.082 0.794 0.082 1.533v2.214c0 1.546 0.037 2.521 0.10
5 2.93 0.07 0.41 0.211 0.8 0.422 1.177h-1.736c-0.174-0.344-0.285-0.747-0.334-1.21-0.615 0.524-1.207 0.894-1.775 1.106-0.568 0.217-1.18 0.324-1.834 0.324-1.076 0-1.904-0.262-2.482-0.788-0.578-0.525-0.867-1.199-0.867-2.016 0-0.481 0.111-0.918 0.328-1.313 0.221-0.398 0.504-0.715 0.861-0.957 0.352-0.238 0.752-0.42 1.193-0.543 0.324-0.087 0.816-0.169 1.477-0.25 1.34-0.16 2.326-0.352 2.961-0.573 0.008-0.228 0.01-0.372 0.01-0.434 0-0.676-0.156-1.153-0.471-1.432-0.424-0.374-1.057-0.561-1.893-0.561-0.781 0-1.357 0.136-1.73 0.41-0.371 0.274-0.646 0.759-0.826 1.452l-1.621-0.222c0.143-0.695 0.387-1.255 0.727-1.685zm-6.74-1.111h1.465v-1.045c0-0.657 0.061-1.146 0.176-1.466 0.16-0.431 0.441-0.78 0.844-1.048 0.406-0.267 0.969-0.401 1.695-0.401 0.465 0 0.982 0.055 1.551 0.167l-0.252 1.449c-0.344-0.062-0.672-0.092-0.977-0.092-0.506 0-0.865 0.107-1.07 0.321-0.211 0.217-0.314 0.62-0.314 1.209v0.905h1.912v1.292h-1.912v8.509h-1.652v-8.509h-1.465v-1.291h-0.001z"/>
+ <path d="m469.5 346.48c-0.764 0-1.406 0.258-1.926 0.766-0.52 0.512-0.805 1.194-0.859 2.047h5.471c-0.074-0.822-0.283-1.441-0.627-1.852-0.532-0.639-1.217-0.961-2.059-0.961z"/>
+ <path d="m341.41 242.86c-0.531-0.64-1.217-0.96-2.061-0.96-0.764 0-1.404 0.256-1.926 0.766-0.518 0.511-0.807 1.195-0.863 2.049h5.475c-0.074-0.823-0.281-1.443-0.625-1.855z"/>
+ <polygon points="188.82 413.46 188.82 420.93 420.93 420.93 420.93 331.74 421.02 331.74 357.3 268.02 357.3 268.11 188.82 268.11 188.82 275.58 166.05 268.05 166.05 283.32 173.52 283.32 165.96 306.18 331.74 306.18 266.76 382.86 166.05 382.86 166.05 420.99" transform="translate(0,10e-4)"/>
+ <path d="m278.95 140.8c-0.527-0.639-1.213-0.958-2.057-0.958-0.764 0-1.402 0.255-1.924 0.767-0.52 0.511-0.809 1.192-0.861 2.048h5.473c-0.076-0.824-0.287-1.444-0.631-1.857z"/>
+ <path d="m313.48 246.6c-0.285 0.122-0.504 0.302-0.656 0.54-0.152 0.235-0.23 0.498-0.23 0.789 0 0.442 0.168 0.811 0.504 1.105 0.334 0.296 0.826 0.443 1.471 0.443 0.641 0 1.209-0.141 1.707-0.42 0.498-0.281 0.861-0.663 1.1-1.15 0.176-0.374 0.266-0.928 0.266-1.66v-0.608c-0.604 0.246-1.508 0.454-2.713 0.628-0.684 0.098-1.168 0.209-1.449 0.333z"/>
+ <path d="m251.02 144.54c-0.281 0.121-0.504 0.302-0.653 0.539-0.155 0.237-0.232 0.501-0.232 0.788 0 0.443 0.169 0.812 0.502 1.107 0.337 0.296 0.827 0.443 1.474 0.443 0.638 0 1.205-0.141 1.704-0.421 0.499-0.277 0.865-0.661 1.1-1.147 0.178-0.374 0.265-0.929 0.265-1.66v-0.609c-0.6 0.246-1.505 0.454-2.709 0.628-0.685 0.098-1.168 0.207-1.451 0.332z"/>
+ <path d="m134.34 239.38c-0.765 0-1.404 0.257-1.925 0.765-0.521 0.513-0.809 1.194-0.861 2.049h5.473c-0.072-0.824-0.283-1.442-0.627-1.853-0.533-0.64-1.218-0.961-2.06-0.961z"/>
+ <path d="m446.3 355.27c-0.604 0-1.07-0.098-1.402-0.287-0.332-0.191-0.566-0.443-0.701-0.754-0.137-0.309-0.205-0.963-0.205-1.959v-5.638h-1.219v-1.292h1.219v-2.43l1.65-0.996v3.422h1.672v1.293h-1.672v5.73c0 0.477 0.031 0.781 0.088 0.914 0.059 0.139 0.154 0.246 0.287 0.324 0.131 0.08 0.318 0.119 0.564 0.119 0.188 0 0.43-0.021 0.732-0.062l0.238 1.467c-0.462 0.099-0.882 0.149-1.251 0.149z"/>
+ <path d="m453.47 347.19c-0.408-0.238-0.812-0.358-1.221-0.358-0.361 0-0.689 0.11-0.977 0.328-0.289 0.218-0.496 0.521-0.617 0.908-0.186 0.591-0.277 1.236-0.277 1.939v5.134h-1.66v-9.803h1.494v1.484c0.383-0.695 0.734-1.153 1.057-1.376 0.324-0.221 0.678-0.332 1.064-0.332 0.562 0 1.131 0.177 1.707 0.534l-0.57 1.542z"/>
+ <path d="m462.94 355.14h-1.486v-1.438c-0.764 1.107-1.799 1.66-3.111 1.66-0.578 0-1.119-0.111-1.619-0.332-0.502-0.221-0.873-0.502-1.117-0.834-0.24-0.336-0.414-0.746-0.514-1.23-0.066-0.328-0.1-0.844-0.1-1.553v-6.072h1.66v5.436c0 0.869 0.033 1.453 0.102 1.754 0.104 0.438 0.326 0.779 0.664 1.027 0.34 0.252 0.756 0.379 1.256 0.379 0.496 0 0.965-0.133 1.402-0.385 0.438-0.254 0.746-0.604 0.928-1.043 0.182-0.441 0.27-1.078 0.27-1.916v-5.25h1.664v9.797h0.001z"/>
+ <path d="m473.93 350.67h-7.309c0.061 1.075 0.363 1.899 0.91 2.47 0.549 0.574 1.23 0.861 2.051 0.861 0.607 0 1.129-0.16 1.559-0.48 0.432-0.318 0.771-0.83 1.025-1.533l1.715 0.213c-0.268 1.004-0.768 1.783-1.5 2.334-0.732 0.555-1.666 0.832-2.807 0.832-1.436 0-2.57-0.441-3.41-1.326-0.842-0.881-1.262-2.119-1.262-3.714 0-1.648 0.426-2.929 1.275-3.839 0.848-0.91 1.949-1.365 3.303-1.365 1.312 0 2.381 0.445 3.211 1.336 0.83 0.893 1.246 2.146 1.246 3.767 0 0.099-0.001 0.247-0.007 0.444z"/>
+ <path d="m273.57 139.85c0.85-0.909 1.949-1.366 3.303-1.366 1.314 0 2.383 0.446 3.213 1.339 0.83 0.894 1.244 2.147 1.244 3.766 0 0.099-0.004 0.246-0.01 0.442h-7.311c0.064 1.076 0.367 1.901 0.914 2.473s1.23 0.859 2.049 0.859c0.609 0 1.127-0.16 1.559-0.48 0.43-0.321 0.771-0.83 1.021-1.531l1.721 0.212c-0.271 1.003-0.773 1.78-1.504 2.334-0.732 0.555-1.67 0.83-2.807 0.83-1.434 0-2.57-0.442-3.41-1.323-0.84-0.884-1.262-2.122-1.262-3.715 0.007-1.65 0.435-2.93 1.28-3.84z"/>
+ <path d="m268.6 144.91c-0.23-0.148-0.793-0.338-1.699-0.564-1.219-0.308-2.062-0.572-2.533-0.798-0.469-0.225-0.826-0.534-1.068-0.932-0.244-0.398-0.365-0.835-0.365-1.315 0-0.438 0.1-0.842 0.301-1.215 0.199-0.372 0.471-0.682 0.816-0.928 0.26-0.189 0.611-0.352 1.057-0.485 0.447-0.13 0.926-0.196 1.434-0.196 0.771 0 1.447 0.111 2.025 0.332 0.582 0.222 1.014 0.523 1.287 0.9 0.279 0.377 0.469 0.886 0.574 1.517l-1.625 0.223c-0.074-0.504-0.287-0.899-0.639-1.182-0.357-0.282-0.855-0.424-1.5-0.424-0.764 0-1.311 0.125-1.635 0.377s-0.492 0.548-0.492 0.886c0 0.216 0.07 0.41 0.205 0.582 0.135 0.178 0.35 0.325 0.637 0.442 0.166 0.062 0.656 0.204 1.467 0.425 1.176 0.313 1.996 0.57 2.459 0.771 0.465 0.199 0.828 0.49 1.096 0.872 0.262 0.381 0.395 0.854 0.395 1.422 0 0.554-0.16 1.075-0.484 1.562-0.324 0.49-0.789 0.869-1.396 1.137-0.609 0.267-1.299 0.401-2.068 0.401-1.273 0-2.244-0.263-2.912-0.794-0.668-0.529-1.092-1.312-1.275-2.353l1.641-0.258c0.092 0.657 0.35 1.161 0.771 1.513 0.422 0.351 1.012 0.526
1.768 0.526 0.764 0 1.328-0.155 1.699-0.467 0.367-0.311 0.553-0.675 0.553-1.093-0.006-0.376-0.168-0.671-0.494-0.884z"/>
+ <rect height="13.528" width="1.659" y="134.97" x="259.15"/>
+ <path d="m249.37 139.81c0.339-0.429 0.826-0.757 1.468-0.989 0.641-0.229 1.381-0.344 2.225-0.344 0.837 0 1.517 0.098 2.039 0.295 0.525 0.197 0.907 0.444 1.153 0.743s0.419 0.675 0.518 1.131c0.057 0.282 0.082 0.793 0.082 1.531v2.214c0 1.545 0.038 2.521 0.108 2.931 0.07 0.408 0.208 0.801 0.417 1.175h-1.734c-0.174-0.344-0.284-0.747-0.333-1.207-0.616 0.523-1.209 0.893-1.779 1.107-0.566 0.215-1.179 0.322-1.83 0.322-1.076 0-1.904-0.264-2.482-0.789-0.576-0.526-0.869-1.199-0.869-2.018 0-0.48 0.111-0.918 0.329-1.314s0.505-0.715 0.859-0.956c0.354-0.239 0.752-0.421 1.195-0.544 0.325-0.086 0.82-0.168 1.476-0.249 1.342-0.161 2.327-0.352 2.961-0.573 0.007-0.228 0.012-0.373 0.012-0.434 0-0.676-0.159-1.153-0.471-1.431-0.427-0.374-1.055-0.562-1.895-0.562-0.78 0-1.356 0.136-1.729 0.41-0.372 0.274-0.649 0.758-0.826 1.455l-1.623-0.223c0.146-0.693 0.39-1.255 0.729-1.681z"/>
+ <path d="m242.64 138.7h1.467v-1.043c0-0.657 0.058-1.146 0.174-1.466 0.162-0.43 0.443-0.78 0.844-1.048 0.405-0.268 0.971-0.4 1.694-0.4 0.469 0 0.984 0.055 1.552 0.164l-0.251 1.448c-0.345-0.06-0.67-0.091-0.978-0.091-0.506 0-0.862 0.108-1.07 0.324-0.211 0.216-0.315 0.617-0.315 1.208v0.903h1.911v1.293h-1.911v8.508h-1.651v-8.508h-1.466v-1.292z"/>
+ <path d="m158.22 436.32h7.65v-53.459h-165.87l64.98-76.681h100.98l-7.74-22.86h7.65v-53.64h0.09l-63.9-63.72 63.9-63.9-7.74-22.86h7.65v-28.079h-43.29c-10.26 0-20.52-12.781-20.52-25.561 0.001-12.78 10.26-25.56 20.52-25.56h86.581c10.26 0 20.52 12.78 20.52 25.561 0 12.779-10.26 25.561-20.52 25.561h-43.111v28.078h7.471l-7.56 22.86 63.72 63.9v-0.09h191.43v15.39h7.65l-7.74 22.86 63.9 63.899-63.9 63.719h0.09v89.372h-232.29v7.65l-22.771-7.711v15.27h7.471l-7.56 23.041h165.78l-64.979 76.5h-100.71v28.078h7.471l-7.56 22.861h43.2c10.26 0 20.52 12.779 20.52 25.561 0 12.777-10.26 25.561-20.52 25.561h-86.581c-10.26 0-20.52-12.783-20.52-25.561 0-12.781 10.26-25.561 20.52-25.561h43.381l-7.74-22.861h7.65v-28.078h-165.87l64.98-76.5h100.98l-7.739-23.04z"/>
+ <path d="m112.15 238.24v1.291h-1.67v5.731c0 0.474 0.028 0.779 0.085 0.914 0.059 0.136 0.154 0.244 0.287 0.322 0.131 0.08 0.321 0.121 0.566 0.121 0.187 0 0.427-0.022 0.729-0.064l0.239 1.467c-0.468 0.099-0.885 0.147-1.254 0.147-0.603 0-1.071-0.096-1.401-0.285-0.332-0.191-0.564-0.442-0.703-0.753-0.135-0.311-0.204-0.966-0.204-1.962v-5.637h-1.218v-1.291h1.218v-2.43l1.653-0.997v3.425h1.673z"/>
+ <path d="m116.27 238.35c0.322-0.22 0.679-0.331 1.065-0.331 0.561 0 1.13 0.177 1.707 0.534l-0.572 1.541c-0.407-0.24-0.812-0.361-1.219-0.361-0.363 0-0.689 0.11-0.978 0.328-0.29 0.219-0.495 0.523-0.616 0.91-0.186 0.59-0.278 1.236-0.278 1.938v5.132h-1.659v-9.8h1.495v1.484c0.381-0.696 0.733-1.153 1.055-1.375z"/>
+ <path d="m121.59 245.43c0.104 0.438 0.325 0.781 0.664 1.03 0.338 0.25 0.756 0.375 1.254 0.375s0.967-0.129 1.401-0.383c0.438-0.255 0.748-0.603 0.93-1.043 0.182-0.439 0.271-1.078 0.271-1.915v-5.25h1.662v9.801h-1.487v-1.44c-0.763 1.106-1.8 1.661-3.11 1.661-0.577 0-1.117-0.112-1.618-0.332-0.501-0.223-0.874-0.502-1.118-0.836-0.242-0.335-0.413-0.745-0.513-1.231-0.068-0.326-0.1-0.843-0.1-1.55v-6.072h1.66v5.436c0 0.864 0.034 1.447 0.104 1.749z"/>
+ <path d="m132.38 246.04c0.549 0.573 1.23 0.859 2.05 0.859 0.609 0 1.128-0.159 1.561-0.48 0.432-0.32 0.771-0.83 1.023-1.532l1.718 0.213c-0.271 1.003-0.772 1.782-1.505 2.334-0.733 0.553-1.667 0.831-2.807 0.831-1.432 0-2.569-0.443-3.411-1.325-0.839-0.882-1.26-2.12-1.26-3.714 0-1.649 0.426-2.929 1.273-3.839 0.852-0.911 1.95-1.365 3.304-1.365 1.311 0 2.383 0.445 3.212 1.336 0.83 0.892 1.245 2.146 1.245 3.766 0 0.099-0.001 0.246-0.009 0.442h-7.31c0.064 1.079 0.367 1.903 0.916 2.474z"/>
+ </g>
+ <g fill="#efeeee">
+ <path d="m148.75 174.05c-0.763 0-1.404 0.255-1.925 0.766-0.52 0.512-0.806 1.193-0.862 2.049h5.473c-0.073-0.824-0.283-1.443-0.628-1.856-0.528-0.641-1.214-0.959-2.058-0.959z"/>
+ <path d="m138.15 174.06c-0.737 0-1.354 0.3-1.851 0.902-0.494 0.604-0.743 1.554-0.743 2.853 0 1.254 0.266 2.193 0.794 2.814s1.154 0.934 1.874 0.934c0.727 0 1.343-0.298 1.852-0.893 0.506-0.594 0.76-1.498 0.76-2.717 0-1.341-0.259-2.325-0.775-2.955-0.517-0.628-1.155-0.938-1.911-0.938z"/>
+ <path d="m165.96 102.06-63.9 63.9 63.9 63.72 63.72-63.72-63.72-63.9zm-0.932 50.138h1.496v1.487c0.381-0.696 0.735-1.154 1.057-1.376 0.324-0.221 0.678-0.332 1.066-0.332 0.56 0 1.128 0.178 1.706 0.534l-0.573 1.54c-0.406-0.239-0.811-0.359-1.219-0.359-0.363 0-0.689 0.11-0.978 0.328-0.288 0.22-0.494 0.521-0.616 0.908-0.186 0.591-0.277 1.236-0.277 1.939v5.132h-1.662v-9.801zm-22.683 30.501h-1.54v-1.235c-0.621 0.973-1.535 1.457-2.74 1.457-0.781 0-1.5-0.217-2.153-0.646-0.656-0.43-1.163-1.031-1.523-1.803-0.361-0.772-0.539-1.66-0.539-2.663 0-0.978 0.162-1.864 0.488-2.662 0.326-0.796 0.814-1.407 1.467-1.832s1.383-0.638 2.188-0.638c0.59 0 1.116 0.125 1.576 0.374 0.461 0.25 0.838 0.573 1.125 0.974v-4.854h1.652v13.528zm1.045-34.228h9.125v1.597h-7.337v4.19h6.35v1.596h-6.35v6.147h-1.79v-13.53h0.002zm9.79 29.752h-7.311c0.062 1.077 0.366 1.9 0.913 2.474 0.547 0.572 1.23 0.859 2.049 0.859 0.607 0 1.128-0.161 1.561-0.482 0.43-0.319 0.771-0.829 1.023-1.531l1.718 0.213c-0.27 1.002-0.772 1.779-1.503 2.3
35-0.733 0.554-1.667 0.829-2.807 0.829-1.434 0-2.569-0.441-3.411-1.322-0.84-0.885-1.26-2.123-1.26-3.717 0-1.647 0.426-2.927 1.274-3.839 0.85-0.909 1.949-1.366 3.303-1.366 1.312 0 2.382 0.446 3.211 1.34 0.83 0.893 1.246 2.147 1.246 3.765 0.001 0.098-0.001 0.245-0.006 0.442zm3.586 4.476h-1.662v-13.528h1.662v13.528zm4.183 0h-1.661v-9.801h1.661v9.801zm0-11.619h-1.661v-1.911h1.661v1.911zm0.011-9.458c-0.724 0.399-1.514 0.599-2.367 0.599-1.373 0-2.481-0.438-3.327-1.319-0.847-0.881-1.27-2.147-1.27-3.801 0-1.815 0.504-3.159 1.515-4.035 0.842-0.725 1.87-1.088 3.082-1.088 1.348 0 2.447 0.442 3.303 1.324 0.854 0.883 1.282 2.102 1.282 3.659 0 1.263-0.188 2.254-0.565 2.977-0.38 0.723-0.93 1.284-1.653 1.684zm6.562 21.077h-1.551l-3.728-9.801h1.754l2.104 5.87c0.227 0.633 0.438 1.291 0.628 1.974 0.146-0.516 0.355-1.137 0.619-1.864l2.179-5.979h1.706l-3.711 9.8zm3.141-25.563c0-1.06 0.174-1.985 0.524-2.777 0.352-0.792 0.885-1.388 1.603-1.786 0.717-0.398 1.496-0.595 2.341-0.595 1.063 0 1.934 0.27 2.611 0
.809 0.677 0.537 1.11 1.303 1.302 2.292l-1.615 0.251c-0.153-0.659-0.428-1.153-0.816-1.487-0.392-0.333-0.862-0.498-1.418-0.498-0.837 0-1.517 0.3-2.039 0.899-0.522 0.601-0.784 1.55-0.784 2.848 0 1.316 0.252 2.273 0.756 2.871s1.163 0.895 1.975 0.895c0.651 0 1.196-0.199 1.634-0.599 0.438-0.401 0.714-1.017 0.83-1.846l1.633 0.212c-0.179 1.125-0.636 2.008-1.369 2.645-0.736 0.637-1.639 0.953-2.71 0.953-1.341 0-2.419-0.436-3.234-1.313s-1.224-2.139-1.224-3.774zm10.584 21.087h-7.311c0.062 1.077 0.365 1.9 0.914 2.474 0.548 0.572 1.229 0.859 2.05 0.859 0.607 0 1.128-0.161 1.558-0.482 0.432-0.319 0.772-0.829 1.025-1.531l1.716 0.213c-0.271 1.002-0.771 1.779-1.505 2.335-0.731 0.554-1.666 0.829-2.806 0.829-1.433 0-2.569-0.441-3.411-1.322-0.838-0.885-1.26-2.123-1.26-3.717 0-1.647 0.424-2.927 1.275-3.839 0.85-0.909 1.948-1.366 3.302-1.366 1.311 0 2.382 0.446 3.212 1.34 0.83 0.893 1.246 2.147 1.246 3.765 0.003 0.098 0.001 0.245-0.005 0.442zm-1.105-21.04c0-1.648 0.425-2.929 1.274-3.839 0.85-0.909 1.948-
1.366 3.304-1.366 1.31 0 2.381 0.446 3.211 1.339 0.829 0.894 1.245 2.147 1.245 3.766 0 0.099-0.003 0.246-0.009 0.442h-7.31c0.062 1.076 0.366 1.901 0.914 2.473s1.23 0.859 2.049 0.859c0.608 0 1.128-0.16 1.559-0.48 0.43-0.321 0.772-0.83 1.024-1.531l1.718 0.212c-0.273 1.003-0.773 1.78-1.506 2.334-0.732 0.555-1.667 0.83-2.806 0.83-1.434 0-2.571-0.442-3.411-1.323-0.836-0.885-1.256-2.124-1.256-3.716zm7.798 17.571c-0.406-0.239-0.811-0.36-1.217-0.36-0.365 0-0.69 0.11-0.978 0.328-0.291 0.22-0.497 0.521-0.62 0.908-0.187 0.591-0.277 1.238-0.277 1.939v5.132h-1.662v-9.802h1.496v1.487c0.381-0.694 0.735-1.154 1.057-1.374 0.324-0.223 0.68-0.334 1.066-0.334 0.56 0 1.128 0.179 1.707 0.535l-0.572 1.541zm6.461 7.945h-1.892v-1.892h1.892v1.892zm1.375-6.616c-0.542 0.48-0.896 0.833-1.062 1.059-0.165 0.228-0.289 0.49-0.369 0.785-0.078 0.296-0.125 0.776-0.138 1.441h-1.597c-0.006-0.223-0.009-0.388-0.009-0.499 0-0.651 0.091-1.215 0.276-1.688 0.135-0.356 0.353-0.716 0.655-1.08 0.222-0.266 0.62-0.649 1.195-1.159
0.576-0.508 0.948-0.913 1.121-1.213 0.174-0.302 0.261-0.631 0.261-0.987 0-0.646-0.254-1.213-0.758-1.702-0.504-0.49-1.122-0.733-1.855-0.733-0.706 0-1.297 0.22-1.771 0.663-0.472 0.442-0.783 1.134-0.932 2.075l-1.708-0.203c0.153-1.261 0.61-2.227 1.371-2.898s1.765-1.006 3.014-1.006c1.323 0 2.378 0.359 3.164 1.08 0.786 0.72 1.182 1.592 1.182 2.611 0 0.591-0.139 1.135-0.415 1.633-0.275 0.498-0.818 1.108-1.625 1.821z"/>
+ <path d="m186.8 154.3c-0.528-0.639-1.215-0.958-2.059-0.958-0.764 0-1.404 0.255-1.925 0.767-0.519 0.511-0.808 1.192-0.862 2.048h5.474c-0.073-0.824-0.282-1.444-0.628-1.857z"/>
+ <path d="m158.59 153.36c-0.831 0-1.521 0.31-2.067 0.932-0.548 0.623-0.82 1.561-0.82 2.816 0 1.254 0.272 2.193 0.82 2.818 0.547 0.625 1.236 0.937 2.067 0.937 0.823 0 1.51-0.314 2.059-0.942s0.82-1.584 0.82-2.869c0-1.211-0.275-2.131-0.825-2.754-0.551-0.628-1.238-0.938-2.054-0.938z"/>
+ <path d="m176.82 174.05c-0.764 0-1.405 0.255-1.926 0.766-0.52 0.512-0.807 1.193-0.861 2.049h5.475c-0.074-0.824-0.284-1.443-0.629-1.856-0.531-0.641-1.216-0.959-2.059-0.959z"/>
+ </g>
+ <g fill="#010101">
+ <path d="m166.69 156.87c0-0.703 0.092-1.349 0.277-1.939 0.122-0.387 0.329-0.688 0.616-0.908 0.291-0.218 0.616-0.328 0.978-0.328 0.408 0 0.812 0.12 1.219 0.359l0.573-1.54c-0.578-0.356-1.146-0.534-1.706-0.534-0.389 0-0.744 0.111-1.066 0.332-0.321 0.222-0.676 0.68-1.057 1.376v-1.487h-1.496v9.8h1.662v-5.131z"/>
+ <polygon points="145.18 154.26 145.18 150.07 152.52 150.07 152.52 148.47 143.39 148.47 143.39 162 145.18 162 145.18 155.85 151.53 155.85 151.53 154.26" transform="translate(0,10e-4)"/>
+ <path d="m163.18 156.96c0-1.559-0.429-2.776-1.282-3.661-0.855-0.881-1.958-1.324-3.303-1.324-1.212 0-2.24 0.364-3.082 1.09-1.011 0.872-1.515 2.218-1.515 4.034 0 1.654 0.423 2.922 1.27 3.801 0.846 0.879 1.954 1.32 3.327 1.32 0.854 0 1.644-0.201 2.367-0.601 0.723-0.398 1.273-0.961 1.652-1.685 0.377-0.722 0.566-1.713 0.566-2.974zm-2.529 2.953c-0.547 0.628-1.235 0.942-2.059 0.942-0.83 0-1.52-0.312-2.066-0.937-0.548-0.625-0.822-1.564-0.822-2.818 0-1.256 0.274-2.193 0.822-2.816 0.547-0.621 1.236-0.932 2.066-0.932 0.818 0 1.503 0.311 2.054 0.938 0.551 0.625 0.823 1.543 0.823 2.754 0.003 1.285-0.271 2.241-0.818 2.869z"/>
+ <path d="m177.83 161.27c0.733-0.637 1.19-1.52 1.369-2.645l-1.632-0.211c-0.117 0.829-0.396 1.444-0.831 1.844-0.438 0.398-0.98 0.601-1.634 0.601-0.812 0-1.471-0.3-1.975-0.896s-0.756-1.553-0.756-2.871c0-1.297 0.263-2.245 0.784-2.848 0.522-0.599 1.202-0.9 2.039-0.9 0.556 0 1.026 0.167 1.418 0.5 0.391 0.332 0.662 0.827 0.816 1.485l1.615-0.249c-0.191-0.99-0.625-1.756-1.302-2.294-0.678-0.539-1.546-0.809-2.611-0.809-0.845 0-1.624 0.198-2.341 0.597-0.717 0.396-1.251 0.991-1.603 1.786-0.351 0.793-0.524 1.719-0.524 2.777 0 1.635 0.406 2.892 1.222 3.769 0.815 0.875 1.894 1.313 3.234 1.313 1.073 0.005 1.977-0.313 2.712-0.949z"/>
+ <path d="m187.62 161.39c0.732-0.556 1.231-1.332 1.505-2.334l-1.717-0.214c-0.254 0.702-0.596 1.212-1.024 1.532-0.431 0.32-0.951 0.481-1.56 0.481-0.819 0-1.501-0.287-2.049-0.859-0.548-0.573-0.852-1.396-0.914-2.474h7.311c0.005-0.195 0.008-0.344 0.008-0.443 0-1.617-0.414-2.872-1.244-3.765-0.83-0.894-1.902-1.34-3.212-1.34-1.354 0-2.455 0.456-3.304 1.366-0.849 0.912-1.273 2.191-1.273 3.84 0 1.594 0.419 2.831 1.26 3.716 0.841 0.881 1.977 1.323 3.411 1.323 1.135 0.002 2.07-0.275 2.802-0.829zm-4.804-7.28c0.521-0.512 1.162-0.767 1.926-0.767 0.842 0 1.528 0.319 2.059 0.958 0.344 0.413 0.554 1.033 0.629 1.856h-5.476c0.056-0.854 0.344-1.537 0.862-2.047z"/>
+ <rect height="9.801" width="1.661" y="172.9" x="159.29"/>
+ <rect height="1.911" width="1.661" y="169.17" x="159.29"/>
+ <path d="m167.35 178.88c-0.265 0.725-0.473 1.349-0.62 1.864-0.191-0.683-0.399-1.341-0.627-1.974l-2.104-5.87h-1.753l3.727 9.801h1.551l3.709-9.801h-1.706l-2.177 5.98z"/>
+ <path d="m148.73 172.68c-1.354 0-2.456 0.455-3.304 1.367-0.85 0.91-1.273 2.189-1.273 3.839 0 1.593 0.418 2.831 1.26 3.715 0.838 0.881 1.976 1.323 3.41 1.323 1.138 0 2.071-0.277 2.807-0.83 0.732-0.555 1.232-1.331 1.503-2.334l-1.718-0.213c-0.252 0.702-0.594 1.212-1.024 1.532-0.43 0.319-0.949 0.48-1.561 0.48-0.819 0-1.501-0.287-2.048-0.859-0.547-0.571-0.854-1.396-0.912-2.473h7.309c0.006-0.196 0.01-0.345 0.01-0.442 0-1.619-0.414-2.873-1.246-3.766s-1.903-1.339-3.213-1.339zm-2.769 4.181c0.057-0.855 0.343-1.537 0.862-2.049 0.521-0.511 1.163-0.766 1.925-0.766 0.843 0 1.528 0.319 2.058 0.958 0.344 0.413 0.555 1.032 0.628 1.856h-5.473z"/>
+ <path d="m140.69 174.02c-0.29-0.399-0.664-0.723-1.125-0.974-0.46-0.251-0.986-0.375-1.576-0.375-0.807 0-1.535 0.213-2.188 0.638-0.652 0.424-1.141 1.036-1.467 1.833s-0.488 1.685-0.488 2.662c0 1.002 0.178 1.889 0.539 2.661 0.36 0.772 0.867 1.375 1.523 1.804 0.653 0.43 1.372 0.646 2.153 0.646 1.206 0 2.119-0.486 2.74-1.459v1.236h1.54v-13.526h-1.652v4.854zm-0.621 6.64c-0.509 0.595-1.125 0.893-1.852 0.893-0.72 0-1.346-0.31-1.874-0.934-0.528-0.623-0.794-1.561-0.794-2.814 0-1.299 0.249-2.249 0.743-2.853 0.495-0.603 1.113-0.902 1.851-0.902 0.756 0 1.394 0.312 1.911 0.941 0.52 0.628 0.776 1.612 0.776 2.954-0.001 1.217-0.255 2.123-0.761 2.715z"/>
+ <rect height="13.528" width="1.662" y="169.17" x="155.1"/>
+ <path d="m185.74 173.01c-0.321 0.222-0.676 0.68-1.057 1.376v-1.487h-1.496v9.801h1.662v-5.131c0-0.703 0.091-1.349 0.277-1.939 0.122-0.387 0.329-0.688 0.62-0.908 0.288-0.218 0.614-0.328 0.978-0.328 0.406 0 0.811 0.12 1.217 0.358l0.572-1.539c-0.578-0.356-1.147-0.535-1.707-0.535-0.386-0.001-0.742 0.109-1.066 0.332z"/>
+ <path d="m176.8 172.68c-1.354 0-2.455 0.455-3.304 1.367-0.85 0.91-1.274 2.189-1.274 3.839 0 1.593 0.42 2.831 1.26 3.715 0.841 0.881 1.977 1.323 3.412 1.323 1.137 0 2.072-0.277 2.805-0.83 0.734-0.552 1.233-1.331 1.505-2.334l-1.717-0.213c-0.254 0.702-0.594 1.212-1.024 1.532-0.43 0.319-0.95 0.48-1.559 0.48-0.818 0-1.501-0.287-2.048-0.859-0.549-0.571-0.854-1.396-0.914-2.473h7.309c0.006-0.196 0.01-0.345 0.01-0.442 0-1.619-0.416-2.873-1.246-3.766-0.83-0.892-1.903-1.339-3.215-1.339zm-2.77 4.181c0.057-0.855 0.342-1.537 0.862-2.049 0.521-0.511 1.161-0.766 1.925-0.766 0.842 0 1.527 0.319 2.059 0.958 0.345 0.413 0.555 1.032 0.628 1.856h-5.474z"/>
+ <path d="m196.64 170.02c-0.788-0.72-1.841-1.08-3.164-1.08-1.249 0-2.253 0.334-3.014 1.006-0.76 0.672-1.217 1.639-1.371 2.899l1.708 0.202c0.148-0.94 0.457-1.632 0.932-2.075 0.477-0.442 1.065-0.664 1.771-0.664 0.733 0 1.35 0.245 1.855 0.734 0.504 0.487 0.758 1.058 0.758 1.703 0 0.354-0.087 0.686-0.261 0.985-0.172 0.301-0.545 0.708-1.121 1.214-0.575 0.508-0.974 0.895-1.195 1.158-0.3 0.364-0.52 0.724-0.655 1.08-0.186 0.474-0.276 1.037-0.276 1.688 0 0.111 0.002 0.278 0.009 0.5h1.597c0.013-0.665 0.058-1.146 0.138-1.44 0.081-0.296 0.204-0.558 0.369-0.785 0.166-0.228 0.521-0.581 1.062-1.06 0.807-0.714 1.349-1.319 1.623-1.818 0.276-0.5 0.414-1.042 0.414-1.633 0.002-1.024-0.393-1.894-1.179-2.614z"/>
+ <rect height="1.892" width="1.892" y="180.81" x="192.51"/>
+ </g>
+ <g fill="#efeeee">
+ <path d="m421.02 331.74 63.9-63.719-63.9-63.899-63.721 63.899 63.721 63.719zm-6.455-41.759h-1.66v-9.802h1.66v9.802zm0-11.619h-1.66v-1.911h1.66v1.911zm31.467 11.619h-1.893v-1.892h1.893v1.892zm12.709-30.501h1.494v1.488c0.383-0.695 0.734-1.154 1.059-1.375 0.324-0.222 0.678-0.333 1.064-0.333 0.561 0 1.129 0.178 1.707 0.534l-0.572 1.54c-0.406-0.239-0.812-0.358-1.219-0.358-0.363 0-0.689 0.108-0.979 0.325-0.287 0.218-0.494 0.522-0.619 0.911-0.184 0.589-0.275 1.236-0.275 1.937v5.133h-1.66v-9.802zm-9.519 0.869c0.842-0.726 1.869-1.089 3.08-1.089 1.35 0 2.449 0.442 3.305 1.324 0.852 0.884 1.281 2.103 1.281 3.659 0 1.262-0.189 2.254-0.564 2.976-0.381 0.725-0.932 1.284-1.652 1.685-0.723 0.399-1.512 0.6-2.369 0.6-1.371 0-2.48-0.439-3.326-1.319-0.844-0.88-1.271-2.147-1.271-3.803-0.002-1.817 0.506-3.16 1.516-4.033zm-6.856-0.869h1.219v-2.426l1.65-0.998v3.424h1.67v1.293h-1.67v5.731c0 0.474 0.029 0.778 0.088 0.913s0.152 0.242 0.287 0.323c0.131 0.079 0.32 0.118 0.566 0.118 0.186 0 0.43-0.021 0.729-
0.062l0.24 1.466c-0.469 0.099-0.885 0.147-1.254 0.147-0.605 0-1.072-0.095-1.402-0.286-0.33-0.19-0.566-0.442-0.703-0.752-0.139-0.31-0.203-0.966-0.203-1.961v-5.639h-1.217v-1.291zm2.733 16.742c1.324 0 2.379 0.36 3.166 1.08s1.182 1.592 1.182 2.612c0 0.589-0.139 1.134-0.414 1.632-0.279 0.5-0.82 1.106-1.625 1.819-0.541 0.48-0.898 0.833-1.062 1.06-0.166 0.227-0.287 0.489-0.369 0.785-0.08 0.295-0.125 0.775-0.137 1.438h-1.596c-0.008-0.22-0.012-0.387-0.012-0.498 0-0.65 0.092-1.214 0.279-1.688 0.135-0.356 0.352-0.716 0.654-1.079 0.219-0.265 0.619-0.65 1.195-1.159 0.576-0.508 0.949-0.913 1.119-1.214 0.176-0.3 0.26-0.63 0.26-0.985 0-0.647-0.25-1.215-0.754-1.703s-1.123-0.732-1.854-0.732c-0.711 0-1.301 0.222-1.771 0.663-0.475 0.443-0.785 1.135-0.934 2.075l-1.707-0.203c0.15-1.262 0.607-2.226 1.371-2.897 0.755-0.671 1.759-1.006 3.009-1.006zm-12.25-16.742h1.512v1.275c0.357-0.499 0.762-0.871 1.211-1.121 0.447-0.251 0.994-0.374 1.633-0.374 0.838 0 1.576 0.216 2.213 0.646 0.639 0.43 1.123 1.038 1.451 1.
823 0.324 0.785 0.486 1.646 0.486 2.579 0 1.002-0.182 1.906-0.541 2.71-0.359 0.802-0.883 1.418-1.568 1.845-0.688 0.426-1.408 0.641-2.164 0.641-0.557 0-1.051-0.117-1.49-0.351-0.441-0.234-0.803-0.529-1.086-0.886v4.771h-1.66v-13.558h0.003zm4.035 26.914c-0.227-0.148-0.795-0.338-1.697-0.565-1.221-0.307-2.064-0.571-2.533-0.797-0.473-0.225-0.828-0.534-1.07-0.933-0.242-0.397-0.367-0.834-0.367-1.316 0-0.437 0.102-0.84 0.303-1.213 0.197-0.372 0.471-0.68 0.816-0.927 0.258-0.19 0.609-0.351 1.057-0.483 0.445-0.132 0.924-0.198 1.434-0.198 0.77 0 1.445 0.111 2.025 0.333 0.582 0.221 1.01 0.522 1.287 0.899 0.277 0.379 0.469 0.884 0.572 1.518l-1.623 0.222c-0.074-0.504-0.289-0.898-0.641-1.18-0.352-0.284-0.854-0.427-1.498-0.427-0.764 0-1.311 0.126-1.637 0.378s-0.486 0.548-0.486 0.887c0 0.217 0.066 0.408 0.203 0.582 0.133 0.177 0.348 0.324 0.635 0.443 0.17 0.06 0.656 0.202 1.469 0.424 1.176 0.312 1.996 0.569 2.459 0.77 0.465 0.201 0.828 0.489 1.094 0.871 0.264 0.382 0.398 0.855 0.398 1.423 0 0.554-0.162
1.074-0.486 1.563-0.322 0.489-0.787 0.868-1.398 1.134-0.609 0.27-1.299 0.402-2.066 0.402-1.273 0-2.244-0.265-2.912-0.794s-1.094-1.312-1.279-2.353l1.645-0.261c0.092 0.66 0.348 1.164 0.77 1.516 0.422 0.351 1.01 0.525 1.77 0.525s1.328-0.155 1.697-0.467c0.369-0.311 0.553-0.675 0.553-1.092-0.004-0.377-0.17-0.672-0.494-0.884zm-8.166-30.642h1.66v1.911h-1.66v-1.911zm0 3.728h1.66v9.802h-1.66v-9.802zm1.467 20.7v1.293h-1.67v5.731c0 0.474 0.029 0.778 0.086 0.913 0.061 0.135 0.154 0.242 0.287 0.323 0.133 0.078 0.32 0.118 0.566 0.118 0.186 0 0.426-0.021 0.729-0.063l0.24 1.467c-0.467 0.098-0.887 0.147-1.254 0.147-0.604 0-1.072-0.095-1.402-0.286-0.332-0.191-0.566-0.443-0.701-0.752-0.139-0.31-0.203-0.966-0.203-1.961v-5.639h-1.221v-1.293h1.221v-2.427l1.652-0.997v3.424l1.67 0.002zm-7.79-20.7h1.494v1.488c0.383-0.695 0.736-1.154 1.057-1.375 0.326-0.222 0.68-0.333 1.066-0.333 0.561 0 1.131 0.178 1.709 0.534l-0.572 1.54c-0.406-0.239-0.812-0.358-1.221-0.358-0.361 0-0.689 0.108-0.977 0.325-0.289 0.218-0.49
4 0.522-0.619 0.911-0.186 0.589-0.277 1.236-0.277 1.937v5.133h-1.66v-9.802zm-0.115 20.812c0.58 0.222 1.012 0.521 1.287 0.9 0.273 0.377 0.465 0.884 0.574 1.517l-1.625 0.222c-0.074-0.503-0.289-0.898-0.643-1.181s-0.854-0.425-1.5-0.425c-0.762 0-1.307 0.126-1.633 0.378s-0.488 0.548-0.488 0.886c0 0.216 0.066 0.408 0.201 0.582 0.139 0.178 0.35 0.325 0.639 0.441 0.168 0.062 0.656 0.204 1.469 0.426 1.174 0.312 1.992 0.57 2.457 0.77 0.463 0.2 0.83 0.49 1.094 0.871 0.264 0.383 0.396 0.855 0.396 1.422 0 0.555-0.162 1.075-0.484 1.564-0.324 0.49-0.789 0.867-1.398 1.134-0.607 0.27-1.297 0.401-2.064 0.401-1.277 0-2.244-0.264-2.912-0.793s-1.094-1.312-1.277-2.354l1.641-0.259c0.094 0.66 0.352 1.163 0.771 1.515 0.42 0.35 1.012 0.525 1.766 0.525 0.766 0 1.33-0.155 1.699-0.466 0.369-0.312 0.557-0.675 0.557-1.094 0-0.374-0.168-0.671-0.49-0.885-0.229-0.147-0.795-0.337-1.697-0.564-1.219-0.308-2.062-0.572-2.535-0.797-0.467-0.226-0.826-0.534-1.07-0.933-0.242-0.396-0.365-0.835-0.365-1.315 0-0.437 0.102-0.84 0.
303-1.213 0.199-0.372 0.471-0.681 0.816-0.927 0.26-0.191 0.611-0.352 1.059-0.485 0.445-0.131 0.924-0.196 1.434-0.196 0.762 0.001 1.436 0.112 2.018 0.333zm-9.373-18.651c0.352-0.794 0.883-1.389 1.602-1.786 0.717-0.398 1.496-0.595 2.34-0.595 1.064 0 1.936 0.267 2.611 0.809 0.678 0.539 1.111 1.302 1.301 2.292l-1.611 0.25c-0.154-0.658-0.428-1.154-0.818-1.486-0.393-0.333-0.863-0.499-1.418-0.499-0.836 0-1.518 0.301-2.039 0.899-0.523 0.6-0.785 1.549-0.785 2.848 0 1.316 0.252 2.273 0.756 2.871s1.164 0.896 1.977 0.896c0.648 0 1.197-0.2 1.633-0.6 0.438-0.399 0.713-1.015 0.83-1.845l1.631 0.212c-0.176 1.125-0.633 2.008-1.367 2.644-0.736 0.638-1.637 0.957-2.711 0.957-1.34 0-2.418-0.438-3.234-1.315-0.814-0.875-1.223-2.133-1.223-3.769-0.002-1.066 0.174-1.989 0.525-2.783zm-4.094 4.052c-0.23-0.147-0.795-0.338-1.699-0.565-1.219-0.307-2.062-0.571-2.535-0.797-0.469-0.225-0.826-0.534-1.068-0.933-0.244-0.397-0.365-0.834-0.365-1.315 0-0.438 0.1-0.841 0.303-1.213 0.197-0.373 0.471-0.68 0.814-0.928 0.262-0.1
9 0.613-0.35 1.059-0.483 0.447-0.132 0.926-0.198 1.434-0.198 0.77 0 1.443 0.111 2.025 0.333 0.58 0.222 1.012 0.522 1.287 0.899 0.273 0.379 0.465 0.884 0.574 1.518l-1.625 0.222c-0.074-0.504-0.289-0.898-0.643-1.18-0.354-0.284-0.854-0.427-1.5-0.427-0.762 0-1.307 0.127-1.633 0.379s-0.488 0.547-0.488 0.886c0 0.217 0.066 0.409 0.201 0.582 0.139 0.177 0.35 0.325 0.639 0.443 0.168 0.06 0.656 0.202 1.469 0.424 1.174 0.313 1.992 0.569 2.457 0.771 0.463 0.2 0.83 0.488 1.094 0.87s0.396 0.855 0.396 1.423c0 0.555-0.162 1.074-0.484 1.563-0.324 0.489-0.789 0.868-1.395 1.134-0.611 0.27-1.301 0.402-2.068 0.402-1.275 0-2.244-0.265-2.912-0.793-0.668-0.53-1.094-1.312-1.277-2.354l1.643-0.26c0.092 0.659 0.35 1.163 0.77 1.515 0.42 0.351 1.012 0.525 1.766 0.525 0.766 0 1.33-0.155 1.699-0.467 0.369-0.311 0.557-0.675 0.557-1.092-0.008-0.375-0.17-0.671-0.495-0.884zm-6.285 14.487h2.074l1.506 2.3c0.283 0.437 0.512 0.801 0.682 1.097 0.271-0.405 0.52-0.765 0.748-1.078l1.652-2.318h1.984l-3.387 4.614 3.645 5.186h-2.
039l-2.014-3.045-0.533-0.821-2.576 3.866h-2.012l3.58-5.095-3.31-4.706zm-0.951 5.327h-7.311c0.062 1.076 0.367 1.9 0.914 2.473s1.23 0.859 2.047 0.859c0.609 0 1.129-0.16 1.561-0.481 0.432-0.32 0.773-0.83 1.025-1.532l1.717 0.214c-0.27 1.002-0.773 1.78-1.504 2.334-0.732 0.555-1.666 0.83-2.807 0.83-1.434 0-2.57-0.442-3.41-1.325-0.838-0.882-1.26-2.12-1.26-3.713 0-1.648 0.424-2.929 1.273-3.84s1.949-1.365 3.305-1.365c1.309 0 2.381 0.445 3.213 1.338 0.828 0.893 1.244 2.148 1.244 3.767 0.003 0.095 0.001 0.244-0.007 0.441zm-7.758-24.882c0.85-0.911 1.951-1.365 3.303-1.365 1.312 0 2.383 0.445 3.213 1.338 0.828 0.894 1.244 2.148 1.244 3.767 0 0.099-0.002 0.246-0.008 0.443h-7.311c0.062 1.075 0.367 1.899 0.914 2.473 0.549 0.571 1.23 0.858 2.051 0.858 0.607 0 1.127-0.16 1.557-0.481 0.43-0.32 0.773-0.83 1.025-1.531l1.717 0.213c-0.27 1.002-0.773 1.78-1.506 2.334-0.732 0.555-1.666 0.83-2.805 0.83-1.436 0-2.572-0.441-3.41-1.325-0.84-0.882-1.26-2.12-1.26-3.713 0.001-1.65 0.429-2.93 1.276-3.841zm-9.341-4.8
73c1.051 0 1.855 0.064 2.406 0.196 0.779 0.177 1.439 0.499 1.988 0.968 0.713 0.603 1.246 1.373 1.598 2.312 0.357 0.939 0.533 2.012 0.533 3.217 0 1.028-0.119 1.939-0.359 2.733-0.244 0.793-0.549 1.45-0.926 1.969-0.375 0.521-0.785 0.931-1.23 1.228-0.447 0.299-0.984 0.525-1.617 0.679-0.627 0.152-1.352 0.229-2.172 0.229h-4.881v-13.529l4.66-0.002z"/>
+ <path d="m386.6 267.44c0.506-0.166 0.912-0.4 1.213-0.703 0.426-0.424 0.754-0.994 0.992-1.711 0.234-0.717 0.354-1.586 0.354-2.608 0-1.415-0.232-2.502-0.695-3.261-0.465-0.76-1.027-1.27-1.693-1.529-0.48-0.186-1.254-0.277-2.316-0.277h-2.842v10.336h2.889c0.889 0.002 1.59-0.083 2.098-0.247z"/>
+ <path d="m452.3 268.14c0.824 0 1.51-0.313 2.061-0.941 0.547-0.628 0.82-1.584 0.82-2.87 0-1.21-0.275-2.131-0.824-2.755-0.553-0.624-1.236-0.937-2.055-0.937-0.83 0-1.521 0.31-2.064 0.934-0.549 0.622-0.822 1.56-0.822 2.813 0 1.256 0.273 2.194 0.822 2.819 0.54 0.625 1.23 0.937 2.062 0.937z"/>
+ <path d="m399.2 261.58c-0.529-0.639-1.215-0.96-2.059-0.96-0.766 0-1.404 0.255-1.926 0.768-0.52 0.511-0.809 1.192-0.859 2.047h5.471c-0.07-0.824-0.281-1.443-0.627-1.855z"/>
+ <path d="m397.15 281.32c-0.764 0-1.404 0.255-1.924 0.768-0.52 0.511-0.809 1.192-0.859 2.048h5.469c-0.074-0.825-0.281-1.443-0.627-1.856-0.529-0.639-1.215-0.96-2.059-0.96z"/>
+ <path d="m436.98 268.14c0.738 0 1.367-0.312 1.893-0.937 0.527-0.625 0.787-1.593 0.787-2.904 0-1.248-0.254-2.182-0.768-2.805-0.514-0.621-1.127-0.934-1.84-0.934-0.709 0-1.336 0.332-1.877 0.993-0.547 0.661-0.818 1.62-0.818 2.884 0 1.261 0.256 2.191 0.766 2.794 0.509 0.604 1.13 0.909 1.857 0.909z"/>
+ </g>
+ <g fill="#010101">
+ <path d="m384.7 269.28c0.82 0 1.545-0.076 2.172-0.23 0.633-0.152 1.17-0.38 1.617-0.679 0.445-0.299 0.855-0.708 1.23-1.229 0.377-0.52 0.682-1.174 0.926-1.969 0.24-0.794 0.359-1.703 0.359-2.731 0-1.206-0.176-2.279-0.533-3.217-0.352-0.938-0.885-1.71-1.598-2.313-0.549-0.467-1.209-0.789-1.988-0.968-0.551-0.13-1.355-0.194-2.406-0.194h-4.66v13.528h4.881v0.002zm-3.09-11.931h2.842c1.062 0 1.836 0.091 2.316 0.276 0.666 0.259 1.229 0.768 1.693 1.528 0.463 0.759 0.695 1.847 0.695 3.263 0 1.02-0.119 1.889-0.354 2.608-0.238 0.716-0.566 1.286-0.992 1.711-0.301 0.3-0.707 0.534-1.213 0.702-0.508 0.165-1.209 0.25-2.1 0.25h-2.889v-10.338h0.002z"/>
+ <path d="m460.4 264.15c0-0.7 0.092-1.348 0.275-1.937 0.125-0.389 0.332-0.693 0.619-0.911 0.289-0.217 0.617-0.325 0.979-0.325 0.406 0 0.812 0.119 1.219 0.358l0.57-1.54c-0.576-0.356-1.145-0.534-1.705-0.534-0.387 0-0.744 0.111-1.064 0.333-0.324 0.221-0.676 0.68-1.059 1.375v-1.488h-1.494v9.802h1.66v-5.133z"/>
+ <path d="m443.59 266.41c0 0.996 0.068 1.649 0.203 1.959s0.371 0.562 0.703 0.752c0.33 0.191 0.799 0.287 1.4 0.287 0.369 0 0.789-0.049 1.256-0.147l-0.24-1.467c-0.301 0.043-0.545 0.064-0.729 0.064-0.246 0-0.436-0.04-0.568-0.12-0.133-0.078-0.229-0.186-0.285-0.323-0.061-0.135-0.088-0.438-0.088-0.913v-5.731h1.67v-1.291h-1.67v-3.423l-1.652 0.996v2.427h-1.217v1.291h1.217v5.639z"/>
+ <path d="m452.3 269.5c0.855 0 1.645-0.2 2.367-0.6 0.725-0.4 1.275-0.96 1.652-1.685 0.379-0.722 0.566-1.716 0.566-2.976 0-1.557-0.426-2.775-1.283-3.659-0.855-0.882-1.955-1.324-3.303-1.324-1.211 0-2.238 0.363-3.082 1.089-1.01 0.873-1.512 2.217-1.512 4.032 0 1.655 0.422 2.924 1.268 3.803 0.844 0.88 1.954 1.32 3.327 1.32zm-2.069-7.936c0.547-0.621 1.236-0.934 2.066-0.934 0.82 0 1.504 0.312 2.055 0.937 0.549 0.624 0.822 1.542 0.822 2.755 0 1.286-0.273 2.243-0.818 2.87-0.547 0.626-1.236 0.941-2.059 0.941-0.83 0-1.52-0.312-2.068-0.937-0.547-0.625-0.82-1.563-0.82-2.819 0-1.253 0.275-2.193 0.822-2.813z"/>
+ <path d="m407.05 268.14c-0.758 0-1.348-0.175-1.768-0.525-0.42-0.352-0.678-0.855-0.771-1.515l-1.643 0.26c0.186 1.041 0.611 1.823 1.279 2.354 0.666 0.528 1.637 0.793 2.912 0.793 0.768 0 1.457-0.133 2.066-0.402 0.609-0.266 1.074-0.645 1.396-1.134 0.324-0.489 0.486-1.012 0.486-1.563 0-0.566-0.135-1.041-0.398-1.423s-0.629-0.67-1.092-0.87c-0.465-0.201-1.285-0.457-2.459-0.771-0.811-0.222-1.301-0.364-1.467-0.424-0.291-0.118-0.502-0.267-0.639-0.443-0.139-0.173-0.203-0.365-0.203-0.582 0-0.339 0.162-0.634 0.486-0.886 0.328-0.252 0.871-0.379 1.637-0.379 0.646 0 1.146 0.143 1.498 0.427 0.354 0.281 0.568 0.676 0.643 1.18l1.623-0.222c-0.105-0.634-0.295-1.139-0.572-1.518-0.277-0.377-0.709-0.678-1.285-0.899-0.584-0.222-1.258-0.333-2.025-0.333-0.514 0-0.99 0.066-1.436 0.198-0.447 0.134-0.799 0.293-1.059 0.483-0.344 0.248-0.617 0.557-0.816 0.928-0.199 0.372-0.301 0.777-0.301 1.213 0 0.481 0.121 0.918 0.363 1.315 0.246 0.396 0.6 0.708 1.07 0.933 0.473 0.226 1.316 0.49 2.535 0.797 0.902 0.228 1.471
0.418 1.697 0.565 0.328 0.214 0.49 0.51 0.49 0.885 0 0.417-0.188 0.782-0.555 1.092-0.368 0.309-0.93 0.466-1.692 0.466z"/>
+ <rect height="1.911" width="1.66" y="255.75" x="428.72"/>
+ <path d="m434.51 268.27c0.281 0.356 0.645 0.651 1.086 0.886 0.439 0.233 0.938 0.351 1.49 0.351 0.756 0 1.479-0.215 2.164-0.641 0.686-0.428 1.207-1.045 1.57-1.845 0.359-0.803 0.539-1.708 0.539-2.71 0-0.935-0.162-1.794-0.488-2.579s-0.809-1.391-1.449-1.823c-0.639-0.433-1.377-0.646-2.215-0.646-0.639 0-1.184 0.123-1.631 0.374-0.449 0.247-0.855 0.622-1.209 1.121v-1.275h-1.516v13.558h1.664v-4.771h-0.005zm0.662-6.715c0.541-0.661 1.168-0.991 1.877-0.991 0.713 0 1.326 0.31 1.84 0.933 0.514 0.621 0.768 1.557 0.768 2.806 0 1.31-0.26 2.279-0.787 2.903-0.525 0.624-1.154 0.937-1.893 0.937-0.727 0-1.348-0.301-1.857-0.903-0.512-0.604-0.766-1.535-0.766-2.796s0.271-2.226 0.818-2.889z"/>
+ <path d="m416.84 269.5c1.074 0 1.975-0.318 2.711-0.955 0.734-0.638 1.191-1.519 1.367-2.645l-1.631-0.213c-0.117 0.83-0.393 1.445-0.83 1.845-0.436 0.399-0.979 0.601-1.633 0.601-0.812 0-1.473-0.299-1.977-0.896-0.504-0.596-0.756-1.554-0.756-2.871 0-1.298 0.262-2.248 0.785-2.848 0.521-0.601 1.203-0.9 2.039-0.9 0.555 0 1.027 0.167 1.418 0.499 0.391 0.333 0.662 0.828 0.818 1.486l1.611-0.251c-0.189-0.989-0.623-1.753-1.301-2.292-0.676-0.538-1.547-0.809-2.611-0.809-0.844 0-1.623 0.198-2.34 0.597-0.715 0.395-1.25 0.991-1.602 1.784-0.352 0.795-0.527 1.722-0.527 2.777 0 1.638 0.408 2.893 1.223 3.771 0.818 0.88 1.896 1.32 3.236 1.32z"/>
+ <path d="m424.06 264.15c0-0.7 0.092-1.348 0.277-1.937 0.125-0.389 0.33-0.693 0.619-0.911 0.287-0.217 0.615-0.325 0.977-0.325 0.408 0 0.814 0.119 1.221 0.358l0.572-1.54c-0.578-0.356-1.148-0.534-1.709-0.534-0.387 0-0.744 0.111-1.066 0.333-0.32 0.221-0.674 0.68-1.057 1.375v-1.488h-1.494v9.802h1.66v-5.133z"/>
+ <rect height="9.802" width="1.66" y="259.48" x="428.72"/>
+ <path d="m397.22 269.5c1.135 0 2.072-0.277 2.807-0.83 0.73-0.553 1.232-1.332 1.504-2.334l-1.719-0.213c-0.25 0.701-0.594 1.211-1.023 1.531-0.43 0.321-0.949 0.481-1.559 0.481-0.818 0-1.5-0.287-2.049-0.858-0.547-0.573-0.854-1.397-0.914-2.473h7.309c0.006-0.197 0.012-0.345 0.012-0.443 0-1.618-0.418-2.873-1.248-3.767-0.828-0.893-1.9-1.338-3.211-1.338-1.354 0-2.453 0.454-3.303 1.365-0.848 0.911-1.273 2.191-1.273 3.84 0 1.593 0.42 2.831 1.26 3.713 0.834 0.885 1.973 1.326 3.407 1.326zm-1.998-8.11c0.518-0.513 1.162-0.768 1.924-0.768 0.842 0 1.529 0.321 2.059 0.96 0.344 0.412 0.555 1.031 0.627 1.855h-5.473c0.054-0.855 0.341-1.539 0.863-2.047z"/>
+ <path d="m442.42 280.33c0.146-0.94 0.457-1.632 0.93-2.075 0.477-0.441 1.066-0.663 1.771-0.663 0.732 0 1.35 0.244 1.855 0.732s0.756 1.056 0.756 1.703c0 0.355-0.086 0.686-0.258 0.985-0.174 0.301-0.547 0.706-1.123 1.214-0.574 0.508-0.973 0.895-1.195 1.159-0.303 0.363-0.52 0.721-0.654 1.079-0.184 0.475-0.277 1.038-0.277 1.688 0 0.111 0.002 0.278 0.008 0.498h1.598c0.014-0.663 0.059-1.144 0.141-1.438 0.076-0.296 0.199-0.559 0.367-0.785 0.166-0.227 0.52-0.582 1.059-1.06 0.809-0.713 1.352-1.319 1.625-1.819 0.275-0.498 0.414-1.043 0.414-1.632 0-1.021-0.393-1.893-1.18-2.612-0.789-0.72-1.844-1.08-3.164-1.08-1.252 0-2.256 0.335-3.016 1.006-0.758 0.672-1.215 1.638-1.371 2.898l1.714 0.202z"/>
+ <path d="m404.27 289.98 2.576-3.867 0.535 0.821 2.012 3.046h2.039l-3.646-5.186 3.387-4.613h-1.982l-1.652 2.316c-0.227 0.312-0.479 0.674-0.748 1.079-0.172-0.294-0.398-0.659-0.682-1.098l-1.504-2.298h-2.078l3.312 4.707-3.578 5.093h2.009z"/>
+ <rect height="1.911" width="1.66" y="276.45" x="412.91"/>
+ <path d="m435.12 288.84c-0.758 0-1.348-0.175-1.77-0.525-0.42-0.352-0.678-0.855-0.77-1.516l-1.643 0.261c0.186 1.04 0.609 1.823 1.277 2.353s1.639 0.794 2.912 0.794c0.768 0 1.459-0.133 2.068-0.402 0.607-0.266 1.072-0.645 1.396-1.134 0.32-0.489 0.482-1.012 0.482-1.563 0-0.566-0.131-1.041-0.396-1.423-0.264-0.382-0.627-0.67-1.092-0.871-0.467-0.2-1.283-0.457-2.459-0.77-0.812-0.222-1.301-0.364-1.467-0.424-0.291-0.119-0.502-0.267-0.637-0.443-0.137-0.174-0.205-0.365-0.205-0.582 0-0.339 0.164-0.635 0.49-0.887s0.869-0.378 1.631-0.378c0.648 0 1.148 0.143 1.504 0.427 0.352 0.281 0.564 0.676 0.639 1.18l1.625-0.222c-0.105-0.634-0.295-1.139-0.574-1.518-0.277-0.377-0.705-0.679-1.287-0.899-0.582-0.222-1.256-0.333-2.025-0.333-0.51 0-0.99 0.066-1.434 0.198-0.445 0.133-0.799 0.293-1.057 0.483-0.344 0.247-0.617 0.557-0.816 0.927-0.201 0.373-0.301 0.778-0.301 1.213 0 0.482 0.121 0.919 0.363 1.316 0.244 0.396 0.602 0.708 1.072 0.933 0.469 0.226 1.314 0.49 2.531 0.797 0.906 0.228 1.475 0.417 1.699 0.565
0.326 0.214 0.49 0.51 0.49 0.885 0 0.417-0.186 0.782-0.555 1.092s-0.929 0.466-1.691 0.466z"/>
+ <path d="m426.86 277.75v2.426h-1.217v1.293h1.217v5.64c0 0.996 0.07 1.65 0.203 1.96 0.135 0.31 0.369 0.562 0.703 0.752 0.334 0.191 0.797 0.287 1.402 0.287 0.369 0 0.787-0.049 1.254-0.147l-0.24-1.467c-0.299 0.043-0.543 0.064-0.729 0.064-0.246 0-0.436-0.04-0.566-0.12-0.135-0.078-0.229-0.187-0.287-0.323-0.059-0.135-0.086-0.438-0.086-0.913v-5.731h1.672v-1.291h-1.672v-3.424l-1.654 0.994z"/>
+ <rect height="9.802" width="1.66" y="280.18" x="412.91"/>
+ <path d="m397.13 279.96c-1.354 0-2.455 0.454-3.305 1.365s-1.273 2.191-1.273 3.84c0 1.593 0.42 2.831 1.262 3.713 0.838 0.883 1.977 1.325 3.406 1.325 1.141 0 2.074-0.278 2.809-0.83 0.734-0.553 1.234-1.332 1.504-2.334l-1.717-0.214c-0.254 0.702-0.594 1.212-1.021 1.532-0.434 0.321-0.953 0.481-1.562 0.481-0.82 0-1.502-0.287-2.051-0.859-0.545-0.572-0.852-1.396-0.914-2.473h7.311c0.008-0.196 0.01-0.344 0.01-0.442 0-1.618-0.416-2.874-1.246-3.767s-1.906-1.337-3.213-1.337zm-2.766 4.181c0.051-0.855 0.34-1.537 0.859-2.048 0.52-0.513 1.16-0.768 1.924-0.768 0.844 0 1.531 0.32 2.061 0.959 0.344 0.413 0.555 1.031 0.629 1.856h-5.473z"/>
+ <rect height="1.892" width="1.893" y="288.09" x="444.14"/>
+ <path d="m418.82 280.16c-0.447 0.134-0.797 0.294-1.055 0.485-0.344 0.246-0.617 0.556-0.82 0.927-0.197 0.373-0.297 0.777-0.297 1.213 0 0.48 0.119 0.919 0.361 1.315 0.244 0.396 0.602 0.707 1.072 0.933 0.473 0.225 1.316 0.489 2.535 0.797 0.904 0.228 1.467 0.417 1.695 0.564 0.326 0.216 0.488 0.511 0.488 0.885 0 0.419-0.186 0.784-0.555 1.094s-0.936 0.466-1.695 0.466c-0.758 0-1.348-0.176-1.77-0.525-0.422-0.352-0.676-0.854-0.77-1.515l-1.645 0.259c0.186 1.041 0.611 1.824 1.279 2.354s1.639 0.793 2.912 0.793c0.768 0 1.457-0.132 2.066-0.401 0.607-0.267 1.076-0.644 1.396-1.134 0.324-0.489 0.486-1.011 0.486-1.564 0-0.564-0.133-1.039-0.398-1.422-0.266-0.381-0.631-0.671-1.09-0.871-0.467-0.199-1.287-0.457-2.461-0.77-0.812-0.222-1.301-0.363-1.469-0.426-0.289-0.116-0.5-0.264-0.635-0.441-0.139-0.174-0.203-0.366-0.203-0.582 0-0.338 0.162-0.634 0.486-0.886s0.871-0.378 1.635-0.378c0.645 0 1.143 0.142 1.5 0.425 0.352 0.282 0.564 0.678 0.639 1.181l1.625-0.222c-0.105-0.633-0.295-1.14-0.574-1.517-0.275-0
.379-0.705-0.679-1.287-0.9-0.578-0.221-1.254-0.332-2.025-0.332-0.5-0.001-0.98 0.064-1.426 0.195z"/>
+ </g>
+ <polygon transform="translate(0,10e-4)" stroke="#000" points="421.11 165.87 229.68 165.87 229.68 165.96 229.68 166.05 420.93 166.05 420.93 181.26 421.11 181.26" stroke-miterlimit="10" fill="#818181"/>
+ <polygon points="421.11 181.26 420.93 181.26 413.46 181.26 421.02 204.12 428.76 181.26" fill="#818181" transform="translate(0,10e-4)"/>
+ <g fill="#010101">
+ <rect height="13.528" width="1.659" y="134.97" x="259.15"/>
+ <path d="m251.1 140.26c0.372-0.273 0.949-0.41 1.729-0.41 0.837 0 1.467 0.187 1.892 0.562 0.312 0.276 0.471 0.754 0.471 1.431 0 0.062-0.005 0.204-0.007 0.434-0.636 0.221-1.622 0.413-2.965 0.572-0.656 0.08-1.148 0.164-1.477 0.251-0.443 0.122-0.839 0.304-1.195 0.544-0.352 0.238-0.638 0.56-0.858 0.955-0.219 0.398-0.325 0.835-0.325 1.314 0 0.818 0.288 1.489 0.866 2.017 0.577 0.526 1.406 0.789 2.482 0.789 0.652 0 1.264-0.106 1.833-0.322s1.16-0.585 1.774-1.106c0.049 0.459 0.162 0.863 0.335 1.207h1.734c-0.208-0.375-0.349-0.767-0.419-1.176-0.07-0.41-0.105-1.386-0.105-2.93v-2.213c0-0.738-0.028-1.251-0.084-1.533-0.1-0.455-0.271-0.831-0.517-1.13-0.248-0.299-0.63-0.546-1.155-0.744-0.522-0.195-1.202-0.295-2.039-0.295-0.842 0-1.583 0.116-2.225 0.346-0.639 0.229-1.129 0.56-1.467 0.989-0.338 0.426-0.579 0.987-0.727 1.685l1.622 0.221c0.179-0.699 0.455-1.185 0.827-1.458zm4.085 3.928c0 0.731-0.089 1.284-0.268 1.66-0.234 0.486-0.6 0.87-1.097 1.147-0.499 0.281-1.068 0.421-1.709 0.421-0.646 0-1.137-0.
147-1.472-0.443-0.335-0.295-0.501-0.664-0.501-1.107 0-0.29 0.074-0.552 0.229-0.788 0.154-0.236 0.372-0.416 0.655-0.539 0.282-0.125 0.765-0.234 1.449-0.334 1.207-0.173 2.109-0.381 2.712-0.629v0.612h0.002z"/>
+ <path d="m266.84 147.36c-0.756 0-1.346-0.176-1.766-0.526-0.422-0.352-0.68-0.855-0.773-1.513l-1.643 0.258c0.188 1.04 0.611 1.823 1.279 2.353s1.637 0.794 2.91 0.794c0.771 0 1.461-0.133 2.068-0.401 0.609-0.268 1.074-0.646 1.396-1.137 0.322-0.487 0.486-1.011 0.486-1.562 0-0.566-0.135-1.04-0.4-1.422-0.262-0.382-0.627-0.673-1.09-0.872-0.465-0.2-1.287-0.457-2.461-0.771-0.811-0.221-1.301-0.363-1.465-0.425-0.291-0.117-0.504-0.265-0.639-0.442-0.135-0.172-0.203-0.366-0.203-0.582 0-0.338 0.162-0.634 0.49-0.886 0.326-0.252 0.867-0.377 1.635-0.377 0.645 0 1.145 0.142 1.5 0.424 0.354 0.282 0.566 0.678 0.641 1.182l1.623-0.223c-0.107-0.633-0.295-1.14-0.572-1.517s-0.705-0.679-1.287-0.9c-0.584-0.221-1.258-0.332-2.025-0.332-0.512 0-0.988 0.066-1.436 0.196-0.445 0.134-0.795 0.296-1.055 0.485-0.346 0.246-0.619 0.556-0.818 0.928-0.199 0.373-0.301 0.777-0.301 1.215 0 0.48 0.121 0.917 0.363 1.315 0.244 0.396 0.602 0.707 1.072 0.932 0.471 0.226 1.314 0.49 2.531 0.798 0.906 0.227 1.471 0.416 1.697 0.564 0
.328 0.215 0.49 0.511 0.49 0.885 0 0.418-0.184 0.782-0.555 1.093-0.362 0.311-0.928 0.466-1.692 0.466z"/>
+ <path d="m244.1 148.5h1.65v-8.508h1.912v-1.293h-1.912v-0.903c0-0.591 0.105-0.993 0.315-1.208 0.21-0.216 0.563-0.324 1.069-0.324 0.308 0 0.636 0.031 0.978 0.091l0.252-1.448c-0.565-0.111-1.084-0.164-1.55-0.164-0.727 0-1.291 0.133-1.692 0.4-0.405 0.267-0.687 0.618-0.844 1.048-0.12 0.32-0.176 0.81-0.176 1.466v1.043h-1.468v1.293h1.468v8.508h-0.002z"/>
+ <path d="m276.97 148.72c1.137 0 2.07-0.276 2.805-0.83 0.73-0.554 1.234-1.331 1.504-2.334l-1.717-0.212c-0.252 0.701-0.596 1.21-1.025 1.531-0.428 0.32-0.949 0.48-1.559 0.48-0.816 0-1.5-0.287-2.047-0.859-0.549-0.571-0.854-1.396-0.914-2.473h7.311c0.006-0.196 0.008-0.344 0.008-0.442 0-1.618-0.412-2.872-1.244-3.766-0.83-0.893-1.9-1.339-3.211-1.339-1.354 0-2.453 0.454-3.303 1.366-0.85 0.91-1.275 2.19-1.275 3.839 0 1.593 0.42 2.831 1.262 3.715 0.834 0.881 1.969 1.324 3.405 1.324zm-1.998-8.111c0.521-0.512 1.16-0.767 1.924-0.767 0.844 0 1.529 0.319 2.057 0.958 0.344 0.413 0.555 1.033 0.631 1.856h-5.477c0.056-0.854 0.345-1.537 0.865-2.047z"/>
+ </g>
+ <polygon transform="translate(0,10e-4)" stroke="#000" points="166.05 229.68 165.96 229.68 165.87 229.68 165.87 283.32 166.05 283.32 166.05 268.05 165.96 268.02 166.05 267.99" stroke-miterlimit="10" fill="#818181"/>
+ <polygon points="165.96 306.18 173.52 283.32 166.05 283.32 165.87 283.32 158.22 283.32" fill="#818181" transform="translate(0,10e-4)"/>
+ <g fill="#010101">
+ <path d="m138.78 243.12c0-1.62-0.414-2.874-1.245-3.767-0.832-0.893-1.901-1.337-3.212-1.337-1.354 0-2.455 0.456-3.304 1.365-0.846 0.911-1.273 2.191-1.273 3.839 0 1.594 0.42 2.832 1.26 3.714 0.842 0.882 1.977 1.325 3.411 1.325 1.138 0 2.073-0.277 2.807-0.83 0.732-0.553 1.233-1.332 1.505-2.334l-1.718-0.212c-0.252 0.7-0.593 1.21-1.023 1.531-0.431 0.32-0.951 0.48-1.561 0.48-0.819 0-1.501-0.286-2.05-0.857-0.549-0.574-0.852-1.398-0.914-2.474h7.311c0.005-0.197 0.006-0.344 0.006-0.443zm-7.225-0.925c0.056-0.854 0.343-1.536 0.862-2.049 0.521-0.511 1.161-0.765 1.925-0.765 0.842 0 1.528 0.321 2.06 0.961 0.343 0.41 0.553 1.028 0.628 1.853h-5.475z"/>
+ <path d="m108.83 235.81v2.43h-1.22v1.291h1.22v5.637c0 0.999 0.066 1.651 0.202 1.962 0.137 0.311 0.369 0.562 0.702 0.753 0.334 0.189 0.8 0.285 1.403 0.285 0.367 0 0.787-0.049 1.254-0.147l-0.239-1.467c-0.302 0.042-0.544 0.064-0.729 0.064-0.247 0-0.436-0.039-0.566-0.121-0.134-0.078-0.227-0.187-0.286-0.322s-0.087-0.44-0.087-0.914v-5.731h1.67v-1.291h-1.67v-3.425l-1.654 0.996z"/>
+ <path d="m113.72 238.24v9.8h1.66v-5.132c0-0.701 0.093-1.348 0.278-1.938 0.123-0.387 0.329-0.691 0.617-0.91 0.29-0.22 0.616-0.328 0.978-0.328 0.406 0 0.812 0.12 1.219 0.361l0.572-1.541c-0.577-0.357-1.146-0.534-1.707-0.534-0.387 0-0.742 0.111-1.064 0.331-0.325 0.223-0.676 0.68-1.058 1.376v-1.483h-1.495v-0.002z"/>
+ <path d="m119.83 238.24v6.072c0 0.708 0.034 1.224 0.101 1.551 0.099 0.486 0.269 0.896 0.513 1.231 0.243 0.335 0.616 0.612 1.117 0.834s1.041 0.333 1.619 0.333c1.311 0 2.347-0.555 3.111-1.662v1.44h1.484v-9.802h-1.662v5.252c0 0.836-0.09 1.477-0.271 1.914-0.182 0.441-0.491 0.79-0.93 1.045-0.436 0.255-0.903 0.381-1.401 0.381s-0.916-0.123-1.254-0.374c-0.339-0.25-0.56-0.592-0.664-1.029-0.069-0.301-0.103-0.885-0.103-1.754v-5.436h-1.66v0.004z"/>
+ </g>
+ <polygon transform="translate(0,10e-4)" stroke="#000" points="421.11 421.11 421.11 331.74 421.02 331.74 420.93 331.74 420.93 420.93 188.82 420.93 188.82 421.11" stroke-miterlimit="10" fill="#818181"/>
+ <polygon points="188.82 428.76 188.82 421.11 188.82 420.93 188.82 413.46 166.05 420.99 166.05 421.05" fill="#818181" transform="translate(0,10e-4)"/>
+ <g fill="#010101">
+ <path d="m451.27 345.45c-0.322 0.223-0.674 0.68-1.057 1.376v-1.484h-1.496v9.803h1.662v-5.134c0-0.703 0.092-1.349 0.277-1.939 0.123-0.387 0.33-0.69 0.617-0.908 0.289-0.22 0.617-0.328 0.977-0.328 0.408 0 0.812 0.118 1.219 0.358l0.574-1.539c-0.576-0.356-1.146-0.535-1.707-0.535-0.387-0.002-0.74 0.109-1.066 0.33z"/>
+ <path d="m469.48 345.12c-1.354 0-2.457 0.456-3.303 1.365-0.848 0.912-1.275 2.191-1.275 3.839 0 1.594 0.42 2.834 1.262 3.713 0.838 0.885 1.975 1.326 3.41 1.326 1.139 0 2.072-0.277 2.805-0.828 0.734-0.555 1.232-1.334 1.506-2.336l-1.719-0.211c-0.25 0.699-0.594 1.211-1.023 1.531s-0.949 0.48-1.562 0.48c-0.82 0-1.502-0.285-2.047-0.857-0.547-0.574-0.854-1.398-0.912-2.475h7.307c0.008-0.197 0.012-0.345 0.012-0.443 0-1.618-0.414-2.874-1.246-3.768-0.834-0.89-1.904-1.336-3.215-1.336zm-2.771 4.178c0.057-0.853 0.344-1.535 0.863-2.047 0.52-0.513 1.162-0.766 1.924-0.766 0.844 0 1.529 0.321 2.057 0.961 0.344 0.41 0.555 1.029 0.629 1.852h-5.473z"/>
+ <path d="m461.27 350.59c0 0.838-0.088 1.477-0.271 1.916s-0.488 0.789-0.928 1.043c-0.436 0.254-0.902 0.381-1.4 0.381-0.5 0-0.916-0.121-1.256-0.373-0.34-0.25-0.561-0.592-0.664-1.027-0.068-0.303-0.102-0.887-0.102-1.757v-5.435h-1.662v6.072c0 0.709 0.033 1.225 0.104 1.549 0.098 0.488 0.268 0.898 0.514 1.234 0.24 0.334 0.611 0.613 1.115 0.834 0.502 0.223 1.043 0.334 1.619 0.334 1.311 0 2.348-0.555 3.109-1.664v1.441h1.488v-9.801h-1.664v5.252h-0.002z"/>
+ <path d="m446.59 353.72c-0.246 0-0.436-0.037-0.568-0.119-0.133-0.078-0.229-0.186-0.287-0.324-0.059-0.133-0.088-0.438-0.088-0.914v-5.73h1.67v-1.291h-1.67v-3.424l-1.65 0.996v2.43h-1.217v1.292h1.217v5.638c0 0.998 0.068 1.65 0.203 1.961 0.135 0.309 0.367 0.561 0.703 0.752 0.332 0.189 0.799 0.287 1.4 0.287 0.371 0 0.789-0.051 1.258-0.148l-0.24-1.467c-0.303 0.039-0.549 0.061-0.731 0.061z"/>
+ </g>
+ <polygon transform="translate(0,10e-4)" stroke="#000" points="357.3 268.02 357.3 267.93 188.82 267.93 188.82 268.11 357.3 268.11" stroke-miterlimit="10" fill="#818181"/>
+ <polygon points="166.05 268.05 188.82 275.58 188.82 268.11 188.82 267.93 188.82 260.28 166.05 267.99 165.96 268.02" fill="#818181" transform="translate(0,10e-4)"/>
+ <g fill="#010101">
+ <rect height="13.529" width="1.664" y="237.03" x="321.61"/>
+ <path d="m306.56 250.56h1.648v-8.509h1.912v-1.292h-1.912v-0.905c0-0.589 0.105-0.992 0.314-1.209 0.211-0.214 0.564-0.321 1.07-0.321 0.311 0 0.633 0.03 0.979 0.092l0.25-1.449c-0.566-0.112-1.082-0.167-1.549-0.167-0.727 0-1.291 0.135-1.693 0.401-0.404 0.268-0.686 0.617-0.846 1.048-0.117 0.319-0.174 0.809-0.174 1.466v1.045h-1.467v1.292h1.467v8.508h0.001z"/>
+ <path d="m329.3 249.42c-0.756 0-1.348-0.177-1.768-0.526-0.422-0.352-0.678-0.854-0.771-1.514l-1.643 0.26c0.186 1.038 0.611 1.823 1.277 2.353 0.668 0.529 1.639 0.793 2.912 0.793 0.77 0 1.459-0.134 2.068-0.4 0.607-0.268 1.072-0.647 1.396-1.135 0.32-0.49 0.482-1.012 0.482-1.564 0-0.564-0.131-1.039-0.393-1.422-0.266-0.382-0.631-0.674-1.096-0.871-0.467-0.199-1.283-0.457-2.459-0.77-0.812-0.223-1.301-0.364-1.467-0.426-0.291-0.116-0.502-0.264-0.637-0.443-0.137-0.171-0.205-0.364-0.205-0.58 0-0.339 0.164-0.634 0.49-0.886 0.326-0.255 0.869-0.379 1.631-0.379 0.648 0 1.148 0.144 1.504 0.425 0.352 0.283 0.564 0.677 0.639 1.181l1.625-0.22c-0.105-0.635-0.295-1.14-0.574-1.518-0.277-0.379-0.705-0.679-1.287-0.9s-1.256-0.333-2.025-0.333c-0.51 0-0.99 0.065-1.434 0.198-0.445 0.131-0.797 0.293-1.057 0.484-0.346 0.247-0.617 0.557-0.816 0.927-0.201 0.372-0.301 0.776-0.301 1.213 0 0.48 0.121 0.917 0.363 1.313 0.244 0.398 0.602 0.708 1.072 0.933 0.469 0.226 1.314 0.49 2.531 0.797 0.906 0.228 1.475 0.416 1.
699 0.563 0.326 0.217 0.49 0.513 0.49 0.887 0 0.417-0.186 0.782-0.555 1.092-0.365 0.312-0.93 0.468-1.691 0.468z"/>
+ <path d="m313.56 242.32c0.373-0.272 0.949-0.41 1.73-0.41 0.834 0 1.467 0.188 1.891 0.562 0.314 0.277 0.471 0.754 0.471 1.43 0 0.062-0.002 0.207-0.006 0.436-0.635 0.221-1.623 0.412-2.963 0.571-0.66 0.081-1.154 0.165-1.477 0.251-0.443 0.122-0.844 0.304-1.195 0.543-0.357 0.24-0.639 0.559-0.857 0.956s-0.328 0.835-0.328 1.314c0 0.819 0.287 1.491 0.867 2.016 0.578 0.526 1.406 0.789 2.48 0.789 0.652 0 1.264-0.108 1.834-0.325 0.568-0.213 1.16-0.582 1.775-1.105 0.051 0.461 0.158 0.863 0.334 1.209h1.734c-0.211-0.375-0.35-0.767-0.42-1.178-0.072-0.408-0.105-1.385-0.105-2.929v-2.214c0-0.736-0.027-1.249-0.084-1.533-0.1-0.455-0.27-0.832-0.516-1.13-0.246-0.3-0.631-0.546-1.154-0.744-0.52-0.198-1.201-0.294-2.039-0.294-0.844 0-1.584 0.114-2.227 0.344-0.637 0.231-1.127 0.561-1.465 0.987-0.336 0.429-0.582 0.99-0.729 1.685l1.623 0.222c0.179-0.692 0.453-1.178 0.826-1.453zm4.082 3.928c0 0.732-0.09 1.286-0.266 1.66-0.232 0.487-0.598 0.869-1.098 1.15-0.5 0.279-1.068 0.42-1.707 0.42-0.646 0-1.139-0.147-1.
471-0.443-0.338-0.295-0.504-0.663-0.504-1.105 0-0.291 0.076-0.554 0.23-0.789 0.154-0.238 0.373-0.416 0.654-0.54 0.281-0.123 0.766-0.234 1.449-0.333 1.207-0.174 2.109-0.382 2.715-0.628v0.608h-0.002z"/>
+ <path d="m339.43 250.78c1.137 0 2.07-0.276 2.807-0.83 0.732-0.552 1.23-1.331 1.506-2.334l-1.721-0.212c-0.254 0.702-0.594 1.21-1.021 1.531-0.432 0.32-0.953 0.48-1.561 0.48-0.818 0-1.502-0.286-2.047-0.857-0.549-0.573-0.855-1.398-0.914-2.474h7.307c0.006-0.196 0.01-0.344 0.01-0.443 0-1.618-0.416-2.875-1.246-3.766-0.83-0.893-1.9-1.339-3.209-1.339-1.355 0-2.457 0.456-3.305 1.366s-1.273 2.19-1.273 3.84c0 1.592 0.418 2.83 1.26 3.713 0.834 0.885 1.971 1.325 3.407 1.325zm-2-8.111c0.52-0.51 1.16-0.766 1.926-0.766 0.842 0 1.527 0.32 2.059 0.96 0.344 0.412 0.555 1.031 0.629 1.854h-5.473c0.05-0.853 0.339-1.537 0.859-2.048z"/>
+ </g>
+ <g fill="#818181">
+ <polygon transform="translate(0,10e-4)" stroke="#000" points="165.87 382.86 165.87 436.32 166.05 436.32 166.05 421.05 166.05 420.99 166.05 382.86" stroke-miterlimit="10"/>
+ <polygon points="165.96 459.36 173.52 436.32 166.05 436.32 165.87 436.32 158.22 436.32" transform="translate(0,10e-4)"/>
+ <rect height="28.079" width="0.179" stroke="#000" stroke-miterlimit="10" y="51.122" x="165.87"/>
+ <polygon points="165.96 102.06 173.52 79.2 166.05 79.2 165.87 79.2 158.22 79.2" transform="translate(0,10e-4)"/>
+ </g>
+ <g fill="#efeeee">
+ <path d="m162.04 24.002c-0.621 0-1.138 0.241-1.55 0.726-0.412 0.482-0.617 1.217-0.617 2.201 0 1.017 0.16 1.767 0.48 2.252 0.45 0.69 1.046 1.033 1.791 1.033 0.572 0 1.059-0.243 1.461-0.734 0.404-0.488 0.605-1.26 0.605-2.311 0-1.119-0.203-1.928-0.608-2.423-0.408-0.495-0.928-0.744-1.562-0.744z"/>
+ <path d="m209.16 51.122c10.26 0 20.52-12.781 20.52-25.561s-10.26-25.561-20.52-25.561h-86.58c-10.26 0-20.52 12.78-20.52 25.561 0 12.779 10.26 25.561 20.52 25.561h43.291 0.179 43.111zm-19.541-32.61h2.591v4.975c0.837-0.978 1.839-1.467 3.001-1.467 0.598 0 1.134 0.111 1.615 0.331 0.48 0.223 0.84 0.506 1.085 0.852 0.244 0.343 0.409 0.724 0.498 1.145 0.089 0.417 0.134 1.067 0.134 1.947v5.747h-2.593v-5.176c0-1.029-0.049-1.681-0.147-1.957-0.099-0.278-0.271-0.497-0.521-0.659-0.248-0.164-0.562-0.246-0.937-0.246-0.429 0-0.815 0.105-1.152 0.314-0.339 0.209-0.588 0.526-0.744 0.944-0.156 0.422-0.236 1.047-0.236 1.87v4.909h-2.592l-0.002-13.529zm-4.97 10.327c-0.128-0.122-0.419-0.236-0.866-0.34-2.095-0.461-3.419-0.884-3.979-1.265-0.776-0.531-1.163-1.265-1.163-2.206 0-0.85 0.336-1.562 1.007-2.14 0.669-0.579 1.71-0.868 3.117-0.868 1.342 0 2.338 0.218 2.989 0.655 0.652 0.438 1.102 1.084 1.35 1.939l-2.446 0.451c-0.105-0.381-0.304-0.675-0.597-0.877s-0.709-0.305-1.251-0.305c-0.683 0-1.171 0.097-1.466 0
.287-0.198 0.134-0.296 0.311-0.296 0.525 0 0.185 0.085 0.34 0.259 0.471 0.232 0.171 1.041 0.415 2.423 0.728s2.346 0.7 2.894 1.154c0.539 0.461 0.812 1.105 0.812 1.93 0 0.898-0.376 1.671-1.127 2.316s-1.861 0.971-3.332 0.971c-1.336 0-2.392-0.27-3.17-0.812-0.778-0.541-1.286-1.276-1.526-2.207l2.602-0.395c0.111 0.503 0.336 0.886 0.675 1.147 0.339 0.263 0.811 0.393 1.421 0.393 0.673 0 1.176-0.122 1.515-0.369 0.228-0.173 0.34-0.403 0.34-0.691-0.002-0.201-0.064-0.362-0.185-0.492zm-10.5-10.327h2.592v2.4h-2.592v-2.4zm0 3.729h2.592v9.8h-2.592v-9.8zm-5.216-3.729h2.592v13.529h-2.592v-13.529zm-25.527 6.258c-0.302 0.565-0.685 1.011-1.148 1.334s-0.938 0.536-1.418 0.641c-0.65 0.129-1.597 0.192-2.833 0.192h-1.782v5.104h-2.732v-13.529h4.385c1.662 0 2.743 0.069 3.25 0.204 0.774 0.204 1.424 0.645 1.947 1.325 0.524 0.679 0.785 1.557 0.785 2.634-0.001 0.829-0.152 1.53-0.454 2.095zm11.517 7.271h-2.406v-1.466c-0.357 0.522-0.825 0.936-1.409 1.236-0.581 0.3-1.195 0.451-1.841 0.451-0.66 0-1.249-0.146-1.771-0.43
4s-0.9-0.695-1.136-1.219c-0.233-0.523-0.351-1.246-0.351-2.169v-6.2h2.593v4.503c0 1.378 0.047 2.224 0.144 2.532 0.095 0.311 0.269 0.559 0.521 0.738 0.255 0.181 0.572 0.272 0.959 0.272 0.442 0 0.841-0.121 1.192-0.366 0.352-0.244 0.591-0.543 0.72-0.904 0.13-0.359 0.193-1.24 0.193-2.644v-4.135h2.594v9.803h-0.002zm10.744-1.136c-0.797 0.904-1.764 1.357-2.9 1.357-0.561 0-1.113-0.141-1.656-0.42-0.546-0.281-1.014-0.692-1.408-1.239v1.44h-2.408v-13.528h2.594v4.872c0.799-0.91 1.748-1.366 2.843-1.366 1.192 0 2.18 0.433 2.962 1.296 0.783 0.864 1.172 2.106 1.172 3.725-0.004 1.671-0.403 2.959-1.199 3.863z"/>
+ <path d="m139.51 20.895c-0.325-0.062-0.98-0.093-1.965-0.093h-1.319v3.84h1.495c1.077 0 1.796-0.071 2.161-0.212 0.363-0.141 0.646-0.364 0.852-0.665 0.207-0.301 0.311-0.65 0.311-1.051 0-0.492-0.145-0.898-0.434-1.219-0.294-0.322-0.658-0.522-1.101-0.6z"/>
+ </g>
+ <g fill="#010101">
+ <rect height="13.529" width="2.592" y="18.512" x="168.93"/>
+ <path d="m152.33 26.375c0 1.401-0.064 2.284-0.193 2.644-0.127 0.361-0.368 0.661-0.72 0.904-0.351 0.243-0.749 0.365-1.191 0.365-0.387 0-0.707-0.092-0.959-0.271s-0.428-0.427-0.522-0.738c-0.095-0.31-0.145-1.156-0.145-2.533v-4.502h-2.592v6.2c0 0.924 0.117 1.646 0.352 2.169 0.234 0.524 0.611 0.929 1.134 1.218 0.521 0.291 1.113 0.435 1.771 0.435 0.646 0 1.26-0.15 1.841-0.452 0.581-0.3 1.05-0.712 1.407-1.236v1.465h2.409v-9.8h-2.595v4.134h0.003z"/>
+ <path d="m165.69 23.314c-0.781-0.864-1.769-1.295-2.964-1.295-1.093 0-2.042 0.456-2.842 1.365v-4.873h-2.593v13.53h2.408v-1.44c0.395 0.548 0.861 0.961 1.407 1.241 0.544 0.28 1.097 0.42 1.656 0.42 1.138 0 2.104-0.452 2.901-1.358 0.796-0.903 1.195-2.191 1.195-3.866 0.003-1.617-0.385-2.859-1.168-3.724zm-2.091 6.166c-0.403 0.491-0.892 0.734-1.462 0.734-0.746 0-1.341-0.343-1.791-1.033-0.32-0.485-0.48-1.235-0.48-2.252 0-0.984 0.205-1.719 0.617-2.201 0.413-0.484 0.93-0.726 1.55-0.726 0.634 0 1.154 0.249 1.561 0.744s0.608 1.304 0.608 2.423c0.001 1.053-0.2 1.822-0.603 2.311z"/>
+ <path d="m141.13 18.716c-0.505-0.135-1.588-0.204-3.25-0.204h-4.385v13.529h2.732v-5.103h1.782c1.236 0 2.18-0.065 2.833-0.193 0.481-0.104 0.954-0.318 1.418-0.641s0.847-0.767 1.148-1.334c0.3-0.565 0.451-1.266 0.451-2.095 0-1.077-0.263-1.955-0.784-2.634-0.521-0.681-1.171-1.121-1.945-1.325zm-0.393 5.047c-0.205 0.302-0.49 0.524-0.854 0.665s-1.083 0.212-2.159 0.212h-1.497v-3.839h1.319c0.982 0 1.641 0.03 1.967 0.093 0.443 0.078 0.808 0.277 1.097 0.599 0.291 0.319 0.435 0.726 0.435 1.218 0.002 0.4-0.101 0.75-0.308 1.052z"/>
+ <rect height="9.8" width="2.592" y="22.241" x="174.15"/>
+ <path d="m182.98 30.389c-0.606 0-1.082-0.13-1.421-0.393-0.339-0.261-0.563-0.645-0.675-1.148l-2.601 0.396c0.239 0.929 0.749 1.665 1.525 2.206 0.779 0.543 1.835 0.812 3.17 0.812 1.471 0 2.582-0.323 3.332-0.971 0.751-0.646 1.127-1.418 1.127-2.316 0-0.824-0.272-1.466-0.812-1.929-0.55-0.456-1.512-0.839-2.894-1.154-1.382-0.314-2.188-0.558-2.423-0.729-0.172-0.129-0.259-0.285-0.259-0.47 0-0.216 0.098-0.39 0.296-0.524 0.295-0.191 0.783-0.287 1.466-0.287 0.542 0 0.958 0.101 1.251 0.305 0.292 0.203 0.49 0.494 0.597 0.876l2.446-0.451c-0.248-0.855-0.697-1.501-1.35-1.939-0.65-0.437-1.647-0.653-2.989-0.653-1.408 0-2.448 0.288-3.117 0.867-0.671 0.576-1.007 1.291-1.007 2.14 0 0.94 0.389 1.676 1.163 2.204 0.56 0.382 1.886 0.803 3.979 1.266 0.447 0.104 0.738 0.218 0.866 0.34 0.121 0.13 0.185 0.294 0.185 0.49 0 0.289-0.113 0.52-0.34 0.691-0.34 0.249-0.843 0.371-1.515 0.371z"/>
+ <path d="m192.21 27.132c0-0.823 0.077-1.447 0.236-1.87 0.156-0.421 0.404-0.735 0.743-0.944s0.724-0.314 1.154-0.314c0.374 0 0.687 0.082 0.937 0.246 0.25 0.162 0.422 0.381 0.521 0.659 0.099 0.276 0.147 0.928 0.147 1.957v5.176h2.593v-5.748c0-0.881-0.046-1.529-0.134-1.947-0.091-0.42-0.257-0.801-0.498-1.146-0.244-0.343-0.604-0.628-1.087-0.85-0.48-0.222-1.016-0.331-1.613-0.331-1.164 0-2.164 0.486-3.001 1.466v-4.975h-2.593v13.53h2.593l0.002-4.909z"/>
+ <rect height="2.4" width="2.592" y="18.512" x="174.15"/>
+ </g>
+ <g fill="#efeeee">
+ <path d="m102.06 612.36c0 12.777 10.26 25.561 20.52 25.561h86.581c10.26 0 20.52-12.783 20.52-25.561 0-12.781-10.26-25.561-20.52-25.561h-43.2-43.382c-10.26 0.001-20.519 12.78-20.519 25.561zm87.11 6.479h-1.91v-1.893h1.91v1.893zm-1.983-13.529h2.057v3l-0.48 7.172h-1.07l-0.509-7.172v-3h0.002zm-9.922 4.873c0.85-0.908 1.949-1.365 3.304-1.365 1.311 0 2.382 0.445 3.211 1.338 0.83 0.891 1.245 2.146 1.245 3.766 0 0.1-0.003 0.246-0.009 0.443h-7.31c0.062 1.076 0.365 1.9 0.912 2.471 0.548 0.574 1.23 0.859 2.049 0.859 0.608 0 1.129-0.158 1.561-0.48 0.431-0.318 0.771-0.83 1.024-1.533l1.717 0.215c-0.27 1.002-0.772 1.781-1.502 2.334-0.733 0.553-1.67 0.832-2.807 0.832-1.435 0-2.571-0.443-3.411-1.326-0.841-0.883-1.26-2.119-1.26-3.715 0.004-1.648 0.429-2.927 1.276-3.839zm-11.153-1.147h1.495v1.398c0.721-1.078 1.762-1.617 3.12-1.617 0.59 0 1.134 0.105 1.63 0.318 0.494 0.213 0.866 0.49 1.112 0.836s0.417 0.752 0.516 1.229c0.062 0.305 0.091 0.846 0.091 1.613v6.025h-1.66v-5.961c0-0.678-0.064-1.184-0.194-1
.516-0.129-0.338-0.359-0.605-0.688-0.805-0.329-0.199-0.715-0.299-1.158-0.299-0.708 0-1.318 0.225-1.833 0.672-0.514 0.449-0.771 1.301-0.771 2.557v5.352h-1.661v-9.803h0.001zm-9.368 0.871c0.844-0.725 1.87-1.09 3.082-1.09 1.348 0 2.449 0.441 3.304 1.324s1.283 2.102 1.283 3.66c0 1.262-0.188 2.252-0.567 2.975-0.377 0.725-0.928 1.283-1.652 1.688-0.722 0.396-1.512 0.598-2.367 0.598-1.371 0-2.479-0.441-3.325-1.32-0.847-0.879-1.27-2.146-1.27-3.801-0.001-1.817 0.503-3.161 1.512-4.034zm-14.346-4.597h4.659c1.051 0 1.855 0.066 2.408 0.195 0.775 0.178 1.436 0.502 1.984 0.971 0.712 0.6 1.246 1.371 1.602 2.309 0.353 0.939 0.531 2.01 0.531 3.217 0 1.029-0.121 1.939-0.361 2.73-0.239 0.795-0.546 1.453-0.922 1.975-0.374 0.52-0.787 0.928-1.232 1.225-0.446 0.301-0.984 0.525-1.614 0.68-0.632 0.15-1.354 0.229-2.174 0.229h-4.881v-13.531z"/>
+ <path d="m182.65 611.15c-0.529-0.639-1.215-0.961-2.059-0.961-0.762 0-1.402 0.258-1.923 0.766-0.521 0.512-0.808 1.193-0.862 2.047h5.472c-0.073-0.823-0.284-1.442-0.628-1.852z"/>
+ <path d="m150.39 616.3c0.425-0.426 0.754-0.996 0.991-1.711 0.236-0.719 0.354-1.588 0.354-2.607 0-1.416-0.231-2.502-0.695-3.262-0.465-0.762-1.03-1.268-1.695-1.529-0.48-0.188-1.25-0.277-2.316-0.277h-2.842v10.336h2.888c0.893 0 1.593-0.082 2.1-0.248 0.509-0.169 0.914-0.401 1.215-0.702z"/>
+ <path d="m159.83 617.7c0.825 0 1.511-0.312 2.06-0.939 0.549-0.631 0.821-1.586 0.821-2.873 0-1.211-0.275-2.129-0.826-2.752-0.551-0.625-1.235-0.939-2.055-0.939-0.829 0-1.519 0.311-2.065 0.932-0.548 0.621-0.822 1.562-0.822 2.814s0.274 2.195 0.822 2.818c0.547 0.629 1.236 0.939 2.065 0.939z"/>
+ </g>
+ <g fill="#010101">
+ <polygon points="187.19 605.31 187.19 608.31 187.7 615.48 188.76 615.48 189.24 608.31 189.24 605.31" transform="translate(0,10e-4)"/>
+ <rect height="1.893" width="1.91" y="616.95" x="187.26"/>
+ <path d="m149.45 618.61c0.63-0.154 1.168-0.381 1.614-0.68 0.447-0.297 0.858-0.705 1.232-1.225 0.373-0.521 0.682-1.18 0.922-1.975 0.242-0.791 0.361-1.701 0.361-2.73 0-1.207-0.179-2.275-0.531-3.217-0.355-0.938-0.887-1.709-1.602-2.309-0.549-0.471-1.209-0.793-1.984-0.971-0.555-0.131-1.357-0.195-2.408-0.195h-4.659v13.529h4.881c0.82 0.002 1.542-0.076 2.174-0.227zm-5.266-1.367v-10.336h2.843c1.064 0 1.837 0.09 2.317 0.277 0.664 0.262 1.229 0.768 1.693 1.529 0.465 0.76 0.697 1.846 0.697 3.262 0 1.02-0.12 1.889-0.355 2.607-0.237 0.715-0.567 1.285-0.991 1.711-0.301 0.299-0.707 0.533-1.214 0.701-0.508 0.166-1.208 0.248-2.102 0.248h-2.888z"/>
+ <path d="m167.78 613.49c0-1.254 0.256-2.109 0.77-2.557 0.516-0.449 1.125-0.672 1.833-0.672 0.442 0 0.829 0.1 1.159 0.299 0.329 0.199 0.558 0.469 0.688 0.805 0.129 0.332 0.193 0.838 0.193 1.516v5.961h1.663v-6.025c0-0.768-0.032-1.309-0.093-1.613-0.1-0.477-0.27-0.885-0.517-1.229-0.246-0.344-0.618-0.623-1.112-0.836-0.496-0.213-1.038-0.318-1.629-0.318-1.359 0-2.4 0.539-3.119 1.617v-1.395h-1.496v9.799h1.661l-0.001-5.352z"/>
+ <path d="m180.66 619.06c1.137 0 2.071-0.279 2.806-0.83 0.731-0.555 1.232-1.334 1.504-2.334l-1.719-0.211c-0.252 0.697-0.594 1.209-1.022 1.529-0.434 0.32-0.95 0.48-1.562 0.48-0.82 0-1.502-0.285-2.048-0.857-0.548-0.574-0.854-1.398-0.913-2.473h7.309c0.006-0.197 0.01-0.346 0.01-0.443 0-1.619-0.414-2.875-1.246-3.768-0.83-0.893-1.899-1.336-3.209-1.336-1.355 0-2.457 0.455-3.304 1.365-0.849 0.912-1.274 2.191-1.274 3.84 0 1.594 0.419 2.832 1.259 3.715 0.838 0.882 1.975 1.323 3.409 1.323zm-1.998-8.113c0.521-0.512 1.163-0.766 1.923-0.766 0.844 0 1.529 0.322 2.059 0.961 0.344 0.41 0.555 1.029 0.628 1.852h-5.472c0.053-0.853 0.342-1.535 0.862-2.047z"/>
+ <path d="m159.83 619.06c0.855 0 1.646-0.201 2.367-0.598 0.725-0.4 1.275-0.963 1.652-1.688 0.379-0.723 0.567-1.715 0.567-2.975 0-1.559-0.429-2.775-1.283-3.66-0.854-0.883-1.957-1.324-3.304-1.324-1.212 0-2.238 0.365-3.082 1.09-1.009 0.873-1.513 2.217-1.513 4.031 0 1.654 0.423 2.924 1.27 3.801 0.847 0.882 1.955 1.323 3.326 1.323zm-2.065-7.935c0.547-0.621 1.236-0.934 2.065-0.934 0.819 0 1.504 0.314 2.055 0.938 0.551 0.625 0.826 1.543 0.826 2.756 0 1.283-0.274 2.24-0.821 2.869s-1.234 0.941-2.06 0.941c-0.829 0-1.519-0.311-2.065-0.939-0.548-0.621-0.822-1.562-0.822-2.816s0.274-2.194 0.822-2.815z"/>
+ </g>
+ <rect height="28.078" width="0.179" stroke="#000" stroke-miterlimit="10" y="535.86" x="165.87" fill="#818181"/>
+ <polygon points="166.05 563.94 165.87 563.94 158.22 563.94 165.96 586.8 173.52 563.94" fill="#818181" transform="translate(0,10e-4)"/>
+ <g fill="#efeeee">
+ <path d="m266.76 382.86 64.979-76.681h-165.78-100.98l-64.98 76.681h165.87 0.179 100.71zm-86.598-21.422h-1.662v-9.799h1.662v9.799zm0-11.618h-1.662v-1.91h1.662v1.91zm20.696 11.618h-1.661v-5.961c0-0.676-0.064-1.184-0.192-1.52-0.13-0.334-0.357-0.602-0.688-0.803-0.329-0.199-0.715-0.299-1.157-0.299-0.707 0-1.317 0.225-1.832 0.672-0.513 0.449-0.77 1.301-0.77 2.557v5.354h-1.662v-9.801h1.495v1.391c0.72-1.074 1.761-1.611 3.12-1.611 0.591 0 1.132 0.105 1.629 0.316 0.494 0.213 0.866 0.492 1.112 0.836 0.247 0.346 0.418 0.754 0.517 1.227 0.061 0.309 0.093 0.848 0.093 1.615v6.027h-0.004zm22.282-4.474h-7.311c0.062 1.076 0.366 1.9 0.912 2.471 0.548 0.574 1.231 0.859 2.05 0.859 0.607 0 1.128-0.158 1.56-0.48 0.433-0.318 0.772-0.828 1.024-1.531l1.718 0.213c-0.271 1.002-0.772 1.781-1.504 2.334-0.729 0.553-1.666 0.832-2.806 0.832-1.433 0-2.57-0.443-3.411-1.326-0.839-0.881-1.261-2.119-1.261-3.715 0-1.648 0.426-2.928 1.275-3.838s1.949-1.365 3.302-1.365c1.312 0 2.383 0.445 3.212 1.336 0.83 0.893 1.246 2
.146 1.246 3.766 0 0.1-0.002 0.247-0.006 0.444zm13.155 4.474h-1.662v-9.799h1.662v9.799zm0-11.618h-1.662v-1.91h1.662v1.91zm9.288 10.304c-0.323 0.49-0.787 0.869-1.396 1.137s-1.298 0.4-2.066 0.4c-1.274 0-2.245-0.266-2.913-0.793-0.667-0.529-1.092-1.314-1.277-2.355l1.643-0.26c0.093 0.66 0.35 1.166 0.771 1.514 0.421 0.352 1.01 0.525 1.766 0.525 0.764 0 1.328-0.154 1.697-0.465 0.369-0.309 0.553-0.676 0.553-1.092 0-0.377-0.161-0.672-0.486-0.885-0.226-0.148-0.793-0.336-1.697-0.562-1.219-0.309-2.062-0.574-2.533-0.799-0.472-0.227-0.827-0.537-1.07-0.932-0.243-0.396-0.365-0.836-0.365-1.314 0-0.436 0.1-0.842 0.301-1.215 0.199-0.371 0.471-0.68 0.816-0.926 0.259-0.191 0.61-0.354 1.057-0.482 0.447-0.133 0.924-0.199 1.435-0.199 0.769 0 1.445 0.111 2.025 0.334 0.581 0.219 1.011 0.521 1.285 0.898 0.279 0.381 0.47 0.885 0.574 1.52l-1.624 0.221c-0.074-0.504-0.288-0.9-0.64-1.182-0.353-0.283-0.854-0.424-1.5-0.424-0.763 0-1.31 0.127-1.635 0.377s-0.486 0.547-0.486 0.887c0 0.215 0.066 0.41 0.202 0.58 0.135 0.
178 0.348 0.326 0.637 0.443 0.166 0.061 0.655 0.203 1.467 0.424 1.176 0.314 1.995 0.572 2.461 0.771 0.465 0.199 0.825 0.49 1.092 0.871 0.266 0.381 0.396 0.855 0.396 1.422-0.005 0.553-0.167 1.073-0.49 1.561zm4.207 1.314h-1.661v-9.799h1.661v9.799zm0-11.618h-1.661v-1.91h1.661v1.91zm10.465 9.558c-0.378 0.723-0.928 1.283-1.652 1.686-0.724 0.4-1.512 0.598-2.367 0.598-1.371 0-2.481-0.441-3.325-1.32-0.847-0.879-1.269-2.146-1.269-3.801 0-1.814 0.502-3.16 1.512-4.031 0.844-0.727 1.87-1.09 3.082-1.09 1.348 0 2.447 0.441 3.303 1.322 0.855 0.885 1.282 2.102 1.282 3.66 0.001 1.259-0.186 2.251-0.566 2.976zm10.401 2.06h-1.66v-5.961c0-0.676-0.066-1.184-0.195-1.52-0.129-0.334-0.359-0.602-0.688-0.803-0.328-0.199-0.715-0.299-1.156-0.299-0.709 0-1.318 0.225-1.834 0.672-0.514 0.449-0.768 1.301-0.768 2.557v5.354h-1.662v-9.801h1.494v1.391c0.723-1.074 1.758-1.611 3.121-1.611 0.59 0 1.131 0.105 1.629 0.316 0.494 0.213 0.867 0.492 1.113 0.836 0.246 0.346 0.416 0.754 0.516 1.227 0.061 0.309 0.09 0.848 0.09 1.6
15v6.027zm20.16-30.5h1.477l-0.416 2.002c0.504-0.755 0.998-1.316 1.482-1.681 0.48-0.363 0.973-0.542 1.479-0.542 0.334 0 0.742 0.118 1.229 0.359l-0.684 1.549c-0.287-0.208-0.604-0.312-0.949-0.312-0.586 0-1.186 0.324-1.799 0.978-0.617 0.652-1.098 1.827-1.449 3.517l-0.83 3.931h-1.588l2.048-9.801zm-10.498 1.332c0.928-1.034 2.148-1.552 3.654-1.552 1.18 0 2.133 0.37 2.855 1.108s1.086 1.732 1.086 2.988c0 1.125-0.227 2.173-0.682 3.143-0.455 0.971-1.102 1.711-1.945 2.229-0.838 0.516-1.723 0.775-2.65 0.775-0.766 0-1.461-0.164-2.082-0.489-0.625-0.326-1.104-0.79-1.432-1.383-0.33-0.598-0.492-1.287-0.492-2.067 0.001-1.916 0.563-3.5 1.688-4.752zm-6.656-0.04 0.27-1.292h1.316l0.51-2.409 1.91-1.153-0.748 3.562h1.645l-0.279 1.292h-1.633l-1.135 5.416c-0.143 0.691-0.213 1.102-0.213 1.235 0 0.197 0.057 0.35 0.172 0.455 0.113 0.103 0.299 0.155 0.559 0.155 0.371 0 0.699-0.038 0.988-0.111l-0.279 1.364c-0.398 0.105-0.787 0.159-1.16 0.159-0.666 0-1.195-0.166-1.59-0.491-0.295-0.246-0.443-0.582-0.443-1.006 0-0.21
6 0.08-0.711 0.24-1.486l1.189-5.693h-1.318v0.003zm-0.236 27.318h1.893v1.891h-1.893v-1.891zm-7.016-28.61-0.289 1.367c0.574-0.598 1.088-1.013 1.539-1.242 0.451-0.228 0.93-0.345 1.436-0.345 0.936 0 1.709 0.342 2.326 1.02 0.613 0.68 0.922 1.652 0.922 2.923 0 1.02-0.17 1.949-0.508 2.791-0.338 0.838-0.752 1.513-1.244 2.025-0.492 0.508-0.99 0.886-1.496 1.125-0.506 0.238-1.021 0.358-1.549 0.358-1.176 0-2.088-0.598-2.734-1.791l-1.105 5.323h-1.672l2.834-13.557h1.541v0.003zm-4.924-3.728h1.66l-0.4 1.892h-1.659l0.399-1.892zm0.885 3.728-2.051 9.8h-1.668l2.047-9.8h1.672zm-7.9 0h1.477l-0.415 2.002c0.504-0.755 0.999-1.316 1.481-1.681 0.48-0.363 0.975-0.542 1.481-0.542 0.333 0 0.74 0.118 1.227 0.359l-0.682 1.549c-0.29-0.208-0.604-0.312-0.95-0.312-0.584 0-1.187 0.324-1.801 0.978-0.616 0.652-1.097 1.827-1.448 3.517l-0.829 3.931h-1.588l2.047-9.801zm-10.332 2.945c0.424-1.034 1.032-1.819 1.822-2.358 0.789-0.539 1.694-0.806 2.709-0.806 1.053 0 1.885 0.298 2.501 0.891 0.614 0.593 0.923 1.38 0.923 2.357l-1.6
45 0.112c-0.003-0.621-0.185-1.105-0.537-1.457-0.356-0.352-0.822-0.526-1.399-0.526-0.673 0-1.251 0.212-1.743 0.639-0.495 0.424-0.879 1.068-1.16 1.934-0.279 0.862-0.42 1.695-0.42 2.496 0 0.837 0.186 1.462 0.555 1.882s0.823 0.628 1.365 0.628c0.541 0 1.061-0.208 1.556-0.618 0.495-0.413 0.884-1.041 1.165-1.884l1.671 0.176c-0.417 1.225-1.013 2.132-1.784 2.728-0.772 0.593-1.651 0.893-2.636 0.893-1.064 0-1.928-0.345-2.589-1.033-0.662-0.689-0.991-1.652-0.991-2.891-0.001-1.077 0.211-2.13 0.637-3.163zm-4.459 3.48c-0.228-0.261-0.783-0.577-1.666-0.956-0.883-0.38-1.447-0.645-1.693-0.797-0.412-0.254-0.724-0.549-0.933-0.893-0.208-0.343-0.312-0.732-0.312-1.175 0-0.778 0.307-1.441 0.923-1.995 0.615-0.551 1.476-0.829 2.586-0.829 1.231 0 2.166 0.286 2.811 0.853 0.643 0.57 0.976 1.318 1.001 2.248l-1.635 0.112c-0.024-0.591-0.234-1.057-0.628-1.401-0.395-0.345-0.95-0.518-1.671-0.518-0.578 0-1.028 0.132-1.347 0.398-0.321 0.262-0.481 0.548-0.481 0.857 0 0.307 0.138 0.576 0.413 0.811 0.187 0.161 0.662 0.407 1
.433 0.738 1.279 0.555 2.086 0.989 2.416 1.311 0.53 0.511 0.795 1.132 0.795 1.865 0 0.485-0.15 0.964-0.448 1.429-0.3 0.468-0.756 0.841-1.367 1.122-0.611 0.278-1.332 0.419-2.166 0.419-1.132 0-2.094-0.281-2.886-0.841s-1.169-1.473-1.125-2.732l1.67-0.1c0 0.479 0.073 0.888 0.222 1.227 0.147 0.337 0.419 0.616 0.817 0.829 0.396 0.216 0.86 0.323 1.388 0.323 0.737 0 1.291-0.147 1.662-0.442 0.367-0.296 0.554-0.643 0.554-1.043-0.002-0.288-0.113-0.562-0.333-0.82zm-10.307 24.075h-1.551l-3.728-9.799h1.753l2.104 5.869c0.227 0.633 0.438 1.291 0.628 1.975 0.148-0.516 0.354-1.139 0.618-1.865l2.177-5.979h1.709l-3.71 9.799zm-3.246-29.988c0.788-0.488 1.639-0.732 2.557-0.732 1.168 0 2.103 0.364 2.8 1.088 0.698 0.726 1.048 1.717 1.048 2.973 0 0.48-0.043 0.973-0.129 1.474h-7.217c-0.024 0.192-0.037 0.366-0.037 0.519 0 0.916 0.211 1.617 0.631 2.098 0.421 0.484 0.938 0.727 1.546 0.727 0.573 0 1.135-0.188 1.688-0.565 0.555-0.375 0.986-0.914 1.293-1.622l1.623 0.166c-0.233 0.807-0.77 1.573-1.611 2.299-0.839 0.72
6-1.841 1.089-3.004 1.089-0.725 0-1.391-0.168-1.998-0.504-0.605-0.335-1.067-0.823-1.384-1.463s-0.476-1.366-0.476-2.187c0-1.071 0.25-2.109 0.744-3.115 0.497-1.008 1.137-1.756 1.926-2.245zm-12.179 2.224c0.49-0.986 1.102-1.726 1.838-2.22 0.734-0.49 1.473-0.736 2.211-0.736 1.218 0 2.138 0.584 2.759 1.761l1.107-5.269h1.66l-2.824 13.528h-1.539l0.295-1.421c-0.955 1.095-1.951 1.644-2.99 1.644-0.929 0-1.703-0.343-2.322-1.031-0.619-0.685-0.927-1.681-0.927-2.983 0-1.194 0.245-2.284 0.732-3.273zm-5.423 17.966h1.495v1.486c0.382-0.697 0.732-1.156 1.057-1.377 0.325-0.223 0.679-0.332 1.065-0.332 0.561 0 1.13 0.176 1.706 0.533l-0.571 1.541c-0.407-0.24-0.812-0.359-1.219-0.359-0.363 0-0.689 0.107-0.978 0.326-0.29 0.219-0.495 0.523-0.618 0.91-0.185 0.59-0.277 1.234-0.277 1.938v5.133h-1.66v-9.799zm-10.874-18.455c0.325-0.795 0.815-1.406 1.467-1.833 0.651-0.425 1.382-0.636 2.187-0.636 0.591 0 1.116 0.122 1.578 0.374 0.46 0.25 0.836 0.575 1.125 0.972v-4.853h1.652v13.529h-1.541v-1.237c-0.621 0.973-1.535 1.4
6-2.74 1.46-0.781 0-1.499-0.218-2.155-0.647-0.653-0.431-1.162-1.032-1.523-1.805-0.358-0.773-0.539-1.659-0.539-2.662-0.001-0.978 0.163-1.866 0.489-2.662zm-9.431-1.102c0.849-0.91 1.949-1.365 3.303-1.365 1.31 0 2.381 0.446 3.211 1.337 0.829 0.891 1.245 2.146 1.245 3.767 0 0.098-0.003 0.246-0.009 0.442h-7.311c0.062 1.076 0.368 1.899 0.915 2.471 0.547 0.574 1.232 0.86 2.049 0.86 0.608 0 1.127-0.16 1.559-0.48 0.43-0.319 0.772-0.83 1.024-1.533l1.717 0.213c-0.27 1.004-0.772 1.783-1.505 2.335-0.732 0.553-1.668 0.832-2.807 0.832-1.432 0-2.568-0.443-3.41-1.327-0.839-0.881-1.26-2.118-1.26-3.713 0.004-1.648 0.428-2.928 1.279-3.839zm1.693 20.658c0.854 0.885 1.283 2.102 1.283 3.66 0 1.262-0.189 2.252-0.567 2.977-0.377 0.723-0.929 1.283-1.649 1.686-0.725 0.396-1.512 0.598-2.367 0.598-1.372 0-2.481-0.441-3.327-1.32s-1.27-2.146-1.27-3.801c0-1.814 0.504-3.16 1.515-4.031 0.843-0.727 1.87-1.09 3.082-1.09 1.343-0.003 2.445 0.44 3.3 1.321zm-11.192-21.803 2.104 5.869c0.227 0.633 0.438 1.293 0.628 1.976 0.1
47-0.516 0.354-1.139 0.618-1.865l2.178-5.979h1.708l-3.71 9.8h-1.55l-3.727-9.8h1.751zm-4.923-3.728h1.66v13.528h-1.66v-13.528zm-1.435 24.43h1.218v-2.429l1.652-0.999v3.426h1.671v1.291h-1.671v5.732c0 0.471 0.029 0.779 0.087 0.914 0.06 0.133 0.153 0.244 0.285 0.322 0.133 0.078 0.324 0.121 0.567 0.121 0.186 0 0.427-0.023 0.729-0.066l0.238 1.467c-0.466 0.102-0.885 0.148-1.254 0.148-0.602 0-1.07-0.096-1.402-0.285-0.33-0.191-0.564-0.441-0.701-0.754-0.136-0.309-0.203-0.963-0.203-1.959v-5.639h-1.219v-1.291h0.003zm-8.066-19.834c0.842-0.724 1.871-1.088 3.082-1.088 1.348 0 2.447 0.441 3.303 1.322 0.855 0.884 1.283 2.103 1.283 3.659 0 1.262-0.188 2.253-0.567 2.977-0.377 0.724-0.929 1.282-1.652 1.683-0.721 0.4-1.512 0.603-2.366 0.603-1.372 0-2.48-0.443-3.326-1.321-0.847-0.88-1.27-2.147-1.27-3.803-0.001-1.815 0.503-3.157 1.513-4.032zm-26.996-0.868h1.496v1.486c0.381-0.696 0.734-1.155 1.057-1.377s0.676-0.332 1.064-0.332c0.561 0 1.129 0.178 1.709 0.535l-0.572 1.539c-0.407-0.238-0.812-0.358-1.219-0.358-
0.364 0-0.688 0.108-0.977 0.326-0.291 0.218-0.496 0.522-0.62 0.909-0.186 0.591-0.278 1.235-0.278 1.938v5.133h-1.66v-9.799zm-9.664 1.719c-0.425-0.378-1.055-0.565-1.892-0.565-0.782 0-1.358 0.138-1.729 0.413-0.373 0.272-0.647 0.757-0.825 1.453l-1.624-0.223c0.147-0.694 0.391-1.257 0.729-1.684 0.339-0.429 0.829-0.757 1.468-0.988 0.639-0.228 1.38-0.345 2.223-0.345 0.837 0 1.518 0.099 2.039 0.295 0.521 0.197 0.907 0.443 1.153 0.743 0.247 0.298 0.417 0.675 0.517 1.132 0.055 0.281 0.083 0.792 0.083 1.53v2.213c0 1.546 0.035 2.521 0.105 2.932 0.073 0.41 0.211 0.802 0.42 1.18h-1.734c-0.174-0.345-0.284-0.75-0.333-1.21-0.616 0.521-1.208 0.891-1.776 1.105-0.569 0.217-1.181 0.324-1.833 0.324-1.077 0-1.904-0.263-2.482-0.788-0.578-0.526-0.867-1.199-0.867-2.018 0-0.48 0.109-0.916 0.327-1.314 0.218-0.396 0.504-0.715 0.859-0.954 0.354-0.241 0.752-0.422 1.195-0.546 0.325-0.084 0.817-0.169 1.476-0.248 1.34-0.16 2.328-0.35 2.962-0.572 0.006-0.228 0.01-0.373 0.01-0.434-0.002-0.679-0.159-1.154-0.471-1.431zm-
44.218-5.447h2.595v2.4h-2.595v-2.4zm0 3.728h2.595v9.8h-2.595v-9.8zm-14.962 1.159c0.85-0.919 1.922-1.379 3.221-1.379 1.458 0 2.607 0.481 3.451 1.442 0.842 0.963 1.245 2.438 1.21 4.425h-6.497c0.018 0.769 0.228 1.367 0.628 1.795 0.399 0.43 0.899 0.641 1.494 0.641 0.407 0 0.749-0.111 1.024-0.333s0.486-0.579 0.629-1.071l2.583 0.434c-0.331 0.947-0.855 1.669-1.571 2.166-0.717 0.494-1.613 0.745-2.691 0.745-1.705 0-2.965-0.561-3.783-1.673-0.646-0.893-0.969-2.018-0.969-3.376-0.002-1.625 0.419-2.895 1.271-3.816zm-14.173-4.887h4.992c1.125 0 1.985 0.087 2.575 0.26 0.794 0.232 1.473 0.647 2.039 1.245 0.567 0.598 0.998 1.329 1.293 2.193s0.441 1.929 0.441 3.197c0 1.113-0.137 2.074-0.413 2.878-0.339 0.984-0.821 1.783-1.448 2.391-0.474 0.462-1.115 0.821-1.919 1.08-0.603 0.191-1.409 0.289-2.417 0.289h-5.139v-13.533h-0.004zm5.639 24.43v1.291h-1.911v8.508h-1.65v-8.508h-1.467v-1.291h1.467v-1.045c0-0.66 0.058-1.147 0.175-1.469 0.159-0.429 0.44-0.78 0.845-1.047 0.402-0.266 0.967-0.401 1.693-0.401 0.467 0 0
.982 0.057 1.55 0.167l-0.251 1.448c-0.344-0.062-0.67-0.092-0.978-0.092-0.503 0-0.861 0.108-1.069 0.323-0.21 0.214-0.314 0.619-0.314 1.21v0.903h1.911v0.003zm9.253 7.738c-0.378 0.723-0.929 1.283-1.65 1.686-0.724 0.396-1.512 0.598-2.366 0.598-1.372 0-2.481-0.441-3.329-1.32-0.846-0.879-1.27-2.146-1.27-3.801 0-1.814 0.505-3.16 1.514-4.031 0.843-0.727 1.871-1.09 3.082-1.09 1.348 0 2.448 0.441 3.303 1.322 0.855 0.885 1.282 2.102 1.282 3.66 0.002 1.259-0.186 2.251-0.566 2.976zm7.171-5.885c-0.406-0.238-0.811-0.359-1.218-0.359-0.364 0-0.689 0.111-0.977 0.328-0.291 0.219-0.496 0.521-0.62 0.908-0.187 0.592-0.278 1.236-0.278 1.939v5.133h-1.66v-9.801h1.496v1.484c0.381-0.695 0.734-1.154 1.057-1.377 0.323-0.221 0.678-0.332 1.064-0.332 0.561 0 1.129 0.178 1.709 0.535l-0.573 1.542zm4.45-12.755h-2.594v-13.528h2.594v13.528zm4.767 20.831c-0.604 0-1.069-0.096-1.401-0.285-0.331-0.191-0.565-0.443-0.702-0.754-0.136-0.309-0.203-0.965-0.203-1.961v-5.637h-1.219v-1.291h1.219v-2.431l1.65-0.996v3.423h1.67v1.293h-
1.67v5.73c0 0.477 0.028 0.781 0.088 0.914 0.061 0.139 0.152 0.244 0.286 0.324 0.132 0.078 0.32 0.119 0.567 0.119 0.186 0 0.428-0.021 0.729-0.064l0.239 1.469c-0.465 0.098-0.883 0.147-1.253 0.147zm10.588-0.131h-1.661v-6.211c0-0.83-0.181-1.434-0.539-1.812-0.361-0.379-0.87-0.566-1.529-0.566-0.491 0-0.955 0.129-1.388 0.383-0.435 0.254-0.744 0.602-0.93 1.039-0.185 0.438-0.276 1.041-0.276 1.809v5.363h-1.661v-13.53h1.661v4.856c0.776-0.9 1.753-1.35 2.935-1.35 0.725 0 1.357 0.141 1.892 0.43 0.534 0.285 0.917 0.68 1.148 1.186 0.229 0.504 0.345 1.236 0.345 2.195v6.209h0.003zm-2.487-20.7h-2.335l-3.949-9.8h2.724l1.845 5.002 0.535 1.669c0.14-0.423 0.23-0.703 0.267-0.837 0.085-0.276 0.178-0.556 0.276-0.83l1.865-5.001h2.666l-3.894 9.797zm13.408 16.226h-7.31c0.061 1.076 0.367 1.9 0.914 2.471 0.547 0.574 1.231 0.859 2.049 0.859 0.607 0 1.128-0.158 1.561-0.48 0.43-0.318 0.771-0.828 1.023-1.531l1.719 0.213c-0.271 1.002-0.772 1.781-1.506 2.334-0.732 0.553-1.667 0.832-2.806 0.832-1.434 0-2.571-0.443-3.409
-1.326-0.842-0.881-1.261-2.119-1.261-3.715 0-1.648 0.423-2.928 1.272-3.838s1.95-1.365 3.305-1.365c1.312 0 2.38 0.445 3.212 1.336 0.83 0.893 1.245 2.146 1.245 3.766 0.003 0.1-0.001 0.247-0.008 0.444zm-5.647-18.582c0.401 0.428 0.899 0.641 1.497 0.641 0.406 0 0.746-0.112 1.022-0.333 0.279-0.223 0.486-0.576 0.63-1.071l2.584 0.434c-0.333 0.947-0.856 1.669-1.573 2.166-0.716 0.494-1.612 0.743-2.69 0.743-1.705 0-2.965-0.558-3.784-1.671-0.646-0.894-0.968-2.019-0.968-3.377 0-1.623 0.425-2.896 1.274-3.816 0.85-0.919 1.923-1.379 3.22-1.379 1.458 0 2.608 0.481 3.45 1.442 0.844 0.963 1.247 2.438 1.211 4.425h-6.501c0.02 0.768 0.228 1.368 0.628 1.796zm11.199-5.038c-0.252 0.199-0.45 0.56-0.596 1.085-0.146 0.522-0.218 1.618-0.218 3.285v3.029h-2.593v-9.802h2.408v1.392c0.412-0.658 0.783-1.09 1.112-1.301 0.331-0.209 0.703-0.313 1.122-0.313 0.589 0 1.161 0.161 1.707 0.487l-0.802 2.262c-0.438-0.283-0.844-0.424-1.219-0.424-0.361 0-0.671 0.1-0.921 0.3zm9.424 25.829c-0.358 0.803-0.884 1.42-1.569 1.846-0.686
0.428-1.407 0.643-2.163 0.643-0.555 0-1.051-0.119-1.49-0.352-0.442-0.236-0.802-0.531-1.086-0.887v4.77h-1.661v-13.555h1.514v1.271c0.355-0.496 0.76-0.871 1.21-1.119 0.449-0.246 0.993-0.373 1.632-0.373 0.837 0 1.575 0.213 2.215 0.646 0.639 0.43 1.123 1.035 1.448 1.82 0.326 0.783 0.488 1.646 0.488 2.578 0.002 1.009-0.177 1.911-0.538 2.712zm10.373 2.265h-1.485v-1.439c-0.765 1.107-1.8 1.662-3.111 1.662-0.578 0-1.119-0.111-1.62-0.332-0.501-0.223-0.873-0.502-1.116-0.836-0.241-0.334-0.414-0.744-0.514-1.23-0.066-0.328-0.101-0.844-0.101-1.551v-6.072h1.66v5.436c0 0.867 0.034 1.453 0.104 1.752 0.104 0.439 0.324 0.781 0.663 1.029 0.339 0.25 0.757 0.377 1.255 0.377s0.967-0.131 1.402-0.385c0.438-0.254 0.747-0.602 0.928-1.043 0.182-0.439 0.271-1.078 0.271-1.914v-5.25h1.663v9.797h0.001zm9.597-1.152c-0.829 0.916-1.826 1.375-2.989 1.375-1.157 0-2.062-0.484-2.722-1.449v1.227h-1.54v-13.528h1.661v4.829c0.701-0.885 1.597-1.322 2.686-1.322 0.604 0 1.173 0.121 1.712 0.365 0.538 0.242 0.98 0.584 1.327 1.021 0
.349 0.441 0.62 0.971 0.818 1.594 0.198 0.621 0.295 1.283 0.295 1.992 0.001 1.681-0.415 2.98-1.248 3.896zm4.815 1.152h-1.662v-13.528h1.662v13.528zm4.185 0h-1.661v-9.799h1.661v9.799zm0-11.618h-1.661v-1.91h1.661v1.91zm1.065-13.556h-7.311c0.062 1.076 0.366 1.899 0.913 2.471 0.548 0.574 1.231 0.86 2.049 0.86 0.608 0 1.128-0.16 1.561-0.48 0.432-0.319 0.772-0.83 1.024-1.533l1.717 0.213c-0.27 1.004-0.772 1.783-1.502 2.335-0.731 0.553-1.668 0.832-2.807 0.832-1.434 0-2.571-0.443-3.412-1.327-0.838-0.881-1.26-2.118-1.26-3.713 0-1.649 0.426-2.929 1.274-3.84 0.851-0.91 1.95-1.365 3.304-1.365 1.31 0 2.381 0.445 3.211 1.336 0.829 0.894 1.245 2.147 1.245 3.767 0.004 0.099 0.001 0.247-0.006 0.444zm7.892 24.44c-0.735 0.639-1.639 0.957-2.71 0.957-1.34 0-2.418-0.441-3.234-1.314-0.815-0.879-1.222-2.135-1.222-3.77 0-1.059 0.175-1.984 0.524-2.777 0.352-0.795 0.887-1.391 1.603-1.785 0.717-0.398 1.497-0.598 2.341-0.598 1.063 0 1.934 0.27 2.611 0.809 0.678 0.537 1.111 1.301 1.302 2.291l-1.614 0.25c-0.154-0.6
62-0.426-1.154-0.817-1.486-0.392-0.334-0.862-0.498-1.418-0.498-0.837 0-1.514 0.301-2.039 0.9-0.522 0.598-0.784 1.547-0.784 2.848 0 1.314 0.252 2.271 0.756 2.867 0.504 0.598 1.163 0.896 1.975 0.896 0.652 0 1.197-0.199 1.634-0.6 0.438-0.398 0.714-1.014 0.83-1.844l1.634 0.213c-0.182 1.125-0.637 2.006-1.372 2.641zm0.89-21.281c-0.321 0.49-0.789 0.87-1.397 1.137-0.607 0.268-1.298 0.401-2.065 0.401-1.274 0-2.244-0.265-2.912-0.794-0.668-0.528-1.094-1.314-1.278-2.354l1.644-0.261c0.092 0.66 0.349 1.165 0.769 1.515 0.422 0.352 1.013 0.524 1.77 0.524 0.762 0 1.328-0.154 1.697-0.465 0.369-0.31 0.555-0.675 0.555-1.091 0-0.378-0.163-0.673-0.488-0.887-0.227-0.147-0.794-0.336-1.697-0.562-1.219-0.308-2.062-0.574-2.534-0.799-0.471-0.225-0.827-0.535-1.072-0.931-0.242-0.396-0.362-0.835-0.362-1.314 0-0.437 0.099-0.842 0.301-1.214 0.199-0.373 0.471-0.68 0.816-0.926 0.259-0.192 0.61-0.354 1.057-0.483 0.445-0.134 0.925-0.199 1.435-0.199 0.768 0 1.442 0.11 2.025 0.333 0.581 0.221 1.011 0.521 1.286 0.9 0.277
0.379 0.469 0.883 0.572 1.519l-1.623 0.22c-0.074-0.504-0.288-0.899-0.641-1.181-0.354-0.282-0.854-0.425-1.499-0.425-0.763 0-1.31 0.127-1.635 0.378-0.326 0.251-0.489 0.546-0.489 0.886 0 0.216 0.069 0.41 0.204 0.581 0.135 0.179 0.349 0.326 0.638 0.443 0.165 0.061 0.655 0.204 1.467 0.424 1.176 0.314 1.995 0.572 2.459 0.771s0.828 0.489 1.094 0.87c0.264 0.381 0.396 0.857 0.396 1.422-0.009 0.554-0.169 1.075-0.493 1.562zm2.28 21.451c-0.576-0.527-0.867-1.201-0.867-2.018 0-0.479 0.11-0.918 0.328-1.316 0.217-0.395 0.504-0.715 0.857-0.953 0.355-0.238 0.753-0.422 1.195-0.543 0.326-0.09 0.819-0.172 1.477-0.252 1.341-0.158 2.328-0.352 2.963-0.572 0.005-0.225 0.01-0.371 0.01-0.434 0-0.676-0.157-1.152-0.473-1.43-0.426-0.371-1.055-0.562-1.892-0.562-0.781 0-1.356 0.137-1.729 0.41-0.373 0.275-0.648 0.76-0.826 1.455l-1.624-0.221c0.147-0.695 0.392-1.258 0.729-1.686 0.339-0.428 0.826-0.758 1.468-0.984 0.639-0.232 1.383-0.348 2.224-0.348 0.838 0 1.517 0.1 2.04 0.295 0.524 0.195 0.907 0.445 1.154 0.744 0.24
6 0.299 0.418 0.674 0.516 1.131 0.057 0.281 0.084 0.793 0.084 1.531v2.215c0 1.543 0.036 2.518 0.105 2.93 0.072 0.41 0.211 0.799 0.42 1.176h-1.736c-0.171-0.342-0.281-0.75-0.333-1.209-0.615 0.523-1.207 0.893-1.776 1.107-0.568 0.217-1.18 0.322-1.832 0.322-1.075-0.001-1.902-0.263-2.482-0.788z"/>
+ <path d="m102.8 332.7c-0.565 0-1.034 0.207-1.402 0.62-0.37 0.412-0.551 0.97-0.546 1.679h3.876c-0.018-0.751-0.213-1.321-0.582-1.712-0.37-0.39-0.817-0.587-1.346-0.587z"/>
+ <path d="m118.28 352.72c-0.708 0-1.334 0.332-1.878 0.994-0.546 0.66-0.816 1.621-0.816 2.883s0.256 2.193 0.764 2.797c0.51 0.604 1.129 0.902 1.856 0.902 0.737 0 1.37-0.311 1.896-0.938 0.525-0.625 0.788-1.59 0.788-2.9 0-1.25-0.258-2.184-0.77-2.809-0.511-0.619-1.125-0.929-1.84-0.929z"/>
+ <path d="m282.66 339.67c0.357 0 0.713-0.073 1.061-0.218 0.348-0.142 0.676-0.364 0.977-0.66 0.301-0.295 0.561-0.633 0.771-1.01s0.381-0.785 0.514-1.226c0.189-0.607 0.285-1.19 0.285-1.752 0-0.885-0.223-1.574-0.67-2.062-0.445-0.49-1.008-0.733-1.684-0.733-0.525 0-1.002 0.124-1.432 0.375-0.43 0.248-0.822 0.612-1.168 1.092s-0.602 1.038-0.766 1.676c-0.162 0.638-0.246 1.205-0.246 1.704 0 0.922 0.223 1.622 0.666 2.098 0.446 0.479 1.009 0.716 1.692 0.716z"/>
+ <path d="m218.71 352.78c-0.765 0-1.405 0.258-1.926 0.766-0.519 0.512-0.808 1.195-0.861 2.047h5.472c-0.074-0.822-0.282-1.441-0.627-1.852-0.532-0.639-1.217-0.961-2.058-0.961z"/>
+ <path d="m147.66 332.08c-0.764 0-1.404 0.258-1.924 0.765-0.521 0.513-0.809 1.194-0.862 2.048h5.473c-0.075-0.823-0.284-1.441-0.63-1.852-0.528-0.641-1.215-0.961-2.057-0.961z"/>
+ <path d="m168.84 358.79c0.177-0.375 0.266-0.93 0.266-1.662v-0.607c-0.603 0.246-1.507 0.455-2.713 0.627-0.682 0.1-1.165 0.211-1.448 0.332-0.285 0.125-0.503 0.303-0.656 0.541-0.152 0.238-0.229 0.5-0.229 0.789 0 0.441 0.167 0.812 0.502 1.107 0.337 0.295 0.826 0.443 1.473 0.443 0.639 0 1.207-0.141 1.706-0.42 0.497-0.281 0.863-0.662 1.099-1.15z"/>
+ <path d="m256.24 352.79c-0.829 0-1.519 0.312-2.067 0.934-0.546 0.621-0.822 1.559-0.822 2.812 0 1.256 0.274 2.197 0.822 2.818 0.549 0.625 1.238 0.938 2.067 0.938 0.823 0 1.511-0.312 2.058-0.939 0.549-0.631 0.823-1.586 0.823-2.873 0-1.211-0.274-2.131-0.827-2.752-0.55-0.624-1.233-0.938-2.054-0.938z"/>
+ <path d="m102.65 352.78c-0.764 0-1.405 0.258-1.925 0.766-0.521 0.512-0.808 1.195-0.861 2.047h5.471c-0.073-0.822-0.281-1.441-0.628-1.852-0.528-0.639-1.215-0.961-2.057-0.961z"/>
+ <path d="m138.97 352.78c-0.726
<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-terminology.odg
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-terminology.odg b/asciidoc/images/ivy-terminology.odg
new file mode 100644
index 0000000..9e4f92d
Binary files /dev/null and b/asciidoc/images/ivy-terminology.odg differ
[22/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/apache-incubator.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/apache-incubator.svg b/asciidoc/images/apache-incubator.svg
new file mode 100644
index 0000000..41e5d86
--- /dev/null
+++ b/asciidoc/images/apache-incubator.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 697.32 518.74" xml:space="preserve" viewBox="0 0 638.90594 148.79584" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill="#010101">
+ <polygon points="604.83 20.641 604.83 36.572 627.9 36.572 627.9 39.274 604.83 39.274 604.83 55.493 630.77 55.493 630.77 58.195 601.84 58.195 601.84 17.938 630.48 17.938 630.48 20.641" transform="translate(-.000078826 -.0012690)"/>
+ <polygon points="538.58 36.63 538.58 17.938 541.57 17.938 541.57 58.195 538.58 58.195 538.58 39.332 512.81 39.332 512.81 58.195 509.82 58.195 509.82 17.938 512.81 17.938 512.81 36.63" transform="translate(-.000078826 -.0012690)"/>
+ <path d="m437.3 58.886c-2.877 0-5.539-0.537-7.994-1.61-2.453-1.073-4.572-2.54-6.355-4.4-1.783-1.859-3.172-4.054-4.17-6.585-0.996-2.53-1.494-5.232-1.494-8.108v-0.114c0-2.837 0.508-5.521 1.525-8.052 1.016-2.531 2.412-4.744 4.195-6.642s3.902-3.393 6.355-4.486c2.455-1.093 5.137-1.639 8.053-1.639 1.801 0 3.432 0.154 4.887 0.46 1.459 0.309 2.809 0.749 4.055 1.323 1.246 0.575 2.416 1.256 3.51 2.041 1.094 0.787 2.156 1.66 3.191 2.617l-2.127 2.185c-0.883-0.844-1.803-1.628-2.762-2.357-0.957-0.729-1.984-1.352-3.076-1.869-1.094-0.519-2.281-0.929-3.566-1.236-1.283-0.308-2.674-0.461-4.17-0.461-2.416 0-4.658 0.461-6.727 1.381-2.07 0.919-3.863 2.195-5.379 3.824-1.514 1.63-2.703 3.539-3.564 5.722-0.865 2.187-1.295 4.543-1.295 7.074v0.115c0 2.531 0.441 4.897 1.322 7.102 0.883 2.206 2.08 4.123 3.594 5.752 1.516 1.63 3.307 2.912 5.377 3.853s4.312 1.409 6.729 1.409c2.914 0 5.443-0.535 7.592-1.609 2.146-1.073 4.236-2.626 6.27-4.658l2.012 1.955c-1.074 1.035-2.176 1.984-3.307 2.847s-2.338 1.602-3.623 2
.215c-1.287 0.611-2.674 1.093-4.17 1.437-1.496 0.341-3.127 0.514-4.888 0.514z"/>
+ <path d="m340.63 17.649h2.876l18.75 40.545h-3.277l-5.119-11.271h-23.753l-5.119 11.271h-3.105l18.747-40.545zm11.962 26.571-10.582-23.291-10.638 23.291h21.22z"/>
+ <path d="m238.6 17.937h14.607c2.224 0 4.246 0.277 6.067 0.834s3.395 1.36 4.715 2.415c1.324 1.055 2.35 2.339 3.077 3.854 0.729 1.516 1.094 3.249 1.094 5.204v0.114c0 2.109-0.422 3.969-1.265 5.578-0.844 1.611-1.985 2.953-3.423 4.026s-3.104 1.879-5.003 2.415c-1.898 0.537-3.899 0.806-6.011 0.806h-10.868v15.011h-2.99v-40.257zm14.032 22.544c1.879 0 3.585-0.229 5.119-0.689 1.533-0.47 2.847-1.132 3.939-2.004 1.095-0.862 1.946-1.917 2.561-3.154 0.613-1.227 0.92-2.597 0.92-4.103v-0.114c0-1.62-0.297-3.039-0.893-4.256-0.593-1.209-1.428-2.225-2.501-3.037-1.073-0.808-2.358-1.42-3.854-1.852-1.493-0.422-3.145-0.633-4.945-0.633h-11.387v19.842h11.041z"/>
+ <path d="m160.16 17.649h2.875l18.75 40.545h-3.278l-5.119-11.271h-23.752l-5.119 11.271h-3.106l18.749-40.545zm11.962 26.571-10.582-23.291-10.64 23.291h21.222z"/>
+ <path d="m636.2 95.651c0 9.738-4.248 15.873-12.748 18.406l15.451 21.445h-12.666l-14.1-19.84h-13.086v19.84h-9.963v-59.016h21.953c9.006 0 15.449 1.521 19.334 4.56 3.884 3.04 5.825 7.908 5.825 14.605zm-24.738 10.978c5.629 0 9.457-0.872 11.482-2.619 2.027-1.742 3.039-4.543 3.039-8.4 0-3.854-1.039-6.499-3.121-7.935-2.084-1.437-5.799-2.154-11.146-2.154h-12.664v21.108h12.41z"/>
+ <path d="m569.87 127.35c-5.965 5.825-13.34 8.738-22.121 8.738-8.779 0-16.154-2.912-22.121-8.738-5.967-5.825-8.949-13.087-8.949-21.784 0-8.696 2.982-15.956 8.949-21.783 5.967-5.823 13.342-8.738 22.121-8.738 8.781 0 16.156 2.912 22.121 8.738 5.967 5.825 8.951 13.087 8.951 21.783 0 8.698-2.984 15.959-8.951 21.784zm-7.303-36.937c-4.023-4.166-8.963-6.248-14.818-6.248-5.854 0-10.791 2.082-14.818 6.248-4.021 4.165-6.037 9.217-6.037 15.154 0 5.939 2.014 10.991 6.037 15.157 4.025 4.165 8.965 6.248 14.818 6.248 5.855 0 10.793-2.083 14.818-6.248 4.023-4.166 6.035-9.218 6.035-15.157 0-5.937-2.011-10.989-6.035-15.154z"/>
+ <polygon points="485.73 85.605 467.83 85.605 467.83 76.487 513.59 76.487 513.59 85.605 495.7 85.605 495.7 135.5 485.73 135.5" transform="translate(-.000078826 -.0012690)"/>
+ <path d="m426.07 122.08-5.91 13.424h-10.637l26.006-59.017h10.637l26.006 59.017h-10.639l-5.912-13.424h-29.551zm25.498-9.203-10.722-24.314-10.723 24.314h21.445z"/>
+ <path d="m386.93 135.5h-25.836v-59.017h22.967c3.996 0 7.443 0.479 10.342 1.437 2.896 0.957 5.049 2.251 6.457 3.885 2.701 3.039 4.053 6.474 4.053 10.301 0 4.614-1.463 8.048-4.391 10.3-1.07 0.788-1.801 1.28-2.195 1.477-0.395 0.198-1.098 0.522-2.109 0.973 3.658 0.789 6.572 2.435 8.74 4.938 2.166 2.505 3.248 5.615 3.248 9.33 0 4.108-1.406 7.739-4.221 10.892-3.321 3.654-9.007 5.484-17.055 5.484zm-15.873-9.203h15.621c3.658 0 6.459-0.576 8.4-1.729 1.941-1.154 2.912-3.336 2.912-6.545 0-5.233-4.191-7.851-12.578-7.851h-14.355v16.125zm0-25.33h12.666c7.205 0 10.807-2.446 10.807-7.345 0-2.812-0.873-4.839-2.617-6.078-1.744-1.238-4.447-1.858-8.105-1.858h-12.748v15.281h-0.003z"/>
+ <path d="m311.82 121.99c2.701 3.152 6.359 4.728 10.976 4.728s8.275-1.575 10.977-4.728c2.702-3.152 4.053-7.431 4.053-12.833v-32.675h9.963v33.098c0 8.5-2.335 15.043-7.008 19.631-4.672 4.585-10.665 6.88-17.982 6.88-7.318 0-13.312-2.294-17.983-6.88-4.672-4.588-7.009-11.131-7.009-19.631v-33.098h9.963v32.675c-0.003 5.402 1.349 9.681 4.05 12.833z"/>
+ <path d="m265.68 126.47c3.434 0 6.388-0.576 8.866-1.73 2.476-1.153 5.065-2.997 7.767-5.53l6.416 6.585c-6.247 6.923-13.833 10.384-22.753 10.384-8.922 0-16.323-2.87-22.205-8.611s-8.822-13.003-8.822-21.783 2.996-16.098 8.991-21.951c5.994-5.854 13.565-8.781 22.711-8.781s16.788 3.378 22.922 10.132l-6.332 6.924c-2.812-2.703-5.474-4.588-7.979-5.657-2.503-1.069-5.446-1.604-8.823-1.604-5.966 0-10.976 1.928-15.028 5.784-4.053 3.854-6.079 8.78-6.079 14.773 0 5.994 2.014 11.004 6.038 15.029 4.023 4.024 8.795 6.036 14.31 6.036z"/>
+ <polygon points="213.87 135.5 180.44 92.445 180.44 135.5 170.48 135.5 170.48 76.487 180.44 76.487 214.71 120.56 214.71 76.487 224.68 76.487 224.68 135.5" transform="translate(-.000078826 -.0012690)"/>
+ <rect height="59.017" width="9.962" y="76.486" x="146.45"/>
+ </g>
+ <linearGradient id="a" y2="446.93" gradientUnits="userSpaceOnUse" x2="139.38" gradientTransform="matrix(1 0 0 -1 -72.34 481.13)" y1="342.52" x1="119.54">
+ <stop stop-color="#211C52" offset="0"/>
+ <stop stop-color="#CB2128" offset=".5"/>
+ <stop stop-color="#F89A20" offset="1"/>
+ </linearGradient>
+ <path fill="url(#a)" d="m60.645 20.391c-0.004-0.438-0.01-0.877-0.021-1.319 0.091 0.144 0.346 0.586 0.769 1.319h-0.748zm-15.88 46.21c-4.634 8.616-7.274 17.605-7.949 26.962-0.602 8.33 0.299 15.514 2.728 21.536 0.332 0.819 0.653 1.577 0.975 2.278-1.92-1.357-3.751-2.773-5.498-4.25-0.147-0.116-0.254-0.165-0.322-0.148 2.294 3.668 5.152 6.992 8.578 9.973 0.529 0.463 1.412 0.68 1.63 1.359 0.619 1.948-1.065 19.44 4.346 23.517 3.441 2.589 18.65-0.667 23.346-2.184 24.498-7.912 43.499-30.539 40.673-63.149-3.1-35.763-26.66-72.131-50.158-80.873-6.352-2.364-7.761-2.147-14.357 0.674-22.93 9.805-45.453 45.291-48.478 80.198-2.9061 33.546 17.276 56.526 42.786 63.786 0.689 0.197 1.356 0.378 2.004 0.549-0.657-1.358-1.195-2.9-1.631-4.53-26.719-7.946-41.665-31.636-39.253-59.469 2.306-26.608 20.14-65.826 46.108-76.934 5.429-2.318 5.942-2.649 11.447-0.601 26.655 9.914 45.274 50.485 47.618 77.535 2.507 28.92-13.8 53.254-42.002 60.223-2.836 0.7-5.296 1.163-7.599 1.394-7.308 0.734-9.849 2.027-11.189-5.583-2.
952-16.784-0.72-47.158 6.583-58.812 0.059-0.846 0.01 0.703-0.54 2.026-0.254 0.594-0.417 0.957-0.488 1.144-4.374 10.02-6.814 39.086-4.733 44.606-0.602-1.978 0.478-6.143 2.039-6.997l0.895-0.626c4.897-3.527 8.064-9.07 11.604-16.088-0.062-0.098-0.176-0.086-0.341 0.033-1.651 1.382-3.355 2.622-5.106 3.719 3.986-4.187 7.467-9.533 10.45-16.046-0.081-0.118-0.219-0.097-0.415 0.057-1.178 1.063-2.377 2.063-3.601 3.002 5.006-9.063 9.414-19.562 9.876-31.562 0.229-7.766-1.192-15.249-4.265-22.396-1.06-2.443-2.538-5.363-4.444-8.809-2.817-5.081-4.34-7.832-4.583-8.231 0.126 11.012-1.816 19.964-5.825 26.783-1.034 1.812-2.869 4.45-5.521 7.91-2.462 3.228-4.269 5.899-5.388 8.019z"/>
+</svg>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/bullet.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/bullet.gif b/asciidoc/images/bullet.gif
new file mode 100644
index 0000000..a1b1748
Binary files /dev/null and b/asciidoc/images/bullet.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/closed.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/closed.gif b/asciidoc/images/closed.gif
new file mode 100644
index 0000000..319fe8d
Binary files /dev/null and b/asciidoc/images/closed.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/discovery.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/discovery.gif b/asciidoc/images/discovery.gif
new file mode 100644
index 0000000..ec6cca4
Binary files /dev/null and b/asciidoc/images/discovery.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/downloaded.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/downloaded.gif b/asciidoc/images/downloaded.gif
new file mode 100644
index 0000000..9f89267
Binary files /dev/null and b/asciidoc/images/downloaded.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/error.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/error.gif b/asciidoc/images/error.gif
new file mode 100644
index 0000000..2ff6678
Binary files /dev/null and b/asciidoc/images/error.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/evicted.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/evicted.gif b/asciidoc/images/evicted.gif
new file mode 100644
index 0000000..dc47edf
Binary files /dev/null and b/asciidoc/images/evicted.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/grippie.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/grippie.png b/asciidoc/images/grippie.png
new file mode 100644
index 0000000..d863dc7
Binary files /dev/null and b/asciidoc/images/grippie.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/hibgraph-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/hibgraph-small.png b/asciidoc/images/hibgraph-small.png
new file mode 100644
index 0000000..fe2ac8c
Binary files /dev/null and b/asciidoc/images/hibgraph-small.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/hibgraph.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/hibgraph.png b/asciidoc/images/hibgraph.png
new file mode 100644
index 0000000..852fa60
Binary files /dev/null and b/asciidoc/images/hibgraph.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/hibgraph.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/hibgraph.svg b/asciidoc/images/hibgraph.svg
new file mode 100644
index 0000000..bdc8bd7
--- /dev/null
+++ b/asciidoc/images/hibgraph.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 549.56701 519.84498" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <font id="font3" horiz-origin-x="0" horiz-origin-y="0" horiz-adv-x="2048" vert-origin-x="45" vert-origin-y="90" vert-adv-y="90">
+ <font-face underline-position="-155" font-family="Helvetica" underline-thickness="101" units-per-em="2048"/>
+ <missing-glyph d="M66,0l0,1469l1166,0l0,-1469M1048,184l0,1101l-798,0l0,-1101z" horiz-adv-x="1298"/>
+ <glyph horiz-adv-x="569" unicode=" "/>
+ <glyph horiz-adv-x="682" unicode="(" d="M606,1493C501,1290 433,1140 402,1044C355,898 331,729 331,538C331,345 358,168 412,8C445,-91 511,-233 609,-418l-121,0C391,-266 330,-169 307,-127C284,-85 258,-28 231,44C194,143 168,248 153,360C146,418 142,473 142,526C142,723 173,899 235,1053C274,1151 356,1298 481,1493z"/>
+ <glyph horiz-adv-x="682" unicode=")" d="M71,-418C177,-211 245,-61 276,34C323,177 346,345 346,538C346,731 319,907 265,1067C232,1166 166,1308 68,1493l121,0C292,1329 354,1228 376,1190C397,1151 421,1098 446,1031C478,948 501,865 515,784C528,703 535,624 535,549C535,352 504,176 441,21C402,-78 320,-225 196,-418z"/>
+ <glyph horiz-adv-x="682" unicode="-" d="M85,663l502,0l0,-185l-502,0z"/>
+ <glyph horiz-adv-x="569" unicode="." d="M175,218l209,0l0,-218l-209,0z"/>
+ <glyph horiz-adv-x="1139" unicode="0" d="M956,1203C1020,1085 1052,923 1052,718C1052,523 1023,362 965,235C881,52 744,-39 553,-39C381,-39 253,36 169,185C99,310 64,477 64,687C64,850 85,989 127,1106C206,1323 348,1432 554,1432C739,1432 873,1356 956,1203M858,711C858,874 838,1008 798,1113C758,1218 680,1270 565,1270C459,1270 382,1220 333,1121C284,1021 259,874 259,680C259,534 275,417 306,328C354,193 436,125 552,125C645,125 720,166 775,249C830,332 858,486 858,711z"/>
+ <glyph horiz-adv-x="1139" unicode="1" d="M196,1014l0,138C326,1165 417,1186 468,1216C519,1245 558,1315 583,1426l142,0l0,-1426l-192,0l0,1014z"/>
+ <glyph horiz-adv-x="1139" unicode="2" d="M400,571l192,111C678,732 738,775 773,810C828,865 855,929 855,1000C855,1083 830,1150 780,1199C730,1248 663,1272 580,1272C457,1272 371,1225 324,1132C299,1082 285,1013 282,924l-183,0C101,1049 124,1150 168,1229C246,1368 384,1437 581,1437C745,1437 865,1393 941,1304C1016,1215 1054,1117 1054,1008C1054,893 1014,795 933,714C886,667 803,609 682,542l-137,-76C480,430 428,396 391,363C324,305 282,241 265,170l782,0l0,-170l-983,0C71,123 96,231 141,322C185,413 271,496 400,571z"/>
+ <glyph horiz-adv-x="1139" unicode="3" d="M49,440l188,0C245,347 262,280 289,238C336,163 420,125 542,125C637,125 713,150 770,201C827,252 856,317 856,397C856,496 826,565 766,604C705,643 621,663 514,663C502,663 490,663 478,663C465,662 453,662 440,661l0,159C459,818 474,817 487,816C500,815 513,815 528,815C595,815 651,826 694,847C770,884 808,951 808,1047C808,1118 783,1173 732,1212C681,1251 622,1270 555,1270C435,1270 352,1230 306,1150C281,1106 266,1043 263,962l-178,0C85,1069 106,1159 149,1234C222,1367 351,1434 536,1434C682,1434 795,1402 875,1337C955,1272 995,1177 995,1054C995,966 971,895 924,840C895,806 857,779 810,760C885,739 944,700 987,641C1029,582 1050,509 1050,424C1050,287 1005,176 915,90C825,4 697,-39 532,-39C363,-39 240,8 164,101C87,194 49,307 49,440z"/>
+ <glyph horiz-adv-x="1139" unicode="4" d="M677,507l0,649l-459,-649M680,0l0,350l-628,0l0,176l656,910l152,0l0,-929l211,0l0,-157l-211,0l0,-350z"/>
+ <glyph horiz-adv-x="1139" unicode="5" d="M253,365C265,262 313,191 396,152C439,132 488,122 544,122C651,122 730,156 781,224C832,292 858,367 858,450C858,550 828,627 767,682C706,737 632,764 547,764C485,764 432,752 388,728C343,704 305,671 274,628l-156,9l109,771l744,0l0,-174l-609,0l-61,-398C334,861 366,880 396,893C449,915 511,926 581,926C712,926 824,884 915,799C1006,714 1052,607 1052,477C1052,342 1010,222 927,119C843,16 709,-36 526,-36C409,-36 306,-3 217,63C127,128 77,229 66,365z"/>
+ <glyph horiz-adv-x="1139" unicode="6" d="M1028,1057l-178,0C839,1114 822,1158 799,1190C756,1250 690,1280 602,1280C501,1280 421,1234 362,1141C303,1048 270,914 263,741C304,802 356,847 419,877C476,904 540,917 611,917C731,917 836,879 925,802C1014,725 1059,611 1059,459C1059,329 1017,214 932,114C847,13 727,-37 570,-37C436,-37 320,14 223,116C126,217 77,388 77,629C77,807 99,958 142,1082C225,1319 378,1438 599,1438C759,1438 871,1397 934,1314C997,1231 1028,1145 1028,1057M869,444C869,517 848,587 806,654C764,720 688,753 577,753C500,753 432,727 374,676C315,625 286,547 286,444C286,353 313,277 366,216C419,154 492,123 586,123C681,123 752,155 799,219C846,282 869,357 869,444z"/>
+ <glyph horiz-adv-x="1139" unicode="7" d="M1071,1408l0,-157C1025,1206 964,1129 888,1018C811,907 744,788 685,660C627,535 583,422 553,319C534,253 509,147 478,0l-199,0C324,273 424,545 579,816C670,975 766,1112 867,1227l-792,0l0,181z"/>
+ <glyph horiz-adv-x="1366" unicode="B" d="M708,848C792,848 857,860 904,883C977,920 1014,986 1014,1081C1014,1177 975,1242 897,1275C853,1294 788,1303 701,1303l-355,0l0,-455M775,170C897,170 984,205 1036,276C1069,321 1085,375 1085,438C1085,545 1037,617 942,656C891,677 824,687 741,687l-395,0l0,-517M151,1469l631,0C954,1469 1076,1418 1149,1315C1192,1254 1213,1184 1213,1105C1213,1012 1187,936 1134,877C1107,846 1067,817 1016,791C1091,762 1148,730 1185,694C1251,630 1284,542 1284,429C1284,334 1254,249 1195,172C1106,57 965,0 772,0l-621,0z"/>
+ <glyph horiz-adv-x="1139" unicode="_" d="M0,-256l0,101l1139,0l0,-101z"/>
+ <glyph horiz-adv-x="1139" unicode="a" d="M462,117C525,117 587,132 646,161C746,210 796,289 796,400l0,145C774,531 746,519 711,510C676,501 642,494 609,490l-109,-14C435,467 386,454 353,435C298,404 270,354 270,285C270,233 289,192 327,162C365,132 410,117 462,117M706,649C747,654 775,672 789,701C797,717 801,740 801,770C801,831 779,876 736,904C692,931 629,945 548,945C454,945 387,920 348,869C326,841 312,799 305,744l-168,0C140,876 183,968 266,1020C348,1071 443,1097 552,1097C678,1097 780,1073 859,1025C937,977 976,902 976,801l0,-617C976,165 980,150 988,139C995,128 1011,122 1036,122C1044,122 1053,123 1063,124C1073,125 1084,126 1095,128l0,-133C1067,-13 1046,-18 1031,-20C1016,-22 996,-23 971,-23C909,-23 864,-1 836,43C821,66 811,99 805,142C768,94 716,52 647,17C578,-18 503,-36 420,-36C321,-36 240,-6 177,55C114,115 82,190 82,281C82,380 113,457 175,512C237,567 318,600 419,613z"/>
+ <glyph horiz-adv-x="1139" unicode="b" d="M118,1474l175,0l0,-533C332,992 379,1032 434,1059C489,1086 548,1099 612,1099C745,1099 854,1053 937,962C1020,870 1061,735 1061,556C1061,387 1020,246 938,134C856,22 742,-34 597,-34C516,-34 447,-14 391,25C358,48 322,86 284,137l0,-137l-166,0M877,547C877,660 853,753 805,827C756,901 685,938 591,938C509,938 437,908 376,847C314,786 283,686 283,547C283,446 296,365 321,302C368,184 457,125 586,125C683,125 756,164 805,241C853,318 877,420 877,547z"/>
+ <glyph horiz-adv-x="1024" unicode="c" d="M976,711l-175,0C790,777 766,832 728,876C690,919 629,941 545,941C430,941 348,885 299,773C267,700 251,611 251,504C251,397 274,306 319,233C364,160 436,123 533,123C608,123 667,146 711,192C754,237 784,300 801,379l175,0C956,237 906,133 826,68C746,2 644,-31 519,-31C379,-31 267,20 184,123C101,225 59,353 59,506C59,694 105,840 196,945C287,1050 404,1102 545,1102C666,1102 764,1073 840,1014C915,955 961,854 976,711z"/>
+ <glyph horiz-adv-x="1139" unicode="d" d="M553,119C636,119 705,155 759,227C812,298 839,401 839,535C839,670 811,771 756,836C701,901 632,933 551,933C460,933 387,898 331,829C274,760 246,658 246,523C246,408 270,312 319,235C368,158 446,119 553,119M723,1038C755,1018 791,983 832,933l0,541l173,0l0,-1474l-162,0l0,149C801,83 751,35 694,6C637,-23 571,-38 497,-38C378,-38 274,12 187,113C100,213 56,346 56,513C56,669 96,804 176,919C255,1033 369,1090 517,1090C599,1090 668,1073 723,1038z"/>
+ <glyph horiz-adv-x="1139" unicode="e" d="M962,903C998,849 1022,786 1034,714C1045,665 1050,586 1050,478l-785,0C268,369 294,282 342,217C390,151 464,118 565,118C659,118 734,149 790,211C822,247 845,289 858,336l177,0C1030,297 1015,253 989,205C962,156 933,117 900,86C845,33 778,-3 697,-22C654,-33 605,-38 550,-38C417,-38 304,11 211,108C118,205 72,340 72,515C72,687 119,827 212,934C305,1041 427,1095 578,1095C654,1095 728,1077 799,1042C870,1006 925,960 962,903M865,621C858,699 841,761 814,808C765,895 682,938 567,938C484,938 415,908 359,849C303,789 273,713 270,621z"/>
+ <glyph horiz-adv-x="1139" unicode="g" d="M730,1028C764,1005 799,971 834,926l0,135l166,0l0,-974C1000,-49 980,-156 940,-235C865,-380 724,-453 517,-453C402,-453 305,-427 226,-375C147,-324 103,-243 94,-133l183,0C286,-181 303,-218 329,-244C370,-284 434,-304 521,-304C659,-304 749,-255 792,-158C817,-101 829,2 827,149C791,94 748,54 697,27C646,0 579,-13 496,-13C380,-13 279,28 192,111C105,193 61,329 61,519C61,698 105,838 193,939C280,1040 386,1090 510,1090C594,1090 667,1069 730,1028M543,931C416,931 330,872 283,753C258,690 246,607 246,504C246,383 271,292 320,229C369,166 434,134 517,134C646,134 737,192 790,309C819,375 834,452 834,540C834,673 807,771 752,835C697,899 628,931 543,931z"/>
+ <glyph horiz-adv-x="1139" unicode="h" d="M132,1474l180,0l0,-548C355,980 393,1018 427,1040C485,1078 557,1097 644,1097C799,1097 905,1043 960,934C990,875 1005,792 1005,687l0,-687l-185,0l0,675C820,754 810,811 790,848C757,907 696,936 606,936C531,936 464,910 403,859C342,808 312,711 312,568l0,-568l-180,0z"/>
+ <glyph horiz-adv-x="455" unicode="i" d="M132,1066l183,0l0,-1066l-183,0M132,1469l183,0l0,-204l-183,0z"/>
+ <glyph horiz-adv-x="455" unicode="j" d="M312,1261l-180,0l0,208l180,0M-38,-271C43,-268 91,-261 108,-249C124,-238 132,-201 132,-140l0,1206l180,0l0,-1225C312,-237 299,-295 274,-334C232,-399 152,-432 35,-432C26,-432 17,-432 8,-431C-2,-430 -17,-429 -38,-427z"/>
+ <glyph horiz-adv-x="455" unicode="l" d="M137,1469l180,0l0,-1469l-180,0z"/>
+ <glyph horiz-adv-x="1706" unicode="m" d="M132,1071l178,0l0,-152C353,972 391,1010 426,1034C485,1075 553,1095 628,1095C713,1095 782,1074 834,1032C863,1008 890,973 914,926C954,983 1001,1026 1055,1054C1109,1081 1170,1095 1237,1095C1381,1095 1479,1043 1531,939C1559,883 1573,808 1573,713l0,-713l-187,0l0,744C1386,815 1368,864 1333,891C1297,918 1253,931 1202,931C1131,931 1071,907 1020,860C969,813 943,734 943,623l0,-623l-183,0l0,699C760,772 751,825 734,858C707,908 656,933 581,933C513,933 451,907 396,854C340,801 312,706 312,568l0,-568l-180,0z"/>
+ <glyph horiz-adv-x="1139" unicode="n" d="M132,1071l171,0l0,-152C354,982 407,1027 464,1054C521,1081 584,1095 653,1095C805,1095 908,1042 961,936C990,878 1005,795 1005,687l0,-687l-183,0l0,675C822,740 812,793 793,833C761,900 703,933 619,933C576,933 541,929 514,920C465,905 421,876 384,832C354,797 335,760 326,723C317,685 312,631 312,561l0,-561l-180,0z"/>
+ <glyph horiz-adv-x="1139" unicode="o" d="M869,553C869,653 853,734 821,797C770,896 683,945 559,945C449,945 369,903 319,819C269,735 244,634 244,515C244,401 269,306 319,230C369,154 448,116 557,116C676,116 758,161 803,252C847,342 869,442 869,553M1057,558C1057,385 1015,243 931,130C847,17 717,-39 540,-39C393,-39 276,11 189,111C102,210 59,344 59,512C59,692 105,835 196,942C287,1049 410,1102 564,1102C702,1102 819,1056 914,964C1009,872 1057,737 1057,558z"/>
+ <glyph horiz-adv-x="682" unicode="r" d="M137,1071l171,0l0,-185C322,922 356,966 411,1018C466,1069 529,1095 600,1095C603,1095 609,1095 617,1094C625,1093 639,1092 658,1090l0,-190C647,902 638,903 629,904C620,905 610,905 599,905C508,905 439,876 390,818C341,759 317,692 317,616l0,-616l-180,0z"/>
+ <glyph horiz-adv-x="1024" unicode="s" d="M239,336C244,276 259,230 284,198C329,140 408,111 520,111C587,111 645,126 696,155C747,184 772,228 772,289C772,335 752,370 711,394C685,409 634,426 557,445l-143,36C323,504 255,529 212,557C135,606 96,673 96,759C96,860 133,942 206,1005C279,1068 377,1099 500,1099C661,1099 778,1052 849,957C894,897 915,832 914,763l-170,0C741,804 726,841 701,874C660,921 588,945 486,945C418,945 367,932 332,906C297,880 279,846 279,803C279,756 302,719 348,691C375,674 414,660 466,647l119,-29C714,587 801,556 845,527C915,481 950,409 950,310C950,215 914,132 842,63C769,-6 659,-41 511,-41C352,-41 239,-5 173,68C106,140 71,229 66,336z"/>
+ <glyph horiz-adv-x="569" unicode="t" d="M168,1370l182,0l0,-299l171,0l0,-147l-171,0l0,-699C350,188 363,163 388,150C402,143 425,139 458,139C467,139 476,139 486,140C496,140 508,141 521,142l0,-142C500,-6 479,-10 457,-13C434,-16 410,-17 384,-17C300,-17 243,5 213,48C183,91 168,146 168,215l0,709l-145,0l0,147l145,0z"/>
+ <glyph horiz-adv-x="1024" unicode="v" d="M220,1071l286,-872l299,872l197,0l-404,-1071l-192,0l-395,1071z"/>
+ </font>
+ <path fill="#fcf9ce" d="m97.75 228.83h61.619c2.22 0 4.02 1.8 4.02 4.02v34.436c0 2.22-1.8 4.021-4.02 4.021h-61.619c-2.22 0-4.02-1.801-4.02-4.021v-34.436c0-2.22 1.8-4.02 4.02-4.02z"/>
+ <text font-size="12.06px" y="247.52879" x="100.7651" font-family="Helvetica" fill="#010101">hibernate
+ </text>
+ <text font-size="12.06px" y="261.7319" x="104.3071" font-family="Helvetica" fill="#010101">3.2.6.ga
+ </text>
+ <path d="m97.75 228.83h61.619c2.22 0 4.02 1.8 4.02 4.02v34.436c0 2.22-1.8 4.021-4.02 4.021h-61.619c-2.22 0-4.02-1.801-4.02-4.021v-34.436c0-2.22 1.8-4.02 4.02-4.02z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m412.4 87.23h132.64c2.222 0 4.021 1.8 4.021 4.02v48.641c0 2.22-1.799 4.02-4.021 4.02h-132.64c-2.219 0-4.02-1.8-4.02-4.02v-48.641c0.001-2.219 1.802-4.02 4.02-4.02z"/>
+ <g font-size="12.06px" font-family="Helvetica" fill="#010101">
+ <text y="105.9243" x="415.41891">commons-collections
+ </text>
+ <text y="120.1284" x="463.4707">2.1.1
+ </text>
+ <text y="134.3315" x="442.63959">2.1 (evicted)
+ </text>
+ </g>
+ <path d="m412.4 87.23h132.64c2.222 0 4.021 1.8 4.021 4.02v48.641c0 2.22-1.799 4.02-4.021 4.02h-132.64c-2.219 0-4.02-1.8-4.02-4.02v-48.641c0.001-2.219 1.802-4.02 4.02-4.02z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m287.52 476.87h38.753c2.22 0 4.021 1.8 4.021 4.02v34.438c0 2.22-1.801 4.02-4.021 4.02h-38.753c-2.22 0-4.02-1.8-4.02-4.02v-34.438c0-2.221 1.8-4.02 4.02-4.02z"/>
+ <text font-size="12.06px" y="495.56009" x="292.7612" font-family="Helvetica" fill="#010101">cglib
+ </text>
+ <text font-size="12.06px" y="509.76419" x="290.52979" font-family="Helvetica" fill="#010101">2.1_3
+ </text>
+ <path d="m287.52 476.87h38.753c2.22 0 4.021 1.8 4.021 4.02v34.438c0 2.22-1.801 4.02-4.021 4.02h-38.753c-2.22 0-4.02-1.8-4.02-4.02v-34.438c0-2.221 1.8-4.02 4.02-4.02z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m460.46 455.98h36.539c2.219 0 4.021 1.8 4.021 4.021v34.437c0 2.221-1.802 4.021-4.021 4.021h-36.539c-2.221 0-4.021-1.801-4.021-4.021v-34.437c0-2.221 1.8-4.021 4.021-4.021z"/>
+ <text font-size="12.06px" y="474.67331" x="466.69141" font-family="Helvetica" fill="#010101">asm
+ </text>
+ <text font-size="12.06px" y="488.8765" x="463.4707" font-family="Helvetica" fill="#010101">1.5.3
+ </text>
+ <path d="m460.46 455.98h36.539c2.219 0 4.021 1.8 4.021 4.021v34.437c0 2.221-1.802 4.021-4.021 4.021h-36.539c-2.221 0-4.021-1.801-4.021-4.021v-34.437c0-2.221 1.8-4.021 4.021-4.021z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m288.62 394.19h36.54c2.22 0 4.02 1.801 4.02 4.021v34.438c0 2.221-1.8 4.021-4.02 4.021h-36.54c-2.22 0-4.02-1.8-4.02-4.021v-34.438c0-2.22 1.8-4.021 4.02-4.021z"/>
+ <text font-size="12.06px" y="412.88229" x="293.353" font-family="Helvetica" fill="#010101">antlr
+ </text>
+ <text font-size="12.06px" y="427.0864" x="291.63721" font-family="Helvetica" fill="#010101">2.7.6
+ </text>
+ <path d="m288.62 394.19h36.54c2.22 0 4.02 1.801 4.02 4.021v34.438c0 2.221-1.8 4.021-4.02 4.021h-36.54c-2.22 0-4.02-1.8-4.02-4.021v-34.438c0-2.22 1.8-4.021 4.02-4.021z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m285.1 311.51h43.582c2.221 0 4.021 1.798 4.021 4.021v34.437c0 2.221-1.8 4.021-4.021 4.021h-43.582c-2.22 0-4.02-1.801-4.02-4.021v-34.436c0-2.224 1.8-4.022 4.02-4.022z"/>
+ <text font-size="12.06px" y="330.20749" x="288.11569" font-family="Helvetica" fill="#010101">dom4j
+ </text>
+ <text font-size="12.06px" y="344.4097" x="291.63721" font-family="Helvetica" fill="#010101">1.6.1
+ </text>
+ <path d="m285.1 311.51h43.582c2.221 0 4.021 1.798 4.021 4.021v34.437c0 2.221-1.8 4.021-4.021 4.021h-43.582c-2.22 0-4.02-1.801-4.02-4.021v-34.436c0-2.224 1.8-4.022 4.02-4.022z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m274.97 228.83h63.839c2.22 0 4.021 1.8 4.021 4.02v34.436c0 2.22-1.801 4.021-4.021 4.021h-63.839c-2.22 0-4.02-1.801-4.02-4.021v-34.436c0-2.22 1.8-4.02 4.02-4.02z"/>
+ <text font-size="12.06px" y="247.52879" x="277.98679" font-family="Helvetica" fill="#010101">asm-attrs
+ </text>
+ <text font-size="12.06px" y="261.7319" x="291.63721" font-family="Helvetica" fill="#010101">1.5.3
+ </text>
+ <path d="m274.97 228.83h63.839c2.22 0 4.021 1.8 4.021 4.02v34.436c0 2.22-1.801 4.021-4.021 4.021h-63.839c-2.22 0-4.02-1.801-4.02-4.021v-34.436c0-2.22 1.8-4.02 4.02-4.02z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m285.15 146.16h43.476c2.221 0 4.021 1.8 4.021 4.02v34.437c0 2.22-1.8 4.02-4.021 4.02h-43.476c-2.22 0-4.02-1.8-4.02-4.02v-34.437c0-2.22 1.8-4.02 4.02-4.02z"/>
+ <text font-size="12.06px" y="164.85201" x="299.4722" font-family="Helvetica" fill="#010101">jta
+ </text>
+ <text font-size="12.06px" y="179.05521" x="288.16849" font-family="Helvetica" fill="#010101">1.0.1B
+ </text>
+ <path d="m285.15 146.16h43.476c2.221 0 4.021 1.8 4.021 4.02v34.437c0 2.22-1.8 4.02-4.021 4.02h-43.476c-2.22 0-4.02-1.8-4.02-4.02v-34.437c0-2.22 1.8-4.02 4.02-4.02z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m280.17 63.479h53.452c2.22 0 4.02 1.8 4.02 4.02v34.437c0 2.22-1.8 4.02-4.02 4.02h-53.452c-2.22 0-4.02-1.8-4.02-4.02v-34.436c0-2.22 1.8-4.021 4.02-4.021z"/>
+ <text font-size="12.06px" y="82.173302" x="283.18121" font-family="Helvetica" fill="#010101">ehcache
+ </text>
+ <text font-size="12.06px" y="96.377403" x="291.63721" font-family="Helvetica" fill="#010101">1.2.3
+ </text>
+ <path d="m280.17 63.479h53.452c2.22 0 4.02 1.8 4.02 4.02v34.437c0 2.221-1.8 4.02-4.02 4.02h-53.452c-2.22 0-4.02-1.799-4.02-4.02v-34.436c0-2.22 1.8-4.021 4.02-4.021z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <path fill="#fcf9ce" d="m421.44 0.5h114.58c2.221 0 4.02 1.799 4.02 4.02v34.437c0 2.22-1.799 4.02-4.02 4.02h-114.58c-2.219 0-4.021-1.8-4.021-4.02v-34.436c0-2.222 1.8-4.021 4.02-4.021z"/>
+ <text font-size="12.06px" y="19.194799" x="424.45209" font-family="Helvetica" fill="#010101">commons-logging
+ </text>
+ <text font-size="12.06px" y="33.398899" x="463.4707" font-family="Helvetica" fill="#010101">1.0.4
+ </text>
+ <path d="m421.44 0.5h114.58c2.221 0 4.02 1.799 4.02 4.02v34.437c0 2.22-1.799 4.02-4.02 4.02h-114.58c-2.219 0-4.021-1.8-4.021-4.02v-34.436c0-2.222 1.8-4.021 4.02-4.021z" stroke="#010101" stroke-miterlimit="1.45" fill="none"/>
+ <line y2="250.07" x2="85.645" stroke="#010101" stroke-miterlimit="1.45" y1="250.07" fill="none"/>
+ <polygon points="81.625 254.49 93.685 249.47 81.625 244.44 84.639 249.47" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="265.75241" x="33.0396" font-family="Helvetica" fill="#010101">3.2.6.ga
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="163.39 239.36 173.94 239.36 234.92 129.98 307.39 129.98 372.35 134.45 400.31 134.45" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="396.29 139.47 408.35 134.45 396.29 129.42 399.3 134.45" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="128.48579" x="370.52539" font-family="Helvetica" fill="#010101">2.1.1
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="162.08 269.69 173.94 269.69 234.92 497.5 275.41 497.5" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="271.39 502.52 283.45 497.5 271.39 492.48 274.4 497.5" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="285.97119" x="156.88921" font-family="Helvetica" fill="#010101">2.1_3
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="163.39 264.63 173.94 264.63 234.92 460.68 448.37 460.68" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="444.35 465.71 456.41 460.68 444.35 455.66 447.36 460.68" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="476.96829" x="413.74121" font-family="Helvetica" fill="#010101">1.5.3
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="330.29 497.5 340.84 497.5 420.4 492.54 448.36 492.54" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="444.34 497.57 456.4 492.54 444.34 487.52 447.35 492.54" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="508.82571" x="418.57709" font-family="Helvetica" fill="#010101">1.5.3
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="163.39 259.58 173.94 259.58 234.92 414.82 276.51 414.82" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="272.49 419.85 284.55 414.82 272.49 409.8 275.51 414.82" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="409.86771" x="238.5405" font-family="Helvetica" fill="#010101">2.7.6
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="163.39 254.52 173.94 254.52 234.92 332.15 273 332.15" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="268.98 337.17 281.04 332.15 268.98 327.12 271.99 332.15" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="327.19189" x="238.146" font-family="Helvetica" fill="#010101">1.6.1
+ </text>
+ <line y2="250.07" x2="262.89" stroke="#010101" stroke-miterlimit="1.45" y1="250.07" x1="163.39" fill="none"/>
+ <polygon points="258.87 254.49 270.92 249.47 258.87 244.44 261.88 249.47" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="243.5083" x="228.25729" font-family="Helvetica" fill="#010101">1.5.3
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="163.39 244.42 173.94 244.42 234.92 166.79 273.05 166.79" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="269.03 171.82 281.09 166.79 269.03 161.77 272.04 166.79" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="182.06979" x="238.146" font-family="Helvetica" fill="#010101">1.0.1B
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="163.39 234.3 173.94 234.3 234.92 84.115 268.06 84.115" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="264.04 89.14 276.1 84.115 264.04 79.089 267.06 84.115" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="99.392097" x="238.5269" font-family="Helvetica" fill="#010101">1.2.3
+ </text>
+ <line y2="96.091" x2="400.31" stroke="#010101" stroke-miterlimit="1.45" y1="96.091" x1="337.64" fill="none"/>
+ <polygon points="396.29 100.51 408.35 95.487 396.29 90.461 399.3 95.487" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="89.526901" x="377.13089" font-family="Helvetica" fill="#010101">2.1
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="337.64 72.742 348.19 72.742 381.38 37.063 409.34 37.063" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="405.32 42.088 417.38 37.063 405.32 32.039 408.34 37.063" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="31.104" x="379.5596" font-family="Helvetica" fill="#010101">1.0.4
+ </text>
+ <polyline transform="translate(0 .604)" stroke="#010101" points="162.08 229.25 173.94 229.25 234.92 5.207 409.33 5.207" stroke-miterlimit="1.45" fill="none"/>
+ <polygon points="405.31 10.23 417.37 5.207 405.31 0.182 408.33 5.207" fill="#010101" transform="translate(0 .604)"/>
+ <text font-size="12.06px" y="223.28951" x="157.9966" font-family="Helvetica" fill="#010101">1.0.4
+ </text>
+</svg>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-book.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-book.png b/asciidoc/images/ivy-book.png
new file mode 100644
index 0000000..a83f8e3
Binary files /dev/null and b/asciidoc/images/ivy-book.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-demo.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-demo.png b/asciidoc/images/ivy-demo.png
new file mode 100644
index 0000000..ea75840
Binary files /dev/null and b/asciidoc/images/ivy-demo.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-dl-1.4.1.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-dl-1.4.1.png b/asciidoc/images/ivy-dl-1.4.1.png
new file mode 100644
index 0000000..4809591
Binary files /dev/null and b/asciidoc/images/ivy-dl-1.4.1.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-dl-2.0.0-alpha-1.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-dl-2.0.0-alpha-1.png b/asciidoc/images/ivy-dl-2.0.0-alpha-1.png
new file mode 100644
index 0000000..3092c21
Binary files /dev/null and b/asciidoc/images/ivy-dl-2.0.0-alpha-1.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-dl.xcf
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-dl.xcf b/asciidoc/images/ivy-dl.xcf
new file mode 100644
index 0000000..1ba3784
Binary files /dev/null and b/asciidoc/images/ivy-dl.xcf differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-forum.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-forum.png b/asciidoc/images/ivy-forum.png
new file mode 100644
index 0000000..e19786c
Binary files /dev/null and b/asciidoc/images/ivy-forum.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-lierre.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-lierre.png b/asciidoc/images/ivy-lierre.png
new file mode 100644
index 0000000..a91bd9d
Binary files /dev/null and b/asciidoc/images/ivy-lierre.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-publish-fc.odg
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-publish-fc.odg b/asciidoc/images/ivy-publish-fc.odg
new file mode 100644
index 0000000..78720d4
Binary files /dev/null and b/asciidoc/images/ivy-publish-fc.odg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-publish-fc.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-publish-fc.png b/asciidoc/images/ivy-publish-fc.png
new file mode 100644
index 0000000..cf8221f
Binary files /dev/null and b/asciidoc/images/ivy-publish-fc.png differ
[29/29] ant-ivy git commit: Merge PR-47. This closes #47
Posted by ja...@apache.org.
Merge PR-47.
This closes #47
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/7ac1170c
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/7ac1170c
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/7ac1170c
Branch: refs/heads/master
Commit: 7ac1170c80ad780065b637edcb77e41c1da03ba7
Parents: aed63ae c50f4b4
Author: Jaikiran Pai <ja...@apache.org>
Authored: Mon Jun 19 07:14:27 2017 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Mon Jun 19 07:14:27 2017 +0530
----------------------------------------------------------------------
.gitignore | 2 +
asciidoc/ant.adoc | 182 ++
asciidoc/bestpractices.adoc | 116 ++
asciidoc/compatibility.adoc | 30 +
asciidoc/concept.adoc | 404 ++++
asciidoc/configuration.adoc | 3 +
asciidoc/configuration/caches.adoc | 3 +
asciidoc/configuration/caches/cache.adoc | 3 +
asciidoc/configuration/caches/ttl.adoc | 3 +
asciidoc/configuration/classpath.adoc | 4 +
asciidoc/configuration/conf.adoc | 3 +
asciidoc/configuration/conflict-managers.adoc | 4 +
asciidoc/configuration/include.adoc | 4 +
asciidoc/configuration/latest-strategies.adoc | 4 +
asciidoc/configuration/lock-strategies.adoc | 3 +
asciidoc/configuration/macrodef.adoc | 4 +
asciidoc/configuration/macrodef/attribute.adoc | 3 +
asciidoc/configuration/module.adoc | 4 +
asciidoc/configuration/modules.adoc | 4 +
asciidoc/configuration/namespace.adoc | 4 +
asciidoc/configuration/namespace/dest.adoc | 3 +
.../configuration/namespace/fromtosystem.adoc | 3 +
asciidoc/configuration/namespace/rule.adoc | 3 +
asciidoc/configuration/namespace/src.adoc | 3 +
asciidoc/configuration/namespaces.adoc | 4 +
asciidoc/configuration/outputters.adoc | 4 +
asciidoc/configuration/parsers.adoc | 4 +
asciidoc/configuration/properties.adoc | 4 +
asciidoc/configuration/property.adoc | 4 +
asciidoc/configuration/resolvers.adoc | 4 +
asciidoc/configuration/status.adoc | 4 +
asciidoc/configuration/statuses.adoc | 4 +
asciidoc/configuration/triggers.adoc | 3 +
asciidoc/configuration/typedef.adoc | 4 +
asciidoc/configuration/version-matchers.adoc | 4 +
asciidoc/dev.adoc | 123 ++
asciidoc/dev/makerelease.adoc | 318 +++
asciidoc/extend.adoc | 35 +
asciidoc/images/ant-project-logo.gif | Bin 0 -> 7577 bytes
asciidoc/images/ant-project-logo.svg | 951 +++++++++
asciidoc/images/apache-incubator-logo.png | Bin 0 -> 6205 bytes
asciidoc/images/apache-incubator.svg | 44 +
asciidoc/images/bullet.gif | Bin 0 -> 193 bytes
asciidoc/images/closed.gif | Bin 0 -> 141 bytes
asciidoc/images/discovery.gif | Bin 0 -> 362 bytes
asciidoc/images/downloaded.gif | Bin 0 -> 104 bytes
asciidoc/images/error.gif | Bin 0 -> 605 bytes
asciidoc/images/evicted.gif | Bin 0 -> 215 bytes
asciidoc/images/grippie.png | Bin 0 -> 162 bytes
asciidoc/images/hibgraph-small.png | Bin 0 -> 9042 bytes
asciidoc/images/hibgraph.png | Bin 0 -> 51535 bytes
asciidoc/images/hibgraph.svg | 173 ++
asciidoc/images/ivy-book.png | Bin 0 -> 14182 bytes
asciidoc/images/ivy-demo.png | Bin 0 -> 24544 bytes
asciidoc/images/ivy-dl-1.4.1.png | Bin 0 -> 10892 bytes
asciidoc/images/ivy-dl-2.0.0-alpha-1.png | Bin 0 -> 12149 bytes
asciidoc/images/ivy-dl.xcf | Bin 0 -> 29498 bytes
asciidoc/images/ivy-forum.png | Bin 0 -> 10441 bytes
asciidoc/images/ivy-lierre.png | Bin 0 -> 15263 bytes
asciidoc/images/ivy-publish-fc.odg | Bin 0 -> 11126 bytes
asciidoc/images/ivy-publish-fc.png | Bin 0 -> 20111 bytes
asciidoc/images/ivy-publish-fc.svg | 337 ++++
asciidoc/images/ivy-terminology.odg | Bin 0 -> 22331 bytes
asciidoc/images/ivy-terminology.png | Bin 0 -> 70573 bytes
asciidoc/images/ivy-terminology.svg | 419 ++++
asciidoc/images/ivyfile-small.png | Bin 0 -> 16328 bytes
asciidoc/images/logo.png | Bin 0 -> 8772 bytes
asciidoc/images/main-tasks.odg | Bin 0 -> 12386 bytes
asciidoc/images/main-tasks.png | Bin 0 -> 32995 bytes
asciidoc/images/main-tasks.svg | 82 +
asciidoc/images/open.gif | Bin 0 -> 151 bytes
asciidoc/images/report-small.png | Bin 0 -> 16751 bytes
asciidoc/images/searched.gif | Bin 0 -> 229 bytes
asciidoc/images/warning.png | Bin 0 -> 762 bytes
asciidoc/images/xooki-edit-small.png | Bin 0 -> 30143 bytes
asciidoc/images/xooki-edit.png | Bin 0 -> 52706 bytes
asciidoc/images/xooki-toolbar.png | Bin 0 -> 6539 bytes
asciidoc/images/yed-step1.jpg | Bin 0 -> 3077 bytes
asciidoc/images/yed-step2.jpg | Bin 0 -> 15150 bytes
asciidoc/images/yed-step3-2.jpg | Bin 0 -> 3816 bytes
asciidoc/images/yed-step3.jpg | Bin 0 -> 21662 bytes
asciidoc/images/yed-step4.jpg | Bin 0 -> 10558 bytes
asciidoc/images/yed-step5.jpg | Bin 0 -> 31309 bytes
asciidoc/images/yed-step6.jpg | Bin 0 -> 21240 bytes
asciidoc/images/yed-step7.jpg | Bin 0 -> 51973 bytes
asciidoc/index.adoc | 69 +
asciidoc/install.adoc | 74 +
asciidoc/ivyfile.adoc | 126 ++
asciidoc/ivyfile/artifact-conf.adoc | 19 +
asciidoc/ivyfile/artifact-exclude-conf.adoc | 19 +
asciidoc/ivyfile/artifact-exclude.adoc | 49 +
asciidoc/ivyfile/artifact.adoc | 94 +
asciidoc/ivyfile/conf.adoc | 62 +
asciidoc/ivyfile/configurations.adoc | 190 ++
asciidoc/ivyfile/conflict.adoc | 35 +
asciidoc/ivyfile/conflicts.adoc | 51 +
asciidoc/ivyfile/dependencies.adoc | 52 +
asciidoc/ivyfile/dependency-artifact-conf.adoc | 17 +
asciidoc/ivyfile/dependency-artifact.adoc | 100 +
asciidoc/ivyfile/dependency-conf.adoc | 33 +
asciidoc/ivyfile/dependency-include-conf.adoc | 17 +
asciidoc/ivyfile/dependency-include.adoc | 46 +
asciidoc/ivyfile/dependency.adoc | 409 ++++
asciidoc/ivyfile/description.adoc | 22 +
asciidoc/ivyfile/exclude.adoc | 24 +
asciidoc/ivyfile/extends.adoc | 40 +
asciidoc/ivyfile/include.adoc | 57 +
asciidoc/ivyfile/info.adoc | 39 +
asciidoc/ivyfile/ivyauthor.adoc | 20 +
asciidoc/ivyfile/license.adoc | 19 +
asciidoc/ivyfile/manager.adoc | 34 +
asciidoc/ivyfile/mapped.adoc | 20 +
asciidoc/ivyfile/override.adoc | 29 +
asciidoc/ivyfile/publications.adoc | 34 +
asciidoc/ivyfile/repository.adoc | 23 +
asciidoc/js/jquery.pack.js | 1 +
asciidoc/js/jquery.treeview.js | 239 +++
asciidoc/moreexamples.adoc | 33 +
asciidoc/osgi.adoc | 44 +
asciidoc/osgi/eclipse-plugin.adoc | 88 +
asciidoc/osgi/osgi-mapping.adoc | 242 +++
asciidoc/osgi/sigil.adoc | 37 +
asciidoc/osgi/standard-osgi.adoc | 46 +
asciidoc/osgi/target-platform.adoc | 48 +
asciidoc/principle.adoc | 64 +
asciidoc/reference.adoc | 39 +
asciidoc/release-notes.adoc | 377 ++++
asciidoc/resolver/bintray.adoc | 53 +
asciidoc/resolver/chain.adoc | 87 +
asciidoc/resolver/dual.adoc | 29 +
asciidoc/resolver/filesystem.adoc | 77 +
asciidoc/resolver/ibiblio.adoc | 70 +
asciidoc/resolver/ivyrep.adoc | 47 +
asciidoc/resolver/jar.adoc | 76 +
asciidoc/resolver/mirrored.adoc | 83 +
asciidoc/resolver/obr.adoc | 62 +
asciidoc/resolver/osgiagg.adoc | 43 +
asciidoc/resolver/packager.adoc | 351 ++++
asciidoc/resolver/sftp.adoc | 133 ++
asciidoc/resolver/ssh.adoc | 92 +
asciidoc/resolver/updatesite.adoc | 52 +
asciidoc/resolver/url.adoc | 55 +
asciidoc/resolver/vfs.adoc | 46 +
asciidoc/running.adoc | 11 +
asciidoc/samples/apache-hello-ivy-default.html | 371 ++++
asciidoc/samples/build-install.xml | 72 +
asciidoc/samples/build.xml | 151 ++
.../samples/commons-lang1.0-dep-report-part.jpg | Bin 0 -> 12087 bytes
asciidoc/samples/eclipse-plugin/build.xml | 77 +
asciidoc/samples/eclipse-plugin/ivy.xml | 39 +
.../eclipse-plugin/ivysettings.properties | 21 +
asciidoc/samples/eclipse-plugin/ivysettings.xml | 36 +
.../samples/hibernate3.0-dep-report-part.jpg | Bin 0 -> 35112 bytes
asciidoc/samples/ivy-doc.xsl | 281 +++
asciidoc/samples/ivy-report.css | 279 +++
asciidoc/samples/ivy-sample-xslt.xml | 101 +
asciidoc/samples/ivy-sample.xml | 100 +
asciidoc/samples/ivy-style.css | 160 ++
asciidoc/samples/ivysettings-default.xml | 24 +
.../jayasoft-ivyrep-example-default.html | 371 ++++
.../samples/jayasoft-ivyrep-example-default.jpg | Bin 0 -> 12564 bytes
.../projects-dependencies-graph-small.jpg | Bin 0 -> 18280 bytes
.../samples/projects-dependencies-graph.jpg | Bin 0 -> 53526 bytes
asciidoc/samples/standard-osgi/build.xml | 83 +
asciidoc/samples/standard-osgi/ivy.xml | 24 +
asciidoc/samples/standard-osgi/ivysettings.xml | 34 +
.../org.apache.ivy.sample.standard-osgi.bnd | 18 +
asciidoc/samples/target-platform/build.xml | 56 +
asciidoc/samples/target-platform/ivy.xml | 24 +
.../samples/target-platform/ivysettings.xml | 33 +
asciidoc/settings.adoc | 131 ++
asciidoc/settings/caches.adoc | 64 +
asciidoc/settings/caches/cache.adoc | 65 +
asciidoc/settings/caches/ttl.adoc | 40 +
asciidoc/settings/classpath.adoc | 55 +
asciidoc/settings/conflict-managers.adoc | 61 +
asciidoc/settings/credentials.adoc | 18 +
asciidoc/settings/include.adoc | 73 +
asciidoc/settings/latest-strategies.adoc | 80 +
asciidoc/settings/lock-strategies.adoc | 34 +
asciidoc/settings/macrodef.adoc | 158 ++
asciidoc/settings/macrodef/attribute.adoc | 18 +
asciidoc/settings/module.adoc | 109 ++
asciidoc/settings/modules.adoc | 23 +
asciidoc/settings/namespace.adoc | 111 ++
asciidoc/settings/namespace/dest.adoc | 43 +
asciidoc/settings/namespace/fromtosystem.adoc | 17 +
asciidoc/settings/namespace/rule.adoc | 19 +
asciidoc/settings/namespace/src.adoc | 18 +
asciidoc/settings/namespaces.adoc | 30 +
asciidoc/settings/outputters.adoc | 43 +
asciidoc/settings/parsers.adoc | 29 +
asciidoc/settings/properties.adoc | 24 +
asciidoc/settings/property.adoc | 58 +
asciidoc/settings/resolvers.adoc | 146 ++
asciidoc/settings/settings.adoc | 40 +
asciidoc/settings/signers.adoc | 78 +
asciidoc/settings/status.adoc | 19 +
asciidoc/settings/statuses.adoc | 50 +
asciidoc/settings/triggers.adoc | 551 ++++++
asciidoc/settings/typedef.adoc | 20 +
asciidoc/settings/version-matchers.adoc | 121 ++
asciidoc/standalone.adoc | 171 ++
asciidoc/style/ant.css | 50 +
asciidoc/style/color.css | 159 ++
asciidoc/style/ivy-ref.css | 84 +
asciidoc/style/nav.css | 28 +
asciidoc/style/print-style.css | 299 +++
asciidoc/style/shell.css | 38 +
asciidoc/style/style.css | 372 ++++
asciidoc/style/tree.css | 53 +
asciidoc/templates/document.html.slim | 87 +
asciidoc/templates/helpers.rb | 173 ++
asciidoc/terminology.adoc | 155 ++
asciidoc/textual.adoc | 115 ++
asciidoc/toc.json | 957 +++++++++
asciidoc/tutorial.adoc | 46 +
asciidoc/tutorial/build-repository.adoc | 44 +
.../tutorial/build-repository/advanced.adoc | 136 ++
asciidoc/tutorial/build-repository/basic.adoc | 122 ++
asciidoc/tutorial/conf.adoc | 204 ++
asciidoc/tutorial/defaultconf.adoc | 306 +++
asciidoc/tutorial/dependence.adoc | 255 +++
asciidoc/tutorial/dual.adoc | 140 ++
asciidoc/tutorial/multiple.adoc | 156 ++
asciidoc/tutorial/multiproject.adoc | 296 +++
asciidoc/tutorial/start.adoc | 109 ++
asciidoc/use/artifactproperty.adoc | 57 +
asciidoc/use/artifactreport.adoc | 82 +
asciidoc/use/buildlist.adoc | 143 ++
asciidoc/use/buildnumber.adoc | 137 ++
asciidoc/use/buildobr.adoc | 93 +
asciidoc/use/cachefileset.adoc | 37 +
asciidoc/use/cachepath.adoc | 61 +
asciidoc/use/checkdepsupdate.adoc | 69 +
asciidoc/use/cleancache.adoc | 49 +
asciidoc/use/configure.adoc | 90 +
asciidoc/use/convertmanifest.adoc | 24 +
asciidoc/use/convertpom.adoc | 24 +
asciidoc/use/deliver.adoc | 112 ++
asciidoc/use/dependencytree.adoc | 51 +
asciidoc/use/findrevision.adoc | 48 +
asciidoc/use/fixdeps.adoc | 80 +
asciidoc/use/info.adoc | 172 ++
asciidoc/use/install.adoc | 42 +
asciidoc/use/listmodules.adoc | 56 +
asciidoc/use/makepom.adoc | 131 ++
asciidoc/use/postresolvetask.adoc | 105 +
asciidoc/use/publish.adoc | 77 +
asciidoc/use/report.adoc | 80 +
asciidoc/use/repreport.adoc | 109 ++
asciidoc/use/resolve.adoc | 304 +++
asciidoc/use/resources.adoc | 105 +
asciidoc/use/retrieve.adoc | 257 +++
asciidoc/use/settings.adoc | 122 ++
asciidoc/use/var.adoc | 28 +
asciidoc/yed.adoc | 46 +
build-release.xml | 65 +-
build.properties | 2 +-
doc/ivyfile/dependency.html | 2 +-
doc/osgi/eclipse-plugin.html | 5 +-
doc/osgi/standard-osgi.html | 5 +-
doc/osgi/target-platform.html | 5 +-
doc/style/color.css | 8 +-
doc/style/style.css | 66 +-
doc/xooki2asciidoc/antlib.xml | 87 +
doc/xooki2asciidoc/xooki2asciidoc.js | 1812 ++++++++++++++++++
xooki2asciidoc.xml | 43 +
268 files changed, 21855 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
[17/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/osgi/eclipse-plugin.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/eclipse-plugin.adoc b/asciidoc/osgi/eclipse-plugin.adoc
new file mode 100644
index 0000000..d49ac83
--- /dev/null
+++ b/asciidoc/osgi/eclipse-plugin.adoc
@@ -0,0 +1,88 @@
+
+
+
+[NOTE]
+====
+
+<table class="notice">
+ <tr>
+ <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+ <td>
+ Note that this feature is considered as *experimental*. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the link:http://ant.apache.org/ivy/mailing-lists.html[ivy-user] mailing list, or discuss about implementation issues or improvement you may have found on link:http://ant.apache.org/ivy/mailing-lists.html[ant-dev].
+
+====
+
+
+This page describes how to build an Eclipse™ plugin with Apache Ivy™ and its OSGi™ capabilities.
+
+
+== Quick setup
+
+
+In few steps, we will setup a build to compile and package an Eclipse plugin.
+
+
+
+. download this <a href="../samples/eclipse-plugin/ivy.xml">ivy.xml<a>, this <a href="../samples/eclipse-plugin/ivysettings.xml">ivysettings.xml</a>, this <a href="../samples/eclipse-plugin/ivysettings.properties">ivysettings.properties</a>, this <a href="../samples/eclipse-plugin/build.xml">build.xml</a>, and put them into your plugin folder; +
+
+. in the ivysettings.properties, specify the location of the plugins folder of your Eclipse target; +
+
+. in the ivy.xml, change the symbolic name declared in the extends element; +
+
+. __(optional)__ by default the build.xml is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case +
+
+. __(optional)__ if Ivy is not in Ant's classpath, get the jar of <a href="../download.html">Apache Ivy</a> and edit the build.xml accordingly (see the comments at the begining of the file) +
+
+
+And that's it ! Now let's use it.
+
+First, Ivy needs to aggregate the OSGi metadata of the target platform. To do so just launch:
+
+[source]
+----
+ant buildobr
+----
+
+You need to run that command only once. Or each time your target platform get modified.
+
+Then to resolve and build, just run:
+
+[source]
+----
+ant build
+----
+
+
+=== Eclipse setup
+
+
+You probably have already configured your project in Eclipse via the PDE. Let's see how to chnage that and use <a href="http://ant.apache.org/ivy/ivyde/">Apache IvyDE</a>.
+
+
+
+. so first remove from your project's classpath the PDE dependencies container; +
+
+. then right click on the ivy.xml you just added and select "Add Ivy library"; +
+
+. in the configuration panel of the IvyDE classpath container, as the settings file put '${workspace_loc:mypluginproject/ivysettings.xml}'; +
+
+. click finish and your Eclipse project should build now. +
+
+
+Nota Bene: to be resolved correctly Ivy is relying on the aggregated metadata of your target platform. Even if you want to only build with Eclipse, you will have to run the command `ant obrindex` at least one time.
+
+
+== Details on the setup
+
+
+
+=== The repository
+
+
+When building an Eclipse plugin, we are relying on a "target platform", the Eclipse installation we want our plugin to be eventually installed into. For Ivy, this will represent the repository of artifacts.
+
+Ivy needs an aggragation of the OSGi metadata in order to resolve a such repository. The Ant task <a href="../use/buildobr.html">buildobr</a> build a OBR (OSGi Bundle Repository) descriptor file from a set of OSGi bundles. So here we are using this Ant task to gather OSGi metadata from the Eclipse plugins in the "target platform". In the above exemple, the file is build in `target/repo-eclipse.xml`.
+
+The plugin to be build has then a ivy.xml file describing its depedencies to be used by Ivy. Since the actual depedencies are in the MANIFEST.MF file, in the ivy.xml file we specify that it extends `META-INF/MANIFEST.MF`. So there not much dependencies specified in the ivy.xml. But as Ivy doesn't support the `Bundle-Fragment` OSGi feature, the ivy.xml can help specify the missing dependencies.
+
+Having this setup, it is then a standard Ant+Ivy build. Ivy computes the classpath to be then used by the `javac` tasks. Note that `javac` is not aware of the OSGi metadata and is then incapable of failing to compile if private packages are accessed.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/osgi/osgi-mapping.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/osgi-mapping.adoc b/asciidoc/osgi/osgi-mapping.adoc
new file mode 100644
index 0000000..818d6f6
--- /dev/null
+++ b/asciidoc/osgi/osgi-mapping.adoc
@@ -0,0 +1,242 @@
+
+
+This page is a description of how OSGi™ dependencies are mapped into Apache Ivy™ ones
+
+Goal: the purpose of this mapping is to transform an OSGi manifest into an ivy.xml, so Ivy can understand OSGi bundles and resolve them. We don't want to do the reverse here.
+
+
+=== Bundle Symbolic name / Ivy organisation and module
+
+
+In OSGi a bundle is identified by its symbolic name. In Ivy there is a notion of organisation and module name.
+
+The choosen mapping is:
+
+
+* The organisation is "bundle" (transitive dependencies like pakages or services have their own organisations, "package" and "service") +
+
+* The module name is the symbolic name +
+
+
+
+[]
+|=======
+| *OSGi* | *Ivy*
+| `Bundle-SymbolicName: com.acme.product.plugin` |
+
+[source]
+----
+
+<info organisation="bundle" module="com.acme.product.plugin" />
+
+----
+
+
+|=======
+
+
+
+=== Version and version range
+
+
+The OSGi specification is defining a version as a composition of 3 numbers and an arbitrary qualifier. This fit well into the lazy definition of Ivy. We will just have to use a special latest strategy in Ivy.
+
+Then about version range, Ivy will understand correctly fully defined range as `[1.2.3,1.4.9)` or `(1.2.3,1.4.9]`. But for OSGi version range defined as in `1.2.3`, it has to be transformed into `[1.2.3,)`
+
+
+[]
+|=======
+| *OSGi* | *Ivy*
+| `Bundle-Version: 3.3.3` | `revision="3.3.3"`
+|`Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"` |
+
+[source]
+----
+
+<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" />
+
+----
+
+
+|=======
+
+
+
+=== Ivy configurations
+
+
+The Ivy configuration is a notion that doesn't exist explicitely in OSGi, but some notion of the latter can be expressed with that configurations.
+
+First the mapping is defining three configurations:
+
+
+* `default` : it will contain every required dependency (transitively) +
+
+* `optional` : it will contain every optional dependency and every required depedency the the first degree dependencies. +
+
+* `transitive-optional` : it will contain every optional dependency (optional transitively) +
+
+
+Then there will be some configurations used for the `use` parameter of the `Import-Package` OSGi manifest header. All of these kinds of configuration have their names starting with "use_". See in the next section.
+
+
+=== OSGi capabilities
+
+
+Generally speaking, declaring capabilities in an ivy.xml is useless (in the scope of this mapping which is to transform an OSGi manifest into an ivy.xml and not the reverse). In the resolve process we want to find the bundle which have the capability matching the expected requirement. In Ivy, if we are about to get the ivy.xml of a module, we are getting the bundle so we already have reached the requirement.
+
+So OSGi capabilities of bundles in a repo will be gathered direclty from the manifests to passed directly to the Ivy resolver, no need to express them into ivy.xml, except for the Export-Package, see the next section.
+
+
+==== Export-Package
+
+
+Exported package are declaring capabilities of the bundle in term of package. But they also declare dependencies between the declared package via the parameter `use`. These dependencies have to be declared in the ivy.xml. And we will use Ivy configurations for that.
+
+First, each exported package will be declared in the ivy.xml as a configuration. The name of the configuration will start will `use_` and will finished with the name of that package.
+
+Then each time an exported package is declared to use some other one, it will be mapped as a dependency between the Ivy configurations coresponding to those packages.
+
+
+[]
+|=======
+| *OSGi* | *Ivy*
+| `Export-Package: com.acme.product.plugin.utils` |
+
+[source]
+----
+
+<configuration name="use_com.acme.product.plugin.utils" extends="default" />
+
+----
+
+
+| `Export-Package: com.acme.product.plugin.utils,com.acme.product.plugin.common;use:=com.acme.product.plugin.utils` |
+
+[source]
+----
+
+<configuration name="use_com.acme.product.plugin.utils" extends="default" />
+<configuration name="use_com.acme.product.plugin.common" extends="default,use_com.acme.product.plugin.utils" />
+
+----
+
+
+|=======
+
+
+
+=== OSGi Requirements / Ivy dependencies
+
+
+In OSGi there are different kind of dependencies, which is an OSGi bundle repository documentation is called a "requirement". The problem is that Ivy is understanding only one kind of requirement, so we use here some extra attribute to declare those different kind of dependency.
+
+
+==== Require-Bundle
+
+
+The OSGi `Require-Bundle` is some a requirement directly on a specific bundle. Ivy does it too. So we just use the `osgi="bundle"` extra attribute.
+
+If there is the OSGi `resolution` parameter specified to `optional`, then the dependency will be declared in the configuration `optional` and `transitive-optional`. Otherwise it will be declared in the `default` configuration.
+
+
+[]
+|=======
+| *OSGi* | *Ivy*
+| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"`
+|
+
+[source]
+----
+
+<dependency osgi="bundle" org="" name="com.acme.product.plugin" rev="[3.2.1,)" conf="default->default" />
+
+----
+
+
+| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1";resolution:="optional"` |
+
+[source]
+----
+
+<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional" />
+
+----
+
+
+|=======
+
+
+
+==== Import-Package
+
+
+The OSGi `Import-Package` is some a requirement on a package of a bundle. Ivy has no notion of package. So we will use the `osgi="pkg"` extra attribute.
+
+If there is the OSGi `resolution` parameter specified to `optional`, then the dependency will be declared in the configuration `optional` and `transitive-optional`. Otherwise it will be declared in the `default` configuration.
+
+As it is an import package the configuration of the dependency will be the `use_XXX` one. So that transitive dependency via the use parameter will be respected in the dependency.
+
+
+[]
+|=======
+| *OSGi* | *Ivy*
+| `Import-Package: com.acme.product.plugin.utils;version="3.2.1"`
+|
+
+[source]
+----
+
+<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils" />
+
+----
+
+
+| `Import-Package: com.acme.product.plugin.utils;version="3.2.1";resolution:="optional"` |
+
+[source]
+----
+
+<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils" />
+
+----
+
+
+|=======
+
+
+
+=== Execution environment
+
+
+The OSGi `Bundle-RequiredExecutionEnvironment` manifest attribute is specifing is which environment the bundle is expected to run. In our problematic of dependency management it means that some of the transitive dependencies won't be resolved within the OSGi space but will be provided by the JRE. So we have to exclude from the dependency tree every requirement that will be provided by the environment. Basically it will be about excluding the packaged declared in the JRE.
+
+
+[]
+|=======
+| *OSGi* | *Ivy*
+| `Bundle-RequiredExecutionEnvironment: JavaSE-1.6` |
+
+[source]
+----
+
+<dependencies>
+ <exclude org="package" module="javax.accessibility" />
+ <exclude org="package" module="javax.activation" />
+ <exclude org="package" module="javax.activity" />
+ ...
+</dependencies>
+
+----
+
+
+|=======
+
+
+
+=== Bundle Fragment
+
+
+Ivy doesn't support the header `Fragment-Host`.
+
+The work around is to manually specify as dependencies in the ivy.xml the bundles which would fit to be the extensions of the host bundle.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/osgi/sigil.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/sigil.adoc b/asciidoc/osgi/sigil.adoc
new file mode 100644
index 0000000..00fc3aa
--- /dev/null
+++ b/asciidoc/osgi/sigil.adoc
@@ -0,0 +1,37 @@
+
+
+Another initiative to manage OSGi™ dependencies is the project link:http://felix.apache.org/site/apache-felix-sigil.html[Apache Felix Sigil™]. Sigil can used also together with Ivy. We will try to explain here the different approach taken there compared to the build-in OSGi capabilities of Ivy.
+
+
+== A different approach
+
+
+Apache Felix Sigil is at its core about managing OSGi dependencies, not directly related to Ivy. Most of it core feature is about the implementation of the not yet released OBR (OSGi Bundle Repository) specification. It then provides integration layers with sevral tools so human being can actually use the OBR API. As "layer" there is an Eclipse plugin, and there are the Ant/Ivy tasks and resolver.
+
+On the other hand the build in OSGi capabilities in Ivy are targeted against users already familiar with Ivy and their link:http://ant.apache.org/ivy/links.html[tools] like link:http://ant.apache.org/ivy/ivyde[Apache IvyDE™]. So with a minimum of effort, they can get OSGi dependency management.
+
+
+== Resulting differences
+
+
+
+=== Resolve
+
+
+The build-in OSGi resolver is __obviously__ using the Ivy engine to do the resolution of the dependencies. The OSGi capability of Ivy is mainly implemented with a module descriptor parser which understands the OSGi metadata of a MANIFEST.MF.
+
+On the other hand, Sigil is using a separate "engine" to do the resolution, the OBR, an engine which is dedicated to understand the OSGi metadata and their semantics.
+
+The immediate consequence of this difference is that the build-in resolver is probably less accurate than the Sigil one as to understand the OSGi dependencies semantics. As explained in this link:osgi-mapping.html[page], the OSGi model doesn't fit well into the Ivy one.
+
+Whereas Ivy is not ready yet to fill most OSGi use cases, OSGi dependency management at build time is not that complex, contrary to the runtime one. We hope that Ivy will catch up soon.
+
+
+=== Source of metadata
+
+
+Apache Felix Sigil has its own format about specifying the OSGi dependencies. Whereas Ivy requires an ivysettings.xml and an ivy.xml, Sigil requires a sigil-repos.properties and a sigil.properties. Then if you want to use the Sigil resolver in Ivy, you will need 4 files, the 2 Ivy ones and the 2 Sigil ones, as described link:http://felix.apache.org/site/apache-felix-sigil-ivy-quickstart.html[there].
+
+To support OSGi directly in Ivy, you just need to add an extra namespace in the ivy.xml, and in the ivysettings.xml, just declare the proper resolver and latest revision strategy.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/osgi/standard-osgi.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/standard-osgi.adoc b/asciidoc/osgi/standard-osgi.adoc
new file mode 100644
index 0000000..1225e54
--- /dev/null
+++ b/asciidoc/osgi/standard-osgi.adoc
@@ -0,0 +1,46 @@
+
+
+
+[NOTE]
+====
+
+<table class="notice">
+ <tr>
+ <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+ <td>
+ Note that this feature is considered as *experimental*. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the link:http://ant.apache.org/ivy/mailing-lists.html[ivy-user] mailing list, or discuss about implementation issues or improvement you may have found on link:http://ant.apache.org/ivy/mailing-lists.html[ant-dev].
+
+====
+
+
+
+'''
+
+*TODO - WORK IN PROGRESS*
+
+'''
+
+
+This page describes how to build an OSGi™ bundle with Apache Ivy™. In this use case, we just basically want to compute a classpath to compile, optionaly one for testing too, and then publish our bundle in a OSGi aware repository.
+
+In oder to produce OSGi metadata of suffient quality and to avoid maintaining them manually, the link:http://www.aqute.biz/Code/Bnd[bnd] tool will be used. The approach taken is then an "Ivy file first" approach. The dependencies will be specified in the ivy.xml file, the MANIFEST.MF being generated from the computed classpath.
+
+
+
+== Quick setup
+
+
+In few steps, we will setup a build to compile and publish an OSGi bundle.
+
+
+
+. download this <a href="../samples/standard-osgi/ivy.xml">ivy.xml<a>, this <a href="../samples/standard-osgi/ivysettings.xml">ivysettings.xml</a>, this <a href="../samples/standard-osgi/build.xml">build.xml</a>, this <a href="../samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd">bnd file</a>, and put them into your project folder; +
+
+. in the ivysettings.properties, specify the location of the plugins folder of your Eclipse target; +
+
+. __(optional)__ by default the build.xml is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case +
+
+. __(optional)__ if Ivy is not in Ant's classpath, get the jar of <a href="../download.html">Apache Ivy</a> and edit the build.xml accordingly (see the comments at the begining of the file) +
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/osgi/target-platform.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/target-platform.adoc b/asciidoc/osgi/target-platform.adoc
new file mode 100644
index 0000000..479dbbc
--- /dev/null
+++ b/asciidoc/osgi/target-platform.adoc
@@ -0,0 +1,48 @@
+
+
+
+[NOTE]
+====
+
+<table class="notice">
+ <tr>
+ <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+ <td>
+ Note that this feature is considered as *experimental*. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the link:http://ant.apache.org/ivy/mailing-lists.html[ivy-user] mailing list, or discuss about implementation issues or improvement you may have found on link:http://ant.apache.org/ivy/mailing-lists.html[ant-dev].
+
+====
+
+
+The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundle which will run together in an OSGi™ environement. Then when developping an OSGi bundle, we expect it to run in a such "target platform".
+
+When developping a single OSGi bundle, a single ivy.xml (together with the use of the link:../use/fixdeps.html[fixdeps] task) is sufficent to describe precisely how the bundle requirements.
+
+But when developping several bundles, it will be error prone to declare for each bundle its dependencies. Because once deployed in an OSGi environement, the bindings are sensitive to the available bundles. So when developping, we must ensure that the set of bundles will be the same set as the one at deploy time.
+
+The concept of "target platform" is a perfect fit to describe the set of bundles to resolve against. Here is a recipe to handle it with just Ant+Ivy.
+
+
+== A Target Platform Project
+
+
+First you need a project (basically a folder) in which you will manage your target platform. In this project you'll need 3 files:
+
+
+* an link:../samples/target-platform/ivy.xml[ivy.xml] in which you will describe the bundles you need, +
+
+* an link:../samples/target-platform/ivysettings.xml[ivysettings.xml] which will describe where to download bundles from, +
+
+* and a link:../samples/target-platform/build.xml[build.xml] with which you'll manage your target platform. +
+
+
+In the build there is a first important target: `'update-dependencies'`. Since the OSGi dependencies are very sensible to the available resources to resolve against, it is important to make the resolve as tight and reproductible as possible. First this target will do a resolve with the `ivy.xml`: a resolve which is very sensible to the content of the remote repo, thus not much reproductible. And it is will generate an `ivy-fixed.xml` from the resolved depedencies: this Ivy file contains only fixed non transitive dependencies (see the link:../use/fixdeps.html[fixdeps] task for further info). With that `ivy-fixed.xml` file, resolves are then reproductible and will always generate the same set of artifacts.
+
+Once generated, it is recommended to share that `ivy-fixed.xml` file into you version control system (subversion, git, etc...). The target `'update-dependencies'` is then to be launched each time you edit the `ivy.xml`, when you want to change the content of your target platform.
+
+The second target `'generate-target-platform'` will generate an `obr.xml`, a OSGi Bundle repository descriptor. This file will list every artifact wich has been resolved by the `ivy-fixed.xml`. Then each of your bundles you develop will do its resolve against that `obr.xml` (see the link:../resolver/obr.html[obr resolver]).
+
+The generated `obr.xml` contains paths to the local filesystem, so it is recommended to not share it between developpers.
+
+If it is required to develop your plugin with the Eclipse PDE plugin, you can then use the alternative target `generate-retrieved-target-platform`. It has the same principle than the `'generate-target-platform'` but the artifacts are also retrieved in a single folder, just like are plugins in an Eclipse install. That way you can define your target platform within Eclipse quite easily.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/principle.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/principle.adoc b/asciidoc/principle.adoc
new file mode 100644
index 0000000..678166c
--- /dev/null
+++ b/asciidoc/principle.adoc
@@ -0,0 +1,64 @@
+
+Now that you have been introduced to the main ivy terminology and concepts, it is time to give some explanation of how ivy works.
+
+
+== Usual cycle of modules between different locations
+
+image::images/main-tasks.png[]
+More details on ant tasks link:ant.html[here].
+
+
+== Configure
+
+Ivy needs to be configured to be able to resolve your dependencies. This configuration is usually done with a settings file, which defines a set of dependency resolvers. Each resolver is able to find ivy files and/or artifacts, given simple information such as organisation, module, revision, artifact name, artifact type and artifact extension.
+
+The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found.
+
+A default configuration is used by ivy when none is given. This configuration uses an link:resolver/ibiblio.html[ibiblio resolver] pointing to https://repo1.maven.org/maven2/ to resolve all modules.
+
+== Resolve
+
+The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies.
+
+Then, for each dependency declared in this file, it asks the appropriate resolver (according to settings) to find the module (i.e. either an ivy file for it, or its artifacts if no ivy file can be found). It also uses a filesystem based cache to avoid asking for a dependency if it is already in cache (at least if possible, which is not the case with latest revisions).
+
+If the resolver is a composite one (i.e. a chain or a dual resolver), several resolvers may actually be called to find the module.
+
+When the dependency module has been found, its ivy file is downloaded to the ivy cache. Then ivy checks if the dependency module has dependencies, in which case it recursilvely traverses the graph of dependencies.
+
+All over this traversal, conflict management is done to prevent access to a module as soon as possible.
+
+When ivy has traversed the whole graph, it asks the resolvers to download the artifacts corresponding to each of the dependencies which are not already in the cache and which have not been evicted by conflict managers. All downloads are made to the ivy cache.
+
+Finally, an xml report is generated in the cache, which allows ivy to easily know what are all the dependencies of a module, without traversing the graph again.
+
+After this resolve step, two main steps are possible: either build a path with artifacts in the cache, or copy them to another directory structure.
+
+
+== Retrieve
+
+What is called retrieve in ivy is the act of copying artifacts from the cache to another directory structure. This is done using a pattern, which indicates to ivy where the files should be copied.
+
+For this, ivy uses the xml report in the cache corresponding to the module it should retrieve to know which artifacts should be copied.
+
+It also checks if the files are not already copied to maximize performances.
+
+== Building a path from the cache
+
+In some cases, it is preferable to use artifacts directly from the cache. Ivy is able to use the xml report generated at resolve time to build a path of all artifacts required.
+
+This can be particularly useful when building plug-ins for IDEs.
+
+
+== Reports
+
+Ivy is also able to generate readable reports describing the dependencies resolution.
+
+This is done with a simple xsl transformation of the xml report generated at resolve time.
+
+
+== Publish
+
+Finally, Ivy can be used to publish a particular version of a module in your repository, so that it becomes available for future resolving. This task is usually called either manually or from a continuous integration server.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/reference.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/reference.adoc b/asciidoc/reference.adoc
new file mode 100644
index 0000000..6e872aa
--- /dev/null
+++ b/asciidoc/reference.adoc
@@ -0,0 +1,38 @@
+
+Welcome to the Ivy reference documentation!
+
+If you don't know Ivy at all, take a look at its features, the faq and the link:tutorial.html[tutorials] before digging into this reference documentation.
+
+
+== Reference Overview
+
+This documentation is broken into several parts:
+
+
+* Introduction +
+<ul>
+
+* link:terminology.html[Terminology] +
+This part gives you the meaning of some words used all over the Ivy documentation, such as organization, module, configurations, settings, ...
+
+* link:concept.html[Main Concepts] +
+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.
+
+* link:principle.html[How does it work ?] +
+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.
+
+* link:install.html[Installation] +
+This part describes how to install Ivy.
+
+* running +
+This part describes possibility to control the behavior of Ivy at run time
+
+<li>link:settings.html[Settings Files]</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>link:ivyfile.html[Ivy Files]</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>link:ant.html[Ant Tasks]</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>link:standalone.html[Using 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/release-notes.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
new file mode 100644
index 0000000..eab6563
--- /dev/null
+++ b/asciidoc/release-notes.adoc
@@ -0,0 +1,377 @@
+
+
+
+=== Announcement
+
+
+
+[source]
+----
+
+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/
+
+----
+
+
+
+
+=== List of Changes in this Release
+
+
+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 (link:https://issues.apache.org/jira/browse/IVY-1444[IVY-1444])
+- FIX: NullPointerException in dependencytree with no dependencies (link:https://issues.apache.org/jira/browse/IVY-1539[IVY-1539])
+- FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task (link:https://issues.apache.org/jira/browse/IVY-1549[IVY-1549])
+- FIX: ArrayIndexOutOfBoundsException when using a p2 repository for dependencies (link:https://issues.apache.org/jira/browse/IVY-1504[IVY-1504])
+- FIX: fixdeps remove transitive 'kept' dependencies
+- FIX: PomModuleDescriptorParser should parse licenses from parent POM (link:https://issues.apache.org/jira/browse/IVY-1526[IVY-1526]) (Thanks to Jaikiran Pai)
+- FIX: dynamic revisions are not cached per resolver (link:https://issues.apache.org/jira/browse/IVY-1430[IVY-1430]) (Thanks to Stephen Haberman)
+- FIX: Dependencies failed using branch attribute (and extra attributes) (link:https://issues.apache.org/jira/browse/IVY-1141[IVY-1141]) (Thanks to Stephen Haberman)
+- FIX: useCacheOnly should allow lookup of changing dependencies in cache (link:https://issues.apache.org/jira/browse/IVY-1515[IVY-1515]) (Thanks to Ilya)
+- FIX: Translation of POM to Ivy XML with * exclusion is removing main artifact (link:https://issues.apache.org/jira/browse/IVY-1531[IVY-1531]) (Thanks to Jaikiran Pai)
+- FIX: Have makepom task take description from ivy-module > info > description element (link:https://issues.apache.org/jira/browse/IVY-1520[IVY-1520])
+- FIX: Fix RetrieveEngine to take into account the correct extension while dealing with unpacked artifacts (link:https://issues.apache.org/jira/browse/IVY-1478[IVY-1478]) (Thanks to Jaikiran Pai)
+- FIX: ParseException "Unsupported repository, resources names are not uris" for ivy.xml with parent on Windows (link:https://issues.apache.org/jira/browse/IVY-1448[IVY-1448]) (Thanks to Riccardo Foschia and Jaikiran Pai)
+- FIX: Ivy 2.4.0 improperly handles modules with colon (:) in version (link:https://issues.apache.org/jira/browse/IVY-1522[IVY-1522]) (Thanks to Jaikiran Pai)
+- FIX: Delay the processing of configured cache ttls, until the IvySettings object is usable (link:https://issues.apache.org/jira/browse/IVY-1495[IVY-1495]) (Thanks to Jaikiran Pai)
+- FIX: Including optional ivysettings of type 'file' doesn't work when file doesn't exist (link:https://issues.apache.org/jira/browse/IVY-1555[IVY-1555]) (Thanks to Jaikiran Pai)
+- FIX: Makepom ignores dependency classifiers (link:https://issues.apache.org/jira/browse/IVY-1528[IVY-1528]) (Thanks to Jaikiran Pai)
+- FIX: Infinite loop in dependencytree (link:https://issues.apache.org/jira/browse/IVY-1540[IVY-1540]) (Thanks to Jaikiran Pai)
+
+- IMPROVEMENT: Throw an IllegalStateException when retrieving the resolutionCacheRoot on the DefaultResolutionCacheManager if the basedir (or IvySettings) is not set (link:https://issues.apache.org/jira/browse/IVY-1482[IVY-1482])
+- IMPROVEMENT: Optimization: limit the revision numbers scanned if revision prefix is specified (Thanks to Ernestas Vaiciukevičius)
+- IMPROVEMENT: Update bouncycastle to 1.52 (link:https://issues.apache.org/jira/browse/IVY-1521[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 (link:https://issues.apache.org/jira/browse/IVY-1529[IVY-1529])
+- NEW: Add (conditional) support for SHA-256 SHA-512 and SHA-384 checksum algorithms (link:https://issues.apache.org/jira/browse/IVY-1554[IVY-1554]) (Thanks to Jaikiran Pai)
+
+
+////
+ Samples :
+- NEW: bla bla bla (link:https://issues.apache.org/jira/browse/IVY-1234[IVY-1234]) (Thanks to Jane Doe)
+- IMPROVEMENT: bla bla bla (link:https://issues.apache.org/jira/browse/IVY-1234[IVY-1234]) (Thanks to Jane Doe)
+- FIX: bla bla bla (link:https://issues.apache.org/jira/browse/IVY-1234[IVY-1234]) (Thanks to Jane Doe)
+- DOCUMENTATION: bla bla bla (link:https://issues.apache.org/jira/browse/IVY-1234[IVY-1234]) (Thanks to Jane Doe)
+
+////
+
+
+
+=== Committers and Contributors
+
+
+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 !
+
+Committers
+
+* Matt Benson +
+
+* Jean-Louis Boudart +
+
+* Maarten Coene +
+
+* Charles Duffy +
+
+* Xavier Hanin +
+
+* Nicolas Lalevee +
+
+* Jon Schneider +
+
+* Gilles Scokart +
+
+
+Contributors:
+
+* Ingo Adler +
+
+* alex322 +
+
+* Mathieu Anquetin +
+
+* Andreas Axelsson +
+
+* Stephane Bailliez +
+
+* Karl Baum +
+
+* Andrew Bernhagen +
+
+* Mikkel Bjerg +
+
+* Per Arnold Blaasmo +
+
+* Jeffrey Blattman +
+
+* Jasper Blues +
+
+* Jim Bonanno +
+
+* Joseph Boyd +
+
+* Dave Brosius +
+
+* Matthieu Brouillard +
+
+* Carlton Brown +
+
+* Mirko Bulovic +
+
+* Ed Burcher +
+
+* Jamie Burns +
+
+* Wei Chen +
+
+* Chris Chilvers +
+
+* Kristian Cibulskis +
+
+* Andrea Bernardo Ciddio +
+
+* Archie Cobbs +
+
+* Flavio Coutinho da Costa +
+
+* Stefan De Boey +
+
+* Mykhailo Delegan +
+
+* Charles Duffy +
+
+* Martin Eigenbrodt +
+
+* Stephen Evanchik +
+
+* Robin Fernandes +
+
+* Gregory Fernandez +
+
+* Danno Ferrin +
+
+* Riccardo Foschia +
+
+* Benjamin Francisoud +
+
+* Wolfgang Frank +
+
+* Jacob Grydholt Jensen +
+
+* John Gibson +
+
+* Mitch Gitman +
+
+* Evgeny Goldin +
+
+* Scott Goldstein +
+
+* Gintautas Grigelionis +
+
+* Pierre Hägnestrand +
+
+* Scott Hebert +
+
+* Tobias Himstedt +
+
+* Aaron Hachez +
+
+* Ben Hale +
+
+* Stephen Haberman +
+
+* Peter Hayes +
+
+* Scott Hebert +
+
+* Payam Hekmat +
+
+* Achim Huegen +
+
+* Ilya +
+
+* Matt Inger +
+
+* Anders Jacobsson +
+
+* Anders Janmyr +
+
+* Steve Jones +
+
+* Christer Jonsson +
+
+* Michael Kebe +
+
+* Matthias Kilian +
+
+* Alexey Kiselev +
+
+* Gregory Kisling +
+
+* Stepan Koltsov +
+
+* Heschi Kreinick +
+
+* Sebastian Krueger +
+
+* Thomas Kurpick +
+
+* Tat Leung +
+
+* Costin Leau +
+
+* Antoine Levy-Lambert +
+
+* Tony Likhite +
+
+* Andrey Lomakin +
+
+* William Lyvers +
+
+* Sakari Maaranen +
+
+* Jan Materne +
+
+* Markus M. May +
+
+* Abel Muino +
+
+* J. Lewis Muir +
+
+* Stephen Nesbitt +
+
+* Joshua Nichols +
+
+* Bernard Niset +
+
+* Ales Nosek +
+
+* David Maplesden +
+
+* Glen Marchesani +
+
+* Phil Messenger +
+
+* Steve Miller +
+
+* Mathias Muller +
+
+* Randy Nott +
+
+* Peter Oxenham +
+
+* Jaikiran Pai +
+
+* Douglas Palmer +
+
+* Jesper Pedersen +
+
+* Emmanuel Pellereau +
+
+* Carsten Pfeiffer +
+
+* Yanus Poluektovich +
+
+* Roshan Punnoose +
+
+* Jean-Baptiste Quenot +
+
+* Carl Quinn +
+
+* Damon Rand +
+
+* Geoff Reedy +
+
+* Torkild U. Resheim +
+
+* Christian Riege +
+
+* Frederic Riviere +
+
+* Jens Rohloff +
+
+* Andreas Sahlbach +
+
+* Brian Sanders +
+
+* Adrian Sandor +
+
+* Michael Scheetz +
+
+* Ben Schmidt +
+
+* Ruslan Shevchenko +
+
+* John Shields +
+
+* Nihal Sinha +
+
+* Gene Smith +
+
+* Michal Srb +
+
+* Colin Stanfill +
+
+* Simon Steiner +
+
+* Johan Stuyts +
+
+* John Tinetti +
+
+* Erwin Tratar +
+
+* Jason Trump +
+
+* David Turner +
+
+* Ernestas Vaiciukevičius +
+
+* Tjeerd Verhagen +
+
+* Richard Vowles +
+
+* Sven Walter +
+
+* James P. White +
+
+* Tom Widmer +
+
+* John Williams +
+
+* Chris Wood +
+
+* Patrick Woodworth +
+
+* Jaroslaw Wypychowski +
+
+* Sven Zethelius +
+
+* Aleksey Zhukov +
+
+* Zhong Wang +
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/bintray.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/bintray.adoc b/asciidoc/resolver/bintray.adoc
new file mode 100644
index 0000000..9ed84b0
--- /dev/null
+++ b/asciidoc/resolver/bintray.adoc
@@ -0,0 +1,53 @@
+
+
+[]
+|=======
+|Tag|bintray
+|Handle latest|yes, at least if the repository server is apache based
+|Handle publish|no
+|=======
+
+
+This resolver uses Bintray DaaS (Distribution as a Service) platform to retrieve artifacts.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|subject|Bintray username of a repository owner.|No, defaults to Bintray
+|repo|User's repository name.|No, defaults to JCenter
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<bintray />
+
+----
+
+A default, defines a link:https://bintray.com/bintray/jcenter[JCenter] (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.
+
+
+'''
+
+
+
+[source]
+----
+
+<bintray subject="dsowerby" repo="maven"/>
+<bintray subject="igelgrun" repo="batrak"/>
+
+----
+
+Defines two resolvers to use a link:https://bintray.com/dsowerby/maven[repository] "maven" of user "dsowerby" (https://dl.bintray.com/dsowerby/maven/)
+and link:https://bintray.com/igelgrun/batrak[repository] "batrak" of user "igelgrun" (https://dl.bintray.com/igelgrun/batrak/).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/chain.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/chain.adoc b/asciidoc/resolver/chain.adoc
new file mode 100644
index 0000000..77981d5
--- /dev/null
+++ b/asciidoc/resolver/chain.adoc
@@ -0,0 +1,87 @@
+
+
+[]
+|=======
+|Tag|chain
+|Handle latest|depends on sub resolvers
+|Handle publish|delegates to first sub resolver in chain
+|=======
+
+
+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.
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of composite resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|returnFirst|true if the first found should be returned.|No, defaults to false
+|dual|true if the chain should behave like a dual chain. *__since 1.3__*|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any resolver|a sub resolver to use|1..n
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<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>
+
+----
+
+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.
+
+'''
+
+
+[source]
+----
+
+<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>
+
+----
+
+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.
+
+'''
+
+
+[source]
+----
+
+<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>
+
+----
+
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/dual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/dual.adoc b/asciidoc/resolver/dual.adoc
new file mode 100644
index 0000000..9459e6f
--- /dev/null
+++ b/asciidoc/resolver/dual.adoc
@@ -0,0 +1,29 @@
+
+
+[]
+|=======
+|Tag|dual
+|Handle latest|depends on sub resolvers
+|Handle publish|delegates to ivy sub resolver if artifact to publish is of "ivy" type, to artifact sub resolver otherwise
+|=======
+
+
+This resolver delegates its job to one resolver for ivy files and another for artifacts.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of composite resolvers.
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any resolver|two resolvers, the first being the ivy resolver, the second the artifact resolver|2
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/filesystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/filesystem.adoc b/asciidoc/resolver/filesystem.adoc
new file mode 100644
index 0000000..1ed5eb3
--- /dev/null
+++ b/asciidoc/resolver/filesystem.adoc
@@ -0,0 +1,77 @@
+
+
+[]
+|=======
+|Tag|filesystem
+|Handle latest|yes
+|Handle publish|yes
+|=======
+
+
+
+This resolver uses the file system to resolve ivy files and artifacts. 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 (*__since 2.0__*). You can indicate a list of patterns which will be checked one after the other.
+
+*__since 1.3__* 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.
+*Limitation*: in m2compatible mode, this resolver is not able list available organizations. It means some features like link:../use/repreport.html[repreport] are not available.
+
+
+=== Atomic publish support
+
+*__since 2.0__* 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.
+
+*Limitations*
+Atomic publish is currently limited in several ways:
+
+
+* 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 +
+
+* both the artifact and ivy pattern should have the same prefix until the [revision] token. +
+
+* overwrite during publish is not supported +
+
+* you should not use revision names ending with '.part' +
+
+
+The *transactional* attribute can be used to configure the atomicity behavior:
+
+
+* auto +
+ use transaction if possible (according to limitation), otherwise don't
+
+* true +
+ always use transaction, fail the build if a limitation is not fulfilled
+
+* false +
+ don't use transaction at all
+
+
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|m2compatible|True if this resolver should be maven2 compatible, false otherwise *__since 1.3__*|No, defaults to false
+|local|True if this resolver should be considered local, false otherwise *__since 1.4__*. See useOrigin attribute on the link:../settings/caches.html[caches] element for details.|No, defaults to true
+|transactional|true to force the use of transaction, false to prevent the use of transaction, auto to get transaction when possible *__since 2.0__*. See above for details.|No, defaults to auto
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/ibiblio.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/ibiblio.adoc b/asciidoc/resolver/ibiblio.adoc
new file mode 100644
index 0000000..4315fcd
--- /dev/null
+++ b/asciidoc/resolver/ibiblio.adoc
@@ -0,0 +1,70 @@
+
+
+[]
+|=======
+|Tag|ibiblio
+|Handle latest|yes, at least if the repository server is apache based
+|Handle publish|no
+|=======
+
+
+This resolver usually uses ibiblio to find artifacts.
+
+*__since 1.3__* 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.
+
+*__since 1.4__* 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:
+
+[source]
+----
+
+<url name="test" m2compatible="true">
+ <artifact pattern="https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+</url>
+
+----
+
+*__since 2.0__* 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.
+
+*Limitation*: in m2compatible mode, this resolver is not able list available organizations. It means some features like link:../use/repreport.html[repreport] are not available.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|root|the root of the artifacts repository.|No, defaults to ${ivy.ibiblio.default.artifact.root}
+|pattern|a pattern describing the layout of the artifacts repository.|No, defaults to ${ivy.ibiblio.default.artifact.pattern}
+|m2compatible|True if this resolver should be maven2 compatible, false otherwise *__since 1.3__*|No, defaults to false
+|usepoms|True if this resolver should use maven poms when it is already in m2compatible mode, false otherwise *__since 1.4__*|No, defaults to true
+|useMavenMetadata|True if this resolver should use maven-metadata.xml files to list available revisions, false to use directory listing *__since 2.0__*|No, defaults to true
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<ibiblio name="maven2" m2compatible="true"/>
+
+----
+
+Defines a resolver called "maven2" using the maven 2 public repository to find module metadata (using maven 2 poms) and artifacts.
+
+
+'''
+
+
+[source]
+----
+
+<ibiblio name="maven" m2compatible="true" usepoms="false"/>
+
+----
+
+Same as above, but doesn't use poms, only artifacts.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/ivyrep.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/ivyrep.adoc b/asciidoc/resolver/ivyrep.adoc
new file mode 100644
index 0000000..18c1d1d
--- /dev/null
+++ b/asciidoc/resolver/ivyrep.adoc
@@ -0,0 +1,47 @@
+
+
+[]
+|=======
+|Tag|ivyrep
+|Handle latest|yes, at least if the repository server is apache based
+|Handle publish|no
+|=======
+
+This resolver usually uses an URL based repository usually similar in structure to link:http://ivyrep.jayasoft.org/[ivyrep] to find ivy files, and ibiblio to find artifacts.
+It can also be configured to use other similar repositories.
+
+
+[NOTE]
+====
+
+Since ivyrep is not maintained anymore, the ivyroot attribute is mandatory, and the use of this resolver is not recommended (we recommend using link:../resolver/url.html[url resolver] as replacement in most cases).
+
+====
+
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|ivyroot|the root of the ivy repository.|Yes, but may be provided through ${ivy.ivyrep.default.ivy.root} *__since 2.0__*
+|ivypattern|a pattern describing the layout of the ivy repository.|No, defaults to ${ivy.ivyrep.default.ivy.pattern}
+|artroot|the root of the artifacts repository.|No, defaults to ${ivy.ivyrep.default.artifact.root}
+|artpattern|a pattern describing the layout of the artifacts repository.|No, defaults to ${ivy.ivyrep.default.artifact pattern}
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivyrep name="ivyrep" ivyroot="http://ivyrep.mycompany.com"/>
+
+----
+
+Looks for ivy files on and ivyrep like web site located at http://ivyrep.mycompany.com.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/jar.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/jar.adoc b/asciidoc/resolver/jar.adoc
new file mode 100644
index 0000000..e5b31bc
--- /dev/null
+++ b/asciidoc/resolver/jar.adoc
@@ -0,0 +1,76 @@
+
+
+[]
+|=======
+|Tag|jar
+|Handle latest|yes
+|Handle publish|no
+|=======
+
+
+
+*__since 2.3__*
+
+This resolver uses a specified jar resolve ivy files and artifacts.
+
+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.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|file|the absolute path of the jar|One of 'file' or 'url' is required
+|url|the url of the jar|One of 'file' or 'url' is required
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<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>
+
+----
+
+A simple local jar repository.
+
+'''
+
+
+[source]
+----
+
+<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>
+
+----
+
+A remote jar repository with multiple ivy and artifact patterns, patterns pointing in some sub directories in the jar.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/mirrored.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/mirrored.adoc b/asciidoc/resolver/mirrored.adoc
new file mode 100644
index 0000000..0656f0d
--- /dev/null
+++ b/asciidoc/resolver/mirrored.adoc
@@ -0,0 +1,83 @@
+
+
+[]
+|=======
+|Tag|mirroredurl
+|Handle latest|yes with http urls (and apache server) and with file urls, no with other urls
+|Handle publish|no
+|=======
+
+
+*__since 2.3__*
+
+
+
+<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.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|m2compatible|True if this resolver should be maven2 compatible, false otherwise|No, defaults to false
+|mirrorListUrl|The url where to retrive the list of mirror urls.|Yes
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
+== Example
+
+
+Having the file mavenrepolist.txt content:
+
+[source]
+----
+
+https://repo1.maven.org/maven2/
+http://repo2.maven.org/maven2/
+
+----
+
+And the piece of settings:
+
+[source]
+----
+
+<mirroredurl name="mirrored-maven" m2compatible="true" mirrorListUrl="file:///Users/me/dev/repo/mavenrepolist.txt">
+ <artifact pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
+</mirroredurl>
+
+----
+
+It will resolve first on the repo1 and if failing it will fall back on repo2.
+
+
+'''
+
+
+The mirror list can be retrieved from a geo-location aware url:
+
+[source]
+----
+
+<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>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/obr.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/obr.adoc b/asciidoc/resolver/obr.adoc
new file mode 100644
index 0000000..0e319da
--- /dev/null
+++ b/asciidoc/resolver/obr.adoc
@@ -0,0 +1,62 @@
+
+
+[]
+|=======
+|Tag|obr
+|Handle latest|yes
+|Handle publish|no
+|=======
+
+
+*__since 2.3__*
+
+<span class="tagdoc" id="ivysettings.resolvers.obr">This resolver is one of the resolver which supports link:../osgi.html[OSGi™] 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.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of composite resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|repoXmlURL|the URL of the obr.xml to load.|Yes
+|repoXmlFile|the local path of the obr.xml to load.|Yes
+|requirementStrategy|defines how strict should be the OSGi resolution. Can be one of `first` or `noambiguity`|No, default to `noambiguity`
+|metadataTtl|the time in milliseconds the obr.xml is considered up to date|No, default to 3600000 (1 hour)
+|forceMetadataUpdate|force the update of the obr.xml without checking its freshness|No, default to false
+|=======
+
+
+The requirement strategy is defining how the resolver should behave in front of several choices. In the OSGi dependency model, an `Import-Package` 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:
+
+
+* if the requirement strategy is `first`, 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. +
+
+* if the requirement strategy is `noambiguity`, Ivy will make the resolution fail. +
+
+
+
+== Examples
+
+
+[source]
+----
+
+<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml" />
+
+----
+
+A simple repository configured to use the Felix OBR.
+
+'''
+
+
+[source]
+----
+
+<obr name="my-osgi-repo" repoXmlFile="${ivy.settings.dir}/obr/obr.xml" requirementStrategy="first" />
+
+----
+
+A local repository which is trusted to always provide correct dependency for the `Import-Package` requirements.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/osgiagg.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/osgiagg.adoc b/asciidoc/resolver/osgiagg.adoc
new file mode 100644
index 0000000..2e21935
--- /dev/null
+++ b/asciidoc/resolver/osgiagg.adoc
@@ -0,0 +1,43 @@
+
+
+[]
+|=======
+|Tag|osgi-agg
+|Handle latest|yes
+|Handle publish|no
+|=======
+
+
+*__since 2.4__*
+
+<span class="tagdoc" id="ivysettings.resolvers.osgi-agg">This resolver is one of the resolver which supports link:../osgi.html[OSGi™] dependencies.
+
+This resolvers is like a classic link:[chain] resolver, but which better support OSGi metadata.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of composite resolvers.
+
+
+== Elements
+
+As sub element, this resolver accept any kind of OSGi resolver: link:../obr.html[obr], link:../updatesite.html[updatesite], or any other `osgi-agg`.
+
+
+== Examples
+
+
+[source]
+----
+
+<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>
+
+----
+
+An aggregated OSGi reporsory composed of the Apache IvyDE Eclipse update site and the Felix OBR.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/packager.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/packager.adoc b/asciidoc/resolver/packager.adoc
new file mode 100644
index 0000000..d5ba189
--- /dev/null
+++ b/asciidoc/resolver/packager.adoc
@@ -0,0 +1,351 @@
+
+
+[]
+|=======
+|Tag|packager
+|Handle latest|yes with http urls (and apache server) and with file urls, no with other urls
+|Handle publish|no
+|=======
+
+
+
+
+
+
+
+*__Since 2.0__*.
+
+
+
+
+
+
+
+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.
+
+
+
+
+
+
+
+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 link:http://ivyroundup.googlecode.com/[Ivy RoundUp]. Of course, private packager repositories are feasible as well.
+
+
+
+
+
+
+
+The Packager resolver supports a "resource cache", where downloaded archives can be stored to avoid duplicate downloads. This cache is entirely separate from the link:../concept.html#cache[normal Ivy cache]: 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.
+
+
+
+
+
+
+
+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 link:http://ant.apache.org/[ant]. 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.
+
+
+
+
+
+
+
+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).
+
+
+
+
+
+
+
+The Packager resolver is based on the link:url.html[URL resolver] and is configured similarly, except the artifact child tags specify where to find the packager.xml files, rather than the artifacts themselves.
+
+
+
+
+
+
+
+Because the packaging process is relatively slow, it is important to use link:../concept.html#cache[Ivy's caching support] to avoid repeated execution of the packaging instructions.
+
+
+
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers, plus the following:
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|buildRoot|Defines the root of the temporary build directory hierarchy|Yes
+|resourceCache|Directory where downloaded resources should be cached|No; defaults to none
+|resourceURL|Ivy pattern that specifies a base URL to use for downloading __all__ resources; overrides the URLs in the packaging instructions|No; defaults to none
+|restricted|True if this resolver should only allow "safe" ant tasks in the packaging instructions. *Warning:* 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.|No; defaults to true
+|verbose|True to run ant with the -verbose flag|No; defaults to false
+|quiet|True to run ant with the -quiet flag|No; defaults to false
+|validate|True if this resolver should validate (via XSD) the downloaded XML packaging instructions|No; defaults to true
+|preserveBuildDirectories|True if this resolver should not delete the temporary build directories in which the ant tasks are executed (for debugging purposes)|No; defaults to false
+|=======
+
+
+
+
+
+
+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.
+
+
+
+
+
+
+
+If a resourceURL download fails, the resolver will fall back to the original URL from the packaging instructions.
+
+
+
+
+
+
+
+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.
+
+
+
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|Defines a pattern for ivy.xml files, using the pattern attribute|1..n
+|artifact|Defines a pattern for packager.xml files, using the pattern attribute|1..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<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>
+
+----
+
+Defines a packager resolver which points to the link:http://ivyroundup.googlecode.com/[Ivy RoundUp] online repository. Builds will occur in a subdirectory of
+[source]
+----
+${user.home}/.ivy2/packager/build
+----
+
+downloaded resources will be cached in
+[source]
+----
+${user.home}/.ivy2/packager/cache
+----
+
+and the mirror site
+[source]
+----
+ftp://mirror.example.com/pub/resources/[organisation]/[module]/
+----
+
+will be tried first for all resources.
+
+
+== Packaging Instructions
+
+
+
+
+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.
+
+
+
+
+
+
+
+Below is an example of packaging instructions for link:http://testng.org/[TestNG 2.5]:
+
+[source]
+----
+
+<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>
+
+----
+
+Of course, packaging instructions must produce artifacts consistent with those listed in the associated ivy.xml file.
+
+
+
+
+
+== Build-time properties
+
+This resolver ensures following ant properties are defined when it executes the ant build task.
+
+[options="header",cols="15%,50%"]
+|=======
+|Property|Description
+|ivy.packager.organisation|Organization of the ivy module whose artifacts are being built
+|ivy.packager.module|Module of the ivy module whose artifacts are being built
+|ivy.packager.revision|Revision of the ivy module whose artifacts are being built
+|ivy.packager.branch|Branch of the ivy module whose artifacts are being built
+|ivy.packager.resourceCache|The configured <span class="ivy-att">resourceCache</span> if any; otherwise not defined
+|ivy.packager.resourceURL|The resolved <span class="ivy-att">resourceURL</span> pattern if any; otherwise not defined
+|=======
+
+
+
+== Packager XML Elements
+
+The packager.xml document element can contain the following child tags.
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|property|Set an ant property|0..n
+|resource|Define a resource to download and (optionally) unpack|0..n
+|m2resource|Define a Maven2 resource to download and (optionally) unpack|0..n
+|build|Specify ant tasks that ultimately result in each artifact being placed into artifacts/[type]s/[artifact].[ext]|0..1
+|=======
+
+
+
+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.
+
+
+
+
+*Warning:* 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.
+
+
+
+
+
+== Resource XML Elements
+
+The resource XML tag supports the following attributes:
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|url|Primary URL for the resource|Yes
+|sha1|SHA1 checksum of the resource|Yes
+|dest|Defines the name of the subdirectory into which the artifact should be unpacked|No; defaults to "archive"
+|tofile|Where to put the file directly; if present no extraction will be performed|No; if present, "dest" is ignored
+|filename|Name of the file to download|No; if not present, same as the last component of the URL
+|type|Type of archive: "zip", "jar", "war", "tar", "tgz", "tar.gz", "tar.bz2"|No; if not present, will be automatically determined from the filename suffix
+|=======
+
+
+
+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.
+
+
+== Maven2 Resources
+
+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.
+
+
+== M2Resource XML Elements
+
+The m2resource XML tag supports the following attributes:
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|groupId|Maven group ID|No; defaults to ${ivy.packager.organisation}
+|artifactId|Maven artifact ID|No; defaults to ${ivy.packager.module}
+|version|Maven version|No; defaults to ${ivy.packager.revision}
+|repo|Maven repository URL|No; defaults to https://repo1.maven.org/maven2/
+|=======
+
+
+
+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.
+
+
+== M2Resource Artifact Attributes
+
+The artifact children of m2resource tags support the following attributes:
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|ext|Maven filename extension|No; defaults to "jar"
+|classifier|Maven classifier (e.g., "sources", "javadoc")|No; defaults to none
+|sha1|SHA1 checksum of the resource|Yes
+|dest|Defines the name of the subdirectory into which the artifact should be unpacked|Exactly one of "dest" or "tofile" must be supplied
+|tofile|Where to put the file; no extraction will be performed
+|type|Type of archive: "zip", "jar", "war", "tar", "tgz", "tar.gz", "tar.bz2"|No; if not present, will be automatically determined from the filename suffix
+|=======
+
+
+
+Below is an example of packaging instructions for the link:http://commons.apache.org/email/[Apache Commons Email] module. Note that no build tag is required because all of the maven2 artifacts are usable directly (i.e., without unpacking anything).
+
+[source]
+----
+
+<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>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/sftp.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/sftp.adoc b/asciidoc/resolver/sftp.adoc
new file mode 100644
index 0000000..73528a7
--- /dev/null
+++ b/asciidoc/resolver/sftp.adoc
@@ -0,0 +1,133 @@
+
+
+[]
+|=======
+|Tag|sftp
+|Handle latest|yes
+|Handle publish|yes
+|=======
+
+
+
+
+This resolver can be used when your ivy repository is located on a server accessible via sftp. The secured nature of sftp and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. *__since 1.4__*
+
+If your server supports ssh but not sftp, there is also an link:../resolver/ssh.html[ssh resolver].
+
+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:geheim@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 link:http://www.jcraft.com/jsch/[jsch] as ssh client, which is a popular java ssh client, used for example in eclipse.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|user|The username to provide as credential|No, defaults to username given on the patterns, or prompt if none is set
+|userPassword|The password to provide as credential|No, defaults to password given on the patterns, or prompt if none is set
+|keyFile|Path to the keyfile to use for authentication|No, defaults to username/password authentication
+|keyFilePassword|the password used to protect the key file|No, will prompt for password if keyFile authentication is used and if it is password encrypted
+|host|The host to connect to|No, defaults to host given on the patterns, fail if none is set
+|port|The port to connect to|No, defaults to 22
+|sshConfig|Path to an OpenSSH-style config file containing additional
+ configuration|No
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
+== Example
+
+
+[source]
+----
+
+<sftp user="myuser" host="myhost.com">
+ <ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
+ <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
+</sftp>
+
+----
+
+Will connect to myhost.com using myuser and prompt for the password.
+
+'''
+
+
+[source]
+----
+
+<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>
+
+----
+
+Will connect to myhost.com using user and password provided with ivy variables.
+
+'''
+
+
+[source]
+----
+
+<sftp>
+ <ivy pattern="sftp://user:geheim@yourserver.com:8022/path/to/repos/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="sftp://user:secret@myserver.com:8022/path/to/my/repos/[artifact].[ext]"/>
+</sftp>
+
+----
+
+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.
+
+'''
+
+
+[source]
+----
+
+<sftp keyFile="path/to/key/file" keyFilePassword="${password}">
+ <ivy pattern="sftp://user@yourserver.com:8022/path/to/repos/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="sftp://user@myserver.com:8022/path/to/my/repos/[artifact].[ext]"/>
+</sftp>
+
+----
+
+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.
+
+
+[source]
+----
+
+<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>
+
+----
+
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/ssh.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/ssh.adoc b/asciidoc/resolver/ssh.adoc
new file mode 100644
index 0000000..2b01dcf
--- /dev/null
+++ b/asciidoc/resolver/ssh.adoc
@@ -0,0 +1,92 @@
+
+
+[]
+|=======
+|Tag|ssh
+|Handle latest|yes
+|Handle publish|yes
+|=======
+
+
+
+
+This resolver can be used when your ivy repository is located on a server accessible via ssh. The secured nature of ssh and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. *__since 1.4__*
+
+If your server supports sftp, you can consider using the link:../resolver/sftp.html[sftp resolver].
+
+Internally this resolver shares most of its behaviour with the link:../resolver/sftp.html[sftp resolver], so refer to its documentation for details.
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|user|The username to provide as credential|No, defaults to username given on the patterns, or prompt if none is set
+|userPassword|The password to provide as credential|No, defaults to password given on the patterns, or prompt if none is set
+|keyFile|Path to the keyfile to use for authentication|No, defaults to username/password authentication
+|keyFilePassword|the password used to protect the key file|No, will prompt for password if keyFile authentication is used and if it is password encrypted
+|host|The host to connect to|No, defaults to host given on the patterns, fail if none is set
+|port|The port to connect to|No, defaults to 22
+|sshConfig|Path to an OpenSSH-style config file containing additional
+ configuration|No
+|publishPermissions|A four digit string (e.g., 0644, see "man chmod", "man open") specifying the permissions of the published files. *__(since 2.0)__*
+|No, defaults to scp standard behaviour
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
+== Example
+
+
+[source]
+----
+
+<ssh user="myuser" host="myhost.com">
+ <ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
+ <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
+</ssh>
+
+----
+
+Will connect to myhost.com using myuser and prompt for the password.
+
+'''
+
+
+[source]
+----
+
+<ssh keyFile="path/to/key/file" keyFilePassword="${password}">
+ <ivy pattern="ssh://user:geheim@yourserver.com:8022/path/to/repos/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="ssh://user:geheim@myserver.com:8022/path/to/my/repos/[artifact].[ext]"/>
+</ssh>
+
+----
+
+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.
+
+
+[source]
+----
+
+<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>
+
+----
+
+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.
\ No newline at end of file
[10/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/makepom.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/makepom.adoc b/asciidoc/use/makepom.adoc
new file mode 100644
index 0000000..e442238
--- /dev/null
+++ b/asciidoc/use/makepom.adoc
@@ -0,0 +1,131 @@
+
+*__since 2.0__*
+The makepom task allows to convert an ivy file to a pom file.
+
+An example of use is to publish an Ivy managed module to a maven 2 repository.
+
+_Note that all Ivy features are not supported by maven poms, so the converted pom may not resolve to the exact same dependencies as the original ivy file._
+
+*__since 2.2__*
+It is possible to specify a template file defining the structure of the generated POM. The following processing is done on this template:
+
+
+* properties like __${property.name}__ are replaced if they are defined in Ant or by the ivy:makepom task (see below for the standard properties) +
+
+* lines containg the string __SKIP_LINE__ are skipped. +
+<li>the defined dependencies will be added to the first <dependencies> element encountered in the pom template. If the template doesn't contain a <dependencies> element, it is generated a the end of the pom.
+
+
+The ivy:makepom task defines following properties that can be used in the template.
+
+* *ivy.pom.groupId*: defaults to the organisation as defined in the ivy.xml file +
+
+* *ivy.pom.artifactId*: defaults to the value of the 'atifactName' attribute of this task, or the name of the module as defined in the ivy.xml file +
+
+* *ivy.pom.packaging*: defaults to the value of the 'artifactPackaging' attribute of this task, or the extenstion of the artifact +
+
+* *ivy.pom.version*: defaults to the revision as defined in the ivy.xml file +
+
+* *ivy.pom.name*: defaults to 'SKIP_LINE' +
+
+* *ivy.pom.description*: defaults to the value of the 'description' attribute of this task, or 'SKIP_LINE' when not specified +
+
+* *ivy.pom.url*: defaults to the homepage as defined in the ivy.xml file +
+
+* *ivy.pom.license*: the content of the specified headerFile, or 'SKIP_LINE' if not specified +
+
+* *ivy.pom.header*: some Ivy information, or 'SKIP_LINE' if the 'printIvyInfo' attribute is set to false. +
+
+Note that each property can be given a value manually in the Ant build file. In that case, Ivy will use the value specified in the build file instead of the default value.
+
+The default template that ships with Ivy looks like this:
+
+[source]
+----
+
+${ivy.pom.license}
+${ivy.pom.header}
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${ivy.pom.groupId}</groupId>
+ <artifactId>${ivy.pom.artifactId}</artifactId>
+ <packaging>${ivy.pom.packaging}</packaging>
+ <version>${ivy.pom.version}</version>
+ <name>${ivy.pom.name}</name>
+ <description>${ivy.pom.description}</description>
+ <url>${ivy.pom.url}</url>
+</project>
+
+----
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|ivyfile|the source ivy file to convert|Yes
+|pomfile|the destination pom file to write|Yes
+|templatefile|the template file to use when generating the pom *__(since 2.2)__*|No, defaults to the internal template file.
+|artifactName|The name of the artifact which is represented by the generated pom file. *__(since 2.2)__*|No, defaults to the module name in the source ivy file.
+|artifactPackaging|The packaging of the artifact which is represented by the generated pom file. *__(since 2.2)__*|No, the artifact type is taken by default. Defaults to 'pom' if no such artifact is defined.
+|conf|a comma separated list of the configurations to include in the generated pom. Wildcards are supported here. *__(since 2.2)__*|No, defaults to all configurations.
+|settingsRef|A reference to the ivy settings that must be used by this task|No, 'ivy.instance' is taken by default.
+|printIvyInfo|Add some information about Ivy to the generated POM. *__(since 2.2)__*|No, defaults to 'true'.
+|headerFile|the header of the generated pom file|No
+|description|The description that will be added to the generated pom. *__(since 2.2)__*|No, defaults to no description. Since 2.5, defaults to the description in the source ivy file.
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|mapping|describes the mapping from an Ivy module configuration to a Maven POM scope.
+These elements takes two attributes:
+* conf +
+ the configuration to map
+* scope +
+the scope to which it should be mapped|0..n
+|dependency|describes extra dependencies that should be added to the generated Maven POM file.
+These elements takes the following attributes:
+* group +
+ the groupId. Default __organisation__ as defined in __info__
+* artifact +
+ the name of the artifact
+* version +
+ the version. Default __revision__ as defined in __info__
+* type *__(since 2.3)__* +
+ the type
+* classifier *__(since 2.3)__* +
+ the classifier
+* scope +
+ the scope
+* optional +
+ is the artifact optional. Default __false__|0..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:makepom ivyfile="${basedir}/path/to/ivy.xml" pomfile="${basedir}/path/to/module.pom" conf="default,runtime">
+ <mapping conf="default" scope="compile"/>
+ <mapping conf="runtime" scope="runtime"/>
+ <dependency group="com.acme" artifact="acme-logging" version="1.0" optional="true"/>
+</ivy:makepom>
+
+----
+
+Converts ${basedir}/path/to/ivy.xml to a pom and writes the result to ${basedir}/path/to/module.pom. The configuration 'default' in the parsed ivy file will be mapped to the scope 'compile', the configuration 'runtime' will be mapped to 'runtime', and other configurations will be excluded.
+
+The __com.acme.acme-logging__ artifact with version 1.0 will be added as an optional dependency.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/postresolvetask.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/postresolvetask.adoc b/asciidoc/use/postresolvetask.adoc
new file mode 100644
index 0000000..8e7d3ef
--- /dev/null
+++ b/asciidoc/use/postresolvetask.adoc
@@ -0,0 +1,105 @@
+
+Several tasks in Ivy are considered as post resolve task and share a common behaviour and settings accordingly.
+
+These tasks are:
+
+
+* link:../use/retrieve.html[retrieve] +
+
+* link:../use/cachefileset.html[cachefileset] +
+
+* link:../use/cachepath.html[cachepath] +
+
+* link:../use/artifactproperty.html[artifactproperty] *__(since 2.0)__* +
+
+* link:../use/artifactreport.html[artifactreport] *__(since 2.0)__* +
+
+
+All these tasks will trigger automatically a resolve if:
+
+
+* none has already been called in the current build with the attribute keep set to true (see below) +
+
+* organisation and module are not set +
+
+
+*__Since Ivy 1.4__*, there are two ways to run a link:../use/resolve.html[resolve]: with an ivy file, or with the inline mode.
+When you call resolve with an ivy file, the default for it is to keep the resolved data for use by the subsequent post resolve tasks. When you run an inline resolve, the default is not to keep the data. You can override this behaviour by setting the keep attribute as you like.
+
+If you want to to reuse the resolved data obtained through a call to resolve in another build (i.e. not the current one), then you have to set the organisation and module attributes. This work only if the cache was not cleaned since your last resolve call. This does not work with inline calls, which must be performed in the same build.
+
+
+The attributes listed are then mostly used only if a resolve is triggered automatically.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|conf|a comma separated list of the configurations to retrieve or '*'.
+*__Since 2.0__* you can also use '*(public)' or '*(private)'. Note that '*' is interpreted as '*(public)' when inline is true.|No. Defaults to the configurations resolved by the last resolve call, or '*' if no resolve was explicitly called
+|inline|true to use inline mode, false to resolve an ivy file *__(since 1.4)__*|No. defaults false
+|organisation|the organisation of the module to retrieve. This usually doesn't need to be set since it defaults to the last resolved one, except for inline mode where it is required.|Yes in inline mode, otherwise no, it then defaults to last resolved module name
+|module|the name of the module to retrieve. This usually doesn't need to be set since it defaults to the last resolved one, except for inline mode where it is required.|Yes in inline mode, otherwise no, it then defaults to last resolved module name
+|revision|the revision constraint of the module to retrieve. Used only in inline mode. *__since 1.4__*|No. Defaults to latest.integration
+|branch|the name of the branch to resolve in inline mode *__(since 2.1)__*|Defaults to no branch in inline mode, nothing in standard mode.
+|changing|indicates that the module may change when resolving in inline mode. See link:../concept.html#change[cache and change management] for details. Ignored when resolving in standard mode. *__(since 2.2.0)__*|No. Defaults to false.
+|transitive|true to resolve dependencies transitively, false otherwise *__since 1.4__*|No. Defaults to true
+|resolveMode|the link:../use/resolve.html[resolve mode] to use when an automatic resolve is triggered *__(since 2.1)__*|No. defaults to using the resolve mode set in the link:../settings.html[settings]
+|keep|true to keep the results of the automatic resolve in memory, false to discard them. When this is false, the standard ivy properties won't be set and other postresolve-tasks (like retrieve and cachepath) won't be able to resuse the results of this resolve!|No. defaults to false for an inline resolve and to true in any other case
+|haltonfailure|true to halt the build on ivy failure, false to continue|No. Defaults to true
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|refresh|true to force Ivy to resolve dynamic revision in this resolve process, false to use cached resolved revision *__since 2.1__*|No. defaults to false
+|file|the file to resolve if a resolve is necessary *__since 2.0__*|No. Defaults to the previous resolved Ivy file or to ${ivy.dep.file}
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|resolveId|The id which was used for a previous resolve, or the resolveId if a new resolve is performed *__(since 2.0)__*|No, defaults to '[org]-[module]'.
+|log|the log setting to use during the resolve process. *__(since 2.0)__*
+
+Available options are:
+
+* default +
+ the default log settings, where all usual messages are output to the console
+
+* download-only +
+ disable all usual messages but download ones. A resolve with everything in cache won't output any message.
+
+* quiet +
+ disable all usual messages, making the whole resolve process quiet unless errors occur
+|No, defaults to 'default'.
+|=======
+
+
+
+== Child elements
+
+
+*__(Since 2.3)__*
+
+These child elements are defining an inlined ivy.xml's link:../ivyfile/dependencies.html[dependencies] elements. Thus these child elements cannot be used together with the __inline__ or __file__ attributes.
+There is one important difference with the ivy.xml's link:../ivyfile/dependencies.html[dependencies]: there is no master configuration to handle here. There is actually only one, the one on which the resolve will run. So every attribute in link:../ivyfile/dependency.html[dependency], link:../ivyfile/exclude.html[exclude], link:../ivyfile/override.html[override] or link:../ivyfile/conflict.html[conflict] which is about a master configuration is not supported. And every attribute about a mapping of a master configuration on a dependency configuration is now expecting only the dependency configuration.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/dependency.html[dependency]|declares a dependency to resolve|0..n
+|link:../ivyfile/exclude.html[exclude]|excludes artifacts, modules or whole organizations from the set of dependencies to resolve|0..n
+|link:../ivyfile/override.html[override]|specify an override mediation rule, overriding the revision and/or branch requested for a transitive dependency *__since 2.0__*|0..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:cachepath organisation="emma" module="emma" revision="2.0.4217" inline="true" conf="ant" pathid="emma.classpath"/>
+<taskdef resource="emma_ant.properties" classpathref="emma.classpath" />
+
+----
+
+Resolves the emma module in version 2.0.4217, constructs an ant path with the corresponding artifacts, and then define the emma tasks using this path.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/publish.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/publish.adoc b/asciidoc/use/publish.adoc
new file mode 100644
index 0000000..b1e0534
--- /dev/null
+++ b/asciidoc/use/publish.adoc
@@ -0,0 +1,77 @@
+
+Publishes the current module's link:../ivyfile/publications.html[artifacts] and the link:../ivyfile.html#resolved[resolved descriptor] (delivered ivy file).
+
+This task is meant to publish the current module descriptor together with its declared publication artifacts to a repository.
+
+All the artifacts must have been created _before_ calling this task. It does not create the artifacts themselves, but expects to find them at the location indicated by the artifacts pattern.
+
+The target repository is given through the name of a resolver declared in current ivy settings. See link:../settings.html[Settings Files] for details about resolver supporting artifact publishing.
+
+It also publishes the delivered ivy file (except if you don't want), and even deliver it, if it has not been done with a previous deliver call or if forcedeliver is set to true. That's why this task takes some parameters useful only for delivery. See the illustration below:
+
+
+
+image::../images/ivy-publish-fc.png[]
+
+
+
+*__since 1.4.1__*
+The source artifact pattern can be specified either as an attribute on the task (artifactspattern) or using a list of nested artifacts element (see examples below).
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the name of the organisation of the module to publish|No. Defaults to ${ivy.organisation} or the last resolved module organisation.
+|module|the name of the module to publish|No. Defaults to ${ivy.module} or the last resolved module name.
+|revision|the revision of the module to publish and also the published revision unless pubrevision is set|No. Defaults to ${ivy.revision} or the last resolve module revision.
+|artifactspattern|the pattern to use to find artifacts to publish|No. Defaults to ${ivy.publish.src.artifacts.pattern}
+|resolver|the name of the resolver to use for publication|Yes
+|pubrevision|the revision to use for the publication|No. Defaults to the ${ivy.deliver.revision}
+|pubbranch|the branch to use for the publication|No. Defaults to the ${ivy.deliver.branch}
+|forcedeliver|true to force the implicit call to deliver, false to do it only if the ivy file to publish doesn't exist yet *__(since 1.4)__*|No. Defaults to false
+|update|true to update ivy file metadata (revision, branch, publication date and status) before publishing, false otherwise. This is usually not necessary when using deliver before publish.|No. Defaults to false
+|merge|if this descriptor link:../ivyfile/extends.html[extends] a parent, merge the inherited information directly into this descriptor on publish. The __extends__ element itself will be commented out in the published descriptor. *__(since 2.2)__*
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in link:../settings.html[settings file])
+|replacedynamicrev|true to replace dynamic revisions by static ones in the delivered file, false to avoid this replacement *__(since 1.3)__*|No. Defaults to true
+|publishivy|True to publish delivered ivy file, false otherwise|No. Defaults to true
+|conf|A comma separated list of configurations to publish *__(since 1.4.1)__*. Accepts wildcards *__(since 2.2)__*.|No. Defaults to all configurations
+|overwrite|True to overwrite files in repository if the revision already exist, false to let it as is|No. Defaults to false
+|warnonmissing|True to warn when artifacts to be published are missing|No. Defaults to true
+|haltonmissing|True to halt build when artifacts to be published are missing|No. Defaults to true
+|srcivypattern|the pattern to use to find ivy file to publish, and even deliver if necessary *__(since 1.2)__*|No. Defaults to the value of artifactspattern
+|pubdate|the publication date to use for the delivery, if necessary. This date should be either 'now', or a date given with the following pattern: yyyyMMddHHmmss|No. Defaults to 'now'
+|status|the status to use for the delivery, if necessary|No. Defaults to ${ivy.status}
+|delivertarget|the target to call for recursive delivery|No. No recursive delivery is done by default
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|artifact|Describe additional artifacts to publish
+These elements can have any attribute: standard artifact attributes and (since 2.2) extra attributes are supported.|0..n
+|artifacts|Specify the pattern used to find the artifact.
+These elements have a __pattern__ attribute containing the pattern used to find the artifact.|0..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:publish resolver="local" pubrevision="1.0">
+ <artifacts pattern="build/artifacts/jars/[artifact].[ext]" />
+ <artifacts pattern="build/artifacts/zips/[artifact].[ext]" />
+</ivy:publish>
+
+----
+
+Publishes the last resolved module in the local resolver with revision 1.0, looking for artifacts in directories __build/artifacts/jars__ and __build/artifacts/zips__.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/report.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/report.adoc b/asciidoc/use/report.adoc
new file mode 100644
index 0000000..aaee943
--- /dev/null
+++ b/asciidoc/use/report.adoc
@@ -0,0 +1,80 @@
+
+Generates reports of dependency resolving. One report per configuration is generated, but all reports generated together are hyperlinked one to each other.
+
+This task should be used only after a call to resolve, even if the call was not done during the same ant build.
+In fact, this task uses xml report generated by resolve in cache. So if you call resolve on a module for a given configuration, you can call report safely on this module and this configuration as long as you do not clean your ivy cache.
+
+If you want to have an idea of what reports look like, check this very simple link:../samples/jayasoft-ivyrep-example-default.html[example].
+The task also generates a graphml file which can be loaded with the free link:http://www.yworks.com/en/products_yed_about.htm[yEd] graph editor.
+Then following a few link:../yed.html[simple steps] you can obtain a graph like this link:../samples/jayasoft-ivyrep-example-default.jpg[one].
+
+*__since 1.4__* If a custom XSL is specified, it's possible to specify additional parameters to the stylesheet.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|todir|the directory to which reports should be generated|No, defaults to ${ivy.report.todir}, or execution directory if not defined
+|outputpattern|the generated report names pattern|No, defaults to ${ivy.report.output.pattern}, or [organisation]-[module]-[conf].[ext] if not defined
+|xsl|true to generate a report (by default html report) using xslt, false otherwise *__since 1.3__*|No, defaults to true
+|xml|true to generate a xml report, false otherwise *__since 1.3__*|No, defaults to false
+|graph|true to generate graphml files, false otherwise|No, defaults to true
+|dot|true to generate link:http://www.graphviz.org/[graphviz dot] files, false otherwise *__since 1.4__*|No, defaults to false
+|conf|a comma separated list of the configurations for which a report should be generated|No. Defaults to the configurations resolved by the last resolve call (during same ant build), or ${ivy.resolved.configurations} if no resolve was called
+|organisation|the name of the organisation of the module for which report should be generated|No, unless resolveId has not been specified and no resolve was called during the build. Defaults to last resolved module organisation.
+|module|the name of the module for which report should be generated|No, unless resolveId has not been specified and no resolve was called during the build. Defaults to last resolved module.
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|xslfile|indicates which xsl file should be used to generate the report|No, defaults to ivy provided xsl which generates html report
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|resolveId|The id which was used for a previous resolve *__(since 2.0)__*|No, defaults to '[org]-[module]'.
+|=======
+
+
+
+== Examples
+
+To generate a HTML and graphml report:
+
+[source]
+----
+
+<report conf="compile" />
+
+----
+
+
+'''
+
+To generate a HTML report only:
+
+[source]
+----
+
+<report conf="compile" graph="false" />
+
+----
+
+
+'''
+
+To generate an XML report using a custom stylesheet:
+
+[source]
+----
+
+<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml" />
+
+----
+
+To generate an XML report using a custom stylesheet which needs some parameters:
+
+[source]
+----
+
+<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml">
+ <param name="param1" expression="value1" />
+ <param name="param2" expression="value2" />
+</report>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/repreport.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/repreport.adoc b/asciidoc/use/repreport.adoc
new file mode 100644
index 0000000..e2aca54
--- /dev/null
+++ b/asciidoc/use/repreport.adoc
@@ -0,0 +1,109 @@
+
+Generates reports about dependencies among several modules in the repository (repreport stands for repository report).*__since 1.4__*
+
+This task is similar to the link:../use/report.html[report] task, except that instead of working on a single module you just resolved, it works with a set of modules in your repository.
+
+Note that the set of modules for which you generate the report is determined by setting organisation module and revision and using a matcher, but also by the dependencies of these modules. No dependency is excluded.
+
+Usually the most useful report is a graph, you can generate either a graphml file that you can then easily link:../yed.html[layout using yEd], or a dot file which is the format recognized by graphviz, which is a free tool which does automatic graph layout, and can thus be used to generate automatically a GIF or PNG of the dependencies between all your modules.
+
+*Limitation*: this task requires to be able to browse the repository, and is thus limited to resolvers supporting repository listing. In particular, it means it doesn't work to report all organizations in a repository using m2compatible mode.
+Moreover, to be able to list organizations, this task requires an [organisation] token in the resolver(s) used.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|A pattern matching the organisation of the modules for which the report should be generated|No, defaults to '*'
+|module|A pattern matching the name of the modules for which the report should be generated|No, defaults to '*'
+|branch|The name of the branch of the modules for which the report should be generated|No, defaults to no branch specified
+|revision|The revision of the modules for which the report should be generated. Only one revision per module will be used, so most of the time keeping the default (latest.integration) is the best thing to do, because it's not very easy to specify only one revision for several modules.|No, defaults to 'latest.integration'
+|todir|the directory to which reports should be generated|No, defaults to execution directory
+|outputname|the name to use for the generate file (without extension)|No, defaults to ivy-repository-report
+|xml|true to generate a xml report, false otherwise|No, defaults to true
+|xsl|true to generate a report using xslt, false otherwise|No, defaults to false
+|xslfile|indicates which xsl file should be used to generate the report|Yes if you want to use xsl transformation
+|xslext|indicates the extension to use when generating report using xsl|No defaults to 'html'
+|graph|true to generate graphml file, false otherwise|No, defaults to false
+|dot|true to generate graphviz dot format file, false otherwise|No, defaults to false
+|matcher|the name of the matcher to use for matching modules names and organisations in your repository|No. Defaults to exactOrRegexp
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|=======
+
+
+
+== Examples
+
+To generate a xml report for all the latest versions of all the modules in your repository:
+
+[source]
+----
+
+<ivy:repreport />
+
+----
+
+
+'''
+
+To generate a graphml report for all the latest versions of all the modules in your repository:
+
+[source]
+----
+
+<ivy:repreport xml="false" graph="true" />
+
+----
+
+
+'''
+
+To generate a xml report for all the latest versions of the modules from the organisation foo in your repository:
+
+[source]
+----
+
+<ivy:repreport organisation="foo" />
+
+----
+
+
+'''
+
+To generate a xml report for all the versions on the 1.x stream of the modules named bar* from the organisation foo in your repository:
+
+[source]
+----
+
+<ivy:repreport organisation="foo" module="bar*" revision="1.+" matcher="glob" />
+
+----
+
+
+'''
+
+To generate an XML report using a custom stylesheet:
+
+[source]
+----
+
+<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml" />
+
+----
+
+
+'''
+
+To generate an XML report using a custom stylesheet which needs some parameters:
+
+[source]
+----
+
+<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml">
+ <param name="param1" expression="value1" />
+ <param name="param2" expression="value2" />
+</report>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/resolve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resolve.adoc b/asciidoc/use/resolve.adoc
new file mode 100644
index 0000000..8dea9a0
--- /dev/null
+++ b/asciidoc/use/resolve.adoc
@@ -0,0 +1,308 @@
+
+The resolve task actually resolve dependencies described in an link:../ivyfile.html[ivy file], and put the resolved dependencies in the ivy cache.
+If configure has not been called before resolve is called, a default configuration will be used (equivalent to call configure with no attributes).
+
+After the call to this task, four properties are set in ant:
+
+
+* ivy.organisation +
+set to the organisation name found in the ivyfile which was used for resolve
+
+* ivy.module +
+set to the module name found in the ivyfile which was used for resolve
+
+* ivy.revision +
+set to the revision name found in the ivyfile which was used for resolve, or a generated revision name if no revision was specified in the file
+
+* ivy.resolved.configurations +
+set to the comma separated list of configurations resolved
+
+*Since 1.2:*
+An additional property is set to true if the resolved dependencies are changes since the last resolve, and to false otherwise:
+[source]
+----
+ivy.deps.changed
+----
+
+*Since 2.0:*
+The property ivy.deps.changed will not be set (and not be computed) if you set the parameter __checkIfChanged__ to false. (by default it is true to keep backward compatibility). This allow to optimize your build when you have multi-module build with multiple configurations.
+
+*Since 2.0:*
+In addition, if the __resolveId__ attribute has been set, the following properties are set as well:
+
+
+* ivy.organisation.${resolveId} +
+
+* ivy.module.${resolveId} +
+
+* ivy.revision.${resolveId} +
+
+* ivy.resolved.configurations.${resolveId} +
+
+* ivy.deps.changed.${resolveId} +
+
+
+*Since 2.4*
+If current module extends other modules
+
+
+* ivy.parents.count +
+number of parents module
+
+* ivy.parent[index].organisation +
+set to the organisation name found in the parent ivyfile which was used for resolve
+
+* ivy.parent[index].module +
+set to the module name found in the parent ivyfile which was used for resolve
+
+* ivy.parent[index].revision +
+set to the revision name found in the parent ivyfile which was used for resolve
+
+* ivy.parent[index].branch +
+set to the branch name found in the parent ivyfile which was used for resolve
+
+Where __index__ represent the index of extends module.
+
+When ivy has finished the resolve task, it outputs a summary of what has been resolved. This summary looks like this:
+
+[source]
+----
+
+---------------------------------------------------------------------
+| | modules || artifacts |
+| conf | number| search|dwnlded|evicted|| number|dwnlded|
+---------------------------------------------------------------------
+| default | 4 | 0 | 0 | 0 || 4 | 0 |
+---------------------------------------------------------------------
+
+----
+
+
+This table gives some statistics about the dependency resolution. Each line correspond to a configuration resolved. Then the table is divided in two parts:
+
+
+* modules +
+<ul>
+
+* number +
+This is the total number of dependency modules resolved in this configuration, including transitive ones
+
+* search +
+This is the number of dependency modules that required a repository access. The repository access is needed if the module is not yet in cache, or if a latest version is required, or in some other cases (depending on checkModified, for instance)
+
+* dwnlded +
+This is the number of dependency ivy files downloaded from the repository. This number can be less than the total number of modules even with a clean cache, if no ivy file is provided for some dependencies.
+
+* evicted +
+This is the number of dependency module evicted by conflict managers.
+
+<li>artifacts</li>
+
+
+* number +
+This is the total number of artifacts resolved in the given configuration.
+
+* dwnlded +
+This is the number of artifacts actually downloaded from the repository.
+
+</ul>
+
+
+=== Inline mode
+
+*__since 1.4__* The inline mode allow to call a resolve without an ivy file, by setting directly the module which should be resolved from the repository. It is particularly useful to install released software, like an ant task for example. When inline is set to true, the organisation module and revision attributes are used to specify which module should be resolved from the repository.
+
+*Remark:* if you want the standard ivy properties to be set or to reuse the results of an inline resolve by other post-resolve tasks like retrieve, cachepath, report, ..., you must set the keep attribute to true!
+
+
+=== Resolve mode
+
+*__since 2.0__* The resolve mode allows to define how Ivy should use dependency revision constraints when performing the resolution.
+
+Two modes are available:
+
+
+* default +
+ In this mode the default revision constraint (expressed with the rev attribute in the link:../ivyfile/dependency.html[dependency] element) is used.
+
+* dynamic +
+ In this mode the dynamic revision constraint (expressed with the revConstraint attribute in the link:../ivyfile/dependency.html[dependency] element) is used.
+
+
+
+=== Concurrency
+
+During resolve, Ivy creates a file in the link:../settings/caches.html[resolution cache]. The creation of this file is not aimed to support concurrency, meaning that you can't have two concurrent resolve of the same module, in the same resolution cache, with the same resolveId.
+
+__Note for developers:
+After the call to this task, a reference to the module descriptor resolved is put in the ant project under the id
+[source]
+----
+"ivy.resolved.descriptor"
+----
+
+.__
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|file|path to the ivy file to use for resolution|No. Defaults to ${ivy.dep.file} or nothing in inline mode
+|conf|a comma separated list of the configurations to resolve, or '*'.
+*__Since 2.0__*, you can also use '*(private)', '*(public)'. Note that when inline is true, the configuration '*' is equivalent as '*(public)'.|No. Defaults to ${ivy.configurations}
+|refresh|true to force Ivy to resolve dynamic revision in this resolve process, false to use cached resolved revision *__since 2.0__*|No. defaults to false
+|resolveMode|the resolve mode to use for this dependency resolution process *__since 2.0__*|No. defaults to using the resolve mode set in the link:../settings.html[settings]
+|inline|true to use inline mode, false to resolve an ivy file *__since 1.4__*|No. defaults to false
+|keep|true to keep the results of the resolve in memory, false to discard them. When this is false, the standard ivy properties won't be set and other postresolve-tasks (like retrieve and cachepath) won't be able to resuse the results of this resolve!|No. defaults to false for an inline resolve and to true in any other case
+|organisation|the organisation of the module to resolve in inline mode *__since 1.4__*|Yes in inline mode, no otherwise.
+|module|the name of the module to resolve in inline mode *__since 1.4__*|Yes in inline mode, no otherwise.
+|revision|the revision constraint to apply to the module to resolve in inline mode *__since 1.4__*|No. Defaults to "latest.integration" in inline mode, nothing in standard mode.
+|branch|the name of the branch to resolve in inline mode *__(since 2.1.0)__*|Defaults to no branch in inline mode, nothing in standard mode.
+|changing|indicates that the module may change when resolving in inline mode. See link:../concept.html#change[cache and change management] for details. Ignored when resolving in standard mode. *__(since 1.4)__*|No. Defaults to false.
+|type|comma separated list of accepted artifact types (*__since 1.2__*)|No. defaults to ${ivy.resolve.default.type.filter}
+|haltonfailure|true to halt the build on ivy failure, false to continue|No. Defaults to true
+|failureproperty|the name of the property to set if the resolve failed *__since 1.4__*|No. No property is set by default.
+|transitive|true to resolve dependencies transitively, false otherwise *__since 1.4__*|No. Defaults to true
+|showprogress|true to show dots while downloading, false otherwise|No. Defaults to true
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|resolveId|An id which can be used later to refer to the results of this resolve *__(since 2.0)__*|No, defaults to '[org]-[module]'.
+|log|the log setting to use during the resolve process. *__(since 2.0)__*
+
+Available options are:
+
+* default +
+ the default log settings, where all usual messages are output to the console
+
+* download-only +
+ disable all usual messages but download ones. A resolve with everything in cache won't output any message.
+
+* quiet +
+ disable all usual messages, making the whole resolve process quiet unless errors occur
+|No, defaults to 'default'.
+|checkIfChanged|When set to true, the resolve will compare the result with the last resolution done on this module, with those configurations in order to define the property ivy.deps.changed. Put it to false may provides slightly better performance. *__(since 2.0)__*|No, default to 'true'
+|useCacheOnly|When set to true, it forces the resolvers to only use their caches and not their actual contents.*__(since 2.0)__*|No, default to 'false'
+|=======
+
+
+
+== Child elements
+
+
+*__(Since 2.3)__*
+
+These child elements are defining an inlined ivy.xml's link:../ivyfile/dependencies.html[dependencies] elements. Thus these child elements cannot be used together with the __inline__ or __file__ attributes.
+There is one important difference with the ivy.xml's link:../ivyfile/dependencies.html[dependencies]: there is no master configuration to handle here. There is actually only one, the one on which the resolve will run. So every attribute in link:../ivyfile/dependency.html[dependency], link:../ivyfile/exclude.html[exclude], link:../ivyfile/override.html[override] or link:../ivyfile/conflict.html[conflict] which is about a master configuration is not supported. And every attribute about a mapping of a master configuration on a dependency configuration is now expecting only the dependency configuration.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/dependency.html[dependency]|declares a dependency to resolve|0..n
+|link:../ivyfile/exclude.html[exclude]|excludes artifacts, modules or whole organizations from the set of dependencies to resolve|0..n
+|link:../ivyfile/override.html[override]|specify an override mediation rule, overriding the revision and/or branch requested for a transitive dependency *__since 2.0__*|0..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:resolve file="path/to/ivy.xml"/>
+
+----
+
+Resolve all dependencies declared in path/to/ivy.xml file.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:resolve file="path/to/ivy.xml" transitive="false" />
+
+----
+
+Same as above, but with transitive dependencies disabled.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:resolve file="path/to/ivy.xml" conf="default, test"/>
+
+----
+
+Resolve the dependencies declared in the configuration default and test of the path/to/ivy.xml file.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:resolve file="path/to/ivy.xml" type="jar"/>
+
+----
+
+Resolve all dependencies declared in path/to/ivy.xml file, but download only jar artifacts.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:resolve organisation="apache" module="commons-lang" revision="2+" inline="true" />
+
+----
+
+Resolve the commons-lang module revision 2+ from the repository, with its dependencies.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:resolve>
+ <dependency org="apache" name="commons-lang" rev="2+" />
+ <dependency org="apache" name="commons-logging" rev="1.1" />
+ <exclude org="apache" module="log4j" />
+</ivy:resolve>
+
+----
+
+Resolve of both commons lang and commons logging, with their dependencies but not log4j.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:resolve>
+ <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j" />
+</ivy:resolve>
+
+----
+
+Resolve the configurations "api" and "log4j" of "slf4j".
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/resources.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resources.adoc b/asciidoc/use/resources.adoc
new file mode 100644
index 0000000..b810e22
--- /dev/null
+++ b/asciidoc/use/resources.adoc
@@ -0,0 +1,105 @@
+
+*__(since 2.3) (Ant 1.7 required)__*
+`ivy:resources` is an Ant link:http://ant.apache.org/manual/Types/resources.html#collection[resource collection], which files are based on an Ivy resolve, and then can be used with any task which is working with resources like `copy` or `import`.
+
+This datatype share the same attributes, child elements and behaviour of a link:../use/postresolvetask.html[post resolve task]. It is not expected to be used as an Ant task though, only as a resource collection.
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:resources file="path/to/ivy.xml"/>
+
+----
+
+Build a resource collection of every artifacts of all dependencies declared in path/to/ivy.xml file.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:resources file="path/to/ivy.xml" transitive="false" />
+
+----
+
+Same as above, but with transitive dependencies disabled.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:resources file="path/to/ivy.xml" conf="default, test"/>
+
+----
+
+Build a resource collection of every artifacts of the dependencies declared in the configuration default and test of the path/to/ivy.xml file.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:resources file="path/to/ivy.xml" type="jar"/>
+
+----
+
+Build a resource collection of every jar artifact of all dependencies declared in path/to/ivy.xml file.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:resources organisation="apache" module="commons-lang" revision="2+" inline="true" />
+
+----
+
+Build a resource collection of every artifacts of commons-lang module revision 2+ from the repository, with its dependencies.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:resources>
+ <dependency org="apache" module="commons-lang" rev="2+" />
+ <dependency org="apache" module="commons-logging" rev="1.1" />
+ <exclude org="apache" module="log4j" />
+</ivy:resources>
+
+----
+
+Build a resource collection of every artifacts of both commons lang and commons logging, with their dependencies but not log4j.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:resources>
+ <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j" />
+</ivy:resources>
+
+----
+
+Build a resource collection of every artifacts of the configurations "api" and "log4j" of "slf4j".
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/retrieve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/retrieve.adoc b/asciidoc/use/retrieve.adoc
new file mode 100644
index 0000000..71776e5
--- /dev/null
+++ b/asciidoc/use/retrieve.adoc
@@ -0,0 +1,257 @@
+
+The retrieve task copies resolved dependencies anywhere you want in your file system.
+
+This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+*__since 1.4__* This task can even be used to synchronize the destination directory with what should actually be in according to the dependency resolution. This means that by setting sync="true", Ivy will not only copy the necessary files, but it will also remove the files which do not need to be there.
+
+The synchronisation actually consists in deleting all filles and directories in the root destination directory which are not required by the retrieve.
+
+The root destination directory is the the directory denoted by the first level up the first token in the destination pattern.
+Example:
+pattern: lib/[conf]/[artifact].[ext]
+root: lib
+
+*__since 2.3__* A nested link:http://ant.apache.org/manual/Types/mapper.html[mapper] element can be used to specify more complex filename transformations of the retrieved files. See the examples below.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|pattern|the pattern to use to copy the dependencies|No. Defaults to ${ivy.retrieve.pattern}
+|ivypattern|the pattern to use to copy the ivy files of dependencies *__since 1.3__*|No. Dependencies ivy files are not retrieved by default.
+|conf|a comma separated list of the configurations to retrieve|No. Defaults to the configurations resolved by the last resolve call, or * if no resolve was explicitly called
+|sync|true to synchronize the destination, false to just make a copy *__since 1.4__*|No. Defaults to false
+|type|comma separated list of accepted artifact types *__since 1.4__*|No. All artifact types are accepted by default.
+|overwriteMode|option to configure when the destination file should be overwritten if it exist *__(since 2.2.0)__*.
+Possible values are:
+
+* *newer* (default) +
+ overwrite the destination file if a more recent one is available (based on timestamp)
+
+* *different* +
+ overwrite the destination file if the timestamp is different
+
+* *always* +
+ always overwrite the destination file
+
+* *never* +
+ never overwrite the destination file
+|No. Defaults to 'newer'.
+|symlink|true to create symbolic links, false to copy the artifacts.
+ The destination of the symbolic links depends on the value of the useOrigin attribute.
+ (requires "ln" to be a valid command, and to support the options -s and -f (works on UNIX/Linux, on other systems you may need to script "ln")
+ *__(since 2.0)__*|No. Defaults to false
+|symlinkmass|true to create symbolic links in mass, false to copy the artifacts.
+ "symlinkmass" overrides "symlink" if both are set to "true".
+ "symlinkmass" will create the same symbolic links "symlink" does, but with a single process call to "sh" with batched "ln" commands passed in as standard input (works on UNIX/Linux, on other systems you may need to script it)
+ Far large lists of resolved jars, this can be dramatically faster.
+ The destination of the symbolic links depends on the value of the useOrigin attribute.
+ The events "StartRetrieveArtifactEvent" and EndRetrieveEvent are NOT fired by this activity, because it is not clear when they should be called.
+ *__(since 2.4)__*|No. Defaults to false
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|log|the log setting to use during the resolve and retrieve process. *__(since 2.0)__*
+
+Available options are the same as for link:../use/resolve.html[resolve] when used to trigger resolve automatically (see link:../use/postresolvetask.html[postresolvetask]), or the following for the retrieve process only:
+
+* *default* +
+ the default log settings, where all usual messages are output to the console
+
+* *quiet* +
+ disable all usual messages, making the whole retrieve process quiet unless errors occur
+|No, defaults to 'default'.
+|pathId|the id of the path to create containing the retrieved artifacts. *__since 2.3__*|No. No path is created by default.
+|setId|the id of the fileset to create containing the retrieved artifacts. *__since 2.3__*|No. No fileset is created by default.
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:retrieve />
+
+----
+
+Retrieves dependencies using default parameters. This usually retrieves all the dependencies of the last resolve call to a lib directory.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"/>
+
+----
+
+Retrieves all dependencies of the last resolve call to a lib directory, dependencies being separated in directories named by configuration, each conf directory containing corresponding artifacts without the revision.
+For instance, if the ivy file declares two configurations default and test, the resulting lib dir could look like this:
+
+[source]
+----
+
+lib
+ default
+ commons-lang.jar
+ commons-logging.jar
+ test
+ junit.jar
+
+----
+
+Note that if a dependency is required in the two configurations, it will be copied in the two directories. The download of the dependency is however only made once at resolve time.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]" sync="true" />
+
+----
+
+Same as before, but with synchronisation enabled.
+
+For instance, if the ivy file declares two configurations default and test, the resulting lib dir could look like this:
+
+[source]
+----
+
+lib
+ default
+ commons-lang.jar
+ commons-logging.jar
+ test
+ junit.jar
+
+----
+
+And now suppose commons-logging is no longer part of the dependencies of the default configuration, then a new call to retrieve will result in:
+
+[source]
+----
+
+lib
+ default
+ commons-lang.jar
+ test
+ junit.jar
+
+----
+
+With no synchronisation, commons-logging would not have been removed by the call.
+
+
+'''
+
+
+[source]
+----
+
+<ivy:retrieve pattern="${lib.dir}/[type]/[artifact]-[revision].[ext]" conf="runtime"/>
+
+----
+
+Retrieves only the dependencies of the
+[source]
+----
+runtime
+----
+
+configuration in directories named by artifact type. The resulting lib dir could look like this:
+
+[source]
+----
+
+lib
+ jar
+ commons-lang-1.0.jar
+ looks-1.1.jar
+ source
+ looks-1.1.zip
+
+----
+
+
+'''
+
+
+[source]
+----
+
+<ivy:retrieve pattern="${lib.dir}/[organisation]/[artifact]-[revision].[ext]" />
+
+----
+
+Retrieves all dependencies of the last resolve call to a lib directory. The [organisation] token will get the unmodified organisation value. The resulting lib dir could look like this:
+
+[source]
+----
+
+lib
+ org.apache
+ commons-lang-1.0.jar
+ org.junit
+ junit-4.1.jar
+ junit-4.1.zip
+
+----
+
+
+[source]
+----
+
+<ivy:retrieve pattern="${lib.dir}/[orgPath]/[artifact]-[revision].[ext]" />
+
+----
+
+Retrieves all dependencies of the last resolve call to a lib directory. The [orgPath] token will get a tree structure. The resulting lib dir could look like this:
+
+[source]
+----
+
+lib
+ org
+ apache
+ commons-lang-1.0.jar
+ junit
+ junit-4.1.jar
+ junit-4.1.zip
+
+----
+
+
+'''
+
+
+[source]
+----
+
+<ivy:retrieve organisation="foo" module="bar" inline="true" pattern="${my.install.dir}/[artifact].[ext]"/>
+
+----
+
+Resolves and retrieve the latest version of the module bar and its dependencies in the directory pointed by ${my.install.dir}.
+
+'''
+
+
+[source]
+----
+
+<ivy:retrieve pattern="lib/[artifact]-[revision].[ext]">
+ <firstmatchmapper>
+ <globmapper from="lib/*-SNAPSHOT.jar" to="lib/snapshots/*-SNAPSHOT.jar" />
+ <globmapper from="lib/*" to="lib/releases/*"/>
+ </firstmatchmapper>
+</ivy:retrieve>
+
+----
+
+Retrieves all dependencies of the last resolve call to a lib directory. The jar files with a version equal to 'SNAPSHOT' are retrieved in a 'snapshots' directory. The other ones are retrieved in a 'releases' directory.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/settings.adoc b/asciidoc/use/settings.adoc
new file mode 100644
index 0000000..5e06db7
--- /dev/null
+++ b/asciidoc/use/settings.adoc
@@ -0,0 +1,122 @@
+
+*__(since 2.0)__*
+
+The settings declaration is used to configure ivy with an xml settings file. The difference with the link:../use/configure.html[configure] task is that when using the settings declaration, the configuration of Ivy will be done when the settings are first needed (for instance when you do a resolve), while the configure task will perform a configuration of Ivy instantly, which makes it easier to see the problem if something goes wrong.
+
+See link:../settings.html[Settings Files] for details about the settings file itself.
+
+
+
+Multiple settings can be defined in a build script. Every task can reference its own settings.
+
+All Ivy variables set during the settings are available in the Ant project as long as they were not set in Ant before (Ant properties are immutable).
+Moreover, the variables are exposed under two names: the variable name, and the variable name suffixed by dot + the settings id.
+For instance, if you load a settings with the id 'myid', and define a variable my.variable=my.value in the Ivy settings, both my.variable and my.variable.myid will now be available as properties in Ant and equal to 'my.value'. If you later load another settings with the id 'yourid', and in this settings assign the variable 'my.variable' the value 'your.value', in the Ant project you will have:
+
+[source]
+----
+
+my.variable=my.value
+my.variable.myid=my.value
+my.variable.yourid=your.value
+
+----
+
+
+=== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|id|The settings id useable in the settingsRef attributes of the ivy task that needs a setting. Note that the ivy tasks will search by default for the settings with the id "ivy.instance", which is the default value.|No, defaults to "ivy.instance"
+|file|path to the settings file to use|No. If a file is provided, url is ignored. If none are provided, then it attempts to find a file at ${ivy.settings.file}, and if this file does not exist, it uses a link:../tutorial/defaultconf.html[default settings file]
+|url|url of the settings file to use
+|host|http authentication host|No, unless authentication is required
+|realm|http authentication realm
+|username|http authentication user name
+|passwd|http authentication password
+|=======
+
+
+=== HTTP Authentication
+
+__Note: HTTP Authentication can be used only if link:http://jakarta.apache.org/commons/httpclient/[commons-httpclient.jar] is in your classpath__
+If any of the url you use in ivy (especially in dependency resolvers) need http
+authentication, then you have to provide the host, realm, username and passwd
+attributes of the configure task. These settings will then be used in any
+further call to ivy tasks.
+
+
+
+
+=== Multiple classloader
+
+A special attention should be applied when you have a multi-project build with __subant__ call, using ivy task loaded by a __typedef__. Indeed in this situation, it is possible to pass settings reference to a subbuild. When you do that, you should take of the classloader. The ivy task of your subant should not be defined in a different classloader than the parent one. This can be achieved by using the __loader__ parameter of the antlib declaration, or avoid to reload the ivy antlib in the subbuild (place the taskdef in a target only executed when the antlib is not yet loaded).
+
+
+
+
+
+=== Examples
+
+
+==== Simplest settings
+
+
+[source]
+----
+<ivy:settings />
+----
+
+Use either ${ivy.settings.file} if it exists, or the link:../samples/ivysettings-default.xml[default settings file]
+
+This simplest setting is implicit.
+
+==== Configure with a file
+
+
+[source]
+----
+<ivy:settings file="mysettings.xml" />
+----
+
+
+==== Configure with an url
+
+
+[source]
+----
+<ivy:settings url="http://mysite.com/mysettings.xml" />
+----
+
+
+==== Configure multiple realms which require autentication
+
+
+[source]
+----
+
+<ivy:settings file="path/to/my/ivysettings.xml">
+ <credentials host="myhost.com" realm="My Realm" username="myuser" passwd="mypasswd" />
+ <credentials host="yourhost.com" realm="Your Realm" username="myuser" passwd="myotherpasswd" />
+</ivy:settings>
+
+----
+
+
+==== Configure 2 different settings
+
+You can use multiple ivy settings during a build. Then every ivy task should specify the settings it uses using the settingsRef attribute.
+
+[source]
+----
+
+ <ivy:settings id="ivy.normal.settings" file="normal_settings.xml" />
+ <ivy:settings id="ivy.release.settings" file="release_settings.xml" />
+
+ <ivy:resolve settingsRef="ivy.normal.settings" />
+ <ivy:resolve settingsRef="ivy.release.settings" />
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/var.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/var.adoc b/asciidoc/use/var.adoc
new file mode 100644
index 0000000..03d3c61
--- /dev/null
+++ b/asciidoc/use/var.adoc
@@ -0,0 +1,28 @@
+
+Sets a variable (by name and value), or set of variables (from file or url) in ivy.
+
+Variables are case sensitive.
+
+
+Contrary to ant properties, ivy variables are mutable. But a problem with this is that you do not control when
+variables are substituted, and usually it is done as soon as possible. So changing the value of a variable will
+have no effect if it has already been substituted. Consequently, *using this task is NOT recommended*.
+See link:../reference.html[reference] page for details about ivy variables.
+
+
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the variable to set|No
+|value|the value of the variable to set|Yes when using the name attribute
+|file|the filename of the property file to load as ivy variables|One of these, when *not* using the name attribute
+|url|the url from which to read ivy variables
+|prefix|Prefix to apply to variables. A "." is appended to the prefix if not specified.|No
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/yed.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/yed.adoc b/asciidoc/yed.adoc
new file mode 100644
index 0000000..7b2b174
--- /dev/null
+++ b/asciidoc/yed.adoc
@@ -0,0 +1,46 @@
+
+link:http://www.yworks.com/en/products_yed_about.htm[yEd] is a free graph editor, benefiting from
+all the automatic layouts of yFiles. Ivy is able to generate graphs which are readable by yEd.
+
+The graphs generated by ivy are not layed out (in fact it's why we use yEd), so you have to follow a simple sequence of steps to layout the generated graphs.
+
+
+=== Preparation
+
+First you have to generate a graphml file. Simply call the report task (see ivy use documentation) for that.
+
+
+=== Step 1: open the graphml file
+
+Launch yEd editor, and open the graphml file generated by the report task. You should obtain something like this:
+
+image::images/yed-step1.jpg[]
+
+
+
+=== Step 2: ask yEd to adjust nodes size
+
+
+image::images/yed-step2.jpg[]
+image::images/yed-step3.jpg[]
+image::images/yed-step3-2.jpg[]
+
+
+
+=== Step 3: ask yEd to layout nodes
+
+
+image::images/yed-step4.jpg[]
+image::images/yed-step5.jpg[]
+image::images/yed-step6.jpg[]
+
+That's all, you should have obtained something like this:
+
+image::images/yed-step7.jpg[]
+
+Note that this is only one possibility, test the available layouts yourself, you could find one better in your case.
+Once you have layed out the graph, you can either save it with in the same file (but be warned that it will be overwritten at next ivy report call), or another file, export it to jpg, gif, svg, etc. (see link:http://www.yworks.com/en/products_yed_about.htm[yEd] site for details).
+
+
+
+
\ No newline at end of file
[18/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependencies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependencies.adoc b/asciidoc/ivyfile/dependencies.adoc
new file mode 100644
index 0000000..33bc609
--- /dev/null
+++ b/asciidoc/ivyfile/dependencies.adoc
@@ -0,0 +1,52 @@
+
+*Tag:* dependencies *Parent:* link:../ivyfile.html[ivy-module]
+
+Container for dependency elements, used to describe the dependencies of this module.
+If this container is not present, it is assumed that the module has no dependency at all.
+
+This container provides for two similar behaviors. An overview is given here. (See link:../ivyfile/configurations.html[configurations doc page] for more details about these behaviors).
+
+*__since 1.1__*
+[source]
+----
+defaultconf
+----
+
+Defines the conf attribute to use when no conf is defined for a dependency in this ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.
+
+*__since 1.3__*
+[source]
+----
+defaultconfmapping
+----
+
+Influences the way that a conf mapping with no mapped conf is interpreted.
+
+In Ivy 2.1.0 and earlier, if both defaultconf and defaultconfmapping are defined, it's the defaultconfmapping that is used. Since Ivy 2.2.0, these attributes can be used together.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|defaultconf|the default configuration to use when none is specified in a dependency. *__since 1.1__*</em>|No, defaults to *->*
+|defaultconfmapping|the default configuration mapping to use in this ivy file. *__since 1.3__*</em>|No, defaults to no default conf mapping
+|=======
+
+
+== Child elements
+
+
+Note: as specified by the ivy.xsd, the children elements are ordered; must come first the `link:../ivyfile/dependency.html[dependency]` elements, then the `link:../ivyfile/exclude.html[exclude]` elements, then the `link:../ivyfile/override.html[override]` elements, and then the `link:../ivyfile/conflict.html[conflict]` elements.
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/dependency.html[dependency]|declares a dependency for this module|0..n
+|link:../ivyfile/exclude.html[exclude]|excludes artifacts, modules or whole organizations from the set of dependencies of this module *__since 2.0__*|0..n
+|link:../ivyfile/override.html[override]|specify an override mediation rule, overriding the revision and/or branch requested for a transitive dependency *__since 2.0__*|0..n
+|link:../ivyfile/conflict.html[conflict]|specify a a conflict manager for one or several dependencies *__since 2.0__*|0..n
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependency-artifact-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-artifact-conf.adoc b/asciidoc/ivyfile/dependency-artifact-conf.adoc
new file mode 100644
index 0000000..e757e30
--- /dev/null
+++ b/asciidoc/ivyfile/dependency-artifact-conf.adoc
@@ -0,0 +1,17 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/dependency-artifact.html[artifact]
+
+Specify a configuration in which the enclosing artifact specification should be included.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the master configuration in which the enclosing artifact should be included|Yes
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependency-artifact.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-artifact.adoc b/asciidoc/ivyfile/dependency-artifact.adoc
new file mode 100644
index 0000000..6b56350
--- /dev/null
+++ b/asciidoc/ivyfile/dependency-artifact.adoc
@@ -0,0 +1,100 @@
+
+*Tag:* artifact *Parent:* link:../ivyfile/dependency.html[dependency]
+
+This feature gives you more control on a dependency for which you do not control its ivy file.
+It enables to specify the artifacts required, if the dependency has no ivy file.
+
+Indeed, when a module has no ivy file, it is assumed that it publishes exactly one artifact having the same name as the module itself. But when this module publishes more artifacts, or simply does not respect the name rule, and if you cannot deliver an ivy file for it (because you do not control the repository, for instance - think about maven ibiblio repository, to give no name), then this feature let you specify the artifacts names you want to get.
+
+Each artifact specification can be given in the context of particular master configurations. By default, if no configuration is specified, artifacts specification apply to all master configurations. But you can specify that a specification applies only to one or several master configurations, using either inline or nested conf specification. In this case, do not forget that if you do not specify any specification for a particular configuration, then no specification will apply for this configuration and it will be resolved not taking into account any specification.
+
+For instance, imagine you have A, B & C master configurations. If you specify art1 in A & B and art2 in A, then C will not be specified at all, and will thus assume the default artifact. To prevent this, you have to specify a configuration mapping for the dependency, mapping only A & B to some or all dependency configurations.
+
+Example:
+
+[source]
+----
+
+<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="A,B->default">
+ <artifact name="art1" type="jar" conf="A,B"/>
+ <artifact name="art2" type="jar" conf="A"/>
+</dependency>
+
+----
+
+*__since 1.4__* It's possible to indicate the url at which the artifact can be found. This is not mandatory, and even not recommended with an enterprise repository. Note that Ivy will always look at the location where the artifact should be and only use the url if it cannot be found at the standard location in the repository.
+
+*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
+
+*__since 2.0__* This feature can also be used for modules having their own module descriptor, but which doesn't declare an artifact you know that is published. Note that in this case artifacts declared to be published by the dependency will be ignored, so do not forget to include all artifacts you want.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of an artifact of the dependency module|Yes
+|type|the type of the artifact of the dependency module|Yes
+|ext|the extension of the artifact of the dependency module|No, defaults to type
+|conf|comma separated list of the master configurations in which this artifact should be included.
+ '*' wildcard can be used to designate all configurations of this module|No, defaults to '*', unless nested conf are specified
+|url|an url where this artifact can be found if it isn't present at the standard location in the repository *__since 1.4__*|No, defaults to no url
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/dependency-artifact-conf.html[conf]|configuration in which the artifact should be included|0..n
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<dependency org="foo" name="bar" rev="1.0">
+ <artifact name="baz" type="jar"/>
+</dependency>
+
+----
+
+Declares a dependency on module bar which only publish one artifact: baz.jar.
+
+
+'''
+
+
+[source]
+----
+
+<dependency org="foo" name="bar" rev="1.0">
+ <artifact name="baz" type="jar" url="http://www.acme.com/repository/bar/baz-1.0-acme.jar"/>
+</dependency>
+
+----
+
+Same as above, except that if the artifact is not found at its standard location, Ivy will use http://www.acme.com/repository/bar/baz-1.0-acme.jar to download it.
+
+
+'''
+
+
+[source]
+----
+
+<dependency org="foo" name="bar" rev="1.0">
+ <include name="*"/>
+ <artifact name="baz" type="source" ext="jar"/>
+</dependency>
+
+----
+
+Declares a dependency on module bar for which all artifacts declared will be used (thanks to the include tag) plus an artifact baz of type source and ext jar (which is not declared in module bar module descriptor).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependency-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-conf.adoc b/asciidoc/ivyfile/dependency-conf.adoc
new file mode 100644
index 0000000..f4e5209
--- /dev/null
+++ b/asciidoc/ivyfile/dependency-conf.adoc
@@ -0,0 +1,33 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/dependency.html[dependency]
+
+
+
+Describes a configuration mapping for a dependency. See also the inline configuration mapping
+in dependency element.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the master configuration to map.
+ '*' wildcard can be used to designate all configurations of this module|Yes
+|mapped|a comma separated list of dependency configurations to which this
+ master configuration should be mapped|No, default to the same configuration as master one, unless nested mapped elements are specified
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/mapped.html[mapped]|map dependency configurations for this master configuration|0..n
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependency-include-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-include-conf.adoc b/asciidoc/ivyfile/dependency-include-conf.adoc
new file mode 100644
index 0000000..78f3dfc
--- /dev/null
+++ b/asciidoc/ivyfile/dependency-include-conf.adoc
@@ -0,0 +1,17 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/dependency-include.html[include]
+
+Specify a configuration in which the enclosing artifact inclusion should be included.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the master configuration in which the enclosing artifact should be included|Yes
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependency-include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-include.adoc b/asciidoc/ivyfile/dependency-include.adoc
new file mode 100644
index 0000000..cca23ca
--- /dev/null
+++ b/asciidoc/ivyfile/dependency-include.adoc
@@ -0,0 +1,46 @@
+
+*Tag:* include *Parent:* link:../ivyfile/dependency.html[dependency]
+
+This feature gives you more control on a dependency for which you do not control its ivy file.
+It enables to restrict the artifacts required by including only the artifacts given here, even if configuration does not a good separation of published artifacts.
+
+Each artifact restriction can be given in the context of particular master configurations. By default, if no configuration is specified, artifacts restriction apply to all master configurations. But you can specify that a restriction applies only to one or several master configurations, using either inline or nested conf specification. In this case, do not forget that if you do not specify any restriction for a particular configuration, then no restriction will apply for this configuration and it will be resolved not taking into account any restriction.
+
+For instance, imagine you have A, B & C master configurations. If you restrict to art1 in A & B and art2 in A, then C will not be restricted at all, and will thus get all artifacts of all dependency configurations if you do not specify a configuration mapping. To prevent this, you have to specify a configuration mapping for the dependency, mapping only A & B to some or all dependency configurations.
+
+Example:
+
+[source]
+----
+
+<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="A,B->default">
+ <include name="art1" type="jar" conf="A,B"/>
+ <include name="art2" type="jar" conf="A"/>
+</dependency>
+
+----
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of an artifact of the dependency module to add to the include list, or an expression matching this name (see matcher attribute below)|No, defaults to .*
+|type|the type of the artifact of the dependency module to add to the include list, or an expression matching this name (see matcher attribute below)|No, defaults to .*
+|ext|the extension of the artifact of the dependency module to add to the include list, or an expression matching this name (see matcher attribute below)|No, defaults to type
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules to include *__since 2.0__*|No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 1.3 and superior
+|conf|comma separated list of the master configurations in which this artifact should be included.
+ '*' wildcard can be used to designate all configurations of this module|No, defaults to '*', unless nested conf are specified
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/dependency-include-conf.html[conf]|configuration in which the artifact should be included|0..n
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/dependency.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency.adoc b/asciidoc/ivyfile/dependency.adoc
new file mode 100644
index 0000000..63e921b
--- /dev/null
+++ b/asciidoc/ivyfile/dependency.adoc
@@ -0,0 +1,409 @@
+
+*Tag:* dependency *Parent:* link:dependencies.html[dependencies]
+
+Declares a dependency for this module. A dependency is described by the module on which the current module depends (identified by its name, organisation and revision), and a mapping of configurations.
+
+
+=== [[revision]]Fixed and dynamic revisions
+
+The revision can be given as a fixed one (1.5.2, for instance) or as a latest (or dynamic) one. Several possibilities for dynamic revisions are implemented in Ivy:
+
+
+* latest.integration +
+ selects the latest revision of the dependency module.
+
+* latest.[any status] *__since 1.4__* +
+ selects the latest revision of the dependency module with at least the specified status.
+
+For instance latest.milestone will select the latest version being either a milestone or a release, and latest.release will only selects the latest release. Note that in order to find the latest revision with the appropriate status Ivy has to parse all the ivy files in your repository from the last one until it finds such a revision. Hence don't be surprised if the resolution slow down.
+See also link:../settings/statuses.html[statuses] to see how to configure module statuses.
+
+* end the revision with a + +
+ selects the latest sub-revision of the dependency module. For instance,
+if the dependency module exists in revision 1.0.3, 1.0.7 and 1.1.2, "1.0.+" will select 1.0.7.
+
+* version ranges *__since 1.4__* +
+ mathematical notation for ranges can be used to match a range of version.
+
+Examples:
+[1.0,2.0] matches all versions greater or equal to 1.0 and lower or equal to 2.0
+[1.0,2.0[ matches all versions greater or equal to 1.0 and lower than 2.0
+]1.0,2.0] matches all versions greater than 1.0 and lower or equal to 2.0
+]1.0,2.0[ matches all versions greater than 1.0 and lower than 2.0
+[1.0,) matches all versions greater or equal to 1.0
+]1.0,) matches all versions greater than 1.0
+(,2.0] matches all versions lower or equal to 2.0
+(,2.0[ matches all versions lower than 2.0
+
+*__since 1.4__* If you don't find a way to expression your dependency version constraint among these, you can link:../settings/version-matchers.html[plug your own].
+The way to determine which revision is the "latest" between two is configurable through the use of pluggable LatestStrategy. See link:../reference.html[ivy main concepts] for details about this.
+
+
+=== [[revision-constraint]]Revision constraint
+
+*__since 2.0__* The dependency tag supports two revision attributes: rev, corresponding to the default required dependency revision, and revConstraint, corresponding to a dynamic revision constraint applied on this dependency.
+
+Depending on the link:../use/resolve.html[resolve mode] used, the actual revision used during dependency resolution may vary. These revisions usually differ only for modules published in a repository. When link:../use/deliver.html[deliver] is used, dynamic version constraints are replaced by a stic version constraint, to help build reproducibility. However, the information of the original version constraint is not lost, but rather put in the revConstraint attribute. This both ensure better metadata in the repository while still allowing easier build reproducibility.
+
+
+=== Configurations mapping
+
+This mapping indicates which configurations of the dependency are required in which configurations of the current module, also called master configurations.
+
+There are several ways to declare this mapping of configurations, choose depending more on preference than on possibilities. Try to avoid mixing usage in a single dependency element: do not use both nested and inline mapping declaration.
+
+The first way to declare this mapping is called the inline mapping. It is maybe the less natural at first, but it's powerful and concise. Inline mapping can take several forms.
+
+
+
+* Specify one configuration name +
+ This means that in this master configuration the same dependency configuration is needed (except if a defaultconfmapping has been specified in this ivy file, see link:../ivyfile/configurations.html[configurations] for details, or table below for examples).
+For instance, if the current module has defined a configuration named 'runtime', and the dependency too, then having an inline mapping configuration set to 'runtime' means that in the runtime master configuration the runtime dependency configuration is required.
+
+The link:../ivyfile/configurations.html#defaultconfmapping[examples on the dependency on the configurations page] explain how ivy interprets the conf attribute according to how link:../ivyfile/configurations.html[defaultconfmapping] and link:../ivyfile/configurations.html[defaultconf] is set.
+
+
+
+* Specify a configuration mapping using the '->' operator separating a comma separated list of master configurations (left operand) of a comma separated list of dependency configurations (right operand). +
+A good way to remember which side is for the master configuration (i.e. the configuration of the module defining the dependency) and which side is for the dependency configuration is to read the '->' as 'depends on'.
+
+In this case, all specified dependency configurations are required in all specified master configurations.
+For instance, 'A, B, C -> E, F' means that dependency configurations E & F are required in master configurations A, B and C.
+
+Note that you can use the wildcard '*' as a configuration name, meaning that all configurations (either master or dependency public ones depending on the side) are wanted. For instance, '* -> B, C' means that B & C dependency configurations are required in all master configurations.
+
+*__since 1.4__* you can use * wildcard followed by negated configurations to mean all but xxx. For instance, '*, !A, !B -> X' means that X dependency configuration is required in all master configurations except A and B.
+
+*__since 1.2__* '@' also has a special meaning as a right operand of the dependency mapping, it means map to self. This is particularly useful with '*', '*->@' meaning that all configurations of the module maps to their equivalent (same name) in the dependency.
+
+*__since 1.4__* '#' can be used as right side operand to mean 'this' configuration, and thus refers to the configuration being resolved. It is slightly similar to @, except that it takes into account the configuration being actually resolved in case of a configuration extending another one.
+
+Example:
+Let's foo be a module with two configurations, A and B, B extending A.
+Then a dependency declaring conf A-># will get A dep conf in its confs A (when resolving A, ivy will find interpret the # symbol as A) and B dep conf in its conf B (when resolving B, ivy will interpret the # symbol as B, even if this dependency is only required because of the A dependency).
+
+If you don't understand really how this works, do not use it :-)
+
+*__since 1.4__* '%' can be used as left side operand to mean 'all the other configurations'. This can be usefull when you only have a specific mapping for some configurations and a default mapping for all the others.
+
+Example:
+
+[source]
+----
+test->runtime;%->default
+----
+
+means that the
+[source]
+----
+test
+----
+
+configuration is mapped to the
+[source]
+----
+runtime
+----
+
+configuration, but all the other configurations are mapped to the
+[source]
+----
+default
+----
+
+configuration.
+
+*__since 1.3__* a fallback mechanism can be used when you are not sure that the dependency will have the required conf. You can indicate to ivy that you want one configuration, but if it isn't present, use another one.
+The syntax for specifying this adds the fallback conf between parenthesis right after the required conf.
+For instance,
+[source]
+----
+test->runtime(default)
+----
+
+means that in the test configuration of the module the
+[source]
+----
+runtime
+----
+
+conf of the dependency is required, but if doesn't exist, it will use the
+[source]
+----
+default
+----
+
+conf instead. If
+[source]
+----
+default
+----
+
+conf doesn't exist then it will be considered as an error. Note that the
+[source]
+----
+*
+----
+
+wildcard can be used as fallback conf.
+
+*__since 2.1__* It is also possible to define dependencies on configurations intersection. A configuration intersection is defined using a '+' sign to separate the configuration (eg 'A+B' means the intersection of configuration 'A' and 'B'). In that case only artifacts and dependencies defined in both configurations in the dependency will be part of the master configuration defining the dependency on the configuration intersection.
+
+Configuration intersections can also be used when specifying the confs to link:../use/resolve.html[resolve].
+
+Moreover, the mapping '*->@' is handled as a specific case with configuration intersections: it maps also the intersections. So if one resolve conf A+B in a module which defines a dependency with mapping *->@, the mapping *->@ is interpreted as A+B->A+B so the intersection of A and B will be resolved in the dependency.
+
+*__since 2.1__* you can refer to a group of configurations sharing the same value for an attribute as left side part of the dependency mapping.
+
+The syntax is
+
+[source]
+----
+*[att=value]
+----
+
+where _att_ is the name of the attribute shared by the configurations of the group, and _value_ is the value for this attribute that configurations must have to be part of the group. This is especially useful with extra attributes.
+
+For instance, if you have:
+
+[source]
+----
+
+<configurations>
+ <conf name="red" e:axis="color" />
+ <conf name="blue" e:axis="color" />
+
+ <conf name="windows" e:axis="platform" />
+ <conf name="linux" e:axis="platform"/>
+</configurations>
+
+----
+
+Then you can do:
+
+[source]
+----
+
+<dependency org="acme" name="foo" rev="2.0" conf="*[axis=platform]->default"/>
+
+----
+
+To map the windows and linux configurations (the one which have the attribute axis equal to platform) to the default configuration of foo.
+
+*__since 1.4__* you can add simple conditions in the right side of the dependency mapping. This is done by adding a condition between '[' and ']'. If the condition evaluates to
+[source]
+----
+true
+----
+
+, the mapping is performed. If the condition evaluates to
+[source]
+----
+false
+----
+
+, the mapping will be ignored. For instance,
+[source]
+----
+test->[org=A]runtime,[org=B]default
+----
+
+means that the
+[source]
+----
+test
+----
+
+configuration will be mapped to the
+[source]
+----
+runtime
+----
+
+conf for the dependencies of organisation 'A' and to the
+[source]
+----
+default
+----
+
+conf for dependencies of organisation 'B'.
+
+
+* Specify a semi-column separated list of any of the previous specs. +
+ In this case, it is the union of the mapping which is kept. For instance, 'A -> B; * -> C' means that B conf is needed in A conf and C conf is need in all master conf... so both B & C dep conf are required in A master conf
+
+
+If you prefer more verbose mapping declaration, everything is also possible with sub elements mapping declaration.
+
+
+=== Artifact restriction
+
+Moreover, the dependency element also supports an artifact restriction feature (since 0.6).
+See link:../ivyfile/dependency-artifact.html[dependency artifact] for details.
+
+
+=== Forcing revision
+
+Finally, the dependency element also supports an a force attribute (since 0.8), which gives an indication
+to conflicts manager to force the revision of a dependency to the one given here.
+See link:../ivyfile/conflicts.html[conflicts manager] for details.
+
+*__since 1.4__* this tag supports link:../concept.html#extra[extra attributes]
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the name of the organisation of the dependency.|No, defaults to the master module organisation
+|name|the module name of the dependency|Yes
+|branch|the branch of the dependency. *__since 1.4__*|No, defaults to the default branch setting for the dependency.
+|rev|the revision of the dependency. See link:#revision[above] for details.|Yes
+|revConstraint|the dynamic revision constraint originally used for this dependency. See link:#revision-constraint[above] for details.|No, defaults to the value of rev
+|force|a boolean to give an indication to conflict manager that this dependency
+ should be forced to this revision (see link:../ivyfile/conflicts.html[conflicts manager])|No, defaults to false
+|conf|an inline mapping configuration spec (see above for details)|No, defaults to defaultconf attribute of dependencies element if neither conf attribute nor conf children element is given
+|transitive|true to resolve this dependency transitively, false otherwise (*__since 1.2__*)|No, defaults to true
+|changing|true if the dependency artifacts may change without revision change, false otherwise (*__since 1.2__*). See link:../concept.html#change[cache and change management] for details.|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/dependency-conf.html[conf]|defines configuration mapping has sub element|0..n
+|link:../ivyfile/dependency-artifact.html[artifact / include]|defines artifacts inclusion - use only if you do not control dependency ivy file|0..n
+|link:../ivyfile/artifact-exclude.html[exclude]|defines artifacts exclusion - use only if you do not control dependency ivy file|0..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<dependency org="jayasoft" name="swtbinding" revision="0.2"/>
+
+----
+
+Declares a dependency on the module swtbinding from jayasoft in its revision 0.2. All the configuration of this dependency will be included in all configurations of the module in which the dependency is declared.
+
+'''
+
+
+[source]
+----
+
+<dependency org="jayasoft" name="swtbinding" branch="fix-103" revision="latest.integration"/>
+
+----
+
+Same as above except that it will take the latest revision on the branch 'fix-103' instead of revision '0.2'.
+
+'''
+
+
+[source]
+----
+
+<dependency name="mymodule" revision="latest.integration" conf="test->default"/>
+
+----
+
+Declares a dependency on the module
+[source]
+----
+mymodule
+----
+
+from the same organisation as the module in which the dependency is declared. The latest available revision of this dependency will be used. This dependency will only be included in the test configuration of the module, and it's only the default configuration of the dependency which will be included.
+
+'''
+
+
+[source]
+----
+
+<dependency org="apache" name="commons-lang" revision="2.0" force="true" conf="default"/>
+
+----
+
+Declares a dependency on the module
+[source]
+----
+commons-lang
+----
+
+from apache, in revision 2.0. The revision 2.0 will be used even if another dependency declares itself a dependency on another version of commons-lang. Moreover, if no defaultconfmapping is defined, only the
+[source]
+----
+default
+----
+
+conf of commons-lang will be used in the
+[source]
+----
+default
+----
+
+conf of the master module. If
+[source]
+----
+*->runtime
+----
+
+was declared as defaultconfmapping, then the runtime conf of commons-lang would be included in the default conf of the master module. Note that whatever the defaultconfmapping is, the dependency only be included in the default conf of the master module. The defaultconfmapping only changes the required dependency confs.
+
+'''
+
+
+[source]
+----
+
+<dependency org="foo" name="bar" revision="3.0" transitive="false" conf="default->@;runtime,test->runtime"/>
+
+----
+
+Declares a dependency on the module
+[source]
+----
+bar
+----
+
+from foo, in revision 3.0. The dependencies of bar will themselves not be included due to the setting of transitive. The default dependency conf will be included in the default master conf, and the runtime dependency conf will be included in both the runtime and test master conf.
+
+'''
+
+
+[source]
+----
+
+<dependency org="foo" name="bar" revision="3.0" changing="true" conf="compile->runtime(default)"/>
+
+----
+
+Declares a dependency on the module
+[source]
+----
+bar
+----
+
+from foo, in revision 3.0. This revision is considered to be able to change (
+[source]
+----
+changing="true"
+----
+
+), so even if it is already in ivy cache, Ivy will check if a revision is a more recent last modified date is available on the repository. The runtime conf of bar is required in the compile conf of the master module, but if bar doesn't define a runtime conf, then the
+[source]
+----
+default
+----
+
+conf will be used.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/description.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/description.adoc b/asciidoc/ivyfile/description.adoc
new file mode 100644
index 0000000..8a75753
--- /dev/null
+++ b/asciidoc/ivyfile/description.adoc
@@ -0,0 +1,22 @@
+
+*Tag:* description *Parent:* link:../ivyfile/info.html[info]
+
+
+
+Describes the current module. This tag is the only one which can contain free text,
+including html. It is used to describe the module itself, usually in a single short phrase
+(it is not meant to replace the module description on the corresponding web site), and then
+gives all information necessary to use the module, especially information about
+public configurations, how and when to use them.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|homepage|the url of the homepage of the module|No, but it's recommended to indicate it.
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/exclude.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/exclude.adoc b/asciidoc/ivyfile/exclude.adoc
new file mode 100644
index 0000000..4300f90
--- /dev/null
+++ b/asciidoc/ivyfile/exclude.adoc
@@ -0,0 +1,24 @@
+
+*Tag:* exclude *Parent:* link:../ivyfile/dependencies.html[dependencies]
+
+*__since 2.0__* This feature gives you more control on a dependency for which you do not control its ivy file.
+It allows to exclude artifacts, modules or organizations from the list of dependencies for the whole module.
+
+It is very similar to the link:../ivyfile/artifact-exclude.html[dependency exclude] element, except that it applies to a whole module, which can be very useful when a lot of dependencies transitively bring a module you don't want.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the organization of the dependency module or artifact to exclude, or a regexp matching this organization|No, defaults to *
+|module|the name of the dependency module or the artifact to exclude, or a regexp matching this module name|No, defaults to *
+|artifact|the name of an artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)|No, defaults to *
+|type|the type of the artifact of the dependency module to add to the exclude list, or a regexp matching this name|No, defaults to *
+|ext|the extension of the artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)|No, defaults to type
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules to excludes|No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 1.3 and superior
+|conf|comma separated list of the master configurations in which this artifact should be included.
+ '*' wildcard can be used to designate all configurations of this module|No, defaults to '*', unless nested conf are specified
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/extends.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/extends.adoc b/asciidoc/ivyfile/extends.adoc
new file mode 100644
index 0000000..ad514e1
--- /dev/null
+++ b/asciidoc/ivyfile/extends.adoc
@@ -0,0 +1,40 @@
+
+*Tag:* extends *Parent:* link:../ivyfile/info.html[info]
+
+*__since 2.2__* Identifies an optional parent descriptor for this module. For complicated projects composed of many modules that have common configurations or dependencies, inheritance allows modules to share this information. Which parts of the parent descriptor are inherited can be controlled with the __extendType__ attribute. Supported __extendType__ values are:
+
+[options="header",cols="15%,50%"]
+|=======
+|Value|Description
+|info|Attributes of the link:../ivyfile/info.html[info] element are inherited from the parent. When an attribute appears in both child and parent, the child value is used.
+|description|The content of the link:../ivyfile/description.html[info/description] element is inherited from the parent.
+|configurations|link:../ivyfile/conf.html[Configurations] defined in the parent descriptor are added to any configurations defined in the child descriptor.
+|dependencies|link:../ivyfile/dependency.html[Dependencies] defined in the parent descriptor are added to any dependencies defined in the child descriptor.
+|licenses|link:../ivyfile/license.html[Licenses] defined in the parent descriptor are added to any licenses defined in the child descriptor.
+|all|info, description, configurations, licenses and dependencies from the parent descriptor are merged into the child descriptor.
+|=======
+
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the organisation of the parent module|Yes
+|module|the name of the parent module|Yes
+|revision|the revision of the parent module. Can be fixed, a dynamic value, or range of revisions; see link:../ivyfile/dependency.html[dependency] for information on specifying revisions.|Yes
+|extendType|which part(s) of the parent descriptor are inherited. Valid values are __info__, __description__,
+__configurations__, __dependencies__, and __all__.|No, default is __all__
+|location|
+
+A local filesystem path that should be searched for the parent descriptor. If the parent descriptor cannot be found at this location, it will be located using dependency resolvers like any normal dependency.
+
+
+
+This attribute is intended for development use. For example, child module descriptors appear in a source control directory with the parent module descriptor at a higher level. __location__ will then contain the relative path to the parent descriptor for use during development builds.
+
+|No, as long as the parent descriptor exists in an Ivy resolver
+|=======
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/include.adoc b/asciidoc/ivyfile/include.adoc
new file mode 100644
index 0000000..28471c5
--- /dev/null
+++ b/asciidoc/ivyfile/include.adoc
@@ -0,0 +1,57 @@
+
+*Tag:* include *Parent:* link:../ivyfile/configurations.html[configurations]
+
+Include configurations specified in another file. *__since 1.3__*
+
+The included file should have a configurations tag as root tag, which follow the same specification as the link:../ivyfile/configurations.html[configurations] tag of the ivy file.
+
+This means that it can contain conf declarations, other file inclusion, and also a defaultconfmapping.
+
+When delivering an ivy file with such an inclusion, the included configuration file is inlined, i.e. ivy remove the dependency on the external file.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|file|the file to include|Yes
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="myorg"
+ module="mymodule"
+ />
+ <configurations>
+ <include file="path/to/included-configurations.xml"/>
+ <conf name="conf3"/>
+ </configurations>
+ <dependencies>
+ <dependency name="mymodule1" rev="1.0"/>
+ <dependency name="mymodule2" rev="2.0" conf="conf2,conf3->*"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+with included-configurations.xml like this:
+
+[source]
+----
+
+<configurations defaultconfmapping="*->@">
+ <conf name="conf1" visibility="public"/>
+ <conf name="conf2" visibility="private"/>
+</configurations>
+
+----
+
+Defines 3 configurations, conf1, conf2 and conf3. mymodule1 is required in each configuration, with for each the same configuration (conf1 is needed in conf1, conf2 in conf2, and conf3 in conf3) due to the defaultconfmapping defined in the included file.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/info.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/info.adoc b/asciidoc/ivyfile/info.adoc
new file mode 100644
index 0000000..8744ccf
--- /dev/null
+++ b/asciidoc/ivyfile/info.adoc
@@ -0,0 +1,39 @@
+
+*Tag:* info *Parent:* link:../ivyfile.html[ivy-module]
+
+Gives identification and basic information about the module this ivy file describes.
+
+*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the name of the organisation that is the owner of this module.|Yes
+|module|the name of the module described by this ivy file.|Yes
+|branch|the branch of this module. *__since 1.4__*|No, defaults to the default branch setting, or nothing if no default branch is configured
+|revision|the revision of this module.|Yes in repository ivy files, no in ivy files to resolve
+|status|the status of this module. See link:../reference.html[terminology] section for details|No, default to 'integration'
+|publication|the date of publication of this module. It should be given in this format: yyyyMMddHHmmss|No, but it's a good practice to set it with delivered ivy files
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/extends.html[extends]|identifies a parent Ivy file from which this descriptor inherits content|0..n
+|link:../ivyfile/license.html[license]|contains information about the licenses of the described module|0..n
+|link:../ivyfile/ivyauthor.html[ivyauthor]|describes who has contributed to write the ivy file|0..n
+|link:../ivyfile/repository.html[repository]|describes on which public repositories this module can be found|0..n
+|link:../ivyfile/description.html[description]|describes how to use the module|0..1
+|=======
+
+After the description, you can also place your own tags in your own namespace. This allow to provide some custom information about the module.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/ivyauthor.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/ivyauthor.adoc b/asciidoc/ivyfile/ivyauthor.adoc
new file mode 100644
index 0000000..5314c98
--- /dev/null
+++ b/asciidoc/ivyfile/ivyauthor.adoc
@@ -0,0 +1,20 @@
+
+*Tag:* ivyauthor *Parent:* link:../ivyfile/info.html[info]
+
+
+
+Gives information about who has contributed to write this ivy file. It does NOT indicate who
+is the author of the module itself.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the author, as a person or a company.|Yes
+|url|an url pointing to where the author can bea reached.|No, but it's a good practice to indicate it
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/license.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/license.adoc b/asciidoc/ivyfile/license.adoc
new file mode 100644
index 0000000..86b883a
--- /dev/null
+++ b/asciidoc/ivyfile/license.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* license *Parent:* link:../ivyfile/info.html[info]
+
+
+
+Gives information about a license of the described module.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the license. Try to respect spelling when using a classical license.|Yes
+|url|an url pointing to the license text.|No, but it's a good practice to indicate it
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/manager.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/manager.adoc b/asciidoc/ivyfile/manager.adoc
new file mode 100644
index 0000000..0dab30e
--- /dev/null
+++ b/asciidoc/ivyfile/manager.adoc
@@ -0,0 +1,34 @@
+
+*Tag:* manager *Parent:* link:../ivyfile/conflicts.html[conflicts]
+
+
+
+*__(since 2.0)__* the conflicts section is deprecated. Use the link:../ivyfile/conflict.html[conflict] instead.
+
+Specify a a conflict manager for one or several dependencies.
+
+The way to specify a conflict manager is by giving indication to which dependencies
+the conflict manager applies (by giving organisation and module names or name regexp),
+and then specifying the conflict manager, either by giving its name or by
+specifying a fixed revision list, in which case a fixed conflicts manager is used.
+
+
+
+See link:../ivyfile/conflicts.html[Conflicts Manager] for details on conflicts manager in general.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the name, or an expression matching the name of organisation to which this conflict manager should apply (see matcher attribute below)|No, defaults to * (match all)
+|module|the name, or an expression matching the name of module to which this conflict manager should apply (see matcher attribute below)|No, defaults to * (match all)
+|name|the name of the conflict manager to use|Exactly one of two
+|rev|a comma separated list of revisions this conflict manager should select
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules for which the conflict manager should be used *__since 1.3__*|No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 1.3 and superior
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/mapped.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/mapped.adoc b/asciidoc/ivyfile/mapped.adoc
new file mode 100644
index 0000000..9dce4f9
--- /dev/null
+++ b/asciidoc/ivyfile/mapped.adoc
@@ -0,0 +1,20 @@
+
+*Tag:* mapped *Parent:* link:../ivyfile/dependency-conf.html[conf]
+
+
+
+Describes a mapped dependency configuration for a master configuration.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the dependency configuration mapped.
+ '*' wildcard can be used to designate all configurations of this module|Yes
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/override.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/override.adoc b/asciidoc/ivyfile/override.adoc
new file mode 100644
index 0000000..d2f3ae3
--- /dev/null
+++ b/asciidoc/ivyfile/override.adoc
@@ -0,0 +1,29 @@
+
+*Tag:* override *Parent:* link:../ivyfile/dependencies.html[dependencies]
+
+
+
+*__(since 2.0)__*
+
+Specify an override mediation rule, overriding the revision and/or branch requested for a transitive dependency.
+
+This can be useful when a direct dependency is bringing a transitive dependency for which you want to change the revision, without actually declaring a dependency on it (because the module doesn't actually depend on it) and without using conflict management for this purpose (maybe because there is no conflict at all, or because you want to by pass conflict management for this particular transitive dependency).
+
+Overriding is done before any else, in a phase called dependency descriptor mediation. The transitive dependency then behave exactly as if it were declared with the new value.
+
+Note that even though no attribute is required, it makes no sense to set no attributes at all. It would mean that overriding is triggered for all transitive dependencies, but doesn't override anything. Most of the time, at least org or module should be set to override only a subset of transitive dependencies, and at least branch or rev should be set to actually override something.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the name, or an expression matching the name of organisation to which overriding should be applied (see matcher attribute below)|No, defaults to * (match all)
+|module|the name, or an expression matching the name of module to which overriding should be applied (see matcher attribute below)|No, defaults to * (match all)
+|branch|the branch to set for all the overriden dependency descriptors|No, by default branch is not overriden
+|rev|the revision to set for all the overriden dependency descriptors|No, by default revision is not overriden
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules for which the conflict manager should be used|No, defaults to exact
+|=======
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/publications.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/publications.adoc b/asciidoc/ivyfile/publications.adoc
new file mode 100644
index 0000000..fdd510d
--- /dev/null
+++ b/asciidoc/ivyfile/publications.adoc
@@ -0,0 +1,34 @@
+
+*Tag:* publications *Parent:* link:../ivyfile.html[ivy-module]
+
+
+
+Container for artifact elements, used to describe the artifacts published by this module.
+
+If this container is not present, it is assumed that the module has one artifact, with the same name as the module, and published in all module configurations.
+
+
+Thus if you have a module which publishes no artifacts (a sort of virtual module, made only to integrate several other modules as a whole), you have to include a publications element with no artifact sub element.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|defaultconf|comma separated list of public configurations in which artifacts are published by default (when no specific configurations are set on the artifact element).
+ '*' wildcard can be used to designate all public configurations of this module. *__since 2.0__*|No, defaults to '*'
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/artifact.html[artifact]|declares a published artifact for this module|0..n
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/repository.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/repository.adoc b/asciidoc/ivyfile/repository.adoc
new file mode 100644
index 0000000..d4b788a
--- /dev/null
+++ b/asciidoc/ivyfile/repository.adoc
@@ -0,0 +1,23 @@
+
+*Tag:* repository *Parent:* link:../ivyfile/info.html[info]
+
+
+
+Gives information about a public repository where the module can be found. This information
+is given as an indication, repositories being able to be down over time.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the repository. Try to respect spelling for common repositories (ibiblio, ivyrep, ...)|Yes
+|url|an url pointing to the repository.|Yes
+|pattern|an ivy pattern to find modules on this repository|No, but it's recommended to indicate it.
+|ivys|true if ivy file can be found on this repository|No, defaults to false.
+|artifacts|true if module artifacts can be found on this repository|No, defaults to false.
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/js/jquery.pack.js
----------------------------------------------------------------------
diff --git a/asciidoc/js/jquery.pack.js b/asciidoc/js/jquery.pack.js
new file mode 100644
index 0000000..f954b6b
--- /dev/null
+++ b/asciidoc/js/jquery.pack.js
@@ -0,0 +1 @@
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('7(1C 1w.6=="T"){1w.T=1w.T;B 6=u(a,c){7(1w==q)v 1p 6(a,c);a=a||17;7(6.1t(a))v 1p 6(17)[6.E.27?"27":"2O"](a);7(1C a=="23"){B m=/^[^<]*(<(.|\\s)+>)[^>]*$/.2Q(a);7(m)a=6.3k([m[1]]);J v 1p 6(c).2o(a)}v q.6r(a.1l==2y&&a||(a.3Y||a.I&&a!=1w&&!a.24&&a[0]!=T&&a[0].24)&&6.3M(a)||[a])};7(1C $!="T")6.2S$=$;B $=6;6.E=6.8p={3Y:"1.1.2",8q:u(){v q.I},I:0,2b:u(1T){v 1T==T?6.3M(q):q[1T]},2r:u(a){B L=6(a);L.6p=q;v L},6r:u(a){q.I=0;[].1g.14(q,a);v q},K:u(E,1E){v 6.K(q,E,1E)},2h:u(1c){B 4c=-1;q.K(u(i){7(q==1c)4c=i});v 4c},1I:u(1Y,O,C){B 1c=1Y;7(1Y.1l==3t)7(O==T)v q.I&&6[C||"1I"](q[0],1Y)||T;J{1c={};1c[1Y]=O}v q.K(u(2h){P(B H 1x 1c)6.1I(C?q.1q:q,H,6.H(q,1c[H],C,2h,H))})},1m:u(1Y,O)
{v q.1I(1Y,O,"30")},2L:u(e){7(1C e=="23")v q.3u().3r(17.8t(e));B t="";6.K(e||q,u(){6.K(q.2I,u(){7(q.24!=8)t+=q.24!=1?q.60:6.E.2L([q])})});v t},2K:u(){B a=6.3k(1A);v q.K(u(){B b=a[0].3l(U);q.11.2X(b,q);22(b.1b)b=b.1b;b.4C(q)})},3r:u(){v q.3j(1A,U,1,u(a){q.4C(a)})},5i:u(){v q.3j(1A,U,-1,u(a){q.2X(a,q.1b)})},5j:u(){v q.3j(1A,12,1,u(a){q.11.2X(a,q)})},5t:u(){v q.3j(1A,12,-1,u(a){q.11.2X(a,q.2e)})},4g:u(){v q.6p||6([])},2o:u(t){v q.2r(6.31(q,u(a){v 6.2o(t,a)}),t)},4Y:u(4N){v q.2r(6.31(q,u(a){B a=a.3l(4N!=T?4N:U);a.$1H=16;v a}))},1D:u(t){v q.2r(6.1t(t)&&6.2q(q,u(2z,2h){v t.14(2z,[2h])})||6.3z(t,q))},2g:u(t){v q.2r(t.1l==3t&&6.3z(t,q,U)||6.2q(q,u(a){v(t.1l==2y||t.3Y)?6.3y(a,t)<0:a!=t}))},1M:u(t){v q.2r(6.2k(q.2b(),t.1l==3t?6(t).2b():t.I!=T&&(!t.1f||t.1f=="8v")?t:[t]))},4l:u(1s){v 1s?6.1D(1s,q).r.I>0:12},1a:u(1a){v 1a==T?(q.I?q[0].O:16):q.1I("O",1a)},4U:u(1a){v 1a==T?(q.I?q[0].2t:16):q.3u().3r(1a)},3j:u(1E,1P,3Z,E){B 4Y=q.I>1;B a=6.3k(1E);7(3Z<0)a.8w();v q.K(u(){B 1c=q;7(1P&&6.1f(q,"1P")&&6
.1f(a[0],"3m"))1c=q.5J("20")[0]||q.4C(17.6n("20"));6.K(a,u(){E.14(1c,[4Y?q.3l(U):q])})})}};6.1z=6.E.1z=u(){B 1O=1A[0],a=1;7(1A.I==1){1O=q;a=0}B H;22(H=1A[a++])P(B i 1x H)1O[i]=H[i];v 1O};6.1z({8x:u(){7(6.2S$)$=6.2S$;v 6},1t:u(E){v!!E&&1C E!="23"&&!E.1f&&1C E[0]=="T"&&/u/i.1n(E+"")},4B:u(D){v D.66&&D.5I&&!D.5I.64},1f:u(D,Y){v D.1f&&D.1f.3K()==Y.3K()},K:u(1c,E,1E){7(1c.I==T)P(B i 1x 1c)E.14(1c[i],1E||[i,1c[i]]);J P(B i=0,6q=1c.I;i<6q;i++)7(E.14(1c[i],1E||[i,1c[i]])===12)3O;v 1c},H:u(D,O,C,2h,H){7(6.1t(O))O=O.3n(D,[2h]);B 6s=/z-?2h|7P-?8A|1d|58|8B-?28/i;v O&&O.1l==3Q&&C=="30"&&!6s.1n(H)?O+"4S":O},19:{1M:u(D,c){6.K(c.3o(/\\s+/),u(i,Q){7(!6.19.2V(D.19,Q))D.19+=(D.19?" ":"")+Q})},2f:u(D,c){D.19=c?6.2q(D.19.3o(/\\s+/),u(Q){v!6.19.2V(c,Q)}).6t(" "):""},2V:u(t,c){t=t.19||t;c=c.1R(/([\\.\\\\\\+\\*\\?\\[\\^\\]\\$\\(\\)\\{\\}\\=\\!\\<\\>\\|\\:])/g,"\\\\$1");v t&&1p 4v("(^|\\\\s)"+c+"(\\\\s|$)").1n(t)}},4d:u(e,o,f){P(B i 1x o){e.1q["1N"+i]=e.1q[i];e.1q[i]=o[i]}f.14(e,[]);P(B i 1x o)e.1q[i]=e.1q[
"1N"+i]},1m:u(e,p){7(p=="28"||p=="3V"){B 1N={},46,3P,d=["7d","8C","8D","8E"];6.K(d,u(){1N["8F"+q]=0;1N["8G"+q+"8H"]=0});6.4d(e,1N,u(){7(6.1m(e,"1h")!="1Z"){46=e.8I;3P=e.8J}J{e=6(e.3l(U)).2o(":4j").5l("2Z").4g().1m({4n:"1G",45:"8K",1h:"2D",7I:"0",8M:"0"}).5z(e.11)[0];B 3d=6.1m(e.11,"45");7(3d==""||3d=="4b")e.11.1q.45="6x";46=e.6y;3P=e.6z;7(3d==""||3d=="4b")e.11.1q.45="4b";e.11.33(e)}});v p=="28"?46:3P}v 6.30(e,p)},30:u(D,H,53){B L;7(H=="1d"&&6.W.1j)v 6.1I(D.1q,"1d");7(H=="4h"||H=="2v")H=6.W.1j?"3T":"2v";7(!53&&D.1q[H])L=D.1q[H];J 7(17.44&&17.44.4W){7(H=="2v"||H=="3T")H="4h";H=H.1R(/([A-Z])/g,"-$1").4m();B Q=17.44.4W(D,16);7(Q)L=Q.55(H);J 7(H=="1h")L="1Z";J 6.4d(D,{1h:"2D"},u(){B c=17.44.4W(q,"");L=c&&c.55(H)||""})}J 7(D.51){B 56=H.1R(/\\-(\\w)/g,u(m,c){v c.3K()});L=D.51[H]||D.51[56]}v L},3k:u(a){B r=[];6.K(a,u(i,1r){7(!1r)v;7(1r.1l==3Q)1r=1r.6C();7(1C 1r=="23"){B s=6.35(1r),1V=17.6n("1V"),2i=[];B 2K=!s.18("<1u")&&[1,"<42>","</42>"]||(!s.18("<6D")||!s.18("<20")||!s.18("<6E"))&&[1,"<1P
>","</1P>"]||!s.18("<3m")&&[2,"<1P><20>","</20></1P>"]||(!s.18("<6F")||!s.18("<6G"))&&[3,"<1P><20><3m>","</3m></20></1P>"]||[0,"",""];1V.2t=2K[1]+s+2K[2];22(2K[0]--)1V=1V.1b;7(6.W.1j){7(!s.18("<1P")&&s.18("<20")<0)2i=1V.1b&&1V.1b.2I;J 7(2K[1]=="<1P>"&&s.18("<20")<0)2i=1V.2I;P(B n=2i.I-1;n>=0;--n)7(6.1f(2i[n],"20")&&!2i[n].2I.I)2i[n].11.33(2i[n])}1r=[];P(B i=0,l=1V.2I.I;i<l;i++)1r.1g(1V.2I[i])}7(1r.I===0&&!6.1f(1r,"3w"))v;7(1r[0]==T||6.1f(1r,"3w"))r.1g(1r);J r=6.2k(r,1r)});v r},1I:u(D,Y,O){B 2j=6.4B(D)?{}:{"P":"6J","6L":"19","4h":6.W.1j?"3T":"2v",2v:6.W.1j?"3T":"2v",2t:"2t",19:"19",O:"O",2W:"2W",2Z:"2Z",89:"6N",2Y:"2Y"};7(Y=="1d"&&6.W.1j&&O!=T){D.58=1;v D.1D=D.1D.1R(/4i\\([^\\)]*\\)/6O,"")+(O==1?"":"4i(1d="+O*6g+")")}J 7(Y=="1d"&&6.W.1j)v D.1D?4T(D.1D.6P(/4i\\(1d=(.*)\\)/)[1])/6g:1;7(Y=="1d"&&6.W.3h&&O==1)O=0.6R;7(2j[Y]){7(O!=T)D[2j[Y]]=O;v D[2j[Y]]}J 7(O==T&&6.W.1j&&6.1f(D,"3w")&&(Y=="81"||Y=="80"))v D.6T(Y).60;J 7(D.66){7(O!=T)D.6V(Y,O);7(6.W.1j&&/5E|3e/.1n(Y)&&!6.4B(D))v D.36(Y,2)
;v D.36(Y)}J{Y=Y.1R(/-([a-z])/6W,u(z,b){v b.3K()});7(O!=T)D[Y]=O;v D[Y]}},35:u(t){v t.1R(/^\\s+|\\s+$/g,"")},3M:u(a){B r=[];7(a.1l!=2y)P(B i=0,2R=a.I;i<2R;i++)r.1g(a[i]);J r=a.3N(0);v r},3y:u(b,a){P(B i=0,2R=a.I;i<2R;i++)7(a[i]==b)v i;v-1},2k:u(2u,3H){B r=[].3N.3n(2u,0);P(B i=0,5b=3H.I;i<5b;i++)7(6.3y(3H[i],r)==-1)2u.1g(3H[i]);v 2u},2q:u(1U,E,4k){7(1C E=="23")E=1p 4w("a","i","v "+E);B 1i=[];P(B i=0,2z=1U.I;i<2z;i++)7(!4k&&E(1U[i],i)||4k&&!E(1U[i],i))1i.1g(1U[i]);v 1i},31:u(1U,E){7(1C E=="23")E=1p 4w("a","v "+E);B 1i=[],r=[];P(B i=0,2z=1U.I;i<2z;i++){B 1a=E(1U[i],i);7(1a!==16&&1a!=T){7(1a.1l!=2y)1a=[1a];1i=1i.6Z(1a)}}B r=1i.I?[1i[0]]:[];5f:P(B i=1,5e=1i.I;i<5e;i++){P(B j=0;j<i;j++)7(1i[i]==r[j])5F 5f;r.1g(1i[i])}v r}});1p u(){B b=7L.71.4m();6.W={2N:/5D/.1n(b),3f:/3f/.1n(b),1j:/1j/.1n(b)&&!/3f/.1n(b),3h:/3h/.1n(b)&&!/(72|5D)/.1n(b)};6.7H=!6.W.1j||17.74=="75"};6.K({5u:"a.11",4z:"6.4z(a)",76:"6.2a(a,2,\'2e\')",7D:"6.2a(a,2,\'5s\')",78:"6.2B(a.11.1b,a)",79:"6.2B(a.1b)"},u(i,n){6.E[i]=u(a
){B L=6.31(q,n);7(a&&1C a=="23")L=6.3z(a,L);v q.2r(L)}});6.K({5z:"3r",7b:"5i",2X:"5j",7e:"5t"},u(i,n){6.E[i]=u(){B a=1A;v q.K(u(){P(B j=0,2R=a.I;j<2R;j++)6(a[j])[n](q)})}});6.K({5l:u(1Y){6.1I(q,1Y,"");q.7g(1Y)},7h:u(c){6.19.1M(q,c)},7i:u(c){6.19.2f(q,c)},7k:u(c){6.19[6.19.2V(q,c)?"2f":"1M"](q,c)},2f:u(a){7(!a||6.1D(a,[q]).r.I)q.11.33(q)},3u:u(){22(q.1b)q.33(q.1b)}},u(i,n){6.E[i]=u(){v q.K(n,1A)}});6.K(["5q","5n","5p","5v"],u(i,n){6.E[n]=u(1T,E){v q.1D(":"+n+"("+1T+")",E)}});6.K(["28","3V"],u(i,n){6.E[n]=u(h){v h==T?(q.I?6.1m(q[0],n):16):q.1m(n,h.1l==3t?h:h+"4S")}});6.1z({1s:{"":"m[2]==\'*\'||6.1f(a,m[2])","#":"a.36(\'2J\')==m[2]",":":{5n:"i<m[3]-0",5p:"i>m[3]-0",2a:"m[3]-0==i",5q:"m[3]-0==i",2u:"i==0",2T:"i==r.I-1",5R:"i%2==0",5S:"i%2","2a-3s":"6.2a(a.11.1b,m[3],\'2e\',a)==a","2u-3s":"6.2a(a.11.1b,1,\'2e\')==a","2T-3s":"6.2a(a.11.7n,1,\'5s\')==a","7p-3s":"6.2B(a.11.1b).I==1",5u:"a.1b",3u:"!a.1b",5v:"6.E.2L.14([a]).18(m[3])>=0",3i:\'a.C!="1G"&&6.1m(a,"1h")!="1Z"&&6.1m(a,"4n")!="1G"\'
,1G:\'a.C=="1G"||6.1m(a,"1h")=="1Z"||6.1m(a,"4n")=="1G"\',7v:"!a.2W",2W:"a.2W",2Z:"a.2Z",2Y:"a.2Y||6.1I(a,\'2Y\')",2L:"a.C==\'2L\'",4j:"a.C==\'4j\'",5x:"a.C==\'5x\'",4G:"a.C==\'4G\'",5y:"a.C==\'5y\'",4R:"a.C==\'4R\'",5A:"a.C==\'5A\'",5B:"a.C==\'5B\'",3x:\'a.C=="3x"||6.1f(a,"3x")\',5C:"/5C|42|7A|3x/i.1n(a.1f)"},".":"6.19.2V(a,m[2])","@":{"=":"z==m[4]","!=":"z!=m[4]","^=":"z&&!z.18(m[4])","$=":"z&&z.2U(z.I - m[4].I,m[4].I)==m[4]","*=":"z&&z.18(m[4])>=0","":"z",4u:u(m){v["",m[1],m[3],m[2],m[5]]},5P:"z=a[m[3]];7(!z||/5E|3e/.1n(m[3]))z=6.1I(a,m[3]);"},"[":"6.2o(m[2],a).I"},5M:[/^\\[ *(@)([a-2m-3C-]*) *([!*$^=]*) *(\'?"?)(.*?)\\4 *\\]/i,/^(\\[)\\s*(.*?(\\[.*?\\])?[^[]*?)\\s*\\]/,/^(:)([a-2m-3C-]*)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/i,/^([:.#]*)([a-2m-3C*-]*)/i],1Q:[/^(\\/?\\.\\.)/,"a.11",/^(>|\\/)/,"6.2B(a.1b)",/^(\\+)/,"6.2a(a,2,\'2e\')",/^(~)/,u(a){B s=6.2B(a.11.1b);v s.3N(6.3y(a,s)+1)}],3z:u(1s,1U,2g){B 1N,Q=[];22(1s&&1s!=1N){1N=1s;B f=6.1D(1s,1U,2g);1s=f.t.1R(/^\\s*,\\s*/,"");Q=2g
?1U=f.r:6.2k(Q,f.r)}v Q},2o:u(t,1B){7(1C t!="23")v[t];7(1B&&!1B.24)1B=16;1B=1B||17;7(!t.18("//")){1B=1B.4H;t=t.2U(2,t.I)}J 7(!t.18("/")){1B=1B.4H;t=t.2U(1,t.I);7(t.18("/")>=1)t=t.2U(t.18("/"),t.I)}B L=[1B],2c=[],2T=16;22(t&&2T!=t){B r=[];2T=t;t=6.35(t).1R(/^\\/\\//i,"");B 3B=12;B 1J=/^[\\/>]\\s*([a-2m-9*-]+)/i;B m=1J.2Q(t);7(m){6.K(L,u(){P(B c=q.1b;c;c=c.2e)7(c.24==1&&(6.1f(c,m[1])||m[1]=="*"))r.1g(c)});L=r;t=t.1R(1J,"");7(t.18(" ")==0)5F;3B=U}J{P(B i=0;i<6.1Q.I;i+=2){B 1J=6.1Q[i];B m=1J.2Q(t);7(m){r=L=6.31(L,6.1t(6.1Q[i+1])?6.1Q[i+1]:u(a){v 40(6.1Q[i+1])});t=6.35(t.1R(1J,""));3B=U;3O}}}7(t&&!3B){7(!t.18(",")){7(L[0]==1B)L.4L();6.2k(2c,L);r=L=[1B];t=" "+t.2U(1,t.I)}J{B 34=/^([a-2m-3C-]+)(#)([a-2m-9\\\\*2S-]*)/i;B m=34.2Q(t);7(m){m=[0,m[2],m[3],m[1]]}J{34=/^([#.]?)([a-2m-9\\\\*2S-]*)/i;m=34.2Q(t)}7(m[1]=="#"&&L[L.I-1].4X){B 2l=L[L.I-1].4X(m[2]);7(6.W.1j&&2l&&2l.2J!=m[2])2l=6(\'[@2J="\'+m[2]+\'"]\',L[L.I-1])[0];L=r=2l&&(!m[3]||6.1f(2l,m[3]))?[2l]:[]}J{7(m[1]==".")B 4r=1p 4v("(^|\\\\s)
"+m[2]+"(\\\\s|$)");6.K(L,u(){B 3E=m[1]!=""||m[0]==""?"*":m[2];7(6.1f(q,"7J")&&3E=="*")3E="3g";6.2k(r,m[1]!=""&&L.I!=1?6.4x(q,[],m[1],m[2],4r):q.5J(3E))});7(m[1]=="."&&L.I==1)r=6.2q(r,u(e){v 4r.1n(e.19)});7(m[1]=="#"&&L.I==1){B 5K=r;r=[];6.K(5K,u(){7(q.36("2J")==m[2]){r=[q];v 12}})}L=r}t=t.1R(34,"")}}7(t){B 1a=6.1D(t,r);L=r=1a.r;t=6.35(1a.t)}}7(L&&L[0]==1B)L.4L();6.2k(2c,L);v 2c},1D:u(t,r,2g){22(t&&/^[a-z[({<*:.#]/i.1n(t)){B p=6.5M,m;6.K(p,u(i,1J){m=1J.2Q(t);7(m){t=t.7M(m[0].I);7(6.1s[m[1]].4u)m=6.1s[m[1]].4u(m);v 12}});7(m[1]==":"&&m[2]=="2g")r=6.1D(m[3],r,U).r;J 7(m[1]=="."){B 1J=1p 4v("(^|\\\\s)"+m[2]+"(\\\\s|$)");r=6.2q(r,u(e){v 1J.1n(e.19||"")},2g)}J{B f=6.1s[m[1]];7(1C f!="23")f=6.1s[m[1]][m[2]];40("f = u(a,i){"+(6.1s[m[1]].5P||"")+"v "+f+"}");r=6.2q(r,f,2g)}}v{r:r,t:t}},4x:u(o,r,1Q,Y,1J){P(B s=o.1b;s;s=s.2e)7(s.24==1){B 1M=U;7(1Q==".")1M=s.19&&1J.1n(s.19);J 7(1Q=="#")1M=s.36("2J")==Y;7(1M)r.1g(s);7(1Q=="#"&&r.I)3O;7(s.1b)6.4x(s,r,1Q,Y,1J)}v r},4z:u(D){B 4A=[];B Q=D.11;22(Q&&Q
!=17){4A.1g(Q);Q=Q.11}v 4A},2a:u(Q,1i,3Z,D){1i=1i||1;B 1T=0;P(;Q;Q=Q[3Z]){7(Q.24==1)1T++;7(1T==1i||1i=="5R"&&1T%2==0&&1T>1&&Q==D||1i=="5S"&&1T%2==1&&Q==D)v Q}},2B:u(n,D){B r=[];P(;n;n=n.2e){7(n.24==1&&(!D||n!=D))r.1g(n)}v r}});6.G={1M:u(S,C,1o,F){7(6.W.1j&&S.3L!=T)S=1w;7(F)1o.F=F;7(!1o.2A)1o.2A=q.2A++;7(!S.$1H)S.$1H={};B 38=S.$1H[C];7(!38){38=S.$1H[C]={};7(S["39"+C])38[0]=S["39"+C]}38[1o.2A]=1o;S["39"+C]=q.5Y;7(!q.1k[C])q.1k[C]=[];q.1k[C].1g(S)},2A:1,1k:{},2f:u(S,C,1o){7(S.$1H){B i,j,k;7(C&&C.C){1o=C.1o;C=C.C}7(C&&S.$1H[C])7(1o)5U S.$1H[C][1o.2A];J P(i 1x S.$1H[C])5U S.$1H[C][i];J P(j 1x S.$1H)q.2f(S,j);P(k 1x S.$1H[C])7(k){k=U;3O}7(!k)S["39"+C]=16}},1S:u(C,F,S){F=6.3M(F||[]);7(!S)6.K(q.1k[C]||[],u(){6.G.1S(C,F,q)});J{B 1o=S["39"+C],1a,E=6.1t(S[C]);7(1o){F.61(q.2j({C:C,1O:S}));7((1a=1o.14(S,F))!==12)q.4F=U}7(E&&1a!==12)S[C]();q.4F=12}},5Y:u(G){7(1C 6=="T"||6.G.4F)v;G=6.G.2j(G||1w.G||{});B 3R;B c=q.$1H[G.C];B 1E=[].3N.3n(1A,1);1E.61(G);P(B j 1x c){1E[0].1o=c[j];1E[0].F=c[j].F;7(c[j].
14(q,1E)===12){G.2n();G.2H();3R=12}}7(6.W.1j)G.1O=G.2n=G.2H=G.1o=G.F=16;v 3R},2j:u(G){7(!G.1O&&G.63)G.1O=G.63;7(G.65==T&&G.67!=T){B e=17.4H,b=17.64;G.65=G.67+(e.68||b.68);G.7Y=G.7Z+(e.6c||b.6c)}7(6.W.2N&&G.1O.24==3){B 3a=G;G=6.1z({},3a);G.1O=3a.1O.11;G.2n=u(){v 3a.2n()};G.2H=u(){v 3a.2H()}}7(!G.2n)G.2n=u(){q.3R=12};7(!G.2H)G.2H=u(){q.82=U};v G}};6.E.1z({3U:u(C,F,E){v q.K(u(){6.G.1M(q,C,E||F,F)})},6u:u(C,F,E){v q.K(u(){6.G.1M(q,C,u(G){6(q).6f(G);v(E||F).14(q,1A)},F)})},6f:u(C,E){v q.K(u(){6.G.2f(q,C,E)})},1S:u(C,F){v q.K(u(){6.G.1S(C,F,q)})},3X:u(){B a=1A;v q.6j(u(e){q.4M=q.4M==0?1:0;e.2n();v a[q.4M].14(q,[e])||12})},83:u(f,g){u 4O(e){B p=(e.C=="41"?e.84:e.85)||e.86;22(p&&p!=q)2G{p=p.11}2w(e){p=q};7(p==q)v 12;v(e.C=="41"?f:g).14(q,[e])}v q.41(4O).6k(4O)},27:u(f){7(6.3W)f.14(17,[6]);J{6.3c.1g(u(){v f.14(q,[6])})}v q}});6.1z({3W:12,3c:[],27:u(){7(!6.3W){6.3W=U;7(6.3c){6.K(6.3c,u(){q.14(17)});6.3c=16}7(6.W.3h||6.W.3f)17.87("6o",6.27,12)}}});1p u(){6.K(("88,8a,2O,8b,8d,52,6j,8e,"+"8f,8g,
8h,41,6k,8j,42,"+"4R,8k,8l,8m,2C").3o(","),u(i,o){6.E[o]=u(f){v f?q.3U(o,f):q.1S(o)}});7(6.W.3h||6.W.3f)17.8n("6o",6.27,12);J 7(6.W.1j){17.8o("<8r"+"8s 2J=62 8u=U "+"3e=//:><\\/2d>");B 2d=17.4X("62");7(2d)2d.37=u(){7(q.3D!="1X")v;q.11.33(q);6.27()};2d=16}J 7(6.W.2N)6.50=3L(u(){7(17.3D=="8y"||17.3D=="1X"){4p(6.50);6.50=16;6.27()}},10);6.G.1M(1w,"2O",6.27)};7(6.W.1j)6(1w).6u("52",u(){B 1k=6.G.1k;P(B C 1x 1k){B 4Z=1k[C],i=4Z.I;7(i&&C!=\'52\')6w 6.G.2f(4Z[i-1],C);22(--i)}});6.E.1z({6A:u(V,21,M){q.2O(V,21,M,1)},2O:u(V,21,M,1W){7(6.1t(V))v q.3U("2O",V);M=M||u(){};B C="5d";7(21)7(6.1t(21)){M=21;21=16}J{21=6.3g(21);C="5V"}B 4e=q;6.3v({V:V,C:C,F:21,1W:1W,1X:u(2P,15){7(15=="2M"||!1W&&15=="5L")4e.1I("2t",2P.3G).4V().K(M,[2P.3G,15,2P]);J M.14(4e,[2P.3G,15,2P])}});v q},6B:u(){v 6.3g(q)},4V:u(){v q.2o("2d").K(u(){7(q.3e)6.59(q.3e);J 6.4a(q.2L||q.6H||q.2t||"")}).4g()}});7(!1w.3p)3p=u(){v 1p 6I("6K.6M")};6.K("5m,5Q,5O,5W,5N,5H".3o(","),u(i,o){6.E[o]=u(f){v q.3U(o,f)}});6.1z({2b:u(V,F,M,C,1W){7(6.1t
(F)){M=F;F=16}v 6.3v({V:V,F:F,2M:M,4t:C,1W:1W})},6Q:u(V,F,M,C){v 6.2b(V,F,M,C,1)},59:u(V,M){v 6.2b(V,16,M,"2d")},6S:u(V,F,M){v 6.2b(V,F,M,"6m")},6U:u(V,F,M,C){7(6.1t(F)){M=F;F={}}v 6.3v({C:"5V",V:V,F:F,2M:M,4t:C})},6X:u(29){6.3q.29=29},6Y:u(5c){6.1z(6.3q,5c)},3q:{1k:U,C:"5d",29:0,5r:"70/x-73-3w-77",5h:U,48:U,F:16},3S:{},3v:u(s){s=6.1z({},6.3q,s);7(s.F){7(s.5h&&1C s.F!="23")s.F=6.3g(s.F);7(s.C.4m()=="2b"){s.V+=((s.V.18("?")>-1)?"&":"?")+s.F;s.F=16}}7(s.1k&&!6.4E++)6.G.1S("5m");B 4y=12;B N=1p 3p();N.7j(s.C,s.V,s.48);7(s.F)N.3A("7l-7m",s.5r);7(s.1W)N.3A("7o-4K-7q",6.3S[s.V]||"7s, 7t 7w 7x 4o:4o:4o 7z");N.3A("X-7B-7C","3p");7(N.7E)N.3A("7F","7G");7(s.5G)s.5G(N);7(s.1k)6.G.1S("5H",[N,s]);B 37=u(4s){7(N&&(N.3D==4||4s=="29")){4y=U;7(3I){4p(3I);3I=16}B 15;2G{15=6.5Z(N)&&4s!="29"?s.1W&&6.69(N,s.V)?"5L":"2M":"2C";7(15!="2C"){B 3F;2G{3F=N.4P("6b-4K")}2w(e){}7(s.1W&&3F)6.3S[s.V]=3F;B F=6.6i(N,s.4t);7(s.2M)s.2M(F,15);7(s.1k)6.G.1S("5N",[N,s])}J 6.3J(s,N,15)}2w(e){15="2C";6.3J(s,N,15,e)}7(s.1k)6.
G.1S("5O",[N,s]);7(s.1k&&!--6.4E)6.G.1S("5Q");7(s.1X)s.1X(N,15);7(s.48)N=16}};B 3I=3L(37,13);7(s.29>0)57(u(){7(N){N.7N();7(!4y)37("29")}},s.29);2G{N.7Q(s.F)}2w(e){6.3J(s,N,16,e)}7(!s.48)37();v N},3J:u(s,N,15,e){7(s.2C)s.2C(N,15,e);7(s.1k)6.G.1S("5W",[N,s,e])},4E:0,5Z:u(r){2G{v!r.15&&7V.7W=="4G:"||(r.15>=5X&&r.15<7X)||r.15==6d||6.W.2N&&r.15==T}2w(e){}v 12},69:u(N,V){2G{B 6e=N.4P("6b-4K");v N.15==6d||6e==6.3S[V]||6.W.2N&&N.15==T}2w(e){}v 12},6i:u(r,C){B 4Q=r.4P("8c-C");B F=!C&&4Q&&4Q.18("N")>=0;F=C=="N"||F?r.8i:r.3G;7(C=="2d")6.4a(F);7(C=="6m")40("F = "+F);7(C=="4U")6("<1V>").4U(F).4V();v F},3g:u(a){B s=[];7(a.1l==2y||a.3Y)6.K(a,u(){s.1g(2x(q.Y)+"="+2x(q.O))});J P(B j 1x a)7(a[j]&&a[j].1l==2y)6.K(a[j],u(){s.1g(2x(j)+"="+2x(q))});J s.1g(2x(j)+"="+2x(a[j]));v s.6t("&")},4a:u(F){7(1w.54)1w.54(F);J 7(6.W.2N)1w.57(F,0);J 40.3n(1w,F)}});6.E.1z({1L:u(R,M){B 1G=q.1D(":1G");R?1G.26({28:"1L",3V:"1L",1d:"1L"},R,M):1G.K(u(){q.1q.1h=q.2E?q.2E:"";7(6.1m(q,"1h")=="1Z")q.1q.1h="2D"});v q},1K:u(R,M){B
3i=q.1D(":3i");R?3i.26({28:"1K",3V:"1K",1d:"1K"},R,M):3i.K(u(){q.2E=q.2E||6.1m(q,"1h");7(q.2E=="1Z")q.2E="2D";q.1q.1h="1Z"});v q},5g:6.E.3X,3X:u(E,4I){B 1E=1A;v 6.1t(E)&&6.1t(4I)?q.5g(E,4I):q.K(u(){6(q)[6(q).4l(":1G")?"1L":"1K"].14(6(q),1E)})},7a:u(R,M){v q.26({28:"1L"},R,M)},7c:u(R,M){v q.26({28:"1K"},R,M)},7f:u(R,M){v q.K(u(){B 5k=6(q).4l(":1G")?"1L":"1K";6(q).26({28:5k},R,M)})},7r:u(R,M){v q.26({1d:"1L"},R,M)},7u:u(R,M){v q.26({1d:"1K"},R,M)},7y:u(R,43,M){v q.26({1d:43},R,M)},26:u(H,R,1v,M){v q.1F(u(){q.2F=6.1z({},H);B 1u=6.R(R,1v,M);P(B p 1x H){B e=1p 6.3b(q,1u,p);7(H[p].1l==3Q)e.2s(e.Q(),H[p]);J e[H[p]](H)}})},1F:u(C,E){7(!E){E=C;C="3b"}v q.K(u(){7(!q.1F)q.1F={};7(!q.1F[C])q.1F[C]=[];q.1F[C].1g(E);7(q.1F[C].I==1)E.14(q)})}});6.1z({R:u(R,1v,E){B 1u=R&&R.1l==7K?R:{1X:E||!E&&1v||6.1t(R)&&R,25:R,1v:E&&1v||1v&&1v.1l!=4w&&1v};1u.25=(1u.25&&1u.25.1l==3Q?1u.25:{7R:7S,7T:5X}[1u.25])||7U;1u.1N=1u.1X;1u.1X=u(){6.6a(q,"3b");7(6.1t(1u.1N))1u.1N.14(q)};v 1u},1v:{},1F:{},6a:u(D,C){C=C||"3b";
7(D.1F&&D.1F[C]){D.1F[C].4L();B f=D.1F[C][0];7(f)f.14(D)}},3b:u(D,1e,H){B z=q;B y=D.1q;B 4D=6.1m(D,"1h");y.5T="1G";z.a=u(){7(1e.49)1e.49.14(D,[z.2p]);7(H=="1d")6.1I(y,"1d",z.2p);J 7(6l(z.2p))y[H]=6l(z.2p)+"4S";y.1h="2D"};z.6v=u(){v 4T(6.1m(D,H))};z.Q=u(){B r=4T(6.30(D,H));v r&&r>-8z?r:z.6v()};z.2s=u(4f,43){z.4J=(1p 5o()).5w();z.2p=4f;z.a();z.4q=3L(u(){z.49(4f,43)},13)};z.1L=u(){7(!D.1y)D.1y={};D.1y[H]=q.Q();1e.1L=U;z.2s(0,D.1y[H]);7(H!="1d")y[H]="5a"};z.1K=u(){7(!D.1y)D.1y={};D.1y[H]=q.Q();1e.1K=U;z.2s(D.1y[H],0)};z.3X=u(){7(!D.1y)D.1y={};D.1y[H]=q.Q();7(4D=="1Z"){1e.1L=U;7(H!="1d")y[H]="5a";z.2s(0,D.1y[H])}J{1e.1K=U;z.2s(D.1y[H],0)}};z.49=u(32,47){B t=(1p 5o()).5w();7(t>1e.25+z.4J){4p(z.4q);z.4q=16;z.2p=47;z.a();7(D.2F)D.2F[H]=U;B 2c=U;P(B i 1x D.2F)7(D.2F[i]!==U)2c=12;7(2c){y.5T="";y.1h=4D;7(6.1m(D,"1h")=="1Z")y.1h="2D";7(1e.1K)y.1h="1Z";7(1e.1K||1e.1L)P(B p 1x D.2F)7(p=="1d")6.1I(y,p,D.1y[p]);J y[p]=""}7(2c&&6.1t(1e.1X))1e.1X.14(D)}J{B n=t-q.4J;B p=n/1e.25;z.2p=1e.1v&&6.1v[1e.1v]
?6.1v[1e.1v](p,n,32,(47-32),1e.25):((-6h.7O(p*6h.8L)/2)+0.5)*(47-32)+32;z.a()}}}})}',62,545,'||||||jQuery|if|||||||||||||||||||this||||function|return||||||var|type|elem|fn|data|event|prop|length|else|each|ret|callback|xml|value|for|cur|speed|element|undefined|true|url|browser||name|||parentNode|false||apply|status|null|document|indexOf|className|val|firstChild|obj|opacity|options|nodeName|push|display|result|msie|global|constructor|css|test|handler|new|style|arg|expr|isFunction|opt|easing|window|in|orig|extend|arguments|context|typeof|filter|args|queue|hidden|events|attr|re|hide|show|add|old|target|table|token|replace|trigger|num|elems|div|ifModified|complete|key|none|tbody|params|while|string|nodeType|duration|animate|ready|height|timeout|nth|get|done|script|nextSibling|remove|not|index|tb|fix|merge|oid|z0|preventDefault|find|now|grep|pushStack|custom|innerHTML|first|cssFloat|catch|encodeURIComponent|Array|el|guid|sibling|error|block|oldblock|curAnim|try|stopPropagation|childNodes
|id|wrap|text|success|safari|load|res|exec|al|_|last|substr|has|disabled|insertBefore|selected|checked|curCSS|map|firstNum|removeChild|re2|trim|getAttribute|onreadystatechange|handlers|on|originalEvent|fx|readyList|parPos|src|opera|param|mozilla|visible|domManip|clean|cloneNode|tr|call|split|XMLHttpRequest|ajaxSettings|append|child|String|empty|ajax|form|button|inArray|multiFilter|setRequestHeader|foundToken|9_|readyState|tag|modRes|responseText|second|ival|handleError|toUpperCase|setInterval|makeArray|slice|break|oWidth|Number|returnValue|lastModified|styleFloat|bind|width|isReady|toggle|jquery|dir|eval|mouseover|select|to|defaultView|position|oHeight|lastNum|async|step|globalEval|static|pos|swap|self|from|end|float|alpha|radio|inv|is|toLowerCase|visibility|00|clearInterval|timer|rec|isTimeout|dataType|_resort|RegExp|Function|getAll|requestDone|parents|matched|isXMLDoc|appendChild|oldDisplay|active|triggered|file|documentElement|fn2|startTime|Modified|shift|lastToggle|deep|handleHo
ver|getResponseHeader|ct|submit|px|parseFloat|html|evalScripts|getComputedStyle|getElementById|clone|els|safariTimer|currentStyle|unload|force|execScript|getPropertyValue|newProp|setTimeout|zoom|getScript|1px|sl|settings|GET|rl|check|_toggle|processData|prepend|before|state|removeAttr|ajaxStart|lt|Date|gt|eq|contentType|previousSibling|after|parent|contains|getTime|checkbox|password|appendTo|image|reset|input|webkit|href|continue|beforeSend|ajaxSend|ownerDocument|getElementsByTagName|tmp|notmodified|parse|ajaxSuccess|ajaxComplete|_prefix|ajaxStop|even|odd|overflow|delete|POST|ajaxError|200|handle|httpSuccess|nodeValue|unshift|__ie_init|srcElement|body|pageX|tagName|clientX|scrollLeft|httpNotModified|dequeue|Last|scrollTop|304|xmlRes|unbind|100|Math|httpData|click|mouseout|parseInt|json|createElement|DOMContentLoaded|prevObject|ol|setArray|exclude|join|one|max|do|relative|clientHeight|clientWidth|loadIfModified|serialize|toString|thead|tfoot|td|th|textContent|ActiveXObject|htmlFor|Mi
crosoft|class|XMLHTTP|readOnly|gi|match|getIfModified|9999|getJSON|getAttributeNode|post|setAttribute|ig|ajaxTimeout|ajaxSetup|concat|application|userAgent|compatible|www|compatMode|CSS1Compat|next|urlencoded|siblings|children|slideDown|prependTo|slideUp|Top|insertAfter|slideToggle|removeAttribute|addClass|removeClass|open|toggleClass|Content|Type|lastChild|If|only|Since|fadeIn|Thu|01|fadeOut|enabled|Jan|1970|fadeTo|GMT|textarea|Requested|With|prev|overrideMimeType|Connection|close|boxModel|right|object|Object|navigator|substring|abort|cos|font|send|slow|600|fast|400|location|protocol|300|pageY|clientY|method|action|cancelBubble|hover|fromElement|toElement|relatedTarget|removeEventListener|blur|readonly|focus|resize|content|scroll|dblclick|mousedown|mouseup|mousemove|responseXML|change|keydown|keypress|keyup|addEventListener|write|prototype|size|scr|ipt|createTextNode|defer|FORM|reverse|noConflict|loaded|10000|weight|line|Bottom|Right|Left|padding|border|Width|offsetHeight|offsetWid
th|absolute|PI|left'.split('|'),0,{}))
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/js/jquery.treeview.js
----------------------------------------------------------------------
diff --git a/asciidoc/js/jquery.treeview.js b/asciidoc/js/jquery.treeview.js
new file mode 100644
index 0000000..0a5f251
--- /dev/null
+++ b/asciidoc/js/jquery.treeview.js
@@ -0,0 +1,239 @@
+/*
+ * Treeview 1.2 - jQuery plugin to hide and show branches of a tree
+ *
+ * Copyright (c) 2006 J�rn Zaefferer, Myles Angell
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id$
+ *
+ */
+
+/**
+ * Takes an unordered list and makes all branches collapsable.
+ *
+ * The "treeview" class is added if not already present.
+ *
+ * To hide branches on first display, mark their li elements with
+ * the class "closed". If the "collapsed" option is used, mark intially open
+ * branches with class "open".
+ *
+ * @example .treeview, .treeview ul {
+ * padding: 0;
+ * margin: 0;
+ * list-style: none;
+ * }
+ *
+ * .treeview li {
+ * margin: 0;
+ * padding: 4px 0 3px 20px;
+ * }
+ *
+ * .treeview li { background: url(images/tv-item.gif) 0 0 no-repeat; }
+ * .treeview .collapsable { background-image: url(images/tv-collapsable.gif); }
+ * .treeview .expandable { background-image: url(images/tv-expandable.gif); }
+ * .treeview .last { background-image: url(images/tv-item-last.gif); }
+ * .treeview .lastCollapsable { background-image: url(images/tv-collapsable-last.gif); }
+ * .treeview .lastExpandable { background-image: url(images/tv-expandable-last.gif); }
+ * @desc The following styles are necessary in your stylesheet. There is are alternative sets of images available.
+ *
+ * @example $("ul").Treeview();
+ * @before <ul>
+ * <li>Item 1
+ * <ul>
+ * <li>Item 1.1</li>
+ * </ul>
+ * </li>
+ * <li class="closed">Item 2 (starts closed)
+ * <ul>
+ * <li>Item 2.1
+ * <ul>
+ * <li>Item 2.1.1</li>
+ * <li>Item 2.1.2</li>
+ * </ul>
+ * </li>
+ * <li>Item 2.2</li>
+ * </ul>
+ * </li>
+ * <li>Item 3</li>
+ * </ul>
+ * @desc Basic usage example
+ *
+ * @example $("ul").Treeview({ speed: "fast", collapsed: true});
+ * @before <ul>
+ * <li class="open">Item 1 (starts open)
+ * <ul>
+ * <li>Item 1.1</li>
+ * </ul>
+ * </li>
+ * <li>Item 2
+ * <ul>
+ * <li>Item 2.1</li>
+ * <li>Item 2.2</li>
+ * </ul>
+ * </li>
+ * </ul>
+ * @desc Create a treeview that starts collapsed. Toggling branches is animated.
+ *
+ * @example $("ul").Treeview({ control: #treecontrol });
+ * @before <div id="treecontrol">
+ * <a href="#">Collapse All</a>
+ * <a href="#">Expand All</a>
+ * <a href="#">Toggle All</a>
+ * </div>
+ * @desc Creates a treeview that can be controlled with a few links.
+ * Very likely to be changed/improved in future versions.
+ *
+ * @param Map options Optional settings to configure treeview
+ * @option String|Number speed Speed of animation, see animate() for details. Default: none, no animation
+ * @option Boolean collapsed Start with all branches collapsed. Default: none, all expanded
+ * @option <Content> control Container for a treecontrol, see last example.
+ * @option Boolean unique Set to allow only one branch on one level to be open
+ * (closing siblings which opening). Default: none
+ * @option Function toggle Callback when toggling a branch.
+ * Arguments: "this" refers to the UL that was shown or hidden.
+ * Works only with speed option set (set speed: 1 to enable callback without animations).
+ * Default: none
+ * @type jQuery
+ * @name Treeview
+ * @cat Plugins/Treeview
+ */
+
+(function($) {
+
+ // classes used by the plugin
+ // need to be styled via external stylesheet, see first example
+ var CLASSES = {
+ open: "open",
+ closed: "closed",
+ expandable: "expandable",
+ collapsable: "collapsable",
+ lastCollapsable: "lastCollapsable",
+ lastExpandable: "lastExpandable",
+ last: "last",
+ hitarea: "hitarea"
+ };
+
+ // styles for hitareas
+ var hitareaCSS = {
+ height: 15,
+ width: 30, // custom size used in xooki
+ marginLeft: "-30px", // custom size used in xooki
+ "float": "left",
+ cursor: "pointer"
+ };
+
+ // ie specific styles for hitareas
+ if( $.browser.msie ) {
+ $.extend( hitareaCSS, {
+ background: "#fff",
+ filter: "alpha(opacity=0)",
+ display: "inline"
+ });
+ }
+
+ $.extend($.fn, {
+ swapClass: function(c1, c2) {
+ return this.each(function() {
+ var $this = $(this);
+ if ( $.className.has(this, c1) )
+ $this.removeClass(c1).addClass(c2);
+ else if ( $.className.has(this, c2) )
+ $this.removeClass(c2).addClass(c1);
+ });
+ },
+ replaceclass: function(c1, c2) {
+ return this.each(function() {
+ var $this = $(this);
+ if ( $.className.has(this, c1) )
+ $this.removeClass(c1).addClass(c2);
+ });
+ },
+ Treeview: function(settings) {
+
+ // currently no defaults necessary, all implicit
+ settings = $.extend({}, settings);
+
+ // factory for treecontroller
+ function treeController(tree, control) {
+ // factory for click handlers
+ function handler(filter) {
+ return function() {
+ // reuse toggle event handler, applying the elements to toggle
+ // start searching for all hitareas
+ toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() {
+ // for plain toggle, no filter is provided, otherwise we need to check the parent element
+ return filter ? $(this).parent("." + filter).length : true;
+ }) );
+ return false;
+ }
+ }
+ // click on first element to collapse tree
+ $(":eq(0)", control).click( handler(CLASSES.collapsable) );
+ // click on second to expand tree
+ $(":eq(1)", control).click( handler(CLASSES.expandable) );
+ // click on third to toggle tree
+ $(":eq(2)", control).click( handler() );
+ }
+
+ // handle toggle event
+ function toggler() {
+ // this refers to hitareas, we need to find the parent lis first
+ $( this ).parent()
+ // swap classes
+ .swapClass( CLASSES.collapsable, CLASSES.expandable )
+ .swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+ // find child lists
+ .find( ">ul" )
+ // toggle them
+ .toggle( settings.speed, settings.toggle );
+ if ( settings.unique ) {
+ $( this ).parent()
+ .siblings()
+ .replaceclass( CLASSES.collapsable, CLASSES.expandable )
+ .replaceclass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+ .find( ">ul" )
+ .hide( settings.speed, settings.toggle );
+ }
+ }
+
+ // add treeview class to activate styles
+ this.addClass("treeview");
+
+ // mark last tree items
+ $("li:last-child", this).addClass(CLASSES.last);
+
+ // collapse whole tree, or only those marked as closed, anyway except those marked as open
+ $( (settings.collapsed ? "li" : "li." + CLASSES.closed) + ":not(." + CLASSES.open + ") > ul", this).hide();
+
+ // find all tree items with child lists
+ $("li[ul]", this)
+ // handle closed ones first
+ .filter("[>ul:hidden]")
+ .addClass(CLASSES.expandable)
+ .swapClass(CLASSES.last, CLASSES.lastExpandable)
+ .end()
+ // handle open ones
+ .not("[>ul:hidden]")
+ .addClass(CLASSES.collapsable)
+ .swapClass(CLASSES.last, CLASSES.lastCollapsable)
+ .end()
+ // append hitarea
+ .prepend("<div class=\"" + CLASSES.hitarea + "\">")
+ // find hitarea
+ .find("div." + CLASSES.hitarea)
+ // apply styles to hitarea
+ .css(hitareaCSS)
+ // apply toggle event to hitarea
+ .toggle( toggler, toggler );
+
+ // if control option is set, create the treecontroller
+ if ( settings.control )
+ treeController(this, settings.control);
+
+ return this;
+ }
+ });
+})(jQuery);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/moreexamples.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/moreexamples.adoc b/asciidoc/moreexamples.adoc
new file mode 100644
index 0000000..771121e
--- /dev/null
+++ b/asciidoc/moreexamples.adoc
@@ -0,0 +1,33 @@
+
+If you have successfully followed and understood all the tutorials, you still might need to get a better picture of how to use Ivy in the real world.
+
+Here are some links which might be interesting:
+
+
+==== link:http://wiki.hippo.nl/display/OS/SAnt+build+system[SAnt]
+
+SAnt is an experimental build system based on Ant and Ivy. It can be interesting to use "as is", or to get insight on an interesting approach to manage your builds.
+
+
+==== link:https://springmodules.dev.java.net/[Spring Modules]
+
+The spring modules project build system is based on Ant and Ivy, and it's really interesting to have a look at how a modularized project can take advantage of advanced Ant and Ivy features to make the build simpler.
+
+
+==== link:http://www.opensymphony.com/webwork/[Webwork]
+
+The webwork project (which should become struts action framework) uses ant+ivy for their build, and thus makes their framework very easy to use in an ant+ivy build system. They have a link:http://wiki.opensymphony.com/display/WW/Dependencies[page documenting how to use Ivy with their framework], which can be an interesting reading, even if you don't plan to use webwork.
+
+
+==== link:http://www.jaya.free.fr/ivy/doc/articles/ease-multi-module.html[Easing multi-module development]
+
+Johan stuyts, the author of SAnt, also contributed a nice article on his view of how to use Ivy on a multi-module environment.
+
+
+==== link:http://olmex.blogspot.in/2012/04/ivy-beginners-guide.html[Beginners Guide]
+
+
+Apache Ivy - Beginners Guide is a step by step guide to assist beginners in understanding basic concepts/tasks and use them straight away in their projects either through Ant build or in Eclipse IDE.
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/osgi.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi.adoc b/asciidoc/osgi.adoc
new file mode 100644
index 0000000..002a91c
--- /dev/null
+++ b/asciidoc/osgi.adoc
@@ -0,0 +1,44 @@
+
+Since Apache Ivy™ 2.3, some support for OSGi™ dependency management has been introduced.
+
+
+[]
+|=======
+|<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg>|
+ Note that this feature is considered as *experimental*. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the link:http://ant.apache.org/ivy/mailing-lists.html[ivy-user] mailing list, or discuss about implementation issues or improvement you may have found on link:http://ant.apache.org/ivy/mailing-lists.html[ant-dev].
+
+|=======
+
+
+So with a standard ivy.xml, you can express some dependency on some OSGi bundle and every of their trasitive dependencies will be resolved. You can also declare in your ivy.xml some OSGi dependency, like a `Require-Bundle`, an `Import-Package` or an `Import-Service`, miming an OSGi MANIFEST.MF.
+
+
+=== Note on the implementation
+
+
+With OSGi we can declare different kind of capabilites of a bundle which can match different kind of requirements of some other bundles (`Require-Bundle`/`Bundle-SymbolicName`, `Import-Package`/`Export-Package`, `Import-Service`/`Export-Service`). In Ivy we only have one kind of requirement and one kind of capability: the symbolic name of the bundle. Due to that restriction Ivy may not resolve exactly how we would expect with OSGi. The runtime of Ivy won't be as smart as a pure OSGi dependency manager. But we think that the mapping is working for most of the use cases involing OSGi dependencies management.
+
+Details on the mapping of the OSGi dependency model into Ivy's one can be found in that link:osgi/osgi-mapping.html[page].
+
+
+=== Repository descriptor based resolvers
+
+
+Since the nature of the OSGi dependencies, resolving against a repository cannot be started before acquiring the metadata of every bundle of the repository. To resolve an `Import-Package`, Ivy has to find every bundle which has the proper `Export-Package`. So unlike the usual Ivy resolvers, the OSGi capable ones have to get the descriptor before starting a resolve.
+
+The descriptor probably being not instantanly downloaded, the descriptor is put in cache. (FIXME not implemented)
+
+
+=== Use cases
+
+
+Here are different use case of using the OSGi capabilities of Ivy:
+
+
+* link:osgi/eclipse-plugin.html[building an Eclipse™ plugin] +
+
+* link:osgi/standard-osgi.html[building a standard OSGi bundle] +
+
+* link:osgi/target-platform.html[managing a "target" platform] +
+
+
\ No newline at end of file
[20/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-terminology.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-terminology.png b/asciidoc/images/ivy-terminology.png
new file mode 100644
index 0000000..d21276c
Binary files /dev/null and b/asciidoc/images/ivy-terminology.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivy-terminology.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivy-terminology.svg b/asciidoc/images/ivy-terminology.svg
new file mode 100644
index 0000000..f0d2d9e
--- /dev/null
+++ b/asciidoc/images/ivy-terminology.svg
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 363.33 643.59" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <polygon fill-rule="evenodd" transform="translate(.31734 .5)" points="350.79 135.63 350.79 264.25 175.4 264.25 0 264.25 0 135.63" fill="#9ebf48"/>
+ <polygon transform="translate(.31734 .5)" points="350.79 135.63 350.79 264.25 175.4 264.25 0 264.25 0 135.63" stroke-miterlimit="10" stroke-width="0" fill="none"/>
+ <path fill="#010101" d="m123.22 152.47v-10.631h3.212l1.929 7.251 1.907-7.251h3.22v10.631h-1.994v-8.368l-2.11 8.368h-2.066l-2.104-8.368v8.368h-1.994zm11.912-3.96c0-0.677 0.167-1.331 0.501-1.965 0.333-0.633 0.806-1.116 1.417-1.45 0.611-0.333 1.295-0.5 2.049-0.5 1.165 0 2.119 0.378 2.864 1.135 0.744 0.757 1.116 1.713 1.116 2.867 0 1.166-0.375 2.131-1.127 2.897s-1.698 1.149-2.839 1.149c-0.706 0-1.379-0.16-2.02-0.479-0.641-0.318-1.128-0.786-1.461-1.402s-0.5-1.366-0.5-2.252zm2.089 0.109c0 0.764 0.182 1.349 0.544 1.755 0.362 0.405 0.81 0.608 1.341 0.608 0.532 0 0.979-0.203 1.338-0.608 0.36-0.406 0.541-0.996 0.541-1.77 0-0.754-0.181-1.334-0.541-1.74-0.359-0.406-0.806-0.609-1.338-0.609-0.531 0-0.979 0.203-1.341 0.609s-0.544 0.992-0.544 1.755zm14.594 3.851h-1.893v-1.132c-0.314 0.439-0.686 0.768-1.113 0.982s-0.859 0.323-1.295 0.323c-0.884 0-1.642-0.356-2.272-1.07-0.631-0.712-0.946-1.707-0.946-2.983 0-1.305 0.307-2.297 0.92-2.977 0.615-0.679 1.391-1.019 2.328-1.019 0.86 0 1.605 0.357 2.233 1.
073v-3.829h2.038v10.632zm-5.439-4.018c0 0.821 0.114 1.417 0.342 1.784 0.328 0.531 0.788 0.797 1.377 0.797 0.47 0 0.868-0.199 1.197-0.598 0.328-0.399 0.493-0.995 0.493-1.787 0-0.885-0.16-1.522-0.479-1.911-0.319-0.39-0.728-0.584-1.225-0.584-0.483 0-0.889 0.192-1.215 0.576-0.326 0.385-0.49 0.96-0.49 1.723zm12.502 4.018v-1.153c-0.28 0.411-0.648 0.734-1.105 0.972-0.457 0.236-0.938 0.355-1.446 0.355-0.518 0-0.981-0.114-1.393-0.341-0.411-0.228-0.708-0.547-0.892-0.957-0.184-0.411-0.275-0.979-0.275-1.705v-4.872h2.037v3.538c0 1.083 0.038 1.747 0.113 1.991 0.074 0.244 0.211 0.438 0.409 0.58s0.449 0.213 0.754 0.213c0.348 0 0.66-0.095 0.936-0.286 0.275-0.19 0.464-0.427 0.565-0.71s0.152-0.976 0.152-2.078v-3.248h2.038v7.701h-1.893zm4.081 0v-10.631h2.037v10.631h-2.037zm8.572-2.451 2.03 0.341c-0.261 0.744-0.674 1.311-1.236 1.7-0.563 0.389-1.268 0.584-2.114 0.584-1.338 0-2.33-0.438-2.972-1.312-0.509-0.701-0.762-1.586-0.762-2.654 0-1.276 0.333-2.275 1-2.998s1.511-1.084 2.53-1.084c1.146 0 2.05 0.378 2.
713 1.135 0.661 0.757 0.979 1.916 0.949 3.477h-5.104c0.015 0.604 0.179 1.075 0.493 1.41 0.314 0.337 0.706 0.504 1.175 0.504 0.319 0 0.587-0.087 0.805-0.261 0.216-0.175 0.382-0.456 0.493-0.842zm0.116-2.06c-0.015-0.59-0.167-1.038-0.457-1.345s-0.643-0.461-1.059-0.461c-0.445 0-0.812 0.162-1.103 0.486-0.29 0.323-0.433 0.764-0.428 1.319h3.047z"/>
+ <path fill="#010101" d="m181.64 152.47v-7.701h1.168v1.08c0.24-0.377 0.562-0.68 0.963-0.909 0.401-0.23 0.859-0.345 1.371-0.345 0.57 0 1.038 0.118 1.403 0.355 0.364 0.236 0.622 0.568 0.772 0.993 0.609-0.898 1.401-1.349 2.378-1.349 0.764 0 1.351 0.211 1.762 0.635 0.41 0.423 0.617 1.074 0.617 1.954v5.286h-1.299v-4.852c0-0.521-0.042-0.897-0.127-1.127s-0.237-0.415-0.46-0.555c-0.223-0.141-0.483-0.211-0.783-0.211-0.541 0-0.99 0.181-1.349 0.54-0.357 0.36-0.536 0.937-0.536 1.729v4.475h-1.306v-5.004c0-0.58-0.106-1.016-0.318-1.306-0.213-0.29-0.562-0.435-1.045-0.435-0.367 0-0.708 0.097-1.02 0.29s-0.537 0.477-0.677 0.849c-0.141 0.372-0.211 0.909-0.211 1.609v3.996h-1.303zm13.153 3.125c-0.252 0-0.531-0.054-0.841-0.16l-0.146-1.225c0.285 0.076 0.535 0.116 0.747 0.116 0.29 0 0.522-0.049 0.696-0.146s0.316-0.232 0.428-0.406c0.082-0.131 0.215-0.454 0.399-0.972 0.023-0.072 0.062-0.179 0.116-0.319l-2.923-7.715h1.406l1.604 4.46c0.207 0.565 0.394 1.16 0.558 1.783 0.15-0.6 0.329-1.185 0.537-1.755l1.646-4.48
8h1.307l-2.931 7.831c-0.314 0.846-0.559 1.429-0.732 1.748-0.232 0.43-0.499 0.745-0.797 0.946-0.301 0.2-0.658 0.302-1.074 0.302zm6.642-3.125v-7.701h1.168v1.08c0.24-0.377 0.562-0.68 0.963-0.909 0.402-0.23 0.858-0.345 1.371-0.345 0.57 0 1.038 0.118 1.403 0.355 0.365 0.236 0.622 0.568 0.773 0.993 0.607-0.898 1.4-1.349 2.378-1.349 0.763 0 1.35 0.211 1.761 0.635 0.411 0.423 0.617 1.074 0.617 1.954v5.286h-1.3v-4.852c0-0.521-0.04-0.897-0.125-1.127s-0.238-0.415-0.461-0.555c-0.223-0.141-0.483-0.211-0.782-0.211-0.542 0-0.992 0.181-1.35 0.54-0.358 0.36-0.537 0.937-0.537 1.729v4.475h-1.304v-5.004c0-0.58-0.107-1.016-0.32-1.306s-0.561-0.435-1.044-0.435c-0.367 0-0.707 0.097-1.019 0.29s-0.538 0.477-0.678 0.849c-0.141 0.372-0.212 0.909-0.212 1.609v3.996h-1.302zm11.884-3.851c0-1.426 0.396-2.482 1.189-3.169 0.662-0.57 1.47-0.855 2.421-0.855 1.06 0 1.925 0.347 2.597 1.041 0.672 0.693 1.008 1.651 1.008 2.874 0 0.991-0.148 1.771-0.446 2.339-0.296 0.568-0.73 1.009-1.297 1.323-0.569 0.314-1.188 0.472-1.861
0.472-1.077 0-1.948-0.346-2.614-1.037-0.665-0.692-0.997-1.688-0.997-2.988zm1.342 0c0 0.986 0.215 1.725 0.645 2.215 0.431 0.491 0.973 0.736 1.624 0.736 0.648 0 1.188-0.247 1.618-0.74s0.645-1.244 0.645-2.255c0-0.952-0.217-1.674-0.648-2.164-0.434-0.49-0.971-0.736-1.614-0.736-0.651 0-1.193 0.244-1.624 0.732-0.431 0.489-0.646 1.226-0.646 2.212zm12.396 3.851v-0.973c-0.488 0.764-1.206 1.146-2.153 1.146-0.613 0-1.179-0.17-1.693-0.508-0.515-0.339-0.914-0.811-1.195-1.418-0.284-0.606-0.426-1.304-0.426-2.092 0-0.769 0.129-1.466 0.385-2.092s0.641-1.105 1.152-1.439c0.513-0.333 1.086-0.5 1.719-0.5 0.465 0 0.878 0.098 1.24 0.294 0.363 0.195 0.657 0.45 0.885 0.765v-3.814h1.298v10.631h-1.212zm-4.126-3.844c0 0.986 0.207 1.724 0.624 2.212 0.415 0.488 0.906 0.732 1.472 0.732 0.57 0 1.055-0.233 1.455-0.7 0.398-0.467 0.597-1.178 0.597-2.135 0-1.054-0.203-1.827-0.608-2.32-0.406-0.493-0.907-0.74-1.501-0.74-0.58 0-1.064 0.237-1.453 0.711-0.391 0.473-0.586 1.221-0.586 2.24z"/>
+ <polygon fill-rule="evenodd" transform="translate(.31734 .5)" points="343.78 163.68 343.78 210.46 174.24 210.46 4.702 210.46 4.702 163.68" fill="#cbcc2c"/>
+ <polygon transform="translate(.31734 .5)" points="343.78 163.68 343.78 210.46 174.24 210.46 4.702 210.46 4.702 163.68" stroke-miterlimit="10" stroke-width="0" fill="none"/>
+ <path fill="#010101" d="m166.97 174.17c0.085 0 0.196-0.01 0.334-0.029l0.11 0.673c-0.214 0.045-0.406 0.067-0.575 0.067-0.276 0-0.491-0.044-0.643-0.131-0.152-0.088-0.26-0.203-0.322-0.345-0.062-0.143-0.093-0.442-0.093-0.898v-2.585h-0.558v-0.593h0.558v-1.112l0.758-0.456v1.568h0.765v0.593h-0.765v2.626c0 0.218 0.013 0.357 0.039 0.419 0.027 0.062 0.07 0.112 0.132 0.148 0.061 0.037 0.148 0.055 0.26 0.055zm1.054 0.651v-4.492h0.686v0.682c0.176-0.318 0.337-0.528 0.484-0.63 0.148-0.102 0.311-0.153 0.488-0.153 0.257 0 0.519 0.082 0.783 0.246l-0.263 0.706c-0.186-0.109-0.372-0.165-0.558-0.165-0.167 0-0.316 0.051-0.448 0.15-0.133 0.101-0.228 0.239-0.284 0.416-0.085 0.271-0.127 0.567-0.127 0.889v2.352h-0.761zm5.76 0v-0.659c-0.35 0.507-0.825 0.761-1.426 0.761-0.265 0-0.512-0.051-0.742-0.152-0.229-0.102-0.4-0.229-0.512-0.382-0.111-0.154-0.189-0.343-0.234-0.565-0.031-0.149-0.047-0.386-0.047-0.711v-2.783h0.762v2.492c0 0.397 0.015 0.665 0.046 0.804 0.049 0.2 0.149 0.357 0.305 0.471 0.155 0.115 0.347 0.
172 0.575 0.172s0.442-0.059 0.643-0.176c0.201-0.116 0.343-0.276 0.425-0.478 0.084-0.202 0.126-0.494 0.126-0.878v-2.407h0.761v4.492h-0.682zm1.838 0v-4.492h0.685v0.64c0.33-0.494 0.808-0.741 1.431-0.741 0.271 0 0.519 0.049 0.746 0.146 0.227 0.098 0.396 0.225 0.509 0.383s0.192 0.346 0.238 0.562c0.027 0.141 0.041 0.388 0.041 0.74v2.762h-0.761v-2.732c0-0.31-0.029-0.542-0.089-0.695-0.059-0.153-0.164-0.276-0.314-0.368-0.151-0.092-0.328-0.138-0.531-0.138-0.324 0-0.604 0.104-0.84 0.31-0.235 0.205-0.353 0.596-0.353 1.171v2.453h-0.762zm4.708 0v-6.2h0.761v3.535l1.803-1.827h0.984l-1.717 1.667 1.89 2.825h-0.938l-1.485-2.296-0.537 0.516v1.78h-0.761z"/>
+ <line stroke-linejoin="round" y2="194.62" x2="339.48" stroke="#010101" stroke-miterlimit="10" y1="194.62" stroke-dasharray="1.4433, 1.4433, 1.4433, 1.4433" x1="58.81" fill="none"/>
+ <path fill-rule="evenodd" fill="#cbcc2c" d="m292.7 257.82zm-140.33-46.859zh140.33l-19.472 46.859h-101.39l-19.47-46.859z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <polygon transform="translate(.31734 .5)" points="171.52 257.32 152.05 210.46 292.38 210.46 272.91 257.32"/>
+ <path d="m152.37 210.96z"/>
+ <path d="m292.7 257.82z"/>
+ </g>
+ <path fill="#010101" d="m210.65 222.1h-0.706v-6.201h0.761v2.212c0.321-0.403 0.733-0.604 1.231-0.604 0.276 0 0.537 0.056 0.784 0.167s0.45 0.269 0.609 0.469c0.159 0.202 0.284 0.445 0.375 0.73 0.09 0.284 0.135 0.589 0.135 0.913 0 0.77-0.189 1.365-0.571 1.785-0.38 0.42-0.837 0.631-1.371 0.631-0.529 0-0.945-0.223-1.247-0.665v0.563zm-0.01-2.281c0 0.539 0.075 0.928 0.222 1.167 0.239 0.393 0.564 0.588 0.973 0.588 0.333 0 0.62-0.145 0.862-0.434 0.242-0.288 0.365-0.72 0.365-1.292 0-0.586-0.117-1.02-0.351-1.299-0.231-0.279-0.514-0.418-0.843-0.418-0.333 0-0.621 0.145-0.863 0.434s-0.365 0.707-0.365 1.254zm4.08 2.281v-4.493h0.686v0.682c0.176-0.318 0.337-0.528 0.485-0.63s0.311-0.152 0.488-0.152c0.255 0 0.518 0.082 0.783 0.245l-0.264 0.706c-0.186-0.11-0.372-0.165-0.558-0.165-0.166 0-0.315 0.05-0.449 0.15-0.132 0.101-0.227 0.239-0.283 0.417-0.084 0.271-0.127 0.566-0.127 0.888v2.353h-0.761zm5.978 0c-0.08-0.158-0.13-0.343-0.153-0.555-0.281 0.239-0.553 0.409-0.813 0.508-0.261 0.098-0.54 0.148-0.841 0
.148-0.491 0-0.872-0.121-1.136-0.362-0.266-0.241-0.397-0.549-0.397-0.924 0-0.221 0.049-0.421 0.149-0.604 0.101-0.182 0.23-0.327 0.394-0.437 0.161-0.11 0.344-0.193 0.547-0.251 0.149-0.039 0.375-0.077 0.677-0.113 0.615-0.073 1.068-0.161 1.358-0.263 0.003-0.104 0.005-0.171 0.005-0.198 0-0.311-0.073-0.528-0.217-0.656-0.194-0.172-0.483-0.258-0.866-0.258-0.358 0-0.623 0.063-0.793 0.188-0.172 0.125-0.297 0.348-0.379 0.666l-0.744-0.102c0.067-0.318 0.178-0.576 0.333-0.772 0.154-0.195 0.38-0.346 0.674-0.452 0.293-0.105 0.632-0.158 1.019-0.158 0.383 0 0.695 0.045 0.935 0.136 0.24 0.09 0.415 0.203 0.529 0.34 0.111 0.137 0.19 0.31 0.237 0.519 0.024 0.129 0.037 0.363 0.037 0.701v1.016c0 0.708 0.017 1.155 0.049 1.343s0.097 0.368 0.192 0.54h-0.796zm-0.216-2.255c-0.276 0.112-0.691 0.208-1.243 0.288-0.313 0.045-0.535 0.095-0.664 0.151-0.13 0.057-0.229 0.14-0.301 0.248s-0.105 0.229-0.105 0.361c0 0.203 0.076 0.372 0.23 0.508 0.154 0.135 0.379 0.203 0.674 0.203 0.294 0 0.555-0.064 0.783-0.192 0.229-0.12
9 0.396-0.305 0.503-0.527 0.083-0.172 0.123-0.426 0.123-0.761v-0.279zm1.837 2.255v-4.493h0.684v0.639c0.33-0.493 0.807-0.739 1.43-0.739 0.271 0 0.521 0.049 0.747 0.146 0.228 0.098 0.397 0.226 0.51 0.383 0.113 0.158 0.192 0.346 0.237 0.562 0.028 0.142 0.041 0.388 0.041 0.74v2.763h-0.761v-2.733c0-0.31-0.029-0.542-0.089-0.696-0.059-0.152-0.164-0.275-0.314-0.367-0.151-0.091-0.328-0.138-0.531-0.138-0.324 0-0.604 0.104-0.84 0.309-0.236 0.206-0.354 0.597-0.354 1.172v2.454h-0.76zm7.713-1.647 0.748 0.099c-0.082 0.516-0.292 0.919-0.629 1.211-0.337 0.291-0.75 0.438-1.241 0.438-0.615 0-1.108-0.202-1.482-0.604-0.373-0.401-0.56-0.978-0.56-1.728 0-0.485 0.079-0.91 0.24-1.273 0.16-0.363 0.405-0.637 0.734-0.818 0.328-0.182 0.686-0.272 1.072-0.272 0.487 0 0.886 0.123 1.196 0.369 0.311 0.247 0.509 0.598 0.598 1.052l-0.74 0.114c-0.071-0.302-0.196-0.528-0.375-0.681-0.18-0.152-0.396-0.229-0.65-0.229-0.383 0-0.693 0.138-0.935 0.412-0.238 0.274-0.358 0.71-0.358 1.305 0 0.604 0.115 1.042 0.346 1.315 0.232 0.
273 0.534 0.41 0.905 0.41 0.3 0 0.549-0.092 0.749-0.274 0.201-0.183 0.326-0.465 0.382-0.846zm1.434 1.647v-6.201h0.761v2.225c0.355-0.411 0.805-0.617 1.346-0.617 0.333 0 0.622 0.065 0.867 0.196 0.246 0.132 0.421 0.312 0.526 0.543 0.106 0.231 0.159 0.567 0.159 1.008v2.847h-0.761v-2.847c0-0.381-0.084-0.658-0.248-0.832-0.165-0.173-0.398-0.26-0.699-0.26-0.226 0-0.438 0.059-0.638 0.176-0.198 0.117-0.34 0.275-0.425 0.476s-0.128 0.477-0.128 0.829v2.458h-0.76z"/>
+ <path fill-rule="evenodd" fill="#e6e64e" d="m0.31734 292.8z"/>
+ <polyline fill-rule="evenodd" transform="translate(.31734 .5)" points="0 643.09 51.397 467.69 0 292.3 311.19 292.3 362.51 467.69 311.19 643.09 0 643.09" fill="#e6e64e"/>
+ <polyline transform="translate(.31734 .5)" points="0 643.09 51.397 467.69 0 292.3 311.19 292.3 362.51 467.69 311.19 643.09 0 643.09" stroke-miterlimit="10" stroke-width="0" fill="none"/>
+ <path d="m0.31734 292.8z" stroke-miterlimit="10" stroke-width="0" fill="none"/>
+ <path fill="#010101" d="m140.34 306.16v-8.269h3.514c0.883 0 1.525 0.074 1.926 0.224 0.4 0.147 0.722 0.412 0.961 0.792 0.241 0.38 0.361 0.814 0.361 1.303 0 0.62-0.182 1.133-0.547 1.537-0.364 0.403-0.91 0.659-1.636 0.764 0.361 0.211 0.659 0.442 0.895 0.693 0.234 0.252 0.552 0.7 0.949 1.343l1.01 1.613h-1.996l-1.207-1.8c-0.429-0.643-0.722-1.048-0.88-1.215-0.157-0.168-0.324-0.282-0.501-0.345-0.178-0.062-0.457-0.093-0.841-0.093h-0.339v3.452h-1.669zm1.669-4.771h1.235c0.801 0 1.301-0.034 1.501-0.102 0.199-0.067 0.354-0.185 0.468-0.35 0.112-0.165 0.169-0.372 0.169-0.62 0-0.278-0.074-0.503-0.223-0.675-0.149-0.171-0.358-0.278-0.629-0.323-0.136-0.02-0.542-0.028-1.219-0.028h-1.303v2.098zm10.03 2.865 1.579 0.265c-0.203 0.579-0.523 1.021-0.961 1.322-0.438 0.303-0.986 0.454-1.645 0.454-1.042 0-1.812-0.341-2.312-1.021-0.395-0.545-0.592-1.233-0.592-2.064 0-0.992 0.26-1.77 0.778-2.332 0.519-0.562 1.174-0.843 1.968-0.843 0.892 0 1.595 0.294 2.109 0.883 0.516 0.588 0.761 1.489 0.738 2.704h-3.97c0.012
0.47 0.139 0.835 0.383 1.097 0.245 0.262 0.55 0.392 0.915 0.392 0.248 0 0.456-0.067 0.625-0.202 0.171-0.137 0.298-0.354 0.385-0.655zm0.09-1.602c-0.011-0.459-0.129-0.808-0.354-1.047s-0.501-0.358-0.824-0.358c-0.346 0-0.632 0.127-0.857 0.378-0.226 0.252-0.336 0.595-0.332 1.027h2.367zm4.509 3.508-2.413-5.989h1.663l1.128 3.057 0.327 1.021c0.087-0.26 0.141-0.431 0.164-0.514 0.052-0.169 0.109-0.338 0.169-0.507l1.139-3.057h1.631l-2.38 5.989h-1.428zm4.776-6.802v-1.467h1.585v1.467h-1.585zm0 6.802v-5.989h1.585v5.989h-1.585zm2.733-1.71 1.591-0.242c0.067 0.309 0.204 0.542 0.411 0.702s0.496 0.24 0.868 0.24c0.41 0 0.719-0.075 0.926-0.226 0.139-0.105 0.208-0.246 0.208-0.423 0-0.12-0.037-0.22-0.112-0.3-0.079-0.075-0.256-0.145-0.53-0.208-1.278-0.282-2.089-0.539-2.431-0.772-0.474-0.324-0.711-0.772-0.711-1.348 0-0.52 0.205-0.955 0.614-1.309 0.411-0.354 1.046-0.53 1.907-0.53 0.819 0 1.429 0.133 1.827 0.4s0.673 0.662 0.823 1.185l-1.495 0.276c-0.062-0.233-0.185-0.412-0.363-0.536s-0.434-0.187-0.765-0.187c-
0.417 0-0.716 0.059-0.896 0.176-0.12 0.082-0.181 0.189-0.181 0.321 0 0.112 0.054 0.208 0.158 0.287 0.144 0.105 0.637 0.254 1.48 0.445 0.845 0.192 1.434 0.427 1.768 0.706 0.332 0.281 0.496 0.674 0.496 1.178 0 0.549-0.229 1.021-0.688 1.416-0.458 0.395-1.137 0.592-2.036 0.592-0.815 0-1.461-0.165-1.937-0.496s-0.785-0.779-0.932-1.347zm6.98-5.092v-1.467h1.586v1.467h-1.586zm0 6.802v-5.989h1.586v5.989h-1.586zm2.925-3.08c0-0.526 0.13-1.035 0.39-1.527 0.259-0.493 0.626-0.869 1.103-1.128 0.475-0.261 1.006-0.39 1.593-0.39 0.905 0 1.648 0.294 2.228 0.883 0.579 0.588 0.868 1.332 0.868 2.23 0 0.906-0.292 1.656-0.876 2.253-0.585 0.596-1.321 0.894-2.208 0.894-0.55 0-1.073-0.124-1.571-0.372s-0.877-0.611-1.136-1.092c-0.261-0.479-0.391-1.063-0.391-1.751zm1.624 0.085c0 0.595 0.142 1.049 0.423 1.365 0.282 0.315 0.63 0.474 1.043 0.474 0.414 0 0.761-0.158 1.041-0.474s0.42-0.775 0.42-1.376c0-0.587-0.14-1.038-0.42-1.354s-0.627-0.474-1.041-0.474c-0.413 0-0.761 0.157-1.043 0.474-0.281 0.316-0.423 0.77-0.423 1.
365zm11.202 2.995h-1.585v-3.057c0-0.647-0.033-1.065-0.101-1.255s-0.179-0.338-0.331-0.443c-0.151-0.104-0.335-0.158-0.549-0.158-0.275 0-0.521 0.076-0.74 0.226-0.217 0.15-0.367 0.351-0.447 0.599-0.081 0.248-0.121 0.707-0.121 1.376v2.713h-1.585v-5.989h1.473v0.879c0.521-0.677 1.181-1.015 1.974-1.015 0.35 0 0.669 0.062 0.959 0.189 0.289 0.126 0.507 0.286 0.656 0.481s0.252 0.418 0.311 0.666c0.058 0.248 0.087 0.604 0.087 1.065v3.723z"/>
+ <path fill="#010101" d="m203.72 305.19v0.976h-5.465c-0.008-0.245 0.032-0.479 0.118-0.705 0.14-0.373 0.363-0.739 0.668-1.1 0.308-0.361 0.75-0.778 1.328-1.252 0.899-0.737 1.506-1.321 1.821-1.751 0.316-0.432 0.474-0.838 0.474-1.222 0-0.402-0.144-0.741-0.431-1.018-0.288-0.276-0.662-0.415-1.126-0.415-0.488 0-0.879 0.147-1.173 0.44-0.293 0.293-0.441 0.699-0.444 1.218l-1.044-0.107c0.071-0.778 0.341-1.371 0.807-1.779 0.466-0.407 1.092-0.611 1.878-0.611 0.793 0 1.421 0.22 1.884 0.659 0.462 0.44 0.692 0.985 0.692 1.636 0 0.331-0.066 0.656-0.201 0.976-0.136 0.32-0.36 0.656-0.675 1.01-0.313 0.354-0.836 0.838-1.565 1.455-0.609 0.511-1 0.858-1.173 1.041s-0.315 0.365-0.429 0.55h4.056zm1.657 0.975v-1.156h1.155v1.156h-1.155zm2.727-2.184 1.016-0.135c0.116 0.575 0.313 0.989 0.595 1.244 0.28 0.253 0.62 0.38 1.023 0.38 0.477 0 0.881-0.165 1.209-0.496 0.329-0.33 0.493-0.741 0.493-1.229 0-0.466-0.151-0.851-0.456-1.153-0.304-0.303-0.692-0.454-1.161-0.454-0.192 0-0.431 0.038-0.717 0.113l0.111-0.892c0.069
0.008 0.123 0.012 0.166 0.012 0.432 0 0.82-0.113 1.166-0.339 0.347-0.226 0.519-0.573 0.519-1.043 0-0.372-0.125-0.681-0.376-0.925-0.253-0.245-0.578-0.367-0.978-0.367-0.395 0-0.724 0.125-0.986 0.373-0.264 0.248-0.432 0.62-0.507 1.116l-1.016-0.181c0.124-0.681 0.406-1.207 0.846-1.581 0.44-0.375 0.986-0.562 1.642-0.562 0.451 0 0.865 0.097 1.246 0.29 0.38 0.194 0.67 0.458 0.871 0.793 0.202 0.334 0.302 0.689 0.302 1.065 0 0.357-0.097 0.683-0.288 0.976s-0.475 0.526-0.851 0.699c0.487 0.113 0.868 0.348 1.139 0.702 0.271 0.355 0.406 0.801 0.406 1.334 0 0.722-0.264 1.334-0.789 1.836-0.527 0.502-1.192 0.753-1.997 0.753-0.726 0-1.328-0.217-1.808-0.648-0.479-0.431-0.752-0.992-0.82-1.681zm6.985 2.184v-1.156h1.157v1.156h-1.157zm3.46-0.717c-0.546-0.688-0.818-1.808-0.818-3.361 0-0.978 0.101-1.764 0.303-2.36 0.2-0.596 0.498-1.055 0.896-1.379 0.396-0.323 0.896-0.484 1.498-0.484 0.443 0 0.831 0.089 1.166 0.268 0.336 0.179 0.611 0.437 0.83 0.772 0.219 0.337 0.389 0.747 0.513 1.229 0.125 0.483 0.187 1.135
0.187 1.954 0 0.97-0.101 1.753-0.299 2.35-0.2 0.596-0.497 1.057-0.895 1.381-0.396 0.326-0.897 0.488-1.502 0.488-0.798 0-1.425-0.285-1.879-0.858zm0.75-6.152c-0.351 0.504-0.524 1.435-0.524 2.791 0 1.357 0.158 2.261 0.477 2.71 0.317 0.449 0.709 0.674 1.176 0.674 0.466 0 0.857-0.226 1.175-0.677s0.478-1.354 0.478-2.707c0-1.361-0.159-2.265-0.478-2.713-0.317-0.447-0.713-0.671-1.187-0.671-0.467 0-0.839 0.197-1.117 0.593z"/>
+ <path fill-rule="evenodd" fill="#e6e64e" d="m58.81 206.34zm-46.778-23.43zh35.062l11.716 11.714-11.716 11.716h-35.062l11.716-11.716-11.716-11.714z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="46.777 205.84 11.715 205.84 23.431 194.12 11.715 182.41 46.777 182.41 58.493 194.12"/>
+ <path d="m12.032 182.91z" stroke-width="0"/>
+ <path d="m58.81 206.34z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m35.945 196.86v0.731h-4.098c-0.007-0.184 0.023-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.229-0.271 0.562-0.584 0.995-0.939 0.675-0.553 1.131-0.99 1.367-1.312 0.237-0.323 0.355-0.628 0.355-0.916 0-0.302-0.108-0.557-0.324-0.764s-0.497-0.311-0.844-0.311c-0.366 0-0.659 0.11-0.88 0.329-0.22 0.221-0.331 0.525-0.334 0.914l-0.782-0.08c0.053-0.584 0.255-1.029 0.604-1.335s0.819-0.459 1.409-0.459c0.594 0 1.065 0.165 1.412 0.495s0.52 0.739 0.52 1.227c0 0.248-0.05 0.492-0.151 0.731-0.102 0.24-0.271 0.492-0.506 0.758-0.235 0.265-0.626 0.628-1.173 1.092-0.458 0.383-0.751 0.643-0.88 0.779-0.13 0.137-0.237 0.274-0.322 0.413h3.042zm1.208 0.732v-0.867h0.867v0.867h-0.867zm1.968-1.637 0.762-0.102c0.087 0.432 0.236 0.742 0.446 0.933s0.466 0.285 0.768 0.285c0.357 0 0.66-0.124 0.907-0.372 0.246-0.248 0.37-0.556 0.37-0.922 0-0.35-0.114-0.639-0.343-0.865s-0.52-0.34-0.871-0.34c-0.145 0-0.323 0.027-0.537 0.084l0.084-0.668c0.051 0.005 0.092 0.008 0.123 0.008 0.324 0 0.616
-0.084 0.875-0.254 0.26-0.169 0.39-0.43 0.39-0.781 0-0.279-0.095-0.511-0.283-0.694-0.189-0.184-0.433-0.275-0.732-0.275-0.296 0-0.542 0.094-0.74 0.279-0.197 0.187-0.323 0.466-0.38 0.838l-0.762-0.136c0.094-0.511 0.305-0.905 0.635-1.187 0.33-0.28 0.739-0.421 1.23-0.421 0.339 0 0.65 0.073 0.936 0.218 0.284 0.146 0.502 0.344 0.652 0.595s0.228 0.518 0.228 0.8c0 0.268-0.073 0.512-0.217 0.731s-0.356 0.395-0.638 0.524c0.366 0.084 0.651 0.26 0.854 0.526 0.202 0.267 0.304 0.6 0.304 1.001 0 0.541-0.197 1-0.592 1.376-0.395 0.377-0.894 0.564-1.498 0.564-0.544 0-0.995-0.161-1.355-0.485s-0.566-0.744-0.616-1.26zm5.613 1.637h-0.706v-6.201h0.761v2.212c0.321-0.402 0.732-0.604 1.231-0.604 0.276 0 0.537 0.056 0.784 0.167 0.247 0.112 0.45 0.269 0.609 0.47 0.159 0.202 0.284 0.445 0.374 0.729 0.091 0.285 0.136 0.59 0.136 0.914 0 0.77-0.19 1.364-0.571 1.784-0.381 0.421-0.838 0.631-1.37 0.631-0.53 0-0.946-0.221-1.248-0.664v0.562zm-0.009-2.281c0 0.539 0.073 0.928 0.221 1.168 0.239 0.392 0.563 0.588 0.973 0.588
0.333 0 0.62-0.145 0.862-0.434 0.243-0.289 0.364-0.721 0.364-1.292 0-0.587-0.116-1.02-0.35-1.299-0.232-0.279-0.514-0.419-0.844-0.419-0.332 0-0.62 0.145-0.863 0.434-0.242 0.29-0.363 0.709-0.363 1.254zm6.744 2.281h-0.761v-4.852c-0.184 0.175-0.424 0.35-0.722 0.524-0.297 0.175-0.564 0.306-0.802 0.393v-0.735c0.426-0.2 0.799-0.442 1.117-0.728 0.318-0.284 0.544-0.561 0.677-0.829h0.49v6.227z"/>
+ <path fill-rule="evenodd" fill="#e6e64e" d="m105.59 206.34zm-46.777-23.43zh35.062l11.714 11.714-11.714 11.716h-35.062l11.714-11.716-11.714-11.714z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="93.556 205.84 58.493 205.84 70.207 194.12 58.493 182.41 93.556 182.41 105.27 194.12"/>
+ <path d="m58.81 182.91z" stroke-width="0"/>
+ <path d="m105.59 206.34z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m82.806 196.86v0.731h-4.1c-0.006-0.184 0.023-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.229-0.271 0.562-0.584 0.996-0.939 0.674-0.553 1.13-0.99 1.366-1.312 0.237-0.323 0.355-0.628 0.355-0.916 0-0.302-0.107-0.557-0.323-0.764s-0.497-0.311-0.844-0.311c-0.367 0-0.66 0.11-0.88 0.329-0.22 0.221-0.332 0.525-0.335 0.914l-0.782-0.08c0.054-0.584 0.256-1.029 0.605-1.335s0.818-0.459 1.408-0.459c0.595 0 1.066 0.165 1.413 0.495s0.52 0.739 0.52 1.227c0 0.248-0.051 0.492-0.151 0.731-0.103 0.24-0.271 0.492-0.506 0.758-0.235 0.265-0.627 0.628-1.174 1.092-0.457 0.383-0.75 0.643-0.88 0.779s-0.237 0.274-0.321 0.413h3.043zm1.129 0.732v-0.867h0.866v0.867h-0.866zm1.968-1.637 0.762-0.102c0.087 0.432 0.235 0.742 0.445 0.933 0.211 0.19 0.467 0.285 0.769 0.285 0.357 0 0.66-0.124 0.906-0.372 0.247-0.248 0.371-0.556 0.371-0.922 0-0.35-0.114-0.639-0.343-0.865s-0.52-0.34-0.871-0.34c-0.145 0-0.323 0.027-0.537 0.084l0.084-0.668c0.051 0.005 0.092 0.008 0.123 0.008 0.324 0 0.615-
0.084 0.875-0.254 0.26-0.169 0.39-0.43 0.39-0.781 0-0.279-0.095-0.511-0.283-0.694-0.189-0.184-0.434-0.275-0.732-0.275-0.296 0-0.543 0.094-0.74 0.279-0.197 0.187-0.324 0.466-0.38 0.838l-0.762-0.136c0.093-0.511 0.305-0.905 0.635-1.187 0.33-0.28 0.739-0.421 1.23-0.421 0.338 0 0.65 0.073 0.935 0.218 0.285 0.146 0.502 0.344 0.653 0.595 0.15 0.251 0.227 0.518 0.227 0.8 0 0.268-0.072 0.512-0.216 0.731s-0.356 0.395-0.639 0.524c0.367 0.084 0.651 0.26 0.854 0.526s0.305 0.6 0.305 1.001c0 0.541-0.197 1-0.592 1.376-0.396 0.377-0.894 0.564-1.498 0.564-0.544 0-0.996-0.161-1.355-0.485-0.36-0.324-0.565-0.744-0.616-1.26zm5.691 1.637h-0.707v-6.201h0.762v2.212c0.321-0.402 0.731-0.604 1.23-0.604 0.276 0 0.538 0.056 0.784 0.167 0.247 0.112 0.45 0.269 0.609 0.47 0.159 0.202 0.284 0.445 0.374 0.729 0.091 0.285 0.136 0.59 0.136 0.914 0 0.77-0.19 1.364-0.571 1.784-0.38 0.421-0.837 0.631-1.37 0.631-0.53 0-0.946-0.221-1.247-0.664v0.562zm-0.008-2.281c0 0.539 0.073 0.928 0.22 1.168 0.24 0.392 0.563 0.588 0.973 0
.588 0.333 0 0.621-0.145 0.863-0.434s0.363-0.721 0.363-1.292c0-0.587-0.116-1.02-0.349-1.299s-0.514-0.419-0.844-0.419c-0.333 0-0.621 0.145-0.863 0.434s-0.363 0.709-0.363 1.254zm7.799 1.549v0.731h-4.098c-0.006-0.184 0.024-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.23-0.271 0.562-0.584 0.996-0.939 0.674-0.553 1.129-0.99 1.366-1.312 0.236-0.323 0.355-0.628 0.355-0.916 0-0.302-0.107-0.557-0.323-0.764s-0.497-0.311-0.844-0.311c-0.367 0-0.66 0.11-0.88 0.329-0.221 0.221-0.332 0.525-0.334 0.914l-0.783-0.08c0.054-0.584 0.256-1.029 0.605-1.335s0.818-0.459 1.408-0.459c0.595 0 1.065 0.165 1.413 0.495 0.347 0.33 0.52 0.739 0.52 1.227 0 0.248-0.051 0.492-0.151 0.731-0.102 0.24-0.271 0.492-0.506 0.758-0.235 0.265-0.627 0.628-1.174 1.092-0.457 0.383-0.75 0.643-0.88 0.779s-0.237 0.274-0.321 0.413h3.041z"/>
+ <path fill-rule="evenodd" fill="#e6e64e" d="m152.37 206.34zm-46.778-23.43zh35.062l11.716 11.714-11.716 11.716h-35.062l11.716-11.716-11.716-11.714z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="140.33 205.84 105.27 205.84 116.98 194.12 105.27 182.41 140.33 182.41 152.05 194.12"/>
+ <path d="m105.59 182.91z" stroke-width="0"/>
+ <path d="m152.37 206.34z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m123.81 196.86v0.731h-4.098c-0.007-0.184 0.023-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.229-0.271 0.562-0.584 0.996-0.939 0.674-0.553 1.13-0.99 1.366-1.312 0.237-0.323 0.355-0.628 0.355-0.916 0-0.302-0.108-0.557-0.324-0.764-0.215-0.207-0.497-0.311-0.844-0.311-0.366 0-0.659 0.11-0.88 0.329-0.22 0.221-0.331 0.525-0.334 0.914l-0.782-0.08c0.053-0.584 0.255-1.029 0.604-1.335s0.819-0.459 1.409-0.459c0.595 0 1.065 0.165 1.412 0.495 0.348 0.33 0.521 0.739 0.521 1.227 0 0.248-0.051 0.492-0.152 0.731-0.102 0.24-0.271 0.492-0.506 0.758-0.234 0.265-0.626 0.628-1.173 1.092-0.457 0.383-0.751 0.643-0.88 0.779-0.13 0.137-0.237 0.274-0.322 0.413h3.042zm1.208 0.732v-0.867h0.867v0.867h-0.867zm1.968-1.637 0.762-0.102c0.088 0.432 0.236 0.742 0.446 0.933s0.466 0.285 0.768 0.285c0.357 0 0.66-0.124 0.907-0.372 0.246-0.248 0.37-0.556 0.37-0.922 0-0.35-0.114-0.639-0.343-0.865s-0.519-0.34-0.871-0.34c-0.145 0-0.323 0.027-0.537 0.084l0.084-0.668c0.051 0.005 0.092 0.008 0
.123 0.008 0.324 0 0.616-0.084 0.876-0.254 0.259-0.169 0.389-0.43 0.389-0.781 0-0.279-0.094-0.511-0.283-0.694s-0.433-0.275-0.732-0.275c-0.296 0-0.542 0.094-0.74 0.279-0.196 0.187-0.323 0.466-0.38 0.838l-0.762-0.136c0.094-0.511 0.305-0.905 0.635-1.187 0.33-0.28 0.74-0.421 1.23-0.421 0.339 0 0.65 0.073 0.936 0.218 0.284 0.146 0.502 0.344 0.653 0.595 0.15 0.251 0.227 0.518 0.227 0.8 0 0.268-0.072 0.512-0.216 0.731-0.145 0.22-0.357 0.395-0.639 0.524 0.366 0.084 0.651 0.26 0.854 0.526s0.304 0.6 0.304 1.001c0 0.541-0.197 1-0.592 1.376-0.395 0.377-0.894 0.564-1.497 0.564-0.545 0-0.996-0.161-1.356-0.485s-0.565-0.744-0.616-1.26zm5.127 1.637v-0.867h0.867v0.867h-0.867zm2.577-0.537c-0.409-0.516-0.613-1.356-0.613-2.521 0-0.733 0.075-1.324 0.227-1.771 0.15-0.447 0.375-0.792 0.672-1.034 0.298-0.243 0.672-0.364 1.123-0.364 0.333 0 0.624 0.067 0.875 0.201s0.459 0.327 0.622 0.579c0.164 0.253 0.292 0.561 0.386 0.923 0.093 0.362 0.14 0.851 0.14 1.466 0 0.728-0.075 1.314-0.225 1.762-0.149 0.446-0.373 0.
792-0.671 1.035-0.297 0.244-0.673 0.367-1.127 0.367-0.598 0-1.068-0.215-1.409-0.643zm0.563-4.616c-0.263 0.378-0.394 1.076-0.394 2.095 0 1.018 0.119 1.695 0.357 2.032s0.532 0.505 0.882 0.505 0.644-0.169 0.882-0.507c0.238-0.339 0.357-1.016 0.357-2.03 0-1.021-0.119-1.699-0.357-2.035s-0.535-0.503-0.89-0.503c-0.349 0-0.628 0.148-0.837 0.443z"/>
+ <path fill-rule="evenodd" fill="#e6e64e" d="m199.14 206.34zm-46.776-23.43zh35.062l11.715 11.714-11.715 11.716h-35.062l11.714-11.716-11.714-11.714z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="187.11 205.84 152.05 205.84 163.76 194.12 152.05 182.41 187.11 182.41 198.82 194.12"/>
+ <path d="m152.37 182.91z" stroke-width="0"/>
+ <path d="m199.14 206.34z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m178.67 196.86v0.731h-4.099c-0.006-0.184 0.023-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.229-0.271 0.562-0.584 0.996-0.939 0.674-0.553 1.13-0.99 1.366-1.312 0.237-0.323 0.355-0.628 0.355-0.916 0-0.302-0.107-0.557-0.324-0.764-0.215-0.207-0.496-0.311-0.844-0.311-0.366 0-0.659 0.11-0.88 0.329-0.219 0.221-0.331 0.525-0.334 0.914l-0.781-0.08c0.052-0.584 0.254-1.029 0.604-1.335s0.819-0.459 1.409-0.459c0.595 0 1.065 0.165 1.412 0.495 0.348 0.33 0.521 0.739 0.521 1.227 0 0.248-0.051 0.492-0.152 0.731-0.102 0.24-0.27 0.492-0.505 0.758-0.235 0.265-0.627 0.628-1.174 1.092-0.457 0.383-0.75 0.643-0.88 0.779s-0.237 0.274-0.321 0.413h3.041zm1.208 0.732v-0.867h0.866v0.867h-0.866zm1.966-1.637 0.762-0.102c0.087 0.432 0.236 0.742 0.447 0.933 0.208 0.19 0.465 0.285 0.767 0.285 0.358 0 0.66-0.124 0.908-0.372 0.246-0.248 0.369-0.556 0.369-0.922 0-0.35-0.115-0.639-0.343-0.865s-0.519-0.34-0.87-0.34c-0.145 0-0.324 0.027-0.539 0.084l0.086-0.668c0.05 0.005 0.093 0.008 0
.122 0.008 0.325 0 0.616-0.084 0.875-0.254 0.26-0.169 0.391-0.43 0.391-0.781 0-0.279-0.096-0.511-0.283-0.694-0.189-0.184-0.435-0.275-0.732-0.275s-0.543 0.094-0.74 0.279c-0.197 0.187-0.324 0.466-0.382 0.838l-0.761-0.136c0.094-0.511 0.305-0.905 0.635-1.187 0.33-0.28 0.74-0.421 1.23-0.421 0.339 0 0.651 0.073 0.936 0.218 0.285 0.146 0.502 0.344 0.653 0.595 0.15 0.251 0.227 0.518 0.227 0.8 0 0.268-0.072 0.512-0.216 0.731-0.146 0.22-0.357 0.395-0.64 0.524 0.368 0.084 0.652 0.26 0.855 0.526s0.304 0.6 0.304 1.001c0 0.541-0.196 1-0.592 1.376-0.396 0.377-0.894 0.564-1.497 0.564-0.544 0-0.996-0.161-1.355-0.485-0.36-0.324-0.565-0.744-0.617-1.26zm5.128 1.637v-0.867h0.865v0.867h-0.865zm4.83 0h-0.762v-4.852c-0.183 0.175-0.423 0.35-0.721 0.524-0.297 0.175-0.563 0.306-0.801 0.393v-0.735c0.425-0.2 0.798-0.442 1.116-0.728 0.319-0.284 0.545-0.561 0.677-0.829h0.49v6.227z"/>
+ <path fill-rule="evenodd" fill="#e6e64e" d="m245.92 206.34zm-46.779-23.43zh35.062l11.716 11.714-11.716 11.716h-35.062l11.716-11.716-11.716-11.714z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="233.89 205.84 198.82 205.84 210.54 194.12 198.82 182.41 233.89 182.41 245.6 194.12"/>
+ <path d="m199.14 182.91z" stroke-width="0"/>
+ <path d="m245.92 206.34z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m225.45 196.86v0.731h-4.098c-0.006-0.184 0.024-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.502-0.824 0.229-0.271 0.562-0.584 0.995-0.939 0.674-0.553 1.131-0.99 1.367-1.312 0.236-0.323 0.355-0.628 0.355-0.916 0-0.302-0.108-0.557-0.324-0.764-0.217-0.207-0.498-0.311-0.844-0.311-0.366 0-0.659 0.11-0.88 0.329-0.22 0.221-0.332 0.525-0.334 0.914l-0.782-0.08c0.053-0.584 0.254-1.029 0.604-1.335 0.351-0.306 0.82-0.459 1.41-0.459 0.594 0 1.065 0.165 1.411 0.495 0.348 0.33 0.521 0.739 0.521 1.227 0 0.248-0.051 0.492-0.153 0.731-0.101 0.24-0.27 0.492-0.506 0.758-0.235 0.265-0.625 0.628-1.173 1.092-0.456 0.383-0.75 0.643-0.881 0.779-0.129 0.137-0.236 0.274-0.32 0.413h3.041zm1.209 0.732v-0.867h0.866v0.867h-0.866zm1.968-1.637 0.762-0.102c0.087 0.432 0.236 0.742 0.445 0.933 0.21 0.19 0.467 0.285 0.768 0.285 0.358 0 0.66-0.124 0.907-0.372s0.371-0.556 0.371-0.922c0-0.35-0.115-0.639-0.343-0.865-0.229-0.227-0.519-0.34-0.872-0.34-0.144 0-0.322 0.027-0.537 0.084l0.085-0.668c0.05
0.005 0.091 0.008 0.123 0.008 0.323 0 0.615-0.084 0.874-0.254 0.261-0.169 0.39-0.43 0.39-0.781 0-0.279-0.094-0.511-0.283-0.694-0.188-0.184-0.433-0.275-0.731-0.275-0.296 0-0.542 0.094-0.74 0.279-0.197 0.187-0.324 0.466-0.381 0.838l-0.761-0.136c0.093-0.511 0.304-0.905 0.634-1.187 0.33-0.28 0.74-0.421 1.231-0.421 0.338 0 0.649 0.073 0.935 0.218 0.284 0.146 0.502 0.344 0.654 0.595 0.15 0.251 0.227 0.518 0.227 0.8 0 0.268-0.073 0.512-0.218 0.731-0.144 0.22-0.356 0.395-0.638 0.524 0.366 0.084 0.651 0.26 0.855 0.526 0.201 0.267 0.304 0.6 0.304 1.001 0 0.541-0.197 1-0.592 1.376-0.396 0.377-0.895 0.564-1.498 0.564-0.544 0-0.996-0.161-1.355-0.485-0.361-0.324-0.566-0.744-0.616-1.26zm5.126 1.637v-0.867h0.867v0.867h-0.867zm5.964-0.732v0.731h-4.099c-0.006-0.184 0.024-0.359 0.09-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.229-0.271 0.562-0.584 0.996-0.939 0.674-0.553 1.129-0.99 1.366-1.312 0.237-0.323 0.355-0.628 0.355-0.916 0-0.302-0.108-0.557-0.324-0.764-0.215-0.207-0.497-0.311-0.844-0.311-0.366
0-0.659 0.11-0.88 0.329-0.22 0.221-0.331 0.525-0.334 0.914l-0.783-0.08c0.054-0.584 0.256-1.029 0.606-1.335 0.349-0.306 0.818-0.459 1.408-0.459 0.594 0 1.065 0.165 1.412 0.495 0.348 0.33 0.521 0.739 0.521 1.227 0 0.248-0.051 0.492-0.153 0.731-0.101 0.24-0.27 0.492-0.505 0.758-0.234 0.265-0.627 0.628-1.174 1.092-0.456 0.383-0.75 0.643-0.88 0.779-0.129 0.137-0.236 0.274-0.321 0.413h3.042z"/>
+ <path fill-rule="evenodd" fill="#fcf9ce" d="m245.92 491.62zm-105.27-23.429zm0 23.429v-17.572l5.858-5.856h99.412v17.572l-5.856 5.856h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 467.69 245.6 485.27 239.75 491.12 140.33 491.12 140.33 473.55 146.19 467.69"/>
+ <path d="m140.65 468.19z" stroke-width="0"/>
+ <path d="m245.92 491.62z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#fdfad8" d="m245.92 491.62zm-105.27-23.429zm0 5.857 5.858-5.856h99.412l-5.856 5.856h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="239.75 473.55 140.33 473.55 146.19 467.69 245.6 467.69"/>
+ <path d="m140.65 468.19z" stroke-width="0"/>
+ <path d="m245.92 491.62z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#cccca3" d="m245.92 491.62zm-105.27-23.429zm99.414 23.429v-17.572l5.856-5.856v17.572l-5.856 5.856z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 485.27 239.75 491.12 239.75 473.55 245.6 467.69"/>
+ <path d="m140.65 468.19z" stroke-width="0"/>
+ <path d="m245.92 491.62z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m149.55 485.85v-4.491h0.681v0.63c0.142-0.22 0.328-0.397 0.562-0.531s0.5-0.201 0.8-0.201c0.332 0 0.605 0.07 0.818 0.207 0.213 0.139 0.362 0.332 0.45 0.579 0.355-0.524 0.818-0.786 1.388-0.786 0.445 0 0.787 0.124 1.027 0.371 0.24 0.245 0.359 0.626 0.359 1.14v3.083h-0.757v-2.83c0-0.304-0.024-0.522-0.074-0.657-0.049-0.134-0.139-0.241-0.269-0.323-0.13-0.083-0.281-0.122-0.457-0.122-0.315 0-0.577 0.104-0.786 0.314s-0.313 0.546-0.313 1.009v2.609h-0.761v-2.918c0-0.338-0.062-0.593-0.187-0.762s-0.327-0.253-0.608-0.253c-0.215 0-0.413 0.056-0.595 0.168-0.183 0.113-0.313 0.277-0.396 0.495s-0.122 0.53-0.122 0.938v2.331h-0.76zm7.551 1.823c-0.146 0-0.31-0.032-0.49-0.094l-0.085-0.715c0.167 0.045 0.312 0.067 0.437 0.067 0.169 0 0.304-0.027 0.405-0.083 0.102-0.058 0.185-0.136 0.25-0.237 0.048-0.077 0.125-0.266 0.232-0.566 0.015-0.043 0.036-0.105 0.067-0.188l-1.705-4.499h0.821l0.935 2.601c0.121 0.33 0.229 0.677 0.326 1.041 0.087-0.35 0.191-0.691 0.312-1.024l0.961-2.617h0.761l-1.
709 4.568c-0.184 0.492-0.325 0.832-0.427 1.019-0.136 0.251-0.291 0.435-0.466 0.552s-0.382 0.175-0.625 0.175zm3.909-1.823v-4.491h0.681v0.63c0.142-0.22 0.329-0.397 0.563-0.531 0.233-0.134 0.5-0.201 0.799-0.201 0.333 0 0.606 0.07 0.818 0.207 0.213 0.139 0.363 0.332 0.451 0.579 0.354-0.524 0.817-0.786 1.387-0.786 0.445 0 0.788 0.124 1.028 0.371 0.239 0.245 0.359 0.626 0.359 1.14v3.083h-0.757v-2.83c0-0.304-0.025-0.522-0.074-0.657-0.05-0.134-0.14-0.241-0.269-0.323-0.13-0.083-0.282-0.122-0.457-0.122-0.315 0-0.578 0.104-0.787 0.314-0.208 0.21-0.312 0.546-0.312 1.009v2.609h-0.762v-2.918c0-0.338-0.062-0.593-0.186-0.762s-0.327-0.253-0.609-0.253c-0.215 0-0.412 0.056-0.595 0.168-0.182 0.113-0.313 0.277-0.396 0.495-0.081 0.218-0.122 0.53-0.122 0.938v2.331h-0.76zm6.812-2.246c0-0.832 0.231-1.447 0.693-1.848 0.387-0.333 0.857-0.5 1.413-0.5 0.617 0 1.122 0.203 1.514 0.607 0.393 0.404 0.588 0.963 0.588 1.678 0 0.576-0.086 1.032-0.26 1.363-0.174 0.332-0.426 0.588-0.757 0.772-0.332 0.183-0.693 0.274-1.0
85 0.274-0.629 0-1.138-0.202-1.525-0.604-0.388-0.404-0.581-0.984-0.581-1.742zm0.782 0c0 0.575 0.126 1.006 0.376 1.292 0.251 0.287 0.567 0.43 0.948 0.43 0.377 0 0.692-0.145 0.943-0.431 0.251-0.288 0.376-0.727 0.376-1.316 0-0.557-0.126-0.977-0.379-1.262-0.252-0.287-0.565-0.43-0.94-0.43-0.381 0-0.697 0.143-0.948 0.426-0.25 0.286-0.376 0.715-0.376 1.291zm7.196 2.246v-0.566c-0.284 0.445-0.703 0.668-1.256 0.668-0.357 0-0.688-0.099-0.987-0.295-0.3-0.198-0.533-0.474-0.697-0.828-0.166-0.354-0.248-0.761-0.248-1.22 0-0.449 0.074-0.856 0.224-1.221s0.374-0.646 0.673-0.84c0.299-0.195 0.633-0.292 1.003-0.292 0.271 0 0.511 0.058 0.723 0.172s0.384 0.264 0.517 0.446v-2.226h0.757v6.201h-0.709zm-2.406-2.242c0 0.575 0.121 1.005 0.364 1.289 0.242 0.286 0.528 0.428 0.858 0.428 0.333 0 0.615-0.137 0.849-0.408 0.231-0.271 0.349-0.688 0.349-1.246 0-0.614-0.118-1.065-0.355-1.354s-0.529-0.431-0.876-0.431c-0.339 0-0.62 0.138-0.849 0.413-0.227 0.278-0.34 0.715-0.34 1.309zm3.9 0.38v-0.766h2.339v0.766h-2.339zm4.50
9 1.21c0.084 0 0.196-0.011 0.334-0.03l0.11 0.674c-0.215 0.045-0.406 0.067-0.576 0.067-0.275 0-0.49-0.045-0.642-0.131-0.153-0.088-0.261-0.203-0.322-0.346-0.062-0.142-0.093-0.441-0.093-0.898v-2.584h-0.559v-0.592h0.559v-1.113l0.757-0.457v1.57h0.766v0.592h-0.766v2.626c0 0.218 0.014 0.357 0.04 0.419 0.027 0.062 0.07 0.112 0.131 0.147 0.062 0.038 0.148 0.056 0.261 0.056zm0.78-1.594c0-0.832 0.231-1.447 0.694-1.848 0.387-0.333 0.857-0.5 1.412-0.5 0.618 0 1.122 0.203 1.514 0.607 0.394 0.404 0.588 0.963 0.588 1.678 0 0.576-0.086 1.032-0.259 1.363-0.174 0.332-0.427 0.588-0.759 0.772-0.331 0.183-0.691 0.274-1.084 0.274-0.629 0-1.138-0.202-1.525-0.604-0.388-0.404-0.581-0.984-0.581-1.742zm0.782 0c0 0.575 0.126 1.006 0.377 1.292 0.25 0.287 0.566 0.43 0.947 0.43 0.377 0 0.691-0.145 0.942-0.431 0.251-0.288 0.378-0.727 0.378-1.316 0-0.557-0.128-0.977-0.379-1.262-0.253-0.287-0.566-0.43-0.941-0.43-0.381 0-0.697 0.143-0.947 0.426-0.251 0.286-0.377 0.715-0.377 1.291zm3.999 0c0-0.832 0.231-1.447 0.694-1.8
48 0.386-0.333 0.857-0.5 1.412-0.5 0.618 0 1.123 0.203 1.515 0.607s0.588 0.963 0.588 1.678c0 0.576-0.087 1.032-0.26 1.363-0.173 0.332-0.427 0.588-0.758 0.772-0.33 0.183-0.692 0.274-1.085 0.274-0.629 0-1.137-0.202-1.525-0.604-0.388-0.404-0.581-0.984-0.581-1.742zm0.782 0c0 0.575 0.126 1.006 0.377 1.292 0.252 0.287 0.567 0.43 0.947 0.43 0.379 0 0.692-0.145 0.943-0.431 0.251-0.288 0.376-0.727 0.376-1.316 0-0.557-0.125-0.977-0.378-1.262-0.251-0.287-0.566-0.43-0.941-0.43-0.38 0-0.695 0.143-0.947 0.426-0.251 0.286-0.377 0.715-0.377 1.291zm4.189 2.246v-6.201h0.761v6.201h-0.761zm1.609-1.341 0.753-0.118c0.042 0.302 0.16 0.532 0.354 0.693 0.193 0.16 0.462 0.241 0.81 0.241 0.35 0 0.609-0.071 0.778-0.214s0.253-0.31 0.253-0.501c0-0.172-0.074-0.307-0.224-0.405-0.104-0.068-0.363-0.154-0.777-0.258-0.559-0.142-0.946-0.264-1.162-0.367-0.215-0.103-0.378-0.244-0.49-0.427-0.111-0.182-0.167-0.383-0.167-0.603 0-0.2 0.046-0.386 0.137-0.556 0.092-0.172 0.218-0.313 0.375-0.426 0.117-0.088 0.279-0.161 0.483-0.
222 0.205-0.062 0.425-0.092 0.659-0.092 0.352 0 0.661 0.052 0.928 0.152 0.267 0.103 0.463 0.238 0.591 0.413 0.126 0.174 0.214 0.405 0.261 0.695l-0.744 0.102c-0.033-0.231-0.131-0.411-0.294-0.542-0.161-0.13-0.391-0.194-0.687-0.194-0.351 0-0.599 0.058-0.749 0.173-0.15 0.116-0.224 0.252-0.224 0.406 0 0.101 0.03 0.188 0.093 0.268 0.062 0.081 0.159 0.149 0.292 0.203 0.075 0.028 0.3 0.093 0.673 0.193 0.537 0.146 0.914 0.262 1.128 0.354 0.212 0.09 0.379 0.225 0.5 0.399 0.12 0.174 0.182 0.392 0.182 0.651 0 0.253-0.074 0.493-0.223 0.717-0.147 0.224-0.36 0.398-0.64 0.521s-0.596 0.184-0.947 0.184c-0.585 0-1.029-0.121-1.335-0.364-0.308-0.239-0.502-0.6-0.587-1.076zm4.374-0.521v-0.766h2.34v0.766h-2.34zm6.971 1.13v0.731h-4.099c-0.006-0.183 0.024-0.359 0.089-0.529 0.104-0.279 0.271-0.554 0.501-0.824 0.229-0.271 0.562-0.584 0.996-0.939 0.675-0.552 1.13-0.99 1.366-1.312 0.237-0.323 0.354-0.628 0.354-0.916 0-0.302-0.107-0.556-0.323-0.764-0.215-0.207-0.496-0.311-0.843-0.311-0.368 0-0.66 0.11-0.879 0.329
-0.222 0.221-0.333 0.524-0.335 0.915l-0.782-0.081c0.054-0.583 0.255-1.028 0.604-1.334 0.351-0.307 0.819-0.46 1.409-0.46 0.596 0 1.065 0.165 1.413 0.495 0.347 0.33 0.521 0.738 0.521 1.227 0 0.248-0.052 0.492-0.153 0.731-0.103 0.241-0.27 0.492-0.505 0.758s-0.626 0.628-1.174 1.09c-0.456 0.385-0.75 0.645-0.88 0.781-0.129 0.138-0.237 0.275-0.321 0.413h3.041zm1.129 0.732v-0.867h0.868v0.867h-0.868zm1.967-1.638 0.763-0.101c0.086 0.432 0.235 0.742 0.446 0.933 0.209 0.189 0.465 0.285 0.767 0.285 0.359 0 0.661-0.124 0.908-0.372 0.247-0.247 0.369-0.556 0.369-0.922 0-0.35-0.114-0.639-0.343-0.865-0.228-0.227-0.519-0.34-0.871-0.34-0.144 0-0.322 0.028-0.537 0.084l0.086-0.668c0.05 0.006 0.09 0.009 0.122 0.009 0.324 0 0.615-0.085 0.875-0.254s0.39-0.431 0.39-0.784c0-0.277-0.096-0.509-0.283-0.692-0.189-0.184-0.434-0.275-0.731-0.275s-0.544 0.094-0.741 0.279c-0.197 0.187-0.325 0.466-0.381 0.837l-0.762-0.135c0.094-0.51 0.306-0.905 0.635-1.187 0.33-0.28 0.741-0.421 1.231-0.421 0.337 0 0.65 0.073 0.935 0.21
9 0.285 0.145 0.503 0.343 0.653 0.594 0.151 0.251 0.226 0.518 0.226 0.799 0 0.269-0.071 0.513-0.215 0.732-0.145 0.221-0.356 0.396-0.639 0.524 0.367 0.085 0.651 0.26 0.854 0.526 0.204 0.267 0.305 0.601 0.305 1.001 0 0.542-0.196 1-0.591 1.376-0.396 0.377-0.895 0.565-1.498 0.565-0.544 0-0.996-0.162-1.355-0.486-0.362-0.325-0.566-0.744-0.618-1.261zm5.206 1.638v-0.867h0.867v0.867h-0.867zm2.498-0.537c-0.409-0.516-0.613-1.356-0.613-2.521 0-0.732 0.075-1.322 0.227-1.77 0.15-0.446 0.375-0.791 0.673-1.034 0.297-0.242 0.67-0.364 1.121-0.364 0.335 0 0.626 0.066 0.877 0.202 0.251 0.133 0.458 0.326 0.622 0.579 0.163 0.252 0.292 0.56 0.385 0.922 0.093 0.361 0.14 0.851 0.14 1.465 0 0.728-0.074 1.314-0.225 1.763-0.149 0.447-0.373 0.793-0.671 1.035-0.297 0.244-0.672 0.365-1.128 0.365-0.597-0.001-1.066-0.213-1.408-0.642zm0.563-4.615c-0.263 0.377-0.394 1.075-0.394 2.093 0 1.019 0.119 1.696 0.357 2.033 0.239 0.337 0.532 0.505 0.881 0.505 0.351 0 0.645-0.17 0.884-0.508 0.238-0.339 0.357-1.016 0.357-2.03 0
-1.021-0.119-1.698-0.357-2.033-0.239-0.336-0.535-0.504-0.891-0.504-0.349 0-0.628 0.148-0.837 0.444zm4.033 5.152v-0.867h0.867v0.867h-0.867zm1.803 1.823c-0.205 0-0.404-0.026-0.596-0.081l0.143-0.646c0.153 0.039 0.272 0.059 0.36 0.059 0.155 0 0.271-0.051 0.348-0.153 0.076-0.104 0.113-0.361 0.113-0.772v-4.72h0.762v4.737c0 0.553-0.071 0.937-0.217 1.154-0.183 0.28-0.486 0.422-0.913 0.422zm0.368-7.14v-0.885h0.762v0.885h-0.762zm4.984 5.317c-0.078-0.158-0.13-0.342-0.152-0.555-0.281 0.24-0.553 0.409-0.813 0.508-0.261 0.1-0.541 0.148-0.84 0.148-0.494 0-0.873-0.12-1.139-0.362-0.264-0.24-0.396-0.549-0.396-0.924 0-0.22 0.05-0.421 0.149-0.603 0.101-0.183 0.232-0.327 0.394-0.437 0.163-0.111 0.345-0.193 0.548-0.251 0.15-0.039 0.376-0.077 0.677-0.114 0.614-0.073 1.067-0.16 1.357-0.262 0.004-0.104 0.005-0.171 0.005-0.198 0-0.311-0.072-0.528-0.215-0.656-0.196-0.172-0.483-0.258-0.868-0.258-0.357 0-0.622 0.063-0.793 0.188-0.17 0.126-0.297 0.349-0.379 0.666l-0.745-0.101c0.068-0.319 0.181-0.576 0.336-0.772
0.154-0.195 0.379-0.347 0.672-0.452 0.294-0.106 0.633-0.159 1.019-0.159 0.385 0 0.696 0.045 0.935 0.136 0.24 0.09 0.417 0.204 0.529 0.34 0.113 0.137 0.192 0.31 0.237 0.519 0.025 0.13 0.038 0.363 0.038 0.702v1.015c0 0.709 0.016 1.156 0.048 1.343 0.034 0.188 0.097 0.368 0.192 0.54h-0.796v-0.001zm-0.215-2.254c-0.275 0.112-0.69 0.208-1.242 0.288-0.314 0.045-0.534 0.096-0.664 0.151-0.13 0.057-0.231 0.139-0.301 0.248-0.071 0.108-0.105 0.228-0.105 0.36 0 0.203 0.076 0.373 0.229 0.509 0.154 0.135 0.38 0.203 0.675 0.203 0.293 0 0.555-0.064 0.782-0.193 0.229-0.128 0.396-0.304 0.504-0.526 0.081-0.172 0.122-0.426 0.122-0.762v-0.278zm1.828 2.254v-4.491h0.685v0.681c0.175-0.319 0.338-0.528 0.484-0.631 0.148-0.101 0.312-0.152 0.489-0.152 0.257 0 0.518 0.082 0.783 0.245l-0.263 0.707c-0.187-0.11-0.372-0.166-0.559-0.166-0.166 0-0.315 0.051-0.449 0.151-0.133 0.101-0.227 0.239-0.283 0.416-0.084 0.271-0.127 0.567-0.127 0.889v2.352h-0.76z"/>
+ <path fill-rule="evenodd" fill="#fcf9ce" d="m245.92 550.12zm-105.27-23.43zm0 23.43v-17.571l5.858-5.859h99.412v17.572l-5.856 5.858h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 526.18 245.6 543.76 239.75 549.62 140.33 549.62 140.33 532.04 146.19 526.18"/>
+ <path d="m140.65 526.68z" stroke-width="0"/>
+ <path d="m245.92 550.12z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#fdfad8" d="m245.92 550.12zm-105.27-23.43zm0 5.859 5.858-5.859h99.412l-5.856 5.859h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="239.75 532.04 140.33 532.04 146.19 526.18 245.6 526.18"/>
+ <path d="m140.65 526.68z" stroke-width="0"/>
+ <path d="m245.92 550.12z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#cccca3" d="m245.92 550.12zm-105.27-23.43zm99.414 23.43v-17.571l5.856-5.859v17.572l-5.856 5.858z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 543.76 239.75 549.62 239.75 532.04 245.6 526.18"/>
+ <path d="m140.65 526.68z" stroke-width="0"/>
+ <path d="m245.92 550.12z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m145.92 544.34v-4.492h0.682v0.63c0.141-0.22 0.328-0.397 0.562-0.53 0.234-0.135 0.501-0.202 0.799-0.202 0.333 0 0.606 0.07 0.819 0.209 0.212 0.137 0.362 0.33 0.45 0.578 0.355-0.523 0.818-0.787 1.388-0.787 0.445 0 0.788 0.124 1.027 0.371 0.24 0.247 0.359 0.627 0.359 1.141v3.083h-0.757v-2.83c0-0.305-0.024-0.523-0.074-0.658-0.049-0.134-0.139-0.241-0.269-0.323s-0.282-0.122-0.457-0.122c-0.315 0-0.577 0.104-0.786 0.314-0.209 0.209-0.312 0.547-0.312 1.009v2.61h-0.762v-2.92c0-0.337-0.062-0.592-0.187-0.761-0.124-0.17-0.327-0.253-0.608-0.253-0.215 0-0.413 0.056-0.595 0.168-0.183 0.113-0.313 0.278-0.396 0.495-0.082 0.218-0.123 0.531-0.123 0.939v2.331h-0.76zm7.552 1.823c-0.146 0-0.311-0.031-0.491-0.094l-0.084-0.715c0.167 0.046 0.312 0.068 0.436 0.068 0.169 0 0.305-0.028 0.406-0.085 0.102-0.058 0.185-0.136 0.25-0.237 0.048-0.076 0.125-0.265 0.232-0.567 0.014-0.041 0.036-0.104 0.067-0.186l-1.705-4.5h0.821l0.935 2.602c0.121 0.33 0.229 0.677 0.326 1.04 0.087-0.35 0.191-0.69
1 0.312-1.024l0.96-2.617h0.762l-1.709 4.567c-0.184 0.494-0.325 0.833-0.427 1.021-0.136 0.25-0.291 0.434-0.466 0.552-0.174 0.115-0.382 0.175-0.625 0.175zm3.909-1.823v-4.492h0.681v0.63c0.142-0.22 0.329-0.397 0.562-0.53 0.234-0.135 0.501-0.202 0.8-0.202 0.333 0 0.605 0.07 0.818 0.209 0.213 0.137 0.363 0.33 0.45 0.578 0.355-0.523 0.817-0.787 1.388-0.787 0.445 0 0.788 0.124 1.028 0.371 0.239 0.247 0.359 0.627 0.359 1.141v3.083h-0.758v-2.83c0-0.305-0.024-0.523-0.074-0.658-0.049-0.134-0.139-0.241-0.269-0.323-0.129-0.082-0.281-0.122-0.456-0.122-0.316 0-0.578 0.104-0.787 0.314-0.209 0.209-0.313 0.547-0.313 1.009v2.61h-0.761v-2.92c0-0.337-0.062-0.592-0.187-0.761-0.124-0.17-0.327-0.253-0.609-0.253-0.214 0-0.411 0.056-0.594 0.168-0.182 0.113-0.313 0.278-0.396 0.495-0.082 0.218-0.122 0.531-0.122 0.939v2.331h-0.76zm6.812-2.246c0-0.832 0.231-1.448 0.693-1.849 0.387-0.333 0.856-0.5 1.413-0.5 0.617 0 1.122 0.203 1.514 0.608 0.393 0.403 0.588 0.963 0.588 1.677 0 0.578-0.087 1.032-0.26 1.363-0.174 0.3
32-0.426 0.59-0.758 0.772-0.331 0.184-0.692 0.274-1.084 0.274-0.629 0-1.138-0.2-1.525-0.604-0.388-0.402-0.581-0.983-0.581-1.741zm0.782 0c0 0.574 0.126 1.006 0.377 1.292 0.25 0.286 0.566 0.43 0.947 0.43 0.377 0 0.691-0.145 0.943-0.432 0.25-0.288 0.376-0.727 0.376-1.315 0-0.556-0.126-0.978-0.379-1.263-0.252-0.287-0.565-0.43-0.94-0.43-0.381 0-0.697 0.142-0.947 0.428-0.251 0.284-0.377 0.714-0.377 1.29zm7.196 2.246v-0.567c-0.284 0.444-0.703 0.668-1.256 0.668-0.357 0-0.687-0.099-0.987-0.296-0.301-0.198-0.533-0.473-0.698-0.826s-0.247-0.761-0.247-1.222c0-0.447 0.075-0.854 0.224-1.219 0.149-0.367 0.374-0.646 0.673-0.84 0.299-0.195 0.633-0.293 1.003-0.293 0.271 0 0.511 0.057 0.723 0.172s0.384 0.264 0.516 0.446v-2.225h0.758v6.201h-0.709zm-2.406-2.243c0 0.576 0.121 1.006 0.364 1.291 0.242 0.285 0.528 0.428 0.858 0.428 0.333 0 0.615-0.137 0.849-0.409 0.231-0.271 0.349-0.687 0.349-1.245 0-0.614-0.119-1.065-0.355-1.354-0.237-0.288-0.529-0.432-0.876-0.432-0.338 0-0.621 0.139-0.848 0.414-0.228 0.276
-0.341 0.713-0.341 1.307zm3.9 0.381v-0.766h2.34v0.766h-2.34zm6.97 1.13v0.731h-4.098c-0.006-0.184 0.023-0.36 0.089-0.528 0.104-0.279 0.271-0.555 0.501-0.825 0.229-0.271 0.562-0.585 0.996-0.94 0.674-0.552 1.129-0.989 1.366-1.312 0.236-0.323 0.355-0.628 0.355-0.915 0-0.302-0.108-0.558-0.324-0.764-0.215-0.207-0.497-0.312-0.843-0.312-0.367 0-0.66 0.11-0.88 0.331-0.221 0.219-0.332 0.523-0.335 0.913l-0.782-0.081c0.054-0.583 0.255-1.028 0.604-1.335 0.35-0.306 0.819-0.458 1.409-0.458 0.594 0 1.065 0.166 1.412 0.494 0.347 0.331 0.521 0.739 0.521 1.227 0 0.25-0.051 0.492-0.152 0.733-0.102 0.238-0.27 0.491-0.506 0.756-0.235 0.266-0.627 0.63-1.173 1.092-0.457 0.383-0.751 0.644-0.88 0.78-0.13 0.137-0.237 0.274-0.321 0.413h3.041zm1.208 0.732v-0.867h0.867v0.867h-0.867zm1.969-1.638 0.761-0.102c0.086 0.432 0.235 0.742 0.446 0.934 0.209 0.19 0.465 0.284 0.767 0.284 0.359 0 0.661-0.123 0.908-0.371s0.369-0.556 0.369-0.922c0-0.351-0.113-0.638-0.342-0.866-0.228-0.227-0.519-0.34-0.871-0.34-0.144 0-0.323 0.
027-0.538 0.085l0.086-0.669c0.05 0.006 0.092 0.008 0.123 0.008 0.323 0 0.614-0.084 0.874-0.254 0.26-0.168 0.39-0.43 0.39-0.781 0-0.279-0.096-0.511-0.283-0.694-0.188-0.183-0.433-0.275-0.731-0.275-0.297 0-0.544 0.094-0.74 0.279-0.197 0.187-0.325 0.467-0.382 0.838l-0.76-0.135c0.092-0.512 0.305-0.907 0.634-1.188s0.741-0.42 1.23-0.42c0.338 0 0.651 0.072 0.935 0.217 0.285 0.146 0.503 0.344 0.653 0.596 0.151 0.25 0.227 0.517 0.227 0.799 0 0.269-0.072 0.512-0.216 0.731-0.144 0.221-0.356 0.395-0.638 0.524 0.367 0.085 0.65 0.26 0.854 0.527 0.203 0.267 0.306 0.6 0.306 1 0 0.542-0.198 1-0.593 1.376-0.395 0.378-0.895 0.565-1.497 0.565-0.545 0-0.997-0.162-1.355-0.485-0.363-0.324-0.567-0.745-0.617-1.261zm5.126 1.638v-0.867h0.866v0.867h-0.866zm2.577-0.537c-0.409-0.516-0.612-1.356-0.612-2.521 0-0.733 0.074-1.323 0.226-1.771 0.15-0.446 0.375-0.791 0.672-1.034s0.672-0.363 1.123-0.363c0.333 0 0.624 0.066 0.875 0.2 0.252 0.134 0.458 0.327 0.623 0.58 0.162 0.252 0.291 0.56 0.384 0.922 0.094 0.362 0.14 0.
851 0.14 1.466 0 0.728-0.074 1.315-0.225 1.762-0.149 0.446-0.372 0.792-0.67 1.037-0.297 0.243-0.673 0.365-1.127 0.365-0.598-0.001-1.068-0.216-1.409-0.643zm0.563-4.616c-0.262 0.377-0.395 1.076-0.395 2.094 0 1.019 0.119 1.695 0.358 2.032 0.238 0.337 0.532 0.505 0.882 0.505s0.644-0.168 0.882-0.507c0.238-0.338 0.357-1.015 0.357-2.03 0-1.021-0.119-1.699-0.357-2.034-0.238-0.337-0.535-0.504-0.891-0.504-0.349 0-0.628 0.149-0.836 0.444zm3.521 3.291v-0.766h2.339v0.766h-2.339zm6.094 1.862v-0.567c-0.284 0.444-0.702 0.668-1.256 0.668-0.357 0-0.688-0.099-0.987-0.296-0.301-0.198-0.533-0.473-0.698-0.826s-0.248-0.761-0.248-1.222c0-0.447 0.075-0.854 0.225-1.219 0.149-0.367 0.374-0.646 0.673-0.84 0.3-0.195 0.634-0.293 1.003-0.293 0.271 0 0.511 0.057 0.723 0.172s0.384 0.264 0.516 0.446v-2.225h0.759v6.201h-0.71zm-2.405-2.243c0 0.576 0.12 1.006 0.363 1.291s0.528 0.428 0.857 0.428c0.334 0 0.616-0.137 0.849-0.409 0.233-0.271 0.349-0.687 0.349-1.245 0-0.614-0.117-1.065-0.354-1.354s-0.529-0.432-0.876-0.432c-
0.339 0-0.62 0.139-0.848 0.414-0.228 0.276-0.34 0.713-0.34 1.307zm3.912-0.003c0-0.832 0.231-1.448 0.693-1.849 0.386-0.333 0.857-0.5 1.412-0.5 0.618 0 1.124 0.203 1.515 0.608 0.392 0.403 0.589 0.963 0.589 1.677 0 0.578-0.088 1.032-0.261 1.363-0.173 0.332-0.427 0.59-0.758 0.772-0.33 0.184-0.692 0.274-1.085 0.274-0.628 0-1.136-0.2-1.523-0.604-0.389-0.402-0.582-0.983-0.582-1.741zm0.782 0c0 0.574 0.126 1.006 0.376 1.292 0.252 0.286 0.567 0.43 0.947 0.43 0.379 0 0.693-0.145 0.943-0.432 0.252-0.288 0.376-0.727 0.376-1.315 0-0.556-0.124-0.978-0.378-1.263-0.251-0.287-0.565-0.43-0.941-0.43-0.38 0-0.695 0.142-0.947 0.428-0.25 0.284-0.376 0.714-0.376 1.29zm7.214 0.6 0.748 0.097c-0.081 0.517-0.291 0.92-0.628 1.211-0.336 0.293-0.75 0.438-1.241 0.438-0.614 0-1.108-0.2-1.482-0.603-0.373-0.401-0.561-0.978-0.561-1.729 0-0.484 0.081-0.908 0.242-1.271 0.16-0.365 0.404-0.637 0.733-0.818 0.329-0.183 0.686-0.274 1.072-0.274 0.487 0 0.887 0.124 1.196 0.371 0.311 0.247 0.51 0.597 0.597 1.05l-0.74 0.115c-0.0
7-0.302-0.195-0.528-0.374-0.681s-0.396-0.229-0.648-0.229c-0.385 0-0.696 0.138-0.935 0.413-0.241 0.274-0.36 0.71-0.36 1.305 0 0.604 0.115 1.042 0.347 1.316 0.231 0.272 0.533 0.41 0.905 0.41 0.298 0 0.548-0.093 0.747-0.275 0.201-0.184 0.328-0.466 0.382-0.846zm1.572 1.646v-0.867h0.867v0.867h-0.867zm3.503-0.653c0.085 0 0.195-0.01 0.335-0.029l0.11 0.673c-0.215 0.045-0.406 0.066-0.576 0.066-0.276 0-0.491-0.043-0.643-0.13-0.152-0.088-0.26-0.203-0.322-0.345-0.062-0.143-0.092-0.442-0.092-0.899v-2.584h-0.559v-0.592h0.559v-1.112l0.757-0.456v1.568h0.766v0.592h-0.766v2.627c0 0.216 0.013 0.355 0.04 0.418 0.025 0.062 0.07 0.112 0.131 0.148 0.062 0.037 0.148 0.055 0.26 0.055zm4.147 0.653c-0.079-0.158-0.13-0.343-0.152-0.555-0.281 0.24-0.552 0.409-0.814 0.507-0.26 0.1-0.541 0.148-0.839 0.148-0.494 0-0.873-0.12-1.139-0.36-0.266-0.242-0.396-0.551-0.396-0.925 0-0.221 0.05-0.422 0.149-0.604 0.1-0.181 0.231-0.327 0.394-0.438s0.345-0.192 0.548-0.25c0.149-0.038 0.375-0.077 0.677-0.113 0.614-0.073 1.067-0.16
1 1.358-0.263 0.002-0.104 0.004-0.17 0.004-0.198 0-0.311-0.072-0.529-0.217-0.656-0.193-0.172-0.483-0.258-0.866-0.258-0.358 0-0.622 0.062-0.794 0.188-0.17 0.126-0.297 0.349-0.378 0.667l-0.745-0.102c0.068-0.318 0.18-0.576 0.334-0.772 0.156-0.195 0.381-0.347 0.673-0.452 0.294-0.105 0.634-0.159 1.02-0.159 0.384 0 0.695 0.045 0.936 0.136 0.239 0.09 0.416 0.204 0.528 0.34 0.113 0.138 0.191 0.31 0.236 0.52 0.026 0.13 0.039 0.364 0.039 0.702v1.016c0 0.706 0.016 1.154 0.049 1.342 0.032 0.188 0.096 0.367 0.191 0.54h-0.796v-0.001zm-0.215-2.255c-0.277 0.112-0.691 0.209-1.244 0.288-0.313 0.045-0.534 0.096-0.663 0.152-0.132 0.056-0.231 0.139-0.301 0.247-0.071 0.108-0.105 0.229-0.105 0.362 0 0.203 0.076 0.371 0.229 0.507 0.152 0.135 0.378 0.203 0.675 0.203 0.293 0 0.555-0.064 0.782-0.192 0.229-0.129 0.396-0.304 0.504-0.526 0.08-0.172 0.123-0.426 0.123-0.762v-0.279zm1.903 2.255v-4.492h0.687v0.681c0.176-0.319 0.337-0.528 0.484-0.631 0.148-0.102 0.311-0.152 0.489-0.152 0.256 0 0.517 0.083 0.782 0.246
l-0.264 0.707c-0.186-0.11-0.371-0.166-0.558-0.166-0.166 0-0.315 0.05-0.447 0.15-0.134 0.1-0.229 0.239-0.284 0.416-0.085 0.271-0.127 0.567-0.127 0.889v2.353h-0.762zm2.539 0v-0.867h0.866v0.867h-0.866zm2.035 0.371 0.74 0.11c0.03 0.229 0.117 0.395 0.258 0.499 0.188 0.141 0.447 0.212 0.774 0.212 0.352 0 0.624-0.071 0.815-0.212 0.192-0.141 0.321-0.338 0.39-0.592 0.039-0.155 0.059-0.481 0.054-0.978-0.331 0.394-0.746 0.589-1.242 0.589-0.618 0-1.096-0.224-1.435-0.669-0.338-0.446-0.507-0.98-0.507-1.603 0-0.43 0.077-0.824 0.232-1.187 0.154-0.363 0.38-0.643 0.674-0.84 0.296-0.197 0.642-0.297 1.039-0.297 0.529 0 0.967 0.215 1.312 0.644v-0.541h0.702v3.883c0 0.699-0.071 1.194-0.214 1.485-0.143 0.293-0.368 0.523-0.677 0.693-0.309 0.169-0.688 0.254-1.14 0.254-0.536 0-0.969-0.122-1.299-0.362-0.327-0.24-0.487-0.602-0.476-1.088zm0.63-2.698c0 0.59 0.117 1.02 0.352 1.29 0.232 0.271 0.527 0.406 0.879 0.406 0.351 0 0.643-0.135 0.88-0.403 0.237-0.271 0.355-0.692 0.355-1.267 0-0.551-0.122-0.965-0.366-1.244-0
.243-0.279-0.538-0.419-0.882-0.419-0.338 0-0.626 0.138-0.862 0.412-0.238 0.275-0.356 0.684-0.356 1.225zm3.89 2.327v-0.619l2.859-3.281c-0.325 0.017-0.611 0.025-0.859 0.025h-1.831v-0.617h3.671v0.502l-2.432 2.853-0.47 0.519c0.342-0.024 0.661-0.037 0.961-0.037h2.076v0.656h-3.975z"/>
+ <path fill-rule="evenodd" fill="#fcf9ce" d="m245.92 573.46zm-105.27-23.348zm0 23.348v-17.572l5.858-5.775h99.412v17.491l-5.856 5.856h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 549.62 245.6 567.11 239.75 572.96 140.33 572.96 140.33 555.39 146.19 549.62"/>
+ <path d="m140.65 550.12z" stroke-width="0"/>
+ <path d="m245.92 573.46z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#fdfad8" d="m245.92 573.46zm-105.27-23.348zm0 5.776 5.858-5.775h99.412l-5.856 5.775h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="239.75 555.39 140.33 555.39 146.19 549.62 245.6 549.62"/>
+ <path d="m140.65 550.12z" stroke-width="0"/>
+ <path d="m245.92 573.46z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#cccca3" d="m245.92 573.46zm-105.27-23.348zm99.414 23.348v-17.572l5.856-5.775v17.491l-5.856 5.856z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 567.11 239.75 572.96 239.75 555.39 245.6 549.62"/>
+ <path d="m140.65 550.12z" stroke-width="0"/>
+ <path d="m245.92 573.46z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m150.87 567.69v-4.492h0.682v0.631c0.141-0.221 0.328-0.396 0.562-0.531 0.234-0.134 0.5-0.2 0.799-0.2 0.333 0 0.606 0.068 0.818 0.207 0.213 0.138 0.363 0.331 0.451 0.579 0.354-0.524 0.817-0.786 1.387-0.786 0.446 0 0.788 0.123 1.028 0.369 0.239 0.247 0.359 0.627 0.359 1.141v3.083h-0.757v-2.829c0-0.306-0.025-0.524-0.074-0.658s-0.139-0.242-0.269-0.324c-0.13-0.081-0.282-0.122-0.457-0.122-0.315 0-0.578 0.105-0.787 0.315-0.208 0.21-0.312 0.546-0.312 1.009v2.609h-0.762v-2.917c0-0.34-0.062-0.594-0.186-0.763-0.124-0.17-0.327-0.254-0.609-0.254-0.215 0-0.412 0.057-0.594 0.17-0.183 0.112-0.314 0.277-0.396 0.494s-0.123 0.53-0.123 0.938v2.331h-0.76zm7.638 1.823c-0.147 0-0.311-0.031-0.491-0.094l-0.085-0.714c0.167 0.045 0.312 0.067 0.437 0.067 0.169 0 0.304-0.028 0.405-0.085 0.102-0.056 0.186-0.135 0.25-0.236 0.048-0.076 0.125-0.266 0.232-0.566 0.015-0.043 0.037-0.104 0.068-0.187l-1.705-4.501h0.82l0.935 2.602c0.122 0.33 0.23 0.677 0.326 1.041 0.088-0.35 0.191-0.691 0.313-1.0
23l0.96-2.619h0.761l-1.709 4.567c-0.183 0.494-0.325 0.835-0.427 1.021-0.135 0.251-0.29 0.436-0.465 0.553-0.173 0.114-0.382 0.174-0.625 0.174zm3.909-1.823v-4.492h0.682v0.631c0.141-0.221 0.328-0.396 0.562-0.531 0.233-0.134 0.5-0.2 0.799-0.2 0.333 0 0.605 0.068 0.818 0.207 0.214 0.138 0.363 0.331 0.451 0.579 0.354-0.524 0.817-0.786 1.387-0.786 0.446 0 0.789 0.123 1.028 0.369 0.239 0.247 0.359 0.627 0.359 1.141v3.083h-0.757v-2.829c0-0.306-0.024-0.524-0.074-0.658-0.049-0.134-0.139-0.242-0.269-0.324-0.13-0.081-0.282-0.122-0.457-0.122-0.315 0-0.578 0.105-0.786 0.315-0.209 0.21-0.313 0.546-0.313 1.009v2.609h-0.762v-2.917c0-0.34-0.062-0.594-0.186-0.763-0.125-0.17-0.327-0.254-0.609-0.254-0.215 0-0.412 0.057-0.594 0.17-0.182 0.112-0.314 0.277-0.396 0.494s-0.123 0.53-0.123 0.938v2.331h-0.76zm6.811-2.247c0-0.831 0.231-1.448 0.694-1.849 0.386-0.332 0.856-0.498 1.412-0.498 0.618 0 1.123 0.201 1.515 0.606s0.588 0.964 0.588 1.677c0 0.578-0.087 1.032-0.26 1.364-0.175 0.331-0.427 0.589-0.758 0.772s-0.
692 0.274-1.085 0.274c-0.629 0-1.137-0.201-1.524-0.605-0.388-0.401-0.582-0.981-0.582-1.741zm0.783 0c0 0.575 0.125 1.007 0.376 1.292 0.251 0.286 0.566 0.43 0.947 0.43 0.378 0 0.691-0.144 0.943-0.432 0.251-0.288 0.376-0.726 0.376-1.314 0-0.557-0.126-0.977-0.378-1.264-0.253-0.285-0.566-0.429-0.941-0.429-0.381 0-0.696 0.144-0.947 0.427-0.251 0.287-0.376 0.716-0.376 1.29zm7.197 2.247v-0.567c-0.285 0.447-0.703 0.669-1.256 0.669-0.358 0-0.688-0.1-0.988-0.297-0.3-0.195-0.533-0.473-0.697-0.826-0.165-0.354-0.248-0.761-0.248-1.219 0-0.449 0.075-0.856 0.225-1.222 0.149-0.364 0.374-0.646 0.672-0.839 0.299-0.195 0.634-0.292 1.003-0.292 0.271 0 0.512 0.057 0.724 0.171 0.211 0.114 0.383 0.263 0.516 0.446v-2.225h0.758v6.2h-0.709zm-2.407-2.241c0 0.574 0.121 1.004 0.363 1.289 0.242 0.284 0.528 0.427 0.858 0.427 0.333 0 0.615-0.136 0.849-0.408 0.232-0.271 0.349-0.688 0.349-1.246 0-0.614-0.118-1.065-0.355-1.354-0.236-0.287-0.528-0.431-0.876-0.431-0.338 0-0.62 0.138-0.848 0.414-0.227 0.278-0.34 0.713-0.3
4 1.309zm3.9 0.38v-0.766h2.34v0.766h-2.34zm6.97 1.129v0.731h-4.099c-0.005-0.183 0.023-0.358 0.089-0.528 0.104-0.279 0.271-0.555 0.501-0.825 0.23-0.271 0.562-0.583 0.996-0.938 0.675-0.553 1.13-0.99 1.366-1.313 0.236-0.322 0.356-0.628 0.356-0.916 0-0.302-0.108-0.556-0.324-0.764-0.216-0.207-0.497-0.312-0.845-0.312-0.365 0-0.659 0.111-0.879 0.331-0.22 0.221-0.331 0.524-0.334 0.913l-0.782-0.079c0.054-0.585 0.254-1.029 0.604-1.335 0.349-0.307 0.819-0.459 1.408-0.459 0.595 0 1.065 0.165 1.413 0.494 0.347 0.33 0.52 0.738 0.52 1.228 0 0.248-0.051 0.492-0.151 0.731-0.102 0.239-0.271 0.492-0.506 0.758-0.235 0.265-0.627 0.628-1.173 1.09-0.458 0.384-0.751 0.645-0.88 0.781-0.132 0.136-0.236 0.273-0.322 0.412h3.042zm1.13 0.732v-0.866h0.867v0.866h-0.867zm1.968-1.637 0.761-0.102c0.088 0.433 0.237 0.743 0.445 0.933 0.211 0.19 0.468 0.286 0.77 0.286 0.357 0 0.659-0.125 0.906-0.373s0.371-0.556 0.371-0.922c0-0.349-0.115-0.638-0.343-0.864-0.229-0.228-0.519-0.341-0.872-0.341-0.143 0-0.322 0.028-0.536 0.08
4l0.084-0.668c0.052 0.005 0.091 0.01 0.122 0.01 0.324 0 0.618-0.086 0.877-0.256 0.259-0.169 0.388-0.429 0.388-0.782 0-0.278-0.094-0.509-0.284-0.694-0.188-0.183-0.432-0.273-0.73-0.273-0.296 0-0.543 0.093-0.739 0.279-0.199 0.186-0.325 0.465-0.382 0.837l-0.761-0.136c0.093-0.509 0.305-0.905 0.634-1.186 0.33-0.281 0.74-0.421 1.231-0.421 0.339 0 0.649 0.072 0.935 0.217 0.284 0.146 0.503 0.345 0.654 0.595 0.15 0.252 0.227 0.518 0.227 0.8 0 0.269-0.073 0.512-0.217 0.731s-0.357 0.396-0.639 0.525c0.366 0.083 0.651 0.26 0.855 0.526 0.202 0.266 0.304 0.599 0.304 1 0 0.541-0.198 1-0.593 1.377-0.395 0.376-0.894 0.563-1.496 0.563-0.546 0-0.997-0.162-1.356-0.485-0.36-0.324-0.565-0.744-0.616-1.26zm5.205 1.637v-0.866h0.866v0.866h-0.866zm2.575-0.538c-0.408-0.516-0.612-1.355-0.612-2.521 0-0.734 0.075-1.323 0.226-1.771 0.152-0.447 0.376-0.791 0.673-1.033 0.299-0.243 0.673-0.364 1.124-0.364 0.333 0 0.625 0.066 0.875 0.2 0.25 0.135 0.459 0.327 0.622 0.58s0.291 0.559 0.385 0.922c0.092 0.362 0.14 0.851 0.14
1.466 0 0.727-0.075 1.314-0.224 1.762-0.15 0.447-0.374 0.791-0.67 1.036-0.299 0.244-0.675 0.365-1.128 0.365-0.599 0.001-1.069-0.213-1.411-0.642zm0.564-4.614c-0.263 0.378-0.394 1.076-0.394 2.094s0.119 1.695 0.358 2.032c0.238 0.337 0.531 0.506 0.882 0.506 0.349 0 0.645-0.17 0.882-0.508 0.238-0.339 0.356-1.016 0.356-2.03 0-1.021-0.118-1.699-0.356-2.035-0.237-0.335-0.535-0.504-0.891-0.504-0.35 0-0.628 0.148-0.837 0.445zm3.443 3.291v-0.766h2.34v0.766h-2.34zm6.096 1.861v-0.567c-0.286 0.447-0.705 0.669-1.257 0.669-0.357 0-0.688-0.1-0.988-0.297-0.299-0.195-0.532-0.473-0.697-0.826s-0.247-0.761-0.247-1.219c0-0.449 0.074-0.856 0.224-1.222 0.149-0.364 0.374-0.646 0.673-0.839 0.299-0.195 0.633-0.292 1.002-0.292 0.271 0 0.513 0.057 0.724 0.171s0.384 0.263 0.516 0.446v-2.225h0.758v6.2h-0.708zm-2.407-2.241c0 0.574 0.121 1.004 0.364 1.289 0.241 0.284 0.528 0.427 0.859 0.427 0.33 0 0.614-0.136 0.846-0.408 0.233-0.271 0.35-0.688 0.35-1.246 0-0.614-0.118-1.065-0.355-1.354-0.236-0.287-0.528-0.431-0.875
-0.431-0.338 0-0.621 0.138-0.849 0.414-0.227 0.278-0.34 0.713-0.34 1.309zm3.99-0.006c0-0.831 0.231-1.448 0.694-1.849 0.387-0.332 0.857-0.498 1.412-0.498 0.618 0 1.123 0.201 1.515 0.606 0.393 0.405 0.588 0.964 0.588 1.677 0 0.578-0.086 1.032-0.26 1.364-0.174 0.331-0.426 0.589-0.759 0.772-0.329 0.183-0.691 0.274-1.084 0.274-0.628 0-1.138-0.201-1.524-0.605-0.389-0.401-0.582-0.981-0.582-1.741zm0.782 0c0 0.575 0.126 1.007 0.377 1.292 0.252 0.286 0.567 0.43 0.947 0.43 0.379 0 0.692-0.144 0.942-0.432 0.251-0.288 0.378-0.726 0.378-1.314 0-0.557-0.127-0.977-0.379-1.264-0.253-0.285-0.566-0.429-0.941-0.429-0.38 0-0.695 0.144-0.947 0.427-0.251 0.287-0.377 0.716-0.377 1.29zm7.137 0.601 0.748 0.097c-0.082 0.517-0.29 0.921-0.627 1.213-0.338 0.292-0.751 0.438-1.242 0.438-0.614 0-1.108-0.2-1.482-0.602-0.374-0.403-0.561-0.979-0.561-1.729 0-0.485 0.079-0.91 0.24-1.273s0.406-0.637 0.735-0.818c0.327-0.183 0.685-0.272 1.071-0.272 0.488 0 0.887 0.123 1.197 0.369 0.31 0.247 0.509 0.598 0.597 1.051l-0.741 0
.115c-0.069-0.303-0.195-0.529-0.373-0.682-0.18-0.151-0.396-0.228-0.65-0.228-0.384 0-0.695 0.137-0.935 0.411-0.239 0.276-0.359 0.711-0.359 1.306 0 0.604 0.115 1.042 0.347 1.315s0.534 0.41 0.905 0.41c0.299 0 0.549-0.092 0.75-0.274 0.2-0.184 0.326-0.467 0.38-0.847zm1.65 1.646v-0.866h0.866v0.866h-0.866zm1.774 0v-0.616l2.858-3.283c-0.324 0.017-0.61 0.025-0.859 0.025h-1.83v-0.618h3.672v0.504l-2.433 2.851-0.469 0.521c0.34-0.026 0.66-0.039 0.959-0.039h2.077v0.655h-3.975zm4.77-5.327v-0.874h0.762v0.874h-0.762zm0 5.327v-4.492h0.762v4.492h-0.762zm1.895 1.722v-6.215h0.693v0.584c0.163-0.228 0.349-0.399 0.554-0.514 0.206-0.114 0.455-0.171 0.749-0.171 0.383 0 0.723 0.099 1.015 0.296 0.294 0.197 0.515 0.477 0.664 0.835 0.149 0.359 0.225 0.753 0.225 1.183 0 0.46-0.083 0.872-0.247 1.241-0.166 0.368-0.405 0.649-0.719 0.846-0.316 0.196-0.646 0.294-0.993 0.294-0.253 0-0.481-0.054-0.683-0.161-0.202-0.105-0.368-0.241-0.497-0.406v2.188h-0.761zm0.689-3.942c0 0.577 0.117 1.005 0.35 1.281 0.235 0.277 0.519 0.4
14 0.85 0.414 0.34 0 0.63-0.144 0.87-0.43 0.242-0.285 0.361-0.73 0.361-1.329 0-0.573-0.117-1.002-0.353-1.286-0.235-0.285-0.518-0.428-0.844-0.428-0.325 0-0.61 0.151-0.86 0.454-0.251 0.304-0.374 0.745-0.374 1.324z"/>
+ <path fill-rule="evenodd" fill="#fcf9ce" d="m245.92 631.96zm-105.27-23.431zm0 23.431v-17.574l5.858-5.856h99.412v17.572l-5.856 5.858h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 608.02 245.6 625.6 239.75 631.46 140.33 631.46 140.33 613.88 146.19 608.02"/>
+ <path d="m140.65 608.52z" stroke-width="0"/>
+ <path d="m245.92 631.96z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#fdfad8" d="m245.92 631.96zm-105.27-23.431zm0 5.857 5.858-5.856h99.412l-5.856 5.856h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="239.75 613.88 140.33 613.88 146.19 608.02 245.6 608.02"/>
+ <path d="m140.65 608.52z" stroke-width="0"/>
+ <path d="m245.92 631.96z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#cccca3" d="m245.92 631.96zm-105.27-23.431zm99.414 23.431v-17.574l5.856-5.856v17.572l-5.856 5.858z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 625.6 239.75 631.46 239.75 613.88 245.6 608.02"/>
+ <path d="m140.65 608.52z" stroke-width="0"/>
+ <path d="m245.92 631.96z" stroke-width="0"/>
+ </g>
+ <path fill="#010101" d="m152.03 626.18v-4.492h0.68v0.63c0.142-0.221 0.328-0.396 0.562-0.531 0.234-0.134 0.501-0.2 0.8-0.2 0.333 0 0.605 0.069 0.818 0.207 0.213 0.139 0.363 0.332 0.45 0.58 0.355-0.524 0.818-0.787 1.388-0.787 0.445 0 0.788 0.123 1.028 0.369 0.239 0.248 0.359 0.628 0.359 1.14v3.085h-0.757v-2.83c0-0.305-0.025-0.524-0.074-0.657-0.05-0.135-0.14-0.242-0.269-0.324-0.13-0.081-0.282-0.123-0.457-0.123-0.316 0-0.578 0.106-0.787 0.314-0.208 0.211-0.312 0.547-0.312 1.01v2.61h-0.762v-2.919c0-0.339-0.062-0.592-0.186-0.761-0.124-0.17-0.327-0.255-0.609-0.255-0.214 0-0.412 0.057-0.594 0.17-0.183 0.112-0.314 0.278-0.396 0.494-0.081 0.218-0.122 0.53-0.122 0.939v2.331h-0.76zm7.638 1.822c-0.147 0-0.311-0.03-0.491-0.093l-0.085-0.715c0.166 0.045 0.312 0.068 0.437 0.068 0.169 0 0.304-0.028 0.405-0.085s0.186-0.135 0.25-0.237c0.048-0.076 0.125-0.264 0.232-0.567 0.015-0.041 0.037-0.103 0.068-0.186l-1.705-4.5h0.82l0.935 2.601c0.122 0.33 0.23 0.677 0.326 1.041 0.087-0.35 0.191-0.69 0.312-1.023l
0.961-2.618h0.761l-1.709 4.567c-0.183 0.494-0.325 0.834-0.427 1.02-0.136 0.252-0.291 0.436-0.466 0.552-0.173 0.117-0.382 0.175-0.624 0.175zm3.831-1.822v-4.492h0.681v0.63c0.141-0.221 0.328-0.396 0.562-0.531 0.234-0.134 0.501-0.2 0.799-0.2 0.333 0 0.605 0.069 0.819 0.207 0.212 0.139 0.362 0.332 0.449 0.58 0.356-0.524 0.818-0.787 1.389-0.787 0.445 0 0.788 0.123 1.027 0.369 0.239 0.248 0.359 0.628 0.359 1.14v3.085h-0.757v-2.83c0-0.305-0.024-0.524-0.074-0.657-0.05-0.135-0.14-0.242-0.269-0.324-0.13-0.081-0.282-0.123-0.457-0.123-0.316 0-0.578 0.106-0.786 0.314-0.209 0.211-0.313 0.547-0.313 1.01v2.61h-0.761v-2.919c0-0.339-0.062-0.592-0.187-0.761-0.124-0.17-0.327-0.255-0.609-0.255-0.214 0-0.412 0.057-0.594 0.17-0.183 0.112-0.314 0.278-0.396 0.494-0.081 0.218-0.122 0.53-0.122 0.939v2.331h-0.76zm6.897-2.247c0-0.831 0.231-1.446 0.693-1.848 0.387-0.333 0.857-0.499 1.413-0.499 0.617 0 1.122 0.202 1.514 0.606 0.393 0.405 0.588 0.965 0.588 1.677 0 0.579-0.086 1.034-0.26 1.364-0.174 0.332-0.426 0.58
9-0.758 0.772-0.331 0.183-0.692 0.275-1.084 0.275-0.629 0-1.137-0.202-1.525-0.604-0.388-0.404-0.581-0.985-0.581-1.743zm0.782 0c0 0.576 0.126 1.007 0.377 1.294 0.251 0.285 0.566 0.429 0.947 0.429 0.378 0 0.691-0.145 0.942-0.433 0.252-0.286 0.377-0.725 0.377-1.315 0-0.555-0.127-0.976-0.378-1.263-0.254-0.285-0.566-0.429-0.941-0.429-0.381 0-0.696 0.143-0.947 0.428-0.251 0.284-0.377 0.714-0.377 1.289zm7.119 2.247v-0.566c-0.285 0.444-0.704 0.668-1.257 0.668-0.357 0-0.687-0.099-0.987-0.297-0.3-0.197-0.533-0.473-0.697-0.827-0.165-0.354-0.248-0.761-0.248-1.22 0-0.448 0.074-0.855 0.225-1.221 0.149-0.365 0.373-0.645 0.672-0.84 0.299-0.193 0.633-0.291 1.003-0.291 0.271 0 0.511 0.057 0.723 0.172 0.212 0.112 0.384 0.262 0.517 0.445v-2.225h0.757v6.201h-0.708zm-2.407-2.243c0 0.575 0.122 1.005 0.364 1.29 0.242 0.284 0.528 0.428 0.858 0.428 0.333 0 0.615-0.137 0.849-0.408 0.232-0.272 0.349-0.688 0.349-1.245 0-0.616-0.118-1.067-0.355-1.354-0.237-0.288-0.529-0.433-0.876-0.433-0.338 0-0.62 0.138-0.848 0
.415-0.227 0.277-0.341 0.713-0.341 1.307zm3.979 0.381v-0.766h2.339v0.766h-2.339zm6.97 1.129v0.732h-4.099c-0.006-0.185 0.024-0.36 0.089-0.529 0.104-0.279 0.271-0.553 0.5-0.824 0.23-0.271 0.563-0.584 0.997-0.939 0.675-0.554 1.128-0.99 1.365-1.313 0.237-0.322 0.355-0.628 0.355-0.916 0-0.302-0.107-0.556-0.323-0.763-0.216-0.208-0.497-0.312-0.844-0.312-0.366 0-0.659 0.11-0.88 0.33-0.22 0.221-0.331 0.524-0.333 0.913l-0.784-0.079c0.055-0.585 0.257-1.029 0.605-1.336 0.351-0.306 0.818-0.457 1.409-0.457 0.595 0 1.065 0.163 1.412 0.494 0.348 0.33 0.521 0.739 0.521 1.227 0 0.247-0.05 0.492-0.152 0.731s-0.271 0.492-0.506 0.758c-0.235 0.264-0.627 0.628-1.173 1.091-0.458 0.384-0.751 0.644-0.88 0.78-0.13 0.137-0.237 0.274-0.322 0.412h3.043zm1.129 0.733v-0.867h0.868v0.867h-0.868zm1.968-1.637 0.762-0.102c0.087 0.431 0.235 0.742 0.446 0.932 0.21 0.19 0.466 0.286 0.768 0.286 0.358 0 0.661-0.124 0.908-0.373 0.246-0.247 0.369-0.555 0.369-0.922 0-0.35-0.113-0.638-0.343-0.864-0.229-0.227-0.519-0.341-0.871-0
.341-0.144 0-0.322 0.028-0.537 0.084l0.084-0.667c0.052 0.005 0.093 0.008 0.124 0.008 0.324 0 0.615-0.084 0.875-0.254s0.389-0.43 0.389-0.782c0-0.279-0.095-0.511-0.283-0.693-0.189-0.184-0.432-0.275-0.732-0.275-0.296 0-0.542 0.093-0.739 0.279-0.198 0.186-0.324 0.465-0.381 0.838l-0.763-0.136c0.095-0.511 0.306-0.906 0.637-1.187 0.329-0.28 0.738-0.42 1.23-0.42 0.338 0 0.649 0.072 0.935 0.217 0.285 0.146 0.503 0.344 0.653 0.595s0.226 0.518 0.226 0.8c0 0.267-0.072 0.511-0.215 0.73-0.144 0.22-0.356 0.396-0.638 0.525 0.365 0.085 0.65 0.26 0.853 0.526 0.204 0.267 0.305 0.6 0.305 1 0 0.541-0.197 1.001-0.592 1.377s-0.894 0.565-1.498 0.565c-0.544 0-0.995-0.162-1.354-0.488-0.362-0.323-0.567-0.742-0.618-1.258zm5.205 1.637v-0.867h0.867v0.867h-0.867zm2.577-0.538c-0.409-0.517-0.612-1.356-0.612-2.521 0-0.733 0.074-1.324 0.226-1.77 0.15-0.448 0.375-0.792 0.672-1.034 0.297-0.243 0.672-0.363 1.123-0.363 0.333 0 0.624 0.066 0.875 0.199 0.252 0.135 0.458 0.328 0.623 0.58 0.163 0.252 0.292 0.561 0.384 0.922
0.094 0.362 0.14 0.851 0.14 1.466 0 0.728-0.074 1.314-0.225 1.762-0.149 0.446-0.372 0.792-0.67 1.036s-0.673 0.366-1.127 0.366c-0.598 0-1.067-0.215-1.409-0.643zm0.563-4.615c-0.262 0.378-0.394 1.075-0.394 2.094 0 1.018 0.119 1.694 0.357 2.032 0.238 0.337 0.532 0.506 0.882 0.506 0.351 0 0.644-0.169 0.882-0.508 0.238-0.338 0.357-1.015 0.357-2.03 0-1.021-0.119-1.698-0.357-2.034s-0.535-0.504-0.891-0.504c-0.348 0-0.627 0.148-0.836 0.444zm3.442 3.291v-0.766h2.339v0.766h-2.339zm2.876 0.521 0.754-0.12c0.043 0.304 0.159 0.534 0.353 0.694 0.193 0.161 0.464 0.242 0.811 0.242 0.349 0 0.607-0.072 0.777-0.214 0.17-0.143 0.255-0.31 0.255-0.502 0-0.171-0.075-0.307-0.225-0.406-0.104-0.067-0.363-0.152-0.777-0.258-0.559-0.141-0.945-0.262-1.163-0.365-0.215-0.103-0.378-0.246-0.489-0.428-0.112-0.182-0.168-0.382-0.168-0.603 0-0.199 0.047-0.386 0.138-0.557 0.093-0.17 0.217-0.312 0.375-0.424 0.118-0.088 0.279-0.162 0.484-0.223 0.204-0.06 0.423-0.091 0.657-0.091 0.353 0 0.662 0.05 0.929 0.152 0.266 0.101 0.464
0.239 0.591 0.412 0.126 0.173 0.215 0.405 0.262 0.696l-0.744 0.102c-0.034-0.231-0.133-0.412-0.295-0.542s-0.392-0.194-0.688-0.194c-0.349 0-0.599 0.058-0.748 0.173-0.149 0.116-0.224 0.252-0.224 0.406 0 0.099 0.03 0.188 0.092 0.267 0.062 0.082 0.159 0.15 0.293 0.203 0.076 0.027 0.301 0.093 0.672 0.195 0.538 0.143 0.914 0.261 1.127 0.353 0.214 0.092 0.379 0.226 0.502 0.399 0.121 0.175 0.182 0.393 0.182 0.652 0 0.253-0.074 0.491-0.222 0.716s-0.362 0.397-0.642 0.521c-0.279 0.122-0.595 0.185-0.947 0.185-0.583 0-1.027-0.121-1.334-0.364-0.307-0.242-0.502-0.601-0.588-1.077zm4.662 1.341v-4.492h0.686v0.681c0.174-0.318 0.337-0.529 0.483-0.63 0.148-0.103 0.312-0.152 0.49-0.152 0.257 0 0.517 0.082 0.782 0.246l-0.263 0.705c-0.186-0.109-0.372-0.164-0.559-0.164-0.166 0-0.315 0.05-0.447 0.149-0.134 0.1-0.228 0.239-0.283 0.417-0.086 0.271-0.128 0.567-0.128 0.888v2.353h-0.761zm5.826-1.647 0.749 0.098c-0.082 0.517-0.292 0.92-0.629 1.212-0.336 0.292-0.75 0.438-1.241 0.438-0.615 0-1.109-0.202-1.483-0.604-
0.372-0.401-0.56-0.978-0.56-1.728 0-0.484 0.081-0.909 0.241-1.273 0.161-0.364 0.405-0.637 0.733-0.818s0.686-0.272 1.072-0.272c0.488 0 0.887 0.123 1.197 0.369 0.311 0.248 0.51 0.599 0.597 1.052l-0.739 0.114c-0.071-0.302-0.196-0.529-0.376-0.681-0.179-0.152-0.396-0.229-0.649-0.229-0.383 0-0.694 0.138-0.935 0.412-0.239 0.275-0.359 0.709-0.359 1.306 0 0.603 0.116 1.041 0.347 1.314 0.232 0.274 0.533 0.411 0.904 0.411 0.3 0 0.55-0.092 0.75-0.275s0.327-0.464 0.381-0.846zm1.572 1.647v-0.867h0.867v0.867h-0.867zm1.773 0v-0.618l2.858-3.282c-0.324 0.017-0.61 0.026-0.858 0.026h-1.831v-0.618h3.672v0.503l-2.433 2.851-0.471 0.521c0.342-0.024 0.662-0.038 0.961-0.038h2.077v0.656h-3.975zm4.772-5.326v-0.876h0.762v0.876h-0.762zm0 5.326v-4.492h0.762v4.492h-0.762zm1.893 1.721v-6.214h0.692v0.584c0.164-0.229 0.348-0.401 0.555-0.514 0.206-0.115 0.455-0.172 0.748-0.172 0.384 0 0.723 0.099 1.016 0.296 0.293 0.198 0.516 0.477 0.664 0.835 0.15 0.36 0.226 0.754 0.226 1.183 0 0.459-0.084 0.873-0.248 1.242-0.165 0.3
67-0.405 0.648-0.719 0.845-0.315 0.196-0.646 0.295-0.993 0.295-0.253 0-0.481-0.054-0.683-0.161s-0.368-0.243-0.497-0.406v2.188h-0.761zm0.69-3.942c0 0.577 0.117 1.005 0.351 1.281s0.518 0.415 0.851 0.415c0.338 0 0.628-0.144 0.868-0.429 0.241-0.287 0.362-0.73 0.362-1.331 0-0.573-0.117-1.001-0.354-1.286-0.235-0.284-0.517-0.428-0.844-0.428-0.325 0-0.611 0.152-0.859 0.456-0.251 0.303-0.375 0.744-0.375 1.322z"/>
+ <path d="m245.92 468.28zm-105.27-23.43zm0 23.43v-17.572l5.858-5.858h99.412v17.574l-5.856 5.856h-99.414z" fill-rule="evenodd" stroke="#010101" stroke-miterlimit="10" fill="#fcf9ce"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <polygon transform="translate(.31734 .5)" points="245.6 444.34 245.6 461.92 239.75 467.78 140.33 467.78 140.33 450.2 146.19 444.34"/>
+ <path d="m140.65 444.84z"/>
+ <path d="m245.92 468.28z"/>
+ </g>
+ <path fill-rule="evenodd" fill="#fdfad8" d="m245.92 468.28zm-105.27-23.43zm0 5.858 5.858-5.858h99.412l-5.856 5.858h-99.414z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="239.75 450.2 140.33 450.2 146.19 444.34 245.6 444.34"/>
+ <path d="m140.65 444.84z" stroke-width="0"/>
+ <path d="m245.92 468.28z" stroke-width="0"/>
+ </g>
+ <path fill-rule="evenodd" fill="#cccca3" d="m245.92 468.28zm-105.27-23.43zm99.414 23.43v-17.572l5.856-5.858v17.574l-5.856 5.856z"/>
+ <g stroke-miterlimit="10" fill="none">
+ <polygon stroke-linejoin="round" transform="translate(.31734 .5)" stroke="#010101" points="245.6 461.92 239.75 467.78 239.75 450.2 245.6 444.34"/>
+ <path d="m140.65 444.84z" stroke-width="0"/>
+ <path d="m245.92 468.28z" stroke-width="0"/>
+ </g>
+ <g fill="#010101">
+ <path d="m150.79 462.42v-4.493h0.681v0.63c0.142-0.22 0.328-0.396 0.562-0.53 0.234-0.135 0.501-0.201 0.8-0.201 0.332 0 0.605 0.069 0.818 0.207 0.213 0.139 0.362 0.332 0.45 0.58 0.355-0.524 0.818-0.787 1.388-0.787 0.445 0 0.788 0.123 1.027 0.369 0.24 0.248 0.359 0.628 0.359 1.14v3.086h-0.757v-2.831c0-0.305-0.024-0.524-0.073-0.657-0.05-0.135-0.14-0.242-0.269-0.324-0.131-0.081-0.282-0.123-0.457-0.123-0.316 0-0.578 0.106-0.787 0.315-0.209 0.21-0.312 0.547-0.312 1.01v2.61h-0.762v-2.92c0-0.339-0.062-0.592-0.187-0.761-0.124-0.17-0.326-0.255-0.608-0.255-0.215 0-0.413 0.058-0.595 0.17-0.183 0.113-0.313 0.278-0.396 0.494-0.081 0.218-0.122 0.531-0.122 0.94v2.331h-0.76zm7.55 1.821c-0.146 0-0.31-0.03-0.49-0.092l-0.085-0.716c0.167 0.045 0.312 0.068 0.437 0.068 0.169 0 0.305-0.028 0.406-0.084 0.102-0.058 0.184-0.136 0.249-0.238 0.048-0.076 0.126-0.264 0.232-0.566 0.015-0.042 0.036-0.104 0.067-0.187l-1.704-4.5h0.82l0.936 2.602c0.12 0.329 0.229 0.677 0.325 1.04 0.087-0.35 0.191-0.69 0.312-1.023l0
.961-2.618h0.761l-1.708 4.568c-0.184 0.494-0.326 0.833-0.428 1.02-0.136 0.251-0.291 0.435-0.465 0.551-0.174 0.118-0.382 0.175-0.626 0.175zm3.91-1.821v-4.493h0.682v0.63c0.141-0.22 0.328-0.396 0.562-0.53 0.233-0.135 0.501-0.201 0.799-0.201 0.333 0 0.606 0.069 0.819 0.207 0.212 0.139 0.362 0.332 0.45 0.58 0.355-0.524 0.817-0.787 1.388-0.787 0.445 0 0.788 0.123 1.027 0.369 0.239 0.248 0.359 0.628 0.359 1.14v3.086h-0.757v-2.831c0-0.305-0.024-0.524-0.074-0.657-0.05-0.135-0.14-0.242-0.269-0.324-0.13-0.081-0.282-0.123-0.457-0.123-0.315 0-0.578 0.106-0.786 0.315-0.209 0.21-0.313 0.547-0.313 1.01v2.61h-0.761v-2.92c0-0.339-0.062-0.592-0.187-0.761-0.124-0.17-0.327-0.255-0.609-0.255-0.214 0-0.412 0.058-0.595 0.17-0.182 0.113-0.312 0.278-0.396 0.494-0.081 0.218-0.122 0.531-0.122 0.94v2.331h-0.76zm6.811-2.248c0-0.831 0.231-1.446 0.693-1.848 0.387-0.333 0.857-0.499 1.413-0.499 0.617 0 1.122 0.202 1.514 0.606 0.393 0.405 0.589 0.965 0.589 1.678 0 0.578-0.087 1.033-0.261 1.364-0.173 0.331-0.426 0.588
-0.757 0.771-0.332 0.183-0.693 0.275-1.085 0.275-0.629 0-1.138-0.202-1.525-0.604-0.388-0.403-0.581-0.984-0.581-1.743zm0.782 0c0 0.576 0.126 1.007 0.377 1.294 0.25 0.285 0.566 0.429 0.947 0.429 0.377 0 0.692-0.145 0.943-0.432s0.376-0.726 0.376-1.316c0-0.555-0.126-0.976-0.379-1.262-0.252-0.286-0.565-0.429-0.94-0.429-0.381 0-0.697 0.142-0.947 0.427-0.251 0.284-0.377 0.715-0.377 1.289zm7.198 2.248v-0.567c-0.285 0.444-0.703 0.668-1.256 0.668-0.358 0-0.688-0.099-0.988-0.297-0.3-0.197-0.532-0.473-0.697-0.827-0.166-0.353-0.248-0.76-0.248-1.22 0-0.448 0.075-0.855 0.225-1.221s0.373-0.645 0.672-0.84c0.299-0.193 0.634-0.291 1.003-0.291 0.271 0 0.512 0.057 0.723 0.172 0.212 0.112 0.384 0.262 0.517 0.445v-2.225h0.757v6.202h-0.708zm-2.407-2.243c0 0.575 0.12 1.005 0.363 1.29 0.242 0.284 0.528 0.428 0.858 0.428 0.333 0 0.615-0.137 0.849-0.408 0.231-0.272 0.349-0.688 0.349-1.245 0-0.615-0.118-1.066-0.355-1.354-0.236-0.288-0.529-0.432-0.876-0.432-0.338 0-0.62 0.137-0.848 0.414-0.226 0.277-0.34 0.713-0
.34 1.307zm3.9 0.381v-0.766h2.339v0.766h-2.339zm3.185-3.464v-0.876h0.761v0.876h-0.761zm0 5.326v-4.493h0.761v4.493h-0.761zm1.893 0v-4.493h0.681v0.63c0.141-0.22 0.329-0.396 0.563-0.53 0.233-0.135 0.499-0.201 0.799-0.201 0.332 0 0.604 0.069 0.818 0.207 0.213 0.139 0.363 0.332 0.449 0.58 0.356-0.524 0.818-0.787 1.388-0.787 0.447 0 0.789 0.123 1.028 0.369 0.239 0.248 0.359 0.628 0.359 1.14v3.086h-0.757v-2.831c0-0.305-0.024-0.524-0.074-0.657-0.05-0.135-0.14-0.242-0.269-0.324-0.13-0.081-0.281-0.123-0.458-0.123-0.315 0-0.576 0.106-0.786 0.315-0.208 0.21-0.312 0.547-0.312 1.01v2.61h-0.763v-2.92c0-0.339-0.061-0.592-0.185-0.761-0.125-0.17-0.327-0.255-0.61-0.255-0.214 0-0.412 0.058-0.594 0.17-0.182 0.113-0.314 0.278-0.396 0.494-0.081 0.218-0.122 0.531-0.122 0.94v2.331h-0.759zm7.094 1.721v-6.214h0.694v0.584c0.163-0.229 0.348-0.401 0.554-0.514 0.207-0.115 0.456-0.172 0.749-0.172 0.384 0 0.722 0.099 1.016 0.297 0.293 0.197 0.513 0.476 0.663 0.834 0.15 0.36 0.224 0.754 0.224 1.183 0 0.459-0.081 0.8
74-0.247 1.242-0.165 0.367-0.404 0.649-0.72 0.846-0.313 0.195-0.645 0.294-0.99 0.294-0.255 0-0.481-0.054-0.684-0.161-0.201-0.107-0.367-0.243-0.498-0.406v2.188h-0.761zm0.689-3.943c0 0.578 0.116 1.005 0.352 1.281 0.234 0.276 0.518 0.415 0.85 0.415 0.339 0 0.629-0.144 0.869-0.429 0.242-0.287 0.362-0.73 0.362-1.331 0-0.572-0.118-1.001-0.353-1.286-0.236-0.284-0.518-0.428-0.845-0.428-0.324 0-0.61 0.153-0.861 0.456-0.249 0.304-0.374 0.744-0.374 1.322zm4.076 2.222v-6.202h0.762v6.202h-0.762zm1.617-1.862v-0.766h2.339v0.766h-2.339zm6.971 1.129v0.733h-4.099c-0.006-0.186 0.024-0.361 0.089-0.53 0.104-0.279 0.271-0.553 0.502-0.823 0.229-0.271 0.562-0.585 0.995-0.94 0.675-0.553 1.13-0.99 1.367-1.313 0.236-0.322 0.354-0.628 0.354-0.915 0-0.302-0.107-0.557-0.323-0.763-0.217-0.209-0.497-0.312-0.844-0.312-0.367 0-0.659 0.109-0.88 0.329-0.22 0.221-0.332 0.524-0.334 0.913l-0.783-0.079c0.055-0.584 0.256-1.029 0.604-1.335 0.351-0.306 0.819-0.458 1.41-0.458 0.594 0 1.065 0.163 1.412 0.494 0.347 0.33 0.521 0
.739 0.521 1.227 0 0.247-0.052 0.492-0.154 0.731-0.102 0.24-0.27 0.492-0.505 0.758-0.236 0.264-0.627 0.628-1.174 1.091-0.456 0.384-0.75 0.644-0.88 0.78s-0.237 0.275-0.321 0.412h3.043zm1.129 0.733v-0.868h0.868v0.868h-0.868zm1.969-1.638 0.763-0.102c0.086 0.431 0.233 0.742 0.444 0.933 0.211 0.189 0.466 0.285 0.769 0.285 0.357 0 0.66-0.123 0.907-0.373 0.246-0.247 0.369-0.555 0.369-0.921 0-0.351-0.113-0.639-0.342-0.865s-0.52-0.341-0.872-0.341c-0.144 0-0.322 0.028-0.537 0.084l0.085-0.667c0.051 0.006 0.092 0.008 0.124 0.008 0.323 0 0.614-0.084 0.874-0.254s0.389-0.43 0.389-0.782c0-0.279-0.094-0.511-0.282-0.693-0.188-0.184-0.433-0.275-0.732-0.275-0.296 0-0.543 0.093-0.74 0.279-0.196 0.187-0.324 0.466-0.38 0.838l-0.762-0.135c0.093-0.512 0.305-0.907 0.635-1.188s0.74-0.42 1.23-0.42c0.338 0 0.65 0.072 0.935 0.217 0.285 0.146 0.503 0.344 0.653 0.596 0.15 0.25 0.226 0.517 0.226 0.799 0 0.267-0.07 0.512-0.215 0.73-0.144 0.221-0.356 0.396-0.638 0.525 0.366 0.085 0.65 0.26 0.853 0.526 0.204 0.267 0.3
06 0.6 0.306 1 0 0.541-0.197 1.001-0.591 1.377-0.396 0.376-0.896 0.565-1.499 0.565-0.543 0-0.996-0.162-1.355-0.488-0.362-0.322-0.566-0.742-0.617-1.258zm5.204 1.638v-0.868h0.867v0.868h-0.867zm2.5-0.538c-0.41-0.518-0.613-1.357-0.613-2.521 0-0.732 0.074-1.322 0.227-1.77 0.15-0.448 0.374-0.792 0.671-1.034 0.298-0.243 0.672-0.363 1.123-0.363 0.334 0 0.625 0.066 0.876 0.2s0.458 0.327 0.622 0.58c0.164 0.252 0.291 0.56 0.384 0.921 0.095 0.362 0.141 0.852 0.141 1.466 0 0.729-0.075 1.314-0.225 1.762-0.149 0.446-0.374 0.793-0.67 1.036-0.298 0.244-0.673 0.366-1.128 0.366-0.599-0.001-1.066-0.215-1.408-0.643zm0.561-4.615c-0.262 0.378-0.393 1.075-0.393 2.094s0.119 1.695 0.357 2.032 0.531 0.506 0.881 0.506 0.645-0.169 0.883-0.508c0.237-0.338 0.356-1.015 0.356-2.03 0-1.021-0.119-1.698-0.356-2.033-0.238-0.337-0.535-0.504-0.891-0.504-0.347-0.001-0.627 0.147-0.837 0.443zm4.035 5.153v-0.868h0.865v0.868h-0.865zm1.801 1.821c-0.206 0-0.403-0.026-0.596-0.079l0.143-0.647c0.152 0.039 0.273 0.059 0.36 0.059 0.
155 0 0.271-0.052 0.347-0.154 0.077-0.104 0.114-0.36 0.114-0.771v-4.721h0.763v4.737c0 0.553-0.073 0.938-0.218 1.154-0.182 0.282-0.487 0.422-0.913 0.422zm0.369-7.138v-0.885h0.763v0.885h-0.763zm4.985 5.317c-0.079-0.159-0.13-0.344-0.152-0.555-0.282 0.238-0.554 0.408-0.814 0.507-0.262 0.099-0.541 0.148-0.839 0.148-0.494 0-0.874-0.12-1.139-0.362-0.265-0.241-0.397-0.549-0.397-0.924 0-0.22 0.049-0.421 0.15-0.604 0.1-0.182 0.231-0.326 0.393-0.438 0.162-0.109 0.345-0.193 0.548-0.249 0.149-0.039 0.375-0.077 0.677-0.113 0.614-0.073 1.068-0.161 1.358-0.264 0.003-0.104 0.004-0.171 0.004-0.198 0-0.311-0.072-0.529-0.215-0.655-0.195-0.172-0.484-0.258-0.868-0.258-0.357 0-0.622 0.062-0.793 0.188-0.17 0.126-0.296 0.347-0.379 0.666l-0.744-0.101c0.067-0.319 0.18-0.577 0.335-0.772 0.154-0.195 0.379-0.347 0.673-0.452 0.293-0.106 0.631-0.159 1.018-0.159 0.385 0 0.696 0.045 0.935 0.136 0.241 0.09 0.417 0.204 0.529 0.34 0.113 0.138 0.192 0.31 0.237 0.518 0.025 0.131 0.038 0.364 0.038 0.703v1.015c0 0.708 0.01
7 1.156 0.049 1.343 0.032 0.188 0.097 0.368 0.192 0.541h-0.796v-0.001zm-0.216-2.256c-0.276 0.112-0.691 0.208-1.243 0.287-0.313 0.046-0.535 0.096-0.665 0.153-0.13 0.056-0.229 0.14-0.3 0.247-0.07 0.108-0.106 0.229-0.106 0.361 0 0.203 0.077 0.372 0.23 0.508 0.154 0.135 0.379 0.202 0.676 0.202 0.293 0 0.554-0.062 0.781-0.191 0.229-0.128 0.396-0.305 0.504-0.526 0.082-0.172 0.123-0.427 0.123-0.762v-0.279zm1.827 2.256v-4.493h0.686v0.681c0.175-0.318 0.336-0.528 0.484-0.63 0.147-0.102 0.312-0.152 0.487-0.152 0.258 0 0.519 0.083 0.784 0.246l-0.263 0.706c-0.187-0.11-0.373-0.165-0.559-0.165-0.166 0-0.316 0.05-0.448 0.149-0.134 0.1-0.227 0.239-0.284 0.417-0.083 0.271-0.126 0.567-0.126 0.889v2.353h-0.761z"/>
+ <path d="m251.65 433.88c-0.206 0-0.405-0.026-0.597-0.08l0.145-0.648c0.151 0.04 0.271 0.061 0.358 0.061 0.155 0 0.271-0.052 0.348-0.155 0.076-0.103 0.113-0.359 0.113-0.771v-4.722h0.762v4.737c0 0.554-0.071 0.938-0.215 1.155-0.184 0.281-0.488 0.423-0.914 0.423zm0.367-7.141v-0.884h0.762v0.884h-0.762zm4.986 5.317c-0.079-0.156-0.131-0.342-0.152-0.553-0.282 0.239-0.553 0.409-0.814 0.508-0.261 0.098-0.54 0.147-0.84 0.147-0.493 0-0.872-0.12-1.137-0.361-0.266-0.241-0.398-0.549-0.398-0.925 0-0.22 0.051-0.421 0.149-0.603 0.102-0.182 0.232-0.328 0.395-0.438 0.162-0.11 0.345-0.193 0.547-0.25 0.15-0.04 0.376-0.077 0.677-0.114 0.615-0.074 1.067-0.16 1.358-0.262 0.003-0.104 0.005-0.171 0.005-0.199 0-0.31-0.072-0.528-0.216-0.656-0.194-0.171-0.483-0.258-0.867-0.258-0.358 0-0.623 0.063-0.793 0.189-0.171 0.126-0.298 0.347-0.379 0.666l-0.744-0.103c0.067-0.317 0.179-0.575 0.334-0.771 0.154-0.197 0.379-0.348 0.672-0.454 0.294-0.104 0.634-0.157 1.021-0.157 0.383 0 0.694 0.045 0.935 0.135 0.238 0.091 0.4
15 0.203 0.528 0.341 0.112 0.137 0.191 0.31 0.236 0.518 0.026 0.13 0.038 0.363 0.038 0.703v1.014c0 0.709 0.016 1.156 0.05 1.344 0.032 0.188 0.095 0.367 0.191 0.538h-0.796v0.001zm-0.216-2.254c-0.275 0.113-0.69 0.209-1.243 0.288-0.313 0.045-0.534 0.096-0.664 0.152s-0.23 0.139-0.301 0.247c-0.07 0.109-0.105 0.23-0.105 0.361 0 0.204 0.076 0.373 0.23 0.508 0.154 0.136 0.379 0.203 0.675 0.203 0.292 0 0.554-0.063 0.782-0.192 0.228-0.128 0.396-0.304 0.504-0.526 0.082-0.173 0.122-0.426 0.122-0.762v-0.279zm1.906 2.254v-4.491h0.684v0.682c0.176-0.318 0.338-0.529 0.485-0.631s0.31-0.151 0.488-0.151c0.257 0 0.518 0.08 0.782 0.245l-0.261 0.705c-0.187-0.109-0.373-0.164-0.559-0.164-0.167 0-0.316 0.051-0.449 0.15s-0.227 0.238-0.284 0.417c-0.085 0.271-0.125 0.565-0.125 0.887v2.352h-0.761z"/>
+ <path d="m251.65 457.31c-0.206 0-0.405-0.026-0.597-0.08l0.145-0.647c0.151 0.04 0.271 0.06 0.358 0.06 0.155 0 0.271-0.052 0.348-0.153 0.076-0.104 0.113-0.361 0.113-0.772v-4.722h0.762v4.737c0 0.553-0.071 0.938-0.215 1.156-0.184 0.28-0.488 0.421-0.914 0.421zm0.367-7.139v-0.885h0.762v0.885h-0.762zm4.986 5.315c-0.079-0.157-0.131-0.342-0.152-0.554-0.282 0.24-0.553 0.409-0.814 0.507-0.261 0.1-0.54 0.148-0.84 0.148-0.493 0-0.872-0.12-1.137-0.361-0.266-0.24-0.398-0.549-0.398-0.924 0-0.22 0.051-0.421 0.149-0.604 0.102-0.182 0.232-0.327 0.395-0.438 0.162-0.109 0.345-0.192 0.547-0.248 0.15-0.04 0.376-0.077 0.677-0.115 0.615-0.072 1.067-0.159 1.358-0.262 0.003-0.104 0.005-0.17 0.005-0.198 0-0.311-0.072-0.53-0.216-0.655-0.194-0.172-0.483-0.258-0.867-0.258-0.358 0-0.623 0.062-0.793 0.188-0.171 0.125-0.298 0.348-0.379 0.666l-0.744-0.102c0.067-0.318 0.179-0.576 0.334-0.771 0.154-0.197 0.379-0.348 0.672-0.453 0.294-0.105 0.634-0.158 1.021-0.158 0.383 0 0.694 0.045 0.935 0.135 0.238 0.091 0.415 0.
203 0.528 0.341 0.112 0.137 0.191 0.31 0.236 0.518 0.026 0.13 0.038 0.364 0.038 0.703v1.015c0 0.707 0.016 1.156 0.05 1.343 0.032 0.188 0.095 0.367 0.191 0.539h-0.796v-0.002zm-0.216-2.253c-0.275 0.111-0.69 0.208-1.243 0.286-0.313 0.046-0.534 0.096-0.664 0.153s-0.23 0.138-0.301 0.247c-0.07 0.108-0.105 0.229-0.105 0.361 0 0.203 0.076 0.372 0.23 0.507 0.154 0.136 0.379 0.204 0.675 0.204 0.292 0 0.554-0.064 0.782-0.193 0.228-0.127 0.396-0.303 0.504-0.526 0.082-0.172 0.122-0.425 0.122-0.761v-0.278zm1.906 2.253v-4.492h0.684v0.682c0.176-0.318 0.338-0.529 0.485-0.63s0.31-0.152 0.488-0.152c0.257 0 0.518 0.081 0.782 0.245l-0.261 0.706c-0.187-0.11-0.373-0.165-0.559-0.165-0.167 0-0.316 0.051-0.449 0.15-0.133 0.101-0.227 0.238-0.284 0.417-0.085 0.271-0.125 0.567-0.125 0.889v2.351h-0.761z"/>
+ <path d="m251.65 480.66c-0.206 0-0.405-0.027-0.597-0.082l0.145-0.646c0.15
<TRUNCATED>
[04/29] ant-ivy git commit: improve the xooki2asciidoc convertor
Posted by ja...@apache.org.
improve the xooki2asciidoc convertor
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/610c3be2
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/610c3be2
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/610c3be2
Branch: refs/heads/master
Commit: 610c3be2cd0105b6e838a69c682e65f594259a25
Parents: 64b328d
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Feb 15 23:35:52 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Feb 15 23:35:52 2015 +0100
----------------------------------------------------------------------
asciidoc-template/helpers.rb | 15 ++++---
build-doc.xml | 1 +
doc/xooki2asciidoc/xooki2asciidoc.js | 65 +++++++++++++++++++++++++++++--
3 files changed, 72 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/610c3be2/asciidoc-template/helpers.rb
----------------------------------------------------------------------
diff --git a/asciidoc-template/helpers.rb b/asciidoc-template/helpers.rb
index b11768b..e62557d 100644
--- a/asciidoc-template/helpers.rb
+++ b/asciidoc-template/helpers.rb
@@ -22,7 +22,12 @@ module IvyDocHelpers
def link(printpage)
l = ''
if self.url
- l += '<a href="' + printpage.relativeRoot + self.url + '"'
+ if self.url.start_with?('http')
+ url = self.url
+ else
+ url = printpage.relativeRoot + self.url
+ end
+ l += '<a href="' + url + '"'
if self.id == printpage.id
l += ' class="current"'
end
@@ -73,7 +78,7 @@ module IvyDocHelpers
def innermenu(page)
m = '<ul id="treemenu" class="treeview">' + "\n"
page.children.each do |p|
- m += '<li id="xooki-' + p.id + '"'
+ m += '<li id="xooki-' + (p.id || "undefined") + '"'
if p.children.length > 0
m += ' class="submenu"'
end
@@ -122,11 +127,11 @@ module IvyDocHelpers
p.title = node['title']
p.parent = parent
if node.has_key?("importRoot")
- p.id = path + child['importRoot'] + '/' + node['importNode']
+ p.id = path + node['importRoot'] + '/' + node['importNode']
p.url = p.id + ".html"
- toc = JSON.parse(IO.read(basedir + '/' + child['importRoot'] + "/toc.json"))
+ toc = JSON.parse(IO.read(basedir + '/' + node['importRoot'] + "/toc.json"))
toc['children'].each do |child|
- p.children << loadPage(basedir, p, child, path + child['importRoot'] + '/')
+ p.children << loadPage(basedir, node, child, path + node['importRoot'] + '/')
end
else
p.id = node['id']
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/610c3be2/build-doc.xml
----------------------------------------------------------------------
diff --git a/build-doc.xml b/build-doc.xml
index e9316f9..671da0e 100644
--- a/build-doc.xml
+++ b/build-doc.xml
@@ -48,6 +48,7 @@
<taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
<asciidoctor:convert sourceDirectory="${build.dir}/asciidoc" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="asciidoc-template" preserveDirectories="true">
<attribute key="basedir" value="${build.dir}/asciidoc" />
+ <attribute key="imagesdir" value="" />
</asciidoctor:convert>
<copy todir="${doc.build.dir}">
<fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/610c3be2/doc/xooki2asciidoc/xooki2asciidoc.js
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/xooki2asciidoc.js b/doc/xooki2asciidoc/xooki2asciidoc.js
index ab5840f..d9ed69a 100644
--- a/doc/xooki2asciidoc/xooki2asciidoc.js
+++ b/doc/xooki2asciidoc/xooki2asciidoc.js
@@ -927,6 +927,18 @@ xooki.input = {
s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*/>'), from);
}
+ print('search img title\n')
+ s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*title\\s*=\\s*\\"([^\\"]*)\\"[^/]*/>'));
+ from = 0;
+ while (s != null) {
+ processedSection = " image:" + s.matcher[1] + "[" + s.matcher[2] + "]"
+ input = input.substring(0, s.begin)
+ + processedSection
+ + input.substring(s.end);
+ from = s.begin + processedSection.length;
+ s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*title\\s*=\\s*\\"([^\\"]*)\\"[^/]*/>'), from);
+ }
+
print('search br\n')
s = xooki.string.find(input, new RegExp('<br\\s*/?>'));
from = 0;
@@ -1065,6 +1077,32 @@ xooki.input = {
s = xooki.string.findXmlSection(input, "center", from);
}
+ print('search p\n')
+ s = xooki.string.findXmlSection(input, "p");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n\n" + input.substring(s.innerStart, s.innerEnd) + "\n\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "p", from);
+ }
+
+ print('search blockquote\n')
+ s = xooki.string.findXmlSection(input, "blockquote");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n[quote]\n____\n" + input.substring(s.innerStart, s.innerEnd) + "\n____\n\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "blockquote", from);
+ }
+
print('search tt\n')
s = xooki.string.findXmlSection(input, "tt");
from = 0;
@@ -1685,15 +1723,34 @@ if (batchMode) {
xooki.init();
- xooki.pageContent = xooki.pageContent.replace(/<script type="text\/javascript" src="[^"]*xooki.js"><\/script>/g, '');
-
+ m = new RegExp('<script type="text/javascript" src="[^"]*xooki\\.js"></script>').exec(xooki.pageContent);
+ if (m != null) {
+ xooki.pageContent = xooki.pageContent.substring(0, m.index) + xooki.pageContent.substring(m.index + m[0].length);
+ }
+
xooki.render.main();
var dest = generateTo.endsWith(".html") ? generateTo : generateTo+'/'+file;
dest = dest.substring(0, dest.length-5) + ".adoc";
print('generating to '+dest);
- xooki.pageContent = xooki.pageContent.replace(/[\s\S]*<body>/i, '');
- xooki.pageContent = xooki.pageContent.replace(/<\/body>[\s\S]*/i, '');
+
+ m = new RegExp('<body>').exec(xooki.pageContent);
+ if (m != null) {
+ xooki.pageContent = xooki.pageContent.substring(m.index + m[0].length);
+ }
+
+ lastM = null;
+ from = 0
+ m = new RegExp('</body>').exec(xooki.pageContent);
+ while (m != null) {
+ lastM = m;
+ from = from + m.index + m[0].length;
+ m = new RegExp('</body>').exec(xooki.pageContent.substring(from));
+ }
+ if (lastM) {
+ xooki.pageContent = xooki.pageContent.substring(0, from - lastM[0].length);
+ }
+
xooki.io.saveFile(dest, xooki.pageContent);
}
} else {
[28/29] ant-ivy git commit: Don't commit tutorial logs generated
during build
Posted by ja...@apache.org.
Don't commit tutorial logs generated during build
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/c50f4b4c
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/c50f4b4c
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/c50f4b4c
Branch: refs/heads/master
Commit: c50f4b4cb151a3999744d5dc1068250ca3a170b6
Parents: 88d2e93
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Thu Jun 15 19:59:09 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Fri Jun 16 09:57:07 2017 +0530
----------------------------------------------------------------------
.gitignore | 2 +
asciidoc/tutorial/log/chained-resolvers.txt | 38 ---
asciidoc/tutorial/log/configurations-lib.txt | 75 ----
asciidoc/tutorial/log/configurations-runcc.txt | 46 ---
asciidoc/tutorial/log/configurations-runhm.txt | 32 --
.../tutorial/log/dependence-depending-2.txt | 40 ---
asciidoc/tutorial/log/dependence-depending.txt | 40 ---
.../tutorial/log/dependence-standalone-2.txt | 36 --
asciidoc/tutorial/log/dependence-standalone.txt | 43 ---
asciidoc/tutorial/log/dual.txt | 47 ---
asciidoc/tutorial/log/hello-ivy-1.txt | 69 ----
asciidoc/tutorial/log/hello-ivy-2.txt | 32 --
asciidoc/tutorial/log/install-deps.txt | 242 -------------
asciidoc/tutorial/log/install-namespace.txt | 37 --
asciidoc/tutorial/log/install.txt | 37 --
.../tutorial/log/multi-project-find-antp.txt | 17 -
.../tutorial/log/multi-project-general-antp.txt | 8 -
.../log/multi-project-general-publishall.txt | 338 -------------------
.../tutorial/log/myrepository-content-deps.txt | 13 -
.../log/myrepository-content-namespace.txt | 10 -
asciidoc/tutorial/log/myrepository-content.txt | 10 -
build-release.xml | 58 ++--
22 files changed, 38 insertions(+), 1232 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7427c17..40f8e72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ doc/samples/target-platform/cache
/test/repositories/checkmodified/mod1.1-1.0.jar
/test/repositories/norevision/ivy-mod1.1.xml
/test/repositories/norevision/mod1.1.jar
+asciidoc/tutorial/log
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/chained-resolvers.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/chained-resolvers.txt b/asciidoc/tutorial/log/chained-resolvers.txt
deleted file mode 100644
index 833d361..0000000
--- a/asciidoc/tutorial/log/chained-resolvers.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-[ivy@apache:/ivy/chained-resolvers/chainedresolvers-project]$ ant
-Buildfile: /ivy/chained-resolvers/chainedresolvers-project/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: file = /ivy/chained-resolvers/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#chained-resolvers;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in ibiblio
-[ivy:retrieve] found org.apache#test;1.0 in libraries
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
-[ivy:retrieve] ............................. (277kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2490ms)
-[ivy:retrieve] downloading /ivy/chained-resolvers/settings/repository/test-1.0.jar ...
-[ivy:retrieve] .. (1kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#test;1.0!test.jar (2ms)
-[ivy:retrieve] :: resolution report :: resolve 8585ms :: artifacts dl 2494ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 2 | 2 | 1 | 0 || 2 | 2 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#chained-resolvers
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (278kB/7ms)
-
-run:
- [mkdir] Created dir: /ivy/chained-resolvers/chainedresolvers-project/build
- [javac] /ivy/chained-resolvers/chainedresolvers-project/build.xml:58: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
- [javac] Compiling 1 source file to /ivy/chained-resolvers/chainedresolvers-project/build
- [java] standard message :example world !
- [java] capitalized by org.apache.commons.lang.WordUtils : Example World !
- [java] upperCased by test.StringUtils : EXAMPLE WORLD !
-
-BUILD SUCCESSFUL
-Total time: 12 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/configurations-lib.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-lib.txt b/asciidoc/tutorial/log/configurations-lib.txt
deleted file mode 100644
index dba57d2..0000000
--- a/asciidoc/tutorial/log/configurations-lib.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-[ivy@apache:/ivy/configurations/multi-projects/filter-framework]$ ant
-Buildfile: /ivy/configurations/multi-projects/filter-framework/build.xml
-
-clean:
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#filter-framework;working@apache
-[ivy:retrieve] confs: [api, homemade-impl, cc-impl, test]
-[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:retrieve] found junit#junit;4.12 in public
-[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar ...
-[ivy:retrieve] ...................
-[ivy:retrieve] ..........
-[ivy:retrieve] ...........
-[ivy:retrieve] ...............
-[ivy:retrieve] .. (733kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (7624ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar ...
-[ivy:retrieve] ............................... (307kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (2329ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...
-[ivy:retrieve] .............. (43kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1293ms)
-[ivy:retrieve] :: resolution report :: resolve 16401ms :: artifacts dl 11251ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | api | 0 | 0 | 0 | 0 || 0 | 0 |
- | homemade-impl | 0 | 0 | 0 | 0 || 0 | 0 |
- | cc-impl | 1 | 1 | 1 | 0 || 1 | 1 |
- | test | 3 | 3 | 3 | 0 || 3 | 3 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#filter-framework
-[ivy:retrieve] confs: [api, homemade-impl, cc-impl, test]
-[ivy:retrieve] 4 artifacts copied, 0 already retrieved (1818kB/12ms)
-
-build:
- [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build
- [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/distrib
- [javac] Compiling 4 source files to /ivy/configurations/multi-projects/filter-framework/build
- [jar] Building jar: /ivy/configurations/multi-projects/filter-framework/distrib/filter-api.jar
- [jar] Building jar: /ivy/configurations/multi-projects/filter-framework/distrib/filter-hmimpl.jar
- [jar] Building jar: /ivy/configurations/multi-projects/filter-framework/distrib/filter-ccimpl.jar
-
-test:
- [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build/test-report
- [mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build/test-classes
- [javac] /ivy/configurations/multi-projects/filter-framework/build.xml:82: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
- [javac] Compiling 3 source files to /ivy/configurations/multi-projects/filter-framework/build/test-classes
- [junit] Running filter.ccimpl.CCFilterTest
- [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec
- [junit] Running filter.hmimpl.HMFilterTest
- [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec
-
-publish:
-[ivy:publish] :: delivering :: org.apache#filter-framework;working@apache :: 1.3 :: release :: Thu Jun 15 19:37:04 IST 2017
-[ivy:publish] delivering ivy file to /ivy/configurations/multi-projects/filter-framework/distrib/ivy.xml
-[ivy:publish] :: publishing :: org.apache#filter-framework
-[ivy:publish] published filter-api to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-api.jar
-[ivy:publish] published filter-hmimpl to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-hmimpl.jar
-[ivy:publish] published filter-ccimpl to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-ccimpl.jar
-[ivy:publish] published ivy to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part
-[ivy:publish] to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3
- [echo] project filter-framework released with version 1.3
-
-BUILD SUCCESSFUL
-Total time: 29 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/configurations-runcc.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-runcc.txt b/asciidoc/tutorial/log/configurations-runcc.txt
deleted file mode 100644
index 424c941..0000000
--- a/asciidoc/tutorial/log/configurations-runcc.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-[ivy@apache:/ivy/configurations/multi-projects/myapp]$ ant
-Buildfile: /ivy/configurations/multi-projects/myapp/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#myapp;working@apache
-[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
-[ivy:retrieve] found org.apache#filter-framework;1.3 in local
-[ivy:retrieve] [1.3] org.apache#filter-framework;latest.integration
-[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-api.jar ...
-[ivy:retrieve] .. (1kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-api.jar (3ms)
-[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-hmimpl.jar ...
-[ivy:retrieve] .. (1kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-hmimpl.jar (4ms)
-[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-ccimpl.jar ...
-[ivy:retrieve] .. (1kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-ccimpl.jar (4ms)
-[ivy:retrieve] :: resolution report :: resolve 91ms :: artifacts dl 16ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | build | 1 | 1 | 1 | 0 || 1 | 1 |
- | noexternaljar | 1 | 1 | 1 | 0 || 2 | 2 |
- | withexternaljar | 2 | 1 | 1 | 0 || 3 | 2 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#myapp
-[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
-[ivy:retrieve] 6 artifacts copied, 0 already retrieved (739kB/11ms)
-
-build:
- [mkdir] Created dir: /ivy/configurations/multi-projects/myapp/build
- [javac] Compiling 1 source file to /ivy/configurations/multi-projects/myapp/build
-
-run-cc:
- [java] Filtering with:class filter.ccimpl.CCFilter
- [java] Result :[two, tree]
-
-BUILD SUCCESSFUL
-Total time: 1 second
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/configurations-runhm.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-runhm.txt b/asciidoc/tutorial/log/configurations-runhm.txt
deleted file mode 100644
index 16f0bb2..0000000
--- a/asciidoc/tutorial/log/configurations-runhm.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-[ivy@apache:/ivy/configurations/multi-projects/myapp]$ ant run-hm
-Buildfile: /ivy/configurations/multi-projects/myapp/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#myapp;working@apache
-[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
-[ivy:retrieve] found org.apache#filter-framework;1.3 in local
-[ivy:retrieve] [1.3] org.apache#filter-framework;latest.integration
-[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:retrieve] :: resolution report :: resolve 87ms :: artifacts dl 5ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | build | 1 | 1 | 0 | 0 || 1 | 0 |
- | noexternaljar | 1 | 1 | 0 | 0 || 2 | 0 |
- | withexternaljar | 2 | 1 | 0 | 0 || 3 | 0 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#myapp
-[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
-[ivy:retrieve] 0 artifacts copied, 6 already retrieved (0kB/5ms)
-
-build:
-
-run-hm:
- [java] Filtering with:class filter.hmimpl.HMFilter
- [java] Result :[two, tree]
-
-BUILD SUCCESSFUL
-Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/dependence-depending-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-depending-2.txt b/asciidoc/tutorial/log/dependence-depending-2.txt
deleted file mode 100644
index 6d8c86f..0000000
--- a/asciidoc/tutorial/log/dependence-depending-2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-[ivy@apache:/ivy/dependence/depender]$ ant
-Buildfile: /ivy/dependence/depender/build.xml
-
-clean:
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#depender;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found org.apache#dependee;2 in projects
-[ivy:retrieve] [2] org.apache#dependee;latest.integration
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
-[ivy:retrieve] downloading /ivy/dependence/settings/repository/dependee-2.jar ...
-[ivy:retrieve] .. (1kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#dependee;2!dependee.jar (3ms)
-[ivy:retrieve] :: resolution report :: resolve 82ms :: artifacts dl 6ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 2 | 1 | 1 | 0 || 2 | 1 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#depender
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/4ms)
-
-compile:
- [mkdir] Created dir: /ivy/dependence/depender/build/classes
- [javac] Compiling 1 source file to /ivy/dependence/depender/build/classes
-
-run:
- [java] you are using version 1 of class standalone.Main
- [java] standard message : i am depending.Main and standalone.Main will do the job for me
- [java] [standalone.Main] capitalizing string "i am depending.Main and standalone.Main will do the job for me" using org.apache.commons.lang.WordUtils
- [java] capitalized message : I Am Depending.main And Standalone.main Will Do The Job For Me
-
-BUILD SUCCESSFUL
-Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/dependence-depending.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-depending.txt b/asciidoc/tutorial/log/dependence-depending.txt
deleted file mode 100644
index d2eb958..0000000
--- a/asciidoc/tutorial/log/dependence-depending.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-[ivy@apache:/ivy/dependence/depender]$ ant
-Buildfile: /ivy/dependence/depender/build.xml
-
-clean:
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#depender;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found org.apache#dependee;1 in projects
-[ivy:retrieve] [1] org.apache#dependee;latest.integration
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
-[ivy:retrieve] downloading /ivy/dependence/settings/repository/dependee-1.jar ...
-[ivy:retrieve] .. (1kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#dependee;1!dependee.jar (3ms)
-[ivy:retrieve] :: resolution report :: resolve 73ms :: artifacts dl 5ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 2 | 1 | 1 | 0 || 2 | 1 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#depender
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/6ms)
-
-compile:
- [mkdir] Created dir: /ivy/dependence/depender/build/classes
- [javac] Compiling 1 source file to /ivy/dependence/depender/build/classes
-
-run:
- [java] you are using version 1 of class standalone.Main
- [java] standard message : i am depending.Main and standalone.Main will do the job for me
- [java] [standalone.Main] capitalizing string "i am depending.Main and standalone.Main will do the job for me" using org.apache.commons.lang.WordUtils
- [java] capitalized message : I Am Depending.main And Standalone.main Will Do The Job For Me
-
-BUILD SUCCESSFUL
-Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/dependence-standalone-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-standalone-2.txt b/asciidoc/tutorial/log/dependence-standalone-2.txt
deleted file mode 100644
index a6bc001..0000000
--- a/asciidoc/tutorial/log/dependence-standalone-2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-[ivy@apache:/ivy/dependence/dependee]$ ant publish
-Buildfile: /ivy/dependence/dependee/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#dependee;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
-[ivy:retrieve] :: resolution report :: resolve 50ms :: artifacts dl 2ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 1 | 0 | 0 | 0 || 1 | 0 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#dependee
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 0 artifacts copied, 1 already retrieved (0kB/3ms)
-
-compile:
-
-jar:
-[propertyfile] Updating property file: /ivy/dependence/dependee/build/classes/version.properties
-
-publish:
- [delete] Deleting: /ivy/dependence/dependee/build/ivy.xml
-[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 2 :: release :: Thu Jun 15 19:36:33 IST 2017
-[ivy:publish] delivering ivy file to /ivy/dependence/dependee/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache#dependee
-[ivy:publish] published dependee to /ivy/dependence/settings/repository/dependee-2.jar
-[ivy:publish] published ivy to /ivy/dependence/settings/repository/dependee-2.xml
- [echo] project dependee released with version 2
-
-BUILD SUCCESSFUL
-Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/dependence-standalone.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-standalone.txt b/asciidoc/tutorial/log/dependence-standalone.txt
deleted file mode 100644
index 6a662e7..0000000
--- a/asciidoc/tutorial/log/dependence-standalone.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-[ivy@apache:/ivy/dependence/dependee]$ ant publish
-Buildfile: /ivy/dependence/dependee/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#dependee;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
-[ivy:retrieve] .........................
-[ivy:retrieve] .... (277kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2899ms)
-[ivy:retrieve] :: resolution report :: resolve 2967ms :: artifacts dl 2900ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 1 | 1 | 0 | 0 || 1 | 1 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#dependee
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 1 artifacts copied, 0 already retrieved (277kB/5ms)
-
-compile:
- [mkdir] Created dir: /ivy/dependence/dependee/build/classes
- [javac] Compiling 1 source file to /ivy/dependence/dependee/build/classes
-
-jar:
-[propertyfile] Creating new property file: /ivy/dependence/dependee/build/classes/version.properties
- [jar] Building jar: /ivy/dependence/dependee/build/dependee.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 1 :: release :: Thu Jun 15 19:36:31 IST 2017
-[ivy:publish] delivering ivy file to /ivy/dependence/dependee/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache#dependee
-[ivy:publish] published dependee to /ivy/dependence/settings/repository/dependee-1.jar
-[ivy:publish] published ivy to /ivy/dependence/settings/repository/dependee-1.xml
- [echo] project dependee released with version 1
-
-BUILD SUCCESSFUL
-Total time: 6 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/dual.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dual.txt b/asciidoc/tutorial/log/dual.txt
deleted file mode 100644
index e37f9d9..0000000
--- a/asciidoc/tutorial/log/dual.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-[ivy@apache:/ivy/dual/project]$ ant
-Buildfile: /ivy/dual/project/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: file = /ivy/dual/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found commons-httpclient#commons-httpclient;2.0.2 in ivys
-[ivy:retrieve] found commons-logging#commons-logging;1.0.4 in ibiblio
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in ibiblio
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar ...
-[ivy:retrieve] ......................... (220kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-httpclient#commons-httpclient;2.0.2!commons-httpclient.jar (2849ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
-[ivy:retrieve] ............................. (277kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2240ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar ...
-[ivy:retrieve] ................ (37kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1350ms)
-[ivy:retrieve] :: resolution report :: resolve 1927ms :: artifacts dl 6443ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 3 | 3 | 1 | 0 || 3 | 3 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 3 artifacts copied, 0 already retrieved (534kB/7ms)
-
-run:
- [mkdir] Created dir: /ivy/dual/project/build
- [javac] Compiling 1 source file to /ivy/dual/project/build
- [java] standard message : Hello Ivy!
- [java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy!
- [java] Jun 15, 2017 7:36:24 PM org.apache.commons.httpclient.HttpMethodBase processRedirectResponse
- [java] WARNING: Redirect from protocol http to https is not supported
- [java] head status code with httpclient: 301
- [java] now check if httpclient dependency on commons-logging has been realized
- [java] found logging class in classpath: interface org.apache.commons.logging.Log
-
-BUILD SUCCESSFUL
-Total time: 12 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/hello-ivy-1.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/hello-ivy-1.txt b/asciidoc/tutorial/log/hello-ivy-1.txt
deleted file mode 100644
index 65c3a9d..0000000
--- a/asciidoc/tutorial/log/hello-ivy-1.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-[ivy@apache:/ivy/hello-ivy]$ ant
-Buildfile: /ivy/hello-ivy/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in public
-[ivy:retrieve] found junit#junit;3.8.1 in public
-[ivy:retrieve] found commons-cli#commons-cli;1.4 in public
-[ivy:retrieve] found junit#junit;4.12 in public
-[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar ...
-[ivy:retrieve] ..............................
-[ivy:retrieve] ........................
-[ivy:retrieve] ...............................
-[ivy:retrieve] .......................... (1585kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(javadoc) (7177ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar ...
-[ivy:retrieve] .................................. (364kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(source) (1688ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
-[ivy:retrieve] ............................... (277kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (1555ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4-sources.jar ...
-[ivy:retrieve] ............... (61kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(source) (1225ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
-[ivy:retrieve] ............... (52kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1226ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4-javadoc.jar ...
-[ivy:retrieve] ...................... (174kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(javadoc) (1333ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar ...
-[ivy:retrieve] ................................ (307kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (1534ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...
-[ivy:retrieve] .............. (43kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1343ms)
-[ivy:retrieve] :: resolution report :: resolve 25480ms :: artifacts dl 17089ms
-[ivy:retrieve] :: evicted modules:
-[ivy:retrieve] junit#junit;3.8.1 by [junit#junit;4.12] in [default]
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 5 | 5 | 5 | 1 || 8 | 8 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 8 artifacts copied, 0 already retrieved (2868kB/12ms)
-
-run:
- [mkdir] Created dir: /ivy/hello-ivy/build
- [javac] Compiling 1 source file to /ivy/hello-ivy/build
- [java] standard message : hello ivy !
- [java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy !
-
-BUILD SUCCESSFUL
-Total time: 43 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/hello-ivy-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/hello-ivy-2.txt b/asciidoc/tutorial/log/hello-ivy-2.txt
deleted file mode 100644
index bda6ff3..0000000
--- a/asciidoc/tutorial/log/hello-ivy-2.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-[ivy@apache:/ivy/hello-ivy]$ ant
-Buildfile: /ivy/hello-ivy/build.xml
-
-resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] found commons-lang#commons-lang;2.6 in public
-[ivy:retrieve] found junit#junit;3.8.1 in public
-[ivy:retrieve] found commons-cli#commons-cli;1.4 in public
-[ivy:retrieve] found junit#junit;4.12 in public
-[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
-[ivy:retrieve] :: resolution report :: resolve 171ms :: artifacts dl 11ms
-[ivy:retrieve] :: evicted modules:
-[ivy:retrieve] junit#junit;3.8.1 by [junit#junit;4.12] in [default]
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 5 | 0 | 0 | 1 || 8 | 0 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 0 artifacts copied, 8 already retrieved (0kB/9ms)
-
-run:
- [java] standard message : hello ivy !
- [java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy !
-
-BUILD SUCCESSFUL
-Total time: 0 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/install-deps.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install-deps.txt b/asciidoc/tutorial/log/install-deps.txt
deleted file mode 100644
index 148191f..0000000
--- a/asciidoc/tutorial/log/install-deps.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-[ivy@apache:/ivy/build-a-ivy-repository]$ ant maven2-deps
-Buildfile: /ivy/build-a-ivy-repository/build.xml
-
-load-ivy:
-
-init-ivy:
-
-maven2-deps:
-[ivy:install] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-basic.xml
-[ivy:install] :: installing org.hibernate#hibernate;3.2.5.ga ::
-[ivy:install] :: resolving dependencies ::
-[ivy:install] found org.hibernate#hibernate;3.2.5.ga in libraries
-[ivy:install] found net.sf.ehcache#ehcache;1.2.3 in libraries
-[ivy:install] found commons-logging#commons-logging;1.0.4 in libraries
-[ivy:install] found commons-collections#commons-collections;2.1 in libraries
-[ivy:install] found javax.transaction#jta;1.0.1B in libraries
-[ivy:install] found asm#asm-attrs;1.5.3 in libraries
-[ivy:install] found dom4j#dom4j;1.6.1 in libraries
-[ivy:install] found antlr#antlr;2.7.6 in libraries
-[ivy:install] found cglib#cglib;2.1_3 in libraries
-[ivy:install] found asm#asm;1.5.3 in libraries
-[ivy:install] found commons-collections#commons-collections;2.1.1 in libraries
-[ivy:install] found ant#ant;1.6.5 in libraries
-[ivy:install] found swarmcache#swarmcache;1.0RC2 in libraries
-[ivy:install] found commons-logging#commons-logging;1.0.2 in libraries
-[ivy:install] found jgroups#jgroups-all;2.2.8 in libraries
-[ivy:install] found jboss#jboss-cache;1.2.2 in libraries
-[ivy:install] found jboss#jboss-system;4.0.2 in libraries
-[ivy:install] found jboss#jboss-common;4.0.2 in libraries
-[ivy:install] found slide#webdavlib;2.0 in libraries
-[ivy:install] found xerces#xercesImpl;2.6.2 in libraries
-[ivy:install] found jboss#jboss-minimal;4.0.2 in libraries
-[ivy:install] found jboss#jboss-j2se;200504122039 in libraries
-[ivy:install] found concurrent#concurrent;1.3.4 in libraries
-[ivy:install] found jgroups#jgroups-all;2.2.7 in libraries
-[ivy:install] found c3p0#c3p0;0.9.1 in libraries
-[ivy:install] found javax.security#jacc;1.0 in libraries
-[ivy:install] found opensymphony#oscache;2.1 in libraries
-[ivy:install] found proxool#proxool;0.8.3 in libraries
-[ivy:install] :: downloading artifacts to cache ::
-[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga.jar ...
-[ivy:install] ......................
-[ivy:install] ................
-[ivy:install] ...................
-[ivy:install] .................................
-[ivy:install] ............................................................ (2202kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar (9026ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-sources.jar ...
-[ivy:install] ....................................................................................................... (1470kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(source) (2658ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-javadoc.jar ...
-[ivy:install] ......................................................................................................................................................................................
-[ivy:install] ..............................................................................................................................................................................................................................
-[ivy:install] ............................................................................. (7352kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(javadoc) (4739ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar ...
-[ivy:install] ........................ (203kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] net.sf.ehcache#ehcache;1.2.3!ehcache.jar (1293ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar ...
-[ivy:install] ................ (37kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1226ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar ...
-[ivy:install] ........ (16kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] asm#asm-attrs;1.5.3!asm-attrs.jar (1330ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar ...
-[ivy:install] ............................... (306kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] dom4j#dom4j;1.6.1!dom4j.jar (1435ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6.jar ...
-[ivy:install] ....................................... (433kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] antlr#antlr;2.7.6!antlr.jar (1331ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/cglib/cglib/2.1_3/cglib-2.1_3.jar ...
-[ivy:install] ............................. (275kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] cglib#cglib;2.1_3!cglib.jar (1299ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/asm/asm/1.5.3/asm-1.5.3.jar ...
-[ivy:install] ........... (25kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] asm#asm;1.5.3!asm.jar (1257ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar ...
-[ivy:install] ...................... (171kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1.1!commons-collections.jar (1434ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.jar ...
-[ivy:install] ...................... (161kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1!commons-collections.jar (1228ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar ...
-[ivy:install] ........................................................................... (1009kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] ant#ant;1.6.5!ant.jar (1541ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/swarmcache/swarmcache/1.0RC2/swarmcache-1.0RC2.jar ...
-[ivy:install] ............. (29kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] swarmcache#swarmcache;1.0RC2!swarmcache.jar (2615ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-cache/1.2.2/jboss-cache-1.2.2.jar ...
-[ivy:install] .................................. (365kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-cache;1.2.2!jboss-cache.jar (1476ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jgroups/jgroups-all/2.2.8/jgroups-all-2.2.8.jar ...
-[ivy:install] .............................................................................................................. (1573kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.8!jgroups-all.jar (2002ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar ...
-[ivy:install] ................................................. (594kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] c3p0#c3p0;0.9.1!c3p0.jar (1481ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/opensymphony/oscache/2.1/oscache-2.1.jar ...
-[ivy:install] ................... (111kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] opensymphony#oscache;2.1!oscache.jar (1327ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/proxool/proxool/0.8.3/proxool-0.8.3.jar ...
-[ivy:install] ......................................... (464kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] proxool#proxool;0.8.3!proxool.jar (1538ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar ...
-[ivy:install] ........... (25kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.2!commons-logging.jar (1224ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-system/4.0.2/jboss-system-4.0.2.jar ...
-[ivy:install] .......................... (227kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-system;4.0.2!jboss-system.jar (1332ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-common/4.0.2/jboss-common-4.0.2.jar ...
-[ivy:install] ........................................ (457kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-common;4.0.2!jboss-common.jar (1332ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-minimal/4.0.2/jboss-minimal-4.0.2.jar ...
-[ivy:install] ...................... (163kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-minimal;4.0.2!jboss-minimal.jar (1329ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-j2se/200504122039/jboss-j2se-200504122039.jar ...
-[ivy:install] ................................. (350kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-j2se;200504122039!jboss-j2se.jar (1434ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar ...
-[ivy:install] ....................... (184kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] concurrent#concurrent;1.3.4!concurrent.jar (1330ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/jgroups/jgroups-all/2.2.7/jgroups-all-2.2.7.jar ...
-[ivy:install] ................................................................................................................. (1613kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.7!jgroups-all.jar (1749ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/slide/webdavlib/2.0/webdavlib-2.0.jar ...
-[ivy:install] .................... (128kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] slide#webdavlib;2.0!webdavlib.jar (1322ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar ...
-[ivy:install] ......................................................................... (986kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] xerces#xercesImpl;2.6.2!xercesImpl.jar (1540ms)
-[ivy:install] :: installing in my-repository ::
-[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar
-[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar
-[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml
-[ivy:install] published ehcache to /ivy/build-a-ivy-repository/myrepository/no-namespace/net.sf.ehcache/ehcache/jars/ehcache-1.2.3.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/net.sf.ehcache/ehcache/ivys/ivy-1.2.3.xml
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/javax.transaction/jta/ivys/ivy-1.0.1B.xml
-[ivy:install] published commons-logging to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/jars/commons-logging-1.0.4.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/ivys/ivy-1.0.4.xml
-[ivy:install] published asm-attrs to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm-attrs/jars/asm-attrs-1.5.3.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm-attrs/ivys/ivy-1.5.3.xml
-[ivy:install] published dom4j to /ivy/build-a-ivy-repository/myrepository/no-namespace/dom4j/dom4j/jars/dom4j-1.6.1.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/dom4j/dom4j/ivys/ivy-1.6.1.xml
-[ivy:install] published antlr to /ivy/build-a-ivy-repository/myrepository/no-namespace/antlr/antlr/jars/antlr-2.7.6.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/antlr/antlr/ivys/ivy-2.7.6.xml
-[ivy:install] published cglib to /ivy/build-a-ivy-repository/myrepository/no-namespace/cglib/cglib/jars/cglib-2.1_3.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/cglib/cglib/ivys/ivy-2.1_3.xml
-[ivy:install] published asm to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm/jars/asm-1.5.3.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/asm/asm/ivys/ivy-1.5.3.xml
-[ivy:install] published commons-collections to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/jars/commons-collections-2.1.1.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/ivys/ivy-2.1.1.xml
-[ivy:install] published commons-collections to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/jars/commons-collections-2.1.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-collections/commons-collections/ivys/ivy-2.1.xml
-[ivy:install] published ant to /ivy/build-a-ivy-repository/myrepository/no-namespace/ant/ant/jars/ant-1.6.5.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/ant/ant/ivys/ivy-1.6.5.xml
-[ivy:install] published swarmcache to /ivy/build-a-ivy-repository/myrepository/no-namespace/swarmcache/swarmcache/jars/swarmcache-1.0RC2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/swarmcache/swarmcache/ivys/ivy-1.0RC2.xml
-[ivy:install] published jboss-cache to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-cache/jars/jboss-cache-1.2.2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-cache/ivys/ivy-1.2.2.xml
-[ivy:install] published jgroups-all to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/jars/jgroups-all-2.2.8.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/ivys/ivy-2.2.8.xml
-[ivy:install] published c3p0 to /ivy/build-a-ivy-repository/myrepository/no-namespace/c3p0/c3p0/jars/c3p0-0.9.1.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/c3p0/c3p0/ivys/ivy-0.9.1.xml
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/javax.security/jacc/ivys/ivy-1.0.xml
-[ivy:install] published oscache to /ivy/build-a-ivy-repository/myrepository/no-namespace/opensymphony/oscache/jars/oscache-2.1.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/opensymphony/oscache/ivys/ivy-2.1.xml
-[ivy:install] published proxool to /ivy/build-a-ivy-repository/myrepository/no-namespace/proxool/proxool/jars/proxool-0.8.3.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/proxool/proxool/ivys/ivy-0.8.3.xml
-[ivy:install] published commons-logging to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/jars/commons-logging-1.0.2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-logging/commons-logging/ivys/ivy-1.0.2.xml
-[ivy:install] published jboss-system to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-system/jars/jboss-system-4.0.2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-system/ivys/ivy-4.0.2.xml
-[ivy:install] published jboss-common to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-common/jars/jboss-common-4.0.2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-common/ivys/ivy-4.0.2.xml
-[ivy:install] published jboss-minimal to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-minimal/jars/jboss-minimal-4.0.2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-minimal/ivys/ivy-4.0.2.xml
-[ivy:install] published jboss-j2se to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-j2se/jars/jboss-j2se-200504122039.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jboss/jboss-j2se/ivys/ivy-200504122039.xml
-[ivy:install] published concurrent to /ivy/build-a-ivy-repository/myrepository/no-namespace/concurrent/concurrent/jars/concurrent-1.3.4.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/concurrent/concurrent/ivys/ivy-1.3.4.xml
-[ivy:install] published jgroups-all to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/jars/jgroups-all-2.2.7.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/jgroups/jgroups-all/ivys/ivy-2.2.7.xml
-[ivy:install] published webdavlib to /ivy/build-a-ivy-repository/myrepository/no-namespace/slide/webdavlib/jars/webdavlib-2.0.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/slide/webdavlib/ivys/ivy-2.0.xml
-[ivy:install] published xercesImpl to /ivy/build-a-ivy-repository/myrepository/no-namespace/xerces/xercesImpl/jars/xercesImpl-2.6.2.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/xerces/xercesImpl/ivys/ivy-2.6.2.xml
-[ivy:install] :: install resolution report ::
-[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 52845ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 28 | 28 | 28 | 0 || 30 | 28 |
- ---------------------------------------------------------------------
-[ivy:install]
-[ivy:install] :: problems summary ::
-[ivy:install] :::: WARNINGS
-[ivy:install] [NOT FOUND ] javax.transaction#jta;1.0.1B!jta.jar (0ms)
-[ivy:install] ==== libraries: tried
-[ivy:install] https://repo1.maven.org/maven2/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar
-[ivy:install] [NOT FOUND ] javax.security#jacc;1.0!jacc.jar (0ms)
-[ivy:install] ==== libraries: tried
-[ivy:install] https://repo1.maven.org/maven2/javax/security/jacc/1.0/jacc-1.0.jar
-[ivy:install] ::::::::::::::::::::::::::::::::::::::::::::::
-[ivy:install] :: FAILED DOWNLOADS ::
-[ivy:install] :: ^ see resolution messages for details ^ ::
-[ivy:install] ::::::::::::::::::::::::::::::::::::::::::::::
-[ivy:install] :: javax.transaction#jta;1.0.1B!jta.jar
-[ivy:install] :: javax.security#jacc;1.0!jacc.jar
-[ivy:install] ::::::::::::::::::::::::::::::::::::::::::::::
-[ivy:install]
-[ivy:install] :: USE VERBOSE OR DEBUG MESSAGE LEVEL FOR MORE DETAILS
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/install-namespace.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install-namespace.txt b/asciidoc/tutorial/log/install-namespace.txt
deleted file mode 100644
index 7f053ee..0000000
--- a/asciidoc/tutorial/log/install-namespace.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[ivy@apache:/ivy/build-a-ivy-repository]$ ant maven2-namespace
-Buildfile: /ivy/build-a-ivy-repository/build.xml
-
-load-ivy:
-
-init-ivy:
-
-maven2-namespace:
-[ivy:install] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-advanced.xml
-[ivy:install] :: installing apache#commons-lang;1.0 ::
-[ivy:install] :: resolving dependencies ::
-[ivy:install] found apache#commons-lang;1.0 in libraries
-[ivy:install] :: downloading artifacts to cache ::
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0.jar ...
-[ivy:install] ............... (62kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar (1728ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
-[ivy:install] ...................... (170kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar(javadoc) (1639ms)
-[ivy:install] :: installing in my-repository ::
-[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar
-[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml
-[ivy:install] :: install resolution report ::
-[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 3370ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 1 | 1 | 1 | 0 || 2 | 2 |
- ---------------------------------------------------------------------
-
-BUILD SUCCESSFUL
-Total time: 8 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/install.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install.txt b/asciidoc/tutorial/log/install.txt
deleted file mode 100644
index 286212b..0000000
--- a/asciidoc/tutorial/log/install.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[ivy@apache:/ivy/build-a-ivy-repository]$ ant maven2
-Buildfile: /ivy/build-a-ivy-repository/build.xml
-
-load-ivy:
-
-init-ivy:
-
-maven2:
-[ivy:install] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-basic.xml
-[ivy:install] :: installing commons-lang#commons-lang;1.0 ::
-[ivy:install] :: resolving dependencies ::
-[ivy:install] found commons-lang#commons-lang;1.0 in libraries
-[ivy:install] :: downloading artifacts to cache ::
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0.jar ...
-[ivy:install] ............... (62kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar (1979ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
-[ivy:install] ...................... (170kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar(javadoc) (2048ms)
-[ivy:install] :: installing in my-repository ::
-[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar
-[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar
-[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml
-[ivy:install] :: install resolution report ::
-[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 4030ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 1 | 1 | 1 | 0 || 2 | 2 |
- ---------------------------------------------------------------------
-
-BUILD SUCCESSFUL
-Total time: 8 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/multi-project-find-antp.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-find-antp.txt b/asciidoc/tutorial/log/multi-project-find-antp.txt
deleted file mode 100644
index d3a0883..0000000
--- a/asciidoc/tutorial/log/multi-project-find-antp.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[ivy@apache:/ivy/multi-project/projects/find]$ ant -p
-Buildfile: /ivy/multi-project/projects/find/build.xml
-
-Main targets:
-
- clean --> clean the project
- clean-build --> clean the project built files
- clean-lib --> clean the project libraries directory (dependencies)
- clean-local --> cleans the local repository for the current module
- compile --> compile the project
- jar --> make a jar file for this project
- publish --> publish this project in the ivy repository
- publish-local --> publish this project in the local ivy repository
- report --> generates a report of dependencies
- resolve --> resolve and retrieve dependencies with ivy
- run --> compile and run the project
-Default target: compile
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/multi-project-general-antp.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-general-antp.txt b/asciidoc/tutorial/log/multi-project-general-antp.txt
deleted file mode 100644
index 6ed2034..0000000
--- a/asciidoc/tutorial/log/multi-project-general-antp.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[ivy@apache:/ivy/multi-project]$ ant -p
-Buildfile: /ivy/multi-project/build.xml
-
-Main targets:
-
- clean clean tutorial: delete repository, ivy cache, and all projects
- clean-all clean all projects
- publish-all compile, jar and publish all projects in the right order
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/multi-project-general-publishall.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-general-publishall.txt b/asciidoc/tutorial/log/multi-project-general-publishall.txt
deleted file mode 100644
index deebd90..0000000
--- a/asciidoc/tutorial/log/multi-project-general-publishall.txt
+++ /dev/null
@@ -1,338 +0,0 @@
-[ivy@apache:/ivy/multi-project]$ ant publish-all
-Buildfile: /ivy/multi-project/build.xml
-
-load-ivy:
-
-buildlist:
-[ivy:buildlist] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
-[ivy:buildlist] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-publish-all:
-
-clean-build:
-
-load-ivy:
-
-ivy-new-version:
- [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-version:
- [mkdir] Created dir: /ivy/multi-project/projects/version/build/classes
-
-clean-lib:
-
-resolve:
- [mkdir] Created dir: /ivy/multi-project/projects/version/lib
-[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#version;working@apache
-[ivy:resolve] confs: [default]
-[ivy:resolve] :: resolution report :: resolve 18ms :: artifacts dl 0ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 0 | 0 | 0 | 0 || 0 | 0 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache.ivy.example#version
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 0 artifacts copied, 0 already retrieved (0kB/2ms)
-
-compile:
- [javac] Compiling 1 source file to /ivy/multi-project/projects/version/build/classes
-
-jar:
- [jar] Building jar: /ivy/multi-project/projects/version/build/version.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#version;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:39:37 IST 2017
-[ivy:publish] delivering ivy file to /ivy/multi-project/projects/version/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache.ivy.example#version
-[ivy:publish] published version to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part/jars/version.jar
-[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part
-[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1
- [echo] project version released with version 1.0-dev-b1
-
-clean-build:
-
-load-ivy:
-
-ivy-new-version:
- [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-version:
- [mkdir] Created dir: /ivy/multi-project/projects/list/build/classes
-
-clean-lib:
-
-resolve:
- [mkdir] Created dir: /ivy/multi-project/projects/list/lib
-[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#list;working@apache
-[ivy:resolve] confs: [core, standalone]
-[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
-[ivy:resolve] found commons-cli#commons-cli;1.4 in public
-[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1/jars/version.jar ...
-[ivy:resolve] .. (1kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#version;1.0-dev-b1!version.jar (3ms)
-[ivy:resolve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
-[ivy:resolve] ............... (52kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1709ms)
-[ivy:resolve] :: resolution report :: resolve 7905ms :: artifacts dl 1714ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | core | 1 | 1 | 1 | 0 || 1 | 1 |
- | standalone | 2 | 2 | 2 | 0 || 2 | 2 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache.ivy.example#list
-[ivy:retrieve] confs: [core, standalone]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (54kB/4ms)
-
-compile:
- [javac] Compiling 2 source files to /ivy/multi-project/projects/list/build/classes
-
-jar:
- [jar] Building jar: /ivy/multi-project/projects/list/build/list.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#list;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:39:48 IST 2017
-[ivy:publish] delivering ivy file to /ivy/multi-project/projects/list/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache.ivy.example#list
-[ivy:publish] published list to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part/jars/list.jar
-[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part
-[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1
- [echo] project list released with version 1.0-dev-b1
-
-clean-build:
-
-load-ivy:
-
-ivy-new-version:
- [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-version:
- [mkdir] Created dir: /ivy/multi-project/projects/find/build/classes
-
-clean-lib:
-
-resolve:
- [mkdir] Created dir: /ivy/multi-project/projects/find/lib
-[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#find;working@apache
-[ivy:resolve] confs: [core, standalone]
-[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
-[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
-[ivy:resolve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:resolve] found commons-cli#commons-cli;1.4 in public
-[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1/jars/list.jar ...
-[ivy:resolve] .. (2kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#list;1.0-dev-b1!list.jar (2ms)
-[ivy:resolve] downloading https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar ...
-[ivy:resolve] ......................
-[ivy:resolve] .............
-[ivy:resolve] .................
-[ivy:resolve] ..... (733kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (6019ms)
-[ivy:resolve] :: resolution report :: resolve 8617ms :: artifacts dl 6024ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | core | 3 | 3 | 2 | 0 || 3 | 2 |
- | standalone | 4 | 3 | 2 | 0 || 4 | 2 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache.ivy.example#find
-[ivy:retrieve] confs: [core, standalone]
-[ivy:retrieve] 4 artifacts copied, 0 already retrieved (790kB/6ms)
-
-compile:
- [javac] Compiling 2 source files to /ivy/multi-project/projects/find/build/classes
-
-jar:
- [jar] Building jar: /ivy/multi-project/projects/find/build/find.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#find;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:04 IST 2017
-[ivy:publish] delivering ivy file to /ivy/multi-project/projects/find/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache.ivy.example#find
-[ivy:publish] published find to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part/jars/find.jar
-[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part
-[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1
- [echo] project find released with version 1.0-dev-b1
-
-clean-build:
-
-load-ivy:
-
-ivy-new-version:
- [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-version:
- [mkdir] Created dir: /ivy/multi-project/projects/size/build/classes
-
-clean-lib:
-
-resolve:
- [mkdir] Created dir: /ivy/multi-project/projects/size/lib
-[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#size;working@apache
-[ivy:resolve] confs: [default]
-[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
-[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
-[ivy:resolve] :: resolution report :: resolve 1837ms :: artifacts dl 1ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 2 | 2 | 0 | 0 || 2 | 0 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache.ivy.example#size
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (4kB/2ms)
-
-compile:
- [javac] Compiling 1 source file to /ivy/multi-project/projects/size/build/classes
-
-jar:
- [jar] Building jar: /ivy/multi-project/projects/size/build/size.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#size;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:07 IST 2017
-[ivy:publish] delivering ivy file to /ivy/multi-project/projects/size/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache.ivy.example#size
-[ivy:publish] published size to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part/jars/size.jar
-[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part
-[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1
- [echo] project size released with version 1.0-dev-b1
-
-clean-build:
-
-load-ivy:
-
-ivy-new-version:
- [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-version:
- [mkdir] Created dir: /ivy/multi-project/projects/sizewhere/build/classes
-
-clean-lib:
-
-resolve:
- [mkdir] Created dir: /ivy/multi-project/projects/sizewhere/lib
-[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#sizewhere;working@apache
-[ivy:resolve] confs: [core, standalone]
-[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
-[ivy:resolve] found org.apache.ivy.example#size;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#size;latest.integration
-[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
-[ivy:resolve] found org.apache.ivy.example#find;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#find;latest.integration
-[ivy:resolve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:resolve] found commons-cli#commons-cli;1.4 in public
-[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1/jars/size.jar ...
-[ivy:resolve] .. (1kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#size;1.0-dev-b1!size.jar (1ms)
-[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1/jars/find.jar ...
-[ivy:resolve] .. (3kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#find;1.0-dev-b1!find.jar (2ms)
-[ivy:resolve] :: resolution report :: resolve 2480ms :: artifacts dl 6ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | core | 5 | 3 | 2 | 0 || 5 | 2 |
- | standalone | 6 | 3 | 2 | 0 || 6 | 2 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache.ivy.example#sizewhere
-[ivy:retrieve] confs: [core, standalone]
-[ivy:retrieve] 6 artifacts copied, 0 already retrieved (795kB/5ms)
-
-compile:
- [javac] Compiling 2 source files to /ivy/multi-project/projects/sizewhere/build/classes
-
-jar:
- [jar] Building jar: /ivy/multi-project/projects/sizewhere/build/sizewhere.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#sizewhere;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:11 IST 2017
-[ivy:publish] delivering ivy file to /ivy/multi-project/projects/sizewhere/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache.ivy.example#sizewhere
-[ivy:publish] published sizewhere to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part/jars/sizewhere.jar
-[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part
-[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1
- [echo] project sizewhere released with version 1.0-dev-b1
-
-clean-build:
-
-load-ivy:
-
-ivy-new-version:
- [ivy:info] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
-
-version:
- [mkdir] Created dir: /ivy/multi-project/projects/console/build/classes
-
-clean-lib:
-
-resolve:
- [mkdir] Created dir: /ivy/multi-project/projects/console/lib
-[ivy:resolve] :: resolving dependencies :: org.apache.ivy.example#console;working@apache
-[ivy:resolve] confs: [default]
-[ivy:resolve] found org.apache.ivy.example#version;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
-[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
-[ivy:resolve] found commons-cli#commons-cli;1.4 in public
-[ivy:resolve] found org.apache.ivy.example#find;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#find;latest.integration
-[ivy:resolve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:resolve] found org.apache.ivy.example#sizewhere;1.0-dev-b1 in shared
-[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#sizewhere;latest.integration
-[ivy:resolve] found org.apache.ivy.example#size;1.0-dev-b1 in shared
-[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1/jars/sizewhere.jar ...
-[ivy:resolve] .. (2kB)
-[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#sizewhere;1.0-dev-b1!sizewhere.jar (3ms)
-[ivy:resolve] :: resolution report :: resolve 3486ms :: artifacts dl 6ms
- ---------------------------------------------------------------------
- | | modules || artifacts |
- | conf | number| search|dwnlded|evicted|| number|dwnlded|
- ---------------------------------------------------------------------
- | default | 7 | 4 | 1 | 0 || 7 | 1 |
- ---------------------------------------------------------------------
-[ivy:retrieve] :: retrieving :: org.apache.ivy.example#console
-[ivy:retrieve] confs: [default]
-[ivy:retrieve] 7 artifacts copied, 0 already retrieved (798kB/4ms)
-
-compile:
- [javac] Compiling 1 source file to /ivy/multi-project/projects/console/build/classes
-
-jar:
- [jar] Building jar: /ivy/multi-project/projects/console/build/console.jar
-
-publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#console;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:15 IST 2017
-[ivy:publish] delivering ivy file to /ivy/multi-project/projects/console/build/ivy.xml
-[ivy:publish] :: publishing :: org.apache.ivy.example#console
-[ivy:publish] published console to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part/jars/console.jar
-[ivy:publish] published ivy to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part/ivys/ivy.xml
-[ivy:publish] publish committed: moved /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part
-[ivy:publish] to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1
- [echo] project console released with version 1.0-dev-b1
-
-BUILD SUCCESSFUL
-Total time: 42 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/myrepository-content-deps.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/myrepository-content-deps.txt b/asciidoc/tutorial/log/myrepository-content-deps.txt
deleted file mode 100644
index ce37429..0000000
--- a/asciidoc/tutorial/log/myrepository-content-deps.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[ivy@apache:/]$ find /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate -type f -print
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml.sha1
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar.sha1
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar.sha1
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar.sha1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/myrepository-content-namespace.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/myrepository-content-namespace.txt b/asciidoc/tutorial/log/myrepository-content-namespace.txt
deleted file mode 100644
index 1766f87..0000000
--- a/asciidoc/tutorial/log/myrepository-content-namespace.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-$ find /ivy/build-a-ivy-repository/myrepository/advanced -type f -print
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml.md5
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml.sha1
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar.md5
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar.sha1
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar.md5
-/ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar.sha1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/asciidoc/tutorial/log/myrepository-content.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/myrepository-content.txt b/asciidoc/tutorial/log/myrepository-content.txt
deleted file mode 100644
index 39206c6..0000000
--- a/asciidoc/tutorial/log/myrepository-content.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[ivy@apache:/]$ find /ivy/build-a-ivy-repository/myrepository/no-namespace -type f -print
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml.sha1
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar.sha1
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar.md5
-/ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar.sha1
\ No newline at end of file
[06/29] ant-ivy git commit: - update asciidoctor - improve
transforming xooki source into asciidoc source
Posted by ja...@apache.org.
- update asciidoctor
- improve transforming xooki source into asciidoc source
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1760b262
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1760b262
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1760b262
Branch: refs/heads/master
Commit: 1760b262c2d99d7803184e471116478ef18ff4c8
Parents: 3d72f1d
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Thu May 25 14:55:24 2017 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Thu May 25 14:55:24 2017 +0200
----------------------------------------------------------------------
build-release.xml | 36 +++++++---------
doc/xooki2asciidoc/xooki2asciidoc.js | 70 +++++++++++++++++++++++++++----
2 files changed, 75 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1760b262/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 7e3fc23..65c13c5 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -63,8 +63,8 @@
</sequential>
</macrodef>
- <target name="generate-tutorial-output" depends="jar, generate-doc-init">
- <property name="output.dir" value="${build.dir}/output" />
+ <target name="generate-tutorial-output" depends="jar" unless="skip.generate-tutorial-output">
+ <property name="output.dir" value="${basedir}/asciidoc/tutorial/log" />
<delete dir="${output.dir}" />
<mkdir dir="${output.dir}" />
@@ -164,35 +164,27 @@
<replace dir="${output.dir}" token="-f build.xml " value="" />
<replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
- <copy todir="${doc.tmp.dir}/tutorial/log">
- <fileset dir="${output.dir}" />
- </copy>
- </target>
-
- <target name="generate-doc-init" depends="release-version">
- <!-- copy documentation to temp dir to replace version tokens -->
- <property name="doc.tmp.dir" value="${build.dir}/tempdoc" />
- <mkdir dir="${doc.tmp.dir}" />
- <copy todir="${doc.tmp.dir}" preservelastmodified="true" overwrite="true">
- <fileset dir="${doc.src.dir}" />
- <filterset>
- <filter token="version" value="${build.version}"/>
- </filterset>
- </copy>
</target>
- <target name="generate-doc" depends="init-ivy,generate-doc-init,generate-tutorial-output">
+ <target name="generate-doc" depends="init-ivy">
<ivy:cachepath pathid="asciidoctor.path">
- <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.0" />
+ <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.4" />
</ivy:cachepath>
<taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
- <asciidoctor:convert sourceDirectory="${doc.tmp.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
- <attribute key="basedir" value="${doc.tmp.dir}" />
+ <asciidoctor:convert sourceDirectory="${doc.src.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
+ <attribute key="basedir" value="${doc.src.dir}" />
<attribute key="imagesdir" value="" />
</asciidoctor:convert>
+ <!-- the basedir seems to fuck up the path to the output directory, let's fix that manually >
+ <delete dir="${doc.build.dir}" />
+ <mkdir dir="${doc.build.dir}" />
+ <copy todir="${doc.build.dir}">
+ <fileset dir="${doc.src.dir}/${doc.build.dir}" />
+ </copy-->
+ <!-- copy static resources -->
<copy todir="${doc.build.dir}">
<fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
- <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
+ <fileset dir="${doc.src.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1760b262/doc/xooki2asciidoc/xooki2asciidoc.js
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/xooki2asciidoc.js b/doc/xooki2asciidoc/xooki2asciidoc.js
index d9ed69a..27fb62f 100644
--- a/doc/xooki2asciidoc/xooki2asciidoc.js
+++ b/doc/xooki2asciidoc/xooki2asciidoc.js
@@ -353,7 +353,8 @@ xooki.string = {
// empty match are not allowed
return null;
}
-
+
+ print('matched!\n');
//print('matched !' + str.substring(openResult.begin, closeResult.end) + '\n');
var children = [];
@@ -805,7 +806,7 @@ xooki.input = {
from = 0;
while (codeSection != null) {
processedSection = "\n[source]\n----\n"
- + input.substring(codeSection.innerStart, codeSection.innerEnd)
+ + input.substring(codeSection.innerStart, codeSection.innerEnd).replace(/</g, "LOWER_THAN_IN_CODE").replace(/>/g, "GREATER_THAN_IN_CODE")
+ "\n----\n\n";
input = input.substring(0, codeSection.outerStart)
+ processedSection
@@ -895,6 +896,29 @@ xooki.input = {
s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"tip"[^>]*>'), new RegExp('</div>'), from);
}
+ print('search postit\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"postit"[^>]*>'), new RegExp('</div>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "\n[NOTE]\n====\n" + input.substring(s.innerStart, s.innerEnd) + "\n====\n";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"tip"[^>]*>'), new RegExp('</div>'), from);
+ }
+
+ print('search shell\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"shell"[^>]*>'), new RegExp('</div>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "\n[source,shell]\n----\n"
+ + input.substring(s.innerStart, s.innerEnd).replace(/<pre>/g, "").replace(/<\/pre>/g, "")
+ + "\n----\n\n";
+ print("processedSection='" + processedSection + "'")
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"shell"[^>]*>'), new RegExp('</div>'), from);
+ }
+
print('search step\n')
s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"step"[^>]*>'), new RegExp('</div>'));
from = 0;
@@ -905,26 +929,27 @@ xooki.input = {
s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"step"[^>]*>'), new RegExp('</div>'), from);
}
- print('search shell\n')
- s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"shell"[^>]*>'), new RegExp('</div>'));
+ print('search ivy-file\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"ivy-file"[^>]*>'), new RegExp('</div>'));
from = 0;
while (s != null) {
processedSection = input.substring(s.innerStart, s.innerEnd);
input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
from = s.outerStart + processedSection.length;
- s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"shell"[^>]*>'), new RegExp('</div>'), from);
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"ivy-file"[^>]*>'), new RegExp('</div>'), from);
}
print('search img\n')
- s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*/>'));
+ s = xooki.string.find(input, new RegExp('<img\\s*(.*)\\s*/>'));
from = 0;
while (s != null) {
- processedSection = " image:" + s.matcher[1] + "[]"
+ imgSrc = s.matcher[1].replace(new RegExp('^.*src\\s*=\\s*\\"([^\\"]*)\\".*$'), "$1")
+ processedSection = "image::" + imgSrc + "[]"
input = input.substring(0, s.begin)
+ processedSection
+ input.substring(s.end);
from = s.begin + processedSection.length;
- s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*/>'), from);
+ s = xooki.string.find(input, new RegExp('<img\\s*(.*)\\s*/>'), from);
}
print('search img title\n')
@@ -1208,6 +1233,15 @@ xooki.input = {
if (!first) {
start = lastEnd;
betweenliContent = input.substring(lastEnd, sli.outerStart);
+ iSpace = 0
+ while (iSpace < betweenliContent.length && (betweenliContent.charAt(iSpace) == ' ' || betweenliContent.charAt(iSpace) == '\t')) {
+ iSpace++;
+ }
+ if (betweenliContent.charAt(iSpace) == "\n") {
+ betweenliContent = " +" + betweenliContent;
+ } else {
+ betweenliContent = " +\n" + betweenliContent;
+ }
}
processedSection = betweenliContent + "\n" + innerindent + input.substring(sli.innerStart, sli.innerEnd).replace(/\\s/, ' ');
input = input.substring(0, start)
@@ -1223,7 +1257,19 @@ xooki.input = {
print(input.substring(from, from + 100));
return input;
}
- input = input.substring(0, s.begin) + input.substring(s.end);
+
+ afterLastContent = input.substring(lastEnd, s.begin);
+ iSpace = 0
+ while (iSpace < afterLastContent.length && (afterLastContent.charAt(iSpace) == ' ' || afterLastContent.charAt(iSpace) == '\t')) {
+ iSpace++;
+ }
+ if (afterLastContent.charAt(iSpace) == "\n") {
+ afterLastContent = " +" + afterLastContent;
+ } else {
+ afterLastContent = " +\n" + afterLastContent;
+ }
+
+ input = input.substring(0, lastEnd) + afterLastContent + input.substring(s.end);
from = s.begin;
return htmllisttag(input, from, indent);
}
@@ -1312,6 +1358,12 @@ xooki.input = {
print("found=" + (s != null) + "\n")
}
+ input = input.replace(/LOWER_THAN_IN_CODE/g, "<").replace(/GREATER_THAN_IN_CODE/g, ">")
+
+ input = input.replace(/include::..\/..\/tutorial/g, "include::asciidoc/tutorial")
+ input = input.replace(/include::..\/tutorial/g, "include::asciidoc/tutorial")
+ input = input.replace(/include::tutorial/g, "include::asciidoc/tutorial")
+
return input;
},
},
[13/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/toc.json
----------------------------------------------------------------------
diff --git a/asciidoc/toc.json b/asciidoc/toc.json
new file mode 100644
index 0000000..55a0f21
--- /dev/null
+++ b/asciidoc/toc.json
@@ -0,0 +1,957 @@
+{
+ "children": [
+ {
+ "id":"index",
+ "title":"Documentation",
+ "children": [
+ {
+ "id":"release-notes",
+ "title":"Release Notes"
+ },
+ {
+ "id":"tutorial",
+ "title":"Tutorials",
+ "children": [
+ {
+ "id":"tutorial/start",
+ "title":"Quick Start",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/defaultconf",
+ "title":"Adjusting default settings",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/multiple",
+ "title":"Multiple Resolvers",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/dual",
+ "title":"Dual Resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/dependence",
+ "title":"Project dependencies",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/multiproject",
+ "title":"Using Ivy in multiple projects environment",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/conf",
+ "title":"Using Ivy Module Configurations",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/build-repository",
+ "title":"Building a repository",
+ "children": [
+ {
+ "id":"tutorial/build-repository/basic",
+ "title":"Basic repository copy",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"tutorial/build-repository/advanced",
+ "title":"Using namespaces",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"moreexamples",
+ "title":"More examples",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"reference",
+ "title":"Reference",
+ "children": [
+ {
+ "id":"intro",
+ "title":"Introduction",
+ "isAbstract":true,
+ "children": [
+ {
+ "id":"terminology",
+ "title":"Terminology",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"concept",
+ "title":"Main Concepts",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"textual",
+ "title":"Text Conventions",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"principle",
+ "title":"How does it work ?",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"bestpractices",
+ "title":"Best practices",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"compatibility",
+ "title":"Compatibility",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"install",
+ "title":"Installation",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings",
+ "title":"Settings Files",
+ "children": [
+ {
+ "id":"settings/property",
+ "title":"property",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/properties",
+ "title":"properties",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/settings",
+ "title":"settings",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/include",
+ "title":"include",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/classpath",
+ "title":"classpath",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/typedef",
+ "title":"typedef",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/credentials",
+ "title":"credentials",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/signers",
+ "title":"signers",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/lock-strategies",
+ "title":"lock-strategies",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/caches",
+ "title":"caches",
+ "children": [
+ {
+ "id":"settings/caches/cache",
+ "title":"cache",
+ "children": [
+ {
+ "id":"settings/caches/ttl",
+ "title":"ttl",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings/latest-strategies",
+ "title":"latest-strategies",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/parsers",
+ "title":"parsers",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/namespaces",
+ "title":"namespaces",
+ "children": [
+ {
+ "id":"settings/namespace",
+ "title":"namespace",
+ "children": [
+ {
+ "id":"settings/namespace/rule",
+ "title":"rule",
+ "children": [
+ {
+ "id":"settings/namespace/fromtosystem",
+ "title":"fromsystem / tosystem",
+ "children": [
+ {
+ "id":"settings/namespace/src",
+ "title":"src",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/namespace/dest",
+ "title":"dest",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings/macrodef",
+ "title":"macrodef",
+ "children": [
+ {
+ "id":"settings/macrodef/attribute",
+ "title":"attribute",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings/resolvers",
+ "title":"resolvers",
+ "children": [
+ {
+ "id":"resolver/ivyrep",
+ "title":"IvyRep Resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/ibiblio",
+ "title":"IBiblio Resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/packager",
+ "title":"Packager resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/filesystem",
+ "title":"File System resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/url",
+ "title":"Url Resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/chain",
+ "title":"Chain Resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/dual",
+ "title":"Dual resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/sftp",
+ "title":"sftp resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/ssh",
+ "title":"ssh resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/vfs",
+ "title":"vfs resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/jar",
+ "title":"Jar resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/obr",
+ "title":"OSGi Bundle Repository",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/osgiagg",
+ "title":"Aggregated OSGi Repository",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/updatesite",
+ "title":"Eclipse updatesite",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/mirrored",
+ "title":"Mirrored Resolver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"resolver/bintray",
+ "title":"Bintray Resolver",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings/conflict-managers",
+ "title":"conflict-managers",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/modules",
+ "title":"modules",
+ "children": [
+ {
+ "id":"settings/module",
+ "title":"module",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings/outputters",
+ "title":"outputters",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/signers",
+ "title":"signers",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/statuses",
+ "title":"statuses",
+ "children": [
+ {
+ "id":"settings/status",
+ "title":"status",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"settings/triggers",
+ "title":"triggers",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"settings/version-matchers",
+ "title":"version-matchers",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile",
+ "title":"Ivy Files",
+ "children": [
+ {
+ "id":"ivyfile/info",
+ "title":"info",
+ "children": [
+ {
+ "id":"ivyfile/extends",
+ "title":"extends",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/license",
+ "title":"license",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/ivyauthor",
+ "title":"ivyauthor",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/repository",
+ "title":"repository",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/description",
+ "title":"description",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/configurations",
+ "title":"configurations",
+ "children": [
+ {
+ "id":"ivyfile/conf",
+ "title":"conf",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/include",
+ "title":"include",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/publications",
+ "title":"publications",
+ "children": [
+ {
+ "id":"ivyfile/artifact",
+ "title":"artifact",
+ "children": [
+ {
+ "id":"ivyfile/artifact-conf",
+ "title":"conf",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/dependencies",
+ "title":"dependencies",
+ "children": [
+ {
+ "id":"ivyfile/dependency",
+ "title":"dependency",
+ "children": [
+ {
+ "id":"ivyfile/dependency-conf",
+ "title":"conf",
+ "children": [
+ {
+ "id":"ivyfile/mapped",
+ "title":"mapped",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/dependency-artifact",
+ "title":"artifact",
+ "children": [
+ {
+ "id":"ivyfile/dependency-artifact-conf",
+ "title":"conf",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/artifact-exclude",
+ "title":"exclude",
+ "children": [
+ {
+ "id":"ivyfile/artifact-exclude-conf",
+ "title":"conf",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/dependency-include",
+ "title":"include",
+ "children": [
+ {
+ "id":"ivyfile/dependency-include-conf",
+ "title":"conf",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/exclude",
+ "title":"exclude",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/override",
+ "title":"override",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"ivyfile/conflict",
+ "title":"conflict",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ivyfile/conflicts",
+ "title":"conflicts",
+ "children": [
+ {
+ "id":"ivyfile/manager",
+ "title":"manager",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"ant",
+ "title":"Ant Tasks",
+ "children": [
+ {
+ "id":"use/artifactproperty",
+ "title":"artifactproperty",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/artifactreport",
+ "title":"artifactreport",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/buildlist",
+ "title":"buildlist",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/buildobr",
+ "title":"buildobr",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/buildnumber",
+ "title":"buildnumber",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/cachefileset",
+ "title":"cachefileset",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/cachepath",
+ "title":"cachepath",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/checkdepsupdate",
+ "title":"checkdepsupdate",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/cleancache",
+ "title":"cleancache",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/configure",
+ "title":"configure",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/convertmanifest",
+ "title":"convertmanifest",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/convertpom",
+ "title":"convertpom",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/deliver",
+ "title":"deliver",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/dependencytree",
+ "title":"dependencytree",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/findrevision",
+ "title":"findrevision",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/fixdeps",
+ "title":"fixdeps",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/info",
+ "title":"info",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/install",
+ "title":"install",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/listmodules",
+ "title":"listmodules",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/makepom",
+ "title":"makepom",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/postresolvetask",
+ "title":"post resolve tasks",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/publish",
+ "title":"publish",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/repreport",
+ "title":"repreport",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/resolve",
+ "title":"resolve",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/resources",
+ "title":"resources",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/retrieve",
+ "title":"retrieve",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/report",
+ "title":"report",
+ "children": [
+ {
+ "id":"yed",
+ "title":"Using yEd to layout report graphs",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"use/settings",
+ "title":"settings",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"use/var",
+ "title":"var",
+ "children": [
+
+ ]
+ }
+ ]
+ },
+ {
+ "id":"standalone",
+ "title":"Using standalone",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"osgi",
+ "title":"OSGi",
+ "children": [
+ {
+ "id":"osgi/osgi-mapping",
+ "title":"OSGi mapping",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"osgi/eclipse-plugin",
+ "title":"Building an Eclipse plugin",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"osgi/standard-osgi",
+ "title":"Building a standard OSGi bundle",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"osgi/target-platform",
+ "title":"Managing a target platform",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"osgi/sigil",
+ "title":"Apache Felix Sigil",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"dev",
+ "title":"Developer doc",
+ "children": [
+ {
+ "id":"extend",
+ "title":"Extending Ivy",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"dev/makerelease",
+ "title":"Making a release",
+ "children": [
+
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial.adoc b/asciidoc/tutorial.adoc
new file mode 100644
index 0000000..cf997c5
--- /dev/null
+++ b/asciidoc/tutorial.adoc
@@ -0,0 +1,46 @@
+
+The best way to learn is to practice! That's what the Ivy tutorials will help you to do, to discover some of the great Ivy features.
+
+For the first tutorial you won't even have to install Ivy (assuming you have Ant and a JDK properly installed), and it shouldn't take more than 30 seconds.
+
+*First Tutorial*
+
+
+. Make sure you have link:http://ant.apache.org/[ant] 1.6.0 or greater and a link:http://java.sun.com[jdk] properly installed +
+
+. Copy link:samples/build.xml[this build file] in an empty directory on your local filesystem (and make sure you name it build.xml) +
+
+. Open a console in this directory and run "ant". That's it! +
+
+If you have any trouble, check the link:http://ant.apache.org/ivy/faq.html[FAQ]. It is most likely related to your internet connection (proxy anyone?).
+
+OK, you've just seen how easy it is to take your first step with Ivy. Go ahead with the other tutorials, but before you do, make sure you have properly link:install.html[installed] Ivy and downloaded the tutorials sources (included in all Ivy distributions, in the `link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=tree;f=src/example[src/example]` directory).
+
+The following tutorials are available:
+
+
+* link:tutorial/start.html[Quick Start] +
+Guides you through your very first steps with ivy.
+
+* link:tutorial/defaultconf.html[Adjusting default settings] +
+Gives you a better understanding of the default settings and shows you how to customize them to your needs.
+
+* link:tutorial/multiple.html[Multiple Resolvers] +
+Teaches you how to configure Ivy to find its dependencies in multiple places.
+
+* link:tutorial/dual.html[Dual Resolver] +
+Helps you configure Ivy to find ivy files in one place and artifacts in another.
+
+* link:tutorial/dependence.html[Project dependencies]</a> +
+A starting point for using Ivy in a multi-project environment.
+
+* link:tutorial/multiproject.html[Using Ivy in multiple projects environment] +
+A more complex example demonstrating the use of Ant+Ivy in a multi-project environment.
+
+* link:tutorial/conf.html[Using Ivy Module Configurations] +
+ Shows you how to use configurations in an ivy file to define sets of artifacts.
+
+* link:tutorial/build-repository.html[Building a repository] +
+Shows you how to build your own enterprise repository.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/build-repository.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/build-repository.adoc b/asciidoc/tutorial/build-repository.adoc
new file mode 100644
index 0000000..98a0c52
--- /dev/null
+++ b/asciidoc/tutorial/build-repository.adoc
@@ -0,0 +1,44 @@
+
+The link:../use/install.html[install] Ant task lets you copy a module or a set of modules from one repository to another. This is very useful to build and maintain an enterprise or team repository. If you don't want to give access to the public maven 2 repository to the developers on your team (to keep control over which modules are in use in your company or your team for instance), it can sometimes become tiresome to answer the developers request to add new modules or new versions by hand.
+
+Fortunately the link:../use/install.html[install] task is here to help: you can use specific settings for your repository maintenance build which will be used to maintain your target enterprise repository. These settings will point to another repository (for instance the maven 2 public repository) so that you will just have to ask Ivy to install the modules you want with a simple command line.
+
+To demonstrate this, we will first use a basic ivy settings file to show how it works, and then we will use the advanced link:../settings/namespaces.html[namespaces] features to demonstrate how to deal with naming mismatches between the source and target repository.
+
+
+== The project used
+
+The project that we will use is pretty simple. It is composed of an Ant build file, and two ivy settings files.
+
+Here are the public targets that we will use:
+
+[source,shell]
+----
+
+Z:\ivy-repository>ant -p
+Buildfile: build.xml
+
+Main targets:
+
+ clean-cache --> clean the cache
+ clean-repo --> clean the destination repository
+ maven2 --> install module from maven 2 repository
+ maven2-deps --> install module from maven 2 repository with dependencies
+ maven2-namespace --> install module from maven 2 using namespaces
+ maven2-namespace-deps --> install module with dependencies from maven2 repo using namespaces
+Default target: basic
+
+----
+
+
+
+
+
+This project is accessible in the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=tree;f=src/example/build-a-ivy-repository[src/example/build-a-ivy-repository]
+
+Next steps:
+link:../tutorial/build-repository/basic.html[Basic repository copy]
+link:../tutorial/build-repository/advanced.html[Using namespaces]
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/build-repository/advanced.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/build-repository/advanced.adoc b/asciidoc/tutorial/build-repository/advanced.adoc
new file mode 100644
index 0000000..e24c58f
--- /dev/null
+++ b/asciidoc/tutorial/build-repository/advanced.adoc
@@ -0,0 +1,136 @@
+
+Now that you have seen how simple it is to create your own repository from an existing one, you may wonder how you can handle more complex cases, like when the source and destination repositories don't follow the same naming conventions.
+
+
+
+== On the road to a professional repository
+
+In this section, you will learn how to build a *professional* repository. What is a *professional* repository? Our vision is to say that a good quality repository must follow clear rules about projects naming and must offer correct, useable, configurations and verified project descriptors. In order to achieve those goals, we think that you have to build your own repository.
+We have seen in the previous example, that we could use some public repositories to begin to build our own repository. Nevertheless, the result is not always the expected one, especially concerning the naming rules used.
+
+This problem is pretty normal when you have an existing repository, and want to benefit from large public repositories which do not follow the same naming conventions. It also shows up because many public repositories do not use a consistent naming scheme. For example, why don't all the apache commons modules use the org.apache.commons organization? Well.. for historical reasons. But if you setup your own repository, you may not want to suffer from the mistakes of history.
+
+Fortunately, Ivy has a very powerful answer to this problem: link:../../settings/namespaces.html[namespaces].
+
+
+== Using namespaces
+
+If you look at the repository built with the link:../../tutorial/build-repository/basic.html[previous tutorial], you will see exactly what we were talking about: all apache commons modules use their own name as their organization.
+
+So let's see what Ivy can do using namespaces (we will dig into details later):
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/install-namespace.txt[]
+
+----
+
+
+
+Now if we look at our repository, it seems to look fine.
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/myrepository-content-namespace.txt[]
+
+----
+
+
+We can even have a look at the commons-lang ivy file in our repository:
+<div>
+[source]
+----
+
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.0">
+ <info organisation="apache"
+ module="commons-lang"
+ revision="1.0"
+ status="integration"
+ publication="20051124062021"
+ namespace="ibiblio-maven2"
+ />
+
+...
+
+----
+
+</div>
+Alright, we see that the organisation is now 'apache'. But where did Ivy pick this up?
+
+=== How does this work ?
+
+Actually, Ivy uses the same repository as before for the source repository, with only one difference: the namespace parameter:
+
+[source]
+----
+
+<ibiblio name="libraries"
+ root="${ibiblio-maven2-root}"
+ m2compatible="true"
+ namespace="maven2"
+/>
+
+----
+
+A namespace is defined by a set of rules. These rules are based on regular expressions and tell Ivy how to convert data from the repository namespace to what is called the system namespace, i.e. the namespace in which Ivy runs most of the time (Note: the Ivy cache always uses the system namespace).
+
+For the namespace we call __maven2__, we have declared several rules. Below is one of the rules:
+
+==== rule handling the imported apache maven1 projects
+
+
+[source]
+----
+<rule> <!-- imported apache maven1 projects -->
+ <fromsystem>
+ <src org="apache" module=".+"/>
+
+ <dest org="$m0" module="$m0"/>
+ </fromsystem>
+ <tosystem>
+ <src org="commons-.+" module="commons-.+" />
+ <src org="ant.*" module="ant.*" />
+ ...
+ <src org="xmlrpc" module="xmlrpc" />
+
+ <dest org="apache" module="$m0"/>
+ </tosystem>
+</rule>
+----
+
+
+[NOTE]
+====
+Note about regular expressions usage :
+In order to distinguish matching regular expressions found in organization, module, and revision, the notation Ivy uses prefixes the matching regular expression with the letters 'o', 'm' and 'r'.
+$o0 : the whole matching value in the organization attribute
+$o1 : the first matching expression group that was marked in the organization attribute
+...
+The same applies for modules : $m0, $m1, ...
+and for revisions : $r0, $r1, ...
+
+====
+
+To understand namespaces,
+
+
+* *fromsystem :* we define here that the projects defined in the system namespace under the organization called "apache" are transformed into the destination namespace into projects whose organization is named with the module name, whatever the revision is. For example, the project apache#commons-lang;1.0 in the system namespace will be translated into commons-lang#commons-lang;1.0 in the maven2 resolver namespace. +
+
+* *tosystem :* we define here the reverse mapping, i.e. how to translate _apache_ projects from maven 2 repo into apache projects in the system namespace. The rule used here tells Ivy that all projects matching `commons-.+` (see it as java regular expression) for their organization name and module name are transformed into projects whose organisation is `apache` with the module name as it was found. The same kind of rule is defined for others apache projects like ant, etc. +
+
+
+OK, you should now get the idea behind namespaces, so go ahead and look at the `ivysettings-advanced.xml` file in this example. You can test the installation of a module and its dependencies using namespaces.
+
+Run
+
+[source]
+----
+ant maven2-namespace-deps
+----
+
+and you will see the resulting repository is cleaner than the first one we built.
+
+From our experience, investing in creating a namespace is worth the time it costs if you often need to add new modules or revisions of third party libraries in your own repository, where naming rules already exist or are rather strict.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/build-repository/basic.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/build-repository/basic.adoc b/asciidoc/tutorial/build-repository/basic.adoc
new file mode 100644
index 0000000..b046fb9
--- /dev/null
+++ b/asciidoc/tutorial/build-repository/basic.adoc
@@ -0,0 +1,122 @@
+
+In this first step, we use the link:../../use/install.html[install] Ant task to install modules from the maven 2 repository to a file system based repository. We first install a module by itself, excluding dependencies, then again with its dependencies.
+
+
+== Basic: ivysettings.xml file used
+
+The ivy settings file that we will use is very simple here. It defines two resolvers, __libraries__ and __my-repository__. The first one is used as the source, the second one as the destination. In a typical setup, the second one would be configured using an link:../../settings/include.html[include] that included an existing settings file used by the development team.
+
+
+[source]
+----
+
+<ivysettings>
+ <settings defaultResolver="libraries"
+ defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
+ <caches defaultCacheDir="${ivy.cache.dir}/no-namespace" />
+ <resolvers>
+ <ibiblio name="libraries" m2compatible="true" />
+ <filesystem name="my-repository">
+ <ivy pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </resolvers>
+</ivysettings>
+
+----
+
+
+== install a simple module with no dependencies
+
+Let's have a look at the _maven2_ target.
+
+[source]
+----
+
+ <target name="maven2" depends="init-ivy"
+ description="--> install module from maven 2 repository">
+ <ivy:install settingsRef="basic.settings"
+ organisation="commons-lang" module="commons-lang" revision="1.0"
+ from="${from.resolver}" to="${to.resolver}" />
+ </target>
+
+----
+
+Pretty simple, we call the [[ant:install] task with the settings we have loaded using link:../../use/settings.html[ivy:settings] as usual. We then set the source and destination repositories using the __from__ and __to__ attributes. We used Ant properties for these values here, which helps ease the maintenance of the script, but it's basically the name of our resolvers: 'libraries' for the source and 'my-repository' for the destination.
+
+Here is the Ant call output :
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/install.txt[]
+
+----
+
+
+The trace tells us that the module definition was found using the "libraries" resolver and that the corresponding artifact was downloaded from the maven 2 repository. Then both were published to the filesystem repository (my-repository).
+
+Let's have a look at our repository :
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/myrepository-content.txt[]
+
+----
+
+
+We can see that we now have the commons-lang module version 1.0 in our repository, with a generated ivy.xml file, its jar, and all the md5 and sha1 checksums for future consistency checks when developers use this repository to resolve modules.
+
+
+== install a module with dependencies
+
+Now let's say that we want to be sure all the dependencies of the module we install are available in our repository after the installation. We could either install without dependencies on a staging repository and check the missing dependencies (more control), or use transitive dependency management and ask Ivy to install everything for us (much simpler).
+
+The `maven2-deps` target is very similar to the one described above, except that we explicitly ask for transitive installation.
+
+[source]
+----
+
+ <target name="maven2-deps" depends="init-ivy"
+ description="--> install module from maven 2 repository with dependencies">
+ <ivy:install settingsRef="basic.settings"
+ organisation="org.hibernate" module="hibernate" revision="3.2.5.ga"
+ from="${from.resolver}" to="${to.resolver}" transitive="true" />
+ </target>
+
+----
+
+If you call this target, you will see that Ivy installs not only the hibernate module but also its dependencies:
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/install-deps.txt[]
+
+
+----
+
+
+
+As you can see the installation has failed, if you look at the log you will see that there are missing artifacts on the source repository. This means that you will need to download those artifacts manually, and copy them to your destination repository to complete the installation. Fortunately Ivy uses a best effort algorithm during install, so that everything gets installed except the missing artifacts. (Note: these missing artifacts are not in the public maven repository due to licensing issues)
+
+You may also have noticed that Ivy installed 2 different revisions of commons-logging (1.0.2, 1.0.4). This is due to the fact that we used the "no conflict" link:../../settings/conflict-managers.html[conflict manager] in the ivysettings file.
+
+We do not want to evict any modules because we are building our own repository. Indeed if we get both commons-logging 1.0.2 and 1.0.4 it's because some modules among the transitive dependencies of hibernate depend on 1.0.2 and others on 1.0.4. If we got only 1.0.4, the module depending on 1.0.2 would be inconsistent in your own repository (depending on a version you don't have installed). Thus developers using this module directly would run into a problem.
+
+If you now have a closer look at your repository, you will probably notice that it isn't an exact replication of the original one. Let's have a look at the directory of one module:
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/myrepository-content-deps.txt[]
+
+
+----
+
+
+
+As you can see there is no pom here (pom is the module metadata format used by maven 2, available on the maven 2 repository). Instead you can see there's an ivy file, which is actually the original hibernate pom converted into an ivy file. So now you have a true Ivy repository with ivy files, where you can use the full power of Ivy if you want to adjust the module metadata (module configurations, fine grain exclusions and transitivity control, per module conflict manager, ...).
+
+OK, enough for this simple repository installation, the link:../../tutorial/build-repository/advanced.html[next tutorial] will show how you can deal with more complex cases where your source and destination repositories do not follow the same naming conventions.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/conf.adoc b/asciidoc/tutorial/conf.adoc
new file mode 100644
index 0000000..82859ee
--- /dev/null
+++ b/asciidoc/tutorial/conf.adoc
@@ -0,0 +1,204 @@
+
+This tutorial introduces the use of module configurations in ivy files. Ivy module configurations are indeed a very important concept. Someone even told me one day that using Ivy without using configurations is like eating a good cheese without touching the glass of Chateau Margaux 1976 you have just poured :-)
+
+More seriously, configurations in Ivy can be better understood as views on your module, and you will see how they can be used effectively here.
+
+Reference documentation on configurations can be found link:../terminology.html[here] and link:../ivyfile/configurations.html[here].
+
+== Introduction
+
+Source code is available in `src/example/configurations/multi-projects`.
+We have two projects :
+ - filter-framework is a library that defines an api to filter String arrays and two implementations of this api.
+ - myapp is a very small app that uses filter-framework.
+
+The filter-framework library project produces 3 artifacts:
+ - the api jar,
+ - an implementation jar with no external dependencies,
+ - a second implementation jar that needs commons-collections to perform.
+
+The application only needs the api jar to compile and can use either of the two implementations at runtime.
+
+
+== The library project
+
+The first project we'll look at in this tutorial is filter-framework. In order to have a fine-grained artifacts publication definition, we defined several configurations, each which maps to a set of artifacts that other projects can make use of.
+
+=== The ivy.xml file
+
+
+
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org.apache" module="filter-framework"/>
+ <configurations>
+ <conf name="api" description="only provide filter framework API"/>
+ <conf name="homemade-impl" extends="api" description="provide a home made implementation of our api"/>
+ <conf name="cc-impl" extends="api" description="provide an implementation that use apache common collection framework"/>
+ <conf name="test" extends="cc-impl" visibility="private" description="for testing our framework"/>
+ </configurations>
+ <publications>
+ <artifact name="filter-api" type="jar" conf="api" ext="jar"/>
+ <artifact name="filter-hmimpl" type="jar" conf="homemade-impl" ext="jar"/>
+ <artifact name="filter-ccimpl" type="jar" conf="cc-impl" ext="jar"/>
+ </publications>
+ <dependencies>
+ <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="cc-impl->default"/>
+ <dependency org="junit" name="junit" rev="3.8" conf="test->default"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+
+
+=== Explanation
+
+As you can see, we defined 4 configurations, with 3 being public and 1 private. (the junit dependency for testing).
+The 2 implementation configurations, *homemade-impl* and *cc-impl* extend the *api* configuration so that all artifacts defined in *api* will also be part of the extending configuration.
+
+In the publications tag, we defined the artifacts we produce (jars in this case) and we assign them to a configuration. When others use our library they will have a flexible way to ask for what they need.
+
+
+=== See it in action
+
+The filter-framework project is built using Ant. Open a shell in the root directory of the project and type `ant`.
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/configurations-lib.txt[]
+
+----
+
+
+The Ant default target is publish. This target uses Ivy to publish our library binaries to a local repository. Since we do not specify any repository path, the default one is used. (`${home.dir}/.ivy2/local/org.apache/filter-framework/`) At this point, we are ready to use our library.
+
+
+== The application project
+
+
+Now that we have shipped (published) our fantastic filter library, we want to use it! The tutorial comes with a sample application called myapp.
+
+=== The `ivy.xml` file
+
+
+
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org.apache" module="myapp"/>
+
+ <configurations>
+ <conf name="build" visibility="private" description="compilation only need api jar" />
+ <conf name="noexternaljar" description="use only company jar" />
+ <conf name="withexternaljar" description="use company jar and third party jars" />
+ </configurations>
+
+ <dependencies>
+ <dependency org="org.apache" name="filter-framework" rev="latest.integration" conf="build->api; noexternaljar->homemade-impl; withexternaljar->cc-impl"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+
+
+=== Explanation
+
+We create 3 configurations that define the different ways we want to use the application. The *build* configuration defines the compile-time dependencies, and thus only needs the api conf from the filter-framework project. The other two configurations define runtime dependencies. One will only use our "home-made" jar, and the other will use an external jar.
+
+We also defined a dependency on our previously built library. In this dependency, we use configuration mappings to match ours with the dependency's configurations. You can find more information about configuration mapping link:../ivyfile/configurations.html[here]
+
+
+. *build->api* : here we tell Ivy that our *build* configuration depends on the *api* configuration of the dependency +
+
+. *noexternaljar->homemade-impl* : here we tell Ivy that our *noexternaljar* configuration depends on the *homemade-impl* configuration of the dependency. +
+
+. *withexternaljar->cc-impl* : here we tell Ivy that our *withexternaljar* configuration depends on the *cc-impl* configuration of the dependency +
+
+Note that we never declare any of the dependency's artifacts we need in each configuration: it's the dependency module's ivy file which declares the published artifacts and which should be used in each configuration.
+
+In the Ant `build.xml` file, we defined a 'resolve' target as follow:
+
+
+[source]
+----
+
+<target name="resolve" description="--> retreive dependencies with ivy">
+ <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact].[ext]"/>
+</target>
+
+----
+
+When we call this target, Ivy will do a resolve using our `ivy.xml` file in the root folder and then retrieve all the artifacts. The artifacts retrieved are kept in separate folders according to the configurations they belong to. Here is how your lib directory should look after a call to this target:
+
+[source,shell]
+----
+
+ Repertoire de D:\ivy\src\example\configurations\multi-projects\myapp\lib
+
+01/24/2006 11:19 AM <REP> build
+01/24/2006 11:19 AM <REP> noexternaljar
+01/24/2006 11:19 AM <REP> withexternaljar
+ 0 fichier(s) 0 octets
+
+ Repertoire de D:\ivy\src\example\configurations\multi-projects\myapp\lib\build
+
+01/24/2006 10:53 AM 1,174 filter-api.jar
+ 1 fichier(s) 1,174 octets
+
+ Repertoire de D:\ivy\src\example\configurations\multi-projects\myapp\lib\noexternaljar
+
+01/24/2006 10:53 AM 1,174 filter-api.jar
+01/24/2006 10:53 AM 1,030 filter-hmimpl.jar
+ 2 fichier(s) 2,204 octets
+
+ Repertoire de D:\ivy\src\example\configurations\multi-projects\myapp\lib\withexternaljar
+01/24/2006 10:53 AM 559,366 commons-collections.jar
+01/24/2006 10:53 AM 1,174 filter-api.jar
+01/24/2006 10:53 AM 1,626 filter-ccimpl.jar
+ 3 fichier(s) 562,166 octets
+
+----
+
+
+As you can see, for each configuration we have now a set of jars.
+
+Let's try to launch our app.
+
+
+=== See it in action
+
+Use Ant to run the application. The default Ant target is __run-cc__ and will launch the application using the Apache commons-collections implementation.
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/configurations-runcc.txt[]
+
+----
+
+
+Launching the application using the homemade implementation is also straightforward.
+type `ant run-hm`
+
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/configurations-runhm.txt[]
+----
+
+
+Nice! We got the same result, but we can see that the implementation classes are different.
+
+
+== Conclusion
+
+*You should use configurations as often as possible.* Configurations are a very important concept in Ivy. They allow you to group artifacts and give the group a meaning. When you write ivy files for projects that are intended for use by others, use configurations to allow people to get only what they need, without having to specify them one by one in their own dependency list.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/defaultconf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/defaultconf.adoc b/asciidoc/tutorial/defaultconf.adoc
new file mode 100644
index 0000000..25dbf9d
--- /dev/null
+++ b/asciidoc/tutorial/defaultconf.adoc
@@ -0,0 +1,306 @@
+
+Ivy comes bundled with some default settings which makes it pretty simple to use in a typical environment. This tutorial, which is close to a reference document, explains what those default settings are and how they can be adjusted to your needs.
+
+To fully understand the concept of settings and what you can do with them, we suggest reading other tutorials related to settings (like link:../tutorial/multiple.html[Multiple Resolvers] and link:../tutorial/dual.html[Dual Resolver]) or the link:../settings.html[Settings Files] reference documentation.
+
+
+== Concept
+
+The default settings include 3 types of repositories:
+
+
+* local +
+ a repository which is private to the user.
+
+* shared +
+ a repository which is shared between all the members of a team
+
+* public +
+ a public repository on which most modules, and especially third party modules, can be found
+
+
+Note that if you work alone, the distinction between a local and shared repository is not very important, but there are some things you should know to distinguish them.
+
+Now let's describe each of these repository concepts in more detail. We will describe how they are set up physically later.
+
+=== Local
+
+The local repository is particularly useful when you want to do something without being disturbed by anything else happening in the environment. This means that whenever Ivy is able to locate a module in this repository it will be used, no matter what is available in others.
+
+For instance, if you have a module declaring a dependency on the module __foo__ with a revision of __latest.integration__, then if a revision of __foo__ is found in the local repository, it will be used, _even if a more recent revision is available in other repositories_.
+
+This may be disturbing for some of you, but imagine you have to implement a new feature on a project, and in order to achieve that you need to modify two modules: you add a new method in module __foo__ and exploit this new method in module __bar__. Then if you publish the module __foo__ to your local repository, you will be sure to get it in your __bar__ module, even if someone else publishes a new revision of __foo__ in the shared repository (this revision not having the new method you are currently adding).
+
+But be careful, when you have finished your development and publish it on the shared repository, you will have to clean your local repository to benefit from new versions published in the shared repository.
+
+Note also that modules found in the local repository must be complete, i.e. they must provide both a module descriptor and the published artifacts.
+
+=== Shared
+
+As its name suggest, the shared repository is aimed to be shared among a whole development team. It is a place where you can publish your team's private modules, and it's also a place where you can put modules not available in the public repository (sun jars, for instance). You can also put modules here that are simply inaccurate in a public repository (bad or incomplete module descriptors for instance).
+
+Note that modules can be split across the shared repository and the public one: For example, you can have the module descriptor in the shared repository and the artifacts in the public one.
+
+=== Public
+
+The public repository is the place where most modules can be found, but which sometimes lack the information you need. It's usually a repository available through an internet connection only, even if this is not mandatory.
+
+== Setting up the repositories
+
+Now that we have seen the objective of each of the three repositories, let's see how they are setup and how to configure them to fit your needs.
+
+First, several repositories use the same root in your filesystem. Referenced as `${ivy.default.ivy.user.dir}`, this is by default the directory `.ivy2` in your user home.
+
+Note that several things can be done by setting Ivy variables. To set them without defining your own `ivysettings.xml` file, you can:
+
+* set an Ant property before any call to Ivy in your build file if you use Ivy from Ant +
+
+* set an environment variable if you use Ivy from the command line +
+
+For example:
+
+[source]
+----
+
+<target name="resolve">
+ <property name="ivy.default.ivy.user.dir" value="/path/to/ivy/user/dir"/>
+ <ivy:resolve />
+</target>
+
+----
+
+Next we will show you how to override default values for the different kinds of repositories. Note that you can find what the default values are below in the details of the default settings.
+
+=== Local
+
+By default, the local repository lies in `${ivy.default.ivy.user.dir}/local`. This is usually a good place, but you may want to modify it. No problem, you just have to set the following Ivy variable to the directory you want to use:
+[source]
+----
+ivy.local.default.root
+----
+
+. For instance:
+
+[source]
+----
+ivy.local.default.root=/opt/ivy/repository/local
+----
+
+.
+
+If you already have something you would like to use as your local repository, you may also want to modify the layout of this repository. Once again, two variables are available for that:
+
+[source]
+----
+ivy.local.default.ivy.pattern
+----
+
+gives the pattern to find ivy files
+
+[source]
+----
+ivy.local.default.artifact.pattern
+----
+
+gives the pattern to find artifacts
+For example:
+
+[source]
+----
+
+ivy.local.default.root=/opt/ivy/repository/local
+ivy.local.default.ivy.pattern=[module]/[revision]/ivy.xml
+ivy.local.default.artifact.pattern=[module]/[revision]/[artifact].[ext]
+
+----
+
+
+=== Shared
+
+By default, the shared repository lies in `${ivy.default.ivy.user.dir}/shared`. This is fine if you work alone, but the shared repository is supposed to be, mmm, shared! So changing this directory is often required, and it is usually modified to point to a network shared directory. You can use the
+[source]
+----
+ivy.shared.default.root
+----
+
+variable to specify a different directory. Moreover, you can also configure the layout with variables similar to the ones used for the local repository:
+
+[source]
+----
+ivy.shared.default.ivy.pattern
+----
+
+gives the pattern to find ivy files
+
+[source]
+----
+ivy.shared.default.artifact.pattern
+----
+
+gives the pattern to find artifacts
+For example:
+
+[source]
+----
+
+ivy.shared.default.root=/opt/ivy/repository/shared
+ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/ivy.xml
+ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[artifact].[ext]
+
+----
+
+
+=== Public
+
+By default, the public repository is ibiblio in m2 compatible mode (in other words, the maven 2 public repository).
+
+This repository has the advantage of providing a lot of modules, with metadata for most of them. The quality of metadata is not always perfect, but it's a very good start to use a tool like Ivy and benefit from the power of transitive dependency management.
+
+Despite its ease of use, we suggest reading the link:../bestpractices.html[Best practices] to have a good understanding of the pros and cons of using a public unmanaged repository before depending on such a repository for your enterprise build system.
+
+_In 1.4 version Ivy was using ivyrep as the default resolver, if you want to restore this, set
+ivy.14.compatible=true as an ant property_
+
+
+== Going further
+
+OK, so we have seen how to easily change the settings of the three main repositories. But what if my shared repository is on a web server? What if you don't want to use maven 2 repository as the public repository? What if ...
+
+No problem, Ivy is very flexible and can be configured with specific settings to match your needs and environment. But before considering writing your own settings from scratch, we suggest reading the following where you will learn how to leverage a part of the default settings and adjust the rest.
+
+But before explaining how, you will need to have a quick overview of how Ivy is configured by default.
+
+By default, Ivy is configured using an `ivysettings.xml` which is packaged in the Ivy jar. Here is this settings file:
+
+[source]
+----
+
+<ivysettings>
+ <settings defaultResolver="default"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+</ivysettings>
+
+----
+
+OK, so not much info here, except a lot of inclusions. These inclusions have been done on purpose so that you can easily change only one part of the ivysettings and easily benefit from the rest. For example, if you want to define your own public resolver, you will just have to configure Ivy with an ivysettings like the following:
+
+[source]
+----
+
+<ivysettings>
+ <settings defaultResolver="default"/>
+ <include url="http://myserver/ivy/myivysettings-public.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+</ivysettings>
+
+----
+
+Note that only the `ivysettings-public.xml` inclusion has changed to include a homemade public resolver. Note also that this can be used like that thanks to the fact that `${ivy.default.settings.dir}` is a variable which is always set to the place where Ivy's default settings files are (i.e. packaged in the jar).
+To finish this example, you have to write your own ivysettings file (that you will make available at http://myserver/ivy/myivysettings-public.xml in this example) for defining your own public resolver. For instance:
+
+[source]
+----
+
+<ivysettings>
+ <resolvers>
+ <filesystem name="public">
+ <ivy pattern="/path/to/my/public/rep/[organisation]/[module]/ivy-[revision].xml" />
+ <artifact pattern="/path/to/my/public/rep/[organisation]/[module]/[artifact]-[revision].[ext]" />
+ </filesystem>
+ </resolvers>
+</ivysettings>
+
+----
+
+Now the last thing you will need in order to properly take advantage of the default settings is the content of each included ivysettings file:
+*ivysettings-public.xml*
+
+[source]
+----
+
+<ivysettings>
+ <resolvers>
+ <ibiblio name="public" m2compatible="true"/>
+ </resolvers>
+</ivysettings>
+
+----
+
+*ivysettings-shared.xml*
+
+[source]
+----
+
+<ivysettings>
+ <property name="ivy.shared.default.root" value="${ivy.default.ivy.user.dir}/shared" override="false"/>
+ <property name="ivy.shared.default.ivy.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
+ <property name="ivy.shared.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
+ <resolvers>
+ <filesystem name="shared">
+ <ivy pattern="${ivy.shared.default.root}/${ivy.shared.default.ivy.pattern}" />
+ <artifact pattern="${ivy.shared.default.root}/${ivy.shared.default.artifact.pattern}" />
+ </filesystem>
+ </resolvers>
+</ivysettings>
+
+----
+
+*ivysettings-local.xml*
+
+[source]
+----
+
+<ivysettings>
+ <property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local" override="false"/>
+ <property name="ivy.local.default.ivy.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
+ <property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
+ <resolvers>
+ <filesystem name="local">
+ <ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
+ <artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
+ </filesystem>
+ </resolvers>
+</ivysettings>
+
+----
+
+*ivysettings-main-chain.xml*
+
+[source]
+----
+
+<ivysettings>
+ <resolvers>
+ <chain name="main" dual="true">
+ <resolver ref="shared"/>
+ <resolver ref="public"/>
+ </chain>
+ </resolvers>
+</ivysettings>
+
+----
+
+*ivysettings-default-chain.xml*
+
+[source]
+----
+
+<ivysettings>
+ <resolvers>
+ <chain name="default" returnFirst="true">
+ <resolver ref="local"/>
+ <resolver ref="main"/>
+ </chain>
+ </resolvers>
+</ivysettings>
+
+----
+
+There you go, you should have enough clues to configure Ivy the way you want. Check the link:../settings.html[settings documentation] to see if what you want to do is possible, and go ahead!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/dependence.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/dependence.adoc b/asciidoc/tutorial/dependence.adoc
new file mode 100644
index 0000000..72a8bb1
--- /dev/null
+++ b/asciidoc/tutorial/dependence.adoc
@@ -0,0 +1,255 @@
+
+This tutorial will show you how to use Ivy when one of your projects depends on another.
+
+For our example, we will have two projects, depender and dependee, where the depender project uses/requires the dependee project. This example will help illustrate two things about Ivy:
+
+
+* that dependencies defined by parent projects (dependee) will automatically be retrieved for use by child projects (depender) +
+
+* that child projects can retrieve the "latest" version of the dependee project +
+
+
+== projects used
+
+
+=== dependee
+
+The dependee project is very simple. It depends on the apache library commons-lang and contains only one class: `standalone.Main` which provides two services:
+
+
+* return the version of the project +
+
+* capitalize a string using `org.apache.commons.lang.WordUtils.capitalizeFully` +
+
+Here is the content of the project:
+
+
+* build.xml: the ant build file for the project +
+
+* ivy.xml: the project ivy file +
+
+* src tandalone\Main.java: the only class of the project +
+
+Take a look at the *ivy.xml* file:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org.apache" module="dependee"/>
+ <dependencies>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+The ivy file declares only one dependency, that being the apache commons-lang library.
+
+=== depender
+
+The depender project is very simple as well. It declares only one dependency on the latest version of the dependee project, and it contains only one class, `depending.Main`, which does 2 things:
+
+
+* gets the version of the standalone project by calling `standalone.Main.getVersion()` +
+
+* transforms a string by calling `standalone.Main.capitalizeWords(str)` +
+
+Take a look at the `ivy.xml` file:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org.apache" module="depender"/>
+ <dependencies>
+ <dependency name="dependee" rev="latest.integration" />
+ </dependencies>
+</ivy-module>
+
+----
+
+
+== settings
+
+The Ivy settings are defined in two files located in the settings directory:
+
+
+* `ivysettings.properties`: a property file +
+
+* `ivysettings.xml`: the file containing the settings +
+
+
+Let's have a look at the `ivysettings.xml` file:
+
+[source]
+----
+
+<ivysettings>
+ <properties file="${ivy.settings.dir}/ivysettings.properties"/>
+ <settings defaultResolver="libraries" />
+ <caches defaultCacheDir="${ivy.settings.dir}/ivy-cache" />
+ <resolvers>
+ <filesystem name="projects">
+ <artifact pattern="${repository.dir}/[artifact]-[revision].[ext]" />
+ <ivy pattern="${repository.dir}/[module]-[revision].xml" />
+ </filesystem>
+ <ibiblio name="libraries" m2compatible="true" usepoms="false" />
+ </resolvers>
+ <modules>
+ <module organisation="org.apache" name="dependee" resolver="projects"/>
+ </modules>
+</ivysettings>
+
+----
+
+The file contains four main tags: properties, settings, resolvers and modules.
+
+=== properties
+
+This tag loads some properties for the Ivy process, just like Ant does.
+
+=== settings
+
+This tag initializes some parameters for the Ivy process. In this case, the directory that Ivy will use to cache artifacts will be in a sub directory called ivy-cache of the directory containing the `ivysettings.xml` file itself.
+The second parameter, tells Ivy to use a resolver named "libraries" as its default resolver. More information can be found in the link:../settings.html[settings reference documentation].
+
+=== resolvers
+
+This tag defines the resolvers to use. Here we have two resolvers defined: "projects" and "libraries".
+The filesystem resolver called "projects" is able to resolve the internal dependencies by locating them on the local filesystem.
+The ibiblio resolver called "libraries" is able to find dependencies on the maven 2 repository, but doesn't use maven poms.
+
+=== modules
+
+The modules tag allows you to configure which resolver should be used for which module. Here the setting tells Ivy to use the "projects" resolver for all modules having an organisation of `org.apache` and module name of `dependee`. This actually corresponds to only one module, but a regular expression could be used, or many other types of expressions (like glob expressions).
+
+All other modules (i.e. all modules but org.apache#dependee), will use the default resolver ("libraries").
+
+== walkthrough
+
+
+
+=== step 1: preparation
+
+Open a DOS or shell window, and go to the `src/example/dependence` directory.
+
+
+
+=== step 2: clean directory tree
+
+On the prompt type: `ant`
+This will clean up the entire project directory tree. You can do this each time you want to clean up this example.
+
+
+
+=== step 3: publication of dependee project
+
+Go to `dependee` directory and publish the project
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/dependence-standalone.txt[]
+
+----
+
+
+What we see here:
+
+
+* the project depends on 1 library (1 artifact) +
+
+* the library was not in the Ivy cache and so was downloaded (1 downloaded) +
+
+* the project has been released under version number 1 +
+
+
+As you can see, the call to the publish task has resulted in two main things:
+
+
+* the delivery of a resolved ivy file to `build/ivy.xml`. +
+This has been done because by default, the publish task not only publishes artifacts, but also its ivy file. So it has looked to the path where the ivy file to publish should be, using the artifactspattern: `${build.dir}/[artifact].[ext]`. For an ivy file, this resolves to `build/ivy.xml`. Because this file does not exist, it automatically makes a call to the deliver task which delivers a resolved ivy file to this destination.
+
+
+* the publication of artifact 'dependee' and its resolved ivy file to the repository. +
+Both are just copies of the files found in the current project, or more precisely, those in the `build` directory. This is because the artifactspattern has been set to `${build.dir}/[artifact].[ext]`, so the dependee artifact is found at `build/dependee.jar` and the ivy file in `build/ivy.xml`. And because we have asked the publish task to publish them using the "projects" resolver, these files are copied to `repository\dependee-1.jar` and to `repository\dependee-1.xml`, respecting the artifact and ivy patterns of our settings (see above).
+
+
+
+
+=== step 4: running the depender project
+
+Go to directory depender and run `ant`
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/dependence-depending.txt[]
+
+----
+
+
+What we see here:
+
+
+* the project depends on 2 libraries (2 artifacts) +
+
+* one of the libraries was in the cache because there was only 1 download (1 downloaded) +
+
+* Ivy retrieved version 1 of the project "dependee". The call to `standalone.Main.getVersion()` has returned 1. If you look in the `depender/lib` directory, you should see `dependee-1.jar` which is the version 1 artifact of the project "dependee" +
+
+* the call to `standalone.Main.capitalizeWords(str)` succeed, which means that the required library was in the classpath. If you look at the `lib` directory, you will see that the library `commons-lang-2.0.jar` was also retrieved. This library was declared as a dependency of the "dependee" project, so Ivy retrieves it (transitively) along with the dependee artifact. +
+
+
+
+
+=== step 5: new version of dependee project
+
+Like we did before in step 3, publish the dependee project again. This will result in a new version of the project being published.
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/dependence-standalone-2.txt[]
+
+----
+
+
+Now if you look in your repository folder, you will find 2 versions of the dependee project.
+Let's look at it:
+
+[source,shell]
+----
+I:\dependee>dir ..\settings\repository /w
+
+[.] [..] dependee-1.jar dependee-1.xml dependee-2.jar dependee-2.xml
+
+I:\dependee>
+----
+
+
+
+OK, now our repository contains two versions of the project *dependee*, so other projects can refer to either version.
+
+
+=== step 6: get the new version in _depender_ project
+
+What should we expect if we run the depender project again? It should:
+
+
+* retrieve version 2 as the latest.integration version of the dependee project +
+
+* display version 2 of dependee project +
+
+Let's try it!!
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/dependence-depending-2.txt[]
+
+----
+
+
+OK, we got what we expected as the `run` target shows that we are using version 2 of the main class of the dependee project. If we take a look at the resolve target results, we see that one artifact has been downloaded to the ivy cache. In fact, this file is the same version 2 of the dependee project that is in the repository, but now all future retrievals will pull it from your ivy-cache directory.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/dual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/dual.adoc b/asciidoc/tutorial/dual.adoc
new file mode 100644
index 0000000..44c3287
--- /dev/null
+++ b/asciidoc/tutorial/dual.adoc
@@ -0,0 +1,140 @@
+
+In some cases, your module descriptions (i.e. Ivy files, maven poms) are located separately from the module artifacts (i.e. jars). So what can you do about it?
+
+Use a Dual resolver! And this tutorial will show you how.
+
+
+== project description
+
+Let's have a look at the `src/example/dual` directory in your Ivy distribution.
+It contains a build file and 3 directories:
+
+
+* settings: contains the ivy settings file +
+
+* repository: a sample repository of ivy files +
+
+* project: the project making use of Ivy with dual resolver +
+
+
+
+=== the dual project
+
+The project is very simple and contains only one simple class: `example.Hello`
+It depends on two libraries: Apache commons-lang and Apache commons-httpclient.
+
+Here is the content of the project:
+
+
+* build.xml: the ant build file for the project +
+
+* ivy.xml: the ivy project file +
+
+* src\example\Hello.java: the only class of the project +
+
+
+Let's have a look at the `ivy.xml` file:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org.apache" module="hello-ivy"/>
+ <dependencies>
+ <dependency org="commons-httpclient" name="commons-httpclient" rev="2.0.2"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+As you can see, nothing special here... Indeed, Ivy's philosophy is to keep ivy files independent of the way dependencies are resolved.
+
+
+=== the *ivy* settings
+
+The ivy settings are defined in the `ivysettings.xml` file located in the `settings` directory. Here is what it contains, followed by an explanation.
+
+
+[source]
+----
+
+<ivysettings>
+ <settings defaultResolver="dual-example"/>
+ <resolvers>
+ <dual name="dual-example">
+ <filesystem name="ivys">
+ <ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml" />
+ </filesystem>
+ <ibiblio name="ibiblio" m2compatible="true" usepoms="false" />
+ </dual>
+ </resolvers>
+</ivysettings>
+
+----
+
+Here we configured one resolver, the default one, which is a dual resolver. This dual resolver has two sub resolvers: the first is what is called the "ivy" or "metadata" resolver of the dual resolver, and the second one is what is called the "artifact" resolver. It is important that the dual resolver has exactly two sub resolvers in this given order.
+
+The metadata resolver, here a filesystem one, is used only to find module descriptors, in this case Ivy files. The setting shown here tells Ivy that all ivy files are in the `repository` directory, named with the pattern: `[module]-ivy-[revision].xml`. If we check the `repository` directory, we can confirm that it contains a file named `commons-httpclient-ivy-2.0.2.xml`. This file matches the pattern, so it will be found by the resolver.
+
+The artifact resolver is simply an ibiblio one, configured in m2compatible mode to use the maven 2 repository, with `usepoms="false"` to make sure it won't use maven 2 metadata. Note that this isn't necessary, since the second resolver in a dual resolver (the artifact resolver) is never asked to find module metadata.
+
+
+== walkthrough
+
+
+
+=== step 1 : preparation
+
+Open a DOS or shell window, and go to the `dual` directory.
+
+
+
+=== step 2 : clean up
+
+On the prompt type : `ant`
+
+This will clean up the entire project directory tree (compiled classes and retrieved libs) and the Ivy cache. You can run this each time you want to clean up this example.
+
+
+
+=== step 3 : run the project
+
+Go to the project directory. And simply run `ant`.
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/dual.txt[]
+
+----
+
+
+
+
+As you can see, Ivy not only downloaded commons-lang and commons-httpclient, but also commons-logging. Indeed, commons-logging is a dependency of httpclient, as we can see in the httpclient ivy file found in the `repository` directory:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info
+ organisation="commons-httpclient"
+ module="commons-httpclient"
+ revision="2.0.2"
+ status="release"
+ publication="20041010174300"/>
+ <dependencies>
+ <dependency org="commons-logging" name="commons-logging" rev="1.0.4" conf="default"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+
+
+So everything seemed to work. The ivy file was found in the `repository` directory and the artifacts have been downloaded from ibiblio.
+
+This kind of setup can be useful if you don't want to rely on the maven 2 repository for metadata, or if you want to take full advantage of Ivy files for some or all modules. Combining chain and dual resolvers should give you enough flexibility to meet almost any requirement.
+
+For full details about the dual resolver, have a look at the corresponding link:../resolver/dual.html[reference documentation].
\ No newline at end of file
[16/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/updatesite.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/updatesite.adoc b/asciidoc/resolver/updatesite.adoc
new file mode 100644
index 0000000..5ebfeaf
--- /dev/null
+++ b/asciidoc/resolver/updatesite.adoc
@@ -0,0 +1,52 @@
+
+
+[]
+|=======
+|Tag|updatesite
+|Handle latest|yes
+|Handle publish|no
+|=======
+
+
+*__since 2.3__*
+
+<span class="tagdoc" id="ivysettings.resolvers.updatesite">This resolver is one of the resolver which supports link:../osgi.html[OSGi™] dependencies.
+It resolves modules (OSGi bundles) which are hosted in an Eclipse™ update site.
+
+This resolver supports old style Eclipse updatesite, based on simply a site.xml. It also supports Eclipse P2 repositories.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of composite resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|url|the URL of the Eclipse updatesite|Yes
+|requirementStrategy|defines how strict should be the OSGi resolution. Can be one of `first` or `noambiguity`|No, default to `noambiguity`
+|metadataTtl|the time in milliseconds the updatesite metadata are considered up to date|No, default to 3600000 (1 hour)
+|forceMetadataUpdate|force the update of the updatesite metadata without checking their freshness|No, default to false
+|=======
+
+
+The requirement strategy is defining how the resolver should behave in front of several choices. In the OSGi dependency model, an `Import-Package` 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:
+
+
+* if the requirement strategy is `first`, 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. +
+
+* if the requirement strategy is `noambiguity`, Ivy will make the resolution fail. +
+
+
+
+== Examples
+
+
+[source]
+----
+
+<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite" />
+
+----
+
+A simple repository configured to load the Apache IvyDE Eclipse update site.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/url.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/url.adoc b/asciidoc/resolver/url.adoc
new file mode 100644
index 0000000..047391a
--- /dev/null
+++ b/asciidoc/resolver/url.adoc
@@ -0,0 +1,55 @@
+
+
+[]
+|=======
+|Tag|url
+|Handle latest|yes with http urls (and apache server) and with file urls, no with other urls
+|Handle publish|yes with http urls whose destination supports publishing (as of Ivy 2.0)
+|=======
+
+
+
+
+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.
+
+*Limitation*: in m2compatible mode, this resolver is not able list available organizations. It means some features like link:../use/repreport.html[repreport] are not available.
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|m2compatible|True if this resolver should be maven2 compatible, false otherwise *__since 1.3__*|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
+== Example
+
+
+[source]
+----
+
+<url name="two-patterns-example">
+ <ivy pattern="http://ivyrep.mycompany.com/[module]/[revision]/ivy-[revision].xml" />
+ <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact]-[revision].[ext]" />
+ <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact].[ext]" />
+</url>
+
+----
+
+Looks for ivy files in one place and for artifacts in two places: with or without revision in name (revision being already in the directory structure).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/resolver/vfs.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/vfs.adoc b/asciidoc/resolver/vfs.adoc
new file mode 100644
index 0000000..1044f5c
--- /dev/null
+++ b/asciidoc/resolver/vfs.adoc
@@ -0,0 +1,46 @@
+
+
+[]
+|=======
+|Tag|vfs
+|Handle latest|depend on vfs capacity, usually yes
+|Handle publish|depend on vfs capacity, usually yes
+|=======
+
+
+
+This resolver is certainly the most capable, since it relies on link:http://jakarta.apache.org/commons/vfs/[Apache commons VFS], which gives an uniform access to link:http://jakarta.apache.org/commons/vfs/filesystems.html[a good number of file systems], including ftp, webdav, zip, ... *__since 1.4__*
+
+__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__
+
+
+== Attributes
+
+This resolver shares the link:../settings/resolvers.html#common[common attributes] of standard resolvers.
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
+|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
+|=======
+
+
+
+== Example
+
+
+[source]
+----
+
+<vfs name="vfs-resolver">
+ <ivy pattern="sftp://username:password@host/[organisation]/[module]/[revision]/ivy.xml" />
+ <artifact pattern="sftp://username:password@host/[organisation]/[module]/[revision]/[artifact].[ext]" />
+</vfs>
+
+----
+
+Access ivy and artifacts files using sftp.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/running.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/running.adoc b/asciidoc/running.adoc
new file mode 100644
index 0000000..dd61b8c
--- /dev/null
+++ b/asciidoc/running.adoc
@@ -0,0 +1,11 @@
+
+ Ivy is sending http headers when downloading files.
+ The User-Agent http header can be controlled using a
+[source]
+----
+http.agent
+----
+
+system property.
+ When this system property is not set, the default value for the User-Agent header is "Apache Ivy/ivyversion"
+ where ivyversion is replaced by the currently running version of ivy.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/apache-hello-ivy-default.html
----------------------------------------------------------------------
diff --git a/asciidoc/samples/apache-hello-ivy-default.html b/asciidoc/samples/apache-hello-ivy-default.html
new file mode 100644
index 0000000..edb4488
--- /dev/null
+++ b/asciidoc/samples/apache-hello-ivy-default.html
@@ -0,0 +1,371 @@
+<!--
+ 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=UTF-8">
+<title>Ivy report :: hello-ivy by apache :: default</title>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="content-language" content="en">
+<meta name="robots" content="index,follow">
+<link rel="stylesheet" type="text/css" href="ivy-report.css">
+</head>
+<body>
+<div id="logo">
+<a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"></a>
+</div>
+<h1>
+<a name="apache-hello-ivy"></a><span id="module">hello-ivy</span>
+ by
+ <span id="organisation">apache</span>
+</h1>
+<div id="date">
+ resolved on
+ 2007-10-21 17:24:25</div>
+<ul id="confmenu">
+<li>
+<a class="active" href="apache-hello-ivy-default.html">default</a>
+</li>
+</ul>
+<div id="content">
+<h2>Dependencies Stats</h2>
+<table class="header">
+<tr>
+<td class="title">Modules</td><td class="value">3</td>
+</tr>
+<tr>
+<td class="title">Revisions</td><td class="value">4
+ (0 searched <img src="http://ivy.jayasoft.org/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved">,
+ 0 downloaded <img src="http://ivy.jayasoft.org/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver">,
+ 1 evicted <img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others">,
+ 0 errors <img src="http://ivy.jayasoft.org/images/error.gif" alt="error" title="module revisions on which error occurred">)</td>
+</tr>
+<tr>
+<td class="title">Artifacts</td><td class="value">3
+ (0 downloaded,
+ 0 failed)</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">217 kB
+ (0 kB downloaded,
+ 217 kB in cache)</td>
+</tr>
+</table>
+<h2>Conflicts</h2>
+<table class="conflicts">
+<thead>
+<tr>
+<th>Module</th><th>Selected</th><th>Evicted</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#commons-lang-commons-lang">commons-lang
+ by
+ commons-lang</a></td><td><a href="#commons-lang-commons-lang-2.0">2.0</a> </td><td><a href="#commons-lang-commons-lang-1.0">1.0</a> </td>
+</tr>
+</tbody>
+</table>
+<h2>Dependencies Overview</h2>
+<table class="deps">
+<thead>
+<tr>
+<th>Module</th><th>Revision</th><th>Status</th><th>Resolver</th><th>Default</th><th>Licenses</th><th>Size</th><th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#commons-cli-commons-cli"> commons-cli
+ by
+ commons-cli</a></td><td><a href="#commons-cli-commons-cli-1.0">1.0</a></td><td align="center">integration</td><td align="center">public</td><td align="center">false</td><td align="center"></td><td align="center">29 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#commons-logging-commons-logging">--- commons-logging
+ by
+ commons-logging</a></td><td><a href="#commons-logging-commons-logging-1.0">1.0</a></td><td align="center">integration</td><td align="center">public</td><td align="center">false</td><td align="center"></td><td align="center">21 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#commons-lang-commons-lang">--- commons-lang
+ by
+ commons-lang</a></td><td><a href="#commons-lang-commons-lang-1.0">1.0</a></td><td align="center"></td><td align="center"></td><td align="center"></td><td align="center"></td><td align="center">0 kB
+ </td><td align="center"><img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="evicted by 2.0"></td>
+</tr>
+<tr>
+<td><a href="#commons-lang-commons-lang">--- commons-lang
+ by
+ commons-lang</a></td><td><a href="#commons-lang-commons-lang-2.0">2.0</a></td><td align="center">integration</td><td align="center">public</td><td align="center">false</td><td align="center"></td><td align="center">166 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#commons-lang-commons-lang"> commons-lang
+ by
+ commons-lang</a></td><td><a href="#commons-lang-commons-lang-2.0">2.0</a></td><td align="center">integration</td><td align="center">public</td><td align="center">false</td><td align="center"></td><td align="center">166 kB
+ </td><td align="center"></td>
+</tr>
+</tbody>
+</table>
+<h2>Details</h2>
+<h3>
+<a name="commons-cli-commons-cli"></a>commons-cli by commons-cli<span class="resolved">resolved by <b>default</b></span>
+</h3>
+<h4>
+<a name="commons-cli-commons-cli-1.0"></a>
+ Revision: 1.0<span style="padding-left:15px;"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Status</td><td class="value">integration</td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value">20051108231152</td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value">public</td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value">system, default, compile, provided, runtime, master</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">29 kB
+ (0 kB downloaded,
+ 29 kB in cache)</td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>apache</td><td><a href="#apache-hello-ivy">hello-ivy</a></td><td>default</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h5>Dependencies</h5>
+<table class="deps">
+<thead>
+<tr>
+<th>Module</th><th>Revision</th><th>Status</th><th>Resolver</th><th>Default</th><th>Licenses</th><th>Size</th><th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#commons-logging-commons-logging"> commons-logging
+ by
+ commons-logging</a></td><td><a href="#commons-logging-commons-logging-1.0">1.0</a></td><td align="center">integration</td><td align="center">public</td><td align="center">false</td><td align="center"></td><td align="center">21 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#commons-lang-commons-lang"> commons-lang
+ by
+ commons-lang</a></td><td><a href="#commons-lang-commons-lang-1.0">1.0</a></td><td align="center"></td><td align="center"></td><td align="center"></td><td align="center"></td><td align="center">0 kB
+ </td><td align="center"><img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="evicted by 2.0"></td>
+</tr>
+<tr>
+<td><a href="#commons-lang-commons-lang"> commons-lang
+ by
+ commons-lang</a></td><td><a href="#commons-lang-commons-lang-2.0">2.0</a></td><td align="center">integration</td><td align="center">public</td><td align="center">false</td><td align="center"></td><td align="center">166 kB
+ </td><td align="center"></td>
+</tr>
+</tbody>
+</table>
+<h5>Artifacts</h5>
+<table>
+<thead>
+<tr>
+<th>Name</th><th>Type</th><th>Ext</th><th>Download</th><th>Size</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-cli</td><td>jar</td><td>jar</td><td align="center">no</td><td align="center">29 kB</td>
+</tr>
+</tbody>
+</table>
+<h3>
+<a name="commons-logging-commons-logging"></a>commons-logging by commons-logging<span class="resolved">resolved by <b>default</b></span>
+</h3>
+<h4>
+<a name="commons-logging-commons-logging-1.0"></a>
+ Revision: 1.0<span style="padding-left:15px;"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Status</td><td class="value">integration</td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value">20051108231641</td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value">public</td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value">compile, runtime, master</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">21 kB
+ (0 kB downloaded,
+ 21 kB in cache)</td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-cli</td><td><a href="#commons-cli-commons-cli">commons-cli</a></td><td>compile, runtime</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h5>Dependencies</h5>
+<table>
+<tr>
+<td>
+ No dependency
+ </td>
+</tr>
+</table>
+<h5>Artifacts</h5>
+<table>
+<thead>
+<tr>
+<th>Name</th><th>Type</th><th>Ext</th><th>Download</th><th>Size</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-logging</td><td>jar</td><td>jar</td><td align="center">no</td><td align="center">21 kB</td>
+</tr>
+</tbody>
+</table>
+<h3>
+<a name="commons-lang-commons-lang"></a>commons-lang by commons-lang<span class="resolved">resolved by <b>default</b></span>
+</h3>
+<h4>
+<a name="commons-lang-commons-lang-1.0"></a>
+ Revision: 1.0<span style="padding-left:15px;"><img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="evicted by 2.0"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Status</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">0 kB
+ (0 kB downloaded,
+ 0 kB in cache)</td>
+</tr>
+<tr>
+<td class="title">Evicted by</td><td class="value">2.0
+ in <b>latest-revision</b> conflict manager
+ </td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-cli</td><td><a href="#commons-cli-commons-cli">commons-cli</a></td><td>compile, runtime</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h4>
+<a name="commons-lang-commons-lang-2.0"></a>
+ Revision: 2.0<span style="padding-left:15px;"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Status</td><td class="value">integration</td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value">20051124062021</td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value">public</td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value">system, default, compile, provided, runtime, master</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">166 kB
+ (0 kB downloaded,
+ 166 kB in cache)</td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>apache</td><td><a href="#apache-hello-ivy">hello-ivy</a></td><td>default</td><td>2.0</td>
+</tr>
+<tr>
+<td>commons-cli</td><td><a href="#commons-cli-commons-cli">commons-cli</a></td><td>compile, runtime</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h5>Dependencies</h5>
+<table>
+<tr>
+<td>
+ No dependency
+ </td>
+</tr>
+</table>
+<h5>Artifacts</h5>
+<table>
+<thead>
+<tr>
+<th>Name</th><th>Type</th><th>Ext</th><th>Download</th><th>Size</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-lang</td><td>jar</td><td>jar</td><td align="center">no</td><td align="center">166 kB</td>
+</tr>
+</tbody>
+</table>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/build-install.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/build-install.xml b/asciidoc/samples/build-install.xml
new file mode 100644
index 0000000..8f7183a
--- /dev/null
+++ b/asciidoc/samples/build-install.xml
@@ -0,0 +1,72 @@
+<!--
+ 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.
+-->
+
+<!--
+ This build script is used to download dependencies for a freshly downloaded
+ binary distribution of Ivy without dependencies.
+
+ To use it, you only need to have this script in the directory where you
+ have unzipped your binary distribution of Ivy, and to call it using
+ ant -f build-install.xml
+
+ If you don't want to download all optional dependencies, you can set
+ the conf attribute value in the ivy:retrieve task, to select only
+ the configuration you want (check the ivy.xml for details about
+ which configurations are available, and what they are useful for).
+-->
+<project name="ivy-bin-install" default="download-deps"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+ <target name="init-ivy-settings">
+ <echo file="${basedir}/ivysettings.xml">
+ <![CDATA[
+<ivysettings>
+ <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
+ <settings defaultResolver="public" />
+ <resolvers>
+ <!--
+ we use ivyrep for ivy and some artifacts, and ibiblio for other artifacts
+ The reason for that is that commons vfs is still not released, thus we depend on an integration
+ version only available on ivyrep, but not on ivyrep
+ As soon as vfs will be available on ibiblio, the default configuration could be used again
+ -->
+ <url name="public">
+ <ivy pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/ivy-[revision].xml"/>
+ <artifact pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/[revision]/[artifact].[ext]"/>
+ <artifact pattern="https://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </url>
+ </resolvers>
+</ivysettings>
+ ]]>
+ </echo>
+ </target>
+
+ <target name="init-ivy" depends="init-ivy-settings">
+ <path id="ivy.lib.path">
+ <fileset dir="${basedir}" includes="*.jar" excludes="ivy-core-*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+ <target name="download-deps" depends="init-ivy">
+ <ivy:retrieve
+ conf="*"
+ pattern="${basedir}/lib/[conf]/[artifact]-[revision].[ext]"/>
+ </target>
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/build.xml b/asciidoc/samples/build.xml
new file mode 100644
index 0000000..a7dbbcd
--- /dev/null
+++ b/asciidoc/samples/build.xml
@@ -0,0 +1,151 @@
+<!--
+ 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.
+-->
+<project name="go-ivy" default="go" xmlns:ivy="antlib:org.apache.ivy.ant">
+ <!--
+ this build file is a self contained project: it doesn't require anything else
+ that ant 1.6.2 or greater and java 1.4 or greater properly installed.
+
+ It is used to showcase how easy and straightforward it can be to use Ivy.
+
+ This is not an example of the best pratice to use in a project, especially
+ for the java source code "generation" :-) (see generate-src target)
+
+ To run copy this file in an empty directory, open a shell or a command window
+ in this directory and run "ant". It will download ivy and then use it to resolve
+ the dependency of the class which is itself "contained" in this build script.
+
+ After a successful build run "ant" again and you will see the build will be
+ much faster.
+
+ More information can be found at http://ant.apache.org/ivy/
+ -->
+
+ <!-- here is the version of ivy we will use. change this property to try a newer
+ version if you want -->
+ <property name="ivy.install.version" value="2.0.0-beta1" />
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+ <property name="build.dir" value="build" />
+ <property name="src.dir" value="src" />
+
+
+ <target name="download-ivy" unless="skip.download">
+ <mkdir dir="${ivy.jar.dir}"/>
+ <!-- download Ivy from web site so that it can be used even without any special installation -->
+ <echo message="installing ivy..."/>
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <!-- =================================
+ target: install-ivy
+ this target is not necessary if you put ivy.jar in your ant lib directory
+ if you already have ivy in your ant lib, you can simply remove this
+ target and the dependency the 'go' target has on it
+ ================================= -->
+ <target name="install-ivy" depends="download-ivy" description="--> install ivy">
+ <!-- try to load ivy here from local ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as local lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the local lib dir. -->
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+ <!-- =================================
+ target: go
+ Go ivy, go!
+ ================================= -->
+ <target name="go" depends="install-ivy, generate-src"
+ description="--> resolve dependencies, compile and run the project">
+ <echo message="using ivy to resolve commons-lang 2.1..."/>
+ <!-- here comes the magic line: asks ivy to resolve a dependency on
+ commons-lang 2.1 and to build an ant path with it from its cache -->
+ <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
+ pathid="lib.path.id" inline="true"/>
+
+ <echo message="compiling..."/>
+ <mkdir dir="${build.dir}" />
+ <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" />
+
+ <echo>
+We are now ready to execute our simple program with its dependency on commons-lang.
+Let's go!
+ </echo>
+ <java classname="example.Hello">
+ <classpath>
+ <path refid="lib.path.id" />
+ <path location="${build.dir}" />
+ </classpath>
+ </java>
+ </target>
+
+ <!-- =================================
+ target: generate-src
+ 'Generates' the class source. It actually just echo a simple java
+ source code to a file. In real life this file would already be
+ present on your file system, and this target wouldn't be necessary.
+ ================================= -->
+ <target name="generate-src">
+ <mkdir dir="${src.dir}/example" />
+ <echo file="${src.dir}/example/Hello.java">
+package example;
+
+import org.apache.commons.lang.WordUtils;
+
+public class Hello {
+ public static void main(String[] args) {
+ String message = "hello ivy !";
+ System.out.println("standard message : " + message);
+ System.out.println("capitalized by " + WordUtils.class.getName()
+ + " : " + WordUtils.capitalizeFully(message));
+ }
+}
+ </echo>
+ </target>
+
+ <!-- =================================
+ target: clean
+ ================================= -->
+ <target name="clean" description="--> clean the project">
+ <delete includeemptydirs="true" quiet="true">
+ <fileset dir="${src.dir}" />
+ <fileset dir="${build.dir}" />
+ </delete>
+ </target>
+
+ <!-- =================================
+ target: clean-ivy
+ ================================= -->
+ <target name="clean-ivy" description="--> clean the ivy installation">
+ <delete dir="${ivy.jar.dir}"/>
+ </target>
+
+ <!-- =================================
+ target: clean-cache
+ ================================= -->
+ <target name="clean-cache" depends="install-ivy"
+ description="--> clean the ivy cache">
+ <ivy:cleancache />
+ </target>
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/commons-lang1.0-dep-report-part.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/samples/commons-lang1.0-dep-report-part.jpg b/asciidoc/samples/commons-lang1.0-dep-report-part.jpg
new file mode 100644
index 0000000..5ceb892
Binary files /dev/null and b/asciidoc/samples/commons-lang1.0-dep-report-part.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/eclipse-plugin/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/build.xml b/asciidoc/samples/eclipse-plugin/build.xml
new file mode 100644
index 0000000..93581b8
--- /dev/null
+++ b/asciidoc/samples/eclipse-plugin/build.xml
@@ -0,0 +1,77 @@
+<!--
+ 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.
+-->
+<project name="eclipse-plugin-build" xmlns:ivy="ivy">
+
+ <!-- Load Ivy ant tasks -->
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
+ <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing -->
+ <!-- taskdef rather than the above one -->
+ <!--path id="ivy.classpath">
+ <fileset dir="${basedir}">
+ <include name="ivy.jar" />
+ </fileset>
+ </path>
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /-->
+
+ <!-- Load the properties where is defined the eclipse home -->
+ <property file="${basedir}/ivysettings.properties" />
+
+ <target name="clean" description="Clean the build directory">
+ <delete dir="${basedir}/target" />
+ </target>
+
+ <target name="buildobr" description="Build the obr index">
+ <!-- build the repo.xml which aggregate every metadata of the Eclipse plugins -->
+ <mkdir dir="${basedir}/target" />
+ <ivy:buildobr baseDir="${eclipse.home}" basePath="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true" />
+ </target>
+
+ <target name="ivy:configure">
+ <!-- classical ivy configuration -->
+ <ivy:configure file="ivysettings.xml" />
+ </target>
+
+ <target name="ivy:resolve" depends="ivy:configure">
+ <!-- classical resolve and cache-path -->
+ <ivy:resolve file="ivy.xml" conf="*" />
+ <ivy:cachepath pathid="compile.classpath" conf="compile" useOrigin="true" />
+ </target>
+
+ <target name="compile" depends="ivy:resolve" description="Compile the Eclipse plugin">
+ <mkdir dir="${basedir}/target/classes" />
+ <!-- simple javac (WARNING: contrary to the JDT, javac doesn't understand OSGi's accessibility (private packages)) -->
+ <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false" />
+ <copy todir="${basedir}/target/classes">
+ <fileset dir="${basedir}/src">
+ <include name="**" />
+ <exclude name="**/*.java" />
+ <exclude name="**/package.html" />
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="plugin.xml" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="build" depends="compile" description="Build the Eclipse plugin">
+ <!-- simple jaring -->
+ <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF" />
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/eclipse-plugin/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/ivy.xml b/asciidoc/samples/eclipse-plugin/ivy.xml
new file mode 100644
index 0000000..cf23e6c
--- /dev/null
+++ b/asciidoc/samples/eclipse-plugin/ivy.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<ivy-module version="2.2" xmlns:o="http://ant.apache.org/ivy/osgi">
+ <info organisation="bundle" module="myplugin">
+ <extends organisation="bundle" module="com.acme.myplugin" revision="1.0.0.qualifier" location="META-INF/MANIFEST.MF" />
+ </info>
+ <configurations>
+ <conf name="compile" extends="default,embedded" description="Dependencies for the compilation" />
+ <conf name="embedded" description="Dependencies embedded into the plugin's jar" />
+ <conf name="win32" extends="compile" description="To run on Microsoft Windows" />
+ <conf name="macos" extends="compile" description="To run on Mac OS X" />
+ <conf name="linux" extends="compile" description="To run on Linux" />
+ </configurations>
+ <dependencies>
+ <!-- example of a dependency that we can't declare in the MANIFEST.MF because we want it to be embedded -->
+ <!--dependency osgi="bundle" org="" module="org.apache.commons.httpcore" rev="4.1.0" conf="embedded->default" /-->
+ <!-- Ivy-Osgi doesn't understand bundle fragment -->
+ <dependency org="bundle" name="org.eclipse.swt.win32.win32.x86" rev="3.+" conf="win32->default" />
+ <dependency org="bundle" name="org.eclipse.swt.cocoa.macosx.x86_64" rev="3.+" conf="macos->default" />
+ <dependency org="bundle" name="org.eclipse.swt.gtk.linux.x86" rev="3.+" conf="linux->default" />
+ </dependencies>
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/eclipse-plugin/ivysettings.properties
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/ivysettings.properties b/asciidoc/samples/eclipse-plugin/ivysettings.properties
new file mode 100644
index 0000000..b41f191
--- /dev/null
+++ b/asciidoc/samples/eclipse-plugin/ivysettings.properties
@@ -0,0 +1,21 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
+# Unix users, set it to something like: /home/me/tools/eclipse-3.4/plugins/
+# Windows users, it should look like: D:/tools/eclipse-3.4/plugins/ or D:\\tools\\eclipse-3.4\\plugins\\
+eclipse.home=/home/me/tools/eclipse-3.5/plugins/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/eclipse-plugin/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/ivysettings.xml b/asciidoc/samples/eclipse-plugin/ivysettings.xml
new file mode 100644
index 0000000..0be2afc
--- /dev/null
+++ b/asciidoc/samples/eclipse-plugin/ivysettings.xml
@@ -0,0 +1,36 @@
+<!--
+ 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.
+-->
+<ivysettings>
+ <!-- Load the properties where is defined the eclipse location -->
+ <properties file="ivysettings.properties" />
+
+ <!-- We need to define the Ivy Osgi latest strategy as the default one -->
+ <settings defaultResolver="eclipse" defaultLatestStrategy="latest-osgi" />
+
+ <!-- These are usual cache setup -->
+ <caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true">
+ <cache name="eclipse" basedir="${ivy.settings.dir}/cache/eclipse" />
+ </caches>
+
+ <!-- We just need to define our Ivy OSGi resolver -->
+ <resolvers>
+ <obr name="eclipse" repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml" />
+ </resolvers>
+
+</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/hibernate3.0-dep-report-part.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/samples/hibernate3.0-dep-report-part.jpg b/asciidoc/samples/hibernate3.0-dep-report-part.jpg
new file mode 100644
index 0000000..6ae4cd5
Binary files /dev/null and b/asciidoc/samples/hibernate3.0-dep-report-part.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/ivy-doc.xsl
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-doc.xsl b/asciidoc/samples/ivy-doc.xsl
new file mode 100644
index 0000000..1f401ad
--- /dev/null
+++ b/asciidoc/samples/ivy-doc.xsl
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:template match="/ivy-module">
+ <xsl:variable name="repositories" select="/ivy-module/info/repository"/>
+ <xsl:variable name="ivyauthors" select="/ivy-module/info/ivyauthor"/>
+ <xsl:variable name="licenses" select="/ivy-module/info/license"/>
+ <xsl:variable name="configurations" select="/ivy-module/configurations"/>
+ <xsl:variable name="public.conf" select="$configurations/conf[not(@visibility) and not(@deprecated)] | $configurations/conf[@visibility='public' and not(@deprecated)]"/>
+ <xsl:variable name="deprecated.conf" select="configurations/conf[not(@visibility) and @deprecated] | configurations/conf[@visibility='public' and @deprecated]"/>
+ <xsl:variable name="private.conf" select="configurations/conf[@visibility='private']"/>
+
+ <xsl:variable name="artifacts" select="/ivy-module/publications/artifact"/>
+ <xsl:variable name="dependencies" select="/ivy-module/dependencies/dependency"/>
+
+ <html>
+ <head>
+ <title><xsl:value-of select="info/@module"/> by <xsl:value-of select="info/@organisation"/> :: Ivy description</title>
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="content-language" content="en" />
+ <meta name="robots" content="index,follow" />
+ <link rel="stylesheet" type="text/css" href="ivy-style.css" />
+ </head>
+ <body>
+ <div id="logo"><a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"/></a><br/><a id="rep" href="http://www.jayasoft.fr/org/ivyrep/">Ivy Repository</a></div>
+ <h1>
+ <span id="module">
+ <xsl:element name="a">
+ <xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:value-of select="info/@organisation"/>/<xsl:value-of select="info/@module"/>/</xsl:attribute>
+ <xsl:value-of select="info/@module"/>
+ </xsl:element>
+ </span>
+ by
+ <span id="organisation">
+ <xsl:element name="a">
+ <xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:value-of select="info/@organisation"/>/</xsl:attribute>
+ <xsl:value-of select="info/@organisation"/>
+ </xsl:element>
+ </span></h1>
+ <div id="revision"><span id="revision">Revision: </span><xsl:value-of select="info/@revision"/></div>
+ <table class="header">
+ <tr><td class="title">Status</td><td class="value"><xsl:value-of select="info/@status"/></td></tr>
+ <tr><td class="title">Home Page</td><td class="value">
+ <xsl:if test="info/description/@homepage">
+ <xsl:element name="a">
+ <xsl:attribute name="href"><xsl:value-of select="info/description/@homepage"/></xsl:attribute>
+ <xsl:value-of select="info/description/@homepage"/>
+ </xsl:element>
+ </xsl:if>
+ </td></tr>
+ <tr><td class="title">Licenses</td><td class="value">
+ <xsl:for-each select="$licenses">
+ <xsl:if test="@url">
+ <xsl:element name="a">
+ <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
+ <xsl:value-of select="@name"/>
+ </xsl:element>
+ </xsl:if>
+ <xsl:if test="not(@url)">
+ <xsl:value-of select="@name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </td></tr>
+ <tr><td class="title">Ivy Authors</td><td class="value">
+ <xsl:for-each select="$ivyauthors">
+ <xsl:if test="@url">
+ <xsl:element name="a">
+ <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
+ <xsl:value-of select="@name"/>
+ </xsl:element>
+ </xsl:if>
+ <xsl:if test="not(@url)">
+ <xsl:value-of select="@name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </td></tr>
+ <tr><td class="title">Description</td><td class="value"><xsl:copy-of select="info/description"/></td></tr>
+ </table>
+
+ <xsl:if test="count($repositories) > 0">
+ <div id="repositories">
+ <h2>Public Repositories</h2>
+ <table>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Url</th>
+ <th>Pattern</th>
+ <th>Ivys</th>
+ <th>Artifacts</th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="$repositories">
+ <tr>
+ <td><xsl:value-of select="@name"/></td>
+ <td>
+ <xsl:element name="a">
+ <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
+ <xsl:value-of select="@url"/>
+ </xsl:element>
+ </td>
+ <td><xsl:value-of select="@pattern"/></td>
+ <td><xsl:value-of select="@ivys"/></td>
+ <td><xsl:value-of select="@artifacts"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </xsl:if>
+
+ <div id="public-confs" class="conf">
+ <h2>Public Configurations</h2>
+ <table>
+ <thead>
+ <tr>
+ <th class="conf-name">Name</th>
+ <th class="conf-desc">Description</th>
+ <th class="conf-extends">Extends</th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="$public.conf">
+ <tr>
+ <td><xsl:value-of select="@name"/></td>
+ <td><xsl:value-of select="@description"/></td>
+ <td><xsl:value-of select="@extends"/></td>
+ </tr>
+ </xsl:for-each>
+ <xsl:if test="count($public.conf) = 0">
+ <tr>
+ <td>default</td>
+ <td></td>
+ <td></td>
+ </tr>
+ </xsl:if>
+ </tbody>
+ </table>
+ </div>
+
+ <xsl:if test="count($deprecated.conf) > 0">
+ <div id="deprecated-confs" class="conf">
+ <h2>Deprecated Configurations</h2>
+ <table>
+ <thead>
+ <tr>
+ <th class="conf-name">Name</th>
+ <th class="conf-desc">Description</th>
+ <th class="conf-extends">Extends</th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="$deprecated.conf">
+ <tr>
+ <td><xsl:value-of select="@name"/></td>
+ <td><xsl:value-of select="@description"/></td>
+ <td><xsl:value-of select="@extends"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </xsl:if>
+
+ <xsl:if test="count($private.conf) > 0">
+ <div id="deprecated-confs" class="conf">
+ <h2>Private Configurations</h2>
+ <table>
+ <thead>
+ <tr>
+ <th class="conf-name">Name</th>
+ <th class="conf-desc">Description</th>
+ <th class="conf-extends">Extends</th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="$private.conf">
+ <tr>
+ <td><xsl:value-of select="@name"/></td>
+ <td><xsl:value-of select="@description"/></td>
+ <td><xsl:value-of select="@extends"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </xsl:if>
+
+ <div id="artifacts">
+ <h2>Published Artifacts</h2>
+ <table>
+ <thead>
+ <tr>
+ <th class="art-name">Name</th>
+ <th class="art-type">Type</th>
+ <th class="art-conf">Configurations</th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="$artifacts">
+ <tr>
+ <td><xsl:value-of select="@name"/></td>
+ <td><xsl:value-of select="@type"/></td>
+ <td>
+ <xsl:value-of select="@conf"/>
+ <xsl:for-each select="conf">
+ <xsl:if test="position() > 1">,
+ </xsl:if>
+ <xsl:value-of select="@name"/>
+ </xsl:for-each>
+ <xsl:if test="not(@conf) and count(conf) = 0">
+ <i>all</i>
+ </xsl:if>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <xsl:if test="count($artifacts) = 0">
+ <td><xsl:value-of select="info/@module"/></td>
+ <td>jar</td>
+ <td><i>all</i></td>
+ </xsl:if>
+ </tbody>
+ </table>
+ </div>
+
+ <xsl:if test="count($dependencies) > 0">
+ <div id="dependencies">
+ <h2>Dependencies</h2>
+ <table>
+ <thead>
+ <tr>
+ <th class="dep-org">Organisation</th>
+ <th class="dep-name">Name</th>
+ <th class="dep-rev">Revision</th>
+ <th class="dep-conf">Configurations</th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="$dependencies">
+ <tr>
+ <td><xsl:if test="not(@org)"><xsl:value-of select="/ivy-module/info/@organisation"/></xsl:if><xsl:value-of select="@org"/></td>
+ <td>
+ <xsl:element name="a">
+ <xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:if test="not(@org)"><xsl:value-of select="/ivy-module/info/@organisation"/></xsl:if><xsl:value-of select="@org"/>/<xsl:value-of select="@name"/>/ivy-<xsl:value-of select="@rev"/>.xml</xsl:attribute>
+ <xsl:value-of select="@name"/>
+ </xsl:element>
+ </td>
+ <td><xsl:value-of select="@rev"/></td>
+ <td><xsl:value-of select="@conf"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </xsl:if>
+
+
+ </body>
+ </html>
+</xsl:template>
+</xsl:stylesheet>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/ivy-report.css
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-report.css b/asciidoc/samples/ivy-report.css
new file mode 100644
index 0000000..c89bd54
--- /dev/null
+++ b/asciidoc/samples/ivy-report.css
@@ -0,0 +1,279 @@
+/*
+ * 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.
+ *
+ */
+
+body {
+ font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+ font-size:small;
+}
+
+div#logo {
+ float: right;
+ padding-left: 10px;
+ padding-bottom: 10px;
+ background: white;
+ text-align: center;
+}
+
+#logo img {
+ border: 0;
+}
+
+div#date {
+ font-style: italic;
+ padding-left: 60px;
+ padding-bottom: 40px;
+}
+
+
+h1 {
+ margin-bottom:2px;
+
+ border-color:#7A9437;
+ border-style:solid;
+ border-width:0 0 3px 0;
+}
+
+span#module {
+ color:#7A9437;
+ text-decoration:none;
+}
+
+span#organisation {
+ color:black;
+ text-decoration:none;
+}
+
+#confmenu {
+ color: #000;
+ border-bottom: 2px solid black;
+ margin: 12px 0px 0px 0px;
+ padding: 0px;
+ z-index: 1;
+ padding-left: 10px
+}
+
+#confmenu li {
+ display: inline;
+ overflow: hidden;
+ list-style-type: none;
+}
+
+#confmenu a, a.active {
+ color: #DEDECF;
+ background: #898B5E;
+ font: bold 1em "Trebuchet MS", Arial, sans-serif;
+ border: 2px solid black;
+ padding: 2px 5px 0px 5px;
+ text-decoration: none;
+}
+
+/*
+background: #ABAD85 #CED4BD
+background: #DEE4CD
+ */
+
+#confmenu a.active {
+ color: #7A9437;
+ background: #DEE4CD;
+ border-bottom: 3px solid #DEE4CD;
+}
+
+#confmenu a:hover {
+ color: #fff;
+ background: #ADC09F;
+}
+
+#confmenu a:visited {
+ color: #DEDECF;
+}
+
+#confmenu a.active:visited {
+ color: #7A9437;
+}
+
+#confmenu a.active:hover {
+ background: #DEE4CD;
+ color: #DEDECF;
+}
+
+#content {
+ background: #DEE4CD;
+ padding: 20px;
+ border: 2px solid black;
+ border-top: none;
+ z-index: 2;
+}
+
+#content a {
+ text-decoration: none;
+ color: #E8E9BE;
+}
+
+#content a:hover {
+ background: #898B5E;
+}
+
+
+h2 {
+ margin-bottom:2px;
+ font-size:medium;
+
+ border-color:#7A9437;
+ border-style:solid;
+ border-width:0 0 2px 0;
+}
+
+h3 {
+ margin-top:30px;
+ margin-bottom:2px;
+ padding: 5 5 5 0;
+ font-size: 24px;
+ border-style:solid;
+ border-width:0 0 2px 0;
+}
+
+h4 {
+ margin-bottom:2px;
+ margin-top:2px;
+ font-size:medium;
+
+ border-color:#7A9437;
+ border-style:dashed;
+ border-width:0 0 1px 0;
+}
+
+h5 {
+ margin-bottom:2px;
+ margin-top:2px;
+ margin-left:20px;
+ font-size:medium;
+}
+
+span.resolved {
+ padding-left: 15px;
+ font-weight: 500;
+ font-size: small;
+}
+
+
+#content table {
+ border-collapse:collapse;
+ width:90%;
+ margin:auto;
+ margin-top: 5px;
+}
+#content thead {
+ background-color:#CED4BD;
+ border:1px solid #7A9437;
+}
+#content tbody {
+ border-collapse:collapse;
+ background-color:#FFFFFF;
+ border:1px solid #7A9437;
+}
+
+#content th {
+ font-family:monospace;
+ border:1px solid #7A9437;
+ padding:5px;
+}
+
+#content td {
+ border:1px dotted #7A9437;
+ padding:0 3 0 3;
+}
+
+#content table a {
+ color:#7A9437;
+ text-decoration:none;
+}
+
+#content table a:hover {
+ background-color:#CED4BD;
+ color:#7A9437;
+}
+
+
+
+table.deps {
+ border-collapse:collapse;
+ width:90%;
+ margin:auto;
+ margin-top: 5px;
+}
+
+table.deps thead {
+ background-color:#CED4BD;
+ border:1px solid #7A9437;
+}
+table.deps tbody {
+ border-collapse:collapse;
+ background-color:#FFFFFF;
+ border:1px solid #7A9437;
+}
+
+table.deps th {
+ font-family:monospace;
+ border:1px solid #7A9437;
+ padding:2;
+}
+
+table.deps td {
+ border:1px dotted #7A9437;
+ padding:0 3 0 3;
+}
+
+
+
+
+
+table.header {
+ border:0;
+ width:90%;
+ margin:auto;
+ margin-top: 5px;
+}
+
+table.header thead {
+ border:0;
+}
+table.header tbody {
+ border:0;
+}
+table.header tr {
+ padding:0px;
+ border:0;
+}
+table.header td {
+ padding:0 3 0 3;
+ border:0;
+}
+
+td.title {
+ width:150px;
+ margin-right:15px;
+
+ font-size:small;
+ font-weight:700;
+}
+
+td.title:first-letter {
+ color:#7A9437;
+ background-color:transparent;
+}
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/ivy-sample-xslt.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-sample-xslt.xml b/asciidoc/samples/ivy-sample-xslt.xml
new file mode 100644
index 0000000..28f32dd
--- /dev/null
+++ b/asciidoc/samples/ivy-sample-xslt.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="ivy-doc.xsl"?>
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="myorg"
+ module="mymodule"
+ revision="myrev"
+ status="integration"
+ publication="20041101110000">
+
+ <license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/>
+
+ <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
+ <ivyauthor name="myorg" url="http://www.myorg.org/"/>
+
+ <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+
+ <description homepage="http://www.my.org/mymodule/">
+ This module is <b>great</b> !<br/>
+ You can use it especially with myconf1 and myconf2, and myconf4 is not too bad too.
+ </description>
+ </info>
+ <configurations>
+ <conf name="myconf1" description="desc 1"/>
+ <conf name="myconf2" description="desc 2" visibility="public"/>
+ <conf name="myconf3" description="desc 3" visibility="private"/>
+ <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
+ <conf name="myoldconf" description="my old desc" deprecated="20050115"/>
+ </configurations>
+ <publications>
+ <artifact name="myartifact1" type="jar"/>
+ <artifact name="myartifact2" type="jar" conf="myconf1"/>
+ <artifact name="myartifact3" type="jar" conf="myconf1, myconf2, myconf3"/>
+ <artifact name="myartifact4" type="jar">
+ <conf name="myconf1"/>
+ <conf name="myconf3"/>
+ </artifact>
+ </publications>
+ <dependencies>
+ <dependency name="mymodule2" rev="2.0"/>
+ <dependency org="yourorg" name="yourmodule1" rev="1.1" conf="myconf1"/>
+ <dependency org="yourorg" name="yourmodule2" rev="2+" conf="myconf1->yourconf1"/>
+ <dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1, yourconf2"/>
+ <dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1, yourconf2"/>
+ <dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1, yourconf2"/>
+
+ <dependency org="yourorg" name="yourmodule6" rev="latest.integration">
+ <conf name="myconf1" mapped="yourconf1"/>
+ <conf name="myconf2" mapped="yourconf1, yourconf2"/>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule7" rev="7.1">
+ <conf name="myconf1">
+ <mapped name="yourconf1"/>
+ </conf>
+ <conf name="myconf2">
+ <mapped name="yourconf1"/>
+ <mapped name="yourconf2"/>
+ </conf>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule8" rev="8.1">
+ <artifact name="yourartifact8-1" type="jar"/>
+ <artifact name="yourartifact8-2" type="jar"/>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
+ <artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/>
+ <artifact name="yourartifact9-2" type="jar">
+ <conf name="myconf2"/>
+ <conf name="myconf3"/>
+ </artifact>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule10" rev="10.1">
+ <include name="your.*" type="jar"/>
+ <include ext="xml"/>
+ <exclude name="toexclude"/>
+ </dependency>
+
+ <conflict org="yourorg" module=".*" manager="all"/>
+ <conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
+ </dependencies>
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/ivy-sample.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-sample.xml b/asciidoc/samples/ivy-sample.xml
new file mode 100644
index 0000000..62ef74c
--- /dev/null
+++ b/asciidoc/samples/ivy-sample.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="myorg"
+ module="mymodule"
+ revision="myrev"
+ status="integration"
+ publication="20041101110000">
+
+ <license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/>
+
+ <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
+ <ivyauthor name="myorg" url="http://www.myorg.org/"/>
+
+ <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+
+ <description homepage="http://www.my.org/mymodule/">
+ This module is <b>great</b> !<br/>
+ You can use it especially with myconf1 and myconf2, and myconf4 is not too bad too.
+ </description>
+ </info>
+ <configurations>
+ <conf name="myconf1" description="desc 1"/>
+ <conf name="myconf2" description="desc 2" visibility="public"/>
+ <conf name="myconf3" description="desc 3" visibility="private"/>
+ <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
+ <conf name="myoldconf" description="my old desc" deprecated="20050115"/>
+ </configurations>
+ <publications>
+ <artifact name="myartifact1" type="jar"/>
+ <artifact name="myartifact2" type="jar" conf="myconf1"/>
+ <artifact name="myartifact3" type="jar" conf="myconf1, myconf2, myconf3"/>
+ <artifact name="myartifact4" type="jar">
+ <conf name="myconf1"/>
+ <conf name="myconf3"/>
+ </artifact>
+ </publications>
+ <dependencies>
+ <dependency name="mymodule2" rev="2.0"/>
+ <dependency org="yourorg" name="yourmodule1" rev="1.1" conf="myconf1"/>
+ <dependency org="yourorg" name="yourmodule2" rev="2+" conf="myconf1->yourconf1"/>
+ <dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1, yourconf2"/>
+ <dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1, yourconf2"/>
+ <dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1, yourconf2"/>
+
+ <dependency org="yourorg" name="yourmodule6" rev="latest.integration">
+ <conf name="myconf1" mapped="yourconf1"/>
+ <conf name="myconf2" mapped="yourconf1, yourconf2"/>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule7" rev="7.1">
+ <conf name="myconf1">
+ <mapped name="yourconf1"/>
+ </conf>
+ <conf name="myconf2">
+ <mapped name="yourconf1"/>
+ <mapped name="yourconf2"/>
+ </conf>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule8" rev="8.1">
+ <artifact name="yourartifact8-1" type="jar"/>
+ <artifact name="yourartifact8-2" type="jar"/>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
+ <artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/>
+ <artifact name="yourartifact9-2" type="jar">
+ <conf name="myconf2"/>
+ <conf name="myconf3"/>
+ </artifact>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule10" rev="10.1">
+ <include name="your.*" type="jar"/>
+ <include ext="xml"/>
+ <exclude name="toexclude"/>
+ </dependency>
+
+ <conflict org="yourorg" module=".*" manager="all"/>
+ <conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
+ </dependencies>
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/ivy-style.css
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-style.css b/asciidoc/samples/ivy-style.css
new file mode 100644
index 0000000..9518ef9
--- /dev/null
+++ b/asciidoc/samples/ivy-style.css
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ *
+ */
+
+body {
+ font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+ font-size:small;
+}
+
+div#logo {
+ float: right;
+ padding-left: 10px;
+ padding-bottom: 10px;
+ background: white;
+ text-align: center;
+}
+
+#logo img {
+ border: 0;
+}
+
+a#rep {
+ color:#7A9437;
+ text-decoration:none;
+}
+
+a#rep:hover {
+ background-color:#DEE4CD;
+ color:#7A9437;
+}
+
+
+h1 {
+ margin-bottom:2px;
+
+ border-color:#7A9437;
+ border-style:solid;
+ border-width:0 0 3px 0;
+}
+
+span#module a {
+ color:#7A9437;
+ text-decoration:none;
+}
+
+span#module a:hover {
+ background-color:#DEE4CD;
+ color:#7A9437;
+}
+
+span#organisation a {
+ color:black;
+ text-decoration:none;
+}
+
+span#organisation a:hover {
+ background-color:black;
+ color:white;
+}
+
+
+h2 {
+ margin-bottom:2px;
+ font-size:medium;
+
+ border-color:#7A9437;
+ border-style:solid;
+ border-width:0 0 2px 0;
+}
+
+div#revision {
+ margin-left:60px;
+ font-size:medium;
+ font-style: italic;
+ font-weight:700;
+}
+
+span#revision {
+ color:#7A9437;
+}
+
+td.title {
+ width:150px;
+ margin-right:15px;
+
+ text-align: left;
+ /*
+ border-color:#7A9437;
+ border-style:solid;
+ border-width:0 0 3px 0;
+ */
+ font-size:small;
+ font-weight:700;
+ margin:0;
+ padding-left:0em;
+ vertical-align: top;
+}
+
+td.title:first-letter {
+ color:#7A9437;
+ font-size:medium;
+ background-color:transparent;
+}
+
+#repositories table {
+ width:90%;
+ margin:auto;
+}
+
+#repositories th {
+ text-align: left;
+}
+
+.conf table, #artifacts table, #dependencies table {
+ border-collapse:collapse;
+ width:90%;
+ margin:auto;
+ margin-top: 10px;
+}
+.conf thead, #artifacts thead, #dependencies thead {
+ background-color:#DEE4CD;
+ border:1px solid #7A9437;
+}
+.conf tbody, #artifacts tbody, #dependencies tbody {
+ border-collapse:collapse;
+ background-color:#FFFFFF;
+ border:1px solid #7A9437;
+}
+
+.conf th, #artifacts th, #dependencies th {
+ font-family:monospace;
+ border:1px solid #7A9437;
+ padding:5px;
+}
+
+.conf td, #artifacts td, #dependencies td {
+ border:1px dotted #7A9437;
+ padding:5px;
+}
+
+th.conf-name {
+ width:15%;
+}
+th.conf-desc {
+ width:50%;
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/ivysettings-default.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivysettings-default.xml b/asciidoc/samples/ivysettings-default.xml
new file mode 100644
index 0000000..9d985c1
--- /dev/null
+++ b/asciidoc/samples/ivysettings-default.xml
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<ivysettings>
+ <settings defaultResolver="ivyrep"/>
+ <resolvers>
+ <ivyrep name="ivyrep"/>
+ </resolvers>
+</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/jayasoft-ivyrep-example-default.html
----------------------------------------------------------------------
diff --git a/asciidoc/samples/jayasoft-ivyrep-example-default.html b/asciidoc/samples/jayasoft-ivyrep-example-default.html
new file mode 100644
index 0000000..faa79ec
--- /dev/null
+++ b/asciidoc/samples/jayasoft-ivyrep-example-default.html
@@ -0,0 +1,371 @@
+<!--
+ 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">
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Ivy report :: ivyrep-example by jayasoft :: default</title>
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+<meta content="en" http-equiv="content-language">
+<meta content="index,follow" name="robots">
+<link href="ivy-report.css" type="text/css" rel="stylesheet">
+</head>
+<body>
+<div id="logo">
+<a href="http://ant.apache.org/ivy/"><img src="../images/logo.png"></a>
+</div>
+<h1>
+<a name="jayasoft-ivyrep-example"></a><span id="module">ivyrep-example</span>
+ by
+ <span id="organisation">jayasoft</span>
+</h1>
+<div id="date">
+ resolved on
+ 2005-04-08 13:33:40</div>
+<ul id="confmenu">
+<li>
+<a class="active" href="jayasoft-ivyrep-example-default.html">default</a>
+</li>
+</ul>
+<div id="content">
+<h2>Dependencies Stats</h2>
+<table class="header">
+<tr>
+<td class="title">Modules</td><td class="value">3</td>
+</tr>
+<tr>
+<td class="title">Revisions</td><td class="value">4
+ (0 searched <img title="module revisions which required a search with a dependency resolver to be resolved" alt="searched" src="../images/searched.gif">,
+ 0 downloaded <img title="module revisions for which ivy file was downloaded by dependency resolver" alt="downloaded" src="../images/downloaded.gif">,
+ 1 evicted <img title="module revisions which were evicted by others" alt="evicted" src="../images/evicted.gif">,
+ 0 errors <img title="module revisions on which error occurred" alt="error" src="../images/error.gif">)</td>
+</tr>
+<tr>
+<td class="title">Artifacts</td><td class="value">3
+ (0 downloaded,
+ 0 failed)</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">219 kB
+ (0 kB downloaded,
+ 219 kB in cache)</td>
+</tr>
+</table>
+<h2>Dependencies Overview</h2>
+<table class="deps">
+<thead>
+<tr>
+<th>Module</th><th>Revision</th><th>Status</th><th>Licenses</th><th>Size</th><th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#apache-commons-cli"> commons-cli
+ by
+ apache</a></td><td><a href="#apache-commons-cli-1.0">1.0</a></td><td align="center">release</td><td align="center"><span style="padding-right:3px;"><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a></span></td><td align="center">32 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#apache-commons-lang">--- commons-lang
+ by
+ apache</a></td><td><a href="#apache-commons-lang-2.0">2.0</a></td><td align="center">release</td><td align="center"></td><td align="center">166 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#apache-commons-lang">--- commons-lang
+ by
+ apache</a></td><td><a href="#apache-commons-lang-1.0">1.0</a></td><td align="center"></td><td align="center"></td><td align="center">0 kB
+ </td><td align="center"><img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="evicted by 2.0"></td>
+</tr>
+<tr>
+<td><a href="#apache-commons-logging">--- commons-logging
+ by
+ apache</a></td><td><a href="#apache-commons-logging-1.0">1.0</a></td><td align="center">release</td><td align="center"><span style="padding-right:3px;"><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a></span></td><td align="center">21 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#apache-commons-lang"> commons-lang
+ by
+ apache</a></td><td><a href="#apache-commons-lang-2.0">2.0</a></td><td align="center">release</td><td align="center"></td><td align="center">166 kB
+ </td><td align="center"></td>
+</tr>
+</tbody>
+</table>
+<h2>Details</h2>
+<h3>
+<a name="apache-commons-cli"></a>commons-cli by apache<span class="resolved">resolved by <b>ivyrep</b></span>
+</h3>
+<h4>
+<a name="apache-commons-cli-1.0"></a>
+ Revision: 1.0<span style="padding-left:15px;"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Home Page</td><td class="value"><a href="http://jakarta.apache.org/commons/cli/">http://jakarta.apache.org/commons/cli/</a></td>
+</tr>
+<tr>
+<td class="title">Status</td><td class="value">release</td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value">20021227095900</td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value">ivyrep</td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value">default</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">32 kB
+ (0 kB downloaded,
+ 32 kB in cache)</td>
+</tr>
+<tr>
+<td class="title">Licenses</td><td class="value"><span style="padding-right:3px;"><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a></span></td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>jayasoft</td><td><a href="#jayasoft-ivyrep-example">ivyrep-example</a></td><td>default</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h5>Dependencies</h5>
+<table class="deps">
+<thead>
+<tr>
+<th>Module</th><th>Revision</th><th>Status</th><th>Licenses</th><th>Size</th><th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#apache-commons-lang"> commons-lang
+ by
+ apache</a></td><td><a href="#apache-commons-lang-2.0">2.0</a></td><td align="center">release</td><td align="center"></td><td align="center">166 kB
+ </td><td align="center"></td>
+</tr>
+<tr>
+<td><a href="#apache-commons-lang"> commons-lang
+ by
+ apache</a></td><td><a href="#apache-commons-lang-1.0">1.0</a></td><td align="center"></td><td align="center"></td><td align="center">0 kB
+ </td><td align="center"><img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="evicted by 2.0"></td>
+</tr>
+<tr>
+<td><a href="#apache-commons-logging"> commons-logging
+ by
+ apache</a></td><td><a href="#apache-commons-logging-1.0">1.0</a></td><td align="center">release</td><td align="center"><span style="padding-right:3px;"><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a></span></td><td align="center">21 kB
+ </td><td align="center"></td>
+</tr>
+</tbody>
+</table>
+<h5>Artifacts</h5>
+<table>
+<thead>
+<tr>
+<th>Name</th><th>Type</th><th>Ext</th><th>Download</th><th>Size</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-cli</td><td>jar</td><td>jar</td><td align="center">no</td><td align="center">32 kB</td>
+</tr>
+</tbody>
+</table>
+<h3>
+<a name="apache-commons-lang"></a>commons-lang by apache<span class="resolved">resolved by <b>ivyrep</b></span>
+</h3>
+<h4>
+<a name="apache-commons-lang-2.0"></a>
+ Revision: 2.0<span style="padding-left:15px;"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Status</td><td class="value">release</td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value">20050407222759</td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value">ivyrep</td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value">default</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">166 kB
+ (0 kB downloaded,
+ 166 kB in cache)</td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>apache</td><td><a href="#apache-commons-cli">commons-cli</a></td><td>default</td><td>1.0</td>
+</tr>
+<tr>
+<td>jayasoft</td><td><a href="#jayasoft-ivyrep-example">ivyrep-example</a></td><td>default</td><td>2.0</td>
+</tr>
+</tbody>
+</table>
+<h5>Dependencies</h5>
+<table>
+<tr>
+<td>
+ No dependency
+ </td>
+</tr>
+</table>
+<h5>Artifacts</h5>
+<table>
+<thead>
+<tr>
+<th>Name</th><th>Type</th><th>Ext</th><th>Download</th><th>Size</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-lang</td><td>jar</td><td>jar</td><td align="center">no</td><td align="center">166 kB</td>
+</tr>
+</tbody>
+</table>
+<h4>
+<a name="apache-commons-lang-1.0"></a>
+ Revision: 1.0<span style="padding-left:15px;"><img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="evicted by 2.0"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Status</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value"></td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">0 kB
+ (0 kB downloaded,
+ 0 kB in cache)</td>
+</tr>
+<tr>
+<td class="title">Evicted by</td><td class="value">2.0
+ in <b>latest-revision</b> conflict manager
+ </td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>apache</td><td><a href="#apache-commons-cli">commons-cli</a></td><td>default</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h3>
+<a name="apache-commons-logging"></a>commons-logging by apache<span class="resolved">resolved by <b>ivyrep</b></span>
+</h3>
+<h4>
+<a name="apache-commons-logging-1.0"></a>
+ Revision: 1.0<span style="padding-left:15px;"></span>
+</h4>
+<table class="header">
+<tr>
+<td class="title">Home Page</td><td class="value"><a href="http://jakarta.apache.org/commons/logging/">http://jakarta.apache.org/commons/logging/</a></td>
+</tr>
+<tr>
+<td class="title">Status</td><td class="value">release</td>
+</tr>
+<tr>
+<td class="title">Publication</td><td class="value">20020220232200</td>
+</tr>
+<tr>
+<td class="title">Resolver</td><td class="value">ivyrep</td>
+</tr>
+<tr>
+<td class="title">Configurations</td><td class="value">default</td>
+</tr>
+<tr>
+<td class="title">Artifacts size</td><td class="value">21 kB
+ (0 kB downloaded,
+ 21 kB in cache)</td>
+</tr>
+<tr>
+<td class="title">Licenses</td><td class="value"><span style="padding-right:3px;"><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a></span></td>
+</tr>
+</table>
+<h5>Required by</h5>
+<table>
+<thead>
+<tr>
+<th>Organisation</th><th>Name</th><th>In Configurations</th><th>Asked Revision</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>apache</td><td><a href="#apache-commons-cli">commons-cli</a></td><td>default</td><td>1.0</td>
+</tr>
+</tbody>
+</table>
+<h5>Dependencies</h5>
+<table>
+<tr>
+<td>
+ No dependency
+ </td>
+</tr>
+</table>
+<h5>Artifacts</h5>
+<table>
+<thead>
+<tr>
+<th>Name</th><th>Type</th><th>Ext</th><th>Download</th><th>Size</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>commons-logging</td><td>jar</td><td>jar</td><td align="center">no</td><td align="center">21 kB</td>
+</tr>
+</tbody>
+</table>
+</div>
+</body>
+
+</html>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/jayasoft-ivyrep-example-default.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/samples/jayasoft-ivyrep-example-default.jpg b/asciidoc/samples/jayasoft-ivyrep-example-default.jpg
new file mode 100644
index 0000000..34759ab
Binary files /dev/null and b/asciidoc/samples/jayasoft-ivyrep-example-default.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/projects-dependencies-graph-small.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/samples/projects-dependencies-graph-small.jpg b/asciidoc/samples/projects-dependencies-graph-small.jpg
new file mode 100644
index 0000000..1ddbfd2
Binary files /dev/null and b/asciidoc/samples/projects-dependencies-graph-small.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/projects-dependencies-graph.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/samples/projects-dependencies-graph.jpg b/asciidoc/samples/projects-dependencies-graph.jpg
new file mode 100644
index 0000000..916226b
Binary files /dev/null and b/asciidoc/samples/projects-dependencies-graph.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/standard-osgi/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/build.xml b/asciidoc/samples/standard-osgi/build.xml
new file mode 100644
index 0000000..e4a9dc7
--- /dev/null
+++ b/asciidoc/samples/standard-osgi/build.xml
@@ -0,0 +1,83 @@
+<!--
+ 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.
+-->
+<project name="standard-osgi" xmlns:ivy="ivy" xmlns:bnd="bnd">
+
+ <!-- Load Ivy ant tasks -->
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
+ <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing -->
+ <!-- taskdef rather than the above one -->
+ <!--path id="ivy.classpath">
+ <fileset dir="${basedir}">
+ <include name="ivy.jar" />
+ </fileset>
+ </path>
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /-->
+
+ <!-- Load Bnd ant tasks -->
+ <taskdef uri="bnd" resource="org/apache/ivy/ant/antlib.xml" />
+ <!-- If Bnd is not in Ant's classpath, get the jar of Bnd and use the folowing -->
+ <!-- taskdef rather than the above one -->
+ <!--path id="bnd.classpath">
+ <fileset dir="${basedir}">
+ <include name="bnd.jar" />
+ </fileset>
+ </path>
+ <taskdef uri="bnd" resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" /-->
+
+ <target name="clean" description="Clean the build directory">
+ <delete dir="${basedir}/target" />
+ </target>
+
+ <target name="ivy:configure">
+ <!-- classical ivy configuration -->
+ <ivy:configure file="${basedir}/ivysettings.xml" />
+ </target>
+
+ <target name="ivy:resolve" depends="ivy:configure">
+ <ivy:resolve file="ivy.xml" conf="*" />
+ <ivy:cachepath pathid="compile.classpath" conf="default" useOrigin="true" />
+ </target>
+
+ <target name="compile" depends="ivy:resolve" description="Compile the OSGi bundle">
+ <mkdir dir="${basedir}/target/classes" />
+ <!-- simple javac (WARNING: contrary to the JDT, javac doesn't understand OSGi's accessibility (private packages)) -->
+ <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false" />
+ <copy todir="${basedir}/target/classes">
+ <fileset dir="${basedir}/src">
+ <include name="**" />
+ <exclude name="**/*.java" />
+ <exclude name="**/package.html" />
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="plugin.xml" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="generate-manifest" depends="ivy:resolve">
+ <mkdir dir="META-INF" />
+ <bnd:bnd classpath="${toString:compile.classpath}" sourcepath="${basedir}/src" eclipse="false" files="org.apache.ivy.sample.standard-osgi.bnd" />
+ </target>
+
+ <target name="build" depends="compile,generate-manifest" description="Build the OSGi app">
+ <!-- simple jaring -->
+ <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF" />
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/standard-osgi/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/ivy.xml b/asciidoc/samples/standard-osgi/ivy.xml
new file mode 100644
index 0000000..ca6411e
--- /dev/null
+++ b/asciidoc/samples/standard-osgi/ivy.xml
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="com.acme" module="local-osgi-repo" />
+ <dependencies>
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" />
+ </dependencies>
+</ivy-module>
\ No newline at end of file
[26/29] ant-ivy git commit: Fix incorrect "lists" in documentation
Posted by ja...@apache.org.
Fix incorrect "lists" in documentation
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/88d2e938
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/88d2e938
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/88d2e938
Branch: refs/heads/master
Commit: 88d2e93800289d5542759a7ebf017d7c686b456f
Parents: c73d10e
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Thu Jun 15 19:57:59 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Fri Jun 16 09:57:07 2017 +0530
----------------------------------------------------------------------
asciidoc/reference.adoc | 33 +++---
asciidoc/tutorial/log/chained-resolvers.txt | 10 +-
asciidoc/tutorial/log/configurations-lib.txt | 27 ++---
asciidoc/tutorial/log/configurations-runcc.txt | 18 ++--
asciidoc/tutorial/log/configurations-runhm.txt | 6 +-
.../tutorial/log/dependence-depending-2.txt | 6 +-
asciidoc/tutorial/log/dependence-depending.txt | 6 +-
.../tutorial/log/dependence-standalone-2.txt | 6 +-
asciidoc/tutorial/log/dependence-standalone.txt | 14 +--
asciidoc/tutorial/log/dual.txt | 19 ++--
asciidoc/tutorial/log/hello-ivy-1.txt | 40 ++++----
asciidoc/tutorial/log/hello-ivy-2.txt | 6 +-
asciidoc/tutorial/log/install-deps.txt | 97 ++++++++----------
asciidoc/tutorial/log/install-namespace.txt | 10 +-
asciidoc/tutorial/log/install.txt | 16 +--
.../log/multi-project-general-publishall.txt | 43 ++++----
asciidoc/tutorial/multiproject.adoc | 102 +++++++++----------
asciidoc/use/resolve.adoc | 30 +++---
18 files changed, 240 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/reference.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/reference.adoc b/asciidoc/reference.adoc
index 6e872aa..27a5640 100644
--- a/asciidoc/reference.adoc
+++ b/asciidoc/reference.adoc
@@ -10,29 +10,30 @@ This documentation is broken into several parts:
* Introduction +
-<ul>
-* link:terminology.html[Terminology] +
-This part gives you the meaning of some words used all over the Ivy documentation, such as organization, module, configurations, settings, ...
+ ** link:terminology.html[Terminology] +
+ This part gives you the meaning of some words used all over the Ivy documentation, such as organization, module, configurations, settings, ...
-* link:concept.html[Main Concepts] +
-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.
+ ** link:concept.html[Main Concepts] +
+ 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.
-* link:principle.html[How does it work ?] +
-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.
+ ** link:principle.html[How does it work ?] +
+ 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.
-* link:install.html[Installation] +
-This part describes how to install Ivy.
+ ** link:install.html[Installation] +
+ This part describes how to install Ivy.
-* running +
-This part describes possibility to control the behavior of Ivy at run time
+ ** Running +
+ This part describes possibility to control the behavior of Ivy at run time
-<li>link:settings.html[Settings Files]</li>
+* link:settings.html[Settings Files] +
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>link:ivyfile.html[Ivy Files]</li>
+
+* link:ivyfile.html[Ivy Files] +
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>link:ant.html[Ant Tasks]</li>
+
+* link:ant.html[Ant Tasks] +
This part describes how to use Ivy from ant. It's in this section that all ant tasks provided by Ivy are specified.
-<li>link:standalone.html[Using standalone]</li>
+
+* link:standalone.html[Using standalone] +
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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/chained-resolvers.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/chained-resolvers.txt b/asciidoc/tutorial/log/chained-resolvers.txt
index 25e3a12..833d361 100644
--- a/asciidoc/tutorial/log/chained-resolvers.txt
+++ b/asciidoc/tutorial/log/chained-resolvers.txt
@@ -2,7 +2,7 @@
Buildfile: /ivy/chained-resolvers/chainedresolvers-project/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: file = /ivy/chained-resolvers/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#chained-resolvers;working@apache
[ivy:retrieve] confs: [default]
@@ -11,11 +11,11 @@ resolve:
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
[ivy:retrieve] ............................. (277kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2303ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2490ms)
[ivy:retrieve] downloading /ivy/chained-resolvers/settings/repository/test-1.0.jar ...
[ivy:retrieve] .. (1kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#test;1.0!test.jar (1ms)
-[ivy:retrieve] :: resolution report :: resolve 8989ms :: artifacts dl 2306ms
+[ivy:retrieve] [SUCCESSFUL ] org.apache#test;1.0!test.jar (2ms)
+[ivy:retrieve] :: resolution report :: resolve 8585ms :: artifacts dl 2494ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -24,7 +24,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#chained-resolvers
[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (278kB/10ms)
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (278kB/7ms)
run:
[mkdir] Created dir: /ivy/chained-resolvers/chainedresolvers-project/build
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/configurations-lib.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-lib.txt b/asciidoc/tutorial/log/configurations-lib.txt
index 46ba5a8..dba57d2 100644
--- a/asciidoc/tutorial/log/configurations-lib.txt
+++ b/asciidoc/tutorial/log/configurations-lib.txt
@@ -4,7 +4,7 @@ Buildfile: /ivy/configurations/multi-projects/filter-framework/build.xml
clean:
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#filter-framework;working@apache
[ivy:retrieve] confs: [api, homemade-impl, cc-impl, test]
@@ -12,19 +12,22 @@ resolve:
[ivy:retrieve] found junit#junit;4.12 in public
[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar ...
-[ivy:retrieve] ...........................................
-[ivy:retrieve] ............... (733kB)
+[ivy:retrieve] ...................
+[ivy:retrieve] ..........
+[ivy:retrieve] ...........
+[ivy:retrieve] ...............
+[ivy:retrieve] .. (733kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (3229ms)
+[ivy:retrieve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (7624ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar ...
[ivy:retrieve] ............................... (307kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (1837ms)
+[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (2329ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...
[ivy:retrieve] .............. (43kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1275ms)
-[ivy:retrieve] :: resolution report :: resolve 14647ms :: artifacts dl 6347ms
+[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1293ms)
+[ivy:retrieve] :: resolution report :: resolve 16401ms :: artifacts dl 11251ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -36,7 +39,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#filter-framework
[ivy:retrieve] confs: [api, homemade-impl, cc-impl, test]
-[ivy:retrieve] 4 artifacts copied, 0 already retrieved (1818kB/19ms)
+[ivy:retrieve] 4 artifacts copied, 0 already retrieved (1818kB/12ms)
build:
[mkdir] Created dir: /ivy/configurations/multi-projects/filter-framework/build
@@ -52,12 +55,12 @@ test:
[javac] /ivy/configurations/multi-projects/filter-framework/build.xml:82: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 3 source files to /ivy/configurations/multi-projects/filter-framework/build/test-classes
[junit] Running filter.ccimpl.CCFilterTest
- [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec
- [junit] Running filter.hmimpl.HMFilterTest
[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec
+ [junit] Running filter.hmimpl.HMFilterTest
+ [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec
publish:
-[ivy:publish] :: delivering :: org.apache#filter-framework;working@apache :: 1.3 :: release :: Thu Jun 15 16:46:53 IST 2017
+[ivy:publish] :: delivering :: org.apache#filter-framework;working@apache :: 1.3 :: release :: Thu Jun 15 19:37:04 IST 2017
[ivy:publish] delivering ivy file to /ivy/configurations/multi-projects/filter-framework/distrib/ivy.xml
[ivy:publish] :: publishing :: org.apache#filter-framework
[ivy:publish] published filter-api to /home/ivy/.ivy2/local/org.apache/filter-framework/1.3.part/jars/filter-api.jar
@@ -69,4 +72,4 @@ publish:
[echo] project filter-framework released with version 1.3
BUILD SUCCESSFUL
-Total time: 23 seconds
+Total time: 29 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/configurations-runcc.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-runcc.txt b/asciidoc/tutorial/log/configurations-runcc.txt
index e943c57..424c941 100644
--- a/asciidoc/tutorial/log/configurations-runcc.txt
+++ b/asciidoc/tutorial/log/configurations-runcc.txt
@@ -2,26 +2,26 @@
Buildfile: /ivy/configurations/multi-projects/myapp/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#myapp;working@apache
[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
[ivy:retrieve] found org.apache#filter-framework;1.3 in local
[ivy:retrieve] [1.3] org.apache#filter-framework;latest.integration
[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-hmimpl.jar ...
+[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-api.jar ...
[ivy:retrieve] .. (1kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-hmimpl.jar (7ms)
-[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-ccimpl.jar ...
+[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-api.jar (3ms)
+[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-hmimpl.jar ...
[ivy:retrieve] .. (1kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-ccimpl.jar (8ms)
-[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-api.jar ...
+[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-hmimpl.jar (4ms)
+[ivy:retrieve] downloading /home/ivy/.ivy2/local/org.apache/filter-framework/1.3/jars/filter-ccimpl.jar ...
[ivy:retrieve] .. (1kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-api.jar (7ms)
-[ivy:retrieve] :: resolution report :: resolve 132ms :: artifacts dl 31ms
+[ivy:retrieve] [SUCCESSFUL ] org.apache#filter-framework;1.3!filter-ccimpl.jar (4ms)
+[ivy:retrieve] :: resolution report :: resolve 91ms :: artifacts dl 16ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -32,7 +32,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#myapp
[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
-[ivy:retrieve] 6 artifacts copied, 0 already retrieved (739kB/33ms)
+[ivy:retrieve] 6 artifacts copied, 0 already retrieved (739kB/11ms)
build:
[mkdir] Created dir: /ivy/configurations/multi-projects/myapp/build
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/configurations-runhm.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/configurations-runhm.txt b/asciidoc/tutorial/log/configurations-runhm.txt
index 62377fb..16f0bb2 100644
--- a/asciidoc/tutorial/log/configurations-runhm.txt
+++ b/asciidoc/tutorial/log/configurations-runhm.txt
@@ -2,14 +2,14 @@
Buildfile: /ivy/configurations/multi-projects/myapp/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#myapp;working@apache
[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
[ivy:retrieve] found org.apache#filter-framework;1.3 in local
[ivy:retrieve] [1.3] org.apache#filter-framework;latest.integration
[ivy:retrieve] found org.apache.commons#commons-collections4;4.1 in public
-[ivy:retrieve] :: resolution report :: resolve 144ms :: artifacts dl 8ms
+[ivy:retrieve] :: resolution report :: resolve 87ms :: artifacts dl 5ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -20,7 +20,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#myapp
[ivy:retrieve] confs: [build, noexternaljar, withexternaljar]
-[ivy:retrieve] 0 artifacts copied, 6 already retrieved (0kB/6ms)
+[ivy:retrieve] 0 artifacts copied, 6 already retrieved (0kB/5ms)
build:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/dependence-depending-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-depending-2.txt b/asciidoc/tutorial/log/dependence-depending-2.txt
index 2ddae45..6d8c86f 100644
--- a/asciidoc/tutorial/log/dependence-depending-2.txt
+++ b/asciidoc/tutorial/log/dependence-depending-2.txt
@@ -4,7 +4,7 @@ Buildfile: /ivy/dependence/depender/build.xml
clean:
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#depender;working@apache
[ivy:retrieve] confs: [default]
@@ -15,7 +15,7 @@ resolve:
[ivy:retrieve] .. (1kB)
[ivy:retrieve] .. (0kB)
[ivy:retrieve] [SUCCESSFUL ] org.apache#dependee;2!dependee.jar (3ms)
-[ivy:retrieve] :: resolution report :: resolve 80ms :: artifacts dl 6ms
+[ivy:retrieve] :: resolution report :: resolve 82ms :: artifacts dl 6ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -24,7 +24,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#depender
[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/5ms)
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/4ms)
compile:
[mkdir] Created dir: /ivy/dependence/depender/build/classes
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/dependence-depending.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-depending.txt b/asciidoc/tutorial/log/dependence-depending.txt
index 8e2fdbb..d2eb958 100644
--- a/asciidoc/tutorial/log/dependence-depending.txt
+++ b/asciidoc/tutorial/log/dependence-depending.txt
@@ -4,7 +4,7 @@ Buildfile: /ivy/dependence/depender/build.xml
clean:
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#depender;working@apache
[ivy:retrieve] confs: [default]
@@ -15,7 +15,7 @@ resolve:
[ivy:retrieve] .. (1kB)
[ivy:retrieve] .. (0kB)
[ivy:retrieve] [SUCCESSFUL ] org.apache#dependee;1!dependee.jar (3ms)
-[ivy:retrieve] :: resolution report :: resolve 75ms :: artifacts dl 6ms
+[ivy:retrieve] :: resolution report :: resolve 73ms :: artifacts dl 5ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -24,7 +24,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#depender
[ivy:retrieve] confs: [default]
-[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/7ms)
+[ivy:retrieve] 2 artifacts copied, 0 already retrieved (279kB/6ms)
compile:
[mkdir] Created dir: /ivy/dependence/depender/build/classes
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/dependence-standalone-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-standalone-2.txt b/asciidoc/tutorial/log/dependence-standalone-2.txt
index c09baa2..a6bc001 100644
--- a/asciidoc/tutorial/log/dependence-standalone-2.txt
+++ b/asciidoc/tutorial/log/dependence-standalone-2.txt
@@ -2,12 +2,12 @@
Buildfile: /ivy/dependence/dependee/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#dependee;working@apache
[ivy:retrieve] confs: [default]
[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
-[ivy:retrieve] :: resolution report :: resolve 79ms :: artifacts dl 2ms
+[ivy:retrieve] :: resolution report :: resolve 50ms :: artifacts dl 2ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -25,7 +25,7 @@ jar:
publish:
[delete] Deleting: /ivy/dependence/dependee/build/ivy.xml
-[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 2 :: release :: Thu Jun 15 16:46:29 IST 2017
+[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 2 :: release :: Thu Jun 15 19:36:33 IST 2017
[ivy:publish] delivering ivy file to /ivy/dependence/dependee/build/ivy.xml
[ivy:publish] :: publishing :: org.apache#dependee
[ivy:publish] published dependee to /ivy/dependence/settings/repository/dependee-2.jar
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/dependence-standalone.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dependence-standalone.txt b/asciidoc/tutorial/log/dependence-standalone.txt
index 0fbdafa..6a662e7 100644
--- a/asciidoc/tutorial/log/dependence-standalone.txt
+++ b/asciidoc/tutorial/log/dependence-standalone.txt
@@ -2,17 +2,17 @@
Buildfile: /ivy/dependence/dependee/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: file = /ivy/dependence/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#dependee;working@apache
[ivy:retrieve] confs: [default]
[ivy:retrieve] found commons-lang#commons-lang;2.6 in libraries
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
-[ivy:retrieve] ......................
-[ivy:retrieve] ....... (277kB)
+[ivy:retrieve] .........................
+[ivy:retrieve] .... (277kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (3127ms)
-[ivy:retrieve] :: resolution report :: resolve 1426ms :: artifacts dl 3129ms
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2899ms)
+[ivy:retrieve] :: resolution report :: resolve 2967ms :: artifacts dl 2900ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -32,7 +32,7 @@ jar:
[jar] Building jar: /ivy/dependence/dependee/build/dependee.jar
publish:
-[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 1 :: release :: Thu Jun 15 16:46:27 IST 2017
+[ivy:publish] :: delivering :: org.apache#dependee;working@apache :: 1 :: release :: Thu Jun 15 19:36:31 IST 2017
[ivy:publish] delivering ivy file to /ivy/dependence/dependee/build/ivy.xml
[ivy:publish] :: publishing :: org.apache#dependee
[ivy:publish] published dependee to /ivy/dependence/settings/repository/dependee-1.jar
@@ -40,4 +40,4 @@ publish:
[echo] project dependee released with version 1
BUILD SUCCESSFUL
-Total time: 5 seconds
+Total time: 6 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/dual.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/dual.txt b/asciidoc/tutorial/log/dual.txt
index 518ee57..e37f9d9 100644
--- a/asciidoc/tutorial/log/dual.txt
+++ b/asciidoc/tutorial/log/dual.txt
@@ -2,7 +2,7 @@
Buildfile: /ivy/dual/project/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: file = /ivy/dual/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
[ivy:retrieve] confs: [default]
@@ -10,19 +10,18 @@ resolve:
[ivy:retrieve] found commons-logging#commons-logging;1.0.4 in ibiblio
[ivy:retrieve] found commons-lang#commons-lang;2.6 in ibiblio
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar ...
-[ivy:retrieve] .......................
-[ivy:retrieve] .. (220kB)
+[ivy:retrieve] ......................... (220kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-httpclient#commons-httpclient;2.0.2!commons-httpclient.jar (3081ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-httpclient#commons-httpclient;2.0.2!commons-httpclient.jar (2849ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
[ivy:retrieve] ............................. (277kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2464ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (2240ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar ...
[ivy:retrieve] ................ (37kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1290ms)
-[ivy:retrieve] :: resolution report :: resolve 2211ms :: artifacts dl 6841ms
+[ivy:retrieve] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1350ms)
+[ivy:retrieve] :: resolution report :: resolve 1927ms :: artifacts dl 6443ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -31,18 +30,18 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
[ivy:retrieve] confs: [default]
-[ivy:retrieve] 3 artifacts copied, 0 already retrieved (534kB/14ms)
+[ivy:retrieve] 3 artifacts copied, 0 already retrieved (534kB/7ms)
run:
[mkdir] Created dir: /ivy/dual/project/build
[javac] Compiling 1 source file to /ivy/dual/project/build
[java] standard message : Hello Ivy!
[java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy!
- [java] Jun 15, 2017 4:46:21 PM org.apache.commons.httpclient.HttpMethodBase processRedirectResponse
+ [java] Jun 15, 2017 7:36:24 PM org.apache.commons.httpclient.HttpMethodBase processRedirectResponse
[java] WARNING: Redirect from protocol http to https is not supported
[java] head status code with httpclient: 301
[java] now check if httpclient dependency on commons-logging has been realized
[java] found logging class in classpath: interface org.apache.commons.logging.Log
BUILD SUCCESSFUL
-Total time: 13 seconds
+Total time: 12 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/hello-ivy-1.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/hello-ivy-1.txt b/asciidoc/tutorial/log/hello-ivy-1.txt
index 9e7ca67..65c3a9d 100644
--- a/asciidoc/tutorial/log/hello-ivy-1.txt
+++ b/asciidoc/tutorial/log/hello-ivy-1.txt
@@ -2,7 +2,7 @@
Buildfile: /ivy/hello-ivy/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
[ivy:retrieve] confs: [default]
@@ -12,41 +12,41 @@ resolve:
[ivy:retrieve] found junit#junit;4.12 in public
[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar ...
-[ivy:retrieve] ....................................
+[ivy:retrieve] ..............................
+[ivy:retrieve] ........................
[ivy:retrieve] ...............................
-[ivy:retrieve] .......................................
-[ivy:retrieve] ..... (1585kB)
+[ivy:retrieve] .......................... (1585kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(javadoc) (5831ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
-[ivy:retrieve] ............................. (277kB)
-[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (1834ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(javadoc) (7177ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar ...
[ivy:retrieve] .................................. (364kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(source) (1746ms)
-[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
-[ivy:retrieve] ............... (52kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar(source) (1688ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar ...
+[ivy:retrieve] ............................... (277kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1105ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-lang#commons-lang;2.6!commons-lang.jar (1555ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4-sources.jar ...
[ivy:retrieve] ............... (61kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(source) (1240ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(source) (1225ms)
+[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
+[ivy:retrieve] ............... (52kB)
+[ivy:retrieve] .. (0kB)
+[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1226ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4-javadoc.jar ...
[ivy:retrieve] ...................... (174kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(javadoc) (1434ms)
+[ivy:retrieve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar(javadoc) (1333ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar ...
-[ivy:retrieve] ............................... (307kB)
+[ivy:retrieve] ................................ (307kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (1739ms)
+[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.12!junit.jar (1534ms)
[ivy:retrieve] downloading https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...
[ivy:retrieve] .............. (43kB)
[ivy:retrieve] .. (0kB)
-[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1227ms)
-[ivy:retrieve] :: resolution report :: resolve 23372ms :: artifacts dl 16165ms
+[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (1343ms)
+[ivy:retrieve] :: resolution report :: resolve 25480ms :: artifacts dl 17089ms
[ivy:retrieve] :: evicted modules:
[ivy:retrieve] junit#junit;3.8.1 by [junit#junit;4.12] in [default]
---------------------------------------------------------------------
@@ -66,4 +66,4 @@ run:
[java] capitalized by org.apache.commons.lang.WordUtils : Hello Ivy !
BUILD SUCCESSFUL
-Total time: 40 seconds
+Total time: 43 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/hello-ivy-2.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/hello-ivy-2.txt b/asciidoc/tutorial/log/hello-ivy-2.txt
index 4e012a6..bda6ff3 100644
--- a/asciidoc/tutorial/log/hello-ivy-2.txt
+++ b/asciidoc/tutorial/log/hello-ivy-2.txt
@@ -2,7 +2,7 @@
Buildfile: /ivy/hello-ivy/build.xml
resolve:
-[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:retrieve] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:retrieve] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
[ivy:retrieve] :: resolving dependencies :: org.apache#hello-ivy;working@apache
[ivy:retrieve] confs: [default]
@@ -11,7 +11,7 @@ resolve:
[ivy:retrieve] found commons-cli#commons-cli;1.4 in public
[ivy:retrieve] found junit#junit;4.12 in public
[ivy:retrieve] found org.hamcrest#hamcrest-core;1.3 in public
-[ivy:retrieve] :: resolution report :: resolve 139ms :: artifacts dl 8ms
+[ivy:retrieve] :: resolution report :: resolve 171ms :: artifacts dl 11ms
[ivy:retrieve] :: evicted modules:
[ivy:retrieve] junit#junit;3.8.1 by [junit#junit;4.12] in [default]
---------------------------------------------------------------------
@@ -22,7 +22,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache#hello-ivy
[ivy:retrieve] confs: [default]
-[ivy:retrieve] 0 artifacts copied, 8 already retrieved (0kB/4ms)
+[ivy:retrieve] 0 artifacts copied, 8 already retrieved (0kB/9ms)
run:
[java] standard message : hello ivy !
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/install-deps.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install-deps.txt b/asciidoc/tutorial/log/install-deps.txt
index 1427e5e..148191f 100644
--- a/asciidoc/tutorial/log/install-deps.txt
+++ b/asciidoc/tutorial/log/install-deps.txt
@@ -6,7 +6,7 @@ load-ivy:
init-ivy:
maven2-deps:
-[ivy:install] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:install] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-basic.xml
[ivy:install] :: installing org.hibernate#hibernate;3.2.5.ga ::
[ivy:install] :: resolving dependencies ::
@@ -39,43 +39,36 @@ maven2-deps:
[ivy:install] found opensymphony#oscache;2.1 in libraries
[ivy:install] found proxool#proxool;0.8.3 in libraries
[ivy:install] :: downloading artifacts to cache ::
-[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-sources.jar ...
-[ivy:install] ...........................
+[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga.jar ...
[ivy:install] ......................
-[ivy:install] ...........................
-[ivy:install] .......................
-[ivy:install] ..... (1470kB)
+[ivy:install] ................
+[ivy:install] ...................
+[ivy:install] .................................
+[ivy:install] ............................................................ (2202kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(source) (7476ms)
-[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga.jar ...
-[ivy:install] ..........................................
-[ivy:install] ..............................
-[ivy:install] ................................
-[ivy:install] ..................................
-[ivy:install] ............ (2202kB)
+[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar (9026ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-sources.jar ...
+[ivy:install] ....................................................................................................... (1470kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar (7618ms)
+[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(source) (2658ms)
[ivy:install] downloading https://repo1.maven.org/maven2/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga-javadoc.jar ...
-[ivy:install] .....................................................................................................................................................
-[ivy:install] ...........................................................................
-[ivy:install] ..................................................................................................................
-[ivy:install] ................................................................................................
-[ivy:install] .............................................................................................................................
-[ivy:install] ... (7352kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(javadoc) (8997ms)
+[ivy:install] ......................................................................................................................................................................................
+[ivy:install] ..............................................................................................................................................................................................................................
+[ivy:install] ............................................................................. (7352kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] org.hibernate#hibernate;3.2.5.ga!hibernate.jar(javadoc) (4739ms)
[ivy:install] downloading https://repo1.maven.org/maven2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar ...
[ivy:install] ........................ (203kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] net.sf.ehcache#ehcache;1.2.3!ehcache.jar (1500ms)
+[ivy:install] [SUCCESSFUL ] net.sf.ehcache#ehcache;1.2.3!ehcache.jar (1293ms)
[ivy:install] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar ...
[ivy:install] ................ (37kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1320ms)
+[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.4!commons-logging.jar (1226ms)
[ivy:install] downloading https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar ...
[ivy:install] ........ (16kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] asm#asm-attrs;1.5.3!asm-attrs.jar (1339ms)
+[ivy:install] [SUCCESSFUL ] asm#asm-attrs;1.5.3!asm-attrs.jar (1330ms)
[ivy:install] downloading https://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar ...
[ivy:install] ............................... (306kB)
[ivy:install] .. (0kB)
@@ -83,90 +76,90 @@ maven2-deps:
[ivy:install] downloading https://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6.jar ...
[ivy:install] ....................................... (433kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] antlr#antlr;2.7.6!antlr.jar (1640ms)
+[ivy:install] [SUCCESSFUL ] antlr#antlr;2.7.6!antlr.jar (1331ms)
[ivy:install] downloading https://repo1.maven.org/maven2/cglib/cglib/2.1_3/cglib-2.1_3.jar ...
[ivy:install] ............................. (275kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] cglib#cglib;2.1_3!cglib.jar (1534ms)
+[ivy:install] [SUCCESSFUL ] cglib#cglib;2.1_3!cglib.jar (1299ms)
[ivy:install] downloading https://repo1.maven.org/maven2/asm/asm/1.5.3/asm-1.5.3.jar ...
[ivy:install] ........... (25kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] asm#asm;1.5.3!asm.jar (1226ms)
+[ivy:install] [SUCCESSFUL ] asm#asm;1.5.3!asm.jar (1257ms)
[ivy:install] downloading https://repo1.maven.org/maven2/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar ...
-[ivy:install] ....................... (171kB)
+[ivy:install] ...................... (171kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1.1!commons-collections.jar (1313ms)
+[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1.1!commons-collections.jar (1434ms)
[ivy:install] downloading https://repo1.maven.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.jar ...
[ivy:install] ...................... (161kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1!commons-collections.jar (1348ms)
+[ivy:install] [SUCCESSFUL ] commons-collections#commons-collections;2.1!commons-collections.jar (1228ms)
[ivy:install] downloading https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar ...
-[ivy:install] ............................................................................ (1009kB)
+[ivy:install] ........................................................................... (1009kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] ant#ant;1.6.5!ant.jar (2154ms)
+[ivy:install] [SUCCESSFUL ] ant#ant;1.6.5!ant.jar (1541ms)
[ivy:install] downloading https://repo1.maven.org/maven2/swarmcache/swarmcache/1.0RC2/swarmcache-1.0RC2.jar ...
[ivy:install] ............. (29kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] swarmcache#swarmcache;1.0RC2!swarmcache.jar (1223ms)
+[ivy:install] [SUCCESSFUL ] swarmcache#swarmcache;1.0RC2!swarmcache.jar (2615ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-cache/1.2.2/jboss-cache-1.2.2.jar ...
[ivy:install] .................................. (365kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-cache;1.2.2!jboss-cache.jar (1413ms)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-cache;1.2.2!jboss-cache.jar (1476ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jgroups/jgroups-all/2.2.8/jgroups-all-2.2.8.jar ...
[ivy:install] .............................................................................................................. (1573kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.8!jgroups-all.jar (2277ms)
+[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.8!jgroups-all.jar (2002ms)
[ivy:install] downloading https://repo1.maven.org/maven2/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar ...
[ivy:install] ................................................. (594kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] c3p0#c3p0;0.9.1!c3p0.jar (1637ms)
+[ivy:install] [SUCCESSFUL ] c3p0#c3p0;0.9.1!c3p0.jar (1481ms)
[ivy:install] downloading https://repo1.maven.org/maven2/opensymphony/oscache/2.1/oscache-2.1.jar ...
[ivy:install] ................... (111kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] opensymphony#oscache;2.1!oscache.jar (1303ms)
+[ivy:install] [SUCCESSFUL ] opensymphony#oscache;2.1!oscache.jar (1327ms)
[ivy:install] downloading https://repo1.maven.org/maven2/proxool/proxool/0.8.3/proxool-0.8.3.jar ...
[ivy:install] ......................................... (464kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] proxool#proxool;0.8.3!proxool.jar (1562ms)
+[ivy:install] [SUCCESSFUL ] proxool#proxool;0.8.3!proxool.jar (1538ms)
[ivy:install] downloading https://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar ...
[ivy:install] ........... (25kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.2!commons-logging.jar (1223ms)
+[ivy:install] [SUCCESSFUL ] commons-logging#commons-logging;1.0.2!commons-logging.jar (1224ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-system/4.0.2/jboss-system-4.0.2.jar ...
[ivy:install] .......................... (227kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-system;4.0.2!jboss-system.jar (1438ms)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-system;4.0.2!jboss-system.jar (1332ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-common/4.0.2/jboss-common-4.0.2.jar ...
[ivy:install] ........................................ (457kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-common;4.0.2!jboss-common.jar (1537ms)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-common;4.0.2!jboss-common.jar (1332ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-minimal/4.0.2/jboss-minimal-4.0.2.jar ...
[ivy:install] ...................... (163kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-minimal;4.0.2!jboss-minimal.jar (1533ms)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-minimal;4.0.2!jboss-minimal.jar (1329ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jboss/jboss-j2se/200504122039/jboss-j2se-200504122039.jar ...
-[ivy:install] .................................. (350kB)
+[ivy:install] ................................. (350kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jboss#jboss-j2se;200504122039!jboss-j2se.jar (1435ms)
+[ivy:install] [SUCCESSFUL ] jboss#jboss-j2se;200504122039!jboss-j2se.jar (1434ms)
[ivy:install] downloading https://repo1.maven.org/maven2/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar ...
[ivy:install] ....................... (184kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] concurrent#concurrent;1.3.4!concurrent.jar (1310ms)
+[ivy:install] [SUCCESSFUL ] concurrent#concurrent;1.3.4!concurrent.jar (1330ms)
[ivy:install] downloading https://repo1.maven.org/maven2/jgroups/jgroups-all/2.2.7/jgroups-all-2.2.7.jar ...
-[ivy:install] .................................................................................................................. (1613kB)
+[ivy:install] ................................................................................................................. (1613kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.7!jgroups-all.jar (2689ms)
+[ivy:install] [SUCCESSFUL ] jgroups#jgroups-all;2.2.7!jgroups-all.jar (1749ms)
[ivy:install] downloading https://repo1.maven.org/maven2/slide/webdavlib/2.0/webdavlib-2.0.jar ...
[ivy:install] .................... (128kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] slide#webdavlib;2.0!webdavlib.jar (1321ms)
+[ivy:install] [SUCCESSFUL ] slide#webdavlib;2.0!webdavlib.jar (1322ms)
[ivy:install] downloading https://repo1.maven.org/maven2/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar ...
[ivy:install] ......................................................................... (986kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] xerces#xercesImpl;2.6.2!xercesImpl.jar (1914ms)
+[ivy:install] [SUCCESSFUL ] xerces#xercesImpl;2.6.2!xercesImpl.jar (1540ms)
[ivy:install] :: installing in my-repository ::
-[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar
[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/jars/hibernate-3.2.5.ga.jar
+[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/sources/hibernate-3.2.5.ga.jar
[ivy:install] published hibernate to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/javadocs/hibernate-3.2.5.ga.jar
[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate/ivys/ivy-3.2.5.ga.xml
[ivy:install] published ehcache to /ivy/build-a-ivy-repository/myrepository/no-namespace/net.sf.ehcache/ehcache/jars/ehcache-1.2.3.jar
@@ -222,7 +215,7 @@ maven2-deps:
[ivy:install] published xercesImpl to /ivy/build-a-ivy-repository/myrepository/no-namespace/xerces/xercesImpl/jars/xercesImpl-2.6.2.jar
[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/xerces/xercesImpl/ivys/ivy-2.6.2.xml
[ivy:install] :: install resolution report ::
-[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 62734ms
+[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 52845ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/install-namespace.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install-namespace.txt b/asciidoc/tutorial/log/install-namespace.txt
index b9a222b..7f053ee 100644
--- a/asciidoc/tutorial/log/install-namespace.txt
+++ b/asciidoc/tutorial/log/install-namespace.txt
@@ -6,7 +6,7 @@ load-ivy:
init-ivy:
maven2-namespace:
-[ivy:install] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:install] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-advanced.xml
[ivy:install] :: installing apache#commons-lang;1.0 ::
[ivy:install] :: resolving dependencies ::
@@ -15,17 +15,17 @@ maven2-namespace:
[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0.jar ...
[ivy:install] ............... (62kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar (2032ms)
+[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar (1728ms)
[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
[ivy:install] ...................... (170kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar(javadoc) (2254ms)
+[ivy:install] [SUCCESSFUL ] apache#commons-lang;1.0!commons-lang.jar(javadoc) (1639ms)
[ivy:install] :: installing in my-repository ::
[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/jars/commons-lang-1.0.jar
[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/javadocs/commons-lang-1.0.jar
[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/advanced/apache/commons-lang/ivys/ivy-1.0.xml
[ivy:install] :: install resolution report ::
-[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 4288ms
+[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 3370ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -34,4 +34,4 @@ maven2-namespace:
---------------------------------------------------------------------
BUILD SUCCESSFUL
-Total time: 9 seconds
+Total time: 8 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/install.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/install.txt b/asciidoc/tutorial/log/install.txt
index d4fabc3..286212b 100644
--- a/asciidoc/tutorial/log/install.txt
+++ b/asciidoc/tutorial/log/install.txt
@@ -6,26 +6,26 @@ load-ivy:
init-ivy:
maven2:
-[ivy:install] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:install] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:install] :: loading settings :: file = /ivy/build-a-ivy-repository/settings/ivysettings-basic.xml
[ivy:install] :: installing commons-lang#commons-lang;1.0 ::
[ivy:install] :: resolving dependencies ::
[ivy:install] found commons-lang#commons-lang;1.0 in libraries
[ivy:install] :: downloading artifacts to cache ::
-[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
-[ivy:install] ...................... (170kB)
-[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar(javadoc) (2255ms)
[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0.jar ...
[ivy:install] ............... (62kB)
[ivy:install] .. (0kB)
-[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar (1413ms)
+[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar (1979ms)
+[ivy:install] downloading https://repo1.maven.org/maven2/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar ...
+[ivy:install] ...................... (170kB)
+[ivy:install] .. (0kB)
+[ivy:install] [SUCCESSFUL ] commons-lang#commons-lang;1.0!commons-lang.jar(javadoc) (2048ms)
[ivy:install] :: installing in my-repository ::
-[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar
[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/jars/commons-lang-1.0.jar
+[ivy:install] published commons-lang to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/javadocs/commons-lang-1.0.jar
[ivy:install] published ivy to /ivy/build-a-ivy-repository/myrepository/no-namespace/commons-lang/commons-lang/ivys/ivy-1.0.xml
[ivy:install] :: install resolution report ::
-[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 3670ms
+[ivy:install] :: resolution report :: resolve 0ms :: artifacts dl 4030ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/log/multi-project-general-publishall.txt
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/log/multi-project-general-publishall.txt b/asciidoc/tutorial/log/multi-project-general-publishall.txt
index b05fbce..deebd90 100644
--- a/asciidoc/tutorial/log/multi-project-general-publishall.txt
+++ b/asciidoc/tutorial/log/multi-project-general-publishall.txt
@@ -4,7 +4,7 @@ Buildfile: /ivy/multi-project/build.xml
load-ivy:
buildlist:
-[ivy:buildlist] :: Apache Ivy 2.5.0 - 20170615164456 :: http://ant.apache.org/ivy/ ::
+[ivy:buildlist] :: Apache Ivy 2.5.0 - 20170615193455 :: http://ant.apache.org/ivy/ ::
[ivy:buildlist] :: loading settings :: url = jar:file://home/ivy/ivy.jar!/org/apache/ivy/core/settings/ivysettings.xml
publish-all:
@@ -43,7 +43,7 @@ jar:
[jar] Building jar: /ivy/multi-project/projects/version/build/version.jar
publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#version;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:49:36 IST 2017
+[ivy:publish] :: delivering :: org.apache.ivy.example#version;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:39:37 IST 2017
[ivy:publish] delivering ivy file to /ivy/multi-project/projects/version/build/ivy.xml
[ivy:publish] :: publishing :: org.apache.ivy.example#version
[ivy:publish] published version to /ivy/multi-project/repository/shared/org.apache.ivy.example/version/1.0-dev-b1.part/jars/version.jar
@@ -78,8 +78,8 @@ resolve:
[ivy:resolve] downloading https://repo1.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar ...
[ivy:resolve] ............... (52kB)
[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1826ms)
-[ivy:resolve] :: resolution report :: resolve 9015ms :: artifacts dl 1830ms
+[ivy:resolve] [SUCCESSFUL ] commons-cli#commons-cli;1.4!commons-cli.jar (1709ms)
+[ivy:resolve] :: resolution report :: resolve 7905ms :: artifacts dl 1714ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -98,7 +98,7 @@ jar:
[jar] Building jar: /ivy/multi-project/projects/list/build/list.jar
publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#list;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:49:48 IST 2017
+[ivy:publish] :: delivering :: org.apache.ivy.example#list;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:39:48 IST 2017
[ivy:publish] delivering ivy file to /ivy/multi-project/projects/list/build/ivy.xml
[ivy:publish] :: publishing :: org.apache.ivy.example#list
[ivy:publish] published list to /ivy/multi-project/repository/shared/org.apache.ivy.example/list/1.0-dev-b1.part/jars/list.jar
@@ -134,12 +134,13 @@ resolve:
[ivy:resolve] .. (0kB)
[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#list;1.0-dev-b1!list.jar (2ms)
[ivy:resolve] downloading https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar ...
-[ivy:resolve] ............................
[ivy:resolve] ......................
-[ivy:resolve] ........ (733kB)
+[ivy:resolve] .............
+[ivy:resolve] .................
+[ivy:resolve] ..... (733kB)
[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (4794ms)
-[ivy:resolve] :: resolution report :: resolve 9842ms :: artifacts dl 4799ms
+[ivy:resolve] [SUCCESSFUL ] org.apache.commons#commons-collections4;4.1!commons-collections4.jar (6019ms)
+[ivy:resolve] :: resolution report :: resolve 8617ms :: artifacts dl 6024ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -158,7 +159,7 @@ jar:
[jar] Building jar: /ivy/multi-project/projects/find/build/find.jar
publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#find;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:04 IST 2017
+[ivy:publish] :: delivering :: org.apache.ivy.example#find;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:04 IST 2017
[ivy:publish] delivering ivy file to /ivy/multi-project/projects/find/build/ivy.xml
[ivy:publish] :: publishing :: org.apache.ivy.example#find
[ivy:publish] published find to /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1.part/jars/find.jar
@@ -187,7 +188,7 @@ resolve:
[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#version;latest.integration
[ivy:resolve] found org.apache.ivy.example#list;1.0-dev-b1 in shared
[ivy:resolve] [1.0-dev-b1] org.apache.ivy.example#list;latest.integration
-[ivy:resolve] :: resolution report :: resolve 2045ms :: artifacts dl 1ms
+[ivy:resolve] :: resolution report :: resolve 1837ms :: artifacts dl 1ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -205,7 +206,7 @@ jar:
[jar] Building jar: /ivy/multi-project/projects/size/build/size.jar
publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#size;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:08 IST 2017
+[ivy:publish] :: delivering :: org.apache.ivy.example#size;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:07 IST 2017
[ivy:publish] delivering ivy file to /ivy/multi-project/projects/size/build/ivy.xml
[ivy:publish] :: publishing :: org.apache.ivy.example#size
[ivy:publish] published size to /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1.part/jars/size.jar
@@ -242,12 +243,12 @@ resolve:
[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/size/1.0-dev-b1/jars/size.jar ...
[ivy:resolve] .. (1kB)
[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#size;1.0-dev-b1!size.jar (2ms)
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#size;1.0-dev-b1!size.jar (1ms)
[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/find/1.0-dev-b1/jars/find.jar ...
[ivy:resolve] .. (3kB)
[ivy:resolve] .. (0kB)
[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#find;1.0-dev-b1!find.jar (2ms)
-[ivy:resolve] :: resolution report :: resolve 3198ms :: artifacts dl 5ms
+[ivy:resolve] :: resolution report :: resolve 2480ms :: artifacts dl 6ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -257,7 +258,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache.ivy.example#sizewhere
[ivy:retrieve] confs: [core, standalone]
-[ivy:retrieve] 6 artifacts copied, 0 already retrieved (795kB/6ms)
+[ivy:retrieve] 6 artifacts copied, 0 already retrieved (795kB/5ms)
compile:
[javac] Compiling 2 source files to /ivy/multi-project/projects/sizewhere/build/classes
@@ -266,7 +267,7 @@ jar:
[jar] Building jar: /ivy/multi-project/projects/sizewhere/build/sizewhere.jar
publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#sizewhere;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:12 IST 2017
+[ivy:publish] :: delivering :: org.apache.ivy.example#sizewhere;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:11 IST 2017
[ivy:publish] delivering ivy file to /ivy/multi-project/projects/sizewhere/build/ivy.xml
[ivy:publish] :: publishing :: org.apache.ivy.example#sizewhere
[ivy:publish] published sizewhere to /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1.part/jars/sizewhere.jar
@@ -305,8 +306,8 @@ resolve:
[ivy:resolve] downloading /ivy/multi-project/repository/shared/org.apache.ivy.example/sizewhere/1.0-dev-b1/jars/sizewhere.jar ...
[ivy:resolve] .. (2kB)
[ivy:resolve] .. (0kB)
-[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#sizewhere;1.0-dev-b1!sizewhere.jar (2ms)
-[ivy:resolve] :: resolution report :: resolve 4611ms :: artifacts dl 7ms
+[ivy:resolve] [SUCCESSFUL ] org.apache.ivy.example#sizewhere;1.0-dev-b1!sizewhere.jar (3ms)
+[ivy:resolve] :: resolution report :: resolve 3486ms :: artifacts dl 6ms
---------------------------------------------------------------------
| | modules || artifacts |
| conf | number| search|dwnlded|evicted|| number|dwnlded|
@@ -315,7 +316,7 @@ resolve:
---------------------------------------------------------------------
[ivy:retrieve] :: retrieving :: org.apache.ivy.example#console
[ivy:retrieve] confs: [default]
-[ivy:retrieve] 7 artifacts copied, 0 already retrieved (798kB/5ms)
+[ivy:retrieve] 7 artifacts copied, 0 already retrieved (798kB/4ms)
compile:
[javac] Compiling 1 source file to /ivy/multi-project/projects/console/build/classes
@@ -324,7 +325,7 @@ jar:
[jar] Building jar: /ivy/multi-project/projects/console/build/console.jar
publish:
-[ivy:publish] :: delivering :: org.apache.ivy.example#console;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 16:50:19 IST 2017
+[ivy:publish] :: delivering :: org.apache.ivy.example#console;working@apache :: 1.0-dev-b1 :: release :: Thu Jun 15 19:40:15 IST 2017
[ivy:publish] delivering ivy file to /ivy/multi-project/projects/console/build/ivy.xml
[ivy:publish] :: publishing :: org.apache.ivy.example#console
[ivy:publish] published console to /ivy/multi-project/repository/shared/org.apache.ivy.example/console/1.0-dev-b1.part/jars/console.jar
@@ -334,4 +335,4 @@ publish:
[echo] project console released with version 1.0-dev-b1
BUILD SUCCESSFUL
-Total time: 46 seconds
+Total time: 42 seconds
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/tutorial/multiproject.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/multiproject.adoc b/asciidoc/tutorial/multiproject.adoc
index 8aa364b..e764c0f 100644
--- a/asciidoc/tutorial/multiproject.adoc
+++ b/asciidoc/tutorial/multiproject.adoc
@@ -48,78 +48,76 @@ The sources for this tutorial can be found in `src/example/multi-project` in the
This is a root build file which can be used to call targets on all modules, in the order of their dependencies (ensuring that a module is always built before any module depending on it, for instance)
* common
-<ul>
-<li>link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/common/common.xml[common.xml]</li> the common build file imported by all build.xml files for each project. This build defines the targets which can be used in all projects.
-<li>link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/common/build.properties[build.properties]</li>some properties common to all projects
-</ul>
- +
+
+ ** link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/common/common.xml[common.xml] the common build file imported by all build.xml files for each project. This build defines the targets which can be used in all projects.
+ ** link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/common/build.properties[build.properties] some properties common to all projects
+
++
* projects +
contains a directory per module, with each containing:
-<ul>
-* ivy.xml +
-Ivy file of the module, describing its dependencies upon other modules and/or external modules.
-Example:
+ ** ivy.xml +
+ Ivy file of the module, describing its dependencies upon other modules and/or external modules.
+ Example:
-[source]
-----
+ [source]
+ ----
-<ivy-module version="1.0">
- <info
- organisation="org.apache.ivy.example"
- module="find"
- status="integration"/>
- <configurations>
- <conf name="core"/>
- <conf name="standalone" extends="core"/>
- </configurations>
- <publications>
- <artifact name="find" type="jar" conf="core" />
- </publications>
- <dependencies>
- <dependency name="version" rev="latest.integration" conf="core->default" />
- <dependency name="list" rev="latest.integration" conf="core" />
- <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="core->default" />
- <dependency org="commons-cli" name="commons-cli" rev="1.0" conf="standalone->default" />
- </dependencies>
-</ivy-module>
+ <ivy-module version="1.0">
+ <info
+ organisation="org.apache.ivy.example"
+ module="find"
+ status="integration"/>
+ <configurations>
+ <conf name="core"/>
+ <conf name="standalone" extends="core"/>
+ </configurations>
+ <publications>
+ <artifact name="find" type="jar" conf="core" />
+ </publications>
+ <dependencies>
+ <dependency name="version" rev="latest.integration" conf="core->default" />
+ <dependency name="list" rev="latest.integration" conf="core" />
+ <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="core->default" />
+ <dependency org="commons-cli" name="commons-cli" rev="1.0" conf="standalone->default" />
+ </dependencies>
+ </ivy-module>
-----
+ ----
-* build.xml +
-The build file of the project, which consists mainly of an import of the common build file and of a module specific properties file:
+ ** build.xml +
+ The build file of the project, which consists mainly of an import of the common build file and of a module specific properties file:
-[source]
-----
+ [source]
+ ----
-<project name="find" default="compile">
- <property file="build.properties"/>
-
- <import file="${common.dir}/common.xml"/>
-</project>
+ <project name="find" default="compile">
+ <property file="build.properties"/>
+
+ <import file="${common.dir}/common.xml"/>
+ </project>
-----
+ ----
-* build.properties +
-Module specific properties + properties to find the common build file
+ ** build.properties +
+ Module specific properties + properties to find the common build file
-[source]
-----
+ [source]
+ ----
-projects.dir = ${basedir}/..
-wkspace.dir = ${projects.dir}/..
-common.dir = ${wkspace.dir}/common
+ projects.dir = ${basedir}/..
+ wkspace.dir = ${projects.dir}/..
+ common.dir = ${wkspace.dir}/common
-----
+ ----
-* src +
- the source directory with all java sources
+ ** src +
+ the source directory with all java sources
-</ul>
Note that this example doesn't demonstrate many good practices for software development in general, in particular you won't find any unit test in these samples, even if we think unit testing is very important. But this isn't the aim of this tutorial.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/88d2e938/asciidoc/use/resolve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resolve.adoc b/asciidoc/use/resolve.adoc
index af20eba..ad2eac7 100644
--- a/asciidoc/use/resolve.adoc
+++ b/asciidoc/use/resolve.adoc
@@ -82,30 +82,26 @@ This table gives some statistics about the dependency resolution. Each line corr
* modules +
-<ul>
-* number +
-This is the total number of dependency modules resolved in this configuration, including transitive ones
+ ** number +
+ This is the total number of dependency modules resolved in this configuration, including transitive ones
-* search +
-This is the number of dependency modules that required a repository access. The repository access is needed if the module is not yet in cache, or if a latest version is required, or in some other cases (depending on checkModified, for instance)
+ ** search +
+ This is the number of dependency modules that required a repository access. The repository access is needed if the module is not yet in cache, or if a latest version is required, or in some other cases (depending on checkModified, for instance)
-* dwnlded +
-This is the number of dependency ivy files downloaded from the repository. This number can be less than the total number of modules even with a clean cache, if no ivy file is provided for some dependencies.
+ ** dwnlded +
+ This is the number of dependency ivy files downloaded from the repository. This number can be less than the total number of modules even with a clean cache, if no ivy file is provided for some dependencies.
-* evicted +
-This is the number of dependency module evicted by conflict managers.
+ ** evicted +
+ This is the number of dependency module evicted by conflict managers.
-<li>artifacts</li>
+* artifacts +
+ ** number +
+ This is the total number of artifacts resolved in the given configuration.
-* number +
-This is the total number of artifacts resolved in the given configuration.
-
-* dwnlded +
-This is the number of artifacts actually downloaded from the repository.
-
-</ul>
+ ** dwnlded +
+ This is the number of artifacts actually downloaded from the repository.
== Inline mode
[15/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/standard-osgi/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/ivysettings.xml b/asciidoc/samples/standard-osgi/ivysettings.xml
new file mode 100644
index 0000000..f5c476c
--- /dev/null
+++ b/asciidoc/samples/standard-osgi/ivysettings.xml
@@ -0,0 +1,34 @@
+<!--
+ 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.
+-->
+<ivysettings>
+
+ <!-- We need to define the Ivy Osgi latest strategy as the default one -->
+ <settings defaultResolver="osgi-bundles" defaultLatestStrategy="latest-osgi" />
+
+ <!-- These are usual cache setup -->
+ <caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true">
+ <cache name="osgi-bundles" basedir="${ivy.settings.dir}/cache/osgi-bundles" />
+ </caches>
+
+ <!-- We just need to define our Ivy Osgi resolver -->
+ <resolvers>
+ <obr name="osgi-bundles" repoXmlFile="${ivy.settings.dir}/../repo/repo.xml" />
+ </resolvers>
+
+</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd b/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
new file mode 100644
index 0000000..8dbe365
--- /dev/null
+++ b/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
@@ -0,0 +1,18 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/target-platform/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/build.xml b/asciidoc/samples/target-platform/build.xml
new file mode 100644
index 0000000..2de015a
--- /dev/null
+++ b/asciidoc/samples/target-platform/build.xml
@@ -0,0 +1,56 @@
+<!--
+ 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.
+-->
+<project name="target-platform" xmlns:ivy="ivy">
+
+ <!-- Load Ivy ant tasks -->
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
+ <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing -->
+ <!-- taskdef rather than the above one -->
+ <!--path id="ivy.classpath">
+ <fileset dir="${basedir}">
+ <include name="ivy.jar" />
+ </fileset>
+ </path>
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /-->
+
+ <target name="update-dependencies" description="Update the dependencies">
+ <ivy:configure file="${basedir}/ivysettings.xml" />
+ <ivy:resolve file="ivy.xml" conf="*" />
+ <ivy:fixdeps tofile="ivy-fixed.xml" />
+ </target>
+
+ <!--
+ Two choices: either the jars stas in the cache, or they are retrive in a dedicated folder
+ Having the bundle retrieved in a folder is helpfull to manage target platforms with the PDE of Eclipse
+ -->
+
+ <target name="generate-target-platform" description="Generate the obr.xml of the target platform">
+ <ivy:configure file="${basedir}/ivysettings.xml" />
+ <ivy:resolve file="ivy-fixed.xml" conf="*" />
+ <ivy:buildobr out="obr.xml" />
+ </target>
+
+ <target name="generate-retrieved-target-platform" description="Generate the obr.xml of the retrieved target platform">
+ <ivy:configure file="${basedir}/ivysettings.xml" />
+ <ivy:resolve file="ivy-fixed.xml" conf="*" />
+ <ivy:retrieve pattern="${basedir}/bundles/[type]s/[artifact]_[revision].[ext]" />
+ <ivy:buildobr basedir="${basedir}/bundles" out="obr.xml" />
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/target-platform/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/ivy.xml b/asciidoc/samples/target-platform/ivy.xml
new file mode 100644
index 0000000..8b83950
--- /dev/null
+++ b/asciidoc/samples/target-platform/ivy.xml
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="com.acme" module="target-platform" />
+ <dependencies>
+ <dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.3.v20130121-145325" />
+ </dependencies>
+</ivy-module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/samples/target-platform/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/ivysettings.xml b/asciidoc/samples/target-platform/ivysettings.xml
new file mode 100644
index 0000000..9697b93
--- /dev/null
+++ b/asciidoc/samples/target-platform/ivysettings.xml
@@ -0,0 +1,33 @@
+<!--
+ 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.
+-->
+<ivysettings>
+
+ <settings defaultResolver="eclipse-juno" defaultLatestStrategy="latest-osgi" />
+
+ <!-- These are usual cache setup -->
+ <caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true">
+ <cache name="eclipse-juno" basedir="${ivy.settings.dir}/cache/eclipse-juno" />
+ </caches>
+
+ <!-- The resolvers from which we will find our bundles -->
+ <resolvers>
+ <updatesite name="eclipse-juno" url="http://download.eclipse.org/releases/juno" cache="eclipse-juno" requirementStrategy="first" />
+ </resolvers>
+
+</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings.adoc b/asciidoc/settings.adoc
new file mode 100644
index 0000000..a3e21d5
--- /dev/null
+++ b/asciidoc/settings.adoc
@@ -0,0 +1,131 @@
+
+In order to work as you want, ivy sometimes needs some settings. Actually, ivy can work with no specific settings at all, see the link:tutorial/defaultconf.html[default settings documentation] for details about that. But ivy is able to work in very different contexts. You just have to configure it properly.
+
+Settings are specified through an xml file, usually called ivysettings.xml. To configure ivy from ant, you just have to use the link:use/settings.html[settings] datatype with the path of your settings file.
+
+Here is an example of the settings file:
+
+[source]
+----
+
+<ivysettings>
+ <properties file="${ivy.settings.dir}/ivysettings-file.properties" />
+ <settings defaultResolver="ibiblio" />
+ <caches defaultCacheDir="${cache.dir}" checkUpToDate="false" />
+ <resolvers>
+ <ibiblio name="ibiblio" />
+ <filesystem name="internal">
+ <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml" />
+ <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]" />
+ </filesystem>
+ </resolvers>
+ <modules>
+ <module organisation="jayasoft" name=".*" resolver="internal" />
+ </modules>
+</ivysettings>
+
+----
+
+
+
+Mainly, the settings enable you to configure the default cache directory used by ivy and the dependency resolvers that it will use to resolve dependencies.
+__Note: To work, this settings file needs a property file named ivysettings-file.properties in the same directory as the settings file, with ivy variables you want in it.__
+
+Some useful variables are available in settings files:
+
+
+* ivy.settings.dir +
+ this variable references the directory in which the ivysettings itself is. This is available if the settings has been loaded as a file. In case of a URL, it takes the part before the last slash of the URL, if any. If the URL has no slash, then this variable is not set.
+
+* ivy.settings.file +
+ the path of the settings file itself if it has been loaded as a file only. If it has been loaded as a URL, this variable is not set
+
+* ivy.settings.url +
+ the URL pointing to the settings file. This is set both when it has been loaded as a file or a URL
+
+
+*__since 1.4__* Note that all link:http://java.sun.com/j2se/1.4.2/docs/api/java/lang/System.html#getProperties()[java system properties] are available as ivy variables in your settings file.
+
+
+== Settings file structure
+
+
+The settings file is structured in some parts and left open in others. Indeed, each resolver has its own structure, thus it's not the settings file itself which defines the structure for the resolvers.
+
+
+[source]
+----
+
+ivysettings
+ link:settings/property.html[property]
+ link:settings/properties.html[properties]
+ link:settings/settings.html[settings]
+ link:settings/include.html[include]
+ link:settings/classpath.html[classpath]
+ link:settings/typedef.html[typedef]
+ link:settings/credentials.html[credentials]
+ link:settings/lock-strategies.html[lock-strategies]
+ link:settings/caches.html[caches]
+ link:settings/caches/cache.html[cache]
+ link:settings/latest-strategies.html[latest-strategies]
+ link:settings/version-matchers.html[version-matchers]
+ link:settings/triggers.html[triggers]
+ link:settings/parsers.html[parsers]
+ link:settings/conflict-managers.html[conflict-managers]
+ link:settings/outputters.html[outputters]
+ link:settings/namespaces.html[namespaces]
+ link:settings/namespace.html[namespace]
+ link:settings/namespace/rule.html[rule]
+ link:settings/namespace/fromtosystem.html[fromsystem]
+ link:settings/namespace/src.html[src]
+ link:settings/namespace/dest.html[dest]
+ link:settings/namespace/fromtosystem.html[tosystem]
+ link:settings/namespace/src.html[src]
+ link:settings/namespace/dest.html[dest]
+ link:settings/macrodef.html[macrodef]
+ link:settings/macrodef/attribute.html[attribute]
+ any resolver
+ link:settings/resolvers.html[resolvers]
+ any resolver
+ link:settings/modules.html[modules]
+ link:settings/module.html[module]
+ link:settings/statuses.html[statuses]
+ link:settings/status.html[status]
+
+----
+
+
+
+
+== ivysettings
+
+*Tag:* ivysettings
+
+Root tag of any ivysettings file.
+
+=== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:settings/property.html[property]|set an ivy variable|0..n
+|link:settings/properties.html[properties]|loads a properties file as ivy variables|0..n
+|link:settings/settings.html[settings]|configures ivy with some defaults|0..1
+|link:settings/include.html[include]|includes another settings file|0..n
+|link:settings/classpath.html[classpath]|add a location in the classpath used to load plugins|0..n
+|link:settings/typedef.html[typedef]|defines new types in ivy|0..n
+|link:settings/lock-strategies.html[lock-strategies]|defines lock strategies|0..1
+|link:settings/caches.html[caches]|defines repository cache managers|0..1
+|link:settings/latest-strategies.html[latest-strategies]|defines latest strategies|0..1
+|link:settings/parsers.html[parsers]|defines module descriptor parsers|0..1
+|link:settings/version-matchers.html[version-matchers]|defines new version matchers|0..1
+|link:settings/triggers.html[triggers]|register triggers on ivy events|0..1
+|link:settings/namespaces.html[namespaces]|defines new namespaces|0..1
+|link:settings/macrodef.html[macrodef]|defines a new macro resolver|0..n
+|link:settings/resolvers.html[resolvers]|defines dependency resolvers|0..1
+|link:settings/conflict-managers.html[conflict-managers]|defines conflicts managers|0..1
+|link:settings/modules.html[modules]|defines rules between modules and dependency resolvers|0..1
+|link:settings/outputters.html[outputters]|defines the list of available report outputters|0..1
+|link:settings/statuses.html[statuses]|defines the list of available statuses|0..1
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/caches.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches.adoc b/asciidoc/settings/caches.adoc
new file mode 100644
index 0000000..791a36a
--- /dev/null
+++ b/asciidoc/settings/caches.adoc
@@ -0,0 +1,64 @@
+
+*Tag:* caches
+
+Configures the Ivy cache system. *__since 2.0__*.
+See link:../concept.html#cache[cache concept] 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.
+
+_defaultCacheDir_ is the default directory used for both the resolution and repository cache(s). It usually points to a directory in your filesystem. If you want to isolate resolution cache from repository cache, we recommend setting both the resolutionCacheDir and repositoryCacheDir attributes on this tag instead of using defaultCacheDir.
+
+Since repository cache implementations are pluggable, you can either define new cache instances based on the default implementation provided in Ivy using the link:../settings/caches/cache.html[cache] child element, or use custom cache implementations using child elements as you have defined using link:../settings/typedef.html[typedef].
+
+_ivyPattern_ and _artifactPattern_ are used to configure the default way Ivy stores ivy files and artifacts in repository cache(s). Usually you do not have to change this, unless you want to use the cache directly from another tool, which is not recommended. These patterns are relative to the repository cache base directory.
+
+_checkUpToDate_ indicates to ivy if it must check date of artifacts before retrieving them (i.e. copying them from
+cache to another place in your filesystem). Usually it is a good thing to check date to avoid unnecessary copy, even if it's most of the time a local copy.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|default|the name of the default cache to use on all resolvers not defining the cache instance to use|No, defaults to a default cache manager instance named 'default-cache'
+|defaultCacheDir|a path to a directory to use as default basedir for both resolution and repository cache(s)|No, defaults to .ivy2/cache in the user's home directory
+|resolutionCacheDir|the path of the directory to use for all resolution cache data|No, defaults to defaultCacheDir
+|repositoryCacheDir|the path of the default directory to use for repository cache data. *This should not point to a directory used as a repository!*|No, defaults to defaultCacheDir
+|ivyPattern|default pattern used to indicate where ivy files should be put in the repository cache(s)|No, defaults to [organisation]/[module]/ivy-[revision].xml
+|artifactPattern|default pattern used to indicate where artifact files should be put in the repository cache(s)|No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]
+|<s>checkUpToDate</s>|Indicates if date should be checked before retrieving artifacts from cache.
+ __Deprecated, we recommend using overwriteMode on the link:../use/retrieve.html[retrieve] task instead__|No, defaults to true
+|useOrigin|the default value to use for useOrigin for caches in which it isn't specifically defined.
+ Use true to avoid the copy of local artifacts to the cache and use directly their original location.|No, defaults to false
+|lockStrategy|the name of the default link:../settings/lock-strategies.html[lock strategy] to use when accessing repository cache(s)|No, defaults to _no-lock_
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:caches/cache.html[cache]|defines a new repository cache instance, based on the default repository cache implementation|0..n
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<caches>
+ <cache name="mycache" basedir="path/to/my/cache/1" />
+ <cache name="mycache2" basedir="path/to/my/cache/2" />
+</caches>
+
+----
+
+Define 2 cache instances, named mycache and mycache2, using two different directories as base directory, and using the default patterns and lock strategies. The default cache instance will still be defined as long as at least one dependency resolver does not declare which cache manager to use.
+
+'''
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/caches/cache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches/cache.adoc b/asciidoc/settings/caches/cache.adoc
new file mode 100644
index 0000000..e88fb61
--- /dev/null
+++ b/asciidoc/settings/caches/cache.adoc
@@ -0,0 +1,65 @@
+
+*Tag:* cache
+
+*__Since 2.0__*.
+
+Defines a repository cache instance based on the default repository cache implementation.
+
+The default repository cache implementation caches files on the local filesystem in subdirectories of a configured base directory.
+
+By default also, the parsed module descriptor read from the cache are kept in a memory cache in case they are reused. This may enhance the performance of multi-module build, provided that all modules are build using the same ivy instance. The size of this memory cache is configurable in term of number of module descriptors. A size of 0 means no memory caching.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|name of the cache instance|Yes
+|basedir|the path of the base directory to use to put repository cache data. *This should not point to a directory used as a repository!*|No, defaults to repositoryCacheDir defined in link:../../settings/caches.html[caches]
+|ivyPattern|the pattern to use to store cached ivy files|No, defaults to default cache ivy pattern as configured in link:../../settings/caches.html[caches]
+|artifactPattern|the pattern to use to store cached artifacts|No, defaults to default cache artifact pattern as configured in link:../../settings/caches.html[caches]
+|useOrigin|true to avoid the copy of local artifacts to the cache and use directly their original location, false otherwise.
+To know if an artifact is local ivy asks to the resolver. Only filesystem resolver is considered local by default, but this can be disabled if you want to force the copy on one filesystem resolver and use the original location on another. Note that it is safe to use useOrigin even if you use the cache for some non local resolvers. In this case the cache will behave as usual, copying files to the cache. Note also that this only applies to artifacts, not to ivy files, which are still copied in the cache.|No. defaults to the default value configured in link:../../settings/caches.html[caches]
+|lockStrategy|the name of the link:../../settings/lock-strategies.html[lock strategy] to use for this cache|No, defaults to default lock strategy as configured in link:../../settings/caches.html[caches]
+|defaultTTL|the default link:../../settings/caches/ttl.html[TTL] to use when no specific one is defined|No, defaults to ${ivy.cache.ttl.default}
+|memorySize|the number of parsed module descriptors to keep in a memory cache.|No, default to 150
+|=======
+
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../../settings/caches/ttl.html[ttl]|defines a TTL rule|0..n
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<cache name="mycache"
+ basedir="/path/to/mycache"
+ ivyPattern="[module]/ivy-[revision].xml"
+ artifactPattern="[module]/[artifact]-[revision].[ext]"
+ lockStrategy="no-lock"
+ defaultTTL="1s">
+ <ttl revision="latest.integration" duration="200ms" />
+ <ttl organisation="org1" duration="10m 20s" />
+ <ttl organisation="org2" duration="5h" />
+ <ttl organisation="org3" duration="2d 12h" />
+</cache>
+
+----
+
+Defines a cache called 'mycache', storing files in the '/path/to/mycache' directory using '[module]/ivy-[revision].xml' as pattern to store Ivy files and '[module]/[artifact]-[revision].[ext]' as pattern to store other artifacts.
+The lock strategy used by this cache is the 'no-lock' strategy, which does not perform any locking.
+The defaultTTL used is of 1s, meaning that by default dynamic revision result will be stored and used for one second. TTL rules then define that all 'latest.integration' revisions will be stored and used for 200ms, while other dynamic revisions from org1 org2 and org3 modules will be stored respectively for 10 minutes 20 seconds; 5 hours; and 2 days and 12 hours.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/caches/ttl.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches/ttl.adoc b/asciidoc/settings/caches/ttl.adoc
new file mode 100644
index 0000000..0ba6d7e
--- /dev/null
+++ b/asciidoc/settings/caches/ttl.adoc
@@ -0,0 +1,40 @@
+
+*Tag:* ttl
+
+*__Since 2.0__* Defines a TTL (Time To Live) rule for resolved revision caching.
+
+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 link:../../use/resolve.html[resolve] in refresh mode.
+
+This tag let you define a rule to define a TTL specific to a set of dynamic revision, based on the whole module revision information (organization, module name, revision, ...). The revision considered in the rule is the revision before the resolution (for instance 'latest.integration') and not the resolved revision (for instance '1.5.1').
+
+The rules are evaluated in order, the first matching rule being used to define the TTL. If no rule matches, the cache defaultTTL will be used.
+
+The format used to specify the TTL is of the form:
+
+[source]
+----
+
+XXd XXh XXm XXs XXXms
+
+----
+
+Where 'd' stands for days, 'h' for hours, 'm' for minutes, 's' for seconds and 'ms' for milliseconds. Any part of the specification can be omitted, so '12d', '2h 5m' and '1d 5ms' are all valid.
+
+The TTL duration can also be set to 'eternal', in which case once resolved the revision is always use, except when resolving in refresh mode.
+
+Using a 0ms TTL disable resolved revision caching for the given rule.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the organisation to match to apply the rule.|No, defaults to *
+|module|the module's name to match to apply the rule.|No, defaults to *
+|revision|the module's revision to match to apply the rule. Note that the version is not resolved when evaluating the rule ('latest.integration' for instance).|No, defaults to *
+|_any extra attribute_|an extra attribute to match to apply the rule.|No, defaults to *
+|matcher|the link:../../concept.html#matcher[matcher] to use to match the modules to which the resolver should be applied|No, defaults to exact
+|duration|the TTL to apply (see above for format)|Yes
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/classpath.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/classpath.adoc b/asciidoc/settings/classpath.adoc
new file mode 100644
index 0000000..18953ef
--- /dev/null
+++ b/asciidoc/settings/classpath.adoc
@@ -0,0 +1,55 @@
+
+*Tag:* classpath
+
+Includes a jar in the classpath used to load plugins. *__since 1.4__*
+
+This let you add ivy plugins without relying on an external classpath (the ant classpath for instance), therefore easing the use of ivy in multiple execution environments (ant, standalone, IDE plugins, ...).
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|url|the url of a jar to add to the classpath|Yes, unless file is specified
+|file|a jar to add to the classpath|Yes, unless url is specified
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivysettings>
+ <classpath file="${ivy.settings.dir}/custom-resolver.jar"/>
+ <typedef name="custom" classname="org.apache.ivy.resolver.CustomResolver"/>
+ <resolvers>
+ <custom name="custom"/>
+ </resolvers>
+</ivysettings>
+
+----
+
+Adds the custom-resolver.jar (found in the same directory as the ivysettings.xml file) to the classpath, then defines a custom resolver and uses it.
+
+
+'''
+
+
+[source]
+----
+
+<ivysettings>
+ <classpath url="http://www.myserver.com/ivy/custom-resolver.jar"/>
+ <typedef name="custom" classname="org.apache.ivy.resolver.CustomResolver"/>
+ <resolvers>
+ <custom name="custom"/>
+ </resolvers>
+</ivysettings>
+
+----
+
+Same as above, but finds the jar on a web server.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/conflict-managers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/conflict-managers.adoc b/asciidoc/settings/conflict-managers.adoc
new file mode 100644
index 0000000..c745119
--- /dev/null
+++ b/asciidoc/settings/conflict-managers.adoc
@@ -0,0 +1,61 @@
+
+*Tag:* conflict-managers
+
+Defines a list of link:../concept.html#conflict[conflicts managers] usable in Ivy. Each conflict manager is identified by its name, given as an attribute.
+The child tag used for the conflict manager must be equal to a name of a conflict manager type (either built-in or added with the typedef tag).
+
+Here is a list of built-in conflicts managers (which do not require anything in the configuration file):
+
+
+* all +
+ this conflicts manager resolve conflicts by selecting all revisions. Also called the NoConflictManager, it doesn't evict any modules.
+
+* latest-time +
+ this conflict manager selects only the 'latest' revision, latest being defined as the latest in time. Note that latest in time is costly to compute, so prefer latest-revision if you can.
+
+* latest-revision +
+ this conflict manager selects only the 'latest' revision, latest being defined by a string comparison of revisions.
+
+* latest-compatible +
+ this conflict manager selects the latest version in the conflicts which can result in a compatible set of dependencies. This means that in the end, this conflict manager does not allow any conflicts (similar to the strict conflict manager), except that it follows a best effort strategy to try to find a set of compatible modules (according to the version constraints)
+
+* strict +
+ this conflict manager throws an exception (i.e. causes a build failure) whenever a conflict is found.
+
+The two "latest" conflict managers also take into account the force attribute of the dependencies.
+Indeed direct dependencies can declare a force attribute (see link:../ivyfile/dependency.html[dependency]), which indicates that the revision given in the direct dependency should be preferred over indirect dependencies.
+
+Here is a list of conflict manager types available, which can be used to define your own custom conflict managers:
+
+
+* latest-cm +
+The latest conflict manager uses a latest strategy to select the latest revision among several ones. Both latest-time and latest-revision conflict managers are based on this conflict manager type. It takes 'latest' as attribute to define which latest strategy should be used. Example:
+
+[source]
+----
+<latest-cm name="mylatest-conflict-manager" latest="my-latest-strategy"/>
+----
+
+
+* compatible-cm +
+The latest compatible conflict manager uses a latest strategy to select the latest revision among several ones. It takes 'latest' as an attribute to define which latest strategy should be used. Example:
+
+[source]
+----
+<compatible-cm name="my-latest-compatible-conflict-manager" latest="my-latest-strategy"/>
+----
+
+
+* regexp-cm +
+This conflict manager is based on a regular expression and throws an exception (i.e. causes a build failure) when a conflict is found with versions with different matching group. For instance if a conflict is found between 1.2.x and 1.3.y it will throw an exception if the regular expression is (.*)\.\d, because the matching group will match different strings (1.2 and 1.3). 1.2.1 and 1.2.2 won't throw an exception with the same regular expression. The regular expression is set using the 'regexp' attribute. A 'ignoreNonMatching' attribute can also be set to simply warn when a version is found which does not match the regular expression, instead of throwing an exception.
+
+
+
+==== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any conflict manager|adds a conflict manager to the list of available conflict managers|0..n
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/credentials.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/credentials.adoc b/asciidoc/settings/credentials.adoc
new file mode 100644
index 0000000..a39b452
--- /dev/null
+++ b/asciidoc/settings/credentials.adoc
@@ -0,0 +1,18 @@
+
+*Tag:* credentials
+
+Configures HTTP authentication credentials. *__since 2.0__*.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|host|the name of the host|Yes
+|realm|the name of the realm|No
+|username|the username|Yes
+|passwd|the password|Yes
+|=======
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/include.adoc b/asciidoc/settings/include.adoc
new file mode 100644
index 0000000..0deebcb
--- /dev/null
+++ b/asciidoc/settings/include.adoc
@@ -0,0 +1,73 @@
+
+*Tag:* include
+
+Includes another ivysettings file as if it were part of this one. *__since 1.3__*
+
+The included ivysettings file has to be a complete well formed ivysettings file, i.e. it does have to include the
+[source]
+----
+<ivysettings>
+----
+
+tag.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|url|a URL to the ivysettings file to include|Yes, unless file is specified
+|file|a path to the ivysettings file to include|Yes, unless url is specified
+|optional|indicates whether Ivy should throw an error if the specified file doesn't exist. *__(Since 2.4)__*.|No, default to false
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivysettings>
+ <property name="myrepository" value="path/to/my/real/rep"/>
+ <settings defaultResolver="default"/>
+ <include file="path/to/ivysettings-default.xml"/>
+</ivysettings>
+
+----
+
+with ivysettings-default.xml:
+
+[source]
+----
+
+<ivysettings>
+ <property name="myrepository" value="path/to/rep" overwrite="false"/>
+ <resolvers>
+ <ivyrep name="default" ivyroot="${myrepository}"/>
+ </resolvers>
+</ivysettings>
+
+----
+
+The included ivysettings defines a resolver named default, which is an ivyrep resolver, with its root configured as being the value of myrepository variable. This variable is given the value path/to/rep in the included file, but because the attribute overwrite is set to false, it will not override the value given in the main ivysettings including this one, so the value used for myrepository will be path/to/my/real/rep.
+
+'''
+
+
+[source]
+----
+
+<ivysettings>
+ <include file="ivysettings-macro.xml"/>
+ <resolvers>
+ <mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
+ </resolvers>
+</ivysettings>
+
+----
+
+with ivysettings-macro.xml being the ivysettings example given on the link:../settings/macrodef.html[macrodef documentation page].
+This lets us easily reuse the custom macro resolver.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/latest-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/latest-strategies.adoc b/asciidoc/settings/latest-strategies.adoc
new file mode 100644
index 0000000..c514047
--- /dev/null
+++ b/asciidoc/settings/latest-strategies.adoc
@@ -0,0 +1,80 @@
+
+*Tag:* latest-strategies
+
+Defines a list of link:../concept.html#latest[latest strategies] usable in Ivy. Each latest strategy is identified by its name, given as an attribute.
+The child tag used for the latest strategy must be equal to a name of a latest strategy type (usually added with the typedef tag).
+
+The latest strategies which are included in Ivy by default are:
+
+
+* latest-time +
+ compares the revisions date to know which is the latest. While this is often a good strategy in terms of pertinence, it's drawback is that it can be slow when dealing with remote repositories. If you use ivyrep,
+for example, Ivy has to ask the http server for the date of each ivy file before knowing which is the latest.
+
+* latest-revision +
+ compares the revisions as strings, using an algorithm close to the one used in php's version_compare function.
+This algorithm takes into account the special meaning of some text. For instance, with this strategy, 1.0-dev1 is considered before 1.0-alpha1, which in turn is before 1.0-rc1, which is before 1.0, which is before 1.0.1.
+
+* latest-lexico +
+ compares the revisions as strings, using lexicographic order (the one used by java string comparison).
+
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any latest strategy|adds a latest strategy to the list of available strategies|0..n
+|=======
+
+
+
+== latest-revision
+
+*__since 1.4__* The latest-revision can now be configured to handle more words with special meanings than the one defined in php version_compare function.
+
+Here is an example of how you can do so:
+
+[source]
+----
+
+<latest-strategies>
+ <latest-revision name="mylatest-revision">
+ <specialMeaning name="PRE" value="-2"/>
+ <specialMeaning name="QA" value="4"/>
+ <specialMeaning name="PROD" value="5"/>
+ </latest-revision>
+</latest-strategies>
+
+----
+
+Knowing that the default "special meaning" words are the following:
+
+[source]
+----
+
+ <specialMeaning name="dev" value="-1"/>
+ <specialMeaning name="rc" value="1"/>
+ <specialMeaning name="final" value="2"/>
+
+----
+
+You can even remove or redefine the default special meanings by setting usedefaultspecialmeanings="false" on the latest-revision tag.
+Example:
+
+[source]
+----
+
+<latest-strategies>
+ <latest-revision name="mylatest-revision" usedefaultspecialmeanings="false">
+ <specialMeaning name="pre" value="-2"/>
+ <specialMeaning name="m" value="1"/>
+ <specialMeaning name="rc" value="2"/>
+ <specialMeaning name="prod" value="3"/>
+ </latest-revision>
+</latest-strategies>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/lock-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/lock-strategies.adoc b/asciidoc/settings/lock-strategies.adoc
new file mode 100644
index 0000000..c53a0d8
--- /dev/null
+++ b/asciidoc/settings/lock-strategies.adoc
@@ -0,0 +1,34 @@
+
+*Tag:* lock-strategies *__since 2.0__*
+
+Defines a list of lock strategies usable in Ivy.
+
+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).
+
+The following strategies are registered by default:
+
+
+* *no-lock* +
+ This lock strategy actually performs no locking at all, and thus should not be used in an environment where the cache is shared by multiple processes.
+
+
+* *artifact-lock* +
+ This strategy acquires a lock whenever a module descriptor or an artifact is downloaded to the cache, which makes a good solution when you want to share your repository cache.
+Note that this strategy is based on file locking, performed by default using the java.io.File.createNewFile() atomicity (which is documented as atomic in the javadoc, but not recommended to perform locks).
+
+
+* *artifact-lock-nio (*__since 2.4__*)* +
+ Like the __artifact-lock__-strategy, this one also acquires a lock whenever a module descriptor or artifact is downloaded to the cache. But here the implementation is done with a java.nio.FileLock.
+
+
+The child tag used for the lock strategy must be equal to a name of a lock strategy type (added with the typedef tag).
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any lock strategy|adds a lock strategy to the list of available ones|0..n
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/macrodef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef.adoc b/asciidoc/settings/macrodef.adoc
new file mode 100644
index 0000000..2804d25
--- /dev/null
+++ b/asciidoc/settings/macrodef.adoc
@@ -0,0 +1,158 @@
+
+*Tag:* macrodef
+
+Defines a new dependency resolver type based upon another. This definition is very similar to the macrodef feature of ant for defining macro tasks. *__since 1.3__*
+
+This task eases the process of creating a new dependency resolver, because it avoids writing java code.
+
+It is generally used in combination with the link:../settings/include.html[include] feature to help reuse a macro in multiple settings files.
+
+A macro is defined by declaring an existing resolver within it. Then you can use attributes to pass parameters to the newly defined resolver type. Attributes are defined with a name, and optionally a default value, and are used using the following syntax:
+
+[source]
+----
+@{attributename}
+----
+
+
+=== Resolvers names
+
+Since you can use the same macro several times it can define several resolvers (in a chain for instance), the resolver names need to be chosen carefully to avoid name conflicts (each resolver must have a unique name).
+
+Here is how Ivy deals with the names of the resolvers defined in a macro:
+
+
+* 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 +
+
+* 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 +
+
+* 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. +
+
+
+Example:
+
+[source]
+----
+
+<ivysettings>
+ <macrodef name="mymacro">
+ <chain>
+ <ibiblio name="ex1" />
+ <ibiblio name="ex2.@{name}" m2compatible="true" />
+ </chain>
+ </macrodef>
+
+ <resolvers>
+ <mymacro name="default" />
+ <mymacro name="other" />
+ </resolvers>
+</ivysettings>
+
+----
+
+This is equivalent to:
+
+[source]
+----
+
+<ivysettings>
+ <resolvers>
+ <chain name="default">
+ <ibiblio name="default-ex1" />
+ <ibiblio name="ex2.default" m2compatible="true" />
+ </chain>
+ <chain name="other">
+ <ibiblio name="other-ex1" />
+ <ibiblio name="ex2.other" m2compatible="true" />
+ </chain>
+ </resolvers>
+</ivysettings>
+
+----
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|name of the resover type created|Yes
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../settings/macrodef/attribute.html[attribute]|defines an attribute for the macro resolver|0..n
+|any resolver|defines the base resolver upon which this macro is defined|1
+|=======
+
+
+== Examples
+
+Defining a simple macro:
+
+[source]
+----
+
+ <macrodef name="mymacro">
+ <attribute name="mymainrep"/>
+ <filesystem name="fs1">
+ <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </macrodef>
+
+----
+
+Using it:
+
+[source]
+----
+
+ <resolvers>
+ <mymacro name="default" mymainrep="path/to/myrep"/>
+ </resolvers>
+
+----
+
+
+'''
+
+A complete example:
+
+[source]
+----
+
+<ivysettings>
+ <macrodef name="mymacro">
+ <attribute name="mymainrep"/>
+ <attribute name="mysecondrep"/>
+ <attribute name="myseconddirlayout" default="[organisation]/[module]/[type]s"/>
+ <chain>
+ <filesystem name="fs1">
+ <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ <filesystem name="fs2" latest="latest-time">
+ <ivy pattern="@{mysecondrep}/@{myseconddirlayout}/ivy-[revision].xml"/>
+ <artifact pattern="@{mysecondrep}/@{myseconddirlayout}/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </chain>
+ </macrodef>
+
+ <resolvers>
+ <mymacro name="default" mymainrep="path/to/myrep" mysecondrep="path/to/secondrep"/>
+ <mymacro name="other"
+ mymainrep="path/to/myrep"
+ mysecondrep="path/to/secondrep"
+ myseconddirlayout="[module]/[type]s"/>
+ </resolvers>
+</ivysettings>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/macrodef/attribute.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef/attribute.adoc b/asciidoc/settings/macrodef/attribute.adoc
new file mode 100644
index 0000000..fca0465
--- /dev/null
+++ b/asciidoc/settings/macrodef/attribute.adoc
@@ -0,0 +1,18 @@
+
+*Tag:* attribute
+
+Defines a macrodef attribute. See macrodef for details.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the attribute|Yes
+|default|the default value of the attribute if none is specified|No, by default attribute are required
+|=======
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/module.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/module.adoc b/asciidoc/settings/module.adoc
new file mode 100644
index 0000000..0cd7b5e
--- /dev/null
+++ b/asciidoc/settings/module.adoc
@@ -0,0 +1,109 @@
+
+*Tag:* 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.
+
+The revision and extra attributes are only used for rules defining the resolver to use. For other settings, use only organisation and module name.
+
+It also gives the specific setting to use for this module set.
+
+For each module set, you can configure:
+
+
+* the link:../settings/resolvers.html[resolver] to use +
+
+* the link:../settings/conflict-managers.html[conflict manager] to use +
+
+* the default link:../terminology.html#branch[branch] to use +
+
+* the link:../use/resolve.html[resolve mode] to use +
+
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the organisation to match to apply the rule.|No, defaults to *
+|name|the module's name to match to apply the rule.|No, defaults to *
+|revision|the module's revision to match to apply the rule. Note that the version may not be resolved yet (be latest.integration for instance), so be very careful when using this attribute. *__since 2.0__*|No, defaults to *
+|_any extra attribute_|an extra attribute to match to apply the rule. *__since 2.0__*|No, defaults to *
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules to which the resolver should be applied *__since 1.3__*|No, defaults to exactOrRegexp
+|resolver|the name of the resolver to apply. The resolver must have been defined in the resolvers section of the configuration file.|No
+|conflict-manager|the name of the conflict manager to apply. *__since 1.4__*|No
+|branch|the default branch to apply. *__since 1.4__*|No
+|resolveMode|the resolve mode to use. *__since 2.0__*|No
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<modules>
+ <module organisation="apache" name="*" resolver="myprojectsresolver"/>
+</modules>
+
+----
+
+Uses myprojectresolver for all modules from __apache__.
+
+'''
+
+
+[source]
+----
+
+<modules>
+ <module organisation="apache" name="commons-*" matcher="glob" resolver="myapachecommonsresolver"/>
+</modules>
+
+----
+
+Uses myapachecommonsresolver for all modules beginning with 'commons-' from 'apache'.
+
+'''
+
+
+[source]
+----
+
+<modules>
+ <module organisation="apache" name="commons-[a-z]+" myextra="val.*" matcher="regexp" resolver="myapachecommonsresolver"/>
+</modules>
+
+----
+
+Uses myapachecommonsresolver for all modules from __apache__ beginning with 'commons-' followed by any number of alphabetic lowercase characters, and with the extra attribute 'myextra' having a value beginning with 'val.'.
+
+'''
+
+
+[source]
+----
+
+<modules>
+ <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
+</modules>
+
+----
+
+Uses latest-time conflict manager for all modules from __apache__ whose name begins with 'ivy'.
+
+'''
+
+
+[source]
+----
+
+<modules>
+ <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/>
+</modules>
+
+----
+
+Uses 'fix-103' as default branch for all modules from __apache__ whose name begins with 'ivy'.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/modules.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/modules.adoc b/asciidoc/settings/modules.adoc
new file mode 100644
index 0000000..58f1141
--- /dev/null
+++ b/asciidoc/settings/modules.adoc
@@ -0,0 +1,23 @@
+
+*Tag:* modules
+
+Defines per module or module set settings.
+
+The rules are given by defining a module set, using a pattern for module organisation and name, and giving some settings for the set, like the name of the corresponding resolver to use.
+
+If no rules match a given module, the default setting will be used.
+
+Note: You can greatly improve the performance of dependency resolution by configuring multiple smaller resolvers instead of one large resolver (i.e. chain). For instance, if you have a local repository for your modules and a remote repository for third party libraries, it is a good idea to have two separate resolvers, one for all of your modules and another for the rest (the default one).
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../settings/module.html[module]|defines a module set rule|1..n
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/namespace.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace.adoc b/asciidoc/settings/namespace.adoc
new file mode 100644
index 0000000..0f5e7e1
--- /dev/null
+++ b/asciidoc/settings/namespace.adoc
@@ -0,0 +1,111 @@
+
+*Tag:* namespace
+
+Defines a new namespace. A namespace is identified by a name, which can be referenced by one of the link:../settings/resolvers.html[resolvers].
+
+An overview of Namespaces is given in the link:../settings/namespaces.html[namespaces] documentation.
+
+A namespace mainly consists of a list of rules, each rule defining a translation between a system namespace and the defined namespace, and vice versa.
+
+There are two main possibilities for using these rules. By default, a namespace iterates through the rules, and when it finds one that translates the given name, it returns the translated name. But the namespace can be configured to use the list as a translator chain: in this case, all rules are applied in order, the result of the first rule translation being passed to the second, and so on.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the namespace name|Yes
+|chainrules|true to indicate that namespaces rules should be chained, false otherwise|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../settings/namespace/rule.html[rule]|defines a new namespace rule|0..n
+|=======
+
+
+== Example
+
+
+[source]
+----
+
+<namespace name="test">
+ <rule>
+ <fromsystem>
+ <src org="systemorg"/>
+ <dest org="A"/>
+ </fromsystem>
+ <tosystem>
+ <src org="A"/>
+ <dest org="systemorg"/>
+ </tosystem>
+ </rule>
+</namespace>
+
+----
+
+
+[source]
+----
+
+<namespace name="test">
+ <rule>
+ <fromsystem>
+ <src org="systemorg2" module="system\-(.+)"/>
+ <dest org="B" module="$m1"/>
+ </fromsystem>
+ <tosystem>
+ <src org="B" module=".+"/>
+ <dest org="systemorg2" module="system-$m0"/>
+ </tosystem>
+ </rule>
+</namespace>
+
+----
+
+
+[source]
+----
+
+<namespace name="test" chainrules="true">
+ <rule>
+ <fromsystem>
+ <src org="systemorg"/>
+ <dest org="A"/>
+ </fromsystem>
+ <tosystem>
+ <src org="A"/>
+ <dest org="systemorg"/>
+ </tosystem>
+ </rule>
+ <rule>
+ <fromsystem>
+ <src module="systemmod"/>
+ <dest module="A"/>
+ </fromsystem>
+ <tosystem>
+ <src module="A"/>
+ <dest module="systemmod"/>
+ </tosystem>
+ </rule>
+ <rule>
+ <fromsystem>
+ <src module="systemmod2"/>
+ <dest module="B"/>
+ </fromsystem>
+ <tosystem>
+ <src module="B"/>
+ <dest module="systemmod2"/>
+ </tosystem>
+ </rule>
+</namespace>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/namespace/dest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/dest.adoc b/asciidoc/settings/namespace/dest.adoc
new file mode 100644
index 0000000..c185c42
--- /dev/null
+++ b/asciidoc/settings/namespace/dest.adoc
@@ -0,0 +1,43 @@
+
+*Tag:* dest
+
+Defines the translation part of a translation rule. If a name has matched a corresponding src, it will be translated using this dest part.
+
+The new names can contain references to groups of the matched name, using a slightly modified regexp syntax. Indeed, referenced groups can be part of either the organisation, module or revision part of the original name. So, to reference the groups, you just have to add a letter identifying the part in which the group should be selected: o for organisation, m for module, and r for revision.
+
+For instance, $o0 matches the whole matched organisation, and $m0 the whole matched module name. $o1 matches the first group of the matched organisation.
+
+For details about regexp and groups, see the link:http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html[Pattern class documentation] in the jdk.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the new organisation name|No, defaults to $o0
+|module|the new module name|No, defaults to $m0
+|rev|the new revision|No, defaults to $r0
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+ <fromsystem>
+ <src org="systemorg2" module="system\-(.+)"/>
+ <dest org="B" module="$m1"/>
+ </fromsystem>
+
+----
+
+Matches modules from systemorg2 which have a name beginning with system followed by a minus and anything else, and translate it to organisation B and module the part following
+[source]
+----
+system-
+----
+
+of the original name.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/namespace/fromtosystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/fromtosystem.adoc b/asciidoc/settings/namespace/fromtosystem.adoc
new file mode 100644
index 0000000..511e5fd
--- /dev/null
+++ b/asciidoc/settings/namespace/fromtosystem.adoc
@@ -0,0 +1,17 @@
+
+*Tag:* fromsystem / tosystem
+
+Defines a one way translation rule, i.e. a translation from system namespace to the defined namespace or vice versa.
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../../settings/namespace/src.html[src]|defines a source name which can be accepted|1..n
+|link:../../settings/namespace/dest.html[dest]|defines the translation to apply when a name is accepted by an src pattern|1
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/namespace/rule.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/rule.adoc b/asciidoc/settings/namespace/rule.adoc
new file mode 100644
index 0000000..5d69a7d
--- /dev/null
+++ b/asciidoc/settings/namespace/rule.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* rule
+
+Defines a new namespace rule. A rule defines a translation between system namespace and the defined namespace, and vice versa.
+
+See the link:../../settings/namespace.html[namespace] doc for details.
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../../settings/namespace/fromtosystem.html[fromsystem]|defines the translation to apply from the system namespace to the defined namespace|1
+|link:../../settings/namespace/fromtosystem.html[tosystem]|defines the translation to apply from the defined namespace to the system namespace|1
+|=======
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/namespace/src.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/src.adoc b/asciidoc/settings/namespace/src.adoc
new file mode 100644
index 0000000..fadb799
--- /dev/null
+++ b/asciidoc/settings/namespace/src.adoc
@@ -0,0 +1,18 @@
+
+*Tag:* src
+
+Defines the acceptation part of a translation rule. If a name matches this src, it will be translated using the dest part.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the organisation to match as a regexp|No, defaults to .*
+|module|the module name to match as a regexp|No, defaults to .*
+|rev|the revision to match as a regexp|No, defaults to .*
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/namespaces.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespaces.adoc b/asciidoc/settings/namespaces.adoc
new file mode 100644
index 0000000..650ca67
--- /dev/null
+++ b/asciidoc/settings/namespaces.adoc
@@ -0,0 +1,30 @@
+
+*Tag:* 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.
+
+For instance, if you want to use both a maven2 repository and an ivyrep, 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, their organisation is same as the module.
+
+So if you try to use both maven2 and ivyrep repositories, you will face some issues like:
+<quote>
+How do I declare a dependency on commons-lang?
+I have an error while trying to resolve module xxx. It says that it depends on [commons-httpclient commons-httpclient] and that it isn't available.
+...
+</quote>
+
+Ivy's answer to this issue is called namespaces. In short, you can attach a namespace to each dependency resolver in Ivy, and each namespace defines rules to convert names from the system namespace to the defined namespace itself, and vice versa.
+
+This very powerful feature is thoroughly used in the link:../tutorial/build-repository/advanced.html[build your own repository tutorial], so is the best place to see an example of what can be done with namespaces.
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../settings/namespace.html[namespace]|defines a new namespace|0..n
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/outputters.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/outputters.adoc b/asciidoc/settings/outputters.adoc
new file mode 100644
index 0000000..3529b01
--- /dev/null
+++ b/asciidoc/settings/outputters.adoc
@@ -0,0 +1,43 @@
+
+*Tag:* outputters
+
+Defines a list of report outputters usable in ivy.
+
+A report outputter is used at the end of the resolve process to generate a report of how the resolve has been performed.
+
+Two report outputters are registered by default:
+
+
+* a log report outputter (link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/plugins/report/LogReportOutputter.java[LogReportOutputter]) +
+which produces the output on the console at the end of the resolve, which looks like this:
+
+[source]
+----
+
+ ---------------------------------------------------------------------
+ | | modules || artifacts |
+ | conf | number| search|dwnlded|evicted|| number|dwnlded|
+ ---------------------------------------------------------------------
+ | default | 1 | 1 | 0 | 0 || 1 | 1 |
+ ---------------------------------------------------------------------
+
+----
+
+
+* an xml report outputter (link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/plugins/report/XmlReportOutputter.java[XmlReportOutputter]) +
+which produces an xml report in the cache, which is mandatory for correct Ivy behaviour, since it's that report which is used when you do a post resolve step in a separate build from the resolve itself. It's also this xml report which is processed to generate all the different reports available in the link:../use/report.html[report] task.
+
+
+The child tag used for the parser must be equal to a name of a report outputter type (added with the typedef tag).
+
+To see how to define your own report outputter see link:../extend.html[Extending Ivy documentation]
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any report outputter|adds a report outputter to the list of available ones|0..n
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/parsers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/parsers.adoc b/asciidoc/settings/parsers.adoc
new file mode 100644
index 0000000..40cbb89
--- /dev/null
+++ b/asciidoc/settings/parsers.adoc
@@ -0,0 +1,29 @@
+
+*Tag:* parsers
+
+Defines a list of module descriptor parsers usable in ivy. 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.
+
+Two parsers are available by default and thus do not need to be declared in this section:
+
+
+* ivy file parser +
+ this is the parser used for ivy xml files. This parser is used for resources that aren't accepted by any other parser.
+
+* pom parser +
+this parser is able to parse maven2 pom files
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any module descriptor parser|adds a module descriptor parser to the list of available parsers|0..n
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/properties.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/properties.adoc b/asciidoc/settings/properties.adoc
new file mode 100644
index 0000000..da14804
--- /dev/null
+++ b/asciidoc/settings/properties.adoc
@@ -0,0 +1,24 @@
+
+*Tag:* properties
+
+
+
+Loads a properties file into ivy variables. See the variables chapter above for details about ivy variables.
+
+*__Since 2.0__*: 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.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|file|a path to a properties file to load|One of these
+|environment|the prefix to use when retrieving environment variables *__(since 2.0)__*
+|override|indicates if the variable found in the properties file should override its previous value, if any *__(since 1.3)__*|No, defaults to true
+|=======
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/property.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/property.adoc b/asciidoc/settings/property.adoc
new file mode 100644
index 0000000..5df7361
--- /dev/null
+++ b/asciidoc/settings/property.adoc
@@ -0,0 +1,58 @@
+
+*Tag:* property
+
+Defines an ivy variable. *__since 1.3__*
+
+The optional override attribute enables you to avoid overriding the previous value of the variable, which makes the definition behave like an ant property, which is particularly useful to define default values (values which are used only if they haven't been defined yet).
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the variable to define|Yes
+|value|the new value the variable must take|Yes
+|override|true if the previous value (if any) of the variable should overriden, false otherwise|No, defaults to true
+|ifset|the variable will be set only if the provided 'ifset' variable is already set (Since 2.4)|No
+|unlessset|the variable will not be set unless the provided 'unlessset' variable is set (Since 2.4)|No
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<property name="myvar" value="myvalue"/>
+
+----
+
+Sets the variable myvar to the value myvalue.
+
+'''
+
+
+[source]
+----
+
+<property name="myvar" value="myvalue" override="false"/>
+
+----
+
+Sets the variable myvar to the value myvalue only if myvar has not been set yet.
+
+'''
+
+
+[source]
+----
+
+ <properties environment="env"/>
+ <property name="ivy.repos.server" value="${env.IVY_SERVER}" override="false" ifset="env.IVY_SERVER" />
+ <property name="ivy.repos.server" value="http://ivy:8081" override="false"/>
+
+----
+
+If the environment variable is set, it takes precedence over of default value.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/resolvers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/resolvers.adoc b/asciidoc/settings/resolvers.adoc
new file mode 100644
index 0000000..cdcf96f
--- /dev/null
+++ b/asciidoc/settings/resolvers.adoc
@@ -0,0 +1,146 @@
+
+*Tag:* resolvers
+
+Defines a list of dependency resolvers usable in ivy. 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).
+
+*__since 1.3__* Once defined, resolvers can be referenced by their name, using the following syntax:
+
+[source]
+----
+
+<resolver ref="alreadydefinedresolver"/>
+
+----
+
+Note that this works only if the resolver has already been defined and NOT if it is defined later in the ivysettings file.
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any resolver|adds a resolver to the list of available resolvers|1..n
+|=======
+
+
+
+== Built-in Resolvers
+
+Ivy comes with a set of built-in dependency resolvers that handle most common needs.
+
+If you don't find the one you want here, you can also check if someone has contributed it on the links page, or even link:../extend.html[write your own].
+
+There are basically two types of resolvers in Ivy: composite and standard. A composite resolver is a resolver which delegates the work to other resolvers. The other resolvers are standard resolvers.
+
+Here is the list of built-in resolvers:
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Name|Type|Description
+|link:../resolver/ivyrep.html[IvyRep]|Standard|Finds ivy files on ivyrep and artifacts on ibiblio.
+|link:../resolver/ibiblio.html[IBiblio]|Standard|Finds artifacts on ibiblio.
+|link:../resolver/packager.html[Packager]|Standard|Finds ivy files and packaging instructions via URLs, then creates artifacts by following the instructions.
+|link:../resolver/filesystem.html[FileSystem]|Standard|This very performant resolver finds ivy files and artifacts in your file system.
+|link:../resolver/url.html[Url]|Standard|Finds ivy files and artifacts in any repository accessible with urls.
+|link:../resolver/vfs.html[Vfs]|Standard|Finds ivy files and artifacts in any repository accessible with link:http://jakarta.apache.org/commons/vfs/[apache commons vfs].
+|link:../resolver/ssh.html[ssh]|Standard|Finds ivy files and artifacts in any repository accessible with ssh.
+|link:../resolver/sftp.html[sftp]|Standard|Finds ivy files and artifacts in any repository accessible with sftp.
+|link:../resolver/jar.html[Jar]|Standard|Finds ivy files and artifacts within a specified jar.
+|link:../resolver/chain.html[Chain]|Composite|Delegates the finding to a chain of sub resolvers.
+|link:../resolver/dual.html[Dual]|Composite|Delegates the finding of ivy files to one resolver and of artifacts to another.
+|link:../resolver/obr.html[OBR]|Standard|Resolve modules as OSGi bundles listed by an OSGi obr.xml.
+|link:../resolver/updatesite.html[Eclipse updatesite]|Standard|Resolve modules as OSGi bundles which are hosted on an Eclipse update site.
+|=======
+
+
+
+== [[common]]Common features and attributes
+
+All resolvers of the same type share some common features and attributes detailed here.
+
+=== Features
+
+
+==== validation
+
+All standard resolvers support several options for validation.
+
+The __validate__ attribute is used to configure if ivy files should be checked against the ivy file xml schema.
+
+The checkconsistency attribute allows you to enable or disable consistency checking between what is expected by Ivy when it finds a module descriptor, and what the module descriptor actually contains.
+
+The descriptor attribute lets you define if module descriptors are mandatory or optional.
+
+The checksums attribute is used to define the list of checksums files to use to check if the content of downloaded files has not been corrupted (eg during transfer).
+
+==== force
+
+Any standard resolver can be used in force mode, which is used mainly to handle local development builds. In force mode, the resolver attempts to find a dependency whatever the requested revision is (internally it replace the requested revision by 'latest.integration'), and if it finds one, it forces this revision to be returned, even when used in a chain with returnFirst=false.
+
+By using such a resolver at the beginning of a chain, you can be sure that Ivy will pick up whatever module is available in this resolver (usually a private local build) instead of the real requested revision. This allows to handle use case like a developer working on modules A and C, where A -> B -> C, and pick up the local build for C without having to publish a local version of B.
+*__since 2.0__*
+
+
+==== Maven
+
+
+Any resolver which is able to parse a Maven pom.xml file has to detect the related sources or javadocs artifacts. This often involves sevrals network connection even if neither the sources nor the javadoc are requested to be downloaded.
+
+*__since 2.5__* Setting the property `ivy.maven.lookup.sources<tt> to <tt>false` disable the lookup of the sources artifact.
+And setting the property `ivy.maven.lookup.javadoc<tt> to <tt>false` disable the lookup of the javadoc artifact.
+
+
+=== Attributes
+
+
+[options="header",cols="15%,50%,12%,12%,12%"]
+|=======
+|Attribute|Description|Required|Composite|Standard
+|name|the name which identifies the resolver|Yes|Yes|Yes
+|validate|indicates if resolved ivy files should be validated against ivy xsd|No, defaults to call setting|Yes|Yes
+|force|Indicates if this resolver should be used in force mode (see above). *__since 2.0__*|No, defaults to false|No|Yes
+|checkmodified|Indicates if this resolver should check lastmodified date to know if an ivy file is up to date.|No, defaults to ${ivy.resolver.default.check.modified}|No|Yes
+|changingPattern|Indicates for which revision pattern this resolver should check lastmodified date to know if an artifact file is up to date. *__since 1.4__*. See link:../concept.html#change[cache and change management] for details.|No, defaults to none|Yes|Yes
+|changingMatcher|The name of the link:../concept.html#matcher[pattern matcher] to use to match a revision against the configured changingPattern. *__since 1.4__*. See link:../concept.html#change[cache and change management] for details.|No, defaults to exactOrRegexp|Yes|Yes
+|alwaysCheckExactRevision|Indicates if this resolver should check the given revision even if it's a special one (like latest.integration). *__since 1.3__*|No, defaults to ${ivy.default.always.check.exact.revision}|No|Yes
+|namespace|The name of the namespace to which this resolver belons *__since 1.3__*|No, defaults to 'system'|Yes|Yes
+|checkconsistency|true to check consistency of module descriptors found by this resolver, false to avoid consistency check *__since 1.3__*|No, defaults to true|No|Yes
+|descriptor|'optional' if a module descriptor (usually an ivy file) is optional for this resolver, 'required' to refuse modules without module descriptor *__since 2.0__*|No, defaults to 'optional'|No (except dual)|Yes
+|allownomd|_DEPRECATED. Use descriptor="required | optional" instead._
+ true if the absence of module descriptor (usually an ivy file) is authorised for this resolver, false to refuse modules without module descriptor *__since 1.4__*|No, defaults to true|No (except dual)|Yes
+|checksums|a comma separated list of link:../concept.html#checksum[checksum algorithms] to use both for publication and checking *__since 1.4__*|No, defaults to ${ivy.checksums}|No|Yes
+|latest|The name of the latest strategy to use.|No, defaults to 'default'|Yes|Yes
+|cache|The name of the cache manager to use.|No, defaults to the value of the default attribute of caches|No|Yes
+|signer|The name of the link:../settings/signers.html[detached signature generator] to use when publishing artifacts. *__(since 2.2)__*|No, by default published artifacts will not get signed by Ivy.|No|Yes
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<resolvers>
+ <filesystem name="1" cache="cache-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>
+ <chain name="chain1">
+ <resolver ref="1"/>
+ <ivyrep name="ivyrep"/>
+ </chain>
+ <chain name="chain2" returnFirst="true" dual="true">
+ <resolver ref="1"/>
+ <ibiblio name="ibiblio"/>
+ </chain>
+</resolvers>
+
+----
+
+Defines a filesystem resolver, named '1', which is then used in two chains, the first which combines the filesystem resolver with an ivyrep resolver, and second which combines the filesystem resolver with an ibiblio resolver, and which returns the first module found, and uses the whole chain to download artifacts (see corresponding resolvers documentation for details about them). Resolver 1 will use a cache named 'cache-1' which should have been defined under the caches element.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/settings.adoc b/asciidoc/settings/settings.adoc
new file mode 100644
index 0000000..2ebb932
--- /dev/null
+++ b/asciidoc/settings/settings.adoc
@@ -0,0 +1,40 @@
+
+*Tag:* settings
+
+Configures some important ivy info: default resolver, latest strategy, conflict manager...
+
+The 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 link:../settings/resolvers.html[resolvers] section of the settings file.
+
+The default latest strategy and conflict manager can also be configured here.
+
+_validate_ indicates if ivy files should generally be validated against the xsd or not. This setting is only a default value, and can be overridden:
+1) in ant tasks
+2) in resolvers
+So if there is a setting in the resolver, it always wins against all other settings.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|defaultResolver|the name of the default resolver to use|No, but all modules should be configured in the modules section if not provided
+|defaultLatestStrategy|the name of the default latest strategy to use|No, defaults to latest-revision
+|defaultConflictManager|the name of the default conflict manager to use|No, defaults to latest-revision
+|defaultBranch|the default branch to use for all modules, except if they have a link:../settings/module.html[module specific branch setting]. *__since 1.4__*|No, defaults to no default branch
+|defaultResolveMode|the default link:../use/resolve.html[resolve mode] to use for all modules, except if they have a link:../settings/module.html[module specific resolve mode setting]. *__since 2.0__*|No, defaults to 'default'
+|[[circularDependencyStrategy]]circularDependencyStrategy|the name of the link:../concept.html#circular[circular dependency strategy] to use *__since 1.4__*|No, defaults to warn
+|validate|Indicates if ivy files should be validated against ivy.xsd or not.|No, defaults to true
+|useRemoteConfig|true to configure ivyrep and ibiblio resolver from a remote configuration file (updated with changes in those repository structure if any) (*__since 1.2__*)|No, defaults to false
+|httpRequestMethod|specifies the HTTP method to use to retrieve information about an URL. Possible values are 'GET' and 'HEAD'. This setting can be used to solve problems with firewalls and proxies. (*__since 2.0__*)|No, defaults to 'HEAD'
+|<s>defaultCache</s>|a path to a directory to use as default basedir for both resolution and repository cache(s).
+ __Deprecated, we recommend using defaultCacheDir on the link:../settings/caches.html[caches] tag instead__|No, defaults to .ivy2/cache in user home
+|<s>checkUpToDate</s>|Indicates if date should be checked before retrieving artifacts from cache.
+ __Deprecated, we recommend using overwriteMode on the link:../use/retrieve.html[retrieve] task instead__|No, defaults to true
+|<s>cacheIvyPattern</s>|a pattern to indicate where ivy files should be put in cache.
+ __Deprecated, we recommend using ivyPattern on the link:../settings/caches.html[caches] tag instead__|No, defaults to [organisation]/[module]/ivy-[revision].xml
+|<s>cacheArtifactPattern</s>|a pattern to indicate where artifact files should be put in cache.
+ __Deprecated, we recommend using artifactPattern on the link:../settings/caches.html[caches] tag instead__|No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]
+|=======
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/signers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/signers.adoc b/asciidoc/settings/signers.adoc
new file mode 100644
index 0000000..5f371b5
--- /dev/null
+++ b/asciidoc/settings/signers.adoc
@@ -0,0 +1,78 @@
+
+*Tag:* signers
+*__since 2.2__*
+
+Defines a list of detached signature generators usable in ivy. Each generator is identified by its name, given as an attribute.
+The child tags used to configure the signature generator must be equal to the name of a signature generator type (either built-in or added with the typedef tag).
+
+Ivy supports the following signature generator out of the box:
+
+
+* pgp +
+ generates an OpenPGP compatible ASCII armored detached signature.
+
+
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any signature generator|adds a signature generator to the list of registered generators|1..n
+|=======
+
+
+
+== Built-in Generators
+
+
+
+=== PGP
+
+
+This generator is capable of generating an OpenPGP compatible ASCII armored detached signature.
+
+*Remark:* This generator uses the link:http://www.bouncycastle.org/java.html[BouncyCastle OpenPGP] library. Before this generator can be used, these libraries must be available on Ivy's classpath.
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|The name of the signature generator.|Yes
+|secring|The location of the secret keyring.|No, defaults to ${user.home}/.gnupg/secring.gpg
+|keyId|The identifier of the key to use. The keyword 'auto' can be used to indicate a key will be selected automatically.|No, defaults to 'auto'.
+|password|The password of the private key.|Yes
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<signers>
+ <pgp name="mypgp" password="my-password" />
+</signers>
+
+----
+
+Defines a detached signature generator with name 'mypgp' which uses the secret key ring on the default location and automatically selects a private key.
+
+'''
+
+
+[source]
+----
+
+<signers>
+ <pgp name="mypgp" password="my-password" keyId="123ABC45"/>
+</signers>
+
+----
+
+Same as before, but this time the key '123ABC45' is used to generate the detached signature.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/status.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/status.adoc b/asciidoc/settings/status.adoc
new file mode 100644
index 0000000..d171c57
--- /dev/null
+++ b/asciidoc/settings/status.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* status
+
+Define one available module status.
+
+See link:../settings/statuses.html[statuses] page for details about how statuses are defined.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|name of status defined|Yes
+|integration|true if this is an integration status, false otherwise|No, defaults to false
+|=======
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/statuses.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/statuses.adoc b/asciidoc/settings/statuses.adoc
new file mode 100644
index 0000000..6c8bde7
--- /dev/null
+++ b/asciidoc/settings/statuses.adoc
@@ -0,0 +1,50 @@
+
+*Tag:* statuses
+
+Defines the list of available statuses. *__since 1.4__*
+
+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.
+
+The integration property on each status is only used for recursive delivery, an integration dependency being delivered if the caller is not in integration state itself.
+
+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.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|default|the name of the status to use when none is declared in an ivy file|No, defaults to the last status declared
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../settings/status.html[status]|defines a new status|0..n
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<statuses default="bronze">
+ <status name="gold" integration="false"/>
+ <status name="silver" integration="false"/>
+ <status name="bronze" integration="true"/>
+</statuses>
+
+----
+
+Defines 3 statuses, gold, silver and bronze. The default status used when none is declared in an ivy file will be bronze.
+It is also considered as an integration status, and thus doesn't trigger any recrusive delivery.
\ No newline at end of file
[19/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivyfile-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivyfile-small.png b/asciidoc/images/ivyfile-small.png
new file mode 100644
index 0000000..d92b6e2
Binary files /dev/null and b/asciidoc/images/ivyfile-small.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/logo.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/logo.png b/asciidoc/images/logo.png
new file mode 100644
index 0000000..5c01f3d
Binary files /dev/null and b/asciidoc/images/logo.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/main-tasks.odg
----------------------------------------------------------------------
diff --git a/asciidoc/images/main-tasks.odg b/asciidoc/images/main-tasks.odg
new file mode 100644
index 0000000..2e75d56
Binary files /dev/null and b/asciidoc/images/main-tasks.odg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/main-tasks.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/main-tasks.png b/asciidoc/images/main-tasks.png
new file mode 100644
index 0000000..d37bc5d
Binary files /dev/null and b/asciidoc/images/main-tasks.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/main-tasks.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/main-tasks.svg b/asciidoc/images/main-tasks.svg
new file mode 100644
index 0000000..6334ddd
--- /dev/null
+++ b/asciidoc/images/main-tasks.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 647.669 503.39903" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path fill-rule="evenodd" fill="#119a48" d="m237.42 102zm-170.04-102zm16.92 0c-8.399 0-16.92 8.52-16.92 17.039v67.921c0 8.52 8.521 17.04 16.92 17.04h136.08c8.521 0 17.04-8.521 17.04-17.04v-67.921c0-8.52-8.52-17.039-17.04-17.039h-136.08z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <path d="m84.298 0.000005c-8.399 0-16.92 8.52-16.92 17.039v67.921c0 8.52 8.521 17.04 16.92 17.04h136.08c8.521 0 17.04-8.521 17.04-17.04v-67.921c0-8.52-8.52-17.039-17.04-17.039h-136.08z"/>
+ <path d="m67.378 0.000005z"/>
+ <path d="m237.42 102z"/>
+ </g>
+ <path fill="#fff" d="m133.61 36.403c0 0.956-0.219 1.811-0.654 2.562-0.437 0.752-1.06 1.334-1.872 1.745-0.812 0.412-1.777 0.617-2.896 0.617h-3.691v5.231h-3.111v-14.86h6.677c1.778 0 3.148 0.409 4.107 1.229s1.44 1.978 1.44 3.476zm-3.133 0.053c0-1.562-0.922-2.342-2.764-2.342h-3.217v4.82h3.302c0.857 0 1.519-0.213 1.982-0.639 0.464-0.424 0.697-1.038 0.697-1.839zm8.152-1.309v6.402c0 2.004 0.675 3.006 2.024 3.006 0.718 0 1.296-0.308 1.735-0.923s0.659-1.404 0.659-2.368v-6.117h2.964v8.859c0 0.971 0.028 1.821 0.084 2.553h-2.826c-0.085-1.013-0.127-1.769-0.127-2.268h-0.053c-0.394 0.865-0.895 1.494-1.503 1.888s-1.33 0.591-2.167 0.591c-1.21 0-2.138-0.371-2.784-1.112-0.647-0.742-0.971-1.83-0.971-3.265v-7.246h2.965zm21.181 5.665c0 1.885-0.378 3.349-1.134 4.393s-1.837 1.566-3.243 1.566c-0.809 0-1.508-0.176-2.099-0.527s-1.044-0.857-1.36-1.519h-0.021c0 0.246-0.016 0.583-0.047 1.013-0.032 0.429-0.065 0.703-0.101 0.822h-2.879c0.056-0.654 0.084-1.522 0.084-2.605v-13.047h2.964v4.366l-0.042 1.856h0.042c0.
668-1.463 1.884-2.194 3.649-2.194 1.35 0 2.385 0.512 3.105 1.535 0.722 1.023 1.082 2.47 1.082 4.341zm-5.442 3.933c1.568 0 2.353-1.311 2.353-3.934 0-1.294-0.19-2.254-0.569-2.879-0.38-0.626-0.967-0.939-1.762-0.939-0.802 0-1.411 0.336-1.83 1.008-0.418 0.671-0.627 1.64-0.627 2.905 0 1.21 0.205 2.151 0.616 2.827 0.411 0.675 1.018 1.012 1.819 1.012zm7.948 1.815v-15.652h2.964v15.652h-2.964zm5.982-13.469v-2.183h2.964v2.183h-2.964zm0 13.469v-11.413h2.964v11.413h-2.964zm10.849 0.211c-1.729 0-3.065-0.515-4.008-1.545s-1.413-2.467-1.413-4.309c0-1.885 0.475-3.353 1.424-4.403s2.295-1.577 4.039-1.577c1.343 0 2.454 0.338 3.333 1.013s1.431 1.606 1.655 2.795l-2.984 0.147c-0.084-0.583-0.295-1.049-0.633-1.397s-0.815-0.521-1.435-0.521c-1.525 0-2.288 1.276-2.288 3.828 0 2.63 0.776 3.944 2.33 3.944 0.562 0 1.034-0.177 1.414-0.532 0.379-0.355 0.615-0.884 0.706-1.587l2.975 0.137c-0.105 0.78-0.385 1.477-0.839 2.088-0.453 0.612-1.049 1.085-1.787 1.419s-1.568 0.5-2.489 0.5z"/>
+ <path fill="#fff" d="m101.17 70.439v-8.732c0-0.626-0.009-1.148-0.026-1.566-0.018-0.419-0.037-0.789-0.058-1.113h2.826c0.021 0.127 0.049 0.512 0.084 1.155s0.053 1.07 0.053 1.281h0.043c0.288-0.802 0.545-1.365 0.77-1.692s0.492-0.569 0.802-0.728 0.696-0.237 1.16-0.237c0.38 0 0.686 0.053 0.917 0.158v2.479c-0.478-0.105-0.899-0.158-1.266-0.158-0.738 0-1.312 0.299-1.724 0.896-0.412 0.598-0.617 1.483-0.617 2.657v5.601h-2.964zm17.871-2.889c-0.809 2.067-2.451 3.101-4.926 3.101-1.715 0-3.033-0.508-3.955-1.524-0.921-1.016-1.381-2.497-1.381-4.445 0-1.884 0.467-3.333 1.402-4.345 0.935-1.013 2.261-1.52 3.977-1.52 1.638 0 2.89 0.544 3.754 1.63 0.865 1.086 1.298 2.678 1.298 4.772v0.084h-7.319c0 1.112 0.205 1.95 0.616 2.516 0.412 0.566 0.997 0.85 1.757 0.85 1.047 0 1.708-0.454 1.982-1.361l2.795 0.242zm-4.925-6.866c-0.695 0-1.232 0.242-1.608 0.728s-0.574 1.164-0.596 2.036h4.43c-0.057-0.922-0.278-1.612-0.664-2.073-0.388-0.461-0.908-0.691-1.562-0.691zm18.137 3.997c0 1.905-0.382 3.377-1.145 4.414s-1.841
1.556-3.232 1.556c-0.802 0-1.5-0.174-2.094-0.522s-1.05-0.849-1.366-1.503h-0.062c0.042 0.211 0.062 0.852 0.062 1.92v4.377h-2.963v-13.269c0-1.076-0.028-1.951-0.085-2.627h2.88c0.035 0.127 0.064 0.377 0.089 0.749 0.025 0.373 0.037 0.742 0.037 1.107h0.042c0.668-1.398 1.885-2.099 3.649-2.099 1.329 0 2.359 0.512 3.091 1.534 0.731 1.025 1.097 2.479 1.097 4.363zm-5.464 3.944c1.582 0 2.373-1.313 2.373-3.944 0-2.559-0.783-3.839-2.352-3.839-0.787 0-1.391 0.345-1.809 1.033-0.419 0.69-0.628 1.652-0.628 2.891 0 1.23 0.209 2.181 0.628 2.853 0.419 0.671 1.015 1.006 1.788 1.006zm18.682-3.902c0 1.851-0.513 3.3-1.54 4.351-1.026 1.052-2.446 1.577-4.261 1.577-1.778 0-3.175-0.527-4.187-1.582-1.013-1.055-1.52-2.503-1.52-4.346 0-1.835 0.507-3.278 1.52-4.329 1.012-1.051 2.429-1.577 4.25-1.577 1.863 0 3.285 0.509 4.267 1.524 0.981 1.015 1.471 2.477 1.471 4.382zm-5.832 3.902c1.821 0 2.731-1.301 2.731-3.902 0-1.356-0.222-2.341-0.664-2.953-0.443-0.611-1.087-0.917-1.931-0.917-1.8 0-2.7 1.291-2.7 3.87 0 1.273 0.22
2.241 0.659 2.906 0.44 0.664 1.075 0.996 1.905 0.996zm17.914-1.519c0 1.104-0.451 1.971-1.355 2.6-0.903 0.63-2.153 0.944-3.749 0.944-1.568 0-2.769-0.248-3.602-0.743-0.833-0.496-1.387-1.268-1.661-2.315l2.604-0.391c0.148 0.542 0.403 0.925 0.765 1.15 0.362 0.226 0.993 0.337 1.894 0.337 0.83 0 1.435-0.105 1.814-0.316s0.569-0.541 0.569-0.991c0-0.365-0.153-0.655-0.459-0.87s-0.824-0.396-1.556-0.543c-1.674-0.331-2.802-0.639-3.386-0.923-0.583-0.285-1.028-0.654-1.334-1.107-0.306-0.454-0.459-1.011-0.459-1.672 0-1.09 0.42-1.938 1.261-2.547 0.84-0.608 2.03-0.912 3.57-0.912 1.356 0 2.448 0.264 3.274 0.791s1.341 1.29 1.545 2.288l-2.626 0.274c-0.084-0.464-0.292-0.811-0.622-1.039-0.331-0.229-0.854-0.343-1.571-0.343-0.703 0-1.23 0.09-1.582 0.27-0.352 0.179-0.527 0.479-0.527 0.901 0 0.331 0.135 0.593 0.405 0.786 0.271 0.193 0.727 0.353 1.366 0.479 0.893 0.184 1.686 0.371 2.378 0.564 0.693 0.193 1.248 0.424 1.667 0.69 0.418 0.268 0.752 0.61 1.002 1.028 0.25 0.421 0.375 0.957 0.375 1.61zm2.262-10.135v-2
.183h2.963v2.183h-2.963zm0 13.468v-11.412h2.963v11.412h-2.963zm11.512-0.168c-0.73 0.239-1.564 0.358-2.499 0.358-0.872 0-1.544-0.237-2.015-0.712s-0.707-1.192-0.707-2.156v-6.729h-1.444v-2.004h1.593l0.928-2.679h1.856v2.679h2.162v2.004h-2.162v5.928c0 0.556 0.105 0.965 0.316 1.229s0.538 0.396 0.98 0.396c0.232 0 0.562-0.049 0.991-0.147v1.833h0.001zm12.614-5.548c0 1.851-0.514 3.3-1.54 4.351-1.026 1.052-2.447 1.577-4.261 1.577-1.779 0-3.175-0.527-4.188-1.582s-1.519-2.503-1.519-4.346c0-1.835 0.506-3.278 1.519-4.329s2.43-1.577 4.25-1.577c1.863 0 3.286 0.509 4.267 1.524s1.472 2.477 1.472 4.382zm-5.833 3.902c1.821 0 2.731-1.301 2.731-3.902 0-1.356-0.221-2.341-0.664-2.953-0.443-0.611-1.086-0.917-1.93-0.917-1.801 0-2.7 1.291-2.7 3.87 0 1.273 0.22 2.241 0.659 2.906 0.44 0.664 1.075 0.996 1.904 0.996zm8.166 1.814v-8.732c0-0.626-0.009-1.148-0.026-1.566-0.018-0.419-0.036-0.789-0.058-1.113h2.826c0.021 0.127 0.05 0.512 0.085 1.155s0.053 1.07 0.053 1.281h0.042c0.288-0.802 0.545-1.365 0.77-1.692 0.226-0.
327 0.492-0.569 0.802-0.728s0.696-0.237 1.16-0.237c0.38 0 0.686 0.053 0.918 0.158v2.479c-0.479-0.105-0.9-0.158-1.266-0.158-0.738 0-1.313 0.299-1.725 0.896s-0.617 1.483-0.617 2.657v5.601h-2.964zm9.88 4.483c-0.71 0-1.332-0.046-1.867-0.137v-2.109c0.373 0.056 0.714 0.084 1.023 0.084 0.422 0 0.771-0.066 1.05-0.2 0.277-0.134 0.527-0.355 0.748-0.665 0.222-0.309 0.47-0.833 0.744-1.571l-4.515-11.296h3.133l1.793 5.348c0.281 0.767 0.637 1.94 1.065 3.522l0.264-1.002 0.686-2.479 1.688-5.39h3.101l-4.514 12.014c-0.605 1.462-1.232 2.475-1.883 3.037s-1.49 0.844-2.516 0.844z"/>
+ <path fill-rule="evenodd" fill="#119a48" d="m230.7 367.44zm-170.16-102.12zm17.04 0c-8.521 0-17.04 8.521-17.04 17.04v67.92c0 8.521 8.52 17.161 17.04 17.161h136.08c8.52 0 17.04-8.641 17.04-17.161v-67.92c0-8.52-8.521-17.04-17.04-17.04h-136.08z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <path d="m77.578 265.32c-8.521 0-17.04 8.521-17.04 17.04v67.92c0 8.521 8.52 17.161 17.04 17.161h136.08c8.52 0 17.04-8.641 17.04-17.161v-67.92c0-8.52-8.521-17.04-17.04-17.04h-136.08z"/>
+ <path d="m60.538 265.32z"/>
+ <path d="m230.7 367.44z"/>
+ </g>
+ <path fill="#fff" d="m93.663 311.88v-14.859h11.686v2.405h-8.574v3.733h7.932v2.404h-7.932v3.912h9.007v2.404h-12.119zm21.842 0v-6.4c0-2.004-0.679-3.007-2.035-3.007-0.718 0-1.296 0.308-1.735 0.923s-0.659 1.404-0.659 2.367v6.117h-2.964v-8.859c0-0.611-0.009-1.112-0.026-1.502-0.018-0.391-0.036-0.741-0.058-1.05h2.826c0.021 0.133 0.05 0.49 0.085 1.07s0.053 0.98 0.053 1.198h0.042c0.4-0.872 0.903-1.505 1.508-1.898 0.605-0.394 1.326-0.591 2.162-0.591 1.21 0 2.138 0.373 2.785 1.118 0.646 0.745 0.97 1.835 0.97 3.27v7.244h-2.954zm11.333-0.169c-0.73 0.239-1.564 0.359-2.499 0.359-0.872 0-1.544-0.237-2.015-0.712s-0.707-1.194-0.707-2.157v-6.729h-1.444v-2.004h1.593l0.928-2.68h1.856v2.68h2.162v2.004h-2.162v5.927c0 0.556 0.105 0.966 0.316 1.229s0.538 0.395 0.98 0.395c0.232 0 0.562-0.049 0.991-0.147v1.835h0.001zm11.37-2.721c-0.809 2.067-2.45 3.101-4.926 3.101-1.716 0-3.034-0.507-3.955-1.523s-1.382-2.498-1.382-4.446c0-1.884 0.468-3.332 1.403-4.345s2.261-1.519 3.976-1.519c1.639 0 2.891 0.543 3.755 1.63 0
.865 1.086 1.298 2.678 1.298 4.772v0.085h-7.32c0 1.11 0.206 1.948 0.617 2.515s0.997 0.849 1.756 0.849c1.048 0 1.709-0.452 1.983-1.359l2.795 0.24zm-4.925-6.865c-0.696 0-1.232 0.242-1.608 0.727s-0.574 1.165-0.596 2.037h4.43c-0.057-0.921-0.277-1.612-0.664-2.073-0.388-0.461-0.908-0.691-1.562-0.691zm7.208 9.755v-8.732c0-0.626-0.009-1.147-0.026-1.565-0.018-0.419-0.037-0.79-0.059-1.113h2.827c0.021 0.126 0.049 0.512 0.084 1.155s0.053 1.071 0.053 1.282h0.042c0.289-0.802 0.545-1.367 0.771-1.693 0.225-0.327 0.492-0.57 0.802-0.729 0.309-0.158 0.695-0.236 1.16-0.236 0.379 0 0.686 0.052 0.917 0.157v2.479c-0.478-0.105-0.899-0.159-1.266-0.159-0.738 0-1.312 0.3-1.725 0.897-0.411 0.598-0.616 1.483-0.616 2.658v5.599h-2.964zm19.203-5.759c0 1.906-0.383 3.378-1.146 4.415s-1.84 1.555-3.231 1.555c-0.802 0-1.5-0.173-2.095-0.521-0.594-0.348-1.049-0.85-1.365-1.503h-0.063c0.043 0.211 0.063 0.851 0.063 1.919v4.378h-2.964v-13.268c0-1.076-0.028-1.952-0.084-2.627h2.879c0.035 0.126 0.064 0.377 0.09 0.75 0.024 0.372
0.037 0.74 0.037 1.105h0.042c0.668-1.398 1.884-2.098 3.649-2.098 1.329 0 2.358 0.512 3.09 1.534 0.731 1.024 1.098 2.477 1.098 4.361zm-5.464 3.945c1.582 0 2.373-1.315 2.373-3.945 0-2.559-0.784-3.839-2.352-3.839-0.788 0-1.392 0.345-1.81 1.034-0.418 0.688-0.627 1.652-0.627 2.89 0 1.23 0.209 2.182 0.627 2.854 0.419 0.67 1.015 1.006 1.789 1.006zm7.84 1.814v-8.732c0-0.626-0.01-1.147-0.026-1.565-0.019-0.419-0.037-0.79-0.059-1.113h2.827c0.021 0.126 0.048 0.512 0.084 1.155 0.034 0.644 0.053 1.071 0.053 1.282h0.042c0.288-0.802 0.545-1.367 0.771-1.693 0.224-0.327 0.491-0.57 0.801-0.729s0.696-0.236 1.16-0.236c0.38 0 0.686 0.052 0.918 0.157v2.479c-0.479-0.105-0.9-0.159-1.266-0.159-0.738 0-1.313 0.3-1.725 0.897s-0.617 1.483-0.617 2.658v5.599h-2.963zm8.402-13.467v-2.185h2.963v2.185h-2.963zm0 13.467v-11.411h2.963v11.411h-2.963zm15.602-3.333c0 1.104-0.452 1.972-1.355 2.601-0.903 0.63-2.153 0.943-3.749 0.943-1.568 0-2.769-0.247-3.603-0.743-0.833-0.495-1.387-1.268-1.661-2.315l2.605-0.389c0.147 0.541
0.402 0.923 0.765 1.148 0.362 0.225 0.993 0.337 1.894 0.337 0.829 0 1.434-0.105 1.813-0.316s0.569-0.541 0.569-0.991c0-0.365-0.152-0.655-0.458-0.869-0.307-0.215-0.825-0.396-1.556-0.544-1.674-0.33-2.803-0.638-3.386-0.922-0.584-0.285-1.028-0.654-1.334-1.107-0.307-0.454-0.459-1.011-0.459-1.672 0-1.09 0.42-1.939 1.26-2.547 0.841-0.608 2.03-0.912 3.57-0.912 1.357 0 2.449 0.263 3.275 0.79s1.341 1.291 1.545 2.29l-2.626 0.273c-0.085-0.464-0.292-0.811-0.623-1.039-0.33-0.229-0.854-0.344-1.571-0.344-0.703 0-1.23 0.091-1.582 0.27-0.352 0.18-0.527 0.48-0.527 0.902 0 0.331 0.136 0.592 0.406 0.785s0.726 0.354 1.366 0.48c0.893 0.184 1.686 0.371 2.378 0.564s1.248 0.423 1.666 0.689c0.419 0.268 0.753 0.611 1.002 1.029 0.251 0.419 0.376 0.956 0.376 1.609zm11.988 0.443c-0.809 2.067-2.45 3.101-4.926 3.101-1.716 0-3.034-0.507-3.955-1.523s-1.382-2.498-1.382-4.446c0-1.884 0.468-3.332 1.403-4.345s2.261-1.519 3.976-1.519c1.639 0 2.891 0.543 3.755 1.63 0.865 1.086 1.298 2.678 1.298 4.772v0.085h-7.32c0 1.11 0.20
6 1.948 0.617 2.515s0.997 0.849 1.756 0.849c1.048 0 1.709-0.452 1.983-1.359l2.795 0.24zm-4.926-6.865c-0.696 0-1.232 0.242-1.608 0.727s-0.574 1.165-0.596 2.037h4.43c-0.057-0.921-0.277-1.612-0.664-2.073s-0.908-0.691-1.562-0.691z"/>
+ <path fill="#fff" d="m94.326 335.76v-8.733c0-0.625-0.009-1.148-0.026-1.565-0.018-0.419-0.037-0.79-0.058-1.113h2.826c0.021 0.127 0.05 0.511 0.085 1.155 0.035 0.643 0.053 1.07 0.053 1.281h0.042c0.288-0.802 0.545-1.365 0.77-1.693 0.226-0.326 0.492-0.569 0.802-0.727 0.31-0.159 0.696-0.238 1.16-0.238 0.38 0 0.686 0.053 0.918 0.158v2.479c-0.479-0.105-0.9-0.158-1.266-0.158-0.738 0-1.313 0.299-1.725 0.896s-0.617 1.484-0.617 2.658v5.601h-2.964zm18-2.89c-0.809 2.066-2.45 3.101-4.925 3.101-1.716 0-3.034-0.509-3.955-1.523-0.922-1.018-1.382-2.499-1.382-4.446 0-1.885 0.468-3.333 1.402-4.346 0.936-1.012 2.261-1.519 3.977-1.519 1.638 0 2.89 0.544 3.755 1.629 0.864 1.088 1.297 2.678 1.297 4.773v0.084h-7.319c0 1.111 0.205 1.949 0.617 2.517 0.411 0.564 0.996 0.848 1.756 0.848 1.048 0 1.708-0.453 1.982-1.36l2.795 0.242zm-4.924-6.866c-0.696 0-1.232 0.242-1.608 0.728-0.377 0.485-0.575 1.164-0.597 2.035h4.43c-0.056-0.921-0.277-1.611-0.664-2.072-0.388-0.461-0.908-0.691-1.561-0.691zm18.007 3.997c0 1.905-0
.381 3.377-1.144 4.413-0.764 1.038-1.841 1.557-3.233 1.557-0.801 0-1.499-0.174-2.093-0.522-0.595-0.348-1.05-0.849-1.366-1.503h-0.063c0.042 0.211 0.063 0.851 0.063 1.92v4.377h-2.964v-13.269c0-1.075-0.028-1.951-0.084-2.626h2.879c0.035 0.127 0.065 0.376 0.09 0.74901 0.025 0.373 0.037 0.742 0.037 1.107h0.042c0.668-1.399 1.885-2.099 3.649-2.099 1.329 0 2.358 0.512 3.09 1.534 0.731 1.024 1.097 2.477 1.097 4.362zm-5.463 3.944c1.582 0 2.373-1.314 2.373-3.944 0-2.56-0.784-3.839-2.352-3.839-0.788 0-1.391 0.345-1.81 1.033-0.418 0.689-0.627 1.652-0.627 2.89 0 1.23 0.209 2.183 0.627 2.853 0.419 0.672 1.015 1.007 1.789 1.007zm18.811-3.902c0 1.85-0.514 3.3-1.54 4.351-1.027 1.052-2.446 1.577-4.261 1.577-1.779 0-3.175-0.527-4.188-1.582-1.012-1.055-1.519-2.503-1.519-4.346 0-1.835 0.507-3.278 1.519-4.329 1.013-1.052 2.43-1.577 4.251-1.577 1.862 0 3.285 0.509 4.266 1.523 0.982 1.018 1.472 2.478 1.472 4.383zm-5.832 3.902c1.82 0 2.731-1.301 2.731-3.902 0-1.356-0.222-2.341-0.665-2.953-0.442-0.611-1.086-0.
917-1.93-0.917-1.8 0-2.7 1.29-2.7 3.87 0 1.272 0.22 2.241 0.659 2.906 0.44 0.663 1.075 0.996 1.905 0.996zm17.784-1.518c0 1.104-0.452 1.971-1.354 2.6-0.904 0.63-2.153 0.944-3.75 0.944-1.567 0-2.769-0.249-3.602-0.743-0.833-0.497-1.387-1.268-1.661-2.315l2.605-0.391c0.147 0.542 0.401 0.925 0.765 1.149 0.361 0.226 0.993 0.338 1.893 0.338 0.83 0 1.435-0.105 1.814-0.31599 0.379-0.211 0.569-0.541 0.569-0.991 0-0.366-0.153-0.656-0.459-0.87-0.306-0.215-0.824-0.396-1.556-0.543-1.673-0.331-2.802-0.638-3.386-0.924-0.583-0.283-1.028-0.654-1.334-1.106-0.306-0.454-0.459-1.011-0.459-1.672 0-1.09 0.421-1.939 1.261-2.547 0.84-0.60899 2.03-0.913 3.57-0.913 1.356 0 2.448 0.264 3.274 0.791s1.342 1.291 1.545 2.289l-2.626 0.274c-0.084-0.464-0.292-0.81-0.622-1.04-0.33-0.227-0.854-0.342-1.571-0.342-0.703 0-1.23 0.089-1.582 0.27-0.352 0.178-0.527 0.479-0.527 0.901 0 0.33 0.135 0.592 0.406 0.786 0.27 0.192 0.726 0.353 1.365 0.479 0.894 0.183 1.686 0.371 2.379 0.563 0.691 0.194 1.248 0.424 1.666 0.691s0.752 0.6
09 1.002 1.029c0.25 0.418 0.375 0.954 0.375 1.609zm2.391-10.136v-2.183h2.964v2.183h-2.964zm0 13.469v-11.412h2.964v11.412h-2.964zm11.404-0.169c-0.731 0.239-1.564 0.358-2.499 0.358-0.872 0-1.544-0.236-2.015-0.712-0.472-0.474-0.707-1.193-0.707-2.156v-6.729h-1.444v-2.004h1.592l0.929-2.679h1.856v2.679h2.162v2.004h-2.162v5.928c0 0.556 0.105 0.966 0.316 1.228 0.211 0.266 0.537 0.396 0.98 0.396 0.232 0 0.562-0.049 0.991-0.147v1.834h0.001zm12.614-5.548c0 1.85-0.514 3.3-1.54 4.351-1.027 1.052-2.446 1.577-4.261 1.577-1.779 0-3.175-0.527-4.188-1.582-1.012-1.055-1.519-2.503-1.519-4.346 0-1.835 0.507-3.278 1.519-4.329 1.013-1.052 2.429-1.577 4.251-1.577 1.862 0 3.285 0.509 4.266 1.523 0.982 1.018 1.472 2.478 1.472 4.383zm-5.832 3.902c1.82 0 2.731-1.301 2.731-3.902 0-1.356-0.222-2.341-0.665-2.953-0.442-0.611-1.086-0.917-1.93-0.917-1.801 0-2.7 1.29-2.7 3.87 0 1.272 0.22 2.241 0.659 2.906 0.441 0.663 1.074 0.996 1.905 0.996zm8.166 1.815v-8.733c0-0.625-0.01-1.148-0.026-1.565-0.018-0.419-0.037-0.79-0.
059-1.113h2.827c0.021 0.127 0.049 0.511 0.084 1.155 0.035 0.643 0.053 1.07 0.053 1.281h0.042c0.289-0.802 0.545-1.365 0.771-1.693 0.225-0.326 0.491-0.569 0.802-0.727 0.309-0.159 0.695-0.238 1.16-0.238 0.379 0 0.686 0.053 0.917 0.158v2.479c-0.479-0.105-0.9-0.158-1.266-0.158-0.738 0-1.312 0.299-1.725 0.896-0.411 0.598-0.616 1.484-0.616 2.658v5.601h-2.964zm9.879 4.482c-0.71 0-1.333-0.046-1.867-0.138v-2.109c0.373 0.057 0.714 0.085 1.023 0.085 0.422 0 0.771-0.067 1.049-0.2 0.278-0.134 0.527-0.355 0.749-0.665s0.47-0.833 0.744-1.571l-4.515-11.296h3.133l1.793 5.348c0.281 0.767 0.636 1.94 1.065 3.522l0.264-1.002 0.686-2.479 1.688-5.39h3.101l-4.515 12.013c-0.604 1.463-1.231 2.476-1.882 3.038s-1.489 0.844-2.516 0.844z"/>
+ <path fill-rule="evenodd" fill="#119a48" d="m570.78 234.72zm-170.04-102.12zm16.92 0c-8.4 0-16.92 8.52-16.92 17.04v68.04c0 8.521 8.52 17.04 16.92 17.04h136.08c8.52 0 17.04-8.52 17.04-17.04v-68.04c0-8.521-8.521-17.04-17.04-17.04h-136.08z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <path d="m417.66 132.6c-8.4 0-16.92 8.52-16.92 17.04v68.04c0 8.521 8.52 17.04 16.92 17.04h136.08c8.52 0 17.04-8.52 17.04-17.04v-68.04c0-8.521-8.521-17.04-17.04-17.04h-136.08z"/>
+ <path d="m400.74 132.6z"/>
+ <path d="m570.78 234.72z"/>
+ </g>
+ <path fill="#fff" d="m461.8 188.92c1.877 0 3.182-0.942 3.912-2.827l2.711 1.023c-0.584 1.435-1.439 2.501-2.567 3.201-1.129 0.699-2.481 1.049-4.056 1.049-2.391 0-4.238-0.677-5.542-2.03-1.305-1.354-1.957-3.246-1.957-5.679 0-2.44 0.629-4.314 1.888-5.622s3.083-1.962 5.474-1.962c1.744 0 3.164 0.351 4.261 1.05 1.098 0.699 1.867 1.728 2.311 3.085l-2.742 0.749c-0.232-0.745-0.688-1.338-1.365-1.777-0.679-0.439-1.479-0.659-2.4-0.659-1.406 0-2.473 0.436-3.2 1.308s-1.093 2.148-1.093 3.829c0 1.708 0.375 3.013 1.124 3.912 0.747 0.9 1.827 1.35 3.241 1.35zm15.109 0.2c-0.829 1.498-2.081 2.246-3.754 2.246-1.104 0-1.966-0.3-2.584-0.901-0.619-0.602-0.929-1.446-0.929-2.536 0-1.182 0.386-2.082 1.155-2.7 0.771-0.619 1.886-0.936 3.349-0.949l2.457-0.042v-0.58c0-0.746-0.13-1.3-0.39-1.661-0.261-0.362-0.686-0.544-1.276-0.544-0.549 0-0.95 0.125-1.207 0.375-0.257 0.249-0.417 0.662-0.48 1.239l-3.091-0.147c0.19-1.111 0.699-1.953 1.525-2.526s1.952-0.859 3.379-0.859c1.441 0 2.553 0.354 3.333 1.065 0.78 0.71 1.171 1.
719 1.171 3.026v4.155c0 0.641 0.072 1.081 0.217 1.324 0.145 0.242 0.385 0.363 0.722 0.363 0.226 0 0.443-0.021 0.654-0.062v1.603c-0.176 0.042-0.334 0.081-0.475 0.116s-0.281 0.063-0.422 0.084-0.29 0.039-0.448 0.053c-0.158 0.015-0.343 0.021-0.554 0.021-0.745 0-1.295-0.183-1.65-0.549-0.354-0.365-0.568-0.903-0.639-1.613h-0.063v-0.001zm-0.305-3.248-1.519 0.021c-0.689 0.028-1.178 0.104-1.466 0.227s-0.508 0.312-0.659 0.564c-0.15 0.253-0.227 0.591-0.227 1.013 0 0.541 0.125 0.944 0.375 1.208 0.249 0.264 0.581 0.396 0.996 0.396 0.464 0 0.888-0.127 1.271-0.38s0.683-0.604 0.9-1.05c0.219-0.446 0.327-0.919 0.327-1.418v-0.581zm10.552 5.494c-1.729 0-3.065-0.515-4.008-1.545s-1.413-2.466-1.413-4.309c0-1.884 0.475-3.352 1.424-4.403s2.296-1.576 4.039-1.576c1.343 0 2.454 0.337 3.333 1.013 0.879 0.675 1.431 1.606 1.656 2.795l-2.985 0.147c-0.084-0.584-0.295-1.05-0.633-1.397-0.337-0.349-0.815-0.522-1.435-0.522-1.525 0-2.288 1.276-2.288 3.829 0 2.629 0.776 3.944 2.331 3.944 0.562 0 1.033-0.178 1.413-0.533 0.
38-0.354 0.615-0.884 0.706-1.587l2.975 0.137c-0.105 0.781-0.386 1.477-0.839 2.089-0.454 0.611-1.049 1.084-1.787 1.418s-1.569 0.5-2.489 0.5zm10.173-9.344c0.401-0.872 0.904-1.505 1.509-1.898 0.604-0.395 1.325-0.591 2.162-0.591 1.209 0 2.138 0.372 2.784 1.118 0.646 0.745 0.971 1.835 0.971 3.27v7.234h-2.953v-6.391c0-2.004-0.679-3.006-2.036-3.006-0.717 0-1.295 0.308-1.734 0.923s-0.659 1.404-0.659 2.367v6.106h-2.964v-15.651h2.964v4.271c0 0.767-0.028 1.516-0.085 2.247h0.041zm19.854 6.244c-0.809 2.067-2.451 3.101-4.926 3.101-1.716 0-3.034-0.508-3.955-1.523-0.921-1.017-1.382-2.498-1.382-4.445 0-1.885 0.468-3.333 1.403-4.346s2.26-1.519 3.976-1.519c1.639 0 2.89 0.543 3.755 1.629 0.865 1.087 1.297 2.678 1.297 4.772v0.085h-7.319c0 1.11 0.205 1.949 0.616 2.516 0.412 0.565 0.998 0.849 1.757 0.849 1.048 0 1.709-0.453 1.983-1.36l2.795 0.241zm-4.926-6.867c-0.696 0-1.232 0.243-1.609 0.729-0.376 0.484-0.574 1.163-0.595 2.035h4.43c-0.057-0.921-0.278-1.612-0.665-2.072-0.387-0.461-0.907-0.692-1.561-0.692z
"/>
+ <path fill-rule="evenodd" fill="#119a48" d="m574.26 503.4zm-170.16-102zm17.041 0c-8.521 0-17.041 8.52-17.041 16.92v68.04c0 8.52 8.52 17.04 17.041 17.04h136.08c8.399 0 17.04-8.521 17.04-17.04v-68.04c0-8.4-8.641-16.92-17.04-16.92h-136.08z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <path d="m421.14 401.4c-8.521 0-17.041 8.52-17.041 16.92v68.04c0 8.52 8.52 17.04 17.041 17.04h136.08c8.399 0 17.04-8.521 17.04-17.04v-68.04c0-8.4-8.641-16.92-17.04-16.92h-136.08z"/>
+ <path d="m404.1 401.4z"/>
+ <path d="m574.26 503.4z"/>
+ </g>
+ <path fill="#fff" d="m466.25 437.8c0 0.956-0.218 1.811-0.653 2.563-0.437 0.752-1.061 1.333-1.873 1.746-0.812 0.41-1.776 0.616-2.895 0.616h-3.691v5.231h-3.111v-14.861h6.676c1.779 0 3.148 0.409 4.107 1.229 0.96 0.819 1.44 1.979 1.44 3.476zm-3.131 0.052c0-1.561-0.923-2.341-2.764-2.341h-3.217v4.819h3.301c0.858 0 1.52-0.212 1.983-0.639 0.464-0.423 0.697-1.037 0.697-1.839zm5.356 10.105v-8.733c0-0.626-0.009-1.148-0.026-1.565-0.018-0.42-0.037-0.79-0.059-1.113h2.827c0.021 0.127 0.049 0.511 0.084 1.155 0.035 0.643 0.053 1.07 0.053 1.281h0.042c0.289-0.802 0.545-1.365 0.771-1.693 0.225-0.326 0.492-0.569 0.802-0.727 0.309-0.159 0.695-0.238 1.16-0.238 0.379 0 0.686 0.053 0.917 0.158v2.479c-0.478-0.105-0.899-0.158-1.266-0.158-0.738 0-1.312 0.299-1.724 0.896s-0.617 1.483-0.617 2.658v5.601h-2.964zm19.244-5.717c0 1.85-0.513 3.3-1.54 4.35-1.026 1.053-2.446 1.578-4.261 1.578-1.778 0-3.173-0.527-4.186-1.582s-1.519-2.504-1.519-4.346c0-1.835 0.506-3.279 1.519-4.329 1.013-1.052 2.428-1.577 4.249-1.577 1.
863 0 3.286 0.509 4.267 1.523 0.982 1.018 1.471 2.478 1.471 4.383zm-5.831 3.903c1.82 0 2.73-1.301 2.73-3.902 0-1.357-0.221-2.342-0.663-2.953-0.443-0.611-1.088-0.918-1.932-0.918-1.8 0-2.7 1.291-2.7 3.871 0 1.272 0.221 2.24 0.66 2.906 0.44 0.662 1.074 0.996 1.905 0.996zm8.113 6.296c-0.703 0-1.301-0.032-1.793-0.096v-2.088l0.537 0.042c0.507 0 0.853-0.11 1.04-0.333 0.185-0.22 0.278-0.68 0.278-1.375v-12.045h2.964v12.762c0 1.006-0.255 1.779-0.764 2.32-0.51 0.542-1.264 0.813-2.262 0.813zm0.063-17.951v-2.184h2.964v2.184h-2.964zm15.571 10.578c-0.809 2.067-2.452 3.102-4.926 3.102-1.717 0-3.034-0.509-3.955-1.523-0.922-1.018-1.382-2.499-1.382-4.446 0-1.885 0.468-3.333 1.403-4.346 0.934-1.013 2.259-1.519 3.976-1.519 1.638 0 2.891 0.544 3.755 1.629 0.865 1.088 1.298 2.678 1.298 4.773v0.084h-7.32c0 1.111 0.205 1.949 0.617 2.516 0.411 0.565 0.997 0.849 1.756 0.849 1.047 0 1.709-0.453 1.983-1.36l2.795 0.241zm-4.926-6.865c-0.696 0-1.232 0.242-1.608 0.728-0.377 0.485-0.574 1.163-0.596 2.035h4.43c-0.058
-0.921-0.279-1.611-0.664-2.073-0.389-0.459-0.907-0.69-1.562-0.69zm12.094 9.967c-1.729 0-3.065-0.516-4.008-1.545-0.942-1.031-1.413-2.467-1.413-4.309 0-1.885 0.475-3.354 1.424-4.403 0.949-1.052 2.296-1.577 4.039-1.577 1.344 0 2.454 0.338 3.333 1.013s1.431 1.606 1.656 2.795l-2.985 0.147c-0.084-0.584-0.295-1.049-0.633-1.398-0.337-0.347-0.815-0.521-1.434-0.521-1.526 0-2.289 1.276-2.289 3.829 0 2.63 0.777 3.944 2.331 3.944 0.562 0 1.033-0.178 1.413-0.532 0.38-0.356 0.615-0.885 0.707-1.588l2.974 0.138c-0.105 0.78-0.386 1.477-0.839 2.088s-1.049 1.085-1.787 1.418c-0.738 0.334-1.568 0.501-2.489 0.501zm12.674-0.38c-0.731 0.239-1.564 0.358-2.499 0.358-0.872 0-1.544-0.236-2.015-0.713-0.472-0.473-0.707-1.192-0.707-2.156v-6.729h-1.444v-2.004h1.592l0.929-2.679h1.856v2.679h2.162v2.004h-2.162v5.928c0 0.555 0.105 0.965 0.316 1.228 0.211 0.265 0.537 0.396 0.98 0.396 0.232 0 0.562-0.05 0.991-0.147v1.835h0.001z"/>
+ <path fill="#fff" d="m447.23 471.84h-3.133l-1.813-6.961c-0.085-0.316-0.25-1.097-0.496-2.341l-0.548 2.362-1.836 6.939h-3.132l-2.953-11.411h2.784l1.877 8.722 0.148-0.781 0.264-1.233 1.793-6.707h3.174l1.751 6.707c0.099 0.366 0.243 1.036 0.433 2.015l0.295-1.394 1.646-7.328h2.742l-2.996 11.411zm15.392-5.716c0 1.849-0.514 3.299-1.54 4.35s-2.446 1.577-4.261 1.577c-1.779 0-3.175-0.527-4.188-1.582-1.012-1.055-1.519-2.503-1.519-4.345 0-1.836 0.507-3.279 1.519-4.33 1.013-1.052 2.43-1.576 4.251-1.576 1.863 0 3.286 0.507 4.267 1.523s1.471 2.477 1.471 4.383zm-5.832 3.902c1.82 0 2.731-1.301 2.731-3.902 0-1.357-0.222-2.342-0.665-2.953-0.442-0.612-1.086-0.919-1.93-0.919-1.8 0-2.7 1.291-2.7 3.872 0 1.272 0.221 2.24 0.66 2.904 0.441 0.665 1.074 0.998 1.904 0.998zm8.166 1.814v-8.732c0-0.626-0.009-1.148-0.026-1.567-0.018-0.418-0.036-0.788-0.058-1.111h2.826c0.021 0.126 0.05 0.511 0.085 1.154s0.053 1.069 0.053 1.28h0.042c0.288-0.802 0.545-1.365 0.77-1.692 0.226-0.326 0.492-0.569 0.802-0.728s0.696-0.237
1.16-0.237c0.38 0 0.686 0.054 0.918 0.159v2.478c-0.479-0.105-0.9-0.157-1.266-0.157-0.738 0-1.313 0.298-1.726 0.896-0.411 0.598-0.616 1.483-0.616 2.657v5.602h-2.964zm15.691 0-3.048-5.168-1.276 0.886v4.282h-2.964v-15.651h2.964v8.965l4.071-4.725h3.186l-4.008 4.45 4.313 6.961h-3.238zm14.212-3.333c0 1.104-0.453 1.971-1.356 2.6s-2.152 0.944-3.749 0.944c-1.567 0-2.769-0.248-3.602-0.744-0.834-0.495-1.387-1.267-1.661-2.314l2.605-0.392c0.147 0.543 0.401 0.926 0.764 1.151 0.362 0.225 0.994 0.337 1.894 0.337 0.83 0 1.435-0.105 1.814-0.316s0.569-0.541 0.569-0.991c0-0.365-0.153-0.656-0.459-0.87-0.306-0.215-0.824-0.396-1.556-0.543-1.673-0.33-2.802-0.639-3.385-0.924-0.584-0.284-1.029-0.653-1.335-1.107-0.306-0.453-0.458-1.011-0.458-1.672 0-1.09 0.419-1.938 1.26-2.547 0.84-0.607 2.03-0.912 3.57-0.912 1.357 0 2.448 0.265 3.274 0.792s1.341 1.289 1.546 2.287l-2.627 0.274c-0.084-0.464-0.291-0.81-0.622-1.038s-0.854-0.343-1.571-0.343c-0.703 0-1.23 0.09-1.582 0.269-0.352 0.18-0.527 0.479-0.527 0.901 0 0.33
0.135 0.593 0.405 0.786s0.727 0.353 1.366 0.479c0.894 0.183 1.686 0.371 2.378 0.564s1.248 0.425 1.667 0.691c0.418 0.268 0.752 0.609 1.002 1.028s0.376 0.957 0.376 1.61zm13.19-2.426c0 1.906-0.382 3.377-1.146 4.414-0.763 1.037-1.84 1.556-3.231 1.556-0.802 0-1.5-0.175-2.095-0.522-0.594-0.348-1.049-0.849-1.365-1.502h-0.062c0.042 0.211 0.062 0.851 0.062 1.919v4.377h-2.963v-13.269c0-1.076-0.028-1.95-0.085-2.625h2.88c0.035 0.126 0.064 0.375 0.089 0.747 0.024 0.373 0.037 0.743 0.037 1.108h0.042c0.668-1.398 1.885-2.1 3.649-2.1 1.329 0 2.359 0.512 3.091 1.535 0.731 1.024 1.097 2.478 1.097 4.362zm-5.464 3.945c1.582 0 2.373-1.315 2.373-3.945 0-2.559-0.783-3.839-2.352-3.839-0.787 0-1.391 0.345-1.81 1.034-0.418 0.688-0.627 1.652-0.627 2.89 0 1.23 0.209 2.181 0.627 2.853 0.42 0.67 1.016 1.007 1.789 1.007zm14.361-0.221c-0.829 1.497-2.081 2.246-3.755 2.246-1.104 0-1.965-0.301-2.584-0.902-0.618-0.601-0.928-1.446-0.928-2.536 0-1.181 0.385-2.081 1.154-2.699 0.77-0.619 1.887-0.936 3.35-0.949l2.457-0.043v
-0.581c0-0.745-0.13-1.298-0.391-1.66-0.26-0.362-0.686-0.543-1.275-0.543-0.549 0-0.952 0.124-1.209 0.374-0.256 0.25-0.416 0.662-0.479 1.238l-3.091-0.147c0.19-1.11 0.697-1.952 1.523-2.525s1.954-0.858 3.381-0.858c1.441 0 2.553 0.354 3.333 1.063s1.171 1.721 1.171 3.028v4.155c0 0.64 0.071 1.081 0.216 1.323 0.144 0.242 0.385 0.364 0.723 0.364 0.225 0 0.443-0.021 0.654-0.063v1.604c-0.176 0.042-0.334 0.081-0.475 0.116s-0.281 0.063-0.422 0.084-0.291 0.039-0.449 0.053c-0.158 0.015-0.342 0.021-0.553 0.021-0.746 0-1.297-0.183-1.651-0.549-0.355-0.365-0.567-0.903-0.638-1.613h-0.062v-0.001zm-0.306-3.25-1.519 0.021c-0.689 0.028-1.178 0.104-1.466 0.228-0.289 0.123-0.509 0.312-0.66 0.564s-0.227 0.591-0.227 1.013c0 0.541 0.125 0.943 0.374 1.207 0.25 0.264 0.583 0.396 0.997 0.396 0.465 0 0.888-0.126 1.271-0.379 0.384-0.254 0.685-0.604 0.902-1.051 0.218-0.446 0.327-0.918 0.327-1.418v-0.581zm10.551 5.496c-1.73 0-3.066-0.516-4.008-1.546-0.942-1.029-1.414-2.467-1.414-4.309 0-1.885 0.477-3.352 1.426-4.402 0
.949-1.052 2.294-1.576 4.038-1.576 1.343 0 2.454 0.337 3.333 1.012 0.879 0.676 1.431 1.605 1.656 2.794l-2.985 0.147c-0.085-0.583-0.296-1.049-0.633-1.396-0.338-0.348-0.815-0.522-1.435-0.522-1.525 0-2.287 1.277-2.287 3.829 0 2.63 0.775 3.945 2.329 3.945 0.562 0 1.034-0.179 1.413-0.533 0.38-0.355 0.615-0.885 0.708-1.588l2.975 0.138c-0.105 0.78-0.386 1.477-0.839 2.089-0.454 0.611-1.051 1.084-1.789 1.418s-1.567 0.5-2.488 0.5zm16.851-3.101c-0.809 2.067-2.451 3.101-4.926 3.101-1.716 0-3.034-0.509-3.955-1.524s-1.382-2.497-1.382-4.445c0-1.884 0.468-3.332 1.403-4.345s2.26-1.519 3.976-1.519c1.639 0 2.89 0.542 3.755 1.629 0.865 1.086 1.297 2.676 1.297 4.771v0.084h-7.319c0 1.111 0.205 1.95 0.616 2.517 0.412 0.565 0.998 0.85 1.757 0.85 1.048 0 1.709-0.454 1.983-1.362l2.795 0.243zm-4.925-6.867c-0.696 0-1.232 0.244-1.609 0.729-0.376 0.485-0.574 1.163-0.595 2.035h4.43c-0.057-0.922-0.278-1.611-0.665-2.072s-0.907-0.692-1.561-0.692z"/>
+ <path fill-rule="evenodd" fill="#010101" d="m158.58 241.56zm-13.679-115.68zm3.479 0v86.64h-3.479l6.84 29.04 6.84-29.04h-3.48v-86.64h-6.721z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <polygon transform="translate(-2.779 0.000005)" points="154.52 241.56 161.36 212.52 157.88 212.52 157.88 125.88 151.16 125.88 151.16 212.52 147.68 212.52"/>
+ <path d="m144.9 125.88z"/>
+ <path d="m158.58 241.56z"/>
+ </g>
+ <path fill-rule="evenodd" fill="#010101" d="m496.14 381zm-13.561-115.68zm3.361 0v86.76h-3.36l6.72 28.921 6.841-28.921h-3.36v-86.76h-6.841z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <polygon transform="translate(-2.779 0.000005)" points="492.08 381 498.92 352.08 495.56 352.08 495.56 265.32 488.72 265.32 488.72 352.08 485.36 352.08"/>
+ <path d="m482.58 265.32z"/>
+ <path d="m496.14 381z"/>
+ </g>
+ <path fill-rule="evenodd" fill="#010101" d="m378.18 217.08zm-110.64 49.199zm1.68 2.761 78.12-45.121-1.56-2.76 29.16-9.6-22.8 20.521-1.681-2.761-78.12 45.24-3.119-5.519z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <polygon transform="translate(-2.779 0.000005)" points="377.72 211.56 354.92 232.08 353.24 229.32 275.12 274.56 272 269.04 350.12 223.92 348.56 221.16"/>
+ <path d="m267.54 266.28z"/>
+ <path d="m378.18 217.08z"/>
+ </g>
+ <path fill-rule="evenodd" fill="#010101" d="m273.78 364.08zm97.92 71.161zm1.559-2.761-78.119-45.12-1.681 2.76-22.92-20.52 29.28 9.479-1.561 2.881 78.121 45.119-3.12 5.401z"/>
+ <g stroke-width="0" stroke-miterlimit="10" fill="none">
+ <polygon transform="translate(-2.779 0.000005)" points="273.32 369.6 302.6 379.08 301.04 381.96 379.16 427.08 376.04 432.48 297.92 387.36 296.24 390.12"/>
+ <path d="m371.7 435.24z"/>
+ <path d="m273.78 364.08z"/>
+ </g>
+ <g fill="#010101">
+ <path d="m12.487 191.76-12.487-6.24l12.487-6.243v1.74l-8.996 4.503 8.996 4.493v1.751zm4.4-13.532v-2.077h2.077v2.077h-2.077zm0 13.532v-11.454h2.077v11.454h-2.077zm8.485 0-4.261-11.454h2.077l3.333 8.912 3.513-8.912h1.94l-4.524 11.454h-2.078zm9.545 4.166 1.856-4.166-4.43-11.454h2.246l3.28 8.627 3.502-8.627h1.961l-6.254 15.62h-2.161zm10.798-13.532v-2.088h2.078v2.088h-2.078zm0 9.366v-2.078h2.078v2.078h-2.078zm6.53-13.532v-2.077h2.078v2.077h-2.078zm0 13.532v-11.454h2.078v11.454h-2.078zm6.114 0v-11.454h2.077v2.151c1.097-1.603 2.44-2.404 4.029-2.404 0.991 0 1.782 0.314 2.373 0.943 0.591 0.63 0.886 1.476 0.886 2.537v8.227h-2.078v-7.552c0-0.851-0.124-1.457-0.374-1.819s-0.663-0.543-1.239-0.543c-1.272 0-2.472 0.833-3.597 2.499v7.415h-2.077zm16.451 0.263c-0.949 0-2.103-0.222-3.46-0.665v-1.908c1.357 0.675 2.539 1.012 3.544 1.012 0.598 0 1.094-0.161 1.487-0.484 0.394-0.324 0.591-0.729 0.591-1.213 0-0.711-0.552-1.298-1.656-1.762l-1.213-0.517c-1.793-0.745-2.689-1.817-2.689-3.217 0-0.999 0.354-1.
784 1.061-2.357 0.706-0.573 1.675-0.859 2.905-0.859 0.64 0 1.431 0.088 2.373 0.264l0.433 0.084v1.729c-1.16-0.344-2.081-0.517-2.764-0.517-1.336 0-2.004 0.485-2.004 1.456 0 0.625 0.507 1.152 1.519 1.582l1.002 0.422c1.133 0.478 1.934 0.982 2.405 1.513s0.706 1.194 0.706 1.988c0 1.006-0.396 1.832-1.191 2.479-0.796 0.647-1.812 0.97-3.049 0.97zm12.996-0.263c-0.64 0.176-1.195 0.264-1.666 0.264-1.055 0-1.877-0.303-2.468-0.907s-0.886-1.445-0.886-2.521v-6.729h-1.435v-1.561h1.435v-2.078l2.077-0.2v2.278h2.995v1.561h-2.995v6.35c0 1.498 0.647 2.246 1.94 2.246 0.274 0 0.608-0.045 1.002-0.137v1.434h0.001zm10.693 0.263c-0.971 0-1.589-0.573-1.856-1.72-1.244 1.146-2.443 1.72-3.597 1.72-0.949 0-1.736-0.297-2.362-0.892-0.626-0.594-0.938-1.345-0.938-2.252 0-1.251 0.525-2.213 1.576-2.884 1.052-0.672 2.558-1.008 4.52-1.008h0.496v-1.382c0-1.328-0.683-1.993-2.046-1.993-1.098 0-2.282 0.338-3.555 1.013v-1.719c1.399-0.57 2.711-0.854 3.934-0.854 1.28 0 2.224 0.288 2.832 0.864 0.608 0.577 0.912 1.474 0.912 2.689v5
.189c0 1.188 0.366 1.782 1.098 1.782 0.091 0 0.225-0.014 0.4-0.042l0.147 1.149c-0.471 0.228-0.991 0.34-1.561 0.34zm-4.862-1.698c0.865 0 1.765-0.383 2.7-1.149v-2.964l-0.696-0.021c-1.139 0-2.061 0.217-2.764 0.649s-1.055 1-1.055 1.703c0 0.499 0.176 0.921 0.527 1.266s0.782 0.516 1.288 0.516zm9.088 1.435v-16.653h2.078v16.653h-2.078zm6.112 0v-16.653h2.078v16.653h-2.078zm6.2 3.122 5.622-18.731h1.635l-5.622 18.731h-1.635zm11.69-3.122 12.488-6.244-12.488-6.243v1.74l8.997 4.503-8.997 4.493v1.751z"/>
+ <path d="m515.89 331.2-12.487-6.244 12.487-6.244v1.74l-8.996 4.504 8.996 4.493v1.751zm4.399-13.532v-2.077h2.077v2.077h-2.077zm0 13.532v-11.454h2.077v11.454h-2.077zm8.487 0-4.261-11.454h2.078l3.332 8.912 3.513-8.912h1.94l-4.524 11.454h-2.078zm9.545 4.166 1.856-4.166-4.43-11.454h2.246l3.28 8.627 3.502-8.627h1.962l-6.255 15.62h-2.161zm10.798-13.532v-2.088h2.078v2.088h-2.078zm0 9.366v-2.078h2.078v2.078h-2.078zm6.529 0v-11.454h2.078v2.151c0.822-1.604 2.018-2.404 3.586-2.404 0.211 0 0.433 0.018 0.664 0.053v1.94c-0.358-0.12-0.675-0.18-0.949-0.18-1.314 0-2.415 0.78-3.301 2.342v7.552h-2.078zm17.166-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.064-0.561-4.13-1.684-1.065-1.12-1.598-2.574-1.598-4.36 0-1.736 0.469-3.16 1.408-4.271 0.938-1.11 2.14-1.666 3.602-1.666 1.386 0 2.455 0.492 3.211 1.477s1.135 2.384 1.135 4.197l-0.011 0.644h-7.225c0.303 2.721 1.635 4.082 3.997 4.082 0.865 0 1.927-0.232 3.186-0.696v1.644zm-4.419-9.788c-1.597 0-2.485 1.065-2.669 3.196h5.053c0-2.131-0.795-3.196-
2.384-3.196zm13.225 10.157c-0.64 0.174-1.195 0.264-1.667 0.264-1.055 0-1.877-0.303-2.468-0.907s-0.886-1.445-0.886-2.521v-6.729h-1.435v-1.561h1.435v-2.078l2.078-0.2v2.278h2.995v1.561h-2.995v6.35c0 1.497 0.646 2.246 1.94 2.246 0.274 0 0.608-0.046 1.002-0.137v1.434h0.001zm2.929 0v-11.454h2.077v2.151c0.823-1.604 2.019-2.404 3.586-2.404 0.211 0 0.433 0.018 0.665 0.053v1.94c-0.358-0.12-0.675-0.18-0.949-0.18-1.315 0-2.415 0.78-3.302 2.342v7.552h-2.077zm8.771-13.532v-2.077h2.077v2.077h-2.077zm0 13.532v-11.454h2.077v11.454h-2.077zm14.637-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.064-0.561-4.13-1.684-1.065-1.12-1.598-2.574-1.598-4.36 0-1.736 0.469-3.16 1.407-4.271 0.939-1.11 2.141-1.666 3.603-1.666 1.386 0 2.455 0.492 3.211 1.477s1.135 2.384 1.135 4.197l-0.011 0.644h-7.225c0.303 2.721 1.635 4.082 3.997 4.082 0.865 0 1.926-0.232 3.186-0.696v1.644zm-4.419-9.788c-1.597 0-2.486 1.065-2.669 3.196h5.052c0-2.131-0.794-3.196-2.383-3.196zm10.493 10.157-4.261-11.454h2.078l3.333 8.912 3.512-8
.912h1.94l-4.524 11.454h-2.078zm17.189-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.064-0.561-4.13-1.684-1.065-1.12-1.598-2.574-1.598-4.36 0-1.736 0.469-3.16 1.408-4.271 0.938-1.11 2.14-1.666 3.602-1.666 1.386 0 2.455 0.492 3.211 1.477s1.135 2.384 1.135 4.197l-0.011 0.644h-7.225c0.303 2.721 1.635 4.082 3.997 4.082 0.865 0 1.927-0.232 3.186-0.696v1.644zm-4.419-9.788c-1.597 0-2.485 1.065-2.669 3.196h5.053c0-2.131-0.795-3.196-2.384-3.196zm8.384 10.157 12.487-6.244-12.487-6.244v1.74l8.996 4.504-8.996 4.493v1.751z"/>
+ <path d="m260.77 463.92-12.488-6.243 12.488-6.244v1.74l-8.997 4.504 8.997 4.493v1.75zm4.398-13.531v-2.078h2.078v2.078h-2.078zm0 13.531v-11.453h2.078v11.453h-2.078zm8.487 0-4.262-11.453h2.078l3.333 8.912 3.512-8.912h1.94l-4.524 11.453h-2.077zm9.545 4.166 1.855-4.166-4.43-11.453h2.247l3.28 8.627 3.501-8.627h1.962l-6.254 15.619h-2.161zm10.797-13.531v-2.088h2.078v2.088h-2.078zm0 9.365v-2.077h2.078v2.077h-2.078zm6.531 4.166v-15.619h2.078v2.151c0.851-1.604 2.127-2.405 3.828-2.405 1.378 0 2.463 0.503 3.254 1.509 0.791 1.005 1.187 2.38 1.187 4.124 0 1.898-0.448 3.43-1.345 4.592-0.896 1.165-2.076 1.746-3.539 1.746-1.356 0-2.485-0.52-3.385-1.561v5.463h-2.078zm2.078-6.897c1.068 0.956 2.088 1.435 3.059 1.435 1.996 0 2.995-1.522 2.995-4.566 0-2.686-0.886-4.029-2.658-4.029-1.16 0-2.292 0.629-3.396 1.888v5.272zm18.647 2.731v-2.151c-1.104 1.61-2.443 2.415-4.018 2.415-0.999 0-1.793-0.313-2.384-0.944-0.591-0.628-0.886-1.477-0.886-2.546v-8.227h2.078v7.551c0 0.859 0.124 1.469 0.374 1.83 0.249 0.363
0.666 0.543 1.25 0.543 1.265 0 2.46-0.833 3.585-2.499v-7.425h2.078v11.453h-2.077zm6.167 0.127v-16.78h2.077v7.352c0.851-1.604 2.127-2.405 3.829-2.405 1.378 0 2.462 0.503 3.253 1.509 0.791 1.005 1.187 2.38 1.187 4.124 0 1.898-0.448 3.43-1.345 4.592-0.896 1.165-2.075 1.746-3.538 1.746-1.357 0-2.485-0.52-3.386-1.561l-0.253 1.424h-1.824zm2.077-2.858c1.069 0.956 2.089 1.435 3.059 1.435 1.997 0 2.995-1.522 2.995-4.566 0-2.686-0.886-4.029-2.657-4.029-1.16 0-2.292 0.629-3.396 1.888v5.272zm11.488 2.731v-16.653h2.077v16.653h-2.077zm6.242-13.531v-2.078h2.078v2.078h-2.078zm0 13.531v-11.453h2.078v11.453h-2.078zm9.15 0.264c-0.949 0-2.103-0.221-3.46-0.664v-1.909c1.357 0.675 2.538 1.013 3.544 1.013 0.598 0 1.094-0.162 1.487-0.485s0.591-0.728 0.591-1.213c0-0.71-0.553-1.297-1.656-1.761l-1.213-0.518c-1.793-0.744-2.689-1.817-2.689-3.217 0-0.998 0.354-1.783 1.061-2.357 0.707-0.572 1.675-0.859 2.905-0.859 0.64 0 1.431 0.088 2.373 0.264l0.433 0.085v1.729c-1.16-0.345-2.082-0.517-2.764-0.517-1.336 0-2.004 0
.485-2.004 1.455 0 0.627 0.506 1.154 1.519 1.582l1.002 0.422c1.132 0.479 1.934 0.983 2.405 1.513 0.471 0.532 0.706 1.194 0.706 1.989 0 1.007-0.397 1.831-1.191 2.479-0.796 0.645-1.811 0.969-3.049 0.969zm7.979-0.264v-16.653h2.078v7.352c1.097-1.604 2.439-2.405 4.029-2.405 0.991 0 1.782 0.315 2.373 0.943 0.59 0.631 0.886 1.477 0.886 2.537v8.227h-2.078v-7.551c0-0.85-0.125-1.457-0.375-1.82-0.249-0.361-0.663-0.543-1.238-0.543-1.274 0-2.473 0.834-3.597 2.5v7.414h-2.078zm13.591 0 12.487-6.243-12.487-6.244v1.74l8.996 4.504-8.996 4.493v1.75z"/>
+ <path d="m264.13 195.24-12.487-6.243 12.487-6.244v1.74l-8.996 4.504 8.996 4.492v1.751zm4.4-13.531v-2.078h2.077v2.078h-2.077zm0 13.531v-11.454h2.077v11.454h-2.077zm8.615 0-4.261-11.454h2.078l3.332 8.912 3.513-8.912h1.94l-4.524 11.454h-2.078zm9.459 4.166 1.856-4.166-4.43-11.454h2.246l3.28 8.628 3.502-8.628h1.961l-6.254 15.62h-2.161zm10.906-13.531v-2.089h2.077v2.089h-2.077zm0 9.365v-2.077h2.077v2.077h-2.077zm6.422 0v-11.454h2.077v2.152c0.823-1.604 2.019-2.405 3.586-2.405 0.211 0 0.433 0.018 0.665 0.053v1.94c-0.358-0.119-0.675-0.179-0.949-0.179-1.315 0-2.415 0.78-3.302 2.341v7.552h-2.077zm17.164-0.369c-1.392 0.422-2.584 0.633-3.574 0.633-1.688 0-3.064-0.561-4.13-1.682-1.064-1.122-1.598-2.575-1.598-4.361 0-1.736 0.47-3.16 1.408-4.271s2.14-1.667 3.602-1.667c1.386 0 2.456 0.492 3.212 1.477s1.133 2.384 1.133 4.198l-0.011 0.644h-7.224c0.303 2.721 1.635 4.081 3.997 4.081 0.864 0 1.926-0.231 3.185-0.696v1.644zm-4.418-9.787c-1.597 0-2.486 1.065-2.669 3.195h5.052c0-2.13-0.794-3.195-2.383-3.1
95zm11.157 10.42c-0.949 0-2.104-0.222-3.459-0.664v-1.909c1.355 0.675 2.537 1.013 3.544 1.013 0.597 0 1.092-0.162 1.485-0.485 0.395-0.323 0.591-0.728 0.591-1.213 0-0.71-0.552-1.297-1.654-1.762l-1.214-0.517c-1.793-0.744-2.688-1.817-2.688-3.217 0-0.998 0.353-1.784 1.06-2.357 0.706-0.572 1.674-0.859 2.906-0.859 0.639 0 1.43 0.089 2.371 0.264l0.434 0.085v1.729c-1.16-0.344-2.082-0.517-2.763-0.517-1.337 0-2.004 0.484-2.004 1.455 0 0.626 0.506 1.153 1.519 1.582l1.001 0.422c1.132 0.479 1.934 0.982 2.404 1.514 0.472 0.53 0.708 1.193 0.708 1.988 0 1.006-0.398 1.831-1.193 2.479-0.795 0.647-1.811 0.969-3.048 0.969zm12.461 0c-1.639 0-2.946-0.543-3.924-1.629-0.977-1.087-1.466-2.54-1.466-4.361 0-1.842 0.49-3.3 1.471-4.372s2.312-1.608 3.993-1.608c1.68 0 3.01 0.536 3.991 1.608 0.98 1.072 1.472 2.522 1.472 4.351 0 1.871-0.492 3.34-1.477 4.409s-2.337 1.602-4.06 1.602zm-3.175-5.99c0 2.953 1.069 4.43 3.206 4.43 2.201 0 3.302-1.483 3.302-4.451 0-2.932-1.087-4.397-3.259-4.397-2.166-0.001-3.249 1.471-3.249
4.418zm11.89 5.726v-16.653h2.078v16.653h-2.078zm8.486 0-4.262-11.454h2.078l3.333 8.912 3.512-8.912h1.94l-4.524 11.454h-2.077zm17.276-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.063-0.561-4.129-1.682-1.065-1.122-1.599-2.575-1.599-4.361 0-1.736 0.471-3.16 1.409-4.271s2.139-1.667 3.601-1.667c1.386 0 2.457 0.492 3.213 1.477s1.133 2.384 1.133 4.198l-0.011 0.644h-7.225c0.303 2.721 1.635 4.081 3.997 4.081 0.865 0 1.927-0.231 3.186-0.696v1.644zm-4.419-9.787c-1.597 0-2.485 1.065-2.669 3.195h5.053c0-2.13-0.795-3.195-2.384-3.195zm8.384 10.156 12.487-6.243-12.487-6.244v1.74l8.996 4.504-8.996 4.492v1.751z"/>
+ </g>
+</svg>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/open.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/open.gif b/asciidoc/images/open.gif
new file mode 100644
index 0000000..bd0be79
Binary files /dev/null and b/asciidoc/images/open.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/report-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/report-small.png b/asciidoc/images/report-small.png
new file mode 100644
index 0000000..2868867
Binary files /dev/null and b/asciidoc/images/report-small.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/searched.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/searched.gif b/asciidoc/images/searched.gif
new file mode 100644
index 0000000..7e7437b
Binary files /dev/null and b/asciidoc/images/searched.gif differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/warning.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/warning.png b/asciidoc/images/warning.png
new file mode 100644
index 0000000..283cc71
Binary files /dev/null and b/asciidoc/images/warning.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/xooki-edit-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/xooki-edit-small.png b/asciidoc/images/xooki-edit-small.png
new file mode 100644
index 0000000..9d9eb39
Binary files /dev/null and b/asciidoc/images/xooki-edit-small.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/xooki-edit.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/xooki-edit.png b/asciidoc/images/xooki-edit.png
new file mode 100644
index 0000000..808a23b
Binary files /dev/null and b/asciidoc/images/xooki-edit.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/xooki-toolbar.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/xooki-toolbar.png b/asciidoc/images/xooki-toolbar.png
new file mode 100644
index 0000000..bfe266e
Binary files /dev/null and b/asciidoc/images/xooki-toolbar.png differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step1.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step1.jpg b/asciidoc/images/yed-step1.jpg
new file mode 100644
index 0000000..9eb99e4
Binary files /dev/null and b/asciidoc/images/yed-step1.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step2.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step2.jpg b/asciidoc/images/yed-step2.jpg
new file mode 100644
index 0000000..300c20b
Binary files /dev/null and b/asciidoc/images/yed-step2.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step3-2.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step3-2.jpg b/asciidoc/images/yed-step3-2.jpg
new file mode 100644
index 0000000..2f7d200
Binary files /dev/null and b/asciidoc/images/yed-step3-2.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step3.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step3.jpg b/asciidoc/images/yed-step3.jpg
new file mode 100644
index 0000000..638d692
Binary files /dev/null and b/asciidoc/images/yed-step3.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step4.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step4.jpg b/asciidoc/images/yed-step4.jpg
new file mode 100644
index 0000000..1803a53
Binary files /dev/null and b/asciidoc/images/yed-step4.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step5.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step5.jpg b/asciidoc/images/yed-step5.jpg
new file mode 100644
index 0000000..39ce414
Binary files /dev/null and b/asciidoc/images/yed-step5.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step6.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step6.jpg b/asciidoc/images/yed-step6.jpg
new file mode 100644
index 0000000..880472d
Binary files /dev/null and b/asciidoc/images/yed-step6.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step7.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step7.jpg b/asciidoc/images/yed-step7.jpg
new file mode 100644
index 0000000..407d9d7
Binary files /dev/null and b/asciidoc/images/yed-step7.jpg differ
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/index.adoc b/asciidoc/index.adoc
new file mode 100644
index 0000000..210e156
--- /dev/null
+++ b/asciidoc/index.adoc
@@ -0,0 +1,69 @@
+
+Welcome to the official Ivy documentation.
+
+
+== What is Ivy?
+
+Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies. It is characterized by the following:
+
+
+. flexibility and configurability - Ivy is essentially process agnostic and is not tied to any methodology or structure. Instead it provides the necessary flexibility and configurability to be adapted to a broad range of dependency management and build processes. +
+
+
+. tight integration with Apache Ant - while available as a standalone tool, Ivy works particularly well with Apache Ant providing a number of powerful Ant tasks ranging from dependency resolution to dependency reporting and publication. +
+
+Ivy is open source and released under a very permissive Apache License.
+
+Ivy has a lot of powerful features, the most popular and useful being its flexibility, integration with ant, and its strong transitive dependencies management engine.
+
+The transitive dependencies management is a feature which lets you get dependencies of your dependencies, transitively. In order to address this general problem, ivy needs to find metadata about your modules, usually in an link:ivyfile.html[ivy file]. To find the metadata and your dependencies' artifacts (usually jars), Ivy can be configured to use a lot of different link:configuration/resolvers.html[repositories].
+
+
+== About this doc
+
+
+[NOTE]
+====
+
+Tip: The menu on the left is dynamic, you can click on the arrows to browse the menu without going to each page.
+
+====
+
+This documentation has been migrated from the old Ivy web site hosted by Jayasoft, feel free to report any problem on the mailing-lists.
+
+If you browse this documentation from your installation of Ivy, you can also check the link:http://ant.apache.org/ivy/[online version] for the latest updates.
+
+You can also browse this documentation offline either by downloading the documentation distribution, or by checking out the doc directory from git. This documentation uses link:http://xooki.sourceforge.net/[xooki] as its documentation engine, so you can very easily edit it and submit patches when you browse it from source.
+
+A link:book.html[printer-friendly version] of this whole documentation is also provided for your convenience.
+
+Since Ivy 2.0.0-alpha-2, we keep an online history of the documentation. You can thus browse history versions online (in the history menu in the web site) and even check the trunk version documentation currently in development.
+
+For earlier versions, we suggest downloading the documentation to browse the documentation corresponding to the version you use. The full history of Ivy versions with corresponding links for download is available in the history menu on the web site.
+
+
+== Other places to go
+
+Check out Ivy features.
+Read our FAQ.
+Ask for help on our mailing lists.
+Report a bug or feature request in our issue tracking system.
+Check external tools and resources.
+
+
+== Overview
+
+This documentation is composed of three main parts:
+
+
+* link:tutorial.html[Tutorials] +
+The tutorials is the best way to begin to play with Ivy. You will easily and quickly learn the basics of Ivy.
+
+* link:reference.html[Reference] +
+The reference documentation gives you all the details of Ivy.
+The introduction part is particularly useful: it defines some vocabulary, explains main concepts such as dependency resolvers and patterns, and gives an overview of how ivy works internally.
+It's also in the reference doc that you will find all you always dreamed to know about ivy settings, ivy files, and ivy use (especially with ant).
+
+* link:dev.html[Developer doc] +
+The developers's doc is useful for users who would like to extend Ivy or build it from source. It's also the documentation used by the Ivy team, so you will also find information about how we make releases.
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/install.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/install.adoc b/asciidoc/install.adoc
new file mode 100644
index 0000000..aa9def6
--- /dev/null
+++ b/asciidoc/install.adoc
@@ -0,0 +1,74 @@
+
+There are basically two ways to install Ivy: either manually or automatically.
+
+== Manually
+
+Download the version you want here, unpack the downloaded zip file wherever you want, and copy the ivy jar file into your ant lib directory (ANT_HOME/lib).
+
+If you use ant 1.6.0 or superior, you can then simply go to the src/example/hello-ivy dir and run ant: if the build is successful, you have successfully installed Ivy!
+
+If you use ant 1.5.1 or superior, you have to modify the build files in the examples:
+- remove the namespace section at their head: xmlns:ivy="antlib:org.apache.ivy.ant"
+- add taskdefs for ivy tasks:
+
+[source]
+----
+
+ <taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
+ <taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
+ <taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
+ <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/>
+
+----
+
+- replace ivy:xxx tasks by ivy-xxx
+You can now run the build, if it is successful, you have successfully installed Ivy!
+
+If the build is not successful, check the FAQ to see what might be the problem with the ivyrep resolver.
+
+
+=== Ivy dependendencies
+
+
+One of the two binary versions of Ivy doesn't include the optional dependencies. To download them using Ivy, all you need is to run the Ant build file provided in the distribution. This will use Ivy itself to download the dependencies. Then you should see the Ivy optional dependencies in the lib directory, organized per configuration (see the ivy.xml for details about the configurations and their use).
+
+
+== Automatically
+
+If you want to use Ivy only in your ant build scripts, and have an internet connection when you build, you can download Ivy from this site and use the downloaded version automatically, using this simple build snippet:
+
+[source]
+----
+
+ <property name="ivy.install.version" value="2.1.0-rc2" />
+ <condition property="ivy.home" value="${env.IVY_HOME}">
+ <isset property="env.IVY_HOME" />
+ </condition>
+ <property name="ivy.home" value="${user.home}/.ant" />
+ <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+ <target name="download-ivy" unless="offline">
+
+ <mkdir dir="${ivy.jar.dir}"/>
+ <!-- download Ivy from web site so that it can be used even without any special installation -->
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <target name="init-ivy" depends="download-ivy">
+ <!-- try to load ivy here from ivy home, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as local lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the local lib dir. -->
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+----
+
+Then the only thing to do is to add the init-ivy target in the depends attribute of your targets using Ivy, and add the ivy namespace to your build script. See the self contained link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/go-ivy/build.xml[go-ivy] example for details about this.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile.adoc b/asciidoc/ivyfile.adoc
new file mode 100644
index 0000000..4d8fe7c
--- /dev/null
+++ b/asciidoc/ivyfile.adoc
@@ -0,0 +1,126 @@
+
+Ivy use is entirely based on _module descriptors_ known as "ivy files". Ivy files are xml files, usually called ivy.xml, containing the description of the dependencies of a module, its published artifacts and its configurations.
+
+Here is the simplest ivy file you can write:
+
+[source]
+----
+
+<ivy-module version="2.0">
+ <info organisation="myorg"
+ module="mymodule"
+ />
+</ivy-module>
+
+----
+
+If you want to see a sample module descriptor using almost all possibilities of ivy files, check this one, link:samples/ivy-sample-xslt.xml[with] or link:samples/ivy-sample.xml[without] xslt.
+
+Before beginning the reference itself, it is required to have in mind the terminology defined in the link:reference.html[main page] of this reference documentation.
+
+For those familiar with xml schema, the schema used to validate ivy files can be found link:http://ant.apache.org/ivy/schemas/ivy.xsd[here]. For those using xsd aware IDE, you can declare the xsd in your ivy files to benefit from code completion / validation:
+
+[source]
+----
+
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://ant.apache.org/ivy/schemas/ivy.xsd">
+ <info organisation="myorg"
+ module="mymodule"
+ />
+</ivy-module>
+
+----
+
+
+=== Dynamic and [[resolved]]resolved ivy files
+
+
+A module descriptor (ivy file) is needed both before and after the publication of each revision of the module. Depending on the case, a module descriptor can be either _dynamic_ or _resolved_:
+
+
+==== Dynamic descriptor for module development
+
+
+During the module development time, between publications, the descriptor helps in managing all the possibly changing dependencies of the module. For that purpose, development time ivy files can declare dynamic dependencies to allow for a greater flexibility of use. link:ivyfile/dependency.html#revision[Dynamic revision] references like "latest.integration" or "1.0.+" are possible and may resolve to different artifacts at different times. Variables can be used for even more flexibility. Development time ivy files are hence called "dynamic", because they can produce different results over time. The dynamic ivy files are normally considered source files and kept with them (under SCM control).
+
+
+==== Resolved descriptors for publishing
+
+
+At each publication, another kind of a module descriptor is needed to document the dependencies of the particular published revision of the module. For that purpose, the descriptor usually needs to be fixed as its dependencies should no longer change. In doing so, the published module revision gets fixed, explicitly resolved dependencies. No variables are allowed either. Such publication-friendly, static ivy files are called "resolved", because they should always produce the same results. The resolved ivy files are comparable to published artifacts and are kept with them in a repository.
+
+Resolved ivy files are generated from their original dynamic ivy files via the link:use/deliver.html[deliver] task.
+
+Note that although it is technically possible to publish module revisions with dynamic ivy files, it is not a generally recommended practice.
+
+
+== Hierarchical Index
+
+
+[source]
+----
+
+ivy-module
+ link:ivyfile/info.html[info]
+ link:ivyfile/license.html[license]
+ link:ivyfile/ivyauthor.html[ivyauthor]
+ link:ivyfile/repository.html[repository]
+ link:ivyfile/description.html[description]
+ link:ivyfile/configurations.html[configurations]
+ link:ivyfile/conf.html[conf]
+ link:ivyfile/publications.html[publications]
+ link:ivyfile/artifact.html[artifact]
+ link:ivyfile/artifact-conf.html[conf]
+ link:ivyfile/dependencies.html[dependencies]
+ link:ivyfile/dependency.html[dependency]
+ link:ivyfile/dependency-conf.html[conf]
+ link:ivyfile/mapped.html[mapped]
+ link:ivyfile/dependency-artifact.html[artifact]
+ link:ivyfile/dependency-artifact-conf.html[conf]
+ link:ivyfile/dependency-artifact.html[include]
+ link:ivyfile/dependency-artifact-conf.html[conf]
+ link:ivyfile/artifact-exclude.html[exclude]
+ link:ivyfile/artifact-exclude-conf.html[conf]
+ link:ivyfile/exclude.html[exclude]
+ link:ivyfile/override.html[override]
+ link:ivyfile/conflict.html[conflict]
+ link:ivyfile/conflicts.html[conflicts]
+ link:ivyfile/manager.html[manager]
+
+----
+
+
+
+
+== ivy-module
+
+*Tag:* ivy-module
+
+The root tag of any ivy file (module descriptor).
+
+=== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|version|the version of the ivy file specification - should be '2.0' with current version of ivy|Yes
+|=======
+
+
+=== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|info|contains information about the described module|1
+|configurations|container for configuration elements|0..1
+|publications|container for published artifact elements|0..1
+|dependencies|container for dependency elements|0..1
+|conflicts|section to configure the conflict managers to use|0..1
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-conf.adoc b/asciidoc/ivyfile/artifact-conf.adoc
new file mode 100644
index 0000000..2ac2c06
--- /dev/null
+++ b/asciidoc/ivyfile/artifact-conf.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/artifact.html[artifact]
+
+
+
+Indicates a public configuration in which enclosing artifact is published.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the module public configuration in which this artifact is published.
+ '*' wildcard can be used to designate all public configurations of this module|Yes
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact-exclude-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-exclude-conf.adoc b/asciidoc/ivyfile/artifact-exclude-conf.adoc
new file mode 100644
index 0000000..e45cca3
--- /dev/null
+++ b/asciidoc/ivyfile/artifact-exclude-conf.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/artifact-exclude.html[artifact]
+
+
+
+Specify a configuration in which the enclosing artifact exclusion should be included.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the master configuration in which the enclosing artifact should be excluded|Yes
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact-exclude.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-exclude.adoc b/asciidoc/ivyfile/artifact-exclude.adoc
new file mode 100644
index 0000000..760c7ea
--- /dev/null
+++ b/asciidoc/ivyfile/artifact-exclude.adoc
@@ -0,0 +1,49 @@
+
+*Tag:* exclude *Parent:* link:../ivyfile/dependency.html[dependency]
+
+This feature gives you more control on a dependency for which you do not control its ivy file.
+It enables to restrict the artifacts required, by excluding artifacts being published by the dependency or any of its transitive dependencies,
+even if configuration does not a good separation of published artifacts
+
+The same principle concerning configuration as for include applies to this exclude feature (see the link:../ivyfile/dependency-include.html[include] feature).
+
+Note that exclusion is always done AFTER inclusion has been done.
+
+*__since 1.3__* This exclude feature can also be used not only to exclude artifacts but also to exclude whole modules. Indeed when you exclude artifacts, it doesn't avoid ivy to search for the module itself, and to resolve the dependencies of the module. But you can also exclude the whole module, which means that the module will not be downloaded at all, and so its own dependencies will not be resolved. For sure, this is usually done to exclude not a direct dependency but an indirect one. To exclude a whole module, you just have to not specify any artifact name, type and ext in your exclude rule. For instance:
+
+[source]
+----
+
+<dependency name="A" rev="1.0">
+ <exclude module="B"/>
+</dependency>
+
+----
+
+*__since 2.0__* A link:../ivyfile/exclude.html[module wide exclude] can also be used to exclude dependencies for the whole module (and not only in the context of one dependency as it is the case here).
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the organisation of the dependency module or artifact to exclude, or a regexp matching this organisation *__since 1.3__*|No, defaults to *
+|module|the name of the dependency module or the artifact to exclude, or a regexp matching this module name *__since 1.3__*|No, defaults to *
+|name|the name of an artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)|No, defaults to *
+|type|the type of the artifact of the dependency module to add to the exclude list, or a regexp matching this name|No, defaults to *
+|ext|the extension of the artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)|No, defaults to type
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules to excludes *__since 1.3__*|No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 1.3 and superior
+|conf|comma separated list of the master configurations in which this artifact should be excluded.
+ '*' wildcard can be used to designate all configurations of this module|No, defaults to '*', unless nested conf are specified
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/artifact-exclude-conf.html[conf]|configuration in which the artifact should be excluded|0..n
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact.adoc b/asciidoc/ivyfile/artifact.adoc
new file mode 100644
index 0000000..6d74c14
--- /dev/null
+++ b/asciidoc/ivyfile/artifact.adoc
@@ -0,0 +1,94 @@
+
+*Tag:* artifact *Parent:* link:../ivyfile/publications.html[publications]
+
+Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see link:../ivyfile/conf.html[configuration declaration]).
+
+The configurations in which an artifact is published can be configured in two ways:
+
+
+* conf attribute on artifact element +
+
+* conf subelement +
+
+The two are equivalent, it is only a matter of preference. However, do not mix both for one artifact.
+
+*__since 1.4__* The artifact element has default values for all its attributes, so if you want to declare a default artifact you can just declare it like that:
+[source]
+----
+
+<artifact />
+
+----
+
+If this is the only artifact declared, then it's equivalent to having no publication section at all.
+
+*__since 1.4__* It is possible to give a url at which artifacts can be found. This is not mandatory, and even not recommended. This is only a convenient way to deal with an existing repository with a bad layout, but should not be avoided in an enterprise repository.
+
+*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
+
+*__since 2.4__* This tag supports the 'packaging' attributes; complete documentation can be found in the link:../concept.html#packaging[concept page].
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the published artifact. This name must not include revision.|No, defaults to the name of the module
+|type|the type of the published artifact. It's usually its extension, but not necessarily. For instance, ivy files are of type 'ivy' but have 'xml' extension|No, defaults to jar
+|ext|the extension of the published artifact|No, defaults to type
+|conf|comma separated list of public configurations in which this artifact is published.
+ '*' wildcard can be used to designate all public configurations of this module|No, defaults to defaultconf attribute value on parent publications element.
+|url|a url at which this artifact can be found if it isn't located at the standard location in the repository *__since 1.4__*|No, defaults to no url
+|packaging|a comma separated list of link:../concept.html#packaging[packaging] types *__since 2.4__*|No, defaults to no packaging
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/artifact-conf.html[conf]|indicates a public configuration in which this artifact is published|0..n
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<artifact />
+
+----
+
+Declares an artifact with the name of the module as name, type and ext jar, and published in all configurations.
+
+
+'''
+
+
+[source]
+----
+
+<artifact name="foo-src" type="source" ext="zip" conf="src" />
+
+----
+
+Declares an artifact foo-src, of type 'source' with extension 'zip', and published in the src configuration.
+
+
+'''
+
+
+[source]
+----
+
+<artifact name="foo" url="http://www.acme.com/repository/barbaz/foo-1.2-bar.jar" />
+
+----
+
+Declares an artifact foo, of type and extension 'jar' located at the url http://www.acme.com/repository/barbaz/foo-1.2-bar.jar. This url will only be used if the artifact cannot be found at its standard location.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conf.adoc b/asciidoc/ivyfile/conf.adoc
new file mode 100644
index 0000000..2c2c146
--- /dev/null
+++ b/asciidoc/ivyfile/conf.adoc
@@ -0,0 +1,62 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/configurations.html[configurations]
+
+Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in Ivy module configurations.
+
+The conf element in the configurations section declares one configuration. This declaration gives the name of the configuration declared, its visibility and the other configurations of the module it extends.
+
+Visibility is used to indicate whether or not a configuration can be used from other modules depending on this one. Thus a private configuration is only used for internal purpose (maybe at build time), and other modules cannot declare to depend on it.
+
+A configuration can also extend one or several other ones of the same module. When a configuration extends another one, then all artifacts required in the extended configuration will also be required in the configuration that extends the other one. For instance, if configuration B extends configuration A, and if artifacts art1 and art2 are required in configuration A, then they will be automatically required in configuration B. On the other hand, artifacts required in configuration B are not necessarily required in configuration A.
+
+This notion is very helpful to define configurations which are similar with some differences.
+
+*__since 1.4__* The extends attribute can use the following wildcards:
+[cols="15%,50%"]
+|=======
+|*|all other configurations
+|*(public)|all other public configurations
+|*(private)|all other private configurations
+|=======
+
+
+
+
+*__since 1.4__* A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivityy enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
+This is very useful to build a compile configuration, for instance, forcing the dependency declaration on each direct dependency, with no risk to forget some because of transitivity.
+
+*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the declared configuration|Yes
+|description|a description for the declared configuration|No
+|visibility|the visibility of the declared configuration.
+ 'public' means that this configuration can be used by other modules, while 'private' means that this configuration is used only in the module itself, and is not exposed to other modules|No, defaults to public
+|extends|a comma separated list of configurations of this module that the
+ current configuration extends|No, defaults to none
+|transitive|a boolean to indicate if this conf is transitive or not *__since 1.4__*|No, defaults to true
+|deprecated|indicates that this conf has been deprecated by giving the date of the deprecation.
+ It should be given in this format: yyyyMMddHHmmss|No, by default the conf is not deprecated
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<conf name="core" visibility="private" />
+<conf name="compile" extends="core" transitive="false" visibility="private" />
+<conf name="runtime" extends="compile" description="everything needed to run this module" />
+
+----
+
+Declares three configurations, core compile and runtime, with only the runtime one accessible from other modules, and with the compile one being non transitive.
+Therefore the core configuration will only be composed of dependencies declared in the core configuration itself, the compile configuration will be composed of all dependencies required in either core or compile configuration, but without transivity (neither for core nor compile dependencies), and runtime will be composed of all dependencies, all transitively, including the dependencies declared only in compile.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/configurations.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc
new file mode 100644
index 0000000..7d4929a
--- /dev/null
+++ b/asciidoc/ivyfile/configurations.adoc
@@ -0,0 +1,190 @@
+
+*Tag:* configurations *Parent:* link:../ivyfile.html[ivy-module]
+
+A container for configuration elements. If this container is not present, it is assumed that the module has one public configuration called 'default'.
+
+*__since 2.2__* You can define the default conf on this container by specifying the defaultconf attribute. This attribute defines the conf mapping to use when no conf mapping is specified for a dependency in this ivy file.
+
+*__since 1.3__* You can define a default conf mapping on this container by specifying the defaultconfmapping attribute.
+
+This attribute modifies the way ivy interprets conf mapping with no mapped conf. In this case, Ivy will look in the default conf mapping and use the conf mapping defined in the default conf mapping for the conf for which there is no mapped conf.
+
+In order to maintain backwards compatibility with Ivy 2.1.0 and earlier, the defaultconfmapping also provides one additional function. If no defaultconf is specified (on either the configurations tag or the dependencies tag), the defaultconfmapping becomes the default configuration for dependencies in this ivy file when no configuration is specified. In other words, in addition to altering the interpretation of individual configurations with no mapping, defaultconfmapping also performs exactly like defaultconf in the absence of a definition for defaultconf.
+
+If several defaultconfmapping or defaultconf attributes are defined (in the configurations tag, one or several in an included configurations file, and/or in the dependency tag, then it's only the last definition of each property which is taken into account. The others will have no effect at all.
+
+See link:#defaultconfmapping[examples below] to clarify the behavior of these two attributes together.
+
+*__since 1.4__* You can activate a confmappingoverride mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
+
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|defaultconf|the default conf to use in this ivy file *__since 2.2__*|No, defaults to no default conf
+|defaultconfmapping|the default conf mapping to use in this ivy file *__since 1.3__*|No, defaults to no default conf mapping
+|confmappingoverride|true to activate configuration mapping override, false otherwise *__since 1.4__*|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/conf.html[conf]|declares a configuration of this module|0..n
+|link:../ivyfile/include.html[include]|include configurations from another file|0..n
+|=======
+
+
+
+== Configuration mappings details
+
+When Ivy parses your Ivy file, it will create (internally) modify the configuration mapping of your dependencies.
+For instance, say you have:
+
+[source]
+----
+
+<configurations defaultconfmapping="conf1->other1;conf2->other2">
+ <conf name="conf1" />
+ <conf name="conf2" extends="conf1" />
+</configurations>
+<dependencies>
+ <dependency name="other-module" conf="conf1" />
+</dependencies>
+
+----
+
+When Ivy parses this file, it will construct the following dependency (in-memory only):
+
+[source]
+----
+<dependency name="other-module" conf="conf1->other1" />
+----
+
+So, if you now resolve the conf2 configuration, you will only get the other1 dependencies of your other-module.
+
+But when you set confmappingoverride to true, Ivy will construct the following dependency in memory:
+
+[source]
+----
+<dependency name="other-module" conf="conf1->other1;conf2->other2" />
+----
+
+As you can see, the defaultmappings of the extending configurations are also added (although you didn't explicitly defined them)
+
+When you now resolve the conf2 configuration, you'll get the other2 dependencies of your other-module.
+
+
+== Examples involving defaultconf and defaultconfmapping
+
+The table below indicates how Ivy interprets the conf attribute according to how link:../ivyfile/configurations.html[defaultconfmapping] and link:../ivyfile/configurations.html[defaultconf] are set:
+[options="header",cols="15%,50%,18%,18%"]
+|=======
+|defaultconf|defaultconfmapping|conf|ivy interpretation
+||||
+[source]
+----
+*->*
+----
+
+
+|||runtime|
+[source]
+----
+runtime->runtime
+----
+
+
+|||test|
+[source]
+----
+test->test
+----
+
+
+|
+[source]
+----
+runtime
+----
+
+|||
+[source]
+----
+runtime->runtime
+----
+
+
+|
+[source]
+----
+runtime
+----
+
+|
+[source]
+----
+runtime->*;test->default
+----
+
+||runtime->*
+|
+[source]
+----
+runtime
+----
+
+|
+[source]
+----
+runtime->*;test->default
+----
+
+|test|test->default
+||
+[source]
+----
+runtime->*;test->default
+----
+
+||
+[source]
+----
+runtime->*;test->default
+----
+
+
+||
+[source]
+----
+runtime->*;test->default
+----
+
+|runtime|
+[source]
+----
+runtime->*
+----
+
+
+||
+[source]
+----
+runtime->*;test->default
+----
+
+|test|
+[source]
+----
+test->default
+----
+
+
+|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/conflict.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conflict.adoc b/asciidoc/ivyfile/conflict.adoc
new file mode 100644
index 0000000..13fa6e9
--- /dev/null
+++ b/asciidoc/ivyfile/conflict.adoc
@@ -0,0 +1,35 @@
+
+*Tag:* conflict *Parent:* link:../ivyfile/dependencies.html[dependencies]
+
+
+
+*__(since 2.0)__*
+
+Specify a a conflict manager for one or several dependencies.
+The way to specify a conflict manager is by giving indication to which dependencies the conflict manager applies (by giving organisation and module names or name regexp), and then specifying the conflict manager, either by giving its name or by specifying a fixed revision list, in which case a fixed conflicts manager is used.
+
+The list of built-in conflict managers available is listed on the link:../settings/conflict-managers.html[conflict manager configuration page].
+
+Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.
+
+There are two things optimized during conflict resolution: download of artifacts and download of ivy files. The first is always ensured by ivy, i.e. artifacts of a module evicted will never be downloaded. The second is not as simple to handle because to know what are the conflicts ivy needs to know the dependency graph, and to know the dependency graph, it has to download ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.
+That's why the order of dependencies is important for download optimization. Indeed ivy traverses the dependency graph in the order in which dependencies are declared in the ivy files, and each time it encounters a dependency on a module, it first check if there is a conflict on this module, and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted, it does not download its ivy file, and the whole branch is not traversed, which can saves a lot of time.
+
+If no specific conflict manager is defined, a default conflict manager is used for all modules.
+
+The current default conflict manager is the "latest-revision" conflict manager.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the name, or an expression matching the name of organisation to which this conflict manager should apply (see matcher attribute below)|No, defaults to * (match all)
+|module|the name, or an expression matching the name of module to which this conflict manager should apply (see matcher attribute below)|No, defaults to * (match all)
+|manager|the name of the conflict manager to use|Exactly one of two
+|rev|a comma separated list of revisions this conflict manager should select
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules for which the conflict manager should be used|No, defaults to exact
+|=======
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/conflicts.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conflicts.adoc b/asciidoc/ivyfile/conflicts.adoc
new file mode 100644
index 0000000..9c063df
--- /dev/null
+++ b/asciidoc/ivyfile/conflicts.adoc
@@ -0,0 +1,51 @@
+
+*Tag:* conflicts *Parent:* link:../ivyfile.html[ivy-module]
+
+
+
+*__(since 2.0)__* the conflicts section is deprecated. Use the link:../ivyfile/conflict.html[conflict] instead.
+
+Container for conflict manager elements, used to indicate how conflicts should be resolved
+for this module.
+
+
+
+The list of built-in conflict managers available is listed on the link:../settings/conflict-managers.html[conflict manager configuration page].
+
+
+
+Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies
+and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time
+enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.
+
+
+
+There are two things optimized during conflict resolution: download of artifacts and download
+of ivy files. The first is always ensured by ivy, i.e. artifacts of a module evicted will never
+be downloaded. The second is not as simple to handle because to know what are the conflicts
+ivy needs to know the dependency graph, and to know the dependency graph, it has to download
+ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.
+
+That's why the order of dependencies is important for download optimization. Indeed ivy
+traverses the dependency graph in the order in which dependencies are declared in the ivy files,
+and each time it encounters a dependency on a module, it first check if there is a conflict on this module,
+and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted,
+it does not download its ivy file, and the whole branch is not traversed, which can saves
+a lot of time.
+
+
+
+If this container is not present, a default conflict manager is used for all modules.
+The current default conflict manager is the "latest-revision" conflict manager.
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/manager.html[manager]|declares a conflict manager for this module|1..n
+|=======
+
+
+
\ No newline at end of file
[05/29] ant-ivy git commit: setup the build to use asciidoc files as
the source of truth
Posted by ja...@apache.org.
setup the build to use asciidoc files as the source of truth
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/3d72f1db
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/3d72f1db
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/3d72f1db
Branch: refs/heads/master
Commit: 3d72f1db6ab39787c6df7ab893828a95a9adef1e
Parents: 610c3be
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Mon Feb 16 12:16:20 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Mon Feb 16 12:19:35 2015 +0100
----------------------------------------------------------------------
asciidoc-template/document.html.slim | 87 ---------------
asciidoc-template/helpers.rb | 173 -----------------------------
asciidoc/templates/document.html.slim | 87 +++++++++++++++
asciidoc/templates/helpers.rb | 173 +++++++++++++++++++++++++++++
build-doc.xml | 59 ----------
build-release.xml | 42 ++-----
build.properties | 2 +-
xooki2asciidoc.xml | 43 +++++++
8 files changed, 315 insertions(+), 351 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/asciidoc-template/document.html.slim
----------------------------------------------------------------------
diff --git a/asciidoc-template/document.html.slim b/asciidoc-template/document.html.slim
deleted file mode 100644
index 6cdb6bd..0000000
--- a/asciidoc-template/document.html.slim
+++ /dev/null
@@ -1,87 +0,0 @@
-doctype transitional
-/!
-/! 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.
-- page = IvyDocHelpers.page(attr("basedir"), attr("docfile"))
-html lang=(attr :lang, 'en' unless attr? :nolang)
- head
- meta http-equiv="Content-Type" content="text/html; charset=utf-8"
- meta name='generator' content="Asciidoctor #{attr 'asciidoctor-version'}"
- title=((doctitle :sanitize => true) || (attr 'untitled-label'))
- link rel="stylesheet" type="text/css" href="#{page.relativeRoot}style/style.css"
- script src="#{page.relativeRoot}js/jquery.pack.js" type="text/javascript"
- script src="#{page.relativeRoot}js/jquery.treeview.js" type="text/javascript"
- javascript:
- $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
- body
- div id="body"
- table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
- tr
- td id="home" width="30%"
- a href="http://ant.apache.org/" title="Apache Ant"
- img src="#{page.relativeRoot}images/ant-group-logo.gif" alt="Apache Ant" border="0"/
- td class="product" width="70%" align="right" valign="middle"
- img src="#{page.relativeRoot}images/logo.png" alt="ivy" border="0"/
- table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
- tr
- td
- div id="navcontainer"
- a<> href="http://www.apache.org/" Apache™
- | >
- a<> href="http://ant.apache.org/" Apache Ant™
- | >
- a<> href="http://ant.apache.org/ivy/" Apache Ivy™
- | >
- = page.breadCrumb
- table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"
- tr
- td id="sidebar-left"
- div class="block block-book" id="block-book-0"
- div class="sidebar-title" Apache Ivy™
- div class="content"
- = page.menu()
- center
- iframe src="http://www.apache.org/ads/buttonbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="135" height="265"
- td valign="top"
- div id="main"
- h1 = page.title
- #content=content
- table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
- tr
- td align="center" valign="middle"
- div class="primary-links"
- | ::
- a href="index.html" Home
- | ::
- a href="reference.html" Reference
- | ::
- a href="tutorial.html" Tutorials
- | ::
- a href="dev.html" Developer's doc
- | ::
- div id="footer-message" class="footer"
- hr/
- i
- | Copyright © 2014 The Apache Software Foundation, Licensed under the
- a href="http://www.apache.org/licenses/LICENSE-2.0.txt" Apache License, Version 2.0
- | .
- br/
- i
- | Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.
- br/
- i
- | All other marks mentioned may be trademarks or registered trademarks of their respective owners.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/asciidoc-template/helpers.rb
----------------------------------------------------------------------
diff --git a/asciidoc-template/helpers.rb b/asciidoc-template/helpers.rb
deleted file mode 100644
index e62557d..0000000
--- a/asciidoc-template/helpers.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-# Add custom functions to this module that you want to use in your Slim
-# templates. Within the template you must namespace the function
-# (unless someone can show me how to include them in the evaluation context).
-# You can change the namespace to whatever you want.
-
-require 'json'
-
-module IvyDocHelpers
-
- class Page
- attr_accessor :id, :title, :url, :allChildIds, :children, :parent
-
- def initialize()
- @id = ""
- @title = ""
- @url = ""
- @allChildIds = []
- @children = []
- @parent = nil
- end
-
- def link(printpage)
- l = ''
- if self.url
- if self.url.start_with?('http')
- url = self.url
- else
- url = printpage.relativeRoot + self.url
- end
- l += '<a href="' + url + '"'
- if self.id == printpage.id
- l += ' class="current"'
- end
- l += '>' + self.title + '</a>'
- else
- l += self.title
- end
- return l
- end
-
- def relativeRoot()
- p = ''
- (self.id.split("/").length-1).times do |e|
- p += '../'
- end
- return p
- end
-
- def breadCrumb()
- b = '<span class="breadCrumb">'
- b += breadCrumbStep(self)
- b += '</span>'
- return b
- end
-
- def breadCrumbStep(page)
- b = ' '
- if page.parent && page.parent.parent
- b += breadCrumbStep(page.parent)
- b += ' > '
- end
- b += page.link(page)
- return b
- end
-
- def rootpage()
- if self.parent
- return self.parent.rootpage()
- else
- return self
- end
- end
-
- def menu()
- return innermenu(rootpage())
- end
-
- def innermenu(page)
- m = '<ul id="treemenu" class="treeview">' + "\n"
- page.children.each do |p|
- m += '<li id="xooki-' + (p.id || "undefined") + '"'
- if p.children.length > 0
- m += ' class="submenu"'
- end
- m += '>'
- m += p.link(self)
- if p.children.length > 0
- m += '<ul class="'
- if p.allChildIds.include? self.id
- m += 'open'
- else
- m += 'closed'
- end
- m += '">'
- m += innermenu(p)
- m += '</ul>'
- end
- m += "</li>\n"
- end
- m += "</ul>\n"
- return m
- end
-
- end
-
- def self.page(basedir, docfile)
- rootpage = loadPages(basedir)
- pageId = docfile[basedir.length+1..docfile.rindex(/\./)-1]
- p = findPage(rootpage, pageId)
- if !p
- p = Page.new
- end
- return p
- end
-
- def self.loadPages(basedir)
- rootpage = Page.new
- toc = JSON.parse(IO.read(basedir + "/toc.json"))
- toc['children'].each do |child|
- rootpage.children << loadPage(basedir, rootpage, child, "")
- end
- return rootpage
- end
-
- def self.loadPage(basedir, parent, node, path)
- p = Page.new
- p.title = node['title']
- p.parent = parent
- if node.has_key?("importRoot")
- p.id = path + node['importRoot'] + '/' + node['importNode']
- p.url = p.id + ".html"
- toc = JSON.parse(IO.read(basedir + '/' + node['importRoot'] + "/toc.json"))
- toc['children'].each do |child|
- p.children << loadPage(basedir, node, child, path + node['importRoot'] + '/')
- end
- else
- p.id = node['id']
- if !(node.has_key?("isAbstract"))
- if node.has_key?("url")
- p.url = node['url']
- else
- p.url = path + node['id'] + ".html"
- end
- end
- if node.has_key?("children")
- node['children'].each do |child|
- p.children << loadPage(basedir, p, child, path)
- end
- end
- end
- p.children.each { |cp| p.allChildIds += cp.allChildIds }
- if p.id
- p.allChildIds << p.id
- end
- return p
- end
-
- def self.findPage(parent, pageId)
- parent.children.each do |p|
- if p.id == pageId
- return p
- end
- if p.children.length > 0
- found = findPage(p, pageId)
- if found
- return found
- end
- end
- end
- return nil
- end
-
-end
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/asciidoc/templates/document.html.slim
----------------------------------------------------------------------
diff --git a/asciidoc/templates/document.html.slim b/asciidoc/templates/document.html.slim
new file mode 100644
index 0000000..6cdb6bd
--- /dev/null
+++ b/asciidoc/templates/document.html.slim
@@ -0,0 +1,87 @@
+doctype transitional
+/!
+/! 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.
+- page = IvyDocHelpers.page(attr("basedir"), attr("docfile"))
+html lang=(attr :lang, 'en' unless attr? :nolang)
+ head
+ meta http-equiv="Content-Type" content="text/html; charset=utf-8"
+ meta name='generator' content="Asciidoctor #{attr 'asciidoctor-version'}"
+ title=((doctitle :sanitize => true) || (attr 'untitled-label'))
+ link rel="stylesheet" type="text/css" href="#{page.relativeRoot}style/style.css"
+ script src="#{page.relativeRoot}js/jquery.pack.js" type="text/javascript"
+ script src="#{page.relativeRoot}js/jquery.treeview.js" type="text/javascript"
+ javascript:
+ $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
+ body
+ div id="body"
+ table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td id="home" width="30%"
+ a href="http://ant.apache.org/" title="Apache Ant"
+ img src="#{page.relativeRoot}images/ant-group-logo.gif" alt="Apache Ant" border="0"/
+ td class="product" width="70%" align="right" valign="middle"
+ img src="#{page.relativeRoot}images/logo.png" alt="ivy" border="0"/
+ table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td
+ div id="navcontainer"
+ a<> href="http://www.apache.org/" Apache™
+ | >
+ a<> href="http://ant.apache.org/" Apache Ant™
+ | >
+ a<> href="http://ant.apache.org/ivy/" Apache Ivy™
+ | >
+ = page.breadCrumb
+ table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td id="sidebar-left"
+ div class="block block-book" id="block-book-0"
+ div class="sidebar-title" Apache Ivy™
+ div class="content"
+ = page.menu()
+ center
+ iframe src="http://www.apache.org/ads/buttonbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="135" height="265"
+ td valign="top"
+ div id="main"
+ h1 = page.title
+ #content=content
+ table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
+ tr
+ td align="center" valign="middle"
+ div class="primary-links"
+ | ::
+ a href="index.html" Home
+ | ::
+ a href="reference.html" Reference
+ | ::
+ a href="tutorial.html" Tutorials
+ | ::
+ a href="dev.html" Developer's doc
+ | ::
+ div id="footer-message" class="footer"
+ hr/
+ i
+ | Copyright © 2014 The Apache Software Foundation, Licensed under the
+ a href="http://www.apache.org/licenses/LICENSE-2.0.txt" Apache License, Version 2.0
+ | .
+ br/
+ i
+ | Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.
+ br/
+ i
+ | All other marks mentioned may be trademarks or registered trademarks of their respective owners.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/asciidoc/templates/helpers.rb
----------------------------------------------------------------------
diff --git a/asciidoc/templates/helpers.rb b/asciidoc/templates/helpers.rb
new file mode 100644
index 0000000..e62557d
--- /dev/null
+++ b/asciidoc/templates/helpers.rb
@@ -0,0 +1,173 @@
+# Add custom functions to this module that you want to use in your Slim
+# templates. Within the template you must namespace the function
+# (unless someone can show me how to include them in the evaluation context).
+# You can change the namespace to whatever you want.
+
+require 'json'
+
+module IvyDocHelpers
+
+ class Page
+ attr_accessor :id, :title, :url, :allChildIds, :children, :parent
+
+ def initialize()
+ @id = ""
+ @title = ""
+ @url = ""
+ @allChildIds = []
+ @children = []
+ @parent = nil
+ end
+
+ def link(printpage)
+ l = ''
+ if self.url
+ if self.url.start_with?('http')
+ url = self.url
+ else
+ url = printpage.relativeRoot + self.url
+ end
+ l += '<a href="' + url + '"'
+ if self.id == printpage.id
+ l += ' class="current"'
+ end
+ l += '>' + self.title + '</a>'
+ else
+ l += self.title
+ end
+ return l
+ end
+
+ def relativeRoot()
+ p = ''
+ (self.id.split("/").length-1).times do |e|
+ p += '../'
+ end
+ return p
+ end
+
+ def breadCrumb()
+ b = '<span class="breadCrumb">'
+ b += breadCrumbStep(self)
+ b += '</span>'
+ return b
+ end
+
+ def breadCrumbStep(page)
+ b = ' '
+ if page.parent && page.parent.parent
+ b += breadCrumbStep(page.parent)
+ b += ' > '
+ end
+ b += page.link(page)
+ return b
+ end
+
+ def rootpage()
+ if self.parent
+ return self.parent.rootpage()
+ else
+ return self
+ end
+ end
+
+ def menu()
+ return innermenu(rootpage())
+ end
+
+ def innermenu(page)
+ m = '<ul id="treemenu" class="treeview">' + "\n"
+ page.children.each do |p|
+ m += '<li id="xooki-' + (p.id || "undefined") + '"'
+ if p.children.length > 0
+ m += ' class="submenu"'
+ end
+ m += '>'
+ m += p.link(self)
+ if p.children.length > 0
+ m += '<ul class="'
+ if p.allChildIds.include? self.id
+ m += 'open'
+ else
+ m += 'closed'
+ end
+ m += '">'
+ m += innermenu(p)
+ m += '</ul>'
+ end
+ m += "</li>\n"
+ end
+ m += "</ul>\n"
+ return m
+ end
+
+ end
+
+ def self.page(basedir, docfile)
+ rootpage = loadPages(basedir)
+ pageId = docfile[basedir.length+1..docfile.rindex(/\./)-1]
+ p = findPage(rootpage, pageId)
+ if !p
+ p = Page.new
+ end
+ return p
+ end
+
+ def self.loadPages(basedir)
+ rootpage = Page.new
+ toc = JSON.parse(IO.read(basedir + "/toc.json"))
+ toc['children'].each do |child|
+ rootpage.children << loadPage(basedir, rootpage, child, "")
+ end
+ return rootpage
+ end
+
+ def self.loadPage(basedir, parent, node, path)
+ p = Page.new
+ p.title = node['title']
+ p.parent = parent
+ if node.has_key?("importRoot")
+ p.id = path + node['importRoot'] + '/' + node['importNode']
+ p.url = p.id + ".html"
+ toc = JSON.parse(IO.read(basedir + '/' + node['importRoot'] + "/toc.json"))
+ toc['children'].each do |child|
+ p.children << loadPage(basedir, node, child, path + node['importRoot'] + '/')
+ end
+ else
+ p.id = node['id']
+ if !(node.has_key?("isAbstract"))
+ if node.has_key?("url")
+ p.url = node['url']
+ else
+ p.url = path + node['id'] + ".html"
+ end
+ end
+ if node.has_key?("children")
+ node['children'].each do |child|
+ p.children << loadPage(basedir, p, child, path)
+ end
+ end
+ end
+ p.children.each { |cp| p.allChildIds += cp.allChildIds }
+ if p.id
+ p.allChildIds << p.id
+ end
+ return p
+ end
+
+ def self.findPage(parent, pageId)
+ parent.children.each do |p|
+ if p.id == pageId
+ return p
+ end
+ if p.children.length > 0
+ found = findPage(p, pageId)
+ if found
+ return found
+ end
+ end
+ end
+ return nil
+ end
+
+end
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/build-doc.xml
----------------------------------------------------------------------
diff --git a/build-doc.xml b/build-doc.xml
deleted file mode 100644
index 671da0e..0000000
--- a/build-doc.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
- 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.
--->
-<project name="doc" xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:xooki="antlib:xooki"
- xmlns:asciidoctor="antlib:org.asciidoctor.ant">
- <import file="build-release.xml"/>
-
- <target name="generate-asciidoc" depends="generate-doc-init">
- <mkdir dir="${build.dir}/asciidoc" />
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki2asciidoc/antlib.xml" />
- <xooki:toAsciidoc destDir="${build.dir}/asciidoc" checkUpToDate="true" xookidir="${doc.src.dir}/xooki2asciidoc">
- <fileset dir="${doc.tmp.dir}">
- <include name="**/*.html"/>
- <exclude name="template*.html"/>
- <exclude name="*Template.html"/>
- <exclude name="conflict-solving-algo.html"/>
- <exclude name="use.html"/>
- <exclude name="samples/**"/>
- <exclude name="js/**"/>
- <exclude name="reports/**"/>
- <exclude name="xooki/**"/>
- </fileset>
- </xooki:toAsciidoc>
- <copy file="${doc.tmp.dir}/toc.json" todir="${build.dir}/asciidoc" />
- </target>
-
- <target name="generate-doc" depends="init-ivy,generate-doc-init">
- <ivy:cachepath pathid="asciidoctor.path">
- <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.0" />
- </ivy:cachepath>
- <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
- <asciidoctor:convert sourceDirectory="${build.dir}/asciidoc" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="asciidoc-template" preserveDirectories="true">
- <attribute key="basedir" value="${build.dir}/asciidoc" />
- <attribute key="imagesdir" value="" />
- </asciidoctor:convert>
- <copy todir="${doc.build.dir}">
- <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
- <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
- </copy>
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 0fa812a..7e3fc23 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -19,7 +19,7 @@
<project name="IvyRelease" default="snapshot"
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ivy2="antlib:org.apache.ivy.ant_2"
- xmlns:xooki="antlib:xooki"
+ xmlns:asciidoctor="antlib:org.asciidoctor.ant"
xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
<import file="build.xml"/>
@@ -181,40 +181,20 @@
</copy>
</target>
- <target name="generate-doc" depends="generate-doc-init, generate-tutorial-output">
+ <target name="generate-doc" depends="init-ivy,generate-doc-init,generate-tutorial-output">
+ <ivy:cachepath pathid="asciidoctor.path">
+ <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.0" />
+ </ivy:cachepath>
+ <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
+ <asciidoctor:convert sourceDirectory="${doc.tmp.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
+ <attribute key="basedir" value="${doc.tmp.dir}" />
+ <attribute key="imagesdir" value="" />
+ </asciidoctor:convert>
<copy todir="${doc.build.dir}">
<fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
<fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
</copy>
-
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
- <xooki:generate destDir="${doc.build.dir}" checkUpToDate="true" xookidir="${doc.src.dir}/xooki">
- <fileset dir="${doc.tmp.dir}">
- <include name="**/*.html"/>
- <exclude name="template.html"/>
- <exclude name="*Template.html"/>
- <exclude name="conflict-solving-algo.html"/>
- <exclude name="use.html"/>
- <exclude name="samples/**"/>
- <exclude name="js/**"/>
- <exclude name="reports/**"/>
- <exclude name="xooki/**"/>
- </fileset>
- </xooki:generate>
-
- <!-- generate print-friendly doc -->
- <!-- modify the basedir because othwise xooki.js will not be found! -->
- <ant antfile="../build-release.xml" target="generate-print-doc" dir="doc" />
- </target>
-
- <target name="generate-print-doc">
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
- <xooki:print src="${doc.tmp.dir}/index.html"
- dest="${doc.build.dir}/book.html"
- xookidir="${doc.src.dir}/xooki" />
- </target>
+ </target>
<target name="all-doc" depends="javadoc, generate-doc" />
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index cc08112..48333e0 100644
--- a/build.properties
+++ b/build.properties
@@ -37,7 +37,7 @@ test.report.dir=${reports.dir}/test
coverage.report.dir=${reports.dir}/coverage
javadoc.build.dir=${reports.dir}/api
ivy.report.dir=${reports.dir}/ivy
-doc.src.dir=${basedir}/doc
+doc.src.dir=${basedir}/asciidoc
checkstyle.report.dir=${reports.dir}/checkstyle
checkstyle.src.dir=${basedir}/src/etc/checkstyle
rat.report.dir=${reports.dir}/rat
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3d72f1db/xooki2asciidoc.xml
----------------------------------------------------------------------
diff --git a/xooki2asciidoc.xml b/xooki2asciidoc.xml
new file mode 100644
index 0000000..0bb98f0
--- /dev/null
+++ b/xooki2asciidoc.xml
@@ -0,0 +1,43 @@
+<!--
+ 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.
+-->
+<project default="generate-asciidoc" name="xooki2asciidoc" xmlns:xooki="antlib:xooki">
+ <import file="build-release.xml"/>
+
+ <target name="generate-asciidoc">
+ <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
+ <taskdef uri="antlib:xooki" file="${basedir}/doc/xooki2asciidoc/antlib.xml" />
+ <xooki:toAsciidoc destDir="${doc.src.dir}" checkUpToDate="true" xookidir="${basedir}/doc/xooki2asciidoc">
+ <fileset dir="${basedir}/doc">
+ <include name="**/*.html"/>
+ <exclude name="template*.html"/>
+ <exclude name="*Template.html"/>
+ <exclude name="conflict-solving-algo.html"/>
+ <exclude name="use.html"/>
+ <exclude name="samples/**"/>
+ <exclude name="js/**"/>
+ <exclude name="reports/**"/>
+ <exclude name="xooki/**"/>
+ </fileset>
+ </xooki:toAsciidoc>
+ <copy todir="${doc.src.dir}">
+ <fileset dir="${basedir}/doc" includes="toc.json,images/**,style/**,samples/**,js/**,ivy.xsd" />
+ </copy>
+ </target>
+
+</project>
[03/29] ant-ivy git commit: improve the xooki2asciidoc convertor
Posted by ja...@apache.org.
improve the xooki2asciidoc convertor
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/64b328d8
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/64b328d8
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/64b328d8
Branch: refs/heads/master
Commit: 64b328d822661bb3aa3d90356a9b5e3821b9ae1c
Parents: b3d2c0c
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Feb 15 16:20:14 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Feb 15 16:20:14 2015 +0100
----------------------------------------------------------------------
asciidoc-template/document.html.slim | 12 +--
doc/ivyfile/dependency.html | 2 +-
doc/osgi/eclipse-plugin.html | 9 +-
doc/osgi/standard-osgi.html | 9 +-
doc/osgi/target-platform.html | 9 +-
doc/style/color.css | 8 +-
doc/style/style.css | 66 ++++++++++++-
doc/xooki2asciidoc/xooki2asciidoc.js | 157 +++++++++++++++++++++++++++---
8 files changed, 220 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/asciidoc-template/document.html.slim
----------------------------------------------------------------------
diff --git a/asciidoc-template/document.html.slim b/asciidoc-template/document.html.slim
index 81e99a8..6cdb6bd 100644
--- a/asciidoc-template/document.html.slim
+++ b/asciidoc-template/document.html.slim
@@ -51,14 +51,14 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
tr
td id="sidebar-left"
div class="block block-book" id="block-book-0"
- h2 Apache Ivy™
- div class="content"
- = page.menu()
- center
- iframe src="http://www.apache.org/ads/buttonbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="135" height="265"
+ div class="sidebar-title" Apache Ivy™
+ div class="content"
+ = page.menu()
+ center
+ iframe src="http://www.apache.org/ads/buttonbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="135" height="265"
td valign="top"
div id="main"
- h1 class="title" = page.title
+ h1 = page.title
#content=content
table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"
tr
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/ivyfile/dependency.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency.html b/doc/ivyfile/dependency.html
index f223d07..e66b38c 100644
--- a/doc/ivyfile/dependency.html
+++ b/doc/ivyfile/dependency.html
@@ -111,7 +111,7 @@ Moreover, the mapping '*->@' is handled as a specific case with configuration in
The syntax is
<code>*[att=value]</code>
-where <em>att</em> is the name of the attribute shared by the configurations of the group, and <em>value</em is the value for this attribute that configurations must have to be part of the group. This is especially useful with extra attributes.
+where <em>att</em> is the name of the attribute shared by the configurations of the group, and <em>value</em> is the value for this attribute that configurations must have to be part of the group. This is especially useful with extra attributes.
For instance, if you have:
<code>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/osgi/eclipse-plugin.html
----------------------------------------------------------------------
diff --git a/doc/osgi/eclipse-plugin.html b/doc/osgi/eclipse-plugin.html
index 28c59c4..fafb2b6 100644
--- a/doc/osgi/eclipse-plugin.html
+++ b/doc/osgi/eclipse-plugin.html
@@ -26,14 +26,9 @@
<body>
<textarea id="xooki-source">
-<table class="notice">
- <tr>
- <td style="vertical-align: top"><img src="../images/warning.png" style="float:left;" /></td>
- <td>
+<div class="tip">
Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
- </td>
- </tr>
-</table>
+</div>
This page describes how to build an Eclipse™ plugin with Apache Ivy™ and its OSGi™ capabilities.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/osgi/standard-osgi.html
----------------------------------------------------------------------
diff --git a/doc/osgi/standard-osgi.html b/doc/osgi/standard-osgi.html
index 81687b6..325353d 100644
--- a/doc/osgi/standard-osgi.html
+++ b/doc/osgi/standard-osgi.html
@@ -26,14 +26,9 @@
<body>
<textarea id="xooki-source">
-<table class="notice">
- <tr>
- <td style="vertical-align: top"><img src="../images/warning.png" style="float:left;" /></td>
- <td>
+<div class="tip">
Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
- </td>
- </tr>
-</table>
+</div>
<hr />
<center><b>TODO - WORK IN PROGRESS</b></center>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/osgi/target-platform.html
----------------------------------------------------------------------
diff --git a/doc/osgi/target-platform.html b/doc/osgi/target-platform.html
index 1f64644..8c791e7 100644
--- a/doc/osgi/target-platform.html
+++ b/doc/osgi/target-platform.html
@@ -26,14 +26,9 @@
<body>
<textarea id="xooki-source">
-<table class="notice">
- <tr>
- <td style="vertical-align: top"><img src="../images/warning.png" style="float:left;" /></td>
- <td>
+<div class="tip">
Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
- </td>
- </tr>
-</table>
+</div>
The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundle which will run together in an OSGi™ environement. Then when developping an OSGi bundle, we expect it to run in a such "target platform".
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/style/color.css
----------------------------------------------------------------------
diff --git a/doc/style/color.css b/doc/style/color.css
index 031c4f4..51333f7 100644
--- a/doc/style/color.css
+++ b/doc/style/color.css
@@ -28,11 +28,11 @@ body {
h1, h2, h3, h4, h5, h6, .toc-title {
color: #7a9438;
}
-h1 {
+h2 {
color: #fff;
background-color: #7a9438;
}
-.title {
+h1 {
color: #7a9438;
background-color: #fff;
background: none;
@@ -142,10 +142,6 @@ pre {
background: #9ebf47;
}
-#content {
- border-top: 3px solid #9ebf47;
-}
-
#forum tr.dark {
background: #daeddc;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/style/style.css
----------------------------------------------------------------------
diff --git a/doc/style/style.css b/doc/style/style.css
index 7308518..4524ed4 100644
--- a/doc/style/style.css
+++ b/doc/style/style.css
@@ -46,7 +46,7 @@ body, p, td, li, ul, ol {
h1, h2, h3, h4, h5, h6 {
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
}
-h1 {
+h2 {
/*
margin-left: 15px;
margin-right: 15px;
@@ -58,13 +58,13 @@ h1 {
-moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px;
}
-h2 {
+h3 {
font-size: 1.4em;
}
-h3 {
+h4 {
font-size: 1.2em;
}
-h4 {
+h5 {
font-size: 1.1em;
}
tr.dark td, tr.light td {
@@ -160,6 +160,17 @@ pre {
#sidebar-left li, #sidebar-right li {
font-size: 1em;
}
+.sidebar-title {
+ margin: 5px 0px 0px 0px;
+ padding: 1px 5px 1px 30px;
+ font-size: 1.2em;
+ font-weight: 700;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ color: #000;
+ background-color: #eee;
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+}
#content {
table-layout:fixed;
}
@@ -312,3 +323,50 @@ tr.homeitems a:hover {
background-color: #FCFCCA;
margin: 10px;
}
+
+table.tableblock {
+ border-collapse: collapse;
+ width: 90%;
+ margin: auto;
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+table.tableblock thead {
+ background-color: #DEE4CD;
+ border: 1px solid #7A9437;
+}
+
+table.tableblock th {
+ font-family: monospace;
+ border: 1px solid #7A9437;
+ padding: 5px;
+}
+
+table.tableblock tbody {
+ background-color: #FFFFFF;
+ border: 1px solid #7A9437;
+}
+
+table.tableblock td {
+ border: 1px dotted #7A9437;
+ padding: 5px;
+}
+
+table.tableblock td p:last-child {
+ margin: 0px;
+}
+
+.note {
+ margin: 10px 10px 10px 50px;
+ padding: 10px;
+ font-style: italic;
+ -moz-border-radius: 10px;
+ background-color: #F6FF7F;
+ border: 1px solid #FFB643;
+ color: #4E3000;
+}
+
+.note .title {
+ display:none;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/64b328d8/doc/xooki2asciidoc/xooki2asciidoc.js
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/xooki2asciidoc.js b/doc/xooki2asciidoc/xooki2asciidoc.js
index 8945c64..ab5840f 100644
--- a/doc/xooki2asciidoc/xooki2asciidoc.js
+++ b/doc/xooki2asciidoc/xooki2asciidoc.js
@@ -753,7 +753,6 @@ xooki.input = {
var title;
var url;
var invalid = false;
-
if (typeof xooki.toc.pages[xooki.toc.importRoot + id] != "undefined") {
title = xooki.toc.pages[xooki.toc.importRoot + id].title;
url = pu(xooki.toc.importRoot + id);
@@ -810,7 +809,7 @@ xooki.input = {
+ "\n----\n\n";
input = input.substring(0, codeSection.outerStart)
+ processedSection
- + input.substring(codeSection.outerEnd);
+ + input.substring(codeSection.outerEnd).trim();
from = codeSection.outerStart + processedSection.length;
codeSection = xooki.string.findXmlSection(input, "code", from);
@@ -827,7 +826,8 @@ xooki.input = {
result = result + input.slice(lastStart,nextPos);
lastStart = nextPos;
nextPos = input.indexOf(">]" , lastStart);
- result = result + xooki.url.loadURL(lu(input.slice(lastStart+2,nextPos)));
+ result = result + "include::" + lu(input.slice(lastStart+2,nextPos)) + "[]"
+ //result = result + xooki.url.loadURL(lu(input.slice(lastStart+2,nextPos)));
lastStart = nextPos + 2;
nextPos = input.indexOf("[<" , lastStart);
}
@@ -853,10 +853,20 @@ xooki.input = {
},
htmltags: function(input) {
- print('search href\n')
- var s = xooki.string.findSection(input, new RegExp('<a\\s*href\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'));
+ print('search comment\n')
+ var s = xooki.string.findSection(input, new RegExp('<!--'), new RegExp('-->'));
var from = 0;
while (s != null) {
+ processedSection = "\n////\n" + input.substring(s.innerStart, s.innerEnd) + "\n////\n";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<!--'), new RegExp('-->'), from);
+ }
+
+ print('search href\n')
+ s = xooki.string.findSection(input, new RegExp('<a\\s*href\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'));
+ from = 0;
+ while (s != null) {
var href = s.matcherStart[1];
processedSection = "link:" + href + "[" + input.substring(s.innerStart, s.innerEnd) + "]";
input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
@@ -875,6 +885,36 @@ xooki.input = {
s = xooki.string.findSection(input, new RegExp('<a\\s*name\\s*=\\s*\\"([^\\"]*)\\"[^>]*>'), new RegExp('</a>'), from);
}
+ print('search tip\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"tip"[^>]*>'), new RegExp('</div>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "\n[NOTE]\n====\n" + input.substring(s.innerStart, s.innerEnd) + "\n====\n";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"tip"[^>]*>'), new RegExp('</div>'), from);
+ }
+
+ print('search step\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"step"[^>]*>'), new RegExp('</div>'));
+ from = 0;
+ while (s != null) {
+ processedSection = input.substring(s.innerStart, s.innerEnd);
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"step"[^>]*>'), new RegExp('</div>'), from);
+ }
+
+ print('search shell\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"shell"[^>]*>'), new RegExp('</div>'));
+ from = 0;
+ while (s != null) {
+ processedSection = input.substring(s.innerStart, s.innerEnd);
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*"shell"[^>]*>'), new RegExp('</div>'), from);
+ }
+
print('search img\n')
s = xooki.string.find(input, new RegExp('<img\\s*src\\s*=\\s*\\"([^\\"]*)\\"\\s*/>'));
from = 0;
@@ -888,7 +928,7 @@ xooki.input = {
}
print('search br\n')
- s = xooki.string.find(input, new RegExp('<br\\s*/>'));
+ s = xooki.string.find(input, new RegExp('<br\\s*/?>'));
from = 0;
while (s != null) {
processedSection = "\n"
@@ -896,7 +936,19 @@ xooki.input = {
+ processedSection
+ input.substring(s.end);
from = s.begin + processedSection.length;
- s = xooki.string.find(input, new RegExp('<br\\s*/>'), from);
+ s = xooki.string.find(input, new RegExp('<br\\s*/?>'), from);
+ }
+
+ print('search hr\n')
+ s = xooki.string.find(input, new RegExp('<hr\\s*/>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "\n'''\n"
+ input = input.substring(0, s.begin)
+ + processedSection
+ + input.substring(s.end);
+ from = s.begin + processedSection.length;
+ s = xooki.string.find(input, new RegExp('<hr\\s*/>'), from);
}
print('search b\n')
@@ -911,6 +963,18 @@ xooki.input = {
print("found=" + (s != null) + "\n")
}
+ print('search u\n')
+ s = xooki.string.findXmlSection(input, "u");
+ from = 0;
+ print("found=" + (s != null) + "\n")
+ while (s != null) {
+ processedSection = input.substring(s.innerStart, s.innerEnd);
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findXmlSection(input, "u", from);
+ print("found=" + (s != null) + "\n")
+ }
+
print('search strong\n')
s = xooki.string.findXmlSection(input, "strong");
from = 0;
@@ -1014,11 +1078,26 @@ xooki.input = {
s = xooki.string.findXmlSection(input, "tt", from);
}
+ print('search pre\n')
+ s = xooki.string.findXmlSection(input, "pre");
+ from = 0;
+ while (s != null) {
+ processedSection = "\n[source]\n----\n"
+ + input.substring(s.innerStart, s.innerEnd)
+ + "\n----\n\n";
+ input = input.substring(0, s.outerStart)
+ + processedSection
+ + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+
+ s = xooki.string.findXmlSection(input, "pre", from);
+ }
+
print('search em\n')
s = xooki.string.findXmlSection(input, "em");
from = 0;
while (s != null) {
- processedSection = "\n[NOTE]\n===============================\n" + input.substring(s.innerStart, s.innerEnd) + "\n===============================\n";
+ processedSection = "_" + input.substring(s.innerStart, s.innerEnd) + "_";
input = input.substring(0, s.outerStart)
+ processedSection
+ input.substring(s.outerEnd);
@@ -1027,6 +1106,16 @@ xooki.input = {
s = xooki.string.findXmlSection(input, "em", from);
}
+ print('search div-since\n')
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*\\"\\s*since\\s*\\"[^>]*>'), new RegExp('</div>'));
+ from = 0;
+ while (s != null) {
+ processedSection = "*__" + input.substring(s.innerStart, s.innerEnd) + "__*";
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<div\\s*class\\s*=\\s*\\"\\s*since\\s*\\"[^>]*>'), new RegExp('</div>'), from);
+ }
+
print('search span-since\n')
s = xooki.string.findSection(input, new RegExp('<span\\s*class\\s*=\\s*\\"\\s*since\\s*\\"[^>]*>'), new RegExp('</span>'));
from = 0;
@@ -1037,6 +1126,16 @@ xooki.input = {
s = xooki.string.findSection(input, new RegExp('<span\\s*class\\s*=\\s*\\"\\s*since\\s*\\"[^>]*>'), new RegExp('</span>'), from);
}
+ print('search span-tagdoc\n')
+ s = xooki.string.findSection(input, new RegExp('<span\\s*class\\s*=\\s*\\"\\s*tagdoc\\s*\\"[^>]*>'), new RegExp('</span>'));
+ from = 0;
+ while (s != null) {
+ processedSection = input.substring(s.innerStart, s.innerEnd);
+ input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+ from = s.outerStart + processedSection.length;
+ s = xooki.string.findSection(input, new RegExp('<span\\s*class\\s*=\\s*\\"\\s*tagdoc\\s*\\"[^>]*>'), new RegExp('</span>'), from);
+ }
+
print('search ul/ol\n')
var htmllisttag = function(input, from, indent) {
var sul = xooki.string.find(input, '<ul>', from);
@@ -1067,10 +1166,12 @@ xooki.input = {
break;
}
start = sli.outerStart;
+ var betweenliContent = "";
if (!first) {
start = lastEnd;
+ betweenliContent = input.substring(lastEnd, sli.outerStart);
}
- processedSection = "\n" + innerindent + input.substring(sli.innerStart, sli.innerEnd).replace(/\\s/, ' ');
+ processedSection = betweenliContent + "\n" + innerindent + input.substring(sli.innerStart, sli.innerEnd).replace(/\\s/, ' ');
input = input.substring(0, start)
+ processedSection
+ input.substring(sli.outerEnd);
@@ -1097,7 +1198,12 @@ xooki.input = {
print("found=" + (s != null) + "\n")
while (s != null) {
tableContent = input.substring(s.innerStart, s.innerEnd);
- processedSection = "\n"
+ var tablespec = ""
+ processedSection = ""
+
+ var ivyTable = input.substring(s.outerStart, s.innerStart).indexOf("class=\"ivy-attributes\"") > -1;
+ ivyTable = ivyTable || input.substring(s.outerStart, s.innerStart).indexOf("class=\"ant\"") > -1;
+ var nbCol = 0;
print('search tablehead\n')
s2 = xooki.string.findXmlSection(tableContent, "thead");
@@ -1105,15 +1211,18 @@ xooki.input = {
print("found=" + (s2 != null) + "\n")
if (s2 != null) {
tableHead = tableContent.substring(s2.innerStart, s2.innerEnd);
- processedSection += '[options="header"]\n'
+ tablespec = "options=\"header\""
processedSection += '|=======\n'
print('search th\n')
s3 = xooki.string.findXmlSection(tableHead, "th");
+ var nbTh = 0;
while (s3 != null) {
processedSection += "|" + tableHead.substring(s3.innerStart, s3.innerEnd);
s3 = xooki.string.findXmlSection(tableHead, "th", s3.outerEnd);
+ nbTh++;
}
+ nbCol = Math.max(nbTh, nbCol);
processedSection += "\n"
from2 = s2.outerEnd
} else {
@@ -1127,19 +1236,39 @@ xooki.input = {
print('search td\n')
s3 = xooki.string.findXmlSection(trContent, "td");
+ var nbTd = 0;
while (s3 != null) {
processedSection += "|" + trContent.substring(s3.innerStart, s3.innerEnd);
s3 = xooki.string.findXmlSection(trContent, "td", s3.outerEnd);
+ nbTd++;
}
processedSection += "\n"
+ nbCol = Math.max(nbTd, nbCol);
from2 = s2.outerEnd;
s2 = xooki.string.findXmlSection(tableContent, "tr", from2);
}
processedSection += '|=======\n'
-
- input = input.substring(0, s.outerStart) + processedSection + input.substring(s.outerEnd);
+
+ if (ivyTable) {
+ if (tablespec.length != 0) {
+ tablespec += ","
+ }
+ tablespec += "cols=\""
+ for (var i = 0; i < nbCol; i++) {
+ if (i == 0) {
+ tablespec += "15%";
+ } else if (i == 1) {
+ tablespec += ",50%";
+ } else {
+ tablespec += "," + Math.round(35 / (nbCol - 2)) + "%";
+ }
+ }
+ tablespec += "\""
+ }
+
+ input = input.substring(0, s.outerStart) + '\n[' + tablespec + ']\n' + processedSection + input.substring(s.outerEnd);
from = s.outerStart + processedSection.length;
s = xooki.string.findXmlSection(input, "table", from);
print("found=" + (s != null) + "\n")
@@ -1408,7 +1537,7 @@ xooki.init = function() {
xooki.template.source = xooki.url.loadURL(xooki.c.action == "print"?cu("printTemplate"):cu("template"));
if(xooki.template.source != null) {
xooki.template.head = '';
- xooki.template.body = '${title}\n====================\n\n${body}';
+ xooki.template.body = '${body}';
}
[25/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
Initial auto-converted .adoc files from xooki2asciidoc convertor
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/22bdffb9
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/22bdffb9
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/22bdffb9
Branch: refs/heads/master
Commit: 22bdffb96dd29d98e2eb7b7f9f3a48a46ccc86ce
Parents: 32296ea
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Thu Jun 15 18:37:16 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Fri Jun 16 09:57:06 2017 +0530
----------------------------------------------------------------------
asciidoc/ant.adoc | 182 ++++
asciidoc/bestpractices.adoc | 116 +++
asciidoc/compatibility.adoc | 30 +
asciidoc/concept.adoc | 404 ++++++++
asciidoc/configuration.adoc | 3 +
asciidoc/configuration/caches.adoc | 3 +
asciidoc/configuration/caches/cache.adoc | 3 +
asciidoc/configuration/caches/ttl.adoc | 3 +
asciidoc/configuration/classpath.adoc | 4 +
asciidoc/configuration/conf.adoc | 3 +
asciidoc/configuration/conflict-managers.adoc | 4 +
asciidoc/configuration/include.adoc | 4 +
asciidoc/configuration/latest-strategies.adoc | 4 +
asciidoc/configuration/lock-strategies.adoc | 3 +
asciidoc/configuration/macrodef.adoc | 4 +
asciidoc/configuration/macrodef/attribute.adoc | 3 +
asciidoc/configuration/module.adoc | 4 +
asciidoc/configuration/modules.adoc | 4 +
asciidoc/configuration/namespace.adoc | 4 +
asciidoc/configuration/namespace/dest.adoc | 3 +
.../configuration/namespace/fromtosystem.adoc | 3 +
asciidoc/configuration/namespace/rule.adoc | 3 +
asciidoc/configuration/namespace/src.adoc | 3 +
asciidoc/configuration/namespaces.adoc | 4 +
asciidoc/configuration/outputters.adoc | 4 +
asciidoc/configuration/parsers.adoc | 4 +
asciidoc/configuration/properties.adoc | 4 +
asciidoc/configuration/property.adoc | 4 +
asciidoc/configuration/resolvers.adoc | 4 +
asciidoc/configuration/status.adoc | 4 +
asciidoc/configuration/statuses.adoc | 4 +
asciidoc/configuration/triggers.adoc | 3 +
asciidoc/configuration/typedef.adoc | 4 +
asciidoc/configuration/version-matchers.adoc | 4 +
asciidoc/dev.adoc | 123 +++
asciidoc/dev/makerelease.adoc | 318 ++++++
asciidoc/extend.adoc | 35 +
asciidoc/images/ant-project-logo.gif | Bin 0 -> 7577 bytes
asciidoc/images/ant-project-logo.svg | 951 ++++++++++++++++++
asciidoc/images/apache-incubator-logo.png | Bin 0 -> 6205 bytes
asciidoc/images/apache-incubator.svg | 44 +
asciidoc/images/bullet.gif | Bin 0 -> 193 bytes
asciidoc/images/closed.gif | Bin 0 -> 141 bytes
asciidoc/images/discovery.gif | Bin 0 -> 362 bytes
asciidoc/images/downloaded.gif | Bin 0 -> 104 bytes
asciidoc/images/error.gif | Bin 0 -> 605 bytes
asciidoc/images/evicted.gif | Bin 0 -> 215 bytes
asciidoc/images/grippie.png | Bin 0 -> 162 bytes
asciidoc/images/hibgraph-small.png | Bin 0 -> 9042 bytes
asciidoc/images/hibgraph.png | Bin 0 -> 51535 bytes
asciidoc/images/hibgraph.svg | 173 ++++
asciidoc/images/ivy-book.png | Bin 0 -> 14182 bytes
asciidoc/images/ivy-demo.png | Bin 0 -> 24544 bytes
asciidoc/images/ivy-dl-1.4.1.png | Bin 0 -> 10892 bytes
asciidoc/images/ivy-dl-2.0.0-alpha-1.png | Bin 0 -> 12149 bytes
asciidoc/images/ivy-dl.xcf | Bin 0 -> 29498 bytes
asciidoc/images/ivy-forum.png | Bin 0 -> 10441 bytes
asciidoc/images/ivy-lierre.png | Bin 0 -> 15263 bytes
asciidoc/images/ivy-publish-fc.odg | Bin 0 -> 11126 bytes
asciidoc/images/ivy-publish-fc.png | Bin 0 -> 20111 bytes
asciidoc/images/ivy-publish-fc.svg | 337 +++++++
asciidoc/images/ivy-terminology.odg | Bin 0 -> 22331 bytes
asciidoc/images/ivy-terminology.png | Bin 0 -> 70573 bytes
asciidoc/images/ivy-terminology.svg | 419 ++++++++
asciidoc/images/ivyfile-small.png | Bin 0 -> 16328 bytes
asciidoc/images/logo.png | Bin 0 -> 8772 bytes
asciidoc/images/main-tasks.odg | Bin 0 -> 12386 bytes
asciidoc/images/main-tasks.png | Bin 0 -> 32995 bytes
asciidoc/images/main-tasks.svg | 82 ++
asciidoc/images/open.gif | Bin 0 -> 151 bytes
asciidoc/images/report-small.png | Bin 0 -> 16751 bytes
asciidoc/images/searched.gif | Bin 0 -> 229 bytes
asciidoc/images/warning.png | Bin 0 -> 762 bytes
asciidoc/images/xooki-edit-small.png | Bin 0 -> 30143 bytes
asciidoc/images/xooki-edit.png | Bin 0 -> 52706 bytes
asciidoc/images/xooki-toolbar.png | Bin 0 -> 6539 bytes
asciidoc/images/yed-step1.jpg | Bin 0 -> 3077 bytes
asciidoc/images/yed-step2.jpg | Bin 0 -> 15150 bytes
asciidoc/images/yed-step3-2.jpg | Bin 0 -> 3816 bytes
asciidoc/images/yed-step3.jpg | Bin 0 -> 21662 bytes
asciidoc/images/yed-step4.jpg | Bin 0 -> 10558 bytes
asciidoc/images/yed-step5.jpg | Bin 0 -> 31309 bytes
asciidoc/images/yed-step6.jpg | Bin 0 -> 21240 bytes
asciidoc/images/yed-step7.jpg | Bin 0 -> 51973 bytes
asciidoc/index.adoc | 69 ++
asciidoc/install.adoc | 74 ++
asciidoc/ivyfile.adoc | 126 +++
asciidoc/ivyfile/artifact-conf.adoc | 19 +
asciidoc/ivyfile/artifact-exclude-conf.adoc | 19 +
asciidoc/ivyfile/artifact-exclude.adoc | 49 +
asciidoc/ivyfile/artifact.adoc | 94 ++
asciidoc/ivyfile/conf.adoc | 62 ++
asciidoc/ivyfile/configurations.adoc | 190 ++++
asciidoc/ivyfile/conflict.adoc | 35 +
asciidoc/ivyfile/conflicts.adoc | 51 +
asciidoc/ivyfile/dependencies.adoc | 52 +
asciidoc/ivyfile/dependency-artifact-conf.adoc | 17 +
asciidoc/ivyfile/dependency-artifact.adoc | 100 ++
asciidoc/ivyfile/dependency-conf.adoc | 33 +
asciidoc/ivyfile/dependency-include-conf.adoc | 17 +
asciidoc/ivyfile/dependency-include.adoc | 46 +
asciidoc/ivyfile/dependency.adoc | 409 ++++++++
asciidoc/ivyfile/description.adoc | 22 +
asciidoc/ivyfile/exclude.adoc | 24 +
asciidoc/ivyfile/extends.adoc | 40 +
asciidoc/ivyfile/include.adoc | 57 ++
asciidoc/ivyfile/info.adoc | 39 +
asciidoc/ivyfile/ivyauthor.adoc | 20 +
asciidoc/ivyfile/license.adoc | 19 +
asciidoc/ivyfile/manager.adoc | 34 +
asciidoc/ivyfile/mapped.adoc | 20 +
asciidoc/ivyfile/override.adoc | 29 +
asciidoc/ivyfile/publications.adoc | 34 +
asciidoc/ivyfile/repository.adoc | 23 +
asciidoc/js/jquery.pack.js | 1 +
asciidoc/js/jquery.treeview.js | 239 +++++
asciidoc/moreexamples.adoc | 33 +
asciidoc/osgi.adoc | 44 +
asciidoc/osgi/eclipse-plugin.adoc | 88 ++
asciidoc/osgi/osgi-mapping.adoc | 242 +++++
asciidoc/osgi/sigil.adoc | 37 +
asciidoc/osgi/standard-osgi.adoc | 46 +
asciidoc/osgi/target-platform.adoc | 48 +
asciidoc/principle.adoc | 64 ++
asciidoc/reference.adoc | 38 +
asciidoc/release-notes.adoc | 377 ++++++++
asciidoc/resolver/bintray.adoc | 53 +
asciidoc/resolver/chain.adoc | 87 ++
asciidoc/resolver/dual.adoc | 29 +
asciidoc/resolver/filesystem.adoc | 77 ++
asciidoc/resolver/ibiblio.adoc | 70 ++
asciidoc/resolver/ivyrep.adoc | 47 +
asciidoc/resolver/jar.adoc | 76 ++
asciidoc/resolver/mirrored.adoc | 83 ++
asciidoc/resolver/obr.adoc | 62 ++
asciidoc/resolver/osgiagg.adoc | 43 +
asciidoc/resolver/packager.adoc | 351 +++++++
asciidoc/resolver/sftp.adoc | 133 +++
asciidoc/resolver/ssh.adoc | 92 ++
asciidoc/resolver/updatesite.adoc | 52 +
asciidoc/resolver/url.adoc | 55 ++
asciidoc/resolver/vfs.adoc | 46 +
asciidoc/running.adoc | 11 +
asciidoc/samples/apache-hello-ivy-default.html | 371 +++++++
asciidoc/samples/build-install.xml | 72 ++
asciidoc/samples/build.xml | 151 +++
.../samples/commons-lang1.0-dep-report-part.jpg | Bin 0 -> 12087 bytes
asciidoc/samples/eclipse-plugin/build.xml | 77 ++
asciidoc/samples/eclipse-plugin/ivy.xml | 39 +
.../eclipse-plugin/ivysettings.properties | 21 +
asciidoc/samples/eclipse-plugin/ivysettings.xml | 36 +
.../samples/hibernate3.0-dep-report-part.jpg | Bin 0 -> 35112 bytes
asciidoc/samples/ivy-doc.xsl | 281 ++++++
asciidoc/samples/ivy-report.css | 279 ++++++
asciidoc/samples/ivy-sample-xslt.xml | 101 ++
asciidoc/samples/ivy-sample.xml | 100 ++
asciidoc/samples/ivy-style.css | 160 ++++
asciidoc/samples/ivysettings-default.xml | 24 +
.../jayasoft-ivyrep-example-default.html | 371 +++++++
.../samples/jayasoft-ivyrep-example-default.jpg | Bin 0 -> 12564 bytes
.../projects-dependencies-graph-small.jpg | Bin 0 -> 18280 bytes
.../samples/projects-dependencies-graph.jpg | Bin 0 -> 53526 bytes
asciidoc/samples/standard-osgi/build.xml | 83 ++
asciidoc/samples/standard-osgi/ivy.xml | 24 +
asciidoc/samples/standard-osgi/ivysettings.xml | 34 +
.../org.apache.ivy.sample.standard-osgi.bnd | 18 +
asciidoc/samples/target-platform/build.xml | 56 ++
asciidoc/samples/target-platform/ivy.xml | 24 +
.../samples/target-platform/ivysettings.xml | 33 +
asciidoc/settings.adoc | 131 +++
asciidoc/settings/caches.adoc | 64 ++
asciidoc/settings/caches/cache.adoc | 65 ++
asciidoc/settings/caches/ttl.adoc | 40 +
asciidoc/settings/classpath.adoc | 55 ++
asciidoc/settings/conflict-managers.adoc | 61 ++
asciidoc/settings/credentials.adoc | 18 +
asciidoc/settings/include.adoc | 73 ++
asciidoc/settings/latest-strategies.adoc | 80 ++
asciidoc/settings/lock-strategies.adoc | 34 +
asciidoc/settings/macrodef.adoc | 158 +++
asciidoc/settings/macrodef/attribute.adoc | 18 +
asciidoc/settings/module.adoc | 109 +++
asciidoc/settings/modules.adoc | 23 +
asciidoc/settings/namespace.adoc | 111 +++
asciidoc/settings/namespace/dest.adoc | 43 +
asciidoc/settings/namespace/fromtosystem.adoc | 17 +
asciidoc/settings/namespace/rule.adoc | 19 +
asciidoc/settings/namespace/src.adoc | 18 +
asciidoc/settings/namespaces.adoc | 30 +
asciidoc/settings/outputters.adoc | 43 +
asciidoc/settings/parsers.adoc | 29 +
asciidoc/settings/properties.adoc | 24 +
asciidoc/settings/property.adoc | 58 ++
asciidoc/settings/resolvers.adoc | 146 +++
asciidoc/settings/settings.adoc | 40 +
asciidoc/settings/signers.adoc | 78 ++
asciidoc/settings/status.adoc | 19 +
asciidoc/settings/statuses.adoc | 50 +
asciidoc/settings/triggers.adoc | 551 +++++++++++
asciidoc/settings/typedef.adoc | 20 +
asciidoc/settings/version-matchers.adoc | 121 +++
asciidoc/standalone.adoc | 171 ++++
asciidoc/style/ant.css | 50 +
asciidoc/style/color.css | 159 +++
asciidoc/style/ivy-ref.css | 84 ++
asciidoc/style/nav.css | 28 +
asciidoc/style/print-style.css | 299 ++++++
asciidoc/style/shell.css | 38 +
asciidoc/style/style.css | 372 +++++++
asciidoc/style/tree.css | 53 +
asciidoc/terminology.adoc | 155 +++
asciidoc/textual.adoc | 115 +++
asciidoc/toc.json | 957 +++++++++++++++++++
asciidoc/tutorial.adoc | 46 +
asciidoc/tutorial/build-repository.adoc | 44 +
.../tutorial/build-repository/advanced.adoc | 136 +++
asciidoc/tutorial/build-repository/basic.adoc | 122 +++
asciidoc/tutorial/conf.adoc | 204 ++++
asciidoc/tutorial/defaultconf.adoc | 306 ++++++
asciidoc/tutorial/dependence.adoc | 255 +++++
asciidoc/tutorial/dual.adoc | 140 +++
asciidoc/tutorial/log/chained-resolvers.txt | 38 +
asciidoc/tutorial/log/configurations-lib.txt | 72 ++
asciidoc/tutorial/log/configurations-runcc.txt | 46 +
asciidoc/tutorial/log/configurations-runhm.txt | 32 +
.../tutorial/log/dependence-depending-2.txt | 40 +
asciidoc/tutorial/log/dependence-depending.txt | 40 +
.../tutorial/log/dependence-standalone-2.txt | 36 +
asciidoc/tutorial/log/dependence-standalone.txt | 43 +
asciidoc/tutorial/log/dual.txt | 48 +
asciidoc/tutorial/log/hello-ivy-1.txt | 69 ++
asciidoc/tutorial/log/hello-ivy-2.txt | 32 +
asciidoc/tutorial/log/install-deps.txt | 249 +++++
asciidoc/tutorial/log/install-namespace.txt | 37 +
asciidoc/tutorial/log/install.txt | 37 +
.../tutorial/log/multi-project-find-antp.txt | 17 +
.../tutorial/log/multi-project-general-antp.txt | 8 +
.../log/multi-project-general-publishall.txt | 337 +++++++
.../tutorial/log/myrepository-content-deps.txt | 13 +
.../log/myrepository-content-namespace.txt | 10 +
asciidoc/tutorial/log/myrepository-content.txt | 10 +
asciidoc/tutorial/multiple.adoc | 156 +++
asciidoc/tutorial/multiproject.adoc | 298 ++++++
asciidoc/tutorial/start.adoc | 109 +++
asciidoc/use/artifactproperty.adoc | 57 ++
asciidoc/use/artifactreport.adoc | 82 ++
asciidoc/use/buildlist.adoc | 143 +++
asciidoc/use/buildnumber.adoc | 137 +++
asciidoc/use/buildobr.adoc | 93 ++
asciidoc/use/cachefileset.adoc | 37 +
asciidoc/use/cachepath.adoc | 61 ++
asciidoc/use/checkdepsupdate.adoc | 69 ++
asciidoc/use/cleancache.adoc | 49 +
asciidoc/use/configure.adoc | 90 ++
asciidoc/use/convertmanifest.adoc | 24 +
asciidoc/use/convertpom.adoc | 24 +
asciidoc/use/deliver.adoc | 112 +++
asciidoc/use/dependencytree.adoc | 51 +
asciidoc/use/findrevision.adoc | 48 +
asciidoc/use/fixdeps.adoc | 80 ++
asciidoc/use/info.adoc | 172 ++++
asciidoc/use/install.adoc | 42 +
asciidoc/use/listmodules.adoc | 56 ++
asciidoc/use/makepom.adoc | 131 +++
asciidoc/use/postresolvetask.adoc | 105 ++
asciidoc/use/publish.adoc | 77 ++
asciidoc/use/report.adoc | 80 ++
asciidoc/use/repreport.adoc | 109 +++
asciidoc/use/resolve.adoc | 308 ++++++
asciidoc/use/resources.adoc | 105 ++
asciidoc/use/retrieve.adoc | 257 +++++
asciidoc/use/settings.adoc | 122 +++
asciidoc/use/var.adoc | 28 +
asciidoc/yed.adoc | 46 +
274 files changed, 20776 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ant.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ant.adoc b/asciidoc/ant.adoc
new file mode 100644
index 0000000..92b75c3
--- /dev/null
+++ b/asciidoc/ant.adoc
@@ -0,0 +1,182 @@
+
+The main and most frequent way to use ivy is from an ant build file. However, ivy can also be called as a standalone application
+
+If you use ant version *1.6.0* or superior, you just have to add ivy namespace to your project (
+[source]
+----
+xmlns:ivy="antlib:org.apache.ivy.ant"
+----
+
+attribute of your project tag), and you can call ivy tasks.
+
+If you want to make your build handle ivy.jar in either ant lib dir or a local lib dir, you can use a taskdef like this:
+
+[source]
+----
+
+<path id="ivy.lib.path">
+ <fileset dir="path/to/dir/with/ivy/jar" includes="*.jar"/>
+</path>
+<taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+
+----
+
+Combined with the antlib definition in the project namespace, it will load Ivy classes either from your ant lib or a local directory (path/to/dir/with/ivy/jar in this example).
+
+If you use ant *1.5.1* or superior, you have to define the tasks you use in your build file. For instance:
+
+[source]
+----
+
+ <taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
+ <taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
+ <taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
+ <taskdef name="ivy-deliver" classname="org.apache.ivy.ant.IvyDeliver"/>
+ <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/>
+
+----
+
+_Note: the tasks listed above are non exhaustive. For a complete list of tasks with the corresponding classes, see the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/ant/antlib.xml[antlib.xml] file in git or the version you use._
+
+Then you can use the tasks, but check their name, following samples assume you use the ivy namespace (ivy:xxx tasks), whereas with ant 1.5 you cannot use namespace, and should therefore use ivy-xxx tasks if you have followed the taskdefs above.
+
+If you use an ant version lower than 1.5.1, you can not use the ivy tasks... you should then call ivy as any external program.
+
+== Calling ivy from ant: first steps
+
+Once your build file is ok to call ivy tasks, the simplest way to use ivy is to call the ivy retrieve task with no parameters:
+
+[source]
+----
+
+<ivy:retrieve />
+
+----
+
+This calls ivy with default values, which might be ok in several projects. In fact, it is equivalent to:
+
+[source]
+----
+
+<target name="resolve">
+ <ivy:configure />
+
+ <ivy:resolve file="${ivy.dep.file}" conf="${ivy.configurations}" />
+
+ <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${ivy.configurations}" />
+</target>
+
+----
+
+Those 3 tasks follow the 3 main steps of the ivy retrieving dependencies process:
+
+
+* First the configure task tells it how it can find dependencies giving it a path to an link:settings.html[xml settings file]. +
+
+* Then the resolve task actually resolves dependencies described by an link:ivyfile.html[ivy file], and puts those dependencies in the ivy cache (a directory configured in the settings file). +
+
+* Finally the retrieve task copies dependencies from the cache to anywhere you want in your file system. You can then use those dependencies to make your classpath with standard ant paths. +
+
+
+To understand more accurately the behaviour of ivy tasks, one should know that a property file is loaded in ant by ivy at the beginning of the configure call. This property file contains the following properties:
+
+[source]
+----
+
+ivy.project.dir = ${basedir}
+ivy.lib.dir = ${ivy.project.dir}/lib
+ivy.build.artifacts.dir = ${ivy.project.dir}/build/artifacts
+ivy.distrib.dir = ${ivy.project.dir}/distrib
+
+ivy.resolver.default.check.modified = false
+ivy.default.always.check.exact.revision = true
+
+ivy.configurations = *
+ivy.resolve.default.type.filter = *
+ivy.status = integration
+ivy.dep.file = ivy.xml
+ivy.settings.file = ivysettings.xml
+ivy.retrieve.pattern = ${ivy.lib.dir}/[artifact]-[revision].[ext]
+ivy.deliver.ivy.pattern = ${ivy.distrib.dir}/[type]s/[artifact]-[revision].[ext]
+ivy.publish.src.artifacts.pattern = ${ivy.distrib.dir}/[type]s/[artifact]-[revision].[ext]
+
+ivy.report.output.pattern = [organisation]-[module]-[conf].[ext]
+
+ivy.buildlist.ivyfilepath = ivy.xml
+
+ivy.checksums=sha1,md5
+
+----
+
+_For the latest version of these properties, you can check the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/core/settings/ivy.properties[git version]._
+
+*__since 2.0__* After calling the first Ivy task, the property ivy.version will be available and contains the version of the used Ivy library.
+
+
+== Ivy tasks attributes : generalities
+
+Some tasks attributes values may be given through different places. The three possible places are :
+
+
+. task attribute +
+
+. ivy instance +
+
+. project property +
+
+The places are queried in this order, so anything set in task attribute will overwrite what would have been found in ivy instance, for example.
+
+The ivy instance considered here is an instance of the class Ivy, which is setup by a call to the configure task, and then reused for other tasks. Because most of the tasks need an ivy instance, they first check if one is available (i.e. configure has been called), and if none is available, then a default configure is called and the resulting ivy instance is used in the remaining tasks (unless another configure is called).
+
+It isn't generally necessary to understand this, but it can lead to some issues if you forget to call configure before another task and if the configure step was required in your environment.
+
+
+== Usual cycle of main tasks
+
+image::images/main-tasks.png[]
+
+== Example
+
+Here is a more complete example of build file using ivy:
+
+
+[source]
+----
+
+<project xmlns:ivy="antlib:org.apache.ivy.ant" name="sample" default="resolve">
+
+ <target name="resolve">
+ <ivy:configure file="../ivysettings.xml" />
+
+ <ivy:resolve file="my-ivy.xml" conf="default, myconf" />
+
+ </target>
+
+ <target name="retrieve-default" depends="resolve">
+ <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default" />
+ </target>
+
+ <target name="retrieve-myconf" depends="resolve">
+ <ivy:retrieve pattern="lib/myconf/[artifact]-[revision].[ext]" conf="myconf" />
+ </target>
+
+ <target name="retrieve-all" depends="resolve">
+ <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*" />
+ </target>
+
+ <target name="deliver" depends="retrieve-all">
+ <ivy:deliver deliverpattern="distrib/[artifact]-[revision].[ext]"
+ pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
+ </target>
+
+ <target name="publish" depends="deliver">
+ <ivy:publish resolver="internal"
+ artifactspattern="distrib/[artifact]-[revision].[ext]"
+ pubrevision="1.1b4" />
+ </target>
+</project>
+
+----
+
+All ivy tasks are documented in the following pages.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/bestpractices.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/bestpractices.adoc b/asciidoc/bestpractices.adoc
new file mode 100644
index 0000000..f65296a
--- /dev/null
+++ b/asciidoc/bestpractices.adoc
@@ -0,0 +1,116 @@
+
+Here are some recommendations and best practices we have gathered throughout our experience and consultancies with our customers.
+
+
+== Add module descriptors for all your modules
+
+In Ivy world, module descriptors are ivy files, which are basically simple xml files describing both what the module produces as artifacts and its dependencies.
+
+It is a good practice to write or download module descriptors for all the modules involved in your development, even for your third party dependencies, and even if they don't provide such module descriptors themselves.
+
+First, it will seem like extra work and require time. But when you have several modules using the same third party library, then you will only need to add one line to your ivy file to get this library and all its own dependencies that you really need (if you have good module descriptors in your repository, especially with the use of module link:concept.html#configurations[configurations]). It will also be very helpful when you want to upgrade a dependency. One single change in your module ivy file and you will get the updated version with its updated (or not) dependencies.
+
+Therefore we recommend adding ivy files for all the modules in your repository. You can even enforce this rule by setting the descriptor attribute to required on your link:settings/resolvers.html[resolvers]. Hence you shouldn't need to use the dependency artifact inclusion/exclusion/specification feature of Ivy, which should only be used in very specific cases.
+
+
+== Use your own enterprise repository
+
+This is usually not a valid recommendation for open source projects, but for the enterprise world we strongly suggest to avoid relying on a public repository like maven ibiblio or ivyrep. Why? Well, there are a couple of reasons:
+
+
+* control +
+ The main problem with these kinds of public repositories is that you don't have control over the repository. This means that if a module descriptor is broken you cannot easily fix it. Sure you can use a chain between a shared repository and the public one and put your fixed module descriptor in the shared repository so that it hides the one on the public repository, but this makes repository browsing and maintenance cumbersome.
+Even more problematic is the possible updates of the repository. We know that versions published in such repositories should be stable and not be updated, but we also frequently see that a module descriptor is buggy, or an artifact corrupted. We even see sometimes a new version published with the same name as the preceding one because the previous one was simply badly packaged. This can occur even to the best; it occurred to us with Ivy 1.2 :-) But then we decided to publish the new version with a different name, 1.2a. But if the repository manager allows such updates, this means that what worked before can break. It can thus break your build reproducibility.
+
+* reliability +
+ The Maven repository is not particularly well known for its reliability (we often experience major slow downs or even complete failures of the site), and ivyrep is only supported by a small company (yes we are only a small company!). So slow down and site hangs occur also. And if the repository you rely on is down, this can cause major slow downs in your development or release process.
+
+* accuracy +
+ A public repository usually contains much more than what you actually need. Is this a problem? We think so. We think that in an enterprise environment the libraries you use should step through some kind of validation process before being used in every projects of your company. And what better way to do so? Setup an enterprise repository with only the libraries you actually want to use. This will not only ensure better quality for your application dependencies, but help to have the same versions everywhere, and even help when declaring your module dependencies, if you use a tool like IvyDE, the code completion will only show relevant information about your repository, with only the libraries you actually want to see.
+
+* security +
+ The artifacts you download from a module repository are often executable, and are thus a security concern. Imagine a hacker replacing commons-lang by another version containing a virus? If you rely on a public repository to build your software, you expose it to a security risk. You can read more about that in this link:http://www.fortifysoftware.com/servlet/downloads/public/fortify_attacking_the_build.pdf[Forrester article].
+
+Note that using an enterprise repository doesn't mean you have to build it entirely by hand. Ivy features an link:use/install.html[install] task which can be used to install modules from one repository to another one, so it can be used to selectively install modules from a public repository to your enterprise repository, where you will then be able to ensure control, reliability and accuracy.
+
+
+== Always use patterns with at least organisation and module
+
+Ivy is very flexible and can accomodate a lot of existing repositories, using the concept of link:concept.html#pattern[patterns]. But if your repository doesn't exist yet, we strongly recommend always using the organisation and the module name in your pattern, even for a private repository where you put only your own modules (which all have the same organisation). Why? Because the Ivy listing feature relies on the token it can find in the pattern. If you have no organisation token in your pattern, Ivy won't be able to list the (only?) organisation in your repository. And this can be a problem for code completion in IvyDE, for example, but also for repository wide tasks like link:use/install.html[install] or link:use/repreport.html[repreport].
+
+
+== Public ivysettings.xml with public repositories
+
+If you create a public repository, provide a URL to the link:settings.html[ivysettings.xml] file. It's pretty easy to do, and if someone wants to leverage your repository, he will just have to load it with link:use/settings.html[settings] with the URL of your ivysettings.xml file, or link:configuration/include.html[include] it in its own configuration file, which makes it really easy to combine several public repositories.
+
+
+== Dealing with integration versions
+
+Very often, especially when working in a team or with several modules, you will need to rely on intermediate, non-finalized versions of your modules. These versions are what we call integration versions, because their main objective is to be integrated with other modules to make and test an application or a framework.
+
+If you follow the continuous integration paradigm across modules, these integration versions can be produced by a continuous integration server, very frequently.
+
+So, how can you deal with these, possibly numerous, integration versions?
+
+There are basically two ways to deal with them, both ways being supported by Ivy:
+
+
+* use a naming convention like a special suffix +
+ the idea is pretty simple, each time you publish a new integration of your module you give the same name to the version (in maven world this is for example 1.0-SNAPSHOT). The dependency manager should then be aware that this version is special because it changes over time, so that it does not trust its local cache if it already has the version, but checks the date of the version on the repository and sees if it has changed. In Ivy this is supported using the link:ivyfile/dependency.html[changing attribute] on a dependency or by configuring the link:configuration/resolvers.html[changing pattern] to use for all your modules.
+
+* automatically create a new version for each +
+ in this case you use either a build number or a timestamp to publish each new integration version with a new version name. Then you can use one of the numerous ways in Ivy to link:ivyfile/dependency.html[express a version constraint]. Usually selecting the very latest one (using 'latest.integration' as version constraint) is enough.
+
+
+So, which way is the best? As often, it depends on your context, and if one of the two was really bad it wouldn't be supported in Ivy :-)
+
+But usually we recommend using the second one, because using a new version each time you publish a new version better fits the version identity paradigm, and can make *all* your builds reproducible, even integration ones. And this is interesting because it enables, with some work in your build system, the ability to introduce a mechanism to promote an integration build to a more stable status, like a milestone or a release.
+
+Imagine you have a customer who comes on a Monday morning and asks for the latest version of your software, for testing or demonstration purposes. Obviously he needs it for the afternoon :-) Now if you have a continuous integration process and good tracking of your changes and your artifacts, it may occur to you that you are actually able to fulfill his request without needing the use of a DeLorean to give you some more time :-) But it may also occur to you that your latest version is stable enough to be used for the purpose of the customer, but was actually built a few days ago, because the very latest just broke a feature or introduced a new one you don't want to deliver. You can deliver this 'stable' integration build if you want, but rest assured that a few days, or weeks, or even months later, the customer will ask for a bug fix on this demo only version. Why? Because it's a customer, and we all know how they are :-)
+
+So, with a build promotion feature of any build in your repository, the solution would be pretty easy: when the customer asks for the version, you not only deliver the integration build, but you also promote it to a milestone status, for example. This promotion indicates that you should keep track of this version for a long period, to be able to come back to it and create a branch if needed.
+
+Unfortunately Ivy does not by its own allow you to have such reproducible builds out of the box, simply because Ivy is a dependency manager, not a build tool. But if you publish only versions with a distinct name and use Ivy features like versions constraint replacement during the publication or recursive delivery of modules, it can really help.
+
+On the other hand, the main drawback of this solution is that it can produce a lot of intermediate versions, and you will have to run some cleaning scripts in your repository unless your company name starts with a G and ends with oogle :-)
+
+
+== Inlining dependencies or not?
+
+With Ivy 1.4 you can resolve a dependency without even writing an ivy file. This pratice is called inlining. But what is it good for, and when should it be avoided?
+
+Putting ivy dependencies in a separate file has the following advantages:
+
+
+* separate revision cycle +
+ if your dependencies may change more often than your build, it's a good idea to separate the two, to isolate the two concepts: describing how to build / describing your project dependencies
+
+* possibility to publish +
+ if you describe dependencies of a module which can itself be reused, you may want to use ant to publish it to a repository. In this case the publication is only possible if you have a separate ivy file
+
+* more flexible +
+ inline dependencies can only be used to express one dependency and only one. An ivy file can be used to express much more complex dependencies
+
+On the other hand, using inline dependencies is very useful when:
+
+
+* you want to use a custom task in your ant build +
+ Without ivy you usually either copy the custom task jar in ant lib, which requires maintenance of your workstation installation, or use a manual copy or download and a taskdef with the appropriate classpath, which is better. But if you have several custom tasks, or if they have themselves dependencies, it can become cumbersome. Using Ivy with an inline dependency is an elegant way to solve this problem.
+
+* you want to easily deploy an application +
+ If you already build your application and its modules using Ivy, it is really easy to leverage your ivy repository to download your application and all its dependencies on the local filesystem, ready to be executed. If you also put your configuration files as artifacts in your repository (maybee packaged as a zip), the whole installation process can rely on ivy, easing the automatic installation of *any* version of your application available in your repository!
+
+
+== Hire an expert
+
+Build and dependency management is often given too low a priority in the software development world. We often see build management implemented by developers when they have time. Even if this may seem like a time and money savings in the short term, it often turns out to be a very bad choice in the long term. Building software is not a simple task, when you want to ensure automatic, tested, fully reproducible builds, releases and installations. On the other hand, once a good build system fitting your very specific needs is setup, it can then only rely on a few people with a good understanding of what is going on, with a constant quality ensured.
+
+Therefore hiring a build and dependency expert to analyse and improve your build and release system is most of the time a very good choice.
+
+
+== Feedback
+
+These best practices reflect our own experience, but we do not pretend to own the unique truth about dependency management or even Ivy use.
+
+So feel free to comment on this page to add your own experience feedback, suggestions or opinion.
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/compatibility.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/compatibility.adoc b/asciidoc/compatibility.adoc
new file mode 100644
index 0000000..748b899
--- /dev/null
+++ b/asciidoc/compatibility.adoc
@@ -0,0 +1,30 @@
+
+
+== JVM compability
+
+
+Up to Ivy 2.3.x, a minimum of Java 1.4 is required.
+
+For Ivy 2.4.0, a minimum of Java 5 is required.
+
+Since Ivy 2.5.0, a minimum of Java 7 is required.
+
+
+== Apache Ant
+
+
+Ivy doesn't require a specific version of Ant as long as the Ant being used complies with the JVM compatibility requirements noted above.
+
+
+== Other optional dependencies
+
+
+The required versions of the Apache HttpClient, Jsch or any optional dependency are to be checked against Ivy's dependency descriptor. In Ivy's source, check for the ivy.xml file at the root. Or the pom.xml of `org.apache.ivy#ivy` in the Maven Central repository.
+
+
+== Environment / Configuration Requirements
+
+
+Ivy does not at this time support multithreaded use. It thus should not be used with the ant `<parallel>` task.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/concept.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/concept.adoc b/asciidoc/concept.adoc
new file mode 100644
index 0000000..45e0f25
--- /dev/null
+++ b/asciidoc/concept.adoc
@@ -0,0 +1,404 @@
+
+
+== [[dependency-resolver]]Dependency Resolver
+
+A dependency resolver is a pluggable class in ivy which is used to:
+
+
+* find dependencies' ivy files +
+
+* download dependencies' artifacts +
+
+The notion of artifact "downloading" is large: an artifact can be on a web site, or on the local file system of your machine. The download is thus the act of bring a file from a repository to the ivy cache.
+
+Moreover, the fact that it is the responsibility of the resolver to find ivy files and download artifacts helps to implement various resolving strategies.
+
+As you see, a dependency resolver can be thought of as a class responsible for describing a repository.
+
+If you want to see which resolvers are available in ivy, you can go to the link:settings/resolvers.html[resolvers configuration page].
+
+
+== [[configurations]]Module configurations explained
+
+Module configurations are described in the terminology page as _a way to use or construct a module_. Configurations being a central part of Ivy, they need more explanations as a concept.
+
+
+When you define a way to use or construct a module, you are able to define which artifacts are published by this module in this configuration, and you are also able to define which dependencies are needed in this configuration.
+
+Moreover, because dependencies in ivy are expressed on modules and not on artifacts, it is important to be able to define which configurations of the dependency are required in the configuration you define of your module. That's what is called *configuration mapping*.
+
+If you use only simple modules and do not want to worry about configurations, you don't have to worry about them. They're still there under the hood because ivy can't work without configurations. But most of the time if you declare nothing, ivy assumes that the artifacts of your module are published in all configurations, and that all the dependencies' configurations are required in all configurations. And it works in simple cases. But whenever you want to separate things within a module, or get more control over things published and get better dependencies resolution, configurations will meet most of your needs.
+
+For details on how to declare your module configurations, how to declare in which configuration your artifacts are published, and how to declare configuration mapping, please refer to link:ivyfile.html[ivy file documentation]. The link:tutorial/conf.html[configurations tutorial] is also a good place to go to learn more about this concept.
+
+
+== [[variables]]Variables
+
+During configuration, ivy allows you to define what are called ivy variables. Ivy variables can be seen as ant properties, and are used in a very similar way. In particular, you use a properties tag in the configuration file to load a properties file containing ivy variables and their values.
+
+But the main differences between ant properties and ivy variables are that ivy variables can be overridden, whereas ant
+properties can't, and that they are defined in separate environments.
+
+Actually all ant properties are imported into ivy variables when the configuration is done (if you call ivy from ant).
+This means that if you define an ant property after the call to configure, it will not be available as an ivy variable.
+On the other hand, ivy variables are NOT exported to ant, thus if you define ivy variables in ivy, do not try to use them as ant properties.
+
+To use ivy variables, you just have to follow the same syntax as for ant properties:
+${__variablename__}
+where __variablename__ is the name of the variable.
+
+Finally, it's also important to be aware of the time of substitution of variables. This substitution is done as soon as possible. This means that when ivy encounters a reference to a variable, it tries to substitute it if such a variable is defined. Consequently, *any later modification of the variable will not alter the value already substituted*.
+
+Moreover, in an ant environment, a bunch of variables are going to be set by default via the ant property file loading mechanism (actually they are first loaded as ant properties and then imported as ivy variables, see link:ant.html[Ant Tasks]), and even in the ant properties themselves there is going to be eager substitution on loading, effectively making it impossible to override some variable purely via the ivysettings.properties file. Some variables will really only be able to be overridden via ant properties because of this.
+
+Moreover, it's also important to understand the difference between ivy variables and ivy pattern tokens.
+See the Patterns chapter below for what pattern tokens are.
+
+== [[patterns]]Patterns
+
+
+Ivy patterns are used in many dependency resolvers and ivy tasks, and are a simple way to structure the way ivy works.
+
+First let's give an example. You can for instance configure the file system dependency resolver by giving it
+a pattern to find artifacts. This pattern can be like this:
+myrepository/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]
+
+This pattern indicates that the repository we use is in a directory called myrepository.
+
+In this directory we have directories having for name the name of the organisation of the module we look for.
+Then we have a directory per module, each having for name the name of the module.
+Then in module directories we find a directory per artifact type (jars, wars, ivys, ...), in which we find artifacts named by the artifact id, followed by a hyphen, then the revision, a dot, and the artifact extension.
+Not too difficult to understand is it? That's it, you have understood the pattern concept!
+
+To give a bit more explanation, a pattern is composed of tokens, which are replaced by actual values when evaluated for a particular artifact or module. Those tokens are different from variables because they are replaced differently for each artifact, whereas variables are usually given the same value.
+
+You can mix variables and tokens in a pattern:
+${repository.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]
+
+
+
+The tokens available depends on where the pattern is used (will it be evaluated with artifacts or modules, for instance).
+But here are all the tokens currently available:
+
+
+* [organisation] +
+ the organisation name
+
+* [orgPath] *__(since 2.3)__* +
+ the organisation name where '.' has been replaced by '/'. This can be used to configure maven2-like repositories.
+
+* [module] +
+ the module name
+
+* [branch] +
+ the branch name
+
+* [revision] +
+ the revision name
+
+* [artifact] +
+ the artifact name (or id)
+
+* [type] +
+ the artifact type
+
+* [ext] +
+ the artifact file extension
+
+* [conf] +
+ the configuration name
+
+* [originalname] *__(since 1.4)__* +
+ the original artifact name (including the extension)
+
+
+The difference between type and extension is explained in the ivy file documentation.
+
+*__since 1.2__* [organization] can be used instead of [organisation].
+
+*__since 1.3__* Optional parts can be used in patterns.
+This provides the possibility to avoid some input when a token is not defined, instead of having only the token as blank. Parenthesis are used to delimit the optional part, and only one token can be found inside the parenthesis.
+So if you surround a token with '(' and ')', any other text which is between the parenthesis will be ignored if the token has no value.
+
+For instance, suppose the pattern: "abc(def[type]ghi)"
+type = "jar" -> the substituted pattern: abcdefjarghi
+type = null or "" -> the substitued pattern: abc
+
+A more real life example:
+The pattern
+[source]
+----
+[artifact](-[revision]).[ext]
+----
+
+lets you accept both myartifact-1.0.jar when a revision is set, and myartifact.jar (instead of myartifact-.jar) when no revision is set.
+This is particularly useful when you need to keep control of artifact names.
+
+*__since 1.4__* Extra attributes can be used as any other token in a pattern.
+
+
+== [[latest]]Latest Strategy
+
+Ivy often needs to know which revision between two is considered the "latest". To know that, it uses the concept of latest strategy. Indeed, there are several ways to consider a revision to be the latest. You can choose an existing one or plug in your own.
+
+But before knowing which revision is the latest, ivy needs to be able to consider several revisions of a module. Thus ivy has to get a list of files in a directory, and it uses the dependency resolver for that. So check if the dependency resolver you use is compatible with latest revisions before wondering why ivy does not manage to get your latest revision.
+
+Finally, in order to get several revisions of a module, most of the time you need to use the [revision] token in your pattern so that ivy gets all the files which match the pattern, whatever the revision is. It's only then that the latest strategy is used to determine which of the revisions is the latest one.
+
+Ivy has three built-in latest strategies:
+
+
+* latest-time +
+ This compares the revisions date to know which is the latest. While this is often a good strategy in terms of pertinence, it has the drawback of being costly to compute for distant repositories. If you use ivyrep, for example, ivy has to ask the http server what is the date of each ivy file before knowing which is the latest.
+
+* latest-revision +
+ This compares the revisions as strings, using an algorithm close to the one used in the php version_compare function.
+This algorithm takes into account special meanings of some text. For instance, with this strategy, 1.0-dev1 is considered before 1.0-alpha1, which in turn is before 1.0-rc1, which is before 1.0, which is before 1.0.1.
+
+* latest-lexico +
+ This compares the revisions as strings, using lexicographic order (the one used by the Java string comparison).
+
+
+See also how to configure new latest strategies link:settings/latest-strategies.html[here].
+
+
+== [[conflict]]Conflict Manager
+
+A conflict manager is able to select, among a list of module revisions in conflict, a list of revisions to keep.
+Yes, it can select a list of revisions, even if most conflict managers select only one revision.
+But in some cases you will need to keep several revisions, and load in separate class loaders, for example.
+
+A list of revisions is said to be in conflict if they correspond to the same module, i.e. the same organisation/module name couple.
+
+The list of available conflict managers is available on the link:settings/conflict-managers.html[conflict manager configuration page].
+
+For more details on how to setup your conflict managers by module, see the link:ivyfile/conflicts.html[conflicts] section in the ivy file reference.
+
+
+== [[matcher]]Pattern matcher
+
+*__since 1.3__*
+In several places Ivy uses a pattern to match a set of objects. For instance, you can exclude several modules at once when declaring a dependency by using a pattern matching all the modules to exclude.
+
+Ivy uses a pluggable pattern matcher to match those object names. 3 are defined by default:
+
+
+* exact +
+This matcher matches only using strings
+
+* regexp +
+This matcher lets you use a regular expression as supported by the Pattern class of java 1.4 or greater
+
+* glob +
+This matcher lets you use a Unix-like glob matcher, i.e. where the only meta characters are * which matches any sequence of characters and ? which matches exactly one character. Note that this matcher is available only with jakarta oro 2.0.8 in your classpath.
+
+Note also that with any matcher, the character '*' has the special meaning of matching anything. This is particularly useful with default values which do not depend on the matcher.
+
+
+== [[extra]]Extra attributes
+
+*__since 1.4__*
+Several tags in ivy xml files are extensible with what is called extra attributes.
+The idea is very simple: if you need some more information to define your modules, you can add the attribute you want and you will then be able to access it as any other attribute in your patterns.
+
+*__since 2.0__*
+It's possible and recommended to use xml namespaces for your extra attributes. Using an Ivy extra namespace is the easiest way to add your own extra attributes.
+
+Example:
+Here is an ivy file with the attribute 'color' set to blue:
+
+[source]
+----
+
+<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
+ <info organisation="apache"
+ module="foo"
+ e:color="blue"
+ status="integration"
+ revision="1.59"
+ />
+</ivy-module>
+
+----
+
+Then you must use the extra attribute when you declare a dependency on foo. Those extra attributes
+will indeed be used as identifiers for the module like the org the name and the revision:
+
+[source]
+----
+
+<dependency org="apache" name="foo" e:color="blue" rev="1.5+" />
+
+----
+
+And you can define your repository pattern as:
+
+[source]
+----
+
+${repository.dir}/[organisation]/[module]/[color]/[revision]/[artifact].[ext]
+
+----
+
+Note that in patterns you must use the unqualified attribute name (no namespace prefix).
+
+If you don't want to use xml namespaces, it's possible but you will need to disable ivy file validation, since your files won't fulffill anymore the official ivy xsd. See the link:settings/settings.html[settings documentation] to see how to disable validation.
+
+== [[checksum]]Checksums
+
+*__since 1.4__*
+Ivy allows the use of checksums, also known as digests, to verify the correctness of a downloaded file.
+
+The configuration of using the algorithm can be done globally or by dependency resolver.
+Globally, use the ivy.checksums variable to list the check to be done.
+On each resolver you can use the checksums attribute to override the global setting.
+
+The setting is a comma separated list of checksum algorithms to use.
+During checking (at download time), the first checksum found is checked, and that's all. This means that if you have a "SHA-256, sha1, md5" setting, then if ivy finds a SHA-256 file, it will compare the downloaded file SHA-256 against this SHA-256, and if the comparison is ok, it will assume the file is ok. If no SHA-256 file is found, it will look for an sha1 file. If that isn't found, then it checks for md5 and so on. If none is found no checking is done.
+During publish, all listed checksum algorithms are computed and uploaded.
+
+By default checksum algorithms are "sha1, md5".
+
+If you want to change this default, you can set the variable ivy.checksums. Hence, to disable checksum validation you just have to set ivy.checksums to "".
+
+
+=== Supported algorithms
+
+*__since 1.4__*
+
+
+* md5 +
+
+* sha1 +
+
+*__since 2.5__*
+Starting 2.5 version, in addition to md5 and sha1, Ivy supports SHA-256, SHA-512 and SHA-384 algorithms, if the Java runtime in which Ivy is running, supports those. For example, Java 6 runtime supports SHA-256 and SHA-512 as standard algorithms. If Ivy 2.5 and later versions are run under Java 6 or higher runtimes, these algorithms are supported by Ivy too.
+
+
+== [[event]]Events and Triggers
+
+*__since 1.4__*
+When Ivy performs the dependency resolution and some other tasks, it fires events before and after the most important steps. You can listen to these events using Ivy API, or you can even register a trigger to perform a particular action when a particular event occur.
+
+This is a particularly powerful and flexible feature which allows, for example, you to perform a build of a dependency just before it is resolved, or follow what's happening during the dependency resolution process accuratly, and so on.
+
+For more details about events and triggers, see the link:settings/triggers.html[triggers] documentation page in the configuration section of this documentation.
+
+
+== [[circular]]Circular Dependencies
+
+*__since 1.4__*
+Circular dependencies can be either direct or indirect. For instance, if A depends on A, it's a circular dependency, and if A depends on B which itself depends on A, this is also a circular dependency.
+
+Prior to Ivy 1.4 circular dependencies where causing a failure in Ivy. As of Ivy 1.4, the behaviour of Ivy when it finds a circular dependency is configurable through a circular dependency strategy.
+
+3 built-in strategies are available:
+
+
+* ignore +
+ circular dependencies are only signaled in verbose messages
+
+* warn +
+ same as ignore, except that they are signaled as a warning (default)
+
+* error +
+ halt the dependency resolution when a circular dependency is found
+
+
+See the link:settings/settings.html[configuration page] to see how to configure the circular dependency strategy you want to use.
+
+
+== Cache and Change Management
+
+Ivy heavily relies on local caching to avoid accessing remote repositories too often, thus saving a lot of network bandwidth and time.
+
+
+=== [[cache]]Cache types
+
+An Ivy cache is composed of two different parts:
+
+
+* the repository cache +
+The repository cache is where Ivy stores data downloaded from module repositories, along with some meta information concerning these artifacts, like their original location.
+This part of the cache can be shared if you use a well suited link:settings/lock-strategies.html[lock strategy].
+
+* the resolution cache +
+This part of the cache is used to store resolution data, which is used by Ivy to reuse the results of a resolve process.
+This part of the cache is overwritten each time a new resolve is performed, and should never be used by multiple processes at the same time.
+
+
+While there is always only one resolution cache, you can link:settings/caches.html[define multiple repository caches], each link:settings/resolvers.html[resolver] being able to use a separate cache.
+
+
+=== [[change]]Change management
+
+To optimize the dependency resolution and the way the cache is used, Ivy assumes by default that a revision never changes. So once Ivy has a module in its cache (metadata and artifacts), it trusts the cache and does not even query the repository. This optimization is very useful in most cases, and causes no problem as long as you respect this paradigm: a revision never changes. Besides performance, there are several link:bestpractices.html[good reasons] to follow this principle.
+
+However, depending on your current build system and your dependency management strategy, you may prefer to update your modules sometimes. There are two kinds of changes to consider:
+
+==== Changes in module metadata
+
+Since pretty often module metadata are not considered by module providers with as much attention as their API or behavior (if they even provide module metadata), it happens more than we would like that we have to update module metadata: a dependency has been forgotten, or another one is missing, ...
+
+In this case, setting checkModified="true" on your dependency resolver will be the solution. This flag tells Ivy to check if module metadata has been modified compared to the cache. Ivy first checks the metadata last modified timestamp on the repository to download it only if necessary, and then updates it when needed.
+
+==== Changes in artifacts
+
+Some people, especially those coming from maven 2 land, like to use one special revision to handle often updated modules. In maven 2 this is called a SNAPSHOT version, and some argue that it helps save disk space to keep only one version for the high number of intermediary builds you can make whilst developing.
+
+Ivy supports this kind of approach with the notion of "changing revision". A changing revision is just that: a revision for which Ivy should consider that the artifacts may change over time. To handle this, you can either specify a dependency as changing on the link:ivyfile/dependency.html[dependency] tag, or use the changingPattern and changingMatcher attributes on your link:settings/resolvers.html[resolvers] to indicate which revision or group of revisions should be considered as changing.
+
+Once Ivy knows that a revision is changing, it will follow this principle to avoid checking your repository too often: if the module metadata has not changed, it will considered the whole module (including artifacts) as not changed. Even if the module descriptor file has changed, it will check the publication data of the module to see if this is a new publication of the same revision or not. Then if the publication date has changed, it will check the artifacts' last modified timestamps, and download them accordingly.
+
+So if you want to use changing revisions, use the link:use/publish.html[publish] task to publish your modules, it will take care of updating the publication date, and everything will work fine. And remember to set checkModified=true" on your resolver too!
+
+== [[paths]]Paths handling
+
+As a dependency manager, Ivy has a lot of file related operations, which most of the time use paths or path patterns to locate the file on the filesystem.
+
+These paths can obviously be relative or absolute. We recommend to always use absolute paths, so that you don't have to worry about what is the base of your relative paths. Ivy provides some variables which can be used as the base of your absolute paths. For instance, Ivy has a concept of base directory, which is basically the same as for Ant. You have access to this base directory with the ivy.basedir variable. So if you have a path like
+[source]
+----
+${ivy.basedir}/ivy.xml
+----
+
+, you have an absolute path. In link:settings.html[settings files], you also have a variable called ivy.settings.dir which points to the directory in which your settings file is located, which makes defining paths relative to this directory very easy.
+
+If you really want to use relative paths, the base directory used to actually locate the file depends on where the relative path is defined:
+
+
+* In an Ivy file, paths are relative to the Ivy file itself (the only possible path in an Ivy file is for configurations declaration inclusion) +
+
+* In settings files, paths for file inclusion (namely properties file loading and settings inclusion) are relative to the directory in which the settings file is located. All other paths must be absolute unless explicitly noted. +
+
+* In Ivy Ant tasks and Ivy parameters or options, paths are relative to Ivy base directory, which when called from Ant is the same as your Ant basedir. +
+
+
+
+== [[packaging]]Packaging
+
+
+Most of the artifacts found in a repository are jars. They can be downoaded and used as is. But some other kind of artifacts required some __unpacking__ after being downloaded and before being used. Such artifacts can be zipped folders and packed jars. Ivy supports that kind of artifact with *packaging*.
+
+A __packaged__ artifact needs to be declared as such in the module descriptor via the attribute link:ivyfile/artifact.html[packaging]. The value of that attribute defined which kind of unpacking algorithm must be used. Here are the list of currently supported algorithms:
+
+
+* `zip`, `jar` or `war`: the artifact will be uncompressed as a folder +
+
+* `pack200`: the artifact will be unpacked to a file via the link:http://docs.oracle.com/javase/7/docs/technotes/tools/share/pack200.html[pack200] algorithm +
+
+* `bundle`: the OSGi artifact will be uncompressed as a folder, and every embedded jar file entry which is packed via the the link:http://docs.oracle.com/javase/7/docs/technotes/tools/share/pack200.html[pack200] algorithm will be unpacked +
+
+
+So, if in an `ivy.xml`, there would be declared a such artifact:
+
+[source]
+----
+
+ <artifact name="mymodule" type="jar" ext="jar.pack.gz" packaging="pack200" />
+
+----
+
+A file `mymodule-1.2.3.jar.pack.gz` would be download into the cache, and also uncompressed in the cache to `mymodule-1.2.3.jar`. Then any post resolve task which supports it, like the link:use/cachepath.html[cachepath], will use the uncompressed file instead of the orginal compressed file.
+
+It is possible to chain packing algorithm. The attribute link:ivyfile/artifact.html[packaging] of a artifact expects a comma separated list of packing types, in packing order. For instance, an artifact '`mymodule-1.2.3.jar.pack.gz`' can have the packaging '`jar,pack200`', so it would be uncompressed as a folder '`mymodule-1.2.3`'.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration.adoc b/asciidoc/configuration.adoc
new file mode 100644
index 0000000..0d4e90d
--- /dev/null
+++ b/asciidoc/configuration.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:settings.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/caches.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/caches.adoc b/asciidoc/configuration/caches.adoc
new file mode 100644
index 0000000..9bc4dec
--- /dev/null
+++ b/asciidoc/configuration/caches.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/caches.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/caches/cache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/caches/cache.adoc b/asciidoc/configuration/caches/cache.adoc
new file mode 100644
index 0000000..e7bbbc6
--- /dev/null
+++ b/asciidoc/configuration/caches/cache.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/caches/cache.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/caches/ttl.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/caches/ttl.adoc b/asciidoc/configuration/caches/ttl.adoc
new file mode 100644
index 0000000..654ddf3
--- /dev/null
+++ b/asciidoc/configuration/caches/ttl.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/caches/ttl.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/classpath.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/classpath.adoc b/asciidoc/configuration/classpath.adoc
new file mode 100644
index 0000000..3f77f9a
--- /dev/null
+++ b/asciidoc/configuration/classpath.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/classpath.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/conf.adoc b/asciidoc/configuration/conf.adoc
new file mode 100644
index 0000000..751790f
--- /dev/null
+++ b/asciidoc/configuration/conf.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/settings.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/conflict-managers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/conflict-managers.adoc b/asciidoc/configuration/conflict-managers.adoc
new file mode 100644
index 0000000..5b3427c
--- /dev/null
+++ b/asciidoc/configuration/conflict-managers.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/conflict-managers.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/include.adoc b/asciidoc/configuration/include.adoc
new file mode 100644
index 0000000..6edb04f
--- /dev/null
+++ b/asciidoc/configuration/include.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/include.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/latest-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/latest-strategies.adoc b/asciidoc/configuration/latest-strategies.adoc
new file mode 100644
index 0000000..7fd1d56
--- /dev/null
+++ b/asciidoc/configuration/latest-strategies.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/latest-strategies.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/lock-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/lock-strategies.adoc b/asciidoc/configuration/lock-strategies.adoc
new file mode 100644
index 0000000..7187311
--- /dev/null
+++ b/asciidoc/configuration/lock-strategies.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/lockstrategies.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/macrodef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/macrodef.adoc b/asciidoc/configuration/macrodef.adoc
new file mode 100644
index 0000000..d22978c
--- /dev/null
+++ b/asciidoc/configuration/macrodef.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/macrodef.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/macrodef/attribute.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/macrodef/attribute.adoc b/asciidoc/configuration/macrodef/attribute.adoc
new file mode 100644
index 0000000..9645252
--- /dev/null
+++ b/asciidoc/configuration/macrodef/attribute.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/macrodef/attribute.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/module.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/module.adoc b/asciidoc/configuration/module.adoc
new file mode 100644
index 0000000..c7b4ebb
--- /dev/null
+++ b/asciidoc/configuration/module.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/module.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/modules.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/modules.adoc b/asciidoc/configuration/modules.adoc
new file mode 100644
index 0000000..dfd6a8a
--- /dev/null
+++ b/asciidoc/configuration/modules.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/modules.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/namespace.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespace.adoc b/asciidoc/configuration/namespace.adoc
new file mode 100644
index 0000000..6ea8678
--- /dev/null
+++ b/asciidoc/configuration/namespace.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/namespace.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/namespace/dest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespace/dest.adoc b/asciidoc/configuration/namespace/dest.adoc
new file mode 100644
index 0000000..859016f
--- /dev/null
+++ b/asciidoc/configuration/namespace/dest.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/namespace/dest.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/namespace/fromtosystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespace/fromtosystem.adoc b/asciidoc/configuration/namespace/fromtosystem.adoc
new file mode 100644
index 0000000..8ec0b9b
--- /dev/null
+++ b/asciidoc/configuration/namespace/fromtosystem.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/namespace/fromtosystem.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/namespace/rule.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespace/rule.adoc b/asciidoc/configuration/namespace/rule.adoc
new file mode 100644
index 0000000..1133b2e
--- /dev/null
+++ b/asciidoc/configuration/namespace/rule.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/namespace/rule.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/namespace/src.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespace/src.adoc b/asciidoc/configuration/namespace/src.adoc
new file mode 100644
index 0000000..4fdf870
--- /dev/null
+++ b/asciidoc/configuration/namespace/src.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../../settings/namespace/src.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/namespaces.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespaces.adoc b/asciidoc/configuration/namespaces.adoc
new file mode 100644
index 0000000..e39593d
--- /dev/null
+++ b/asciidoc/configuration/namespaces.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/namespaces.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/outputters.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/outputters.adoc b/asciidoc/configuration/outputters.adoc
new file mode 100644
index 0000000..b4dfe76
--- /dev/null
+++ b/asciidoc/configuration/outputters.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/outputters.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/parsers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/parsers.adoc b/asciidoc/configuration/parsers.adoc
new file mode 100644
index 0000000..f0a85cf
--- /dev/null
+++ b/asciidoc/configuration/parsers.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/parsers.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/properties.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/properties.adoc b/asciidoc/configuration/properties.adoc
new file mode 100644
index 0000000..295a9ac
--- /dev/null
+++ b/asciidoc/configuration/properties.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/properties.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/property.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/property.adoc b/asciidoc/configuration/property.adoc
new file mode 100644
index 0000000..c886cb6
--- /dev/null
+++ b/asciidoc/configuration/property.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/property.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/resolvers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/resolvers.adoc b/asciidoc/configuration/resolvers.adoc
new file mode 100644
index 0000000..7182214
--- /dev/null
+++ b/asciidoc/configuration/resolvers.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/resolvers.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/status.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/status.adoc b/asciidoc/configuration/status.adoc
new file mode 100644
index 0000000..3b56a00
--- /dev/null
+++ b/asciidoc/configuration/status.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/status.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/statuses.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/statuses.adoc b/asciidoc/configuration/statuses.adoc
new file mode 100644
index 0000000..1e90f95
--- /dev/null
+++ b/asciidoc/configuration/statuses.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/statuses.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/triggers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/triggers.adoc b/asciidoc/configuration/triggers.adoc
new file mode 100644
index 0000000..ce355a0
--- /dev/null
+++ b/asciidoc/configuration/triggers.adoc
@@ -0,0 +1,3 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/triggers.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/typedef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/typedef.adoc b/asciidoc/configuration/typedef.adoc
new file mode 100644
index 0000000..7a2c7ad
--- /dev/null
+++ b/asciidoc/configuration/typedef.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/typedef.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/configuration/version-matchers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/version-matchers.adoc b/asciidoc/configuration/version-matchers.adoc
new file mode 100644
index 0000000..1c9bbba
--- /dev/null
+++ b/asciidoc/configuration/version-matchers.adoc
@@ -0,0 +1,4 @@
+
+This page has moved. If your browser doesn't automatically redirect to its new location, click
+link:../settings/version-matchers.html[here].
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/dev.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/dev.adoc b/asciidoc/dev.adoc
new file mode 100644
index 0000000..7b307d5
--- /dev/null
+++ b/asciidoc/dev.adoc
@@ -0,0 +1,123 @@
+
+
+== Building from source
+
+To build Ivy from source it's really easy.
+
+=== Requirements
+
+All you need is
+
+
+* an link:http://subversion.tigris.org/[svn] client +
+_to check out Ivy sources from apache svn, not required if you build from sources packaged in a release_
+
+* link:http://ant.apache.org/[Apache Ant] 1.6.0 or greater +
+_We recommend either ant 1.6.5 or 1.7.0_
+
+* link:http://junit.org[junit] 3.8.2 jar in your ant lib +
+_ this is not required if you use ant 1.7_
+
+* a link:http://java.sun.com/[jdk] 1.5 or greater +
+_Build instructions have been successfully tested with sun jdk 1.5.0 and 1.6.0_
+
+
+
+=== Procedure
+
+
+==== Get the source
+
+You can either get the sources from a release, or get them directly from svn. For instance, to get the trunk version:
+
+[source]
+----
+
+svn co https://svn.apache.org/repos/asf/ant/ivy/core/trunk ivy
+
+----
+
+
+==== Build
+
+Go to the directory where you get the Ivy sources (you should see a file named build.xml) and run:
+
+[source]
+----
+
+ant
+
+----
+
+
+==== Check the result
+
+The ant build will compile the core classes of Ivy and use them to resolve the dependencies (used for some optional features). Then it will compile and run tests with coverage metrics.
+
+If everything goes well, you should see the message
+
+[source]
+----
+
+BUILD SUCCESSFUL
+
+----
+
+Then you can check the test results in the build/doc/reports/test directory, the jars are in build/artifacts, and the test coverage report in build/doc/reports/coverage
+
+== Coding conventions
+
+The Ivy code base is supposed to follow the standard java conventions:
+http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html
+
+This is a work in progress though (see link:https://issues.apache.org/jira/browse/IVY-511[IVY-511]), but patches helping migration to these conventions are welcome.
+
+
+== Developing with eclipse
+
+Even though you can develop Ivy with your IDE of choice, we support eclipse development by providing ad hoc metadata.
+
+We currently provide two options:
+
+=== Eclipse alone
+
+To develop with a simple eclipse install all you need is eclipse 3.1 or greater, with no particular plugin.
+First call the following ant target in your Ivy workspace:
+
+[source]
+----
+
+ant eclipse-default
+
+----
+
+This will resolve the dependencies of Ivy and produce a .classpath using the resolved jars for the build path.
+Then you can use the "Import->Existing project into workspace" eclipse feature to import the Ivy project in your workspace.
+
+=== Eclipse + IvyDE
+
+You can also leverage the latest IvyDE version to be able to easily resolve the ivy dependencies from Eclipse.
+To do so all you need is call the following ant target in your Ivy workspace:
+
+[source]
+----
+
+ant eclipse-ivyde
+
+----
+
+or if you don't have ant installed you can simply copy the file .classpath.ivyde and rename it to .classpath
+Then you can import the project using "Import->Existing project into workspace" as long as you already have latest IvyDE installed.
+
+To install latest IvyDE version compatible with the latest Ivy used to resolve Ivy dependencies, you will need to use a snapshot build, not endorsed by the ASF, available here:
+http://people.apache.org/~xavier/ivyde/snapshot/
+
+Download the file and unzip its content in your eclipse installation directory.
+
+
+=== recommended plugins
+
+The Ivy project comes with settings for the link:http://eclipse-cs.sourceforge.net/[checkstyle plugin] we recommend to use to avoid introducing new disgression to the checkstyle rules we use.
+If you use this plugin, you will many errors in Ivy. As we said, following strict checkstyle rules is a work in progress and we used to have pretty different code conventions (like using _ as prefix for private attributes), so we still have things to fix. We usually use the filter in the problems view to filter out checkstyle errors from this view, which helps to know what the real compilation problem are.
+
+Besides this plugin we also recommend to use a subversion plugin, link:http://www.eclipse.org/subversive/[subversive] or link:http://subclipse.tigris.org[subclipse] being the two options currently available in the open source landscape.
\ No newline at end of file
[02/29] ant-ivy git commit: Make xooki2asciidoc work on java8+ based
jvm.
Posted by ja...@apache.org.
Make xooki2asciidoc work on java8+ based jvm.
Nashorn is not a drop-in replacement JavaScript implementation for Rhino.
see https://bugs.openjdk.java.net/browse/JDK-8025132 for further details
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/b3d2c0cd
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/b3d2c0cd
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/b3d2c0cd
Branch: refs/heads/master
Commit: b3d2c0cd6512a9dc9c6d17e4065cba1521791f4d
Parents: 879ac40
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Tue Dec 30 17:37:07 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Tue Dec 30 17:37:07 2014 +0100
----------------------------------------------------------------------
doc/xooki2asciidoc/antlib.xml | 7 ++++++-
doc/xooki2asciidoc/xooki2asciidoc.js | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b3d2c0cd/doc/xooki2asciidoc/antlib.xml
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/antlib.xml b/doc/xooki2asciidoc/antlib.xml
index 8f4d2e2..68da5f4 100644
--- a/doc/xooki2asciidoc/antlib.xml
+++ b/doc/xooki2asciidoc/antlib.xml
@@ -24,6 +24,11 @@
<attribute name="checkUpToDate"/>
<attribute name="printerFriendly"/>
<![CDATA[
+ try {
+ load("nashorn:mozilla_compat.js");
+ } catch (e) {
+ // ignore the exception - perhaps we are running on Rhino!
+ }
importClass(java.io.File);
var xookidir = attributes.get("xookidir");
@@ -79,4 +84,4 @@
}
]]>
</scriptdef>
-</antlib>
\ No newline at end of file
+</antlib>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b3d2c0cd/doc/xooki2asciidoc/xooki2asciidoc.js
----------------------------------------------------------------------
diff --git a/doc/xooki2asciidoc/xooki2asciidoc.js b/doc/xooki2asciidoc/xooki2asciidoc.js
index 554924e..8945c64 100644
--- a/doc/xooki2asciidoc/xooki2asciidoc.js
+++ b/doc/xooki2asciidoc/xooki2asciidoc.js
@@ -1427,6 +1427,11 @@ xooki.init = function() {
};
if (batchMode) {
+ try {
+ load("nashorn:mozilla_compat.js");
+ } catch (e) {
+ // ignore the exception - perhaps we are running on Rhino!
+ }
importPackage(java.io);
xooki.io.loadFile = function( url, warnOnError ) {
[14/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/triggers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/triggers.adoc b/asciidoc/settings/triggers.adoc
new file mode 100644
index 0000000..60ed6a5
--- /dev/null
+++ b/asciidoc/settings/triggers.adoc
@@ -0,0 +1,551 @@
+
+*Tag:* triggers
+*__since 1.4__*
+
+Defines a list of triggers to activate on some Ivy events.
+
+A trigger is an action which is performed whenever a particular event occurs.
+Ivy supports 3 type of triggers out of the box:
+
+
+* ant-call +
+ calls a target in the same build as the original one whenever a particular event occurs.
+
+* ant-build +
+ calls an ant build which may be in another ant build script.
+
+* log +
+ echo a message, usually in a file
+
+
+If you want to use a different trigger, you can link:../extend.html[implement your own].
+
+The following events are available in Ivy:
+
+[options="header"]
+|=======
+|Name|Attributes|Description
+|pre-resolve|
+
+
+* organisation +
+the organisation of the module for which the dependencies will be resolved
+
+* module +
+the name of the module for which the dependencies will be resolved
+
+* revision +
+the revision of the module for which the dependencies will be resolved
+
+* conf +
+comma separated list of configurations which will be resolved
+
+ |Fired at the beginning of the resolve process, before module dependencies and transitive dependencies are resolved.
+|pre-resolve-dependency|
+
+
+* organisation +
+the organisation of the dependency resolved
+
+* module +
+the name of the dependency resolved
+
+* req-revision +
+the requested revision for the dependency *__since 2.0__* (provided for consistency with post-resolve-dependency)
+
+* req-revision-default +
+the default requested revision constraint for the dependency *__since 2.0__*
+
+* req-revision-dynamic +
+the requested revision dynamic constraint for the dependency *__since 2.0__*
+
+* revision +
+the requested revision for the dependency
+
+* resolver +
+the name of the resolver used to resolve the dependency
+
+ |Fired before each dependency is resolved. In this case resolved means resolving the actual revision if the requested revision is a version constraint and not a static version, and downloading all necessary metadata information.
+|post-resolve-dependency|
+
+
+* organisation +
+the organisation of the dependency resolved
+
+* module +
+the name of the dependency resolved
+
+* req-revision +
+the requested revision for the dependency *__since 2.0__*
+
+* req-revision-default +
+the default requested revision constraint for the dependency *__since 2.0__*
+
+* req-revision-dynamic +
+the requested revision dynamic constraint for the dependency *__since 2.0__*
+
+* revision +
+the revision of the dependency resolved, or the requested revision if the resolution was not successful
+
+* resolved +
+true if the resolution was successful, false otherwise
+
+* duration +
+the time elapsed to resolve the dependency (in ms) *__since 2.0__*
+
+* resolver +
+the name of the resolver used to resolve the dependency
+
+* any extra attribute +
+all extra attributes found on the info tag of the resolved dependency are available *__since 2.0__*
+
+ |Fired after each dependency is resolved
+|post-resolve|
+
+
+* organisation +
+the organisation of the module for which the dependencies have been resolved
+
+* module +
+the name of the module for which the dependencies have been resolved
+
+* revision +
+the revision of the module for which the dependencies have been resolved
+
+* conf +
+comma separated list of configurations resolved
+
+* resolve-id +
+the identifier of the resolution process *__since 2.0__*
+
+* nb-dependencies +
+total number of dependencies, including transitive and evicted ones *__since 2.0__*
+
+* nb-artifacts +
+total number of artifacts resolved, excluding metadata artifacts *__since 2.0__*
+
+* resolve-duration +
+the time (in ms) elapsed to resolve dependencies, before dowloading artifacts *__since 2.0__*
+
+* download-duration +
+the time (in ms) elapsed to download all artifacts, excluding metadata artifacts downloaded during the first phase of the resolution process *__since 2.0__*
+
+* download-size +
+the total size (in bytes) of all downloaded artifacts, excluding metadata artifacts. Only artifacts actually downloaded (not in cache or used from their original location) are considered *__since 2.0__*
+
+ |Fired at the end of the resolve process, when all module dependencies have been resolved
+|pre-download-artifact|
+
+
+* organisation +
+the organisation of the artifact which is about to be downloaded
+
+* module +
+the name of the module of the artifact which is about to be downloaded
+
+* revision +
+the revision of the the artifact which is about to be downloaded
+
+* artifact +
+the name of the the artifact which is about to be downloaded
+
+* type +
+the type of the the artifact which is about to be downloaded
+
+* ext +
+the extension of the the artifact which is about to be downloaded
+
+* metadata +
+true if the artifact to be downloaded is a metadata artifact, false for published artifacts *__since 2.0__*
+
+* resolver +
+the name of the resolver used to download the artifact
+
+* origin +
+the origin location from which it will be downloaded
+
+* local +
+true if it's a local artifact, false otherwise
+
+ |Fired before an artifact is downloaded from a repository to the cache
+|post-download-artifact|
+
+
+* organisation +
+the organisation of the artifact which was just downloaded
+
+* module +
+the name of the module of the artifact which was just downloaded
+
+* revision +
+the revision of the the artifact which was just downloaded
+
+* artifact +
+the name of the the artifact which was just downloaded
+
+* type +
+the type of the the artifact which was just downloaded
+
+* ext +
+the extension of the the artifact which was just downloaded
+
+* metadata +
+true if the downloaded artifact is a metadata artifact, false for published artifacts *__since 2.0__*
+
+* resolver +
+the name of the resolver used to download the artifact
+
+* origin +
+the origin location from which it was downloaded
+
+* local +
+true if it's a local artifact, false otherwise
+
+* size +
+the size in bytes of the downloaded artifact
+
+* duration +
+the time elapsed to download the artifact (in ms) *__since 2.0__*
+
+* file +
+the file to which it has been downloaded
+
+ |Fired after an artifact has been downloaded from a repository to the cache
+|pre-retrieve
+*__since 2.0__*|
+
+
+* organisation +
+the organisation of the module for which the dependencies will be retrieved
+
+* module +
+the name of the module for which the dependencies will be retrieved
+
+* revision +
+the revision of the module for which the dependencies will be retrieved
+
+* conf +
+comma separated list of configurations which will be retrieved
+
+* symlink +
+true if Ivy will use symbolic links instead of copies on supported platforms, false otherwise
+
+* sync +
+true if the retrieve process will be performed in sync mode, false otherwise
+
+ |Fired at the beginning of the retrieve process.
+|post-retrieve
+*__since 2.0__*|
+
+
+* organisation +
+the organisation of the module for which the dependencies have been retrieved
+
+* module +
+the name of the module for which the dependencies will be retrieved
+
+* revision +
+the revision of the module for which the dependencies have been retrieved
+
+* conf +
+comma separated list of configurations which have been retrieved
+
+* symlink +
+true if Ivy used symbolic links instead of copies on supported platforms, false otherwise
+
+* sync +
+true if the retrieve process has been performed in sync mode, false otherwise
+
+* duration +
+the time elapsed in ms during the retrieve process
+
+* size +
+the total size of artifacts which have actually been copied (or symlinked)
+
+* nbCopied +
+the number of artifacts copied or symlinked
+
+* nbUptodate +
+the number of artifacts which were already present and up to date at the destination location
+
+ |Fired at the end of the retrieve process.
+|pre-retrieve-artifact
+*__since 2.1__*|
+
+
+* organisation +
+the organisation of the artifact which is about to be retrieved
+
+* module +
+the name of the module of the artifact which is about to be retrieved
+
+* revision +
+the revision of the the artifact which is about to be retrieved
+
+* artifact +
+the name of the the artifact which is about to be retrieved
+
+* type +
+the type of the the artifact which is about to be retrieved
+
+* ext +
+the extension of the the artifact which is about to be retrieved
+
+* metadata +
+true if the retrieved artifact is a metadata artifact, false for published artifacts
+
+* size +
+the size in bytes of the retrieved artifact
+
+* from +
+the absolute path from which it will be retrieved (usually a location in cache)
+
+* to +
+the absolute path to which it will be retrieved
+
+ |Fired before an artifact is retrieved from the cache to a local location
+|post-retrieve-artifact
+*__since 2.1__*|
+
+
+* organisation +
+the organisation of the artifact which has just been retrieved
+
+* module +
+the name of the module of the artifact which has just been retrieved
+
+* revision +
+the revision of the the artifact which has just been retrieved
+
+* artifact +
+the name of the the artifact which has just been retrieved
+
+* type +
+the type of the the artifact which has just been retrieved
+
+* ext +
+the extension of the the artifact which has just been retrieved
+
+* metadata +
+true if the retrieved artifact is a metadata artifact, false for published artifacts
+
+* size +
+the size in bytes of the retrieved artifact
+
+* from +
+the absolute path from which it has just been retrieved (usually a location in cache)
+
+* to +
+the absolute path to which it has just been retrieved
+
+ |Fired after an artifact is retrieved from the cache to a local location
+|pre-publish-artifact
+*__since 2.0__*|
+
+
+* organisation +
+the organisation of the artifact which is about to be published
+
+* module +
+the name of the module of the artifact which is about to be published
+
+* revision +
+the revision of the the artifact which is about to be published
+
+* artifact +
+the name of the the artifact which is about to be published
+
+* type +
+the type of the the artifact which is about to be published
+
+* ext +
+the extension of the the artifact which is about to be published
+
+* resolver +
+the name of the resolver into which the artifact is about to be published
+
+* file +
+the absolute path of the source file for the artifact
+
+* overwrite +
+"true" if the new data will overwrite existing artifacts, "false" otherwise
+
+ |Fired before an artifact is published into a repository
+|post-publish-artifact
+*__since 2.0__*|
+
+
+* organisation +
+the organisation of the artifact that was published
+
+* module +
+the name of the module of the artifact that was published
+
+* revision +
+the revision of the the artifact that was published
+
+* artifact +
+the name of the the artifact that was published
+
+* type +
+the type of the the artifact that was published
+
+* ext +
+the extension of the the artifact that was published
+
+* resolver +
+the name of the resolver into which the artifact was published
+
+* file +
+the absolute path of the source file for the artifact
+
+* overwrite +
+"true" if the new data overwrote existing artifacts, "false" otherwise
+
+* status +
+"successful" if the artifact published successfully; "failed" if the artifact failed to publish, or if the status is unknown
+
+ |Fired after an artifact is published into a repository. Note that this event is fired whether or not the publication succeeded. The "status" property can be checked to verify success.
+|=======
+
+
+
+The child tag used for the dependency resolver must be equal to a name of a trigger type (either built-in or added with the typedef tag).
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any trigger|adds a trigger to the list of registered triggers|1..n
+|=======
+
+
+
+== Built-in Triggers
+
+Ivy comes with 3 built-in triggers:
+
+
+[options="header",cols="15%,50%"]
+|=======
+|Name|Description
+|ant-build|Triggers an ant build. Note that by default the ant build is triggered only once per build file, the property onlyonce can be set to false to change this.
+|ant-call|Calls a target in the current ant build.
+|log|Logs a message on the console or in a log file.
+|=======
+
+
+
+
+== [[common]]Common attributes
+
+All triggers share some common attributes detailed here.
+
+Among these attributes, you will find how to select when the trigger should be performed. You have to provide an event name, which is simple, but you can also use a filter expression. The syntax for this expression is very simple and limited:
+you can use the = operator to compare an attribute (left operande) with a value (right operande).
+you can use AND OR NOT as boolean operators
+you cannot use parenthesis to change the precedence
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the trigger for identification purpose only|Yes
+|event|the name of the event on which the trigger should be performed|Yes
+|filter|a filter expression used to restrict when the trigger should be performed|No, defaults to no filter
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<triggers>
+ <ant-build antfile="${ivy.settings.dir}/[module]/build.xml" target="publish"
+ event="pre-resolve-dependency" filter="revision=latest.integration"/>
+</triggers>
+
+----
+
+Triggers an ant build of the ant file ${ivy.settings.dir}/[module]/build.xml (where [module] is replaced by the name of the dependency resolved) with the target "publish", just before resolving a dependency with a latest.integration revision.
+Note that by default the ant build is triggered only once per build file. See below to see how to trigger the build more than once.
+
+'''
+
+
+[source]
+----
+
+<triggers>
+ <ant-build antfile="${ivy.settings.dir}/[module]/build.xml" target="publish"
+ event="pre-resolve-dependency" filter="revision=latest.integration"
+ onlyonce="false" />
+</triggers>
+
+----
+
+Same as before, but this time the builds will be triggered as many time as the dependency is resolved, instead of only once.
+
+'''
+
+
+[source]
+----
+
+<triggers>
+ <ant-call target="unzip" prefix="dep"
+ event="post-download-artifact" filter="type=zip AND status=successful"/>
+</triggers>
+
+----
+
+Triggers an ant call of the target unzip just after downloading a zip artifact, prefixing all parameters to the target with 'dep'.
+Here is how the target can look like:
+
+[source]
+----
+
+<target name="unzip">
+ <echo>
+ unzipping artifact:
+ organisation=${dep.organisation}
+ module=${dep.module}
+ revision=${dep.revision}
+ artifact=${dep.artifact}
+ type=${dep.type}
+ ext=${dep.ext}
+ origin=${dep.origin}
+ local=${dep.local}
+ size=${dep.size}
+ file=${dep.file}
+ </echo>
+ <mkdir dir="${basedir}/out"/>
+ <unzip src="${dep.file}" dest="${basedir}/out"/>
+</target>
+
+----
+
+
+'''
+
+
+[source]
+----
+
+<triggers>
+ <log file="ivy.log"
+ message='downloaded "${origin}" to "${file}" (${duration}ms - ${size}B)'
+ event="post-download-artifact" filter="status=successful"/>
+</triggers>
+
+----
+
+Logs any successful artifact download, with information on the source and destination, and details on download size and duration.
+
+The file attribute is optional, the log trigger will output messages to console if it isn't provided.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/typedef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/typedef.adoc b/asciidoc/settings/typedef.adoc
new file mode 100644
index 0000000..7aacd45
--- /dev/null
+++ b/asciidoc/settings/typedef.adoc
@@ -0,0 +1,20 @@
+
+*Tag:* typedef
+
+
+
+Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.
+See link:../extend.html[how to write and plug your own dependency resolver] for details.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the type to define. This name is then used as an xml tag.|Yes
+|classname|the fully qualified class name of the type to define.|Yes
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/settings/version-matchers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/version-matchers.adoc b/asciidoc/settings/version-matchers.adoc
new file mode 100644
index 0000000..e31632d
--- /dev/null
+++ b/asciidoc/settings/version-matchers.adoc
@@ -0,0 +1,121 @@
+
+*Tag:* version-matchers
+
+Defines a list of version matchers. *__since 1.4__*
+
+The child tag used for the version matcher must be equal to a name of a report outputter type (added with the typedef tag).
+
+A version matcher is used to evaluate if a dependency version constraint matches a dependency version.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Descrition|Required
+|usedefaults|when set to true, includes the built-in version matchers (Latest, Sub Revision, and Version Ranger Matcher). Exact Revision Matcher is always included|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|any version matcher|adds a version matcher to the list of available ones|0..n
+|=======
+
+
+
+== Built-in Version Matchers
+
+
+=== Exact Revesion Matcher
+
+A matcher that matches a dependency revision id to the module revision id using simple string equality.
+
+
+=== Sub Revision Matcher
+
+A matcher that matches all revisions starting with a specific prefix. The syntax is: [prefix]+
+
+
+[options="header"]
+|=======
+|Revision|Matches
+|1.0.+|all revisions starting with '1.0.', like 1.0.1, 1.0.5, 1.0.a
+|1.1+|all revisions starting with '1.1', like 1.1, 1.1.5, but also 1.10, 1.11
+|=======
+
+
+
+=== Latest (Status) Matcher
+
+
+A matcher that matches versions based on their status. The predefined statuses in Ivy are 'release', 'milestone' and 'integration'. It's possible to define your own statuses, see link:../settings/statuses.html[statuses] for more details.
+
+
+[options="header"]
+|=======
+|Revision|Matches
+|latest.integration|all versions
+|latest.milestone|all modules having at least 'milestone' as status
+|latest.release|all modules having at least 'release' as status
+|latest.[any status]|all modules having at least the specified status
+|=======
+
+
+
+=== Version Range Matcher
+
+
+Range types are exhaustively listed by example in the table below.
+
+
+[options="header"]
+|=======
+|Revision|Matches
+| [1.0,2.0] | all versions greater or equal to 1.0 and lower or equal to 2.0
+| [1.0,2.0[ | all versions greater or equal to 1.0 and lower than 2.0
+| ]1.0,2.0]
+| [1.0,) | all versions greater or equal to 1.0
+| ]1.0,) | all versions greater than 1.0
+| (,2.0] | all versions lower or equal to 2.0
+| (,2.0[ | all versions lower than 2.0
+|=======
+
+
+
+=== Version Pattern Matcher
+
+
+The version pattern matcher allows for more flexibility in pattern matching at the cost of adding a matcher declaration in Ivy settings. A simple example is given below.
+
+
+==== Settings.xml
+
+
+[source]
+----
+
+<pattern-vm>
+ <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
+</pattern-vm>
+
+----
+
+
+==== Ivy.xml
+
+
+[source]
+----
+
+<dependency org="acme" name="tool" rev="foo(1, 3)" />
+
+----
+
+The version pattern matcher may contain more than one match element. The matcher will attempt to match a dependency revision against each match in sequence, checking the revision tag (e.g. foo(..)) and then the pattern.
+Matcher types may be one of "regexp", "exact", "glob", or "exactOrRegexp". Glob pattern matching requires Apache ORO 2.0.8 or higher to be on the classpath.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/standalone.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/standalone.adoc b/asciidoc/standalone.adoc
new file mode 100644
index 0000000..423a289
--- /dev/null
+++ b/asciidoc/standalone.adoc
@@ -0,0 +1,171 @@
+
+Ivy can be used as a standalone program very easily. All you need is a Java 5+ runtime environment (JRE)!
+
+Then here is how to call it:
+
+[source]
+----
+
+java -jar ivy.jar -?
+
+----
+
+It will display an online help like this:
+
+[source]
+----
+
+==== settings options
+ -settings <settingsfile> use given file for settings
+ -cache <cachedir> use given directory for cache
+ -novalidate do not validate ivy files against xsd
+ -m2compatible use maven2 compatibility
+
+==== resolve options
+ -ivy <ivyfile> use given file as ivy file
+ -dependency <organisation> <module> <revision>
+ use this instead of ivy file to do the rest of the
+ work with this as a dependency.
+ -confs <configurations> resolve given configurations
+
+==== retrieve options
+ -retrieve <retrievepattern> use given pattern as retrieve pattern
+ -sync use sync mode for retrieve
+
+==== cache path options
+ -cachepath <cachepathfile> outputs a classpath consisting of all dependencies
+ in cache (including transitive ones) of the given
+ ivy file to the given cachepathfile
+
+==== deliver options
+ -deliverto <ivypattern> use given pattern as resolved ivy file pattern
+
+==== publish options
+ -publish <resolvername> use given resolver to publish to
+ -publishpattern <artpattern> use given pattern to find artifacts to publish
+ -revision <revision> use given revision to publish the module
+ -status <status> use given status to publish the module
+
+==== http auth options
+ -realm <realm> use given realm for HTTP AUTH
+ -host <host> use given host for HTTP AUTH
+ -username <username> use given username for HTTP AUTH
+ -passwd <passwd> use given password for HTTP AUTH
+
+==== launcher options
+ -main <main> the FQCN of the main class to launch
+ -args <args> the arguments to give to the launched process
+ -cp <cp> extra classpath to use when launching process
+
+==== message options
+ -debug set message level to debug
+ -verbose set message level to verbose
+ -warn set message level to warn
+ -error set message level to error
+
+==== help options
+ -? display this help
+ -deprecated show deprecated options
+
+----
+
+*__since 1.3__* System properties are included as ivy variables, so you can easily define an ivy variable like this:
+
+[source]
+----
+
+java -Dmyivyvar=myvalue org.apache.ivy.Main [parameters]
+
+----
+
+
+== Examples
+
+
+[source]
+----
+
+java -jar ivy.jar
+
+----
+
+calls ivy with default configuration using ivy.xml in the current dir
+
+'''
+
+
+[source]
+----
+
+java -jar ivy.jar -settings path/to/myivysettings.xml -ivy path/to/myivy.xml
+
+----
+
+calls ivy with given ivysettings file using given ivy file
+
+'''
+
+*__since 1.3__*
+
+[source]
+----
+
+java -jar ivy.jar -settings path/to/myivysettings.xml -dependency apache commons-lang 2.0
+
+----
+
+calls ivy with given ivysettings file and resolve apache commons-lang 2.0.
+
+This is equivalent to:
+
+[source]
+----
+
+java -jar ivy.jar -settings path/to/myivysettings.xml -ivy ivy.xml
+
+----
+
+with ivy.xml like this:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info organisation="org"
+ module="standalone"
+ revision="working"
+ />
+ <dependencies>
+ <dependency org="apache" name="commons-lang" rev="2.0" conf="default->*"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+
+'''
+
+*__since 1.3__*
+
+[source]
+----
+
+java -jar ivy.jar -settings path/to/myivysettings.xml -ivy path/to/myivy.xml -cachepath mycachefile.txt
+
+----
+
+calls ivy with given ivysettings file and resolve the dependencies found in the given ivy file, and then output the classpath of resolved artifacts in cache in a file. This file can then be used to define a classpath corresponding to all the resolved dependencies for any java program.
+
+
+'''
+
+*__since 1.4__*
+
+[source]
+----
+
+java -jar ivy.jar -settings path/to/myivysettings.xml -dependency bar foo 2.0 -main org.bar.foo.FooMain
+
+----
+
+calls ivy with given ivysettings file and resolve bar foo 2.0, and then run org.foo.FooMain class with the resolved artifacts as classpath
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/ant.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/ant.css b/asciidoc/style/ant.css
new file mode 100644
index 0000000..3c25d3b
--- /dev/null
+++ b/asciidoc/style/ant.css
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ *
+ */
+
+table.ant {
+ border-collapse:collapse;
+ width:90%;
+ margin:auto;
+ margin-top: 10px;
+}
+.ant thead {
+ background-color:#DEE4CD;
+ border:1px solid #7A9437;
+}
+.ant tbody {
+ background-color:#FFFFFF;
+ border:1px solid #7A9437;
+}
+
+.ant th {
+ font-family:monospace;
+ border:1px solid #7A9437;
+ padding:5px;
+}
+
+.ant td {
+ border:1px dotted #7A9437;
+ padding:5px;
+}
+
+th.ant-att {
+ width:15%;
+}
+th.ant-desc {
+ width:50%;
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/color.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/color.css b/asciidoc/style/color.css
new file mode 100644
index 0000000..51333f7
--- /dev/null
+++ b/asciidoc/style/color.css
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ *
+ */
+
+body {
+ background-color: #5a7418;
+}
+
+#body {
+ color: #000;
+ background-color: #fff;
+}
+
+h1, h2, h3, h4, h5, h6, .toc-title {
+ color: #7a9438;
+}
+h2 {
+ color: #fff;
+ background-color: #7a9438;
+}
+h1 {
+ color: #7a9438;
+ background-color: #fff;
+ background: none;
+}
+a:link {
+ color: #7a9438;
+}
+a:visited {
+ color: #7a9438;
+}
+a:hover, a:active {
+ color: #7a9438;
+}
+blockquote {
+ color: #696969;
+}
+pre {
+ background-color: #eee;
+ border: 1px solid #ddd;
+}
+.form-item label {
+ color: #7a9438;
+}
+.item-list .title {
+ color: #7a9438;
+}
+
+/*
+** Page layout blocks / IDs
+*/
+#header {
+ background-color: #ffffff;
+ /* border: 3px solid #9ebf47; */
+}
+
+#top-menu {
+ background-color:#7a9438;
+ border-top: 3px solid #9ebf47;
+ border-bottom: 3px solid #9ebf47;
+}
+
+#search .form-text, #search .form-submit {
+ border: 1px solid #7a9438;
+}
+#search .form-submit {
+ background-color: #9ebf47;
+}
+
+.block h2 {
+ color: #000;
+ background-color: #eee;
+}
+
+.block .content {
+ background-color: #fff;
+ border: 1px solid #eee;
+}
+/*
+.block h2 {
+ color: #000;
+}
+*/
+
+#navcontainer {
+ background-color:#7a9438;
+}
+
+#nav {
+ background-color:#7a9438;
+}
+
+#nav ul {
+ background-color:#7a9438;
+ border-top: 1px solid #7a9438;
+ border-right: 1px solid #7a9438;
+ border-bottom: 1px solid #7a9438;
+ border-left: 0.75em solid #7a9438;
+}
+
+#nav li a {
+ color: #fff;
+}
+
+#nav .title {
+ color: #fff;
+ /*
+ background: #61752c;
+ */
+ background: #7a9438;
+ border-top: 0;
+ border-right: 0;
+ border-bottom: 1px solid #7a9438;
+ border-left: 0;
+}
+
+#nav li li a {
+ background: #fff;
+ color: #7a9438;
+ border-top: 0;
+ border-right: 0;
+ border-bottom: 1px solid #7a9438;
+ border-left: 0;
+}
+
+#nav a:hover,
+#nav a:active {
+ background: #9ebf47;
+}
+
+#forum tr.dark {
+ background: #daeddc;
+}
+
+.postit {
+ background-color: #FFDBA1;
+ border: 1px solid #FFB643;
+ color: #4E3000;
+}
+
+.tip {
+ background-color: #F6FF7F;
+ border: 1px solid #FFB643;
+ color: #4E3000;
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/ivy-ref.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/ivy-ref.css b/asciidoc/style/ivy-ref.css
new file mode 100644
index 0000000..ae0fdea
--- /dev/null
+++ b/asciidoc/style/ivy-ref.css
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ *
+ */
+
+table.ivy-attributes {
+ border-collapse:collapse;
+ width:90%;
+ margin:auto;
+ margin-top: 10px;
+}
+.ivy-attributes thead {
+ background-color:#DEE4CD;
+ border:1px solid #7A9437;
+}
+.ivy-attributes tbody {
+ background-color:#FFFFFF;
+ border:1px solid #7A9437;
+}
+
+.ivy-attributes th {
+ font-family:monospace;
+ border:1px solid #7A9437;
+ padding:5px;
+}
+
+.ivy-attributes td {
+ border:1px dotted #7A9437;
+ padding:5px;
+}
+
+th.ivy-att {
+ width:15%;
+}
+th.ivy-att-desc {
+ width:50%;
+}
+
+table.ivy-children {
+/* border:3px solid #6495ed; */
+ border-collapse:collapse;
+ width:90%;
+ margin:auto;
+ margin-top: 10px;
+}
+.ivy-children thead {
+ background-color:#DEE4CD;
+ border:1px solid #7A9437;
+}
+.ivy-children tbody {
+ background-color:#FFFFFF;
+ border:1px solid #7A9437;
+}
+
+.ivy-children th {
+ font-family:monospace;
+ border:1px solid #7A9437;
+ padding:5px;
+}
+
+.ivy-children td {
+ border:1px dotted #7A9437;
+ padding:5px;
+}
+
+th.ivy-chld {
+ width:15%;
+}
+th.ivy-chld-desc {
+ width:50%;
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/nav.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/nav.css b/asciidoc/style/nav.css
new file mode 100644
index 0000000..b59a0c5
--- /dev/null
+++ b/asciidoc/style/nav.css
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ *
+ */
+
+#navcontainer {
+ color: white;
+ margin-left: 20px;
+}
+
+
+#navcontainer a {
+ color: white;
+ text-decoration: none;
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/print-style.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/print-style.css b/asciidoc/style/print-style.css
new file mode 100644
index 0000000..48701d2
--- /dev/null
+++ b/asciidoc/style/print-style.css
@@ -0,0 +1,299 @@
+/*
+ * 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.
+ *
+ */
+
+@import "color.css";
+@import "nav.css";
+@import "xmlverbatim.css";
+@import "ant.css";
+@import "ivy-ref.css";
+@import "shell.css";
+
+#body {
+ padding: 0;
+}
+#body {
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+/*
+** HTML elements
+*/
+body {
+ margin: 0;
+ padding: 0;
+ bgcolor: #ffffff;
+}
+body, p, td, li, ul, ol {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: small;
+}
+h1, h2, h3, h4, h5, h6, .toc-title {
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+}
+.toc-title {
+ margin: 15px;
+ padding: 10px;
+ font-size: 2em;
+ text-align: center;
+ border: solid 2px;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ -moz-border-radius-bottomright: 5px;
+ -moz-border-radius-bottomleft: 5px;
+}
+h1 {
+/*
+ margin-left: 15px;
+ margin-right: 15px;
+ */
+ padding-left: 10px;
+ font-size: 1.6em;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ -moz-border-radius-bottomright: 5px;
+ -moz-border-radius-bottomleft: 5px;
+}
+h2 {
+ font-size: 1.4em;
+}
+h3 {
+ font-size: 1.2em;
+}
+h4 {
+ font-size: 1.1em;
+}
+tr.dark td, tr.light td {
+ padding: 0.3em;
+}
+a:link {
+ text-decoration: none;
+ font-weight: bold;
+}
+a:visited {
+ text-decoration: none;
+ font-weight: bold;
+}
+a:hover, a:active {
+ font-weight: bold;
+ text-decoration: underline;
+}
+p {
+ margin: 0 0 1.3em 0;
+ padding: 0;
+}
+blockquote {
+ padding: 0 15px 0 15px;
+ margin: 15px 50px 15px 50px;
+ text-align: left;
+ font-size: 1.2em;
+ line-height: 1.3em;
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+}
+pre {
+ padding: 0.75em 1.5em;
+ font-size: 1em;
+}
+.form-item {
+ margin-top: 1em;
+}
+.item-list .title {
+ font-size: 0.85em;
+}
+.hide {
+ display: none
+}
+
+/*
+** Page layout blocks / IDs
+*/
+#home img {
+ padding: 5px 20px 10px 10px;
+}
+.product img {
+ padding: 5px 20px 10px 10px;
+}
+
+#top-menu tr {
+ padding: 0;
+ margin: 0;
+}
+
+#top-menu td {
+ padding: 0;
+ margin: 0;
+}
+
+#search {
+ padding: 0 1em 0 1em;
+ margin: 0;
+}
+#search .form-text, #search .form-submit {
+ padding: 0;
+ margin: 0;
+ font-size: 0.85em;
+}
+#search .form-text {
+ width: 8em;
+ padding: 0;
+ margin: 0;
+}
+
+#sidebar-left, #sidebar-right {
+ width: 200px;
+ /* padding in px not ex because IE messes up 100% width tables otherwise */
+ padding: 15px 5px 75px 10px;
+ vertical-align: top;
+}
+#sidebar-left li, #sidebar-right li {
+ font-size: 1em;
+}
+.block h2 {
+ margin: 5px 0px 0px 0px;
+ padding: 1px 5px 1px 30px;
+ font-size: 1.2em;
+ font-weight: 700;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+}
+
+.block .content {
+ -moz-border-radius-bottomright: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ margin-bottom: 10px;
+}
+
+#main {
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom: 10px;
+ background: transparent url(../images/background.png) center center no-repeat;
+}
+
+.content {
+ padding-top: 10px;
+}
+
+#forum {
+ margin: 15px 0 15px 0;
+}
+#forum table {
+ width: 100%;
+}
+#forum table tr th {
+ text-align: center;
+ font-size: 0.75em;
+}
+#forum table tr th a {
+ text-decoration: underline;
+}
+#forum table tr th img {
+ margin: 0;
+}
+#forum td {
+ padding: 0.5em 0.5em 0.5em 0.5em;
+}
+#forum td.container a {
+ padding: 20px 0 20px 35px;
+}
+#forum td.statistics, #forum td.settings, #forum td.pager {
+ height: 1.5em;
+}
+#forum td .links {
+ padding-top: 0.7em;
+ font-size: 0.9em;
+}
+.block-forum h3 {
+ margin-bottom: .5em;
+}
+
+.footer {
+ text-align: center;
+ margin-top: 3pt;
+ margin-bottom: 3pt;
+ font-size: 85%;
+}
+
+#footer-menu td {
+ padding-top: 3px;
+}
+
+.comparison td, .comparison th {
+ text-align: center;
+}
+
+.comment {
+ -moz-border-radius: 5px;
+ border: 1px solid #abc;
+ padding: .5em;
+ margin-bottom: 1em;
+}
+.comment .title {
+ font-size: 1em;
+ padding: 10px 0px 12px 19px;
+ background: transparent url(icon-comment.png) left center no-repeat;
+}
+.comment .new {
+ font-weight: bold;
+ font-size: 1em;
+ margin-left: 2px;
+ color: red;
+}
+.comment .picture {
+ border: 1px solid #fff;
+ float: right;
+ margin: 10px;
+}
+.submitted {
+ color: #999;
+ font-size: 0.79em;
+}
+.since {
+ font-weight: 700;
+ font-style: italic;
+}
+
+.postit {
+ margin:10px;
+ padding:10px;
+ -moz-border-radius:10px;
+ float:right;
+ width:400px;
+}
+
+table.home {
+ text-align:center;
+ color:#6e9244;
+ font-family:verdana, "Lucida Grande", arial, helvetica, sans-serif;
+}
+tr.homeitems {
+ font-size:large;
+}
+tr.homeitems td {
+ padding: 0 0.5cm 0 0.5cm;
+}
+tr.homeitems a:link, a:visited {
+ color: #6e9244;
+ text-decoration: none;
+}
+tr.homeitems a:hover {
+ text-decoration: underline;
+ background: none !important;
+}
+.home img { border-width:0; }
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/shell.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/shell.css b/asciidoc/style/shell.css
new file mode 100644
index 0000000..1b0fba9
--- /dev/null
+++ b/asciidoc/style/shell.css
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ */
+
+/* the class shell is used when a copy of the content of a shell or DOS window is made */
+
+.shell {
+ background-color: black;
+ color: white;
+ border: medium gray solid;
+}
+.shell pre {
+ background-color: black;
+ border: none;
+ font-size: small;
+ white-space: pre; /* CSS2 */
+ white-space: -moz-pre-wrap; /* Mozilla */
+ white-space: -hp-pre-wrap; /* HP printers */
+ white-space: -o-pre-wrap; /* Opera 7 */
+ white-space: -pre-wrap; /* Opera 4-6 */
+ white-space: pre-wrap; /* CSS 2.1 */
+ white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
+ word-wrap: break-word; /* IE */
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/style.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/style.css b/asciidoc/style/style.css
new file mode 100644
index 0000000..4524ed4
--- /dev/null
+++ b/asciidoc/style/style.css
@@ -0,0 +1,372 @@
+/*
+ * 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.
+ *
+ */
+
+
+@import "color.css";
+@import "nav.css";
+@import "xmlverbatim.css";
+@import "ant.css";
+@import "ivy-ref.css";
+@import "shell.css";
+@import "tree.css";
+
+/*
+** HTML elements
+*/
+body {
+ margin: 0;
+ padding: 0;
+ bgcolor: #ffffff;
+}
+#body {
+ display: table;
+ margin: 8px auto;
+ padding: 0;
+ width: 98%;
+}
+body, p, td, li, ul, ol {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: small;
+}
+h1, h2, h3, h4, h5, h6 {
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+}
+h2 {
+/*
+ margin-left: 15px;
+ margin-right: 15px;
+ */
+ padding-left: 10px;
+ font-size: 1.6em;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ -moz-border-radius-bottomright: 5px;
+ -moz-border-radius-bottomleft: 5px;
+}
+h3 {
+ font-size: 1.4em;
+}
+h4 {
+ font-size: 1.2em;
+}
+h5 {
+ font-size: 1.1em;
+}
+tr.dark td, tr.light td {
+ padding: 0.3em;
+}
+a:link {
+ text-decoration: none;
+ font-weight: bold;
+}
+a:visited {
+ text-decoration: none;
+ font-weight: bold;
+}
+a:hover, a:active {
+ font-weight: bold;
+ text-decoration: underline;
+}
+p {
+ margin: 0 0 1.3em 0;
+ padding: 0;
+}
+blockquote {
+ padding: 0 15px 0 15px;
+ margin: 15px 50px 15px 50px;
+ text-align: left;
+ font-size: 1.2em;
+ line-height: 1.3em;
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+}
+pre {
+ padding: 0.75em 1.5em;
+ font-size: 1em;
+}
+.form-item {
+ margin-top: 1em;
+}
+.item-list .title {
+ font-size: 0.85em;
+}
+.hide {
+ display: none
+}
+
+/*
+** Page layout blocks / IDs
+*/
+#body {
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ -moz-border-radius-bottomright: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+#home img {
+ padding: 5px 20px 10px 10px;
+}
+.product img {
+ padding: 5px 20px 10px 10px;
+}
+
+#top-menu tr {
+ padding: 0;
+ margin: 0;
+}
+
+#top-menu td {
+ padding: 0;
+ margin: 0;
+}
+
+#search {
+ padding: 0 1em 0 1em;
+ margin: 0;
+}
+#search .form-text, #search .form-submit {
+ padding: 0;
+ margin: 0;
+ font-size: 0.85em;
+}
+#search .form-text {
+ width: 8em;
+ padding: 0;
+ margin: 0;
+}
+
+#sidebar-left, #sidebar-right {
+ width: 260px;
+ /* padding in px not ex because IE messes up 100% width tables otherwise */
+ padding: 15px 5px 75px 10px;
+ vertical-align: top;
+}
+#sidebar-left li, #sidebar-right li {
+ font-size: 1em;
+}
+.sidebar-title {
+ margin: 5px 0px 0px 0px;
+ padding: 1px 5px 1px 30px;
+ font-size: 1.2em;
+ font-weight: 700;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ color: #000;
+ background-color: #eee;
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+}
+#content {
+ table-layout:fixed;
+}
+.block h2 {
+ margin: 5px 0px 0px 0px;
+ padding: 1px 5px 1px 30px;
+ font-size: 1.2em;
+ font-weight: 700;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+}
+
+.block .content {
+ -moz-border-radius-bottomright: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ margin-bottom: 10px;
+}
+
+#main {
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom: 10px;
+ background: transparent url(../images/background.png) center center no-repeat;
+}
+
+.content {
+ padding-top: 0px;
+}
+
+#forum {
+ margin: 15px 0 15px 0;
+}
+#forum table {
+ width: 100%;
+}
+#forum table tr th {
+ text-align: center;
+ font-size: 0.75em;
+}
+#forum table tr th a {
+ text-decoration: underline;
+}
+#forum table tr th img {
+ margin: 0;
+}
+#forum td {
+ padding: 0.5em 0.5em 0.5em 0.5em;
+}
+#forum td.container a {
+ padding: 20px 0 20px 35px;
+}
+#forum td.statistics, #forum td.settings, #forum td.pager {
+ height: 1.5em;
+}
+#forum td .links {
+ padding-top: 0.7em;
+ font-size: 0.9em;
+}
+.block-forum h3 {
+ margin-bottom: .5em;
+}
+
+#footer-menu td {
+ padding-top: 3px;
+}
+
+.footer {
+ text-align: center;
+ margin-top: 3pt;
+ margin-bottom: 3pt;
+ font-size: 85%;
+}
+
+.comparison td, .comparison th {
+ text-align: center;
+}
+
+.comment {
+ -moz-border-radius: 5px;
+ border: 1px solid #abc;
+ padding: .5em;
+ margin-bottom: 1em;
+}
+.comment .title {
+ font-size: 1em;
+ padding: 10px 0px 12px 19px;
+ background: transparent url(icon-comment.png) left center no-repeat;
+}
+.comment .new {
+ font-weight: bold;
+ font-size: 1em;
+ margin-left: 2px;
+ color: red;
+}
+.comment .picture {
+ border: 1px solid #fff;
+ float: right;
+ margin: 10px;
+}
+.submitted {
+ color: #999;
+ font-size: 0.79em;
+}
+.since {
+ font-weight: 700;
+ font-style: italic;
+}
+
+.postit {
+ margin:10px;
+ padding:10px;
+ -moz-border-radius:10px;
+ float:right;
+ width:400px;
+}
+
+.tip {
+ margin:10px 10px 10px 50px;
+ padding:10px;
+ font-style:italic;
+ -moz-border-radius:10px;
+}
+
+table.home {
+ text-align:center;
+ color:#6e9244;
+ font-family:verdana, "Lucida Grande", arial, helvetica, sans-serif;
+}
+tr.homeitems {
+ font-size:large;
+}
+tr.homeitems td {
+ padding: 0 0.5cm 0 0.5cm;
+}
+tr.homeitems a:link, a:visited {
+ color: #6e9244;
+ text-decoration: none;
+}
+tr.homeitems a:hover {
+ text-decoration: underline;
+ background: none !important;
+}
+.home img { border-width:0; }
+
+.notice {
+ padding: 15px;
+ border-style:solid;
+ border-width:1px;
+ border-color: #F0D88D;
+ background-color: #FCFCCA;
+ margin: 10px;
+}
+
+table.tableblock {
+ border-collapse: collapse;
+ width: 90%;
+ margin: auto;
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+table.tableblock thead {
+ background-color: #DEE4CD;
+ border: 1px solid #7A9437;
+}
+
+table.tableblock th {
+ font-family: monospace;
+ border: 1px solid #7A9437;
+ padding: 5px;
+}
+
+table.tableblock tbody {
+ background-color: #FFFFFF;
+ border: 1px solid #7A9437;
+}
+
+table.tableblock td {
+ border: 1px dotted #7A9437;
+ padding: 5px;
+}
+
+table.tableblock td p:last-child {
+ margin: 0px;
+}
+
+.note {
+ margin: 10px 10px 10px 50px;
+ padding: 10px;
+ font-style: italic;
+ -moz-border-radius: 10px;
+ background-color: #F6FF7F;
+ border: 1px solid #FFB643;
+ color: #4E3000;
+}
+
+.note .title {
+ display:none;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/style/tree.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/tree.css b/asciidoc/style/tree.css
new file mode 100644
index 0000000..a9dce80
--- /dev/null
+++ b/asciidoc/style/tree.css
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ *
+ */
+
+
+#treemenu {
+padding-left: 10px;
+}
+
+.treeview ul{
+margin: 0;
+padding: 0;
+}
+
+.treeview li{
+background: white url(../images/bullet.gif) no-repeat left center;
+list-style-type: none;
+padding-left: 22px;
+margin-bottom: 3px;
+}
+
+.treeview li.submenu{
+background: white url(../images/closed.gif) no-repeat left 1px;
+cursor: hand !important;
+cursor: pointer !important;
+}
+
+.treeview li.collapsable, .treeview li.open {
+background: white url(../images/open.gif) no-repeat left 1px;
+}
+
+
+.treeview ul.closed {
+display: none;
+}
+
+.treeview .submenu ul li{
+cursor: default;
+}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/terminology.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/terminology.adoc b/asciidoc/terminology.adoc
new file mode 100644
index 0000000..67ccd9b
--- /dev/null
+++ b/asciidoc/terminology.adoc
@@ -0,0 +1,155 @@
+
+Here are some terms used in Ivy, with their definitions in Ivy:
+
+
+* link:#organisation[Organisation] +
+
+* link:#module[Module] +
+
+* link:#descriptor[Module Descriptor] +
+
+* link:#artifact[Artifact] +
+
+* link:#type[Type of an artifact] +
+
+* link:#extension[Artifact file name extension] +
+
+* link:#revision[Module Revision] +
+
+* link:#branch[Branch] +
+
+* link:#status[Status of a revision] +
+
+* link:#configurations[Configurations of a module] +
+
+* link:#settings[Ivy Settings] +
+
+* link:#repository[Repository] +
+
+
+
+== Overview
+
+The following [[illustration]]illustration shows all the key terminology in one diagram:
+
+
+
+image::images/ivy-terminology.png[]
+
+
+
+
+== [[organisation]]Organisation
+
+An organisation is either a company, an individual, or simply any group of people that produces software. In principle, Ivy handles only a single level of organisation, meaning that they have a flat namespace in Ivy module descriptors. So, with Ivy descriptors, you can only describe a tree-like organisation structure, if you use a hierarchical naming convention. The organisation name is used for keeping together software produced by the same team, just to help locate their published works.
+
+Often organisations will use their inverted domain name as their organisation name in Ivy, since domain names by definition are unique. A company whose domain name is www.example.com might want to use com.example, or if they had multiple teams, all their organisation names could begin with com.example (e.g. com.example.rd, com.example.infra, com.example.services). The organisation name does neither really have to be an inverted domain name, nor even globally unique, but unique naming is highly recommended. Widely recognized trademark or trade name owners may choose to use their brand name instead.
+
+__Examples: org.apache, ibm, jayasoft__
+
+Note that the Ivy "organisation" is very similar to Maven POM "groupId".
+</dd>
+
+== [[module]]Module
+
+A module is a self-contained, reusable unit of software that, as a whole unit, follows a revision control scheme.
+
+Ivy is only concerned about the module deliverables known as _artifacts_, and the _module descriptor_ that declares them. These deliverables, for each _revision_ of the module, are managed in _repositories_. In other words, to Ivy, a module is a chain of revisions each comprising a descriptor and one or more artifacts.
+
+__Examples: hibernate-entitymanager, ant__
+
+=== [[descriptor]]Module Descriptor
+
+A _module descriptor_ is a generic way of identifying what describes a module: the identifier (organisation, module name, branch and revision), the published artifacts, possible configurations and their dependencies.
+
+The most common module descriptors in Ivy are link:ivyfile.html[Ivy Files], xml files with an Ivy specific syntax, and usually called ivy.xml.
+
+But since Ivy is also compatible with maven 2 metadata format (called pom, for Project Object Model), pom files fall into the category of module descriptors.
+
+And because Ivy accepts pluggable module descriptor parsers, you can use almost whatever you want as module descriptors.
+
+== [[artifact]]Artifact
+
+An artifact is _a single file_ ready for delivery with the publication of a module revision, as a product of development.
+
+Compressed package formats are often preferred because they are easier to manage, transfer and store. For the same reasons, only one or a few artifacts per module are commonly used. However, artifacts can be of any file type and any number of them can be declared in a single module.
+
+In the Java world, common artifacts are Java archives or JAR files. In many cases, each revision of a module publishes only one artifact (like jakarta-log4j-1.2.6.tar.gz, for instance), but some of them publish many artifacts dependending on the use of the module (like apache-ant binary and source distributions in zip, gz and bz2 package formats, for instance).
+
+__Examples: ant-1.7.0-bin.zip, apache-ant-1.7.0-src.tar.gz __
+
+=== [[type]]Type of an artifact
+
+The artifact type is a category of a particular kind of artifact specimen. It is a classification based on the intended purpose of an artifact or _why_ it is provided, not a category of packaging format or _how_ the artifact is delivered.
+
+Although the type of an artifact may (rather accidentally) imply its file format, they are two different concepts. The artifact file name extension is more closely associated with its format. For example, in the case of Java archives the artifact type "jar" indicates that it is indeed a Java archive as per the JAR File specification. The file name extension happens to be "jar" as well. On the other hand, with source code distributions, the artifact type may be "source" while the file name extensions vary from "tar.gz", "zip", "java", "c", or "xml" to pretty much anything. So, the type of an artifact is basically an abstract functional category to explain its purpose, while the artifact file name extension is a more concrete technical indication of its format and, of course, naming.
+
+Defining appropriate artifact types for a module is up to its development organisation. Common choices may include: "jar", "binary", "bin", "rc", "exe", "dll", "source", "src", "config", "conf", "cfg", "doc", "api", "spec", "manual", "man", "data", "var", "resource", "res", "sql", "schema", "deploy", "install", "setup", "distrib", "distro", "distr", "dist", "bundle", etc.
+
+Module descriptors are not really artifacts, but they are comparable to an artifact type, i.e. "descriptor" (an ivy file or a Maven POM).
+
+Electronic signatures or digests are not really artifacts themselves, but can be found with them in repositories. They also are comparable to an artifact type, i.e. "digest" (md5 or sha1).
+
+=== [[extension]]Artifact file name extension
+
+In some cases the artifact type already implies its file name extension, but not always. More generic types may include several different file formats, e.g. documentation can contain tarballs, zip packages or any common document formats.
+
+__Examples: zip, tar, tar.gz, rar, jar, war, ear, txt, doc, xml, html__
+
+== Module [[revision]]Revision and Status
+
+
+=== Module revision
+
+A unique revision number or version name is assigned to each delivered unique state of a module. Ivy can help in generating revision numbers for module delivery and publishing revisions to repositories, but other aspects of revision control, especially source revisioning, must be managed with a separate version control system.
+
+Therefore, to Ivy, a _revision_ always corresponds to _a delivered version of a module_. It can be a public, shared or local delivery, a release, a milestone, or an integration build, an alpha or a beta version, a nightly build, or even a continuous build. All of them are considered revisions by Ivy.
+
+==== __Source revision__
+
+Source files kept under a version control system (like Subversion, CVS, SourceSafe, Perforce, etc.) have a separate revisioning scheme that is independent of the _module revisions_ visible to Ivy. Ivy is unaware of any revisions of a module's source files.
+
+In some cases, the SCM's _source revision_ number could be used also as the _module revision_ number, but that usage is very rare. They are still two different concepts, even if the module revision number was wholly or partially copied from the respective source revision number.
+
+=== [[branch]]Branch
+
+A branch corresponds to the standard meaning of a branch (or sometimes stream) in source control management tools.
+The head, or trunk, or main stream, is also considered as a branch in Ivy.
+
+=== [[status]]Status of a revision
+
+A module's status indicates how stable a module revision can be considered. It can be used to consolidate the status of all the dependencies of a module, to prevent the use of an integration revision of a dependency in the release of your module.
+
+Three statuses are defined by default in Ivy:
+
+
+* *integration*: revisions builded by a continuous build, a nightly build, and so on, fall in this category +
+
+* *milestone*: revisions delivered to the public but not actually finished fall in this category +
+
+* *release*: a revision fully tested and labelled fall in this category +
+
+*__Since 1.4__* This list is link:configuration/statuses.html[configurable] in your settings file.
+
+== [[configurations]]Configurations of a module
+
+A _module configuration_ is a way to use or construct a module. If the same module has different dependencies based on how it's used, those distinct dependency-sets are called its configurations in Ivy.
+
+Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server).
+Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those different ways to use or build a module are called module configurations in ivy.
+
+For more details on configurations and how they are used in ivy, please refer to the link:concept.html[main concepts page].
+
+== [[settings]]Ivy Settings
+
+Ivy settings files are xml files used to configure ivy to indicate where the modules can be found and how.
+
+==== __History of settings__
+
+__Prior to Ivy 2.0, the settings files were called configuration files and usually named ivyconf.xml. This resulted in confusion between module configurations and Ivy configuration files, so they were renamed to settings files. If you happen to fall on an ivyconf file or something called a configuration file, most of the time it's only unupdated information (documentation, tutorial or article). Feel free to report any problem like this if you find such an inconsistency.__
+
+
+== [[repository]]Repository
+
+What is called a _repository_ in Ivy is a distribution site location where Ivy is able to find your required modules' artifacts and descriptors (i.e. Ivy files in most cases).
+Ivy can be used with complex repositories configured very finely. You can use link:concept.html[Dependency Resolvers] to do so.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/textual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/textual.adoc b/asciidoc/textual.adoc
new file mode 100644
index 0000000..e913e6e
--- /dev/null
+++ b/asciidoc/textual.adoc
@@ -0,0 +1,115 @@
+
+Very often some concepts discussed in Ivy here, and especially those involving modules and dependencies, require to be discussed by text (e-mail, textual doc, console, ...), and so benefit from convention in this area.
+
+The conventions have been adopted with Ivy 2.0 are the following:
+
+[options="header"]
+|=======
+
+|
+a module without revision
+|
+__[organisation]__#__[module]__
+|
+org.apache.ant#ant
+
+|
+a module with revision
+|
+__[organisation]__#__[module]__;__[revision]__
+|
+org.apache.ant#ant;1.7.0
+
+|
+a module with (some) configurations
+|
+__[organisation]__#__[module]__[ __[confs]__ ]
+|
+org.apache.ant#ant[master,compile,build]
+
+|
+a module with revision and (some) configurations
+|
+__[organisation]__#__[module]__;__[revision]__[ __[confs]__ ]
+|
+org.apache.ant#ant;1.7.0[master,compile,build]
+
+|
+a module's artifact
+|
+__[organisation]__#__[module]__!__[artifact]__.__[ext]__(__[type]__)
+|
+org.apache.ant#ant!ant.jar(source)
+
+|
+a module's artifact with revision
+|
+__[organisation]__#__[module]__;__[revision]__!__[artifact]__.__[ext]__(__[type]__)
+|
+org.apache.ant#ant;1.7.0!ant.jar(source)
+
+|=======
+
+
+
+Another usual text representation used is to represent dependencies using a dash followed by greater than sign: ->
+
+To group a set of set of modules, we recommend using curly braces { }
+
+With these conventions, it's easy to give a concise and detailed overview of a set of modules and their dependencies.
+
+For instance:
+
+[source]
+----
+
+#A;2-> { #B;[1.0,1.5] #C;[2.0,2.5] }
+#B;1.4->#D;1.5
+#B;1.5->#D;2.0
+#C;2.5->#D;[1.0,1.6]
+
+----
+
+
+In full words here is how it could be written:
+
+[source]
+----
+
+module A revision 2 depends on module B with the version constraint [1.0,1.5], and on module C with the version constraint [2.0,2.5].
+module B revision 1.4 depends on module D revision 1.5.
+module B revision 1.5 depends on module D revision 2.0.
+module C revision 2.5 depends on module D with the version constraint [1.0,1.6].
+
+----
+
+
+
+As you can see, using text conventions is much more concise.
+
+Another benefit is that these conventions are usually used in Ivy console output, and can also be used in some cases to be parsed into Ivy objects (we use it for test cases for instance). To make sure text parsing works fine, we recommend using only a limited range of characters for each attributes of your module identifiers.
+
+Here is the recommended characters set for each attribute:
+
+
+* organisation +
+ a-z A-Z 0-9 - / . _ + =
+
+* module +
+ a-z A-Z 0-9 - / . _ + =
+
+* branch +
+ a-z A-Z 0-9 - / . _ + =
+
+* revision +
+ a-z A-Z 0-9 - / . _ + = , [ ] { } ( ) : @
+
+* artifact +
+ a-z A-Z 0-9 - / . _ + =
+
+* extension +
+ a-z A-Z 0-9 - / . _ + =
+
+* type +
+ a-z A-Z 0-9 - / . _ + =
+
[27/29] ant-ivy git commit: Don't commit tutorial logs generated
during build
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c50f4b4c/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index b540c04..e9abdbd 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -17,10 +17,10 @@
under the License.
-->
<project name="IvyRelease" default="snapshot"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ivy2="antlib:org.apache.ivy.ant_2"
- xmlns:xooki="antlib:xooki"
- xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ivy2="antlib:org.apache.ivy.ant_2"
+ xmlns:asciidoctor="antlib:org.asciidoctor.ant"
+ xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
<import file="build.xml"/>
<macrodef name="run-tutorial">
@@ -63,8 +63,8 @@
</sequential>
</macrodef>
- <target name="generate-tutorial-output" depends="jar,generate-doc-init">
- <property name="output.dir" value="${build.dir}/output"/>
+ <target name="generate-tutorial-output" depends="jar,generate-doc-init" unless="skip.generate-tutorial-output">
+ <property name="output.dir" value="${basedir}/asciidoc/tutorial/log"/>
<delete dir="${output.dir}"/>
<mkdir dir="${output.dir}"/>
@@ -157,27 +157,41 @@
<fileset file="${artifacts.build.dir}/jars/${final.name}"/>
</pathconvert>
- <replace dir="${output.dir}" token="\" value="/" />
- <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
- <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local" />
- <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar" />
- <replace dir="${output.dir}" token="-f build.xml " value="" />
- <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
+ <replace dir="${output.dir}" token="\" value="/"/>
+ <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy"/>
+ <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local"/>
+ <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar"/>
+ <replace dir="${output.dir}" token="-f build.xml " value=""/>
+ <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache"/>
</target>
- <target name="generate-doc" depends="init-ivy">
- <ivy:cachepath pathid="asciidoctor.path">
- <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.4" />
- </ivy:cachepath>
- <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
- <asciidoctor:convert sourceDirectory="${doc.src.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
- <attribute key="basedir" value="${doc.src.dir}" />
- <attribute key="imagesdir" value="" />
+ <target name="generate-doc-init" depends="release-version">
+ <!-- copy documentation to temp dir to replace version tokens -->
+ <!-- TODO: Don't like it that we are copying the entire set of files,
+ just so that we can replace some tokens and feed the updated files
+ to document generation. Need to figure out if there's a better way
+ to deal with this, at some point -->
+ <property name="doc.tmp.src.dir" value="${build.dir}/tempdoc"/>
+ <mkdir dir="${doc.tmp.src.dir}"/>
+ <copy todir="${doc.tmp.src.dir}" preservelastmodified="true" overwrite="true">
+ <fileset dir="${doc.src.dir}"/>
+ <filterset>
+ <filter token="version" value="${build.version}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <target name="generate-doc" depends="generate-doc-init,generate-tutorial-output">
+ <ivy:cachepath pathid="asciidoctor.path" organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.4" inline="true"/>
+ <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path"/>
+ <asciidoctor:convert sourceDirectory="${doc.tmp.src.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.tmp.src.dir}/templates" preserveDirectories="true">
+ <attribute key="basedir" value="${doc.tmp.src.dir}"/>
+ <attribute key="imagesdir" value=""/>
</asciidoctor:convert>
<!-- copy static resources -->
<copy todir="${doc.build.dir}">
- <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
- <fileset dir="${doc.src.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
+ <fileset dir="${doc.tmp.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd"/>
+ <fileset dir="${doc.tmp.src.dir}" includes="tutorial/log/multi-project-general-publishall.txt"/>
</copy>
</target>
[08/29] ant-ivy git commit: Merge latest master changes
Posted by ja...@apache.org.
Merge latest master changes
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/32296ea3
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/32296ea3
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/32296ea3
Branch: refs/heads/master
Commit: 32296ea3915941404eb602a0c4852bb8641149bf
Parents: 5d6131a 225afb8
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Thu Jun 15 13:10:12 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Thu Jun 15 13:10:12 2017 +0530
----------------------------------------------------------------------
.settings/org.eclipse.jdt.core.prefs | 49 +-
.settings/org.eclipse.jdt.ui.prefs | 11 +-
META-INF/MANIFEST.MF | 2 +-
build-for-bin-distrib.xml | 29 +-
build-release.xml | 286 +++---
build.properties | 3 +-
build.xml | 589 ++++++------
doc/compatibility.html | 6 +-
doc/images/ant-group-logo.gif | Bin 7577 -> 0 bytes
doc/images/ant-project-logo.gif | Bin 0 -> 7577 bytes
doc/images/ant-project-logo.svg | 951 +++++++++++++++++++
doc/images/apache-incubator.svg | 44 +
doc/images/hibgraph.svg | 173 ++++
doc/images/ivy-publish-fc.svg | 337 +++++++
doc/images/ivy-terminology.odg | Bin 20840 -> 22331 bytes
doc/images/ivy-terminology.svg | 419 ++++++++
doc/images/main-tasks.odg | Bin 0 -> 12386 bytes
doc/images/main-tasks.svg | 82 ++
doc/osgi.html | 4 +-
doc/osgi/eclipse-plugin.html | 4 +
doc/osgi/standard-osgi.html | 4 +
doc/osgi/target-platform.html | 4 +
doc/printTemplate.html | 2 +-
doc/release-notes.html | 10 +-
doc/template.html | 2 +-
doc/use/cachefileset.html | 8 +-
ivy.xml | 47 +-
src/etc/checkstyle/checkstyle-config | 305 +++---
src/etc/checkstyle/checkstyle-frames.xsl | 2 +-
src/example/bintray/build.xml | 6 +-
src/example/bintray/ivy.xml | 10 +-
src/example/build-a-ivy-repository/build.xml | 118 +--
src/example/chained-resolvers/build.xml | 30 +-
.../chainedresolvers-project/build.xml | 74 +-
.../chainedresolvers-project/ivy.xml | 4 +-
.../src/example/Hello.java | 8 +-
.../configurations/jdbc-example/build.xml | 101 +-
src/example/configurations/jdbc-example/ivy.xml | 32 +-
.../src/example/ConfigurationsExample.java | 17 +-
.../multi-projects/filter-framework/build.xml | 195 ++--
.../multi-projects/filter-framework/ivy.xml | 20 +-
.../src/filter/FilterProvider.java | 8 +-
.../src/filter/ccimpl/CCFilter.java | 16 +-
.../src/filter/hmimpl/HMFilter.java | 13 +-
.../test/filter/AbstractTestFilter.java | 62 +-
.../multi-projects/myapp/build.xml | 87 +-
.../configurations/multi-projects/myapp/ivy.xml | 12 +-
.../multi-projects/myapp/src/myapp/Main.java | 4 +-
src/example/dependence/build.xml | 32 +-
src/example/dependence/dependee/build.xml | 98 +-
src/example/dependence/dependee/ivy.xml | 4 +-
.../dependee/src/standalone/Main.java | 8 +-
src/example/dependence/depender/build.xml | 82 +-
src/example/dependence/depender/ivy.xml | 4 +-
.../dependence/depender/src/depending/Main.java | 6 +-
src/example/dual/build.xml | 30 +-
src/example/dual/project/build.xml | 74 +-
src/example/dual/project/ivy.xml | 4 +-
src/example/dual/project/src/example/Hello.java | 51 -
.../dual/project/src/example/HelloIvy.java | 51 +
src/example/go-ivy/build.xml | 171 ++--
src/example/hello-ivy/build.xml | 70 +-
src/example/hello-ivy/ivy.xml | 6 +-
src/example/hello-ivy/src/example/Hello.java | 51 -
.../hello-ivy/src/example/HelloConsole.java | 51 +
src/example/multi-project/build.xml | 89 +-
src/example/multi-project/common/common.xml | 313 +++---
.../multi-project/projects/console/ivy.xml | 12 +-
.../projects/console/src/console/Main.java | 16 +-
src/example/multi-project/projects/find/ivy.xml | 14 +-
.../projects/find/src/find/FindFile.java | 30 +-
.../projects/find/src/find/Main.java | 50 +-
src/example/multi-project/projects/list/ivy.xml | 10 +-
.../projects/list/src/list/ListFile.java | 24 +-
.../projects/list/src/list/Main.java | 39 +-
src/example/multi-project/projects/size/ivy.xml | 8 +-
.../projects/size/src/size/FileSize.java | 25 +-
.../multi-project/projects/sizewhere/ivy.xml | 14 +-
.../projects/sizewhere/src/sizewhere/Main.java | 44 +-
.../sizewhere/src/sizewhere/SizeWhere.java | 13 +-
.../multi-project/projects/version/ivy.xml | 4 +-
.../projects/version/src/version/Version.java | 10 +-
src/java/org/apache/ivy/Ivy.java | 66 +-
src/java/org/apache/ivy/Ivy14.java | 8 +-
src/java/org/apache/ivy/Main.java | 7 +-
.../org/apache/ivy/ant/AntBuildTrigger.java | 19 +-
src/java/org/apache/ivy/ant/AntCallTrigger.java | 8 +-
.../org/apache/ivy/ant/AntMessageLogger.java | 12 +-
src/java/org/apache/ivy/ant/IvyAntSettings.java | 15 +-
.../apache/ivy/ant/IvyAntVariableContainer.java | 8 +-
.../org/apache/ivy/ant/IvyArtifactReport.java | 10 +-
src/java/org/apache/ivy/ant/IvyBuildList.java | 18 +-
.../org/apache/ivy/ant/IvyCacheFileset.java | 131 ++-
src/java/org/apache/ivy/ant/IvyCachePath.java | 2 +-
src/java/org/apache/ivy/ant/IvyCacheTask.java | 2 +-
src/java/org/apache/ivy/ant/IvyCheck.java | 2 +-
src/java/org/apache/ivy/ant/IvyCleanCache.java | 6 +-
src/java/org/apache/ivy/ant/IvyConflict.java | 6 +-
src/java/org/apache/ivy/ant/IvyDeliver.java | 4 +-
.../org/apache/ivy/ant/IvyDependencyTree.java | 70 +-
.../ivy/ant/IvyDependencyUpdateChecker.java | 5 +-
.../apache/ivy/ant/IvyExtractFromSources.java | 4 +-
src/java/org/apache/ivy/ant/IvyInstall.java | 6 +-
.../org/apache/ivy/ant/IvyPostResolveTask.java | 14 +-
src/java/org/apache/ivy/ant/IvyPublish.java | 8 +-
src/java/org/apache/ivy/ant/IvyReport.java | 6 +-
.../org/apache/ivy/ant/IvyRepositoryReport.java | 2 +-
src/java/org/apache/ivy/ant/IvyResolve.java | 7 +-
src/java/org/apache/ivy/ant/IvyRetrieve.java | 14 +-
src/java/org/apache/ivy/ant/IvyTask.java | 14 +-
src/java/org/apache/ivy/ant/PackageMapping.java | 6 +-
src/java/org/apache/ivy/ant/antlib.xml | 16 +-
src/java/org/apache/ivy/core/IvyContext.java | 27 +-
.../org/apache/ivy/core/IvyPatternHelper.java | 21 +-
src/java/org/apache/ivy/core/IvyThread.java | 4 +-
.../apache/ivy/core/RelativeUrlResolver.java | 17 +-
.../apache/ivy/core/cache/ArtifactOrigin.java | 39 +-
.../org/apache/ivy/core/cache/CacheUtil.java | 4 +-
.../cache/DefaultRepositoryCacheManager.java | 136 ++-
.../cache/DefaultResolutionCacheManager.java | 6 +-
.../core/cache/ModuleDescriptorMemoryCache.java | 6 +-
.../ivy/core/cache/ParserSettingsMonitor.java | 6 +-
.../ivy/core/cache/RepositoryCacheManager.java | 204 ++--
.../org/apache/ivy/core/check/CheckEngine.java | 4 +
.../apache/ivy/core/deliver/DeliverEngine.java | 8 +-
.../apache/ivy/core/deliver/DeliverOptions.java | 35 +-
.../PublishingDependencyRevisionResolver.java | 10 +-
.../org/apache/ivy/core/event/IvyEvent.java | 28 +-
.../apache/ivy/core/event/IvyEventFilter.java | 14 +-
.../event/publish/EndArtifactPublishEvent.java | 3 +-
.../ivy/core/event/publish/PublishEvent.java | 2 +-
.../publish/StartArtifactPublishEvent.java | 3 +-
.../resolve/EndResolveDependencyEvent.java | 2 +-
.../core/event/retrieve/EndRetrieveEvent.java | 8 +-
.../apache/ivy/core/install/InstallEngine.java | 4 +-
.../descriptor/AbstractIncludeExcludeRule.java | 4 +-
.../ivy/core/module/descriptor/Artifact.java | 18 +-
.../core/module/descriptor/Configuration.java | 13 +-
.../module/descriptor/ConfigurationAware.java | 4 +-
.../module/descriptor/ConfigurationGroup.java | 6 +-
.../descriptor/ConfigurationIntersection.java | 4 +-
.../DefaultDependencyArtifactDescriptor.java | 14 +-
.../descriptor/DefaultDependencyDescriptor.java | 62 +-
.../descriptor/DefaultExtendsDescriptor.java | 5 +-
.../descriptor/DefaultModuleDescriptor.java | 38 +-
.../DependencyArtifactDescriptor.java | 22 +-
.../module/descriptor/DependencyDescriptor.java | 30 +-
.../DependencyDescriptorMediator.java | 2 +-
.../ivy/core/module/descriptor/ExcludeRule.java | 10 +-
.../module/descriptor/ExtendsDescriptor.java | 32 +-
.../ivy/core/module/descriptor/IncludeRule.java | 12 +-
.../core/module/descriptor/InheritableItem.java | 2 +-
.../module/descriptor/ModuleDescriptor.java | 160 ++--
.../OverrideDependencyDescriptorMediator.java | 6 +-
.../apache/ivy/core/module/id/ArtifactId.java | 4 +-
.../ivy/core/module/id/ArtifactRevisionId.java | 2 +-
.../ivy/core/module/id/MatcherLookup.java | 24 +-
.../org/apache/ivy/core/module/id/ModuleId.java | 24 +-
.../ivy/core/module/id/ModuleRevisionId.java | 26 +-
.../apache/ivy/core/module/id/ModuleRules.java | 20 +-
.../org/apache/ivy/core/module/id/package.html | 2 -
.../ivy/core/module/status/StatusManager.java | 2 +-
.../apache/ivy/core/pack/OsgiBundlePacking.java | 3 +-
.../apache/ivy/core/pack/PackagingManager.java | 4 +-
.../org/apache/ivy/core/pack/ZipPacking.java | 3 +-
.../apache/ivy/core/publish/PublishEngine.java | 17 +-
.../apache/ivy/core/publish/PublishOptions.java | 2 +-
.../ivy/core/report/ArtifactDownloadReport.java | 4 +-
.../core/report/ConfigurationResolveReport.java | 35 +-
.../apache/ivy/core/report/DownloadStatus.java | 3 +-
.../report/MetadataArtifactDownloadReport.java | 4 +-
.../apache/ivy/core/report/ResolveReport.java | 29 +-
.../repository/RepositoryManagementEngine.java | 10 +-
.../org/apache/ivy/core/resolve/IvyNode.java | 78 +-
.../apache/ivy/core/resolve/IvyNodeCallers.java | 23 +-
.../ivy/core/resolve/IvyNodeEviction.java | 24 +-
.../apache/ivy/core/resolve/IvyNodeUsage.java | 12 +-
.../apache/ivy/core/resolve/ResolveData.java | 16 +-
.../apache/ivy/core/resolve/ResolveEngine.java | 68 +-
.../apache/ivy/core/resolve/ResolveOptions.java | 17 +-
.../core/resolve/ResolveProcessException.java | 1 +
.../core/resolve/ResolvedModuleRevision.java | 19 +-
.../ivy/core/resolve/RestartResolveProcess.java | 1 +
.../org/apache/ivy/core/resolve/VisitNode.java | 49 +-
.../ivy/core/retrieve/RetrieveEngine.java | 17 +-
.../ivy/core/retrieve/RetrieveOptions.java | 4 +-
.../ivy/core/retrieve/RetrieveReport.java | 10 +
.../apache/ivy/core/search/SearchEngine.java | 25 +-
.../apache/ivy/core/settings/IvySettings.java | 86 +-
.../ivy/core/settings/IvyVariableContainer.java | 2 +-
.../core/settings/IvyVariableContainerImpl.java | 4 +-
.../apache/ivy/core/settings/Validatable.java | 2 +-
.../ivy/core/settings/XmlSettingsParser.java | 86 +-
.../core/sort/CollectionOfModulesToSort.java | 12 +-
.../ivy/core/sort/ModuleDescriptorSorter.java | 14 +-
.../org/apache/ivy/core/sort/ModuleInSort.java | 30 +-
.../core/sort/NonMatchingVersionReporter.java | 4 +-
.../org/apache/ivy/core/sort/SortEngine.java | 4 +-
.../org/apache/ivy/osgi/core/BundleInfo.java | 4 +-
.../apache/ivy/osgi/core/BundleInfoAdapter.java | 15 +-
.../ivy/osgi/core/ManifestHeaderValue.java | 6 +-
.../apache/ivy/osgi/core/ManifestParser.java | 19 +-
.../ivy/osgi/core/OSGiManifestParser.java | 7 +-
.../ivy/osgi/core/OsgiLatestStrategy.java | 11 +-
.../ivy/osgi/core/jvm-packages.properties | 2 +-
.../ivy/osgi/filter/MultiOperatorFilter.java | 2 +-
.../ivy/osgi/filter/OSGiFilterParser.java | 10 +-
.../ivy/osgi/filter/UniOperatorFilter.java | 2 +-
.../org/apache/ivy/osgi/obr/OBRResolver.java | 2 +-
.../ivy/osgi/obr/xml/CapabilityAdapter.java | 3 +-
.../apache/ivy/osgi/obr/xml/OBRXMLParser.java | 39 +-
.../ivy/osgi/obr/xml/RequirementAdapter.java | 11 +-
.../obr/xml/UnsupportedFilterException.java | 1 +
.../apache/ivy/osgi/p2/P2ArtifactParser.java | 20 +-
.../apache/ivy/osgi/p2/P2CompositeParser.java | 4 +-
.../org/apache/ivy/osgi/p2/P2Descriptor.java | 4 +-
.../apache/ivy/osgi/p2/P2MetadataParser.java | 103 +-
.../apache/ivy/osgi/p2/PropertiesParser.java | 2 +-
.../osgi/repo/AbstractFSManifestIterable.java | 10 +-
.../ivy/osgi/repo/AbstractOSGiResolver.java | 20 +-
.../repo/ArtifactReportManifestIterable.java | 5 +-
.../ivy/osgi/repo/FSManifestIterable.java | 24 +-
.../ivy/osgi/repo/ModuleDescriptorWrapper.java | 6 +-
.../ivy/osgi/repo/RelativeURLRepository.java | 2 +-
.../apache/ivy/osgi/repo/RepoDescriptor.java | 8 +-
.../osgi/repo/RepositoryManifestIterable.java | 6 +-
.../ivy/osgi/updatesite/UpdateSiteResolver.java | 6 +-
.../updatesite/xml/EclipseUpdateSiteParser.java | 28 +-
.../ivy/osgi/updatesite/xml/FeatureParser.java | 56 +-
.../ivy/osgi/updatesite/xml/UpdateSite.java | 2 +
.../updatesite/xml/UpdateSiteDigestParser.java | 2 +-
.../apache/ivy/osgi/util/DelegatingHandler.java | 133 ++-
.../org/apache/ivy/osgi/util/ParseUtil.java | 2 +-
src/java/org/apache/ivy/osgi/util/Version.java | 52 +-
.../org/apache/ivy/osgi/util/VersionRange.java | 30 +-
.../circular/CircularDependencyException.java | 3 +-
.../circular/CircularDependencyHelper.java | 7 +-
.../circular/CircularDependencyStrategy.java | 2 +-
.../ivy/plugins/conflict/ConflictManager.java | 4 +-
.../LatestCompatibleConflictManager.java | 22 +-
.../plugins/conflict/LatestConflictManager.java | 12 +-
.../plugins/conflict/RegexpConflictManager.java | 8 +-
.../conflict/StrictConflictException.java | 1 +
.../ivy/plugins/latest/LatestStrategy.java | 12 +-
.../plugins/latest/WorkspaceLatestStrategy.java | 4 +-
.../ivy/plugins/lock/DeleteOnExitHook.java | 4 +-
.../ivy/plugins/lock/FileBasedLockStrategy.java | 20 +-
.../apache/ivy/plugins/lock/LockStrategy.java | 11 +-
.../plugins/matcher/AbstractPatternMatcher.java | 4 +-
.../matcher/ExactOrRegexpPatternMatcher.java | 5 +-
.../plugins/matcher/ExactPatternMatcher.java | 3 +-
.../ivy/plugins/matcher/GlobPatternMatcher.java | 15 +-
.../org/apache/ivy/plugins/matcher/Matcher.java | 4 +-
.../ivy/plugins/matcher/PatternMatcher.java | 7 +-
.../plugins/matcher/RegexpPatternMatcher.java | 4 +-
.../namespace/MRIDTransformationRule.java | 6 +-
.../parser/AbstractModuleDescriptorParser.java | 38 +-
.../plugins/parser/ModuleDescriptorParser.java | 14 +-
.../parser/ModuleDescriptorParserRegistry.java | 2 +-
.../ivy/plugins/parser/ParserSettings.java | 2 +-
.../parser/m2/PomModuleDescriptorBuilder.java | 14 +-
.../parser/m2/PomModuleDescriptorParser.java | 19 +-
.../parser/m2/PomModuleDescriptorWriter.java | 4 +-
.../apache/ivy/plugins/parser/m2/PomReader.java | 30 +-
.../ivy/plugins/parser/m2/PomWriterOptions.java | 2 +-
.../ivy/plugins/parser/xml/UpdateOptions.java | 4 +-
.../parser/xml/XmlModuleDescriptorParser.java | 111 +--
.../parser/xml/XmlModuleDescriptorUpdater.java | 27 +-
.../parser/xml/XmlModuleDescriptorWriter.java | 5 +-
.../ivy/plugins/report/XmlReportParser.java | 8 +-
.../ivy/plugins/repository/Repository.java | 45 +-
.../apache/ivy/plugins/repository/Resource.java | 28 +-
.../ivy/plugins/repository/TransferEvent.java | 40 +-
.../plugins/repository/sftp/SFTPRepository.java | 17 +-
.../ssh/AbstractSshBasedRepository.java | 19 +-
.../repository/ssh/RemoteScpException.java | 10 +-
.../apache/ivy/plugins/repository/ssh/Scp.java | 17 +-
.../ivy/plugins/repository/ssh/SshCache.java | 38 +-
.../plugins/repository/ssh/SshRepository.java | 41 +-
.../ivy/plugins/repository/ssh/SshResource.java | 16 +-
.../plugins/repository/url/URLRepository.java | 2 +-
.../plugins/repository/vfs/VfsRepository.java | 20 +-
.../ivy/plugins/repository/vfs/VfsResource.java | 36 +-
.../repository/vsftp/VsftpRepository.java | 22 +-
.../resolver/AbstractPatternsBasedResolver.java | 4 +-
.../ivy/plugins/resolver/AbstractResolver.java | 26 +-
.../resolver/AbstractSshBasedResolver.java | 22 +-
.../resolver/AbstractWorkspaceResolver.java | 2 +-
.../ivy/plugins/resolver/BasicResolver.java | 36 +-
.../ivy/plugins/resolver/ChainResolver.java | 2 +-
.../plugins/resolver/DependencyResolver.java | 48 +-
.../ivy/plugins/resolver/DualResolver.java | 2 +-
.../plugins/resolver/FileSystemResolver.java | 6 +-
.../ivy/plugins/resolver/IBiblioResolver.java | 2 +-
.../ivy/plugins/resolver/IvyRepResolver.java | 2 +-
.../plugins/resolver/RepositoryResolver.java | 6 +-
.../ivy/plugins/resolver/SshResolver.java | 20 +-
.../resolver/WorkspaceChainResolver.java | 6 +-
.../resolver/packager/BuiltFileResource.java | 2 +-
.../resolver/packager/PackagerCacheEntry.java | 12 +-
.../resolver/packager/PackagerResolver.java | 27 +-
.../plugins/resolver/util/ResolverHelper.java | 2 +-
.../plugins/resolver/util/ResourceMDParser.java | 2 +-
.../ivy/plugins/resolver/util/URLLister.java | 6 +-
.../ivy/plugins/trigger/AbstractTrigger.java | 2 +-
.../apache/ivy/plugins/trigger/LogTrigger.java | 10 +-
.../plugins/version/AbstractVersionMatcher.java | 9 +-
.../plugins/version/ChainVersionMatcher.java | 10 +-
.../plugins/version/LatestVersionMatcher.java | 7 +-
.../org/apache/ivy/plugins/version/Match.java | 2 +-
.../plugins/version/PatternVersionMatcher.java | 2 +-
.../ivy/plugins/version/VersionMatcher.java | 30 +-
.../plugins/version/VersionRangeMatcher.java | 2 +-
.../apache/ivy/util/AbstractMessageLogger.java | 2 +-
src/java/org/apache/ivy/util/Checks.java | 2 +-
.../org/apache/ivy/util/ChecksumHelper.java | 6 +-
.../org/apache/ivy/util/ConfigurationUtils.java | 6 +-
src/java/org/apache/ivy/util/Configurator.java | 2 +-
src/java/org/apache/ivy/util/Credentials.java | 4 +-
.../org/apache/ivy/util/CredentialsUtil.java | 5 +-
src/java/org/apache/ivy/util/DateUtil.java | 2 +-
.../apache/ivy/util/DefaultMessageLogger.java | 2 +-
.../apache/ivy/util/EncryptedProperties.java | 66 ++
.../org/apache/ivy/util/EncrytedProperties.java | 49 +-
src/java/org/apache/ivy/util/FileResolver.java | 8 +-
src/java/org/apache/ivy/util/FileUtil.java | 160 ++--
src/java/org/apache/ivy/util/HostUtil.java | 4 +-
src/java/org/apache/ivy/util/MemoryUtil.java | 9 +-
src/java/org/apache/ivy/util/Message.java | 4 +-
src/java/org/apache/ivy/util/MessageLogger.java | 10 +-
.../apache/ivy/util/MessageLoggerEngine.java | 6 +-
.../org/apache/ivy/util/PropertiesFile.java | 1 +
src/java/org/apache/ivy/util/StringUtils.java | 29 +-
src/java/org/apache/ivy/util/XMLHelper.java | 23 +-
.../apache/ivy/util/cli/CommandLineParser.java | 1 +
.../org/apache/ivy/util/cli/ParseException.java | 1 +
.../ivy/util/extendable/ExtendableItem.java | 10 +-
.../util/extendable/ExtendableItemHelper.java | 8 +-
.../apache/ivy/util/filter/FilterHelper.java | 18 +-
.../apache/ivy/util/url/ApacheURLLister.java | 16 +-
.../apache/ivy/util/url/BasicURLHandler.java | 5 +-
.../apache/ivy/util/url/CredentialsStore.java | 2 +-
.../apache/ivy/util/url/HttpClientHandler.java | 4 +-
.../apache/ivy/util/url/IvyAuthenticator.java | 5 +-
.../org/apache/ivy/util/url/URLHandler.java | 51 +-
.../apache/ivy/util/url/URLHandlerRegistry.java | 4 +-
test/java/org/apache/ivy/IvyTest.java | 15 +-
test/java/org/apache/ivy/MainTest.java | 48 +-
test/java/org/apache/ivy/TestFixture.java | 23 +-
test/java/org/apache/ivy/TestHelper.java | 55 +-
.../apache/ivy/ant/AntBuildResolverTest.java | 35 +-
.../org/apache/ivy/ant/AntBuildTriggerTest.java | 12 +-
.../org/apache/ivy/ant/AntCallTriggerTest.java | 33 +-
.../org/apache/ivy/ant/BuildOBRTaskTest.java | 36 +-
test/java/org/apache/ivy/ant/FileUtilTest.java | 92 ++
.../org/apache/ivy/ant/FixDepsTaskTest.java | 29 +-
.../ivy/ant/IvyAntSettingsBuildFileTest.java | 48 +-
.../apache/ivy/ant/IvyArtifactPropertyTest.java | 37 +-
.../apache/ivy/ant/IvyArtifactReportTest.java | 16 +-
.../org/apache/ivy/ant/IvyBuildListTest.java | 47 +-
.../org/apache/ivy/ant/IvyBuildNumberTest.java | 27 +-
.../org/apache/ivy/ant/IvyCacheFilesetTest.java | 162 +++-
.../org/apache/ivy/ant/IvyCachePathTest.java | 44 +-
.../org/apache/ivy/ant/IvyCleanCacheTest.java | 36 +-
.../org/apache/ivy/ant/IvyConfigureTest.java | 84 +-
.../org/apache/ivy/ant/IvyConvertPomTest.java | 5 +-
.../java/org/apache/ivy/ant/IvyDeliverTest.java | 94 +-
.../apache/ivy/ant/IvyDependencyTreeTest.java | 52 +-
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 136 +--
.../org/apache/ivy/ant/IvyFindRevisionTest.java | 18 +-
.../apache/ivy/ant/IvyInfoRepositoryTest.java | 18 +-
test/java/org/apache/ivy/ant/IvyInfoTest.java | 17 +-
.../java/org/apache/ivy/ant/IvyInstallTest.java | 63 +-
.../org/apache/ivy/ant/IvyListModulesTest.java | 17 +-
.../apache/ivy/ant/IvyPostResolveTaskTest.java | 97 +-
.../java/org/apache/ivy/ant/IvyPublishTest.java | 87 +-
test/java/org/apache/ivy/ant/IvyReportTest.java | 21 +-
.../apache/ivy/ant/IvyRepositoryReportTest.java | 42 +-
.../java/org/apache/ivy/ant/IvyResolveTest.java | 119 ++-
.../org/apache/ivy/ant/IvyResourcesTest.java | 43 +-
.../org/apache/ivy/ant/IvyRetrieveBuildFile.xml | 8 +-
.../ivy/ant/IvyRetrieveBuildFileTest.java | 25 +-
.../org/apache/ivy/ant/IvyRetrieveTest.java | 86 +-
test/java/org/apache/ivy/ant/IvyTaskTest.java | 12 +-
test/java/org/apache/ivy/ant/IvyVarTest.java | 11 +-
.../ivy/ant/testutil/AntTaskTestCase.java | 6 +-
.../ivy/ant/testutil/AntTestListener.java | 12 +-
.../ivy/core/NormalRelativeUrlResolverTest.java | 13 +-
.../org/apache/ivy/core/TestPerformance.java | 17 +-
.../DefaultRepositoryCacheManagerTest.java | 47 +-
.../cache/ModuleDescriptorMemoryCacheTest.java | 29 +-
.../apache/ivy/core/deliver/DeliverTest.java | 22 +-
.../ivy/core/event/IvyEventFilterTest.java | 13 +-
.../apache/ivy/core/install/InstallTest.java | 25 +-
.../DefaultDependencyDescriptorTest.java | 11 +-
.../core/module/descriptor/IvyMakePomTest.java | 189 ++++
.../module/descriptor/ivy-to-pom-classifier.xml | 23 +
.../apache/ivy/core/module/id/ModuleIdTest.java | 41 +-
.../core/module/id/ModuleRevisionIdTest.java | 45 +-
.../ivy/core/module/id/ModuleRulesTest.java | 15 +-
.../ivy/core/publish/PublishEngineTest.java | 17 +-
.../ivy/core/publish/PublishEventsTest.java | 53 +-
.../ivy/core/report/ResolveReportTest.java | 24 +-
.../RepositoryManagementEngineTest.java | 16 +-
.../ivy/core/resolve/ResolveEngineTest.java | 18 +-
.../apache/ivy/core/resolve/ResolveTest.java | 562 +++++++----
.../apache/ivy/core/retrieve/RetrieveTest.java | 50 +-
.../org/apache/ivy/core/search/SearchTest.java | 27 +-
.../apache/ivy/core/settings/ConfigureTest.java | 12 +-
.../ivy/core/settings/IvySettingsTest.java | 8 +-
.../settings/OnlineXmlSettingsParserTest.java | 11 +-
.../core/settings/XmlSettingsParserTest.java | 89 +-
.../settings/ivysettings-cache-ttl-matcher.xml | 25 +
.../java/org/apache/ivy/core/sort/SortTest.java | 168 ++--
.../osgi/core/AggregatedOSGiResolverTest.java | 15 +-
.../ExecutionEnvironmentProfileLoaderTest.java | 7 +-
.../ivy/osgi/core/ManifestHeaderTest.java | 12 +-
.../ivy/osgi/core/ManifestParserTest.java | 20 +-
.../ivy/osgi/core/OSGiManifestParserTest.java | 11 +-
.../ivy/osgi/core/OsgiLatestStrategyTest.java | 23 +-
.../apache/ivy/osgi/filter/OSGiFilterTest.java | 36 +-
.../org/apache/ivy/osgi/obr/OBRParserTest.java | 12 +-
.../apache/ivy/osgi/obr/OBRResolverTest.java | 49 +-
.../apache/ivy/osgi/obr/OBRXMLWriterTest.java | 25 +-
.../apache/ivy/osgi/p2/P2DescriptorTest.java | 24 +-
.../apache/ivy/osgi/repo/BundleRepoTest.java | 9 +-
.../UpdateSiteAndIbiblioResolverTest.java | 12 +-
.../osgi/updatesite/UpdateSiteLoaderTest.java | 26 +-
.../osgi/updatesite/UpdateSiteResolverTest.java | 16 +-
.../org/apache/ivy/osgi/util/ParseUtilTest.java | 8 +-
.../apache/ivy/osgi/util/VersionRangeTest.java | 10 +-
.../org/apache/ivy/osgi/util/VersionTest.java | 9 +-
.../IgnoreCircularDependencyStrategyTest.java | 42 +-
.../WarnCircularDependencyStrategyTest.java | 64 +-
.../LatestCompatibleConflictManagerTest.java | 74 +-
.../conflict/LatestConflictManagerTest.java | 40 +-
.../conflict/RegexpConflictManagerTest.java | 43 +-
.../conflict/StrictConflictManagerTest.java | 46 +-
.../latest/LatestRevisionStrategyTest.java | 27 +-
.../plugins/lock/ArtifactLockStrategyTest.java | 21 +-
.../matcher/AbstractPatternMatcherTest.java | 47 +-
.../ExactOrRegexpPatternMatcherTest.java | 17 +-
.../matcher/ExactPatternMatcherTest.java | 10 +-
.../plugins/matcher/GlobPatternMatcherTest.java | 23 +-
.../matcher/RegexpPatternMatcherTest.java | 16 +-
.../namespace/MRIDTransformationRuleTest.java | 6 +-
.../plugins/namespace/NameSpaceHelperTest.java | 6 +-
.../AbstractModuleDescriptorParserTester.java | 66 +-
.../ModuleDescriptorParserRegistryTest.java | 7 +-
.../m2/PomModuleDescriptorParserTest.java | 175 +++-
.../m2/PomModuleDescriptorWriterTest.java | 24 +-
.../parser/m2/test-system-properties.pom | 58 ++
.../xml/XmlModuleDescriptorParserTest.java | 226 +++--
.../xml/XmlModuleDescriptorWriterTest.java | 38 +-
.../parser/xml/XmlModuleUpdaterTest.java | 67 +-
.../apache/ivy/plugins/parser/xml/test-info.xml | 2 +-
.../ivy/plugins/parser/xml/test-write-info.xml | 2 +-
.../ivy/plugins/report/XmlReportParserTest.java | 15 +-
.../ivy/plugins/report/XmlReportWriterTest.java | 35 +-
.../repository/vfs/VfsRepositoryTest.java | 111 +--
.../plugins/repository/vfs/VfsResourceTest.java | 205 ++--
.../plugins/repository/vfs/VfsTestHelper.java | 14 +-
.../ivy/plugins/repository/vfs/VfsURI.java | 67 +-
.../AbstractDependencyResolverTest.java | 4 +-
.../plugins/resolver/BintrayResolverTest.java | 28 +-
.../ivy/plugins/resolver/ChainResolverTest.java | 185 ++--
.../ivy/plugins/resolver/DualResolverTest.java | 47 +-
.../resolver/FileSystemResolverTest.java | 721 +++++++-------
.../plugins/resolver/IBiblioResolverTest.java | 24 +-
.../plugins/resolver/IvyRepResolverTest.java | 38 +-
.../ivy/plugins/resolver/JarResolverTest.java | 17 +-
.../ivy/plugins/resolver/Maven2LocalTest.java | 16 +-
.../resolver/MirroredURLResolverTest.java | 18 +-
.../ivy/plugins/resolver/MockResolver.java | 6 +-
.../plugins/resolver/PackagerResolverTest.java | 17 +-
.../plugins/resolver/ResolverTestHelper.java | 73 +-
.../ivy/plugins/resolver/URLResolverTest.java | 22 +-
.../ivy/plugins/resolver/VfsResolverTest.java | 10 +
.../resolver/util/ResolverHelperTest.java | 8 +-
.../ivy/plugins/trigger/LogTriggerTest.java | 17 +-
.../version/LatestVersionMatcherTest.java | 21 +-
.../version/PatternVersionMatcherTest.java | 16 +-
.../version/VersionRangeMatcherTest.java | 13 +-
test/java/org/apache/ivy/util/CacheCleaner.java | 2 +-
.../org/apache/ivy/util/ConfiguratorTest.java | 89 +-
.../apache/ivy/util/IvyPatternHelperTest.java | 24 +-
.../org/apache/ivy/util/MockMessageLogger.java | 37 +-
.../org/apache/ivy/util/StringUtilsTest.java | 15 +-
.../java/org/apache/ivy/util/TestXmlHelper.java | 74 ++
.../ivy/util/url/AbstractURLHandlerTest.java | 10 +-
.../ivy/util/url/ApacheURLListerTest.java | 39 +-
.../ivy/util/url/ArtifactoryListingTest.java | 8 +-
.../ivy/util/url/BasicURLHandlerTest.java | 17 +-
.../ivy/util/url/HttpclientURLHandlerTest.java | 19 +-
test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml | 0
test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml | 0
test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml | 0
test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml | 0
test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml | 0
test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml | 0
.../1/org/foo-bar/ivys/ivy-1.2.3.xml | 28 +
.../1/org/foo-bar/jars/foo-bar-1.2.3.jar | 0
test/repositories/1/org/mod1/ivys/ivy-2.0.xml | 27 +
test/repositories/1/org/mod1/jars/mod1-2.0.jar | 0
test/repositories/2/mod17.1/ivy-1.0.xml | 0
test/repositories/2/modpom-dbunit/ivy-2.2.xml | 0
test/repositories/2/modpom-junit/ivy-3.8.1.xml | 0
test/repositories/2/modpom-junit/ivy-3.8.2.xml | 0
.../ivysettings-optional-file-include.xml | 27 +
.../m2/org/circular/module1/1.0/module1-1.0.jar | 1 +
.../m2/org/circular/module1/1.0/module1-1.0.pom | 35 +
.../m2/org/circular/module2/2.0/module2-2.0.jar | 1 +
.../m2/org/circular/module2/2.0/module2-2.0.pom | 35 +
.../m2/org/relocated/test3/1.0/test3-1.0.pom | 0
.../relocated/test3full/1.1/test3full-1.1.pom | 0
test/test-repo/build.xml | 1 +
516 files changed, 11105 insertions(+), 6378 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/build-release.xml
----------------------------------------------------------------------
diff --cc build-release.xml
index af39676,2364091..b540c04
--- a/build-release.xml
+++ b/build-release.xml
@@@ -154,40 -154,75 +154,40 @@@
</pathconvert>
<pathconvert property="ivy.jar.location" dirsep="/">
<identitymapper/>
- <fileset file="${artifacts.build.dir}/jars/${final.name}" />
+ <fileset file="${artifacts.build.dir}/jars/${final.name}"/>
</pathconvert>
- <replace dir="${output.dir}" token="\" value="/"/>
- <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy"/>
- <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local"/>
- <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar"/>
- <replace dir="${output.dir}" token="-f build.xml " value=""/>
- <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache"/>
-
- <copy todir="${doc.tmp.dir}/tutorial/log">
- <fileset dir="${output.dir}"/>
- </copy>
- </target>
-
- <target name="generate-doc-init" depends="release-version">
- <!-- copy documentation to temp dir to replace version tokens -->
- <property name="doc.tmp.dir" value="${build.dir}/tempdoc"/>
- <mkdir dir="${doc.tmp.dir}"/>
- <copy todir="${doc.tmp.dir}" preservelastmodified="true" overwrite="true">
- <fileset dir="${doc.src.dir}"/>
- <filterset>
- <filter token="version" value="${build.version}"/>
- </filterset>
- </copy>
+ <replace dir="${output.dir}" token="\" value="/" />
+ <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
+ <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local" />
+ <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar" />
+ <replace dir="${output.dir}" token="-f build.xml " value="" />
+ <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
</target>
- <target name="generate-doc" depends="generate-doc-init,generate-tutorial-output">
+ <target name="generate-doc" depends="init-ivy">
+ <ivy:cachepath pathid="asciidoctor.path">
+ <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.4" />
+ </ivy:cachepath>
+ <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
+ <asciidoctor:convert sourceDirectory="${doc.src.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
+ <attribute key="basedir" value="${doc.src.dir}" />
+ <attribute key="imagesdir" value="" />
+ </asciidoctor:convert>
+ <!-- copy static resources -->
<copy todir="${doc.build.dir}">
- <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd"/>
- <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt"/>
+ <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
+ <fileset dir="${doc.src.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
</copy>
-
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml"/>
- <xooki:generate destDir="${doc.build.dir}" checkUpToDate="true" xookidir="${doc.src.dir}/xooki">
- <fileset dir="${doc.tmp.dir}">
- <include name="**/*.html"/>
- <exclude name="template.html"/>
- <exclude name="*Template.html"/>
- <exclude name="conflict-solving-algo.html"/>
- <exclude name="use.html"/>
- <exclude name="samples/**"/>
- <exclude name="js/**"/>
- <exclude name="reports/**"/>
- <exclude name="xooki/**"/>
- </fileset>
- </xooki:generate>
-
- <!-- generate print-friendly doc -->
- <!-- modify the basedir because othwise xooki.js will not be found! -->
- <ant antfile="../build-release.xml" target="generate-print-doc" dir="doc"/>
- </target>
-
- <target name="generate-print-doc">
- <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml"/>
- <xooki:print src="${doc.tmp.dir}/index.html"
- dest="${doc.build.dir}/book.html"
- xookidir="${doc.src.dir}/xooki"/>
</target>
- <target name="all-doc" depends="javadoc, generate-doc" />
+ <target name="all-doc" depends="javadoc,generate-doc"/>
<target name="init-snapshot" depends="default-version">
- <property name="snapshot.full.name" value="apache-ivy-${build.version}" />
+ <property name="snapshot.full.name" value="apache-ivy-${build.version}"/>
</target>
- <target name="snapshot-metadata" depends="init-snapshot, resolve">
+ <target name="snapshot-metadata" depends="init-snapshot,resolve">
<mkdir dir="${artifacts.build.dir}"/>
<ivy:deliver
deliverpattern="${artifacts.build.dir}/ivy.xml"
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/build.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/doc/osgi/eclipse-plugin.html
----------------------------------------------------------------------
diff --cc doc/osgi/eclipse-plugin.html
index fafb2b6,3b24d92..c08d861
--- a/doc/osgi/eclipse-plugin.html
+++ b/doc/osgi/eclipse-plugin.html
@@@ -26,9 -26,14 +26,13 @@@
<body>
<textarea id="xooki-source">
+<div class="tip">
+ <table class="notice">
+ <tr>
+ <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+ <td>
Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
- </td>
- </tr>
-</table>
+</div>
This page describes how to build an Eclipse™ plugin with Apache Ivy™ and its OSGi™ capabilities.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/doc/osgi/standard-osgi.html
----------------------------------------------------------------------
diff --cc doc/osgi/standard-osgi.html
index 325353d,755affc..bf9d12b
--- a/doc/osgi/standard-osgi.html
+++ b/doc/osgi/standard-osgi.html
@@@ -26,9 -26,14 +26,13 @@@
<body>
<textarea id="xooki-source">
+<div class="tip">
+ <table class="notice">
+ <tr>
+ <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+ <td>
Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
- </td>
- </tr>
-</table>
+</div>
<hr />
<center><b>TODO - WORK IN PROGRESS</b></center>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/doc/osgi/target-platform.html
----------------------------------------------------------------------
diff --cc doc/osgi/target-platform.html
index 8c791e7,863df9d..0aed5a2
--- a/doc/osgi/target-platform.html
+++ b/doc/osgi/target-platform.html
@@@ -26,9 -26,14 +26,13 @@@
<body>
<textarea id="xooki-source">
+<div class="tip">
+ <table class="notice">
+ <tr>
+ <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+ <td>
Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
- </td>
- </tr>
-</table>
+</div>
The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundle which will run together in an OSGi™ environement. Then when developping an OSGi bundle, we expect it to run in a such "target platform".
[09/29] ant-ivy git commit: Fix heading levels to take care of the
asciidoc warnings
Posted by ja...@apache.org.
Fix heading levels to take care of the asciidoc warnings
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/c73d10e0
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/c73d10e0
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/c73d10e0
Branch: refs/heads/master
Commit: c73d10e072dfc53a428e1980259f25920d98345f
Parents: 22bdffb
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Thu Jun 15 18:55:33 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Fri Jun 16 09:57:06 2017 +0530
----------------------------------------------------------------------
asciidoc/ivyfile.adoc | 6 +++---
asciidoc/ivyfile/dependency.adoc | 10 +++++-----
asciidoc/moreexamples.adoc | 10 +++++-----
asciidoc/osgi.adoc | 6 +++---
asciidoc/osgi/osgi-mapping.adoc | 20 ++++++++++----------
asciidoc/resolver/filesystem.adoc | 2 +-
asciidoc/settings/conflict-managers.adoc | 2 +-
asciidoc/settings/macrodef.adoc | 2 +-
asciidoc/terminology.adoc | 2 +-
asciidoc/use/buildlist.adoc | 4 ++--
asciidoc/use/cachefileset.adoc | 4 ++--
asciidoc/use/configure.adoc | 10 +++++-----
asciidoc/use/deliver.adoc | 6 +++---
asciidoc/use/resolve.adoc | 6 +++---
asciidoc/use/settings.adoc | 18 +++++++++---------
asciidoc/yed.adoc | 8 ++++----
16 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/ivyfile.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile.adoc b/asciidoc/ivyfile.adoc
index 4d8fe7c..4faf3b9 100644
--- a/asciidoc/ivyfile.adoc
+++ b/asciidoc/ivyfile.adoc
@@ -36,19 +36,19 @@ For those familiar with xml schema, the schema used to validate ivy files can be
----
-=== Dynamic and [[resolved]]resolved ivy files
+== Dynamic and [[resolved]]resolved ivy files
A module descriptor (ivy file) is needed both before and after the publication of each revision of the module. Depending on the case, a module descriptor can be either _dynamic_ or _resolved_:
-==== Dynamic descriptor for module development
+=== Dynamic descriptor for module development
During the module development time, between publications, the descriptor helps in managing all the possibly changing dependencies of the module. For that purpose, development time ivy files can declare dynamic dependencies to allow for a greater flexibility of use. link:ivyfile/dependency.html#revision[Dynamic revision] references like "latest.integration" or "1.0.+" are possible and may resolve to different artifacts at different times. Variables can be used for even more flexibility. Development time ivy files are hence called "dynamic", because they can produce different results over time. The dynamic ivy files are normally considered source files and kept with them (under SCM control).
-==== Resolved descriptors for publishing
+=== Resolved descriptors for publishing
At each publication, another kind of a module descriptor is needed to document the dependencies of the particular published revision of the module. For that purpose, the descriptor usually needs to be fixed as its dependencies should no longer change. In doing so, the published module revision gets fixed, explicitly resolved dependencies. No variables are allowed either. Such publication-friendly, static ivy files are called "resolved", because they should always produce the same results. The resolved ivy files are comparable to published artifacts and are kept with them in a repository.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/ivyfile/dependency.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency.adoc b/asciidoc/ivyfile/dependency.adoc
index 63e921b..b1971d3 100644
--- a/asciidoc/ivyfile/dependency.adoc
+++ b/asciidoc/ivyfile/dependency.adoc
@@ -4,7 +4,7 @@
Declares a dependency for this module. A dependency is described by the module on which the current module depends (identified by its name, organisation and revision), and a mapping of configurations.
-=== [[revision]]Fixed and dynamic revisions
+== [[revision]]Fixed and dynamic revisions
The revision can be given as a fixed one (1.5.2, for instance) or as a latest (or dynamic) one. Several possibilities for dynamic revisions are implemented in Ivy:
@@ -39,14 +39,14 @@ Examples:
The way to determine which revision is the "latest" between two is configurable through the use of pluggable LatestStrategy. See link:../reference.html[ivy main concepts] for details about this.
-=== [[revision-constraint]]Revision constraint
+== [[revision-constraint]]Revision constraint
*__since 2.0__* The dependency tag supports two revision attributes: rev, corresponding to the default required dependency revision, and revConstraint, corresponding to a dynamic revision constraint applied on this dependency.
Depending on the link:../use/resolve.html[resolve mode] used, the actual revision used during dependency resolution may vary. These revisions usually differ only for modules published in a repository. When link:../use/deliver.html[deliver] is used, dynamic version constraints are replaced by a stic version constraint, to help build reproducibility. However, the information of the original version constraint is not lost, but rather put in the revConstraint attribute. This both ensure better metadata in the repository while still allowing easier build reproducibility.
-=== Configurations mapping
+== Configurations mapping
This mapping indicates which configurations of the dependency are required in which configurations of the current module, also called master configurations.
@@ -236,13 +236,13 @@ conf for dependencies of organisation 'B'.
If you prefer more verbose mapping declaration, everything is also possible with sub elements mapping declaration.
-=== Artifact restriction
+== Artifact restriction
Moreover, the dependency element also supports an artifact restriction feature (since 0.6).
See link:../ivyfile/dependency-artifact.html[dependency artifact] for details.
-=== Forcing revision
+== Forcing revision
Finally, the dependency element also supports an a force attribute (since 0.8), which gives an indication
to conflicts manager to force the revision of a dependency to the one given here.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/moreexamples.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/moreexamples.adoc b/asciidoc/moreexamples.adoc
index 771121e..08dc508 100644
--- a/asciidoc/moreexamples.adoc
+++ b/asciidoc/moreexamples.adoc
@@ -4,27 +4,27 @@ If you have successfully followed and understood all the tutorials, you still mi
Here are some links which might be interesting:
-==== link:http://wiki.hippo.nl/display/OS/SAnt+build+system[SAnt]
+== link:http://wiki.hippo.nl/display/OS/SAnt+build+system[SAnt]
SAnt is an experimental build system based on Ant and Ivy. It can be interesting to use "as is", or to get insight on an interesting approach to manage your builds.
-==== link:https://springmodules.dev.java.net/[Spring Modules]
+== link:https://springmodules.dev.java.net/[Spring Modules]
The spring modules project build system is based on Ant and Ivy, and it's really interesting to have a look at how a modularized project can take advantage of advanced Ant and Ivy features to make the build simpler.
-==== link:http://www.opensymphony.com/webwork/[Webwork]
+== link:http://www.opensymphony.com/webwork/[Webwork]
The webwork project (which should become struts action framework) uses ant+ivy for their build, and thus makes their framework very easy to use in an ant+ivy build system. They have a link:http://wiki.opensymphony.com/display/WW/Dependencies[page documenting how to use Ivy with their framework], which can be an interesting reading, even if you don't plan to use webwork.
-==== link:http://www.jaya.free.fr/ivy/doc/articles/ease-multi-module.html[Easing multi-module development]
+== link:http://www.jaya.free.fr/ivy/doc/articles/ease-multi-module.html[Easing multi-module development]
Johan stuyts, the author of SAnt, also contributed a nice article on his view of how to use Ivy on a multi-module environment.
-==== link:http://olmex.blogspot.in/2012/04/ivy-beginners-guide.html[Beginners Guide]
+== link:http://olmex.blogspot.in/2012/04/ivy-beginners-guide.html[Beginners Guide]
Apache Ivy - Beginners Guide is a step by step guide to assist beginners in understanding basic concepts/tasks and use them straight away in their projects either through Ant build or in Eclipse IDE.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/osgi.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi.adoc b/asciidoc/osgi.adoc
index 002a91c..babbb64 100644
--- a/asciidoc/osgi.adoc
+++ b/asciidoc/osgi.adoc
@@ -13,7 +13,7 @@ Since Apache Ivy™ 2.3, some support for OSGi™ dependency management ha
So with a standard ivy.xml, you can express some dependency on some OSGi bundle and every of their trasitive dependencies will be resolved. You can also declare in your ivy.xml some OSGi dependency, like a `Require-Bundle`, an `Import-Package` or an `Import-Service`, miming an OSGi MANIFEST.MF.
-=== Note on the implementation
+== Note on the implementation
With OSGi we can declare different kind of capabilites of a bundle which can match different kind of requirements of some other bundles (`Require-Bundle`/`Bundle-SymbolicName`, `Import-Package`/`Export-Package`, `Import-Service`/`Export-Service`). In Ivy we only have one kind of requirement and one kind of capability: the symbolic name of the bundle. Due to that restriction Ivy may not resolve exactly how we would expect with OSGi. The runtime of Ivy won't be as smart as a pure OSGi dependency manager. But we think that the mapping is working for most of the use cases involing OSGi dependencies management.
@@ -21,7 +21,7 @@ With OSGi we can declare different kind of capabilites of a bundle which can mat
Details on the mapping of the OSGi dependency model into Ivy's one can be found in that link:osgi/osgi-mapping.html[page].
-=== Repository descriptor based resolvers
+== Repository descriptor based resolvers
Since the nature of the OSGi dependencies, resolving against a repository cannot be started before acquiring the metadata of every bundle of the repository. To resolve an `Import-Package`, Ivy has to find every bundle which has the proper `Export-Package`. So unlike the usual Ivy resolvers, the OSGi capable ones have to get the descriptor before starting a resolve.
@@ -29,7 +29,7 @@ Since the nature of the OSGi dependencies, resolving against a repository cannot
The descriptor probably being not instantanly downloaded, the descriptor is put in cache. (FIXME not implemented)
-=== Use cases
+== Use cases
Here are different use case of using the OSGi capabilities of Ivy:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/osgi/osgi-mapping.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/osgi-mapping.adoc b/asciidoc/osgi/osgi-mapping.adoc
index 818d6f6..5031456 100644
--- a/asciidoc/osgi/osgi-mapping.adoc
+++ b/asciidoc/osgi/osgi-mapping.adoc
@@ -5,7 +5,7 @@ This page is a description of how OSGi™ dependencies are mapped into Apache
Goal: the purpose of this mapping is to transform an OSGi manifest into an ivy.xml, so Ivy can understand OSGi bundles and resolve them. We don't want to do the reverse here.
-=== Bundle Symbolic name / Ivy organisation and module
+== Bundle Symbolic name / Ivy organisation and module
In OSGi a bundle is identified by its symbolic name. In Ivy there is a notion of organisation and module name.
@@ -36,7 +36,7 @@ The choosen mapping is:
-=== Version and version range
+== Version and version range
The OSGi specification is defining a version as a composition of 3 numbers and an arbitrary qualifier. This fit well into the lazy definition of Ivy. We will just have to use a special latest strategy in Ivy.
@@ -62,7 +62,7 @@ Then about version range, Ivy will understand correctly fully defined range as `
-=== Ivy configurations
+== Ivy configurations
The Ivy configuration is a notion that doesn't exist explicitely in OSGi, but some notion of the latter can be expressed with that configurations.
@@ -80,7 +80,7 @@ First the mapping is defining three configurations:
Then there will be some configurations used for the `use` parameter of the `Import-Package` OSGi manifest header. All of these kinds of configuration have their names starting with "use_". See in the next section.
-=== OSGi capabilities
+== OSGi capabilities
Generally speaking, declaring capabilities in an ivy.xml is useless (in the scope of this mapping which is to transform an OSGi manifest into an ivy.xml and not the reverse). In the resolve process we want to find the bundle which have the capability matching the expected requirement. In Ivy, if we are about to get the ivy.xml of a module, we are getting the bundle so we already have reached the requirement.
@@ -88,7 +88,7 @@ Generally speaking, declaring capabilities in an ivy.xml is useless (in the scop
So OSGi capabilities of bundles in a repo will be gathered direclty from the manifests to passed directly to the Ivy resolver, no need to express them into ivy.xml, except for the Export-Package, see the next section.
-==== Export-Package
+=== Export-Package
Exported package are declaring capabilities of the bundle in term of package. But they also declare dependencies between the declared package via the parameter `use`. These dependencies have to be declared in the ivy.xml. And we will use Ivy configurations for that.
@@ -126,13 +126,13 @@ Then each time an exported package is declared to use some other one, it will be
-=== OSGi Requirements / Ivy dependencies
+== OSGi Requirements / Ivy dependencies
In OSGi there are different kind of dependencies, which is an OSGi bundle repository documentation is called a "requirement". The problem is that Ivy is understanding only one kind of requirement, so we use here some extra attribute to declare those different kind of dependency.
-==== Require-Bundle
+=== Require-Bundle
The OSGi `Require-Bundle` is some a requirement directly on a specific bundle. Ivy does it too. So we just use the `osgi="bundle"` extra attribute.
@@ -168,7 +168,7 @@ If there is the OSGi `resolution` parameter specified to `optional`, then the de
-==== Import-Package
+=== Import-Package
The OSGi `Import-Package` is some a requirement on a package of a bundle. Ivy has no notion of package. So we will use the `osgi="pkg"` extra attribute.
@@ -206,7 +206,7 @@ As it is an import package the configuration of the dependency will be the `use_
-=== Execution environment
+== Execution environment
The OSGi `Bundle-RequiredExecutionEnvironment` manifest attribute is specifing is which environment the bundle is expected to run. In our problematic of dependency management it means that some of the transitive dependencies won't be resolved within the OSGi space but will be provided by the JRE. So we have to exclude from the dependency tree every requirement that will be provided by the environment. Basically it will be about excluding the packaged declared in the JRE.
@@ -234,7 +234,7 @@ The OSGi `Bundle-RequiredExecutionEnvironment` manifest attribute is specifing i
-=== Bundle Fragment
+== Bundle Fragment
Ivy doesn't support the header `Fragment-Host`.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/resolver/filesystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/filesystem.adoc b/asciidoc/resolver/filesystem.adoc
index 1ed5eb3..be9a992 100644
--- a/asciidoc/resolver/filesystem.adoc
+++ b/asciidoc/resolver/filesystem.adoc
@@ -17,7 +17,7 @@ The configuration of such a resolver is mainly done through ivy and artifact pat
*Limitation*: in m2compatible mode, this resolver is not able list available organizations. It means some features like link:../use/repreport.html[repreport] are not available.
-=== Atomic publish support
+== Atomic publish support
*__since 2.0__* 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.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/settings/conflict-managers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/conflict-managers.adoc b/asciidoc/settings/conflict-managers.adoc
index c745119..40bd560 100644
--- a/asciidoc/settings/conflict-managers.adoc
+++ b/asciidoc/settings/conflict-managers.adoc
@@ -51,7 +51,7 @@ This conflict manager is based on a regular expression and throws an exception (
-==== Child elements
+== Child elements
[options="header"]
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/settings/macrodef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef.adoc b/asciidoc/settings/macrodef.adoc
index 2804d25..096843e 100644
--- a/asciidoc/settings/macrodef.adoc
+++ b/asciidoc/settings/macrodef.adoc
@@ -15,7 +15,7 @@ A macro is defined by declaring an existing resolver within it. Then you can use
----
-=== Resolvers names
+== Resolvers names
Since you can use the same macro several times it can define several resolvers (in a chain for instance), the resolver names need to be chosen carefully to avoid name conflicts (each resolver must have a unique name).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/terminology.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/terminology.adoc b/asciidoc/terminology.adoc
index 67ccd9b..8c63dc2 100644
--- a/asciidoc/terminology.adoc
+++ b/asciidoc/terminology.adoc
@@ -144,7 +144,7 @@ For more details on configurations and how they are used in ivy, please refer to
Ivy settings files are xml files used to configure ivy to indicate where the modules can be found and how.
-==== __History of settings__
+=== __History of settings__
__Prior to Ivy 2.0, the settings files were called configuration files and usually named ivyconf.xml. This resulted in confusion between module configurations and Ivy configuration files, so they were renamed to settings files. If you happen to fall on an ivyconf file or something called a configuration file, most of the time it's only unupdated information (documentation, tutorial or article). Feel free to report any problem like this if you find such an inconsistency.__
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/use/buildlist.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildlist.adoc b/asciidoc/use/buildlist.adoc
index fa1cb38..cac7187 100644
--- a/asciidoc/use/buildlist.adoc
+++ b/asciidoc/use/buildlist.adoc
@@ -69,10 +69,10 @@ halt the build with a failure.
-=== Parameters specified as nested elements
+== Parameters specified as nested elements
-==== fileset
+=== fileset
FileSets are used to select sets of files to order.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/use/cachefileset.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cachefileset.adoc b/asciidoc/use/cachefileset.adoc
index 3f83669..ab72755 100644
--- a/asciidoc/use/cachefileset.adoc
+++ b/asciidoc/use/cachefileset.adoc
@@ -14,12 +14,12 @@ Built fileset is registered in ant with a given id, and can thus be used like an
refid.
-=== Limitation
+== Limitation
A fileset, in Ant, requires a base directory from within which the files are included/excluded. The cachefileset task, in Ivy, internally tries to determine a common base directory across all the resolved artifacts' files that have been downloaded in the Ivy repository cache(s). Given that Ivy can be configured to consist multiple repository caches and each one can potentially be on a different filesystem root, there are times, when cachefileset cannot determine a common base directory for these resolved artifacts. The cachefileset throws an exception in such cases.
-=== Alternative task
+== Alternative task
If cachefileset doesn't fit the need of your use case (maybe due to the limitations noted above), the link:../use/resources.html[resources] task could be an alternative task to use in certain cases.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/use/configure.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/configure.adoc b/asciidoc/use/configure.adoc
index 772ca1a..2523893 100644
--- a/asciidoc/use/configure.adoc
+++ b/asciidoc/use/configure.adoc
@@ -31,7 +31,7 @@ an error is raised if a settings has already been defined with this id|No, defau
|=======
-=== HTTP Authentication
+== HTTP Authentication
If any of the url you use in ivy (especially in dependency resolvers) need http
authentication, then you have to provide the host, realm, username and passwd
@@ -44,10 +44,10 @@ further call to ivy tasks.
It's also possible to configure authentication settings for multiple urls. This can be done with the <credentials> subelements. See the examples for more details.
-=== Examples
+== Examples
-==== Simplest settings
+=== Simplest settings
[source]
@@ -57,7 +57,7 @@ It's also possible to configure authentication settings for multiple urls. This
Use either ${ivy.settings.file} if it exists, or the link:../samples/ivysettings-default.xml[default settings file]
-==== Configure with a file
+=== Configure with a file
[source]
@@ -66,7 +66,7 @@ Use either ${ivy.settings.file} if it exists, or the link:../samples/ivysettings
----
-==== Configure with an url
+=== Configure with an url
[source]
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/use/deliver.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/deliver.adoc b/asciidoc/use/deliver.adoc
index eb50b55..e988e29 100644
--- a/asciidoc/use/deliver.adoc
+++ b/asciidoc/use/deliver.adoc
@@ -3,7 +3,7 @@ Deliver a resolved descriptor of the current module, and possibly perform a recu
This task does two main things:
-=== Generate a resolved ivy file
+== Generate a resolved ivy file
This task generates a resolved descriptor of the current module, based upon the last resolve done. The resolved ivy file contains updated information about the delivered module, such as revision and status.
@@ -14,7 +14,7 @@ Finally, in the resolved ivy file, dynamic revisions are replaced by the static
*__since 1.3__* The replacement of dynamic revisions by static ones can be turned off, so that dynamic revisions are kept in the ivy file. This is an exception to the recommended standard that published module descriptors be fully resolved, so use it with caution.
-=== do recursive delivery
+== do recursive delivery
This is done only if a deliver target is given to the deliver task.
@@ -64,7 +64,7 @@ Usually the deliver target itself triggers an another ant build (using ant task)
The delivered ivy file will update its dependency revisions with those given here.
-=== deliver and publish
+== deliver and publish
The deliver task is most of the time not called explicitly, but rather called automatically by the link:../use/publish.html[publish] task. So, when shall the deliver task be called explictly? When you actually need to separate what is performed by the deliver task (see above), from what is performed by the publish task, i.e. upload a module to a repository.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/use/resolve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resolve.adoc b/asciidoc/use/resolve.adoc
index 8dea9a0..af20eba 100644
--- a/asciidoc/use/resolve.adoc
+++ b/asciidoc/use/resolve.adoc
@@ -108,14 +108,14 @@ This is the number of artifacts actually downloaded from the repository.
</ul>
-=== Inline mode
+== Inline mode
*__since 1.4__* The inline mode allow to call a resolve without an ivy file, by setting directly the module which should be resolved from the repository. It is particularly useful to install released software, like an ant task for example. When inline is set to true, the organisation module and revision attributes are used to specify which module should be resolved from the repository.
*Remark:* if you want the standard ivy properties to be set or to reuse the results of an inline resolve by other post-resolve tasks like retrieve, cachepath, report, ..., you must set the keep attribute to true!
-=== Resolve mode
+== Resolve mode
*__since 2.0__* The resolve mode allows to define how Ivy should use dependency revision constraints when performing the resolution.
@@ -130,7 +130,7 @@ Two modes are available:
-=== Concurrency
+== Concurrency
During resolve, Ivy creates a file in the link:../settings/caches.html[resolution cache]. The creation of this file is not aimed to support concurrency, meaning that you can't have two concurrent resolve of the same module, in the same resolution cache, with the same resolveId.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/use/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/settings.adoc b/asciidoc/use/settings.adoc
index 5e06db7..9a50c3a 100644
--- a/asciidoc/use/settings.adoc
+++ b/asciidoc/use/settings.adoc
@@ -23,7 +23,7 @@ my.variable.yourid=your.value
----
-=== Attributes
+== Attributes
[options="header",cols="15%,50%,35%"]
@@ -39,7 +39,7 @@ my.variable.yourid=your.value
|=======
-=== HTTP Authentication
+== HTTP Authentication
__Note: HTTP Authentication can be used only if link:http://jakarta.apache.org/commons/httpclient/[commons-httpclient.jar] is in your classpath__
If any of the url you use in ivy (especially in dependency resolvers) need http
@@ -50,7 +50,7 @@ further call to ivy tasks.
-=== Multiple classloader
+== Multiple classloader
A special attention should be applied when you have a multi-project build with __subant__ call, using ivy task loaded by a __typedef__. Indeed in this situation, it is possible to pass settings reference to a subbuild. When you do that, you should take of the classloader. The ivy task of your subant should not be defined in a different classloader than the parent one. This can be achieved by using the __loader__ parameter of the antlib declaration, or avoid to reload the ivy antlib in the subbuild (place the taskdef in a target only executed when the antlib is not yet loaded).
@@ -58,10 +58,10 @@ A special attention should be applied when you have a multi-project build with _
-=== Examples
+== Examples
-==== Simplest settings
+=== Simplest settings
[source]
@@ -73,7 +73,7 @@ Use either ${ivy.settings.file} if it exists, or the link:../samples/ivysettings
This simplest setting is implicit.
-==== Configure with a file
+=== Configure with a file
[source]
@@ -82,7 +82,7 @@ This simplest setting is implicit.
----
-==== Configure with an url
+=== Configure with an url
[source]
@@ -91,7 +91,7 @@ This simplest setting is implicit.
----
-==== Configure multiple realms which require autentication
+=== Configure multiple realms which require autentication
[source]
@@ -105,7 +105,7 @@ This simplest setting is implicit.
----
-==== Configure 2 different settings
+=== Configure 2 different settings
You can use multiple ivy settings during a build. Then every ivy task should specify the settings it uses using the settingsRef attribute.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c73d10e0/asciidoc/yed.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/yed.adoc b/asciidoc/yed.adoc
index 7b2b174..f817016 100644
--- a/asciidoc/yed.adoc
+++ b/asciidoc/yed.adoc
@@ -5,12 +5,12 @@ all the automatic layouts of yFiles. Ivy is able to generate graphs which are re
The graphs generated by ivy are not layed out (in fact it's why we use yEd), so you have to follow a simple sequence of steps to layout the generated graphs.
-=== Preparation
+== Preparation
First you have to generate a graphml file. Simply call the report task (see ivy use documentation) for that.
-=== Step 1: open the graphml file
+== Step 1: open the graphml file
Launch yEd editor, and open the graphml file generated by the report task. You should obtain something like this:
@@ -18,7 +18,7 @@ image::images/yed-step1.jpg[]
-=== Step 2: ask yEd to adjust nodes size
+== Step 2: ask yEd to adjust nodes size
image::images/yed-step2.jpg[]
@@ -27,7 +27,7 @@ image::images/yed-step3-2.jpg[]
-=== Step 3: ask yEd to layout nodes
+== Step 3: ask yEd to layout nodes
image::images/yed-step4.jpg[]
[24/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/dev/makerelease.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/dev/makerelease.adoc b/asciidoc/dev/makerelease.adoc
new file mode 100644
index 0000000..47265ff
--- /dev/null
+++ b/asciidoc/dev/makerelease.adoc
@@ -0,0 +1,318 @@
+
+
+== Making a release
+
+
+=== Requirements
+
+Requirements for making a release are similar to the requirements for building from source, except that JDK 1.6+ and Apache Ant 1.9+ are required.
+
+=== Procedure
+
+
+==== 1. Check the files which needs to be updated for the release.
+
+On the master, check that files which require update for the release are up to date.
+This includes particularly:
+doc/release-notes.html
+
+==== 2. Check out a clean copy of the branch
+
+Run the following git command to checkout the branch, revert any change and remove untracked and ignored files:
+
+[source]
+----
+
+git checkout 2.0.x
+git reset --hard
+git clean -d -x -f
+
+----
+
+
+==== 3. Add Ivy xsd file.
+
+You need to store the current ivy xml schema in the documentation, so that it will later be accessible on public web site. To do so, run the following command in the directory in which you checked out the release branch:
+
+[source]
+----
+
+ant -f build-release.xml release-xsd
+
+----
+
+And commit your changes in the branch:
+
+[source]
+----
+
+git add doc/ivy.xsd
+git commit -m "release the ivy.xsd"
+
+----
+
+
+==== 4. Launch the release script
+
+
+[source]
+----
+
+ant -f build-release.xml release
+
+----
+
+The status should be release only for final releases, and milestone for any other intermediate release.
+If the release script is successful, release artifacts will be waiting for you in the build/distrib directory.
+
+
+==== 5. Verify the release
+
+Check that all zips can be opened correctly, and that running 'ant' after unzipping the source distribution works properly.
+You can also do a smoke test with the generated ivy.jar, to see if it is able to resolve properly a basic module (for instance you can run some tutorials provided in the src/example directory in all distributions).
+
+
+==== 6. Sign the artifacts
+
+It's now time to sign the release artifacts and upload them to a location accessible by other Apache commiters.
+
+Here is a simple way to sign the files using gnupg:
+
+[source]
+----
+
+gpg --armor --output file.zip.asc --detach-sig file.zip
+
+----
+
+Here is a ruby script you can use to sign the files:
+
+[source]
+----
+
+require 'find'
+
+Find.find('build/distrib') do |f|
+ `gpg --armor --output #{f}.asc --detach-sig #{f}` if File.file?(f) && ['.zip', '.gz', '.jar', '.pom'].include?(File.extname(f))
+end
+
+----
+
+Be prepared to enter your passphrase several times if you use this script, gpg will ask for your passphrase for each file to sign.
+
+
+==== 7. Prepare the Eclipse update site
+
+
+To be able to test the release within IvyDE, it can be deployed in the IvyDE update site. See link:http://ant.apache.org/ivy/ivyde/history/trunk/dev/updatesite.html[that page] to know how to process.
+
+
+==== 8. Publish the release candidate
+
+
+All artifacts in `build/distrib/dist` needs to be published on the 'dist' svn of the ASF, in the *dev* part.
+
+The following command lines should do the job:
+
+[source]
+----
+
+svn checkout -N https://dist.apache.org/repos/dist/dev/ant/ivy build/distrib/dist
+svn add build/distrib/dist/*
+svn commit build/distrib/dist -m 'Ivy 2.4.0 distribution'
+
+----
+
+
+==== 9. Publish the Maven artifact to Nexus
+
+
+Having your GPG key ID, its password, your apache ID and the associated password, just launch ant and enter the information as required:
+
+[source]
+----
+
+ant -f build-release.xml upload-nexus
+
+----
+
+Once uploaded, log in https://repository.apache.org/ with your prefered web browser (use your Apache ID).
+
+You should find there an __open__ repository with the name of the form `orgapacheant-XXXX`. It should contain the Maven artifacts: the pom, the jar, the sources, the javadocs and the md5 and asc files.
+
+Now __close__ the staging repository, with the description "Ivy 2.0.0-beta1". Closing means you finished the upload and some automatic checks will run. You can see them in the __Activity__ tab of the repository.
+
+Once the checks passed, you can find in the __Summary__ the URL of the staging repository. It will something like: https://repository.apache.org/content/repositories/orgapacheant-XXXX/
+
+
+==== 10. Create a signed tag
+
+As soon as you are happy with the artifacts to be released, it is time to tag the release
+
+[source]
+----
+
+git tag -s 2.0.0-beta1 -m 'Release Ivy 2.0.0-beta1'
+
+----
+
+And push the changes to the ASF repo
+
+[source]
+----
+
+git push --tags
+
+----
+
+
+==== 11. Call for a vote to approve the release
+
+Cast a vote to approve the release on the dev@ant.apache.org mailing list.
+
+Here is an example:
+
+[source]
+----
+
+Subject: [VOTE] Ivy ${version} Release
+
+I have built a release candidate for Ivy ${version}
+
+The svn tag of this release is: https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=tag;h=refs/tags/2.0.0-beta1
+
+The artifacts has been published to: https://dist.apache.org/repos/dist/dev/ant/ivy/$VERSION at revision ${svn-rev-of-the-check-in}
+
+The staging maven repository is availble there: https://repository.apache.org/content/repositories/orgapacheant-XXXX
+
+The Eclipse updatesite has been build there: https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivy-2.0.0.beta1_20141213170938/
+
+Do you vote for the release of these binaries?
+
+[ ] Yes
+[ ] No
+
+Regards,
+
+${me}, Ivy ${version} release manager
+
+----
+
+
+==== 12. Publish the release
+
+
+If the release is approved, it's now time to make it public. The artifacts in the __dev__ part needs to be moved into the __release__ one:
+
+[source]
+----
+
+$ svn mv https://dist.apache.org/repos/dist/dev/ant/ivy/$VERSION https://dist.apache.org/repos/dist/release/ant/ivy/$VERSION
+
+----
+
+In order to keep the main dist area of a reasonable size, old releases should be removed. They will disapear from the main dist but will still be available via the link:http://archive.apache.org/dist/ant/ivy/[archive]. To do so, just use the `svn rm` command against the artifacts or folders to remove.
+
+
+==== 13. Promote the Maven staging repository
+
+
+Go log in https://repository.apache.org/ with your prefered web browser (use your Apache ID).
+
+Select the appropriate `orgapacheant-XXXX` repository and select the __Release__ action.
+
+
+==== 14. Update the web site
+
+
+It's time to update the download image used on the home page and the download page. Use site/images/ivy-dl.xcf as a basis if you have link:http://www.gimp.org/[gimp] installed. Then you can update the home page to refer to this image, and add a news item announcing the new version. Update also the download page with the new image and update the links to the download location (using a search/replace on the html source is recommended for this).
+
+The just release documentation should be added to the site. To do so, you need to:
+
+
+. edit the toc.json file in the site component of Ivy +
+and add a piece of json with a title and an url; note that the version in the url must be the same as the tag in the git repo.
+
+[source]
+----
+
+{
+ "title":"2.0.0-beta1",
+ "url":"http://ant.apache.org/ivy/history/2.0.0-beta1/index.html"
+}
+
+----
+
+
+. generate the part of the site for the new version: +
+
+[source]
+----
+
+ant checkout-history -Dhistory.version=2.0.0-beta1
+ant generate-history -Dhistory.version=2.0.0-beta1
+
+----
+
+
+. if the 'latest-milestone' needs to be update too, run: +
+
+[source]
+----
+
+ant checkout-history -Dhistory.version=2.0.0-beta1 -Dtarget.history.folder=latest-milestone
+
+----
+
+
+
+Now let's generate the website with the new toc:
+
+[source]
+----
+
+ant /all generate-site
+
+----
+
+You should verify that the site generated in the production directory is OK. You can open the files with your prefered web browser like it was deployed.
+
+And once your happy with it, commit the changes in the source directory, and in the production directoy to get it actually deployed via svnpubsub.
+
+Tip: lot's of files might need to be 'added' to svn. An handy command to `add` any file which is not yet under version control is the following one:
+
+[source]
+----
+svn add --force sources
+----
+
+
+==== 15. Deploy the Eclipse updatesite
+
+
+If the Eclipse update site has already been prepared to include that new Ivy release, it is now needed to be deployed. Then follow the deployment instruction on link:http://ant.apache.org/ivy/ivyde/history/trunk/dev/updatesite.html[that page].
+
+
+==== 16. Announce
+
+Announce the release on the dev@ant.a.o, ivy-user@ant.a.o, user@ant.apache.org and announce@apache.org mailing lists.
+You can also announce the release on popular web sites, like freshmeat.net (xavier is the owner of the Ivy project on freshmeat), javalobby.org, theserverside.com, dzone.com, ...
+
+
+==== 17. Update this doc
+
+If you feel like anything is missing or misleading in this release doc, update it as soon as you encounter the problem.
+
+
+==== 18. Merge your modifications back to the master if necessary.
+
+Modifications on the template files do not need to be merged, but if you had troubles during your release you may want to merge your fixes back to the trunk.
+
+
+==== 19. Prepare next release
+
+In the master branch, update the file version.properties with the version of the next release so that anyone building from the trunk will obtain jar with the correct version number.
+
+If the version just release is a final one (not an alpha, beta or rc), the list of changes should be emptied in doc/release-notes.html, and update there the next expected version. The announcement in the file should also be changed accordingly to the next expected version.
+
+Release the version in link:https://issues.apache.org/jira/browse/IVY[jira], and create a new unreleased version for the next planned version.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/extend.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/extend.adoc b/asciidoc/extend.adoc
new file mode 100644
index 0000000..9213eb5
--- /dev/null
+++ b/asciidoc/extend.adoc
@@ -0,0 +1,35 @@
+
+Many things are configurable in Ivy, and many things are available with Ivy core. But when you want to do something not built in ivy core, you can still plug your own code.
+
+Many things are pluggable in Ivy:
+
+
+* module descriptor parsers +
+
+* dependency resolvers +
+
+* lock strategies +
+
+* latest strategies +
+
+* circular dependency strategies +
+
+* conflict managers +
+
+* report outputters +
+
+* version matchers +
+
+* triggers +
+
+
+Before trying to implement your own, we encourage you to check if the solution to your problem cannot be addressed by existing features, or by contributed ones. Do not hesitate to ask for help on the mailing-lists.
+
+If you still don't find what you need, then you'll have to develop your own plugin or find someone who could do that for you.
+
+All ivy plug-ins use the same code patterns as ant specific tasks for parameters. This means that if you want to have a "myattribute" of type String, you just have to declare a method called setMyattribute(String val) on your plug-in. The same applies to child tags, you just have to follow Ant specifications.
+
+All pluggable code in Ivy is located in the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=tree;f=src/java/org/apache/ivy/plugins[org.apache.ivy.plugins] package. In each package you will find an interface that you must implement to provide a new plugin. We usually also provide an abstract class easing the implementation and making your code more independent of interface changes. We heavily recommend using these abstract classes as a base class.
+
+To understand how your implementation can be done, we suggest looking at existing implementations we provide, it's the best way to get started.
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ant-project-logo.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/ant-project-logo.gif b/asciidoc/images/ant-project-logo.gif
new file mode 100644
index 0000000..de57d34
Binary files /dev/null and b/asciidoc/images/ant-project-logo.gif differ
[23/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ant-project-logo.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/ant-project-logo.svg b/asciidoc/images/ant-project-logo.svg
new file mode 100644
index 0000000..3f876c3
--- /dev/null
+++ b/asciidoc/images/ant-project-logo.svg
@@ -0,0 +1,951 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 697.32 518.74" xml:space="preserve" viewBox="0 0 680.49139 191.48885" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(.77474 .076835)">
+ <g stroke="#010101">
+ <path d="m679.14 164.41c-50.58-12.83-278.12-31.26-340.63-44.1-154.18-31.203-207.09-48.383-338.51-110.78 8.242 13.5 38.485 27.738 51.058 37.347 19.865 10.676 50.899 22.75 68.428 28.635 67.796 22.739 138.83 44.402 211.58 56.294 90.439 14.816 293.15 25.048 348.07 32.605z" stroke-width=".59560" fill="#010101"/>
+ <linearGradient id="bq" y2="3507.4" gradientUnits="userSpaceOnUse" x2="-3432.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3621.6" x1="-3428.2">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m484.63 188.6-5.271-1.703-4.654-2.01-4.189-2.167-3.721-2.334-3.572-2.471-3.106-2.631-2.953-2.634-2.784-2.943-2.801-2.955-2.642-3.091-2.784-3.259-2.945-3.248-2.953-3.418-3.259-3.409-3.731-3.409-3.873-3.564-2.481-0.306-2.789-0.156-2.79-0.309-2.795-0.316-2.787-0.3-2.79-0.312-2.476-0.153-2.331-0.145 2.79 0.92 3.106 2.03 3.567 3.093 3.881 3.874 4.192 4.65 4.498 4.955 4.654 5.134 4.973 5.102 5.271 4.965 5.284 4.641 5.587 4.029 5.588 3.101 5.74 2.325 5.737 0.923 5.742-0.475 5.888-2.014-0.021-0.01z" stroke-width="0.254" fill="url(#bq)"/>
+ <linearGradient id="bf" y2="3488.6" gradientUnits="userSpaceOnUse" x2="-3471.3" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3582.5" x1="-3467.7">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m503.91 187.82h-3.111l-3.26-0.767-3.411-1.4-3.42-2.009-3.409-2.477-3.586-2.942-3.401-3.259-3.418-3.417-3.259-3.565-3.104-3.718-2.953-3.56-2.792-3.564-2.331-3.259-2.173-3.099-1.703-2.64-1.402-2.167-1.861-0.158h-1.862l-1.861-0.147-1.861-0.153-1.856-0.147-1.711-0.313-1.867-0.15-1.706-0.15-1.7-0.166-1.701-0.143-1.706-0.316-1.716-0.15-1.698-0.15-1.553-0.158h-1.714l-1.543-0.147 4.029 3.57 3.881 3.865 3.887 4.182 3.873 4.185 3.729 4.18 3.884 4.345 3.876 4.029 4.192 3.718 4.188 3.56 4.648 3.101 4.661 2.642 5.124 2.162 5.576 1.397 5.894 0.606 6.354-0.152 6.837-1.097 0.016-0.002z" stroke-width="0.254" fill="url(#bf)"/>
+ <linearGradient id="au" y2="3512.3" gradientUnits="userSpaceOnUse" x2="-3508.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3612.3" x1="-3504.6">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m516.58 187.95-2.953-2.021-2.632-2.32-2.642-2.325-2.635-2.315-2.336-2.483-2.479-2.634-2.322-2.629-2.318-2.637-2.183-2.801-2.334-2.62-2.167-2.793-2.328-2.629-2.323-2.789-2.334-2.484-2.32-2.634-2.496-2.481h-5.73l-2.48-0.287-2.477-0.316-2.479-0.309-2.486-0.309-2.483-0.158-2.637 0.008 4.351 6.511 4.188 5.734 4.039 5.263 3.879 4.81 3.723 4.023 3.57 3.729 3.572 3.099 3.573 2.629 3.575 2.325 3.406 1.706 3.415 1.393 3.572 0.772 3.568 0.616 3.567 0.146 3.72-0.304 3.882-0.469-0.026-0.017z" stroke-width="0.254" fill="url(#au)"/>
+ <linearGradient id="aj" y2="3491.3" gradientUnits="userSpaceOnUse" x2="-3541.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3585.3" x1="-3538.1">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m530.08 187.31-2.948-2.156-2.786-2.173-2.646-2.328-2.479-2.326-2.48-2.31-2.173-2.341-2.176-2.471-2.175-2.323-2.012-2.481-1.869-2.479-2.025-2.476-1.861-2.486-1.859-2.466-1.854-2.491-2.02-2.474-1.869-2.479-16.599-1.545 2.484 2.483 2.789 2.948 2.953 3.406 3.111 3.871 3.262 3.876 3.254 4.039 3.583 4.024 3.404 3.878 3.578 3.716 3.567 3.095 3.567 2.79 3.417 2.025 3.412 1.381 3.267 0.473 3.249-0.62 2.947-1.566-0.013-0.014z" stroke-width="0.254" fill="url(#aj)"/>
+ <linearGradient id="y" y2="3510.3" gradientUnits="userSpaceOnUse" x2="-3583.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3606.7" x1="-3579.6">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m557.56 183.74-2.173-0.152-2.48-0.306-2.486-0.612-2.79-0.928-2.79-1.089-2.945-1.242-3.111-1.703-3.103-1.856-3.109-2.173-3.256-2.471-3.106-2.792-3.105-2.942-3.26-3.259-2.953-3.729-2.945-3.871-2.95-4.187-2.64-0.148-2.021-0.147-1.397 0.003-1.393-0.158-1.395-0.158-1.559-0.15-2.167-0.15-2.787-0.467 3.259 4.501 3.262 4.651 3.417 4.638 3.414 4.493 3.578 4.174 3.404 4.2 3.739 3.567 3.72 3.409 3.89 2.779 3.868 2.181 4.028 1.39 4.183 0.775h4.351l4.495-0.938 4.49-2.025 4.812-3.106h0.011z" stroke-width="0.254" fill="url(#y)"/>
+ <linearGradient id="n" y2="3494" gradientUnits="userSpaceOnUse" x2="-3612.3" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3588" x1="-3608.7">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m568.25 181.23-3.731-1.863-3.567-2.168-3.564-2.317-3.415-2.474-3.108-2.489-3.096-2.637-2.961-2.457-2.623-2.489-2.336-2.32-2.173-2.173-1.709-1.858-1.548-1.559-1.244-1.239-0.775-0.77-0.309-0.316-0.772-0.147-1.706-0.158-2.323-0.143-2.795-0.312-3.264-0.152-3.251-0.312-3.417-0.301-3.106-0.158 2.79 4.029 2.953 3.881 2.958 3.718 3.101 3.415 3.254 3.256 3.412 2.942 3.42 2.637 3.726 2.318 3.726 2.164 3.881 1.712 4.182 1.395 4.195 0.918 4.493 0.614 4.653 0.316 4.802-0.324 4.973-0.623-3.726-1.556z" stroke-width="0.254" fill="url(#n)"/>
+ <linearGradient id="c" y2="3519.2" gradientUnits="userSpaceOnUse" x2="-3648.3" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3600.6" x1="-3645.4">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m589.5 183.1-2.175-1.234-2.795-1.703-3.099-2.184-3.425-2.325-3.567-2.637-3.718-2.795-3.729-2.784-3.57-2.618-3.425-2.643-3.09-2.483-2.643-2.165-2.175-1.703-1.543-1.403-0.625-0.765v-0.311l-1.711-0.306-2.009-0.158-2.484-0.166-2.483-0.299h-2.633l-2.476-0.145-2.325-0.161h-1.867l2.637 3.104 2.795 3.108 3.104 3.102 3.265 3.253 3.42 3.102 3.569 2.942 3.718 2.795 3.724 2.626 4.042 2.471 4.031 2.012 4.026 1.719 4.189 1.382 4.185 0.772 4.185 0.459 4.042-0.309 4.185-0.775-1.55-0.775z" stroke-width="0.254" fill="url(#c)"/>
+ <linearGradient id="b" y2="3496.9" gradientUnits="userSpaceOnUse" x2="-3685.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3590.8" x1="-3681.9">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m612.11 183.7-2.795-1.558-2.637-1.696-2.798-1.708-2.786-1.706-2.637-1.854-2.787-1.861-2.632-1.867-2.795-2.009-2.645-1.856-2.784-1.861-2.647-2.015-2.79-1.849-2.629-1.722-2.805-1.846-2.787-1.709-2.784-1.697-2.643-0.153-2.476-0.163-2.486-0.158-2.486-0.29-2.315-0.169-2.325-0.147-2.181-0.143-2.018-0.155 0.78 0.619 1.712 1.548 2.631 2.323 3.57 2.787 4.045 3.417 4.646 3.56 4.968 3.71 5.276 3.723 5.284 3.404 5.432 3.113 5.109 2.613 4.971 1.864 4.495 1.078 4.032-0.002 3.267-1.087 2.476-2.473-0.026-0.005z" stroke-width="0.254" fill="url(#b)"/>
+ <linearGradient id="a" y2="3562.4" gradientUnits="userSpaceOnUse" x2="-3715.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3606.1" x1="-3714.9">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m627.66 183.99-2.953-0.62-3.259-1.086-3.412-1.551-3.409-1.851-3.573-2.173-3.414-2.164-3.412-2.477-3.262-2.476-3.262-2.483-2.789-2.311-2.645-2.339-2.329-2.02-1.855-1.7-1.4-1.247-0.928-0.929-0.312-0.467-0.47-0.145-1.244-0.158-1.856-0.155-2.325-0.15-2.635-0.15-2.631 0.002-2.945-0.158-2.645-0.158 6.212 3.876 5.585 3.718 5.123 3.57 4.81 3.249 4.34 2.953 3.884 2.784 3.57 2.479 3.411 2.167 3.111 1.861 2.945 1.551 2.79 1.073 2.632 0.788 2.646 0.446 2.632-0.15 2.629-0.467 2.64-0.931 0.005-0.001z" stroke-width="0.254" fill="url(#a)"/>
+ <linearGradient id="ca" y2="3536.2" gradientUnits="userSpaceOnUse" x2="-3739.1" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3631.3" x1="-3753.7">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m638.96 182.28-2.481-0.611-2.483-0.783-2.323-1.076-2.488-1.252-2.16-1.39-2.339-1.543-2.162-1.703-2.17-1.714-2.181-1.856-2.17-1.856-2.012-1.861-2.02-2.015-2.02-1.863-1.856-1.709-2.027-1.701-1.859-1.703-2.481-0.155-2.47-0.298-2.337-0.147-2.167-0.169-2.328-0.301-2.315-0.147-2.333-0.164-2.484-0.152 0.939 0.938 1.55 1.382 2.004 2.02 2.647 2.32 2.948 2.795 3.411 2.79 3.729 2.945 3.879 2.786 4.034 2.795 4.351 2.463 4.182 2.018 4.343 1.55 4.182 1.084 4.045 0.293 3.879-0.617 3.56-1.393h-0.017z" stroke-width="0.254" fill="url(#ca)"/>
+ <linearGradient id="bz" y2="3563.4" gradientUnits="userSpaceOnUse" x2="-3772.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3607.2" x1="-3772.1">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m649.98 177.78-2.649-0.312-2.471-0.608-2.477-0.625-2.333-0.765-2.32-1.087-2.176-1.083-2.024-1.247-2.01-1.239-1.7-1.546-1.717-1.55-1.545-1.551-1.4-1.708-1.097-1.712-1.094-1.851-0.778-1.867-2.479-0.145-2.64-0.301-2.48-0.158-2.326-0.301-2.167-0.158-2.015-0.152-1.861-0.307-1.709-0.168 2.793 2.494 2.792 2.629 2.792 2.792 2.945 2.626 2.953 2.632 2.953 2.483 3.101 2.474 2.953 2.02 3.099 1.854 3.101 1.39 3.104 0.938 3.111 0.612 3.106-0.158 3.105-0.623 3.091-1.399 3.098-2.168-2.629-0.155z" stroke-width="0.254" fill="url(#bz)"/>
+ <linearGradient id="by" y2="3527.3" gradientUnits="userSpaceOnUse" x2="-3796.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3622.5" x1="-3811.3">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m662.69 174.98-2.173-0.47-2.006-0.617-1.87-0.611-1.848-0.622-1.706-0.768-1.709-0.772-1.542-0.775-1.405-0.923-1.39-1.097-1.411-0.926-1.242-1.236-1.239-1.245-1.239-1.395-1.244-1.553-1.097-1.562-2.64-0.145-2.325-0.158-2.176-0.15-2.004-0.153-2.024-0.155-2.015-0.309-1.861-0.15-1.864-0.16 0.934 2.642 1.397 2.637 1.861 2.315 2.17 2.178 2.486 2.004 2.634 1.706 2.951 1.558 3.111 1.393 3.253 0.926 3.26 0.931 3.411 0.464 3.104 0.153 3.268-0.006 2.939-0.464 2.792-0.78 2.643-1.076-2.184-0.629z" stroke-width="0.254" fill="url(#by)"/>
+ <linearGradient id="bx" y2="3564.4" gradientUnits="userSpaceOnUse" x2="-3823.4" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3608.1" x1="-3822.6">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m667.97 172.49-3.724-1.543-3.733-2.02-3.713-2.01-3.108-2.02-2.333-1.708-1.385-1.237v-0.619l-1.089 0.003-1.086-0.003-1.245-0.147-1.392-0.158-1.39-0.153-1.551-0.155-1.247-0.146-1.387-0.169 1.239 2.021 1.399 1.861 1.854 1.858 2.175 1.701 2.176 1.559 2.479 1.384 2.486 1.242 2.483 1.094 2.476 0.771 2.484 0.777 2.32 0.456 2.173 0.153h1.861l1.7-0.316 1.405-0.617 0.934-0.926-3.261-0.933z" stroke-width="0.254" fill="url(#bx)"/>
+ <linearGradient id="bw" y2="3564.6" gradientUnits="userSpaceOnUse" x2="-3837.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3608.4" x1="-3836.4">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m675.73 169.06-1.556-0.464-1.866-0.775-2.012-0.765-2.168-1.089-2.024-0.931-1.854-0.928-1.566-0.781-0.929-0.616-12.092-1.379 0.155 0.308 0.773 0.617 1.244 0.926 1.7 1.242 1.867 1.407 2.328 1.543 2.326 1.542 2.483 1.4 2.483 1.242 2.323 0.926 2.323 0.777 2.02 0.306 1.703-0.309 1.234-0.63 0.777-1.393 0.316-2.17 0.012-0.006z" stroke-width="0.254" fill="url(#bw)"/>
+ <linearGradient id="bv" y2="3550.8" gradientUnits="userSpaceOnUse" x2="-3852" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3578.8" x1="-3851.6">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m663.92 163.65 2.637 1.395 2.953 1.548 2.789 1.408 2.793 0.767 2.175-0.005 1.39-1.395 0.472-2.956-2.336-0.459-2.017-0.311-2.012-0.148-1.864-0.16-2.018-0.15-2.17-0.147-2.323-0.158-2.639-0.158 2.17 0.929z" stroke-width="0.254" fill="url(#bv)"/>
+ <linearGradient id="bu" y2="3564.9" gradientUnits="userSpaceOnUse" x2="-3852.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3608.6" x1="-3851.9">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m662.21 161.18 2.022-0.628 2.635-0.928 3.104-0.783 3.103-0.609 2.943 0.135 2.175 0.777 1.397 2.173-0.152 3.417-2.331-0.622-2.173-0.469-1.859-0.467-1.855-0.462-2.025-0.306-2.012-0.459-2.323-0.309-2.645-0.456-0.004-0.004z" stroke-width="0.254" fill="url(#bu)"/>
+ <linearGradient id="bt" y2="3725.2" gradientUnits="userSpaceOnUse" x2="-3477.1" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3591.5" x1="-3436.6">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m500.88 98.168-3.562-0.617-3.873 0.158-3.879 0.934-3.876 1.561-4.037 2.012-3.876 2.492-3.86 2.784-3.886 3.101-3.565 3.267-3.56 3.418-3.262 3.414-2.945 3.412-2.787 3.111-2.333 3.101-2.004 2.647-1.548 2.162-1.867-0.312-2.017-0.15-1.851-0.3-1.867-0.161-1.709-0.153-1.854-0.303-1.866-0.166-1.709-0.143-1.706-0.158-1.861-0.147-1.703-0.153-1.714-0.158-1.551-0.309-1.706-0.158-1.703-0.155-1.556-0.29 4.49-3.272 4.346-3.572 4.335-3.729 4.337-3.876 4.351-4.034 4.479-3.884 4.493-3.721 4.654-3.423 4.807-2.953 4.97-2.639 5.113-1.859 5.584-1.255 5.737-0.306 6.038 0.459 6.526 1.695 6.821 2.639 0.012-0.011z" stroke-width="0.254" fill="url(#bt)"/>
+ <linearGradient id="bs" y2="3761.1" gradientUnits="userSpaceOnUse" x2="-3569.1" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3655" x1="-3496.2">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m512.49 100.8-3.259 1.408-3.104 1.703-3.106 1.714-2.942 2.018-2.787 2.325-2.637 2.334-2.787 2.32-2.637 2.48-2.634 2.64-2.483 2.642-2.629 2.632-2.629 2.626-2.479 2.647-2.792 2.647-2.632 2.483-2.79 2.32-3.098-0.475-2.645-0.453-2.32-0.312-2.176-0.306-2.162-0.312-2.333-0.158-2.474-0.287-2.795-0.158 5.121-6.359 4.801-5.743 4.496-5.126 4.487-4.495 4.185-3.89 4.026-3.251 3.887-2.8 3.87-2.176 3.724-1.711 3.564-1.086 3.721-0.778 3.557-0.313 3.736 0.313 3.557 0.617 3.729 0.918 3.887 1.395-0.018 0.007z" stroke-width="0.254" fill="url(#bs)"/>
+ <linearGradient id="br" y2="3705.2" gradientUnits="userSpaceOnUse" x2="-3543.1" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3571.6" x1="-3502.6">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m525.54 104.21-3.415 1.402-3.256 1.551-3.104 1.711-2.948 2.012-2.786 2.021-2.64 2.178-2.479 2.32-2.484 2.325-2.167 2.331-2.32 2.489-2.162 2.637-2.175 2.479-2.157 2.479-2.02 2.483-2.17 2.489-2.17 2.481-16.912-2.01 2.792-2.322 2.953-2.801 3.404-3.259 3.403-3.562 3.727-3.878 3.873-3.734 4.021-3.73 4.034-3.567 4.034-3.259 4.029-2.79 3.871-2.173 3.881-1.556 3.56-0.77 3.564 0.301 3.272 1.239 2.945 2.479v0.004z" stroke-width="0.254" fill="url(#br)"/>
+ <linearGradient id="bp" y2="3722.2" gradientUnits="userSpaceOnUse" x2="-3625.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3616.1" x1="-3552.9">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m550.98 115.03-2.479 0.011h-2.629l-2.645 0.3-2.624 0.319-2.789 0.617-2.948 0.777-2.787 0.929-2.947 1.252-3.111 1.548-2.948 1.867-3.104 2.178-3.245 2.476-3.104 2.951-3.254 3.417-3.104 3.723-3.251 4.188-2.803-0.454-2.312-0.316-2.022-0.3-1.854-0.312-1.867-0.306-2.017-0.158-2.474-0.143-2.953-0.163 3.724-4.493 3.718-4.501 3.712-4.501 3.876-4.188 3.724-4.034 4.034-3.733 3.865-3.256 4.028-2.787 4.032-2.02 4.185-1.562 4.187-0.622 4.34 0.153 4.346 1.239 4.343 2.164 4.501 3.246 4.648 4.504 0.008-0.01z" stroke-width="0.254" fill="url(#bp)"/>
+ <linearGradient id="bo" y2="3683" gradientUnits="userSpaceOnUse" x2="-3616.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3549.3" x1="-3576">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m569.13 119.21-4.346 0.931-4.187 1.408-4.021 1.553-3.728 1.719-3.718 2.004-3.418 2.025-3.101 2.167-2.947 2.02-2.632 2.181-2.328 2.01-2.004 1.716-1.714 1.701-1.39 1.405-1.089 1.081-0.778 0.622-0.306 0.306-0.772 0.006-2.02-0.147-2.629-0.327-3.409-0.459-3.731-0.464-3.73-0.464-3.721-0.451-3.251-0.467 3.251-4.034 3.265-3.733 3.401-3.409 3.572-3.109 3.558-2.792 3.876-2.483 3.72-2.176 4.029-1.698 4.034-1.402 4.192-0.934 4.337-0.627 4.501-0.006 4.49 0.312 4.807 0.765 4.808 1.392 5.133 1.872-0.004-0.014z" stroke-width="0.254" fill="url(#bo)"/>
+ <linearGradient id="bn" y2="3682.4" gradientUnits="userSpaceOnUse" x2="-3683.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3576.3" x1="-3610.9">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m592.09 121.98-2.007 0.467-2.494 0.777-3.085 1.248-3.428 1.565-3.71 1.852-4.042 2.009-4.032 2.181-3.867 2.186-3.874 2.154-3.72 2.178-3.262 2.025-2.79 1.698-2.325 1.563-1.54 1.084-0.772 0.774-0.006 0.312h-1.708l-2.32-0.147-2.64-0.312-2.953-0.303-2.948-0.314-2.792-0.303-2.476-0.304-2.007-0.152 2.942-2.953 3.246-2.948 3.567-2.945 3.573-2.803 4.026-2.639 4.028-2.64 4.185-2.173 4.182-2.015 4.501-1.714 4.34-1.397 4.488-0.928 4.501-0.478 4.345-0.003 4.488 0.465 4.192 1.244 4.187 1.692 0.007-0.003z" stroke-width="0.254" fill="url(#bn)"/>
+ <linearGradient id="bm" y2="3659.3" gradientUnits="userSpaceOnUse" x2="-3694.6" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3525.6" x1="-3654.1">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m613.8 126.44-2.95 1.081-2.945 1.258-2.945 1.236-2.79 1.408-2.786 1.244-2.953 1.388-2.785 1.55-2.789 1.416-2.787 1.548-2.95 1.553-2.785 1.554-2.795 1.402-2.787 1.556-2.95 1.545-2.787 1.411-2.953 1.399-2.789-0.466-2.787-0.467-2.953-0.296-2.942-0.316-2.793-0.155-2.645-0.298-2.471-0.312-2.173-0.469 0.932-0.473 2.006-1.39 2.953-1.855 3.863-2.489 4.653-2.948 5.123-2.953 5.424-3.105 5.894-2.948 5.732-2.64 5.89-2.333 5.585-1.709 5.12-1.083h4.646l4.034 0.759 3.259 2.018 2.175 3.409 0.001-0.03z" stroke-width="0.254" fill="url(#bm)"/>
+ <linearGradient id="bl" y2="3562.9" gradientUnits="userSpaceOnUse" x2="-3744.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3606.7" x1="-3743.9">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m639.08 133.74h-2.486l-2.489 0.47-2.624 0.767-2.484 0.936-2.642 1.239-2.621 1.244-2.486 1.556-2.479 1.556-2.477 1.712-2.483 1.705-2.479 1.704-2.325 1.55-2.326 1.701-2.17 1.41-2.175 1.387-2.471-0.3-2.334-0.316-2.007-0.312-2.17-0.147-2.03-0.147-2.004-0.309-2.325-0.314-2.479-0.3 0.928-0.781 1.698-1.239 2.326-1.861 2.944-2.022 3.257-2.17 3.721-2.483 4.182-2.331 4.192-2.325 4.485-2.025 4.495-1.703 4.648-1.413 4.509-0.765 4.335-0.003 4.034 0.602 3.871 1.405 3.417 2.471-2.476-0.149z" stroke-width="0.254" fill="url(#bl)"/>
+ <linearGradient id="bk" y2="3541" gradientUnits="userSpaceOnUse" x2="-3707.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3636.1" x1="-3722.4">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m631.33 129.41-3.721 0.003-3.726 0.451-3.876 0.791-3.884 1.233-3.876 1.556-3.868 1.72-3.57 2.014-3.562 2.015-3.251 2.022-2.953 2.025-2.789 1.858-2.323 1.709-1.858 1.392-1.396 1.256-1.094 0.765-0.306 0.321-0.617 0.143-1.403-0.143-1.851-0.316-2.481-0.316-2.797-0.451-2.787-0.316-2.793-0.298-2.483-0.16 6.676-3.109 6.036-3.101 5.579-2.8 5.123-2.635 4.646-2.486 4.335-2.331 3.882-1.858 3.73-1.717 3.394-1.244 3.27-1.092 2.948-0.617 2.789-0.152 2.787 0.3 2.642 0.623 2.787 1.239 2.643 1.711v-0.005z" stroke-width="0.254" fill="url(#bk)"/>
+ <linearGradient id="bj" y2="3532.6" gradientUnits="userSpaceOnUse" x2="-3762.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3627.8" x1="-3777.1">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m653.98 141.79-2.789-0.316-2.632-0.292-2.642-0.003-2.635 0.147-2.476 0.316-2.352 0.456-2.315 0.625-2.17 0.771-2.015 0.931-2.024 1.094-1.695 1.097-1.551 1.393-1.556 1.551-1.234 1.708-1.091 1.714-0.929 2.01-2.645-0.301-2.632-0.316-2.795-0.298-2.628-0.319-2.481-0.295-2.326-0.465-2.017-0.155-1.859-0.309 3.254-2.009 3.259-2.342 3.252-2.325 3.414-2.168 3.415-2.183 3.409-2.173 3.262-1.698 3.401-1.708 3.256-1.103 3.417-0.777 3.257-0.304 3.108 0.146 3.101 0.931 2.951 1.545 2.942 2.325 2.797 3.101h-0.006z" stroke-width="0.254" fill="url(#bj)"/>
+ <linearGradient id="bi" y2="3524.4" gradientUnits="userSpaceOnUse" x2="-3815.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3619.6" x1="-3830.5">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m673.07 152-3.884-0.145-3.876 0.625-4.031 1.086-3.567 1.255-3.101 1.387-2.643 1.245-1.545 0.934-0.617 0.316h-1.236l-1.247-0.169-1.548-0.147-1.711-0.301-1.701-0.312-1.698-0.306-1.389-0.312 1.542-1.866 1.711-1.709 2.162-1.55 2.331-1.245 2.471-1.092 2.64-0.925 2.795-0.631 2.631-0.461 2.79-0.15 2.481-0.005 2.48 0.147 2.168 0.464 1.861 0.622 1.709 0.923 1.239 1.084 0.782 1.242v-0.004z" stroke-width="0.254" fill="url(#bi)"/>
+ <linearGradient id="bh" y2="3564.7" gradientUnits="userSpaceOnUse" x2="-3838.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3608.4" x1="-3837.6">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m675.09 158.06-2.02 0.005-2.167 0.301-2.17 0.464-2.165 0.617-1.859 0.62-1.7 0.472-1.095 0.453-12.411-2.159 0.316-0.146 0.773-0.614 1.553-0.625 1.861-0.928 2.165-0.934 2.483-0.931 2.634-0.936 2.632-0.931 2.787-0.62 2.483-0.312 2.326-0.163 2.015 0.316 1.7 0.77 1.097 1.245 0.614 1.866-0.142 2.466-1.71-0.296z" stroke-width="0.254" fill="url(#bh)"/>
+ <linearGradient id="bg" y2="3564" gradientUnits="userSpaceOnUse" x2="-3802.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3607.7" x1="-3802">
+ <stop stop-color="#F6EE61" offset="0"/>
+ <stop stop-color="#F6D65D" offset=".186"/>
+ <stop stop-color="#F4C35B" offset=".3825"/>
+ <stop stop-color="#F3BC5A" offset=".5198"/>
+ <stop stop-color="#F5DA5D" offset=".7809"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m666.55 147.98-1.864-0.303-2.02-0.155-2.01 0.005-2.012 0.15-2.02 0.161-1.864 0.311-2.012 0.47-1.861 0.622-1.856 0.611-1.717 0.781-1.703 0.928-1.548 0.934-1.39 1.092-1.241 1.083-1.087 1.247-0.933 1.38-2.637-0.293-2.489-0.464-2.326-0.148-2.164-0.316-2.17-0.311-2.025-0.146-1.851-0.313-2.022-0.158 1.395-2.787 1.703-2.483 2.17-2.168 2.629-1.866 2.792-1.551 2.951-1.242 3.256-1.097 3.257-0.627 3.406-0.293 3.417-0.003 3.254 0.443 3.265 0.619 3.259 0.937 2.953 1.387 2.637 1.551 2.478 2.012z" stroke-width="0.254" fill="url(#bg)"/>
+ <linearGradient id="be" y2="3635.3" gradientUnits="userSpaceOnUse" x2="-2786.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3729.3" x1="-2818.8">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m114.4 73.81 0.771 0.309 0.774 0.316 0.606 0.158 0.62 0.313 0.633 0.146 0.772 0.309 0.62 0.163 0.772 0.301-0.628 2.015-0.76 2.325-0.622 2.331-0.459 2.637-0.616 2.637-0.47 2.795-0.301 2.935-0.306 2.956-0.153 2.947-0.147 2.798v2.945l0.158 2.795 0.306 2.787 0.459 2.476 0.475 2.476 0.78 2.339-4.814-1.556-3.723-2.167-2.637-2.779-1.709-3.114-0.777-3.409-0.203-3.712 0.321-3.729 0.923-3.882 1.224-3.718 1.405-3.728 1.548-3.262 1.566-2.945 1.392-2.484 1.079-2.009 0.777-1.247 0.312-0.475 0.032 0.007z" stroke-width="0.254" fill="url(#be)"/>
+ <linearGradient id="bd" y2="3627" gradientUnits="userSpaceOnUse" x2="-2811.1" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3721" x1="-2843.1">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m119.63 75.969 1.092 0.314 1.239 0.306 1.545 0.469 1.408 0.454 1.693 0.467 1.708 0.616 1.872 0.615 1.852 0.622-0.923 3.259-0.765 3.106-0.628 3.411-0.459 3.257-0.298 3.417-0.166 3.257 0.005 3.411 0.164 3.265 0.306 3.254 0.47 3.105 0.475 3.091 0.616 3.111 0.628 2.787 0.775 2.787 0.928 2.48 0.929 2.481h-1.556l-1.704-0.153-1.855-0.303-2.188-0.775-2.004-1.078-2.021-1.408-2.009-2.009-1.867-2.481-1.402-3.099-1.244-3.723-0.931-4.34-0.314-5.121 0.153-5.896 0.765-6.663 1.548-7.752 2.164-8.54v-0.001z" stroke-width="0.254" fill="url(#bd)"/>
+ <linearGradient id="bc" y2="3617.2" gradientUnits="userSpaceOnUse" x2="-2839.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3711.2" x1="-2871.8">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m132.21 79.848 1.078 0.301 1.406 0.475 1.547 0.617 1.862 0.614 1.861 0.619 1.866 0.617 1.856 0.617 1.556 0.617-0.931 3.253-0.617 3.42-0.614 3.268-0.306 3.409-0.298 3.409v3.259l0.155 3.409 0.312 3.257 0.622 3.259 0.617 3.259 0.934 3.111 0.928 3.251 1.244 2.945 1.406 3.101 1.705 2.942 1.709 2.801-4.487 1.244-3.893-0.163-3.401-1.229-2.958-2.326-2.315-3.101-2.021-3.876-1.396-4.493-1.102-4.807-0.775-5.128-0.47-5.273-0.008-5.269 0.166-5.276 0.29-4.807 0.633-4.34 0.918-3.887 0.934-3.101h-0.013z" stroke-width="0.254" fill="url(#bc)"/>
+ <linearGradient id="bb" y2="3606.6" gradientUnits="userSpaceOnUse" x2="-2871.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3700.5" x1="-2903.2">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m171.7 144.17-1.866-1.078-1.706-1.695-1.553-2.339-1.248-2.782-1.086-3.264-0.944-3.724-0.69-3.892-0.633-4.192-0.453-4.177-0.47-4.498-0.155-4.34-0.158-4.188-0.156-4.179-0.163-4.048v-3.56-3.257l-2.02-0.611-1.856-0.617-2.02-0.622-1.852-0.62-1.872-0.617-1.851-0.461-1.722-0.628-1.709-0.611-1.39 4.81-0.923 5.126-0.469 5.275 0.011 5.269 0.316 5.271 0.774 5.269 1.25 5.126 1.556 4.814 2.02 4.487 2.173 4.029 2.64 3.56 3.104 2.958 3.259 2.162 3.56 1.545 4.039 0.623 4.198-0.324h0.065z" stroke-width="0.254" fill="url(#bb)"/>
+ <linearGradient id="ba" y2="3517.5" gradientUnits="userSpaceOnUse" x2="-2978.6" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3636.1" x1="-2999.2">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#6E2A80" offset=".0752"/>
+ <stop stop-color="#81287F" offset=".1935"/>
+ <stop stop-color="#A2237C" offset=".3399"/>
+ <stop stop-color="#D11C75" offset=".5088"/>
+ <stop stop-color="#ED2272" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m160.58 89.115 0.316 5.276 0.006 5.121 0.158 5.12 0.15 4.957 0.171 4.965 0.158 4.654 0.448 4.498 0.633 4.343 0.944 3.884 1.239 3.723 1.708 3.396 2.179 2.953 2.637 2.483 3.105 2.162 3.724 1.551 4.487 1.086-2.173-2.009-1.708-2.494-1.4-2.943-1.236-3.253-0.772-3.418-0.783-3.72-0.465-4.026-0.306-4.04-0.158-4.023-0.163-4.203-0.006-4.171-0.005-3.881-0.153-3.879-0.158-3.726-0.163-3.401-0.313-3.106-1.537-0.619-1.562-0.467-1.397-0.459-1.55-0.464-1.563-0.312-1.39-0.464-1.551-0.462-1.556-0.619 0.005-0.013z" stroke-width="0.254" fill="url(#ba)"/>
+ <linearGradient id="az" y2="3585.4" gradientUnits="userSpaceOnUse" x2="-2935.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3658.3" x1="-2945.8">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m201.74 155.31-4.656-5.421-3.733-5.263-3.102-5.424-2.483-5.123-1.698-4.963-1.408-4.814-0.791-4.638-0.458-4.192-0.169-4.034 0.158-3.567 0.316-3.109 0.301-2.787 0.464-2.178 0.316-1.711 0.306-1.089 0.158-0.459-1.719-0.462-1.554-0.308-1.39-0.467-1.545-0.459-1.571-0.459-1.387-0.472-1.551-0.459-1.703-0.462 0.316 4.338 0.306 4.656v4.957l0.011 5.284v5.11l0.163 5.286 0.47 5.107 0.62 4.962 1.094 4.815 1.692 4.337 2.036 3.879 2.789 3.412 3.576 2.631 4.332 2.015 5.281 1.239 6.201 0.295 0.012-0.003z" stroke-width="0.254" fill="url(#az)"/>
+ <linearGradient id="ay" y2="3580.8" gradientUnits="userSpaceOnUse" x2="-2967" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3653.7" x1="-2977.5">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m222.87 161.97-3.578-2.945-3.259-3.407-2.956-3.723-2.474-4.029-2.33-4.192-1.867-4.335-1.703-4.345-1.408-4.493-1.247-4.49-0.778-4.343-0.774-4.188-0.456-3.881-0.325-3.726-0.152-3.243 0.147-2.956 0.153-2.479-14.739-4.644-1.239 5.898-0.617 5.889 0.163 6.201 0.775 6.06 1.25 6.027 1.877 5.898 2.331 5.579 2.626 5.126 3.117 4.809 3.417 4.335 3.729 3.567 3.87 2.94 4.034 2.17 4.029 1.405 4.192 0.29 4.192-0.77v-0.005z" stroke-width="0.254" fill="url(#ay)"/>
+ <linearGradient id="ax" y2="3496.7" gradientUnits="userSpaceOnUse" x2="-2989.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3657.5" x1="-3006.5">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m199.52 100.89 0.312 8.369 0.786 7.916 1.244 7.121 1.571 6.679 2.004 6.191 2.342 5.421 2.473 4.968 2.79 4.189 3.106 3.879 3.105 3.096 3.27 2.473 3.259 2.025 3.26 1.393 3.259 0.77 3.248 0.153 3.101-0.465-2.631-2.33-2.168-2.632-2.02-2.79-1.708-3.264-1.396-3.412-1.249-3.707-0.941-3.731-0.771-3.873-0.617-4.034-0.469-4.023-0.306-4.203-0.475-4.029-0.158-4.028-0.301-3.887-0.172-3.865-0.309-3.57-2.175-0.464-2.787-0.772-3.259-0.921-3.265-1.091-3.401-0.931-3.27-1.084-2.953-0.775-2.32-0.765-0.009 0.003z" stroke-width="0.254" fill="url(#ax)"/>
+ <linearGradient id="aw" y2="3570.6" gradientUnits="userSpaceOnUse" x2="-3037.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3643.5" x1="-3048.3">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m258.98 168.14-3.116-2.94-2.79-2.945-2.336-3.108-2.167-3.243-1.709-3.265-1.55-3.262-1.245-3.403-1.086-3.418-0.788-3.569-0.763-3.56-0.627-3.718-0.465-3.895-0.633-3.863-0.469-4.034-0.459-4.019-0.464-4.205-2.336-0.614-2.01-0.62-1.708-0.45-1.872-0.475-1.693-0.454-1.697-0.618-1.874-0.469-2.168-0.462 0.475 4.032 0.304 4.495 0.316 4.81 0.152 5.281 0.475 5.271 0.47 5.266 0.77 5.438 1.248 4.962 1.563 4.957 2.012 4.343 2.797 3.879 3.407 3.248 4.045 2.647 5.12 1.692 5.894 0.62 6.989-0.33-0.012-0.002z" stroke-width="0.254" fill="url(#aw)"/>
+ <linearGradient id="av" y2="3489" gradientUnits="userSpaceOnUse" x2="-3064.3" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3649.8" x1="-3080.9">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m277.76 171.54-1.861-1.4-2.015-1.551-1.866-1.7-1.861-2.17-1.709-2.323-1.856-2.481-1.725-2.945-1.55-3.251-1.556-3.575-1.556-3.723-1.393-4.338-1.255-4.493-1.092-4.965-1.092-5.268-0.928-5.738-0.777-6.059-2.334-0.467-2.004-0.617-1.722-0.298-1.537-0.459-1.714-0.311-1.703-0.467-1.862-0.451-2.183-0.475 0.327 3.723 0.464 4.346 0.472 4.656 0.772 4.968 0.78 5.258 1.092 5.126 1.405 5.266 1.854 4.97 2.179 4.81 2.488 4.487 3.102 3.876 3.569 3.259 4.192 2.632 4.81 1.692 5.43 0.775 6.204-0.311 0.011-0.008z" stroke-width="0.254" fill="url(#av)"/>
+ <linearGradient id="at" y2="3565.3" gradientUnits="userSpaceOnUse" x2="-3104.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3648.3" x1="-3110.6">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m295.44 173.85-2.5-1.855-2.631-2.315-2.489-2.795-2.325-3.265-2.331-3.406-2.165-3.56-2.175-3.876-2.021-4.029-1.708-4.042-1.562-4.185-1.55-3.876-1.092-4.028-1.092-3.718-0.617-3.415-0.469-3.262-0.153-2.937-2.009-0.475-1.867-0.462-1.856-0.451-1.872-0.466-1.855-0.467-1.872-0.465-1.862-0.464-1.861-0.311 0.628 3.733 0.617 4.177 0.777 4.65 1.095 4.815 1.249 5.109 1.406 5.118 1.711 5.118 2.165 4.814 2.486 4.641 2.795 4.345 3.262 3.721 3.567 3.246 4.34 2.473 4.656 1.72 5.278 0.765 5.901-0.316v-0.004z" stroke-width="0.254" fill="url(#at)"/>
+ <linearGradient id="as" y2="3522.6" gradientUnits="userSpaceOnUse" x2="-3134.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3632.3" x1="-3142">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m314.81 177.4-3.099-0.923-2.945-1.708-2.637-2.326-2.645-2.939-2.322-3.409-2.173-3.884-2.02-4.032-1.867-4.329-1.714-4.515-1.556-4.329-1.387-4.335-1.25-4.192-1.097-4.034-0.929-3.56-0.77-3.101-0.775-2.634-2.015-0.316-2.02-0.467-2.024-0.459-2.168-0.611-2.173-0.47-2.164-0.617-2.176-0.461-2.32-0.451 0.003 1.543 0.461 2.634 0.775 3.564 0.934 4.351 1.561 5.11 1.856 5.271 2.178 5.593 2.484 5.732 3.116 5.429 3.401 5.271 3.733 4.648 4.341 3.868 4.661 3.106 5.115 2.004 5.596 0.775 6.032-0.783-0.001-0.014z" stroke-width="0.254" fill="url(#as)"/>
+ <linearGradient id="ar" y2="3520.6" gradientUnits="userSpaceOnUse" x2="-3164.6" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3630.3" x1="-3171.9">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m328.94 176.62-3.56-2.167-3.27-2.325-2.942-2.474-2.947-2.795-2.474-2.787-2.491-3.098-2.171-3.254-1.866-3.412-1.867-3.412-1.548-3.417-1.405-3.564-1.25-3.718-0.923-3.576-0.943-3.715-0.765-3.721-0.475-3.564-1.403-0.166-1.233-0.298-1.397-0.316-1.562-0.306-1.397-0.312-1.545-0.303-1.711-0.156-1.695-0.303 0.765 2.942 0.931 3.718 0.936 4.192 1.245 4.644 1.556 4.973 1.561 5.12 2.015 5.11 2.184 4.962 2.639 4.662 2.945 4.321 3.259 3.567 3.573 2.953 4.189 2.168 4.509 1.081 4.952-0.006 5.574-1.239 0.007-0.009z" stroke-width="0.254" fill="url(#ar)"/>
+ <linearGradient id="aq" y2="3476.5" gradientUnits="userSpaceOnUse" x2="-3185.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3637.2" x1="-3202.3">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m346.62 179.42-4.814-2.939-4.346-3.104-3.718-3.099-3.111-2.947-2.784-3.106-2.331-3.101-1.877-3.251-1.698-3.109-1.405-3.253-1.242-3.106-0.923-3.254-0.934-3.256-0.785-3.251-0.938-3.265-0.771-3.406-0.938-3.26-1.856-0.469-2.024-0.312-1.862-0.453-2.009-0.313-2.009-0.301-2.17-0.467-2.022-0.309-2.015-0.456 0.934 5.725 1.397 5.587 1.563 5.426 1.866 5.121 2.323 4.804 2.483 4.656 2.795 4.18 2.953 3.889 3.412 3.407 3.407 3.09 3.886 2.635 3.871 2.159 4.2 1.556 4.332 1.081 4.504 0.469 4.646-0.01 0.01 0.012z" stroke-width="0.254" fill="url(#aq)"/>
+ <linearGradient id="ap" y2="3472.4" gradientUnits="userSpaceOnUse" x2="-3224.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3633.2" x1="-3241.6">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m371.74 182.32-4.341-1.698-4.036-2.012-4.032-2.325-3.73-2.477-3.56-2.792-3.272-2.942-3.105-3.085-2.798-3.42-2.626-3.415-2.326-3.572-2.03-3.718-1.851-3.718-1.551-3.713-1.26-3.887-0.929-3.876-0.611-3.87-2.025-0.464-2.02-0.307-2.025-0.464-1.855-0.316-1.867-0.303-1.846-0.301-1.867-0.472-1.711-0.307 0.946 5.59 1.239 5.58 1.725 5.426 2.01 5.279 2.32 4.951 2.805 4.646 3.106 4.348 3.423 3.868 3.718 3.712 4.179 3.111 4.507 2.629 4.807 2.012 5.125 1.548 5.43 0.931 5.888 0.304 6.054-0.478-0.008-0.003z" stroke-width="0.254" fill="url(#ap)"/>
+ <linearGradient id="ao" y2="3538.8" gradientUnits="userSpaceOnUse" x2="-3257.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3611.7" x1="-3268.4">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m385.54 183.86-5.123-2.474-4.487-2.479-4.034-2.474-3.578-2.634-3.101-2.476-2.785-2.792-2.483-2.629-2.173-2.953-2.02-2.945-1.867-3.093-1.716-3.26-1.864-3.569-1.709-3.724-1.861-4.039-1.859-4.172-2.175-4.503-2.184-0.306-1.848-0.309-1.546-0.309-1.402-0.15-1.39-0.158-1.397-0.158-1.561-0.15-1.698-0.301 0.928 5.261 1.408 5.134 1.861 4.962 2.173 4.799 2.632 4.487 2.958 4.361 3.415 4.021 3.567 3.715 3.878 3.406 4.19 2.956 4.49 2.624 4.503 2.17 4.802 1.854 4.976 1.239 4.965 0.768 5.121 0.303-0.006-0.003z" stroke-width="0.254" fill="url(#ao)"/>
+ <linearGradient id="an" y2="3465.9" gradientUnits="userSpaceOnUse" x2="-3287.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3626.7" x1="-3304.4">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m410.36 185.4-4.654-1.864-4.34-2.01-4.343-2.167-4.028-2.315-3.89-2.483-3.712-2.784-3.584-2.79-3.256-2.942-3.259-3.267-2.953-3.259-2.785-3.56-2.642-3.568-2.317-3.867-2.339-4.026-2.02-4.346-1.864-4.351-1.405-0.143-1.846-0.311-2.179-0.307-2.48-0.464-2.328-0.309-2.32-0.309-1.867-0.316-1.39-0.147 2.009 4.81 2.179 4.968 2.339 4.81 2.639 4.793 2.787 4.82 2.953 4.487 3.417 4.343 3.731 4.021 4.021 3.728 4.509 3.243 4.807 2.801 5.427 2.312 5.894 1.708 6.356 1.084 7.141 0.295 7.602-0.311-0.01-0.007z" stroke-width="0.254" fill="url(#an)"/>
+ <linearGradient id="am" y2="3529.5" gradientUnits="userSpaceOnUse" x2="-3321.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3602.4" x1="-3332.5">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m425.1 187.56-3.573-2.787-3.394-3.111-3.422-3.09-3.41-3.415-3.419-3.401-3.262-3.409-3.257-3.412-3.101-3.56-3.111-3.422-3.106-3.417-3.108-3.249-2.945-3.104-2.95-2.784-2.953-2.787-2.79-2.331-2.795-2.162-0.777-0.469-1.548-0.306-1.867-0.314-2.17-0.15-2.479-0.311-2.473-0.153-2.331-0.295-2.328-0.322 2.333 5.59 2.798 5.427 3.256 5.11 3.56 4.814 4.045 4.653 4.192 4.335 4.501 3.876 4.654 3.718 4.807 3.251 4.812 2.942 4.814 2.484 4.81 2.001 4.805 1.701 4.658 1.086 4.338 0.617 4.188 0.152v0.004z" stroke-width="0.254" fill="url(#am)"/>
+ <linearGradient id="al" y2="3459.2" gradientUnits="userSpaceOnUse" x2="-3353.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3619.9" x1="-3369.8">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m447.75 187.55-3.106-0.928-3.101-1.387-3.105-1.859-3.262-2.167-3.257-2.484-3.259-2.784-3.412-3.114-3.417-3.401-3.423-3.401-3.564-3.723-3.575-3.73-3.567-3.71-3.724-3.724-3.736-3.72-3.876-3.568-3.873-3.564-2.025-0.301-2.314-0.464-2.481-0.459-2.481-0.321-2.32-0.47-2.333-0.155-1.999-0.298h-1.722l4.965 4.174 4.974 4.651 4.965 5.117 4.812 5.121 4.81 5.263 4.817 5.269 4.651 4.957 4.501 4.814 4.495 4.185 4.501 3.71 4.346 2.95 4.337 2.17 4.346 1.089 4.189-0.003 4.177-1.089 4.039-2.649 0.007 0.003z" stroke-width="0.254" fill="url(#al)"/>
+ <linearGradient id="ak" y2="3519.5" gradientUnits="userSpaceOnUse" x2="-3391" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3592.4" x1="-3401.6">
+ <stop stop-color="#672A80" offset="0"/>
+ <stop stop-color="#672A80" offset=".0006"/>
+ <stop stop-color="#8D236F" offset=".072"/>
+ <stop stop-color="#AD1E5C" offset=".1459"/>
+ <stop stop-color="#C81F4D" offset=".2229"/>
+ <stop stop-color="#DD1D40" offset=".3041"/>
+ <stop stop-color="#EC1B37" offset=".3913"/>
+ <stop stop-color="#ED1B35" offset=".4884"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m465.28 189.56-5.595-2.95-5.118-3.248-4.812-3.562-4.499-3.868-4.182-3.884-4.037-4.034-3.575-3.868-3.567-3.881-3.111-3.705-3.104-3.417-2.95-3.262-2.792-2.781-2.803-2.323-2.629-1.711-2.64-1.242-2.637-0.609-0.928 0.003-1.548-0.164-1.859-0.155-2.336-0.298-2.317-0.163-2.334-0.301-1.856-0.147-1.548-0.164 4.343 3.718 4.19 3.876 4.026 4.188 3.884 4.335 3.884 4.334 3.729 4.192 3.873 4.18 4.037 4.026 4.031 3.726 4.354 3.404 4.492 3.098 4.807 2.486 5.282 1.999 5.434 1.561 6.041 0.612 6.37-0.006v0.005z" stroke-width="0.254" fill="url(#ak)"/>
+ <linearGradient id="ai" y2="3911" gradientUnits="userSpaceOnUse" x2="-2863.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3777.4" x1="-2823.4">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m120.12 61.873 0.912 0.316 0.78 0.146 0.622 0.306 0.614 0.321 0.631 0.147 0.762 0.316 0.625 0.153 0.77 0.147 0.456-2.483 0.462-2.632 0.617-2.942 0.627-3.114 0.763-3.101 0.788-3.251 0.765-3.267 0.928-3.104 1.095-3.257 1.073-3.108 1.091-2.79 1.234-2.789 1.239-2.481 1.397-2.325 1.387-1.859 1.562-1.556-4.805-1.239-4.187 0.158-3.412 1.245-2.652 2.172-2.315 2.948-1.54 3.572-1.255 4.034-0.923 4.185-0.453 4.499-0.148 4.34-0.152 4.187 0.158 3.876 0.158 3.265 0.158 2.632 0.158 1.7v0.62l0.01 0.013z" stroke-width="0.254" fill="url(#ai)"/>
+ <linearGradient id="ah" y2="3898.3" gradientUnits="userSpaceOnUse" x2="-2891.6" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3768.7" x1="-2843.8">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m125.71 64.186 0.928 0.306 0.728 0.164 0.633 0.306 0.612 0.152 0.622 0.312 0.936 0.312 1.396 0.142 1.851 0.314 0.788-3.721 0.921-3.573 0.931-3.409 0.92-3.409 1.086-3.262 1.239-3.111 1.245-3.101 1.392-2.945 1.393-2.8 1.545-2.64 1.714-2.626 1.714-2.486 2.004-2.476 1.867-2.179 2.156-2.322 2.173-2.012-1.239-0.932-1.408-0.931-1.55-0.77-1.695-0.617-1.701-0.316-2.032 0.158-1.854 0.622-2.172 1.403-2.021 2.015-2.162 2.789-2.156 3.882-2.184 4.809-2.156 6.044-2.168 7.293-2.162 8.538-2.02 10.077h-0.114z" stroke-width="0.254" fill="url(#ah)"/>
+ <linearGradient id="ag" y2="3896.5" gradientUnits="userSpaceOnUse" x2="-2911.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3762.9" x1="-2871.3">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m133.61 67.139 0.932 0.312 1.392 0.608 1.706 0.625 1.867 0.768 2.014 0.772 2.025 0.619 1.867 0.615 1.688 0.461 0.622-4.026 0.77-3.884 0.778-3.726 1.078-3.56 1.086-3.409 1.397-3.259 1.388-3.109 1.714-3.111 1.703-2.789 1.856-2.795 2.009-2.795 2.325-2.474 2.326-2.331 2.481-2.325 2.628-2.334 2.79-2.017-3.57-3.555-3.412-2.022-3.575-0.616-3.564 0.616-3.412 1.723-3.248 2.631-3.102 3.415-2.953 4.034-2.784 4.501-2.473 4.804-2.315 4.973-2.025 5.118-1.534 4.965-1.234 4.656-0.785 4.192-0.459 3.718 0.003 0.011z" stroke-width="0.254" fill="url(#ag)"/>
+ <linearGradient id="af" y2="3878.4" gradientUnits="userSpaceOnUse" x2="-2945.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3748.8" x1="-2897.7">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m194.02 26.449-2.795 0.765-2.621 1.405-2.494 1.858-2.468 2.326-2.184 2.637-2.156 3.101-2.02 3.264-1.852 3.581-1.703 3.718-1.714 3.871-1.695 4.042-1.534 4.034-1.411 3.876-1.551 3.876-1.233 3.884-1.403 3.564-2.014-0.306-1.852-0.625-2.022-0.456-2.012-0.775-1.864-0.622-1.864-0.606-1.855-0.47-1.864-0.469 0.614-5.732 1.236-5.59 1.553-5.574 2.01-5.284 2.32-4.967 2.629-4.81 3.104-4.346 3.085-3.723 3.414-3.259 3.573-2.79 3.723-2.025 3.876-1.244 3.729-0.464 3.876 0.464 3.723 1.393 3.718 2.48v-0.002z" stroke-width="0.254" fill="url(#af)"/>
+ <linearGradient id="ae" y2="3877.4" gradientUnits="userSpaceOnUse" x2="-2974.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3743.8" x1="-2934.3">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m211.13 31.084-5.568 2.025-4.973 2.8-4.335 3.104-3.887 3.718-3.248 3.879-2.953 4.192-2.326 4.192-1.998 4.189-1.703 4.189-1.237 4.029-1.094 3.729-0.765 3.254-0.464 2.786-0.459 2.018-0.158 1.556-0.147 0.606-1.709-0.301-1.709-0.459-1.556-0.611-1.542-0.479-1.563-0.612-1.551-0.459-1.55-0.467-1.709-0.149 2.015-4.501 1.858-4.81 1.706-5.118 1.852-5.12 1.851-4.963 2.025-4.978 2.004-4.81 2.33-4.343 2.632-3.876 2.932-3.267 3.265-2.635 3.721-1.705 4.189-0.781 4.651 0.153 5.273 1.397 5.896 2.621 0.004 0.007z" stroke-width="0.254" fill="url(#ae)"/>
+ <linearGradient id="ad" y2="3855.8" gradientUnits="userSpaceOnUse" x2="-3006.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3726.2" x1="-2959">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m233.12 34.327-4.33 1.709-4.034 2.17-3.886 2.483-3.56 2.951-3.249 3.27-3.101 3.411-2.938 3.724-2.642 3.876-2.32 3.873-2.176 3.892-1.851 3.874-1.867 3.723-1.548 3.57-1.239 3.254-1.244 3.116-0.92 2.632-15.979-4.172 0.772-6.829 1.382-6.359 2.178-6.21 2.779-5.734 3.264-5.435 3.549-4.96 4.045-4.355 4.33-3.871 4.501-3.111 4.49-2.488 4.646-1.867 4.656-0.928 4.34-0.164 4.33 0.622 4.037 1.698 3.572 2.637h0.013z" stroke-width="0.254" fill="url(#ad)"/>
+ <linearGradient id="ac" y2="3858.3" gradientUnits="userSpaceOnUse" x2="-3037.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3724.6" x1="-2997.4">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m192.08 86.3 3.248-8.844 3.418-8.068 3.707-6.977 3.729-6.204 3.859-5.281 4.034-4.654 4.019-3.729 4.045-2.945 4.019-2.333 3.876-1.551 3.884-0.938 3.718-0.306 3.562 0.303 3.27 0.934 3.09 1.393 2.8 1.858-3.253 1.239-3.254 1.712-2.953 2.175-2.632 2.643-2.637 2.942-2.483 3.259-2.326 3.423-2.153 3.718-2.013 4.036-2.02 4.032-1.854 4.036-1.706 4.177-1.698 4.195-1.708 4.034-1.709 4.031-1.545 3.876-2.173-0.617-2.626-0.762-2.953-0.775-3.096-1.081-3.27-0.928-2.955-0.931-2.945-0.617-2.315-0.462v-0.013z" stroke-width="0.254" fill="url(#ac)"/>
+ <linearGradient id="ab" y2="3846.1" gradientUnits="userSpaceOnUse" x2="-3078" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3712.5" x1="-3037.5">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m269.88 45.609-3.87 1.864-3.726 2.015-3.243 2.173-3.114 2.491-2.787 2.643-2.481 2.784-2.468 2.945-2.331 3.27-2.004 3.262-2.024 3.567-2.004 3.567-1.859 3.879-1.854 3.881-1.864 4.023-1.854 4.195-2.025 4.185-2.32-0.453-2.014-0.307-1.862-0.467-1.703-0.461-1.708-0.464-1.709-0.322-1.858-0.448-2.165-0.311 1.849-4.192 1.854-4.651 2.02-5.12 2.17-5.273 2.165-5.427 2.314-5.429 2.632-5.126 2.789-4.81 3.26-4.348 3.403-3.575 4.034-2.801 4.18-1.854 4.807-0.777 5.281 0.458 5.732 2.015 6.359 3.407v-0.008z" stroke-width="0.254" fill="url(#ab)"/>
+ <linearGradient id="aa" y2="3817.6" gradientUnits="userSpaceOnUse" x2="-3110.4" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3688" x1="-3062.6">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m289.12 51.179-3.101 0.459-2.959 0.63-2.778 1.086-2.643 1.25-2.631 1.703-2.479 2.021-2.479 2.325-2.479 2.637-2.326 3.267-2.468 3.404-2.323 3.892-2.486 4.335-2.637 4.814-2.615 5.273-2.784 5.737-2.79 6.21-2.479-0.467-2.178-0.309-1.867-0.461-1.851-0.47-1.709-0.306-1.856-0.459-2.024-0.464-2.326-0.459 1.712-3.876 1.843-4.501 2.173-4.648 2.473-5.129 2.643-5.117 2.942-4.973 3.243-4.805 3.412-4.656 3.729-4.039 4.034-3.418 4.329-2.789 4.498-1.867 4.963-0.775 5.123 0.307 5.424 1.55 5.745 3.096-0.018-0.008z" stroke-width="0.254" fill="url(#aa)"/>
+ <linearGradient id="z" y2="3827.6" gradientUnits="userSpaceOnUse" x2="-3139.3" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3693.9" x1="-3098.8">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m303.72 55.353-3.265 0.934-3.248 1.55-3.265 2.015-3.406 2.481-3.259 2.642-3.254 3.101-3.259 3.431-3.101 3.404-2.948 3.726-2.626 3.726-2.637 3.731-2.168 3.72-2.014 3.721-1.704 3.414-1.381 3.42-0.934 3.099-2.01-0.313-1.872-0.454-1.7-0.306-1.706-0.312-1.551-0.469-1.714-0.312-1.703-0.453-1.856-0.459 1.698-3.884 1.852-4.185 2.024-4.656 2.466-4.814 2.48-4.815 2.943-4.809 3.101-4.651 3.248-4.34 3.729-3.876 3.865-3.42 4.188-2.645 4.335-1.856 4.819-0.944 4.946-0.005 5.295 1.25 5.585 2.631 0.007-0.018z" stroke-width="0.254" fill="url(#z)"/>
+ <linearGradient id="x" y2="3796.8" gradientUnits="userSpaceOnUse" x2="-3166.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3667.2" x1="-3119">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m321.25 59.84-3.576-0.142-3.554 0.611-3.417 1.402-3.423 2.173-3.248 2.64-3.249 3.259-3.105 3.567-2.943 3.884-2.8 4.19-2.615 4.034-2.484 4.187-2.314 4.185-2.176 3.731-1.854 3.569-1.561 3.26-1.393 2.634-2.009-0.309-2.025-0.309-1.856-0.301-2.009-0.467-2.025-0.466-2.02-0.462-2.015-0.459-2.322-0.469 0.456-1.551 0.933-2.642 1.709-3.56 2.17-4.195 2.629-4.807 3.243-4.971 3.57-5.117 4.028-4.979 4.33-4.646 4.651-4.203 4.967-3.56 5.121-2.479 5.268-1.562 5.585-0.158 5.59 1.397 5.737 3.091h0.006z" stroke-width="0.254" fill="url(#x)"/>
+ <linearGradient id="w" y2="3810.3" gradientUnits="userSpaceOnUse" x2="-3196.4" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3676.6" x1="-3155.9">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m333.97 64.797-4.338 0.929-4.034 1.244-3.723 1.706-3.724 2.025-3.417 2.325-3.101 2.486-3.09 2.784-2.795 3.106-2.629 3.265-2.481 3.417-2.151 3.417-2.173 3.721-1.867 3.718-1.708 3.73-1.703 3.879-1.396 3.868-1.39-0.293-1.249-0.316-1.234-0.467-1.402-0.464-1.245-0.453-1.397-0.467-1.545-0.462-1.864-0.313 1.551-3.101 1.706-3.718 2.167-4.349 2.325-4.656 2.785-4.962 2.942-4.973 3.259-4.799 3.417-4.509 3.707-4.188 3.876-3.415 4.188-2.8 4.338-1.867 4.653-0.772 4.651 0.459 4.962 1.861 5.126 3.407 0.003-0.003z" stroke-width="0.254" fill="url(#w)"/>
+ <linearGradient id="v" y2="3777.7" gradientUnits="userSpaceOnUse" x2="-3218.7" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3648.1" x1="-3170.9">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m350.12 68.494-5.593 1.392-5.11 1.717-4.493 2.018-4.034 2.175-3.564 2.483-3.259 2.643-2.784 2.945-2.632 2.955-2.162 3.104-2.03 3.412-1.698 3.259-1.708 3.412-1.382 3.575-1.408 3.412-1.39 3.573-1.39 3.409-2.024-0.296-2.012-0.469-2.018-0.62-2.009-0.461-2.015-0.622-2.027-0.467-2.007-0.309-2.015-0.312 2.312-6.038 2.787-5.742 2.789-5.43 3.249-4.965 3.406-4.503 3.573-4.034 3.718-3.727 3.873-3.108 4.182-2.642 4.192-2.173 4.177-1.395 4.493-0.934 4.351-0.316 4.648 0.313 4.49 1.076 4.509 1.708 0.015-0.018z" stroke-width="0.254" fill="url(#v)"/>
+ <linearGradient id="u" y2="3791.7" gradientUnits="userSpaceOnUse" x2="-3257.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3658" x1="-3217.3">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m373.05 73.926-4.812 0.316-4.641 0.775-4.504 1.239-4.337 1.402-4.032 1.856-3.881 2.183-3.713 2.326-3.406 2.795-3.104 2.947-2.787 3.26-2.637 3.417-2.325 3.57-2.162 3.881-1.698 4.034-1.551 4.023-1.092 4.343-2.167-0.309-2.167-0.306-2.179-0.301-2.156-0.316-2.036-0.301-2.167-0.316-1.867-0.306-1.855-0.311 2.167-6.038 2.474-5.593 2.642-5.429 3.096-5.121 3.401-4.653 3.58-4.195 4.029-3.723 4.019-3.265 4.495-2.637 4.646-2.018 4.965-1.405 5.12-0.77 5.43 0.15 5.426 0.762 5.901 1.562 5.893 2.468h-0.008z" stroke-width="0.254" fill="url(#u)"/>
+ <linearGradient id="t" y2="3755.9" gradientUnits="userSpaceOnUse" x2="-3277.8" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3626.3" x1="-3230">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m384.38 75.149-5.732 1.249-5.12 1.403-4.341 1.545-4.028 1.719-3.409 2.021-3.111 2.167-2.787 2.328-2.479 2.64-2.315 2.789-2.015 3.111-2.017 3.254-2.165 3.417-2.024 3.871-2.157 3.881-2.481 4.346-2.64 4.504-2.009-0.312-1.856-0.461-1.55-0.316-1.556-0.301-1.556-0.314-1.551-0.306-1.551-0.155-1.861-0.143 1.54-5.745 2.025-5.432 2.471-4.968 2.786-4.651 3.254-4.187 3.417-3.724 3.863-3.417 4.031-2.953 4.343-2.483 4.49-2.021 4.662-1.556 4.954-1.244 4.973-0.622 5.118-0.158 5.11 0.459 5.274 0.765z" stroke-width="0.254" fill="url(#t)"/>
+ <linearGradient id="s" y2="3773.6" gradientUnits="userSpaceOnUse" x2="-3317.4" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3640" x1="-3276.9">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m409.03 78.39-4.948 1.25-4.817 1.399-4.644 1.551-4.501 1.717-4.332 2.017-4.188 2.018-4.034 2.317-3.873 2.494-3.721 2.798-3.56 2.939-3.262 3.262-3.101 3.578-2.939 3.718-2.793 4.034-2.483 4.19-2.312 4.65-1.4-0.158-1.697-0.145-1.87-0.464-2.009-0.465-2.03-0.306-1.859-0.469-1.7-0.148-1.245-0.152 2.479-5.121 2.477-4.967 2.787-4.968 2.947-4.646 3.249-4.503 3.417-4.188 3.715-3.887 4.172-3.411 4.351-3.12 4.807-2.317 5.273-1.872 5.737-1.239 6.201-0.627 6.666 0.306 7.29 1.086 7.752 1.852v-0.003z" stroke-width="0.254" fill="url(#s)"/>
+ <linearGradient id="r" y2="3765.8" gradientUnits="userSpaceOnUse" x2="-3343.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3632.1" x1="-3302.7">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m423.76 79.927-4.177 2.178-4.337 2.479-4.029 2.643-4.185 2.95-4.034 2.956-4.028 3.248-3.871 3.272-3.887 3.262-3.707 3.248-3.729 3.111-3.554 3.111-3.415 2.953-3.414 2.79-3.257 2.483-3.088 2.173-3.116 1.864-0.77 0.15-1.239-0.148-1.562-0.475-1.856-0.458-2.17-0.459-2.181-0.462-2.159-0.309-2.175-0.158 2.947-5.893 3.409-5.435 3.871-4.962 4.189-4.651 4.646-4.192 4.804-3.729 4.957-3.42 5.266-2.955 5.273-2.487 5.278-2.012 5.263-1.556 5.134-1.097 5.113-0.777 4.962-0.156 4.509 0.153 4.324 0.765h-0.005z" stroke-width="0.254" fill="url(#r)"/>
+ <linearGradient id="q" y2="3756.1" gradientUnits="userSpaceOnUse" x2="-3375.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3622.4" x1="-3334.7">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m444.4 85.793-4.493 0.475-4.346 0.778-4.187 1.397-4.034 1.709-3.874 2.024-3.726 2.331-3.56 2.637-3.723 2.784-3.562 3.109-3.557 3.259-3.575 3.267-3.724 3.265-3.718 3.406-4.034 3.272-4.021 3.259-4.188 3.101-2.012 0.008h-4.971l-2.623-0.15-2.483-0.15-2.479-0.166-2.022-0.15-1.704-0.295 5.593-3.73 5.571-4.19 5.577-4.503 5.576-4.815 5.43-4.809 5.426-4.82 5.432-4.493 5.269-4.351 5.266-3.56 4.97-3.116 4.96-2.326 4.648-1.249 4.493-0.312 4.351 0.934 4.187 2.314 3.882 3.871-0.015-0.015z" stroke-width="0.254" fill="url(#q)"/>
+ <linearGradient id="p" y2="3755.3" gradientUnits="userSpaceOnUse" x2="-3454.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3641.9" x1="-3354">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m459.93 87.645-6.052 2.024-5.587 2.64-5.271 2.948-5.112 3.272-4.648 3.417-4.49 3.572-4.177 3.718-3.881 3.57-3.726 3.417-3.56 3.268-3.412 2.95-3.104 2.483-3.104 2.01-2.945 1.413-2.792 0.762-2.787 0.008-0.937-0.15-1.537-0.166-2.024-0.29-2.318-0.318-2.333-0.146-2.331-0.316-2.02-0.306-1.537-0.15 4.799-3.267 4.812-3.412 4.482-3.887 4.493-3.879 4.498-4.034 4.338-4.031 4.49-3.733 4.498-3.721 4.648-3.262 4.805-2.953 4.965-2.328 5.109-1.867 5.439-1.094 5.73-0.312 6.048 0.614 6.519 1.543 0.012-0.007z" stroke-width="0.254" fill="url(#p)"/>
+ <linearGradient id="o" y2="3735.2" gradientUnits="userSpaceOnUse" x2="-3477.4" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1376.5 2061.7)" y1="3621.8" x1="-3376.5">
+ <stop stop-color="#512A7C" offset="0"/>
+ <stop stop-color="#682672" offset=".0701"/>
+ <stop stop-color="#991E5E" offset=".209"/>
+ <stop stop-color="#C21F4B" offset=".3368"/>
+ <stop stop-color="#E01D3D" offset=".4512"/>
+ <stop stop-color="#ED1B35" offset=".5481"/>
+ <stop stop-color="#ED1B35" offset=".6158"/>
+ <stop stop-color="#F6EE61" offset="1"/>
+ </linearGradient>
+ <path d="m479.47 93.079-5.426 1.241-4.965 1.408-4.341 1.553-4.031 1.867-3.721 2.007-3.409 2.175-3.254 2.334-2.953 2.48-2.939 2.637-3.106 2.795-2.942 2.938-3.105 2.959-3.401 2.945-3.56 3.108-3.882 3.101-4.335 3.267-2.634-0.16-2.95-0.156-3.106-0.467-3.104-0.3-3.098-0.475-2.945-0.454-2.645-0.459-2.474-0.313 2.942-0.472 3.415-1.556 3.873-2.632 4.182-3.422 4.648-4.021 5.115-4.351 5.273-4.659 5.424-4.656 5.732-4.182 5.886-3.89 6.051-3.259 6.057-2.333 6.033-1.25h5.893l6.057 1.384 5.737 3.262 0.008 0.006z" stroke-width="0.254" fill="url(#o)"/>
+ <g stroke-width="0.254">
+ <linearGradient id="m" y2="3588.2" gradientUnits="userSpaceOnUse" x2="-2809.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3797.2" x1="-2874.7">
+ <stop stop-color="#D8E7EB" offset="0"/>
+ <stop stop-color="#CAD9DF" offset=".0849"/>
+ <stop stop-color="#A5B8C2" offset=".2184"/>
+ <stop stop-color="#728896" offset=".3836"/>
+ <stop stop-color="#415867" offset=".5537"/>
+ <stop stop-color="#677E8B" offset=".6417"/>
+ <stop stop-color="#92A7B1" offset=".742"/>
+ <stop stop-color="#B7C8D0" offset=".8374"/>
+ <stop stop-color="#CFDFE4" offset=".9257"/>
+ <stop stop-color="#D8E7EB" offset="1"/>
+ </linearGradient>
+ <path d="m103.82 29.46 0.472 1.551 0.301 1.703 0.316 1.866 0.153 1.867 0.163 2.015 0.158 2.164v2.018l0.153 2.02 0.005 2.01v3.572l0.147 1.717v1.397l0.172 1.078 0.15 1.089 0.295 0.617-1.382-3.111-1.405-3.096-1.405-3.409-1.556-3.414-1.392-3.565-1.39-3.56-1.253-3.575-0.928-3.718-0.78-3.729-0.473-3.718v-3.723l0.304-3.724 0.77-3.564 1.397-3.406 1.861-3.576 2.474-3.256-0.461 1.7-0.454 1.867-0.321 1.851-0.147 1.859-0.143 1.864 0.005 2.02 0.143 2.017 0.146 1.859 0.171 2.025 0.306 1.858 0.47 2.009 0.475 1.859 0.459 1.703 0.617 1.714 0.616 1.701 0.775 1.553h0.016z" fill="url(#m)"/>
+ <linearGradient id="l" y2="3592.6" gradientUnits="userSpaceOnUse" x2="-2795.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3801.6" x1="-2860.7">
+ <stop stop-color="#D8E7EB" offset="0"/>
+ <stop stop-color="#CAD9DF" offset=".0849"/>
+ <stop stop-color="#A5B8C2" offset=".2184"/>
+ <stop stop-color="#728896" offset=".3836"/>
+ <stop stop-color="#415867" offset=".5537"/>
+ <stop stop-color="#677E8B" offset=".6417"/>
+ <stop stop-color="#92A7B1" offset=".742"/>
+ <stop stop-color="#B7C8D0" offset=".8374"/>
+ <stop stop-color="#CFDFE4" offset=".9257"/>
+ <stop stop-color="#D8E7EB" offset="1"/>
+ </linearGradient>
+ <path d="m56.531 93.846 2.8 0.143 2.801-0.15 2.784-0.467 2.79-0.925 2.789-1.092 2.632-1.4 2.795-1.551 2.631-1.866 2.785-2.012 2.637-2.184 2.637-2.173 2.631-2.476 2.479-2.328 2.484-2.479 2.479-2.494 2.479-2.468-2.795 1.545-2.774 1.563-2.652 1.384-2.474 1.562-2.642 1.55-2.483 1.709-2.463 1.556-2.643 1.556-2.468 1.698-2.494 1.561-2.637 1.711-2.637 1.551-2.784 1.709-2.784 1.706-2.948 1.869-2.953 1.708v-0.016z" fill="url(#l)"/>
+ <linearGradient id="k" y2="3590.5" gradientUnits="userSpaceOnUse" x2="-2802.2" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3799.5" x1="-2867.4">
+ <stop stop-color="#D8E7EB" offset="0"/>
+ <stop stop-color="#CAD9DF" offset=".0849"/>
+ <stop stop-color="#A5B8C2" offset=".2184"/>
+ <stop stop-color="#728896" offset=".3836"/>
+ <stop stop-color="#415867" offset=".5537"/>
+ <stop stop-color="#677E8B" offset=".6417"/>
+ <stop stop-color="#92A7B1" offset=".742"/>
+ <stop stop-color="#B7C8D0" offset=".8374"/>
+ <stop stop-color="#CFDFE4" offset=".9257"/>
+ <stop stop-color="#D8E7EB" offset="1"/>
+ </linearGradient>
+ <path d="m79.592 31.814 3.259 0.304 3.096 0.616 2.637 0.931 2.484 1.09 2.172 1.392 2.018 1.556 1.869 1.548 1.545 1.864 1.397 2.004 1.261 2.015 1.076 2.02 0.933 2.173 0.923 2.162 0.775 2.175 0.78 2.022 0.623 2.01-1.405-1.862-1.393-1.855-1.405-1.862-1.551-1.708-1.395-1.852-1.548-1.703-1.556-1.708-1.551-1.714-1.719-1.551-1.714-1.703-1.698-1.551-1.861-1.387-1.867-1.397-2.006-1.397-2.025-1.395-2.17-1.25 0.016 0.013z" fill="url(#k)"/>
+ <linearGradient id="j" y2="3584.8" gradientUnits="userSpaceOnUse" x2="-2820.6" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3793.7" x1="-2885.8">
+ <stop stop-color="#D8E7EB" offset="0"/>
+ <stop stop-color="#CAD9DF" offset=".0849"/>
+ <stop stop-color="#A5B8C2" offset=".2184"/>
+ <stop stop-color="#728896" offset=".3836"/>
+ <stop stop-color="#415867" offset=".5537"/>
+ <stop stop-color="#677E8B" offset=".6417"/>
+ <stop stop-color="#92A7B1" offset=".742"/>
+ <stop stop-color="#B7C8D0" offset=".8374"/>
+ <stop stop-color="#CFDFE4" offset=".9257"/>
+ <stop stop-color="#D8E7EB" offset="1"/>
+ </linearGradient>
+ <path d="m102.7 13.16 2.01 1.703 1.708 1.861 1.556 2.178 1.09 2.32 0.931 2.634 0.78 2.793 0.472 2.784 0.309 3.108 0.158 3.093 0.153 3.265-0.148 3.259-0.152 3.265-0.306 3.406-0.314 3.417-0.456 3.26-0.306 3.409-0.638-2.943-0.606-2.792-0.465-2.789-0.472-2.79-0.478-2.79-0.3-2.637-0.475-2.795-0.327-2.784-0.464-2.789-0.316-2.79-0.465-2.792-0.308-2.943-0.473-2.792-0.622-3.101-0.459-3.106-0.617-3.105v-0.017z" fill="url(#j)"/>
+ <linearGradient id="i" y2="3592.2" gradientUnits="userSpaceOnUse" x2="-2796.6" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3801.2" x1="-2861.8">
+ <stop stop-color="#D8E7EB" offset="0"/>
+ <stop stop-color="#CAD9DF" offset=".0849"/>
+ <stop stop-color="#A5B8C2" offset=".2184"/>
+ <stop stop-color="#728896" offset=".3836"/>
+ <stop stop-color="#415867" offset=".5537"/>
+ <stop stop-color="#677E8B" offset=".6417"/>
+ <stop stop-color="#92A7B1" offset=".742"/>
+ <stop stop-color="#B7C8D0" offset=".8374"/>
+ <stop stop-color="#CFDFE4" offset=".9257"/>
+ <stop stop-color="#D8E7EB" offset="1"/>
+ </linearGradient>
+ <path d="m86.094 8.092 0.301 4.182 0.791 3.721 0.929 3.101 1.241 2.787 1.247 2.481 1.546 2.181 1.716 2.004 1.551 2.009 1.722 2.03 1.54 2.168 1.566 2.325 1.239 2.629 1.244 3.098 0.772 3.418 0.62 4.028 0.316 4.644-1.551-1.693-1.872-2.183-2.167-2.312-2.484-2.795-2.637-2.787-2.642-3.098-2.474-3.26-2.331-3.253-2.017-3.41-1.717-3.417-1.244-3.414-0.617-3.254 0.161-3.265 0.762-3.101 1.688-2.953 2.803-2.621-0.002 0.01z" fill="url(#i)"/>
+ <linearGradient id="h" y2="3585.3" gradientUnits="userSpaceOnUse" x2="-2818.9" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3794.3" x1="-2884.1">
+ <stop stop-color="#D8E7EB" offset="0"/>
+ <stop stop-color="#CAD9DF" offset=".0849"/>
+ <stop stop-color="#A5B8C2" offset=".2184"/>
+ <stop stop-color="#728896" offset=".3836"/>
+ <stop stop-color="#415867" offset=".5537"/>
+ <stop stop-color="#677E8B" offset=".6417"/>
+ <stop stop-color="#92A7B1" offset=".742"/>
+ <stop stop-color="#B7C8D0" offset=".8374"/>
+ <stop stop-color="#CFDFE4" offset=".9257"/>
+ <stop stop-color="#D8E7EB" offset="1"/>
+ </linearGradient>
+ <path d="m105.97 57.688-0.316-1.55-0.617-1.859-0.923-1.858-0.934-2.176-1.102-2.159-1.092-2.484-0.76-2.634-0.785-2.792-0.312-2.942 0.147-3.268 0.612-3.259 1.252-3.56 1.852-3.726 2.629-3.884 3.718-4.189 4.503-4.346-1.244 2.792-0.923 2.787-1.089 2.795-0.772 2.784-0.612 2.79-0.765 2.79-0.464 2.95-0.472 2.784-0.298 2.8-0.307 2.943-0.311 2.945-0.147 2.953-0.158 3.111-0.143 3.095-0.155 3.102v3.259l-0.012 0.006z" fill="url(#h)"/>
+ <linearGradient id="g" y2="3593.5" gradientUnits="userSpaceOnUse" x2="-2792.5" gradientTransform="matrix(-.5318 .0004 -.0004 -.5318 -1416.2 2021)" y1="3802.5" x1="-2857.8">
+
<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/apache-incubator-logo.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/apache-incubator-logo.png b/asciidoc/images/apache-incubator-logo.png
new file mode 100644
index 0000000..2d6fda4
Binary files /dev/null and b/asciidoc/images/apache-incubator-logo.png differ
[11/29] ant-ivy git commit: Initial auto-converted .adoc files from
xooki2asciidoc convertor
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/multiproject.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/multiproject.adoc b/asciidoc/tutorial/multiproject.adoc
new file mode 100644
index 0000000..8aa364b
--- /dev/null
+++ b/asciidoc/tutorial/multiproject.adoc
@@ -0,0 +1,298 @@
+
+In the previous tutorial, you saw how to deal with dependencies between two simple projects.
+
+This tutorial will guide you through the use of Ivy in a more complete environment. All of the code for this tutorial is available in the `src/example/multi-project` directory of the Ivy distribution.
+
+
+== Context
+
+Here is a 10000ft overview of the projects involved in this tutorial:
+
+
+* version +
+ helps to identify module by a version
+
+* list +
+ gives a list of files in a directory (recursively)
+
+* size +
+ gives the total size of all files in a directory, or of a collection of files
+
+* find +
+ find files in a given dir or among a list of files which match a given name
+
+* sizewhere +
+ gives the total size of files matching a name in a directory
+
+* console +
+ give access to all other modules features through a simple console app
+
+For sure this is not aimed to demonstrate how to develop a complex app or give indication of advanced algorithm :-)
+
+But this gives a simple understanding of how Ant+Ivy can be used to develop an application divided in multiple modules.
+
+Now, here is how these modules relate to each other:
+link:../samples/projects-dependencies-graph.jpg[image::../samples/projects-dependencies-graph-small.jpg[]__click to enlarge__]
+
+Modules in yellow are the modules described in this tutorial, and modules in blue are external dependencies (we will see how to generate this graph later in this tutorial).
+
+As you can see, we have here a pretty interesting set of modules with dependencies between each other, each depending on the latest version of the others.
+
+
+== The example files
+
+The sources for this tutorial can be found in `src/example/multi-project` in the Ivy distribution. In this directory, you will find the following files:
+
+
+* link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/build.xml[build.xml] +
+This is a root build file which can be used to call targets on all modules, in the order of their dependencies (ensuring that a module is always built before any module depending on it, for instance)
+
+* common
+<ul>
+<li>link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/common/common.xml[common.xml]</li> the common build file imported by all build.xml files for each project. This build defines the targets which can be used in all projects.
+<li>link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/multi-project/common/build.properties[build.properties]</li>some properties common to all projects
+</ul>
+ +
+
+* projects +
+contains a directory per module, with each containing:
+<ul>
+
+* ivy.xml +
+Ivy file of the module, describing its dependencies upon other modules and/or external modules.
+Example:
+
+[source]
+----
+
+<ivy-module version="1.0">
+ <info
+ organisation="org.apache.ivy.example"
+ module="find"
+ status="integration"/>
+ <configurations>
+ <conf name="core"/>
+ <conf name="standalone" extends="core"/>
+ </configurations>
+ <publications>
+ <artifact name="find" type="jar" conf="core" />
+ </publications>
+ <dependencies>
+ <dependency name="version" rev="latest.integration" conf="core->default" />
+ <dependency name="list" rev="latest.integration" conf="core" />
+ <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="core->default" />
+ <dependency org="commons-cli" name="commons-cli" rev="1.0" conf="standalone->default" />
+ </dependencies>
+</ivy-module>
+
+----
+
+
+* build.xml +
+The build file of the project, which consists mainly of an import of the common build file and of a module specific properties file:
+
+[source]
+----
+
+<project name="find" default="compile">
+ <property file="build.properties"/>
+
+ <import file="${common.dir}/common.xml"/>
+</project>
+
+----
+
+
+* build.properties +
+Module specific properties + properties to find the common build file
+
+[source]
+----
+
+projects.dir = ${basedir}/..
+wkspace.dir = ${projects.dir}/..
+common.dir = ${wkspace.dir}/common
+
+----
+
+
+* src +
+ the source directory with all java sources
+
+</ul>
+
+Note that this example doesn't demonstrate many good practices for software development in general, in particular you won't find any unit test in these samples, even if we think unit testing is very important. But this isn't the aim of this tutorial.
+
+Now that you are a bit more familiar with the structure, let's have a look at the most important part of this example: the common build file. Indeed, as you have seen, all the module's build files only import the common build file, and define their dependencies in their ivy files (which you should begin to be familiar with).
+
+So, here are some aspects of this common build file:
+
+=== ivy settings
+
+
+[source]
+----
+
+<!-- setup ivy default configuration with some custom info -->
+<property name="ivy.local.default.root" value="${repository.dir}/local"/>
+<property name="ivy.shared.default.root" value="${repository.dir}/shared"/>
+
+<!-- here is how we would have configured ivy if we had our own ivysettings file
+<ivy:settings file="${common.dir}/ivysettings.xml" id="ivy.instance" />
+-->
+
+----
+
+This declaration configures Ivy by only setting two properties: the location for the local repository and the location for the shared repository. It's the only settings done here, since Ivy is configured by default to work in a team environment (see link:../tutorial/defaultconf.html[default settings tutorial] for details about this). For sure in a real environment, the shared repository location would rather be in a team shared directory (or in a more complex repository, again see the default settings tutorial to see how to use something really different).
+Commented out you can see how the settings would have been done if the default setting wasn't OK for our purpose.
+
+
+=== resolve dependencies
+
+
+[source]
+----
+
+<target name="resolve" depends="clean-lib, load-ivy" description="--> resolve and retrieve dependencies with ivy">
+ <mkdir dir="${lib.dir}"/> <!-- not usually necessary, ivy creates the directory IF there are dependencies -->
+
+ <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't -->
+ <ivy:resolve file="${ivy.file}"/>
+ <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" />
+</target>
+
+----
+
+You should begin to be familiar with using Ivy this way. We call __resolve__ explicitly to use the ivy file configured (the default would have been fine), and then call __retrieve__ to copy resolved dependencies artifacts from the cache to a local lib directory. The pattern is also used to name the artifacts in the lib dir with their name and extension only (without revision), this is easier to use with an IDE, as the IDE configuration won't change when the artifacts version change.
+
+
+=== ivy-new-version
+
+
+[source]
+----
+
+<target name="ivy-new-version" depends="load-ivy" unless="ivy.new.revision">
+ <!-- default module version prefix value -->
+ <property name="module.version.prefix" value="${module.version.target}-dev-b" />
+
+ <!-- asks Ivy for an available version number -->
+ <ivy:info file="${ivy.file}" />
+ <ivy:buildnumber
+ organisation="${ivy.organisation}" module="${ivy.module}"
+ revision="${module.version.prefix}" defaultBuildNumber="1" revSep=""/>
+</target>
+
+----
+
+This target is used to ask Ivy to find a new version for a module. To get details about the module we are dealing with, we pull information out of the ivy file by using the ivy:info task. Then the link:../use/buildnumber.html[buildnumber] task is used to get a new revision, based on a prefix we set with a property, by default it will be 1.0-dev-b (have a look at the default value for `module.version.target` in the `common/build.properties` file). Each module built by this common build file could easily override this by either setting a different `module.version.target` in its module specific `build.properties`, or even overriding `module.version.prefix`. To get the new revision, Ivy scans the repository to find the latest available version with the given prefix, and then increments this version by 1.
+
+
+=== publish
+
+
+[source]
+----
+
+<target name="publish" depends="clean-build, jar" description="--> publish this project in the ivy repository">
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ resolver="shared"
+ pubrevision="${version}"
+ status="release"
+ />
+ <echo message="project ${ant.project.name} released with version ${version}" />
+</target>
+
+----
+
+This target publishes the module to the shared repository, with the revision found in the version property, which is set by other targets (based on ivy-new-version we have seen above). It can be used when a module reaches a specific milestone, or whenever you want the team to benefit from a new version of the module.
+
+=== publish-local
+
+
+[source]
+----
+
+<target name="publish-local" depends="local-version, jar" description="--> publish this project in the local ivy repository">
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="${version}"
+ pubdate="${now}"
+ status="integration"
+ forcedeliver="true"
+ />
+ <echo message="project ${ant.project.name} published locally with version ${version}" />
+</target>
+
+----
+
+This is very similar to the publish task, except that this publishes the revision to the local repository, which is used only in your environment and doesn't disturb the team. When you change something in a module and want to benefit from the change in another one, you can simply call `publish-local` in this module, and then your next build of the other module will automatically get this local version.
+
+=== clean-local
+
+
+[source]
+----
+
+<target name="clean-local" description="--> cleans the local repository for the current module">
+ <delete dir="${ivy.local.default.root}/${ant.project.name}"/>
+</target>
+
+----
+
+This target is used when you don't want to use your local version of a module anymore. For example, when you release a new version to the whole team, or discard your local changes and want to take advantage of a new version from the team.
+
+=== report
+
+
+[source]
+----
+
+<target name="report" depends="resolve" description="--> generates a report of dependencies">
+ <ivy:report todir="${build.dir}"/>
+</target>
+
+----
+
+Generates both an html report and a graphml report.
+
+For example, to generate a graph like the one shown at the beginning of this tutorial, you just have to follow the instructions given link:../yed.html[here] with the graphml file you will find in
+[source]
+----
+projects/console/build/
+----
+
+after having called report in the console project, and that's it, you have a clear overview of all your app dependencies!
+
+
+== Playing with the projects
+
+You can play with this tutorial by using regular Ant commands. Begin in the base directory of the tutorial (src/example/multi-project), and run ant -p:
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/multi-project-general-antp.txt[]
+
+----
+
+
+
+This gives you an idea of what you can do here. To make sure you have at least one version of all your modules published in your repository (required to build modules having dependencies on the others), you can run `ant publish-all` (example log link:log/multi-project-general-publishall.txt[here]).
+
+You will see that Ivy calls the publish target on all the modules, following the order of the dependencies, so that a dependee is always built and published before its depender. Feel free to make changes in the source code of a module (changing a method name for instance) and in the module using the method, then call publish-all to see how the change in the dependee is compiled first, published, and then available to the depender which can compile successfully.
+
+Then you can go in one of the example project directories (like projects/find for instance), and run `ant -p`:
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/multi-project-find-antp.txt[]
+
+----
+
+
+
+You can see the targets available, thanks to the import of the `common.xml` build file. Play with the project by calling resolve, and publish, and see what happens when you do the same in other projects. An interesting thing to do for instance, is to change the dependencies of a project. If the module version now depends on a new commons library, you will see that all other projects depending on that version will get this library as part of their transitive dependencies once the new revision of the version project is published. Very easy! And if a project introduces a change with which the depender isn't compatible with yet, you can easily change the dependency in the depender to move from `latest.integration` to a fixed version with which the depender is compatible (probably the latest before the change). Keeping your modules under control is now very easy!
+
+By now, you should be pretty familiar with multi-project development with Ivy. We hope you will appreciate its power and flexibility! And these tutorials are only the beginning of your journey with Ivy, browse the link:../reference.html[reference documentation] to learn more about the features, subscribe to the mailing lists to share your experience and ask questions with the community, browse the source code, open jira issues, submit patches, join in and help make Ivy the best of dependency management tools!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/tutorial/start.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/start.adoc b/asciidoc/tutorial/start.adoc
new file mode 100644
index 0000000..40fbf38
--- /dev/null
+++ b/asciidoc/tutorial/start.adoc
@@ -0,0 +1,109 @@
+
+In this tutorial, you will see one of the simplest ways to use Ivy. With no specific settings, Ivy uses the maven 2 repository to resolve the dependencies you declare in an Ivy file. Let's have a look at the content of the files involved.
+
+_You'll find this tutorial's sources in the ivy distribution in the src/example/hello-ivy directory._
+
+
+== The ivy.xml file
+
+This file is used to describe the dependencies of the project on other libraries.
+Here is the sample:
+
+[source]
+----
+
+<ivy-module version="2.0">
+ <info organisation="org.apache" module="hello-ivy"/>
+ <dependencies>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
+ <dependency org="commons-cli" name="commons-cli" rev="1.0"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+The format of this file should pretty easy to understand, but let's give some details about what is declared here. First, the root element ivy-module, with the version attribute used to tell Ivy which version of Ivy this file uses.
+
+Then there is an info tag, which is used to give information about the module for which we are defining dependencies. Here we define only the organization and module name. You are free to choose whatever you want for them, but we recommend avoiding spaces for both.
+
+Finally, the dependencies section lets you define dependencies. Here this module depends on two libraries: commons-lang and commons-cli. As you can see, we use the `org` and `name` attributes to define the organization and module name of the dependencies we need. The `rev` attribute is used to specify the version of the module you depend on.
+
+To know what to put in these attributes, you need to know the exact information for the libraries you depend on. Ivy uses the maven 2 repository by default, so we recommend you use link:http://mvnrepository.com[mvnrepository.com] to look for the module you want. Once you find it, you will have the details on how to declare the dependency in a maven POM. For instance:
+
+[source]
+----
+
+<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+</dependency>
+
+----
+
+To convert this into an Ivy dependency declaration, all you have to do is use the groupId as organization, the artifactId as module name, and the version as revision. That's what we did for the dependencies in this tutorial, that is commons-lang and commons-cli. Note that having commons-lang and commons-cli as organization is not the best example of what the organization should be. It would be better to use org.apache, org.apache.commons or org.apache.commons.lang. However, this is how these modules are identified in the maven 2 repository, so the simplest way to get them is to use the details as is (you will see in link:../tutorial/build-repository.html[Building a repository] that you can use namespaces to redefine these names if you want something cleaner).
+
+If you want more details on what you can do in Ivy files, you can have a look at the link:../ivyfile.html[Ivy files reference documentation].
+
+== The build.xml file
+
+The corresponding build file contains a set of targets, allowing you to resolve dependencies declared in the Ivy file, to compile and run the sample code, produce a report of dependency resolution, and clean the cache or the project.
+You can use the standard "ant -p" to get the list of available targets. Feel free to have a look at the whole file, but here is the part relevant to dependency resolution:
+
+[source]
+----
+
+<project xmlns:ivy="antlib:org.apache.ivy.ant" name="hello-ivy" default="run">
+
+ ...
+
+ <!-- =================================
+ target: resolve
+ ================================= -->
+ <target name="resolve" description="--> retrieve dependencies with ivy">
+ <ivy:retrieve />
+ </target>
+</project>
+
+----
+
+As you can see, it's very easy to call Ivy to resolve and retrieve dependencies: all you need if Ivy is properly link:../install.html[installed] is to define an XML namespace in your Ant file (xmlns:ivy="antlib:org.apache.ivy.ant"). Then all the link:../ant.html[Ivy ant tasks] will be available in this namespace.
+
+Here we use only one task: the link:../use/retrieve.html[retrieve] task. With no attributes, it will use default settings and look for a file named `ivy.xml` for the dependency definitions. That's exactly what we want, so we need nothing more than that.
+
+Note that in this case we define a `resolve` target and call the `link:../use/retrieve.html[retrieve]` task. This may sound confusing, actually the retrieve task performs a link:../use/resolve.html[resolve] (which resolves dependencies and downloads them to a cache) followed by a retrieve (a copy of those file to a local project directory). Check the link:../principle.html[How does it work ?] page for details about that.
+
+== Running the project
+
+OK, now that we have seen the files involved, let's run the sample to see what happens. Open a shell (or command line) window, and enter the `hello-ivy` example directory.
+Then, at the command prompt, run `ant`:
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/hello-ivy-1.txt[]
+
+----
+
+
+
+== What happened ?
+
+Without any settings, Ivy retrieves files from the maven 2 repository. That's what happened here.
+The resolve task has found the commons-lang and commons-cli modules in the maven 2 repository, identified that commons-cli depends on commons-logging and so resolved it as a transitive dependency. Then Ivy has downloaded all corresponding artifacts in its cache (by default in your user home, in a .ivy2/cache directory). Finally, the retrieve task copies the resolved jars from the ivy cache to the default library directory of the project: the lib dir (you can change this easily by setting the pattern attribute on the link:../use/retrieve.html[retrieve] task).
+
+You might say that the task took a long time just to write out a "Hello Ivy!" message. But remember that a lot of time was spent downloading the required files from the web. Let's try to run it again:
+
+[source,shell]
+----
+
+include::asciidoc/tutorial/log/hello-ivy-2.txt[]
+
+----
+
+
+Great! The cache was used, so no download was needed and the build was instantaneous.
+
+And now, if you want to generate a report detailing all the dependencies of your module, you can call the report target, and check the generated file in the build directory. You should obtain something looking like link:../samples/apache-hello-ivy-default.html[this].
+
+As you can see, using Ivy to resolve dependencies stored in the maven 2 repository is extremely easy. Now you can go on with the next tutorials to learn more about link:../tutorial/conf.html[how to use module configurations] which is a very powerful Ivy specific feature. Other tutorials are also available where you will learn how to use Ivy settings to leverage a possibly complex enterprise repository. It may also be a good time to start reading the link:../reference.html[reference documentation], and especially the introduction material which gives a good overview of Ivy. The link:../bestpractices.html[best practices] page is also a must read to start thinking about how to use Ant+Ivy to build a clean and robust build system.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/artifactproperty.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/artifactproperty.adoc b/asciidoc/use/artifactproperty.adoc
new file mode 100644
index 0000000..f9bfb77
--- /dev/null
+++ b/asciidoc/use/artifactproperty.adoc
@@ -0,0 +1,57 @@
+
+*__since 1.1__*
+Sets an ant property for each dependency artifacts previously resolved.
+
+*__since 2.0__* This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+Please prefer the use of retrieve + standard ant path creation, which make your build more independent from ivy (once artifacts are properly retrieved, ivy is not required any more).
+
+The property name and value are generated using the classical pattern concept, all artifact tokens and ivy variables being available.
+
+*__since 2.0__* This tag will follow the ant usual behavior for properties. If a property of the same name already exist, it's value will be unchanged. This behavior can be changed using the 'overwrite' attribute.
+__WARNING : Before 2.0, the behavior was to overwrite the properties. Since 2.0, the default is to not overwrite to properties__
+
+
+
+== Attributes
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|a pattern used to generate the name of the properties to set|Yes
+|value|a pattern used to generate the value of the properties to set|Yes
+|conf|a comma separated list of the configurations for which properties should be set|No. Defaults to the configurations resolved by the last resolve call, or * if no resolve was explicitly called
+|haltonfailure|true to halt the build on ivy failure, false to continue|No. Defaults to true
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|settingsRef|A reference to the ivy settings that must be used by this task *(since 2.0)*|No, 'ivy.instance' is taken by default.
+|overwrite|Overwrite the value of the property if it already exist *(since 2.0)*. Before 2.0, the properties were always overwritten.|No, 'false' by default.
+|=======
+
+
+
+== Example
+
+Suppose we have one dependency called __mydep__ in revision 1.0 publishing two artifacts: __foo.jar__ and __bar.jar__.
+Then:
+
+[source]
+----
+
+<artifactproperty conf="build"
+ name="[module].[artifact]-[revision]"
+ value="${cache.dir}/[module]/[artifact]-[revision].[ext]"/>
+
+----
+
+will set two properties:
+
+[source]
+----
+
+mydep.foo-1.0 = my/cache/dir/mydep/foo-1.0.jar
+mydep.bar-1.0 = my/cache/dir/mydep/bar-1.0.jar
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/artifactreport.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/artifactreport.adoc b/asciidoc/use/artifactreport.adoc
new file mode 100644
index 0000000..5dde634
--- /dev/null
+++ b/asciidoc/use/artifactreport.adoc
@@ -0,0 +1,82 @@
+
+*__since 1.4__*
+The artifactreport task generates an xml report of all artifacts dependencies resolved by the last link:../use/resolve.html[resolve] task call during the same build.
+
+*__since 2.0__* This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+This report is different from the standard link:../use/report.html[report] which reports all modules and artifacts, whle this report is much simpler and focuses only on artifacts, and gives more information on artifacts, such as the original location and the retrieve location.
+
+It is thus easy to use to generate things like a classpath file for an IDE.
+
+See this link:http://www.jaya.free.fr/ivy/doc/articles/ease-multi-module.html[article by Johan Stuyts] (who contributed this task) to see how he uses this task.
+
+Here is an example of generate file:
+
+[source]
+----
+
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+ <module organisation="hippo" name="sant-classes" rev="1.01.00b04-dev" status="integration">
+ <artifact name="sant-classes-src" ext="zip" type="zip">
+ <origin-location is-local="true">
+ C:/home/jstuyts/data/ivy/local/hippo/sant-classes/1.01.00b04-dev/sant-classes-src-1.01.00b04-dev.zip</origin-location>
+ <cache-location>
+ C:/home/jstuyts/data/ivy/cache/hippo/sant-classes/zips/sant-classes-src-1.01.00b04-dev.zip</cache-location>
+ <retrieve-location>lib/test/sant-classes-src-1.01.00b04-dev.zip</retrieve-location>
+ </artifact>
+ <artifact name="sant-classes-unoptimized" ext="jar" type="jar">
+ <origin-location is-local="true">
+ C:/home/jstuyts/data/ivy/local/hippo/sant-classes/1.01.00b04-dev/sant-classes-unoptimized-1.01.00b04-dev.jar</origin-location>
+ <cache-location>
+ C:/home/jstuyts/data/ivy/cache/hippo/sant-classes/jars/sant-classes-unoptimized-1.01.00b04-dev.jar</cache-location>
+ <retrieve-location>lib/test/sant-classes-unoptimized-1.01.00b04-dev.jar</retrieve-location>
+ </artifact>
+ </module>
+ <module organisation="testng" name="testng" rev="4.6.1-jdk15" status="release">
+ <artifact name="testng" ext="jar" type="jar">
+ <origin-location is-local="false">
+ http://repository.hippocms.org/maven/testng/jars/testng-4.6.1-jdk15.jar</origin-location>
+ <cache-location>C:/home/jstuyts/data/ivy/cache/testng/testng/jars/testng-4.6.1-jdk15.jar</cache-location>
+ <retrieve-location>lib/test/testng-4.6.1-jdk15.jar</retrieve-location>
+ </artifact>
+ </module>
+
+----
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|tofile|the file to which the report should be written|Yes
+|pattern|the retrieve pattern to use to fill the retrieve location information about the artifacts|No. Defaults to ${ivy.retrieve.pattern}.
+|conf|a comma separated list of the configurations to use to generate the report|No. Defaults to the configurations resolved by the last resolve call
+|haltonfailure|true to halt the build on ivy failure, false to continue|No. Defaults to true
+|settingsRef|A reference to the ivy settings that must be used by this task *(since 2.0)*|No, 'ivy.instance' is taken by default.
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:artifactreport tofile="${basedir}/path/to/myreport.xml" />
+
+----
+
+Generates the artifact report for all configurations resolved during the last resolve call (in the same build).
+
+
+[source]
+----
+
+<ivy:artifactreport tofile="${basedir}/path/to/myreport.xml" conf="default"/>
+
+----
+
+Generates the artifact report for only the default configuration resolved during the last resolve call.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/buildlist.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildlist.adoc b/asciidoc/use/buildlist.adoc
new file mode 100644
index 0000000..fa1cb38
--- /dev/null
+++ b/asciidoc/use/buildlist.adoc
@@ -0,0 +1,143 @@
+
+The buildlist task enable to obtain a filelist of files (usually build.xml files) ordered according to ivy dependency information from the least dependent to the most one, or the inverse. (*__since 1.2__*)
+
+This is particularly useful combined with subant, to build a set of interelated projects being sure that a dependency will be built before any module depending on it.
+
+When the ivy.xml of the modules that you want to order doesn't contains a link:../ivyfile/info.html[revision] numbers, the rev attributes declared in the dependency is not used.
+When the ivy.xml of the modules that you want to order contains a link:../ivyfile/info.html[revision] numbers, the revision numbers are used. If the revision number doesn't match a dependency description a warning is logged and the modules is considered as different modules.
+
+*__since 1.3__* A root attribute can also be used to include, among all the modules found, only the one that are dependencies (either direct or transitive) of a root module. This can also be used with the excluderoot attribute, which when set to true will exclude the root itself from the list.
+
+*__since 1.4.1__* A leaf attribute can also be used to include, among all the modules found, only the one that have dependencies (either direct or transitive) on a leaf module. This can also be used with the excludeleaf attribute, which when set to true will exclude the leaf itself from the list.
+
+*__since 1.4__* The ivy.sorted.modules property is set in the ant at the end of the task with a comma separated list of ordered modules. This can be useful for debug or information purpose.
+
+*__since 2.0__* The root and leaf attributes can be a delimited list of modules to use as roots. These modules, and all their dependencies will be included in the build list.
+
+*__since 2.0__* By default, all the modules included in a circular dependency are grouped together so that any dependency of any module in the loop will apear before the modules in the loop. This garantee that if there is a depedendency path between a module A and a module B (but no dependency path from B to A), B will alway apear before A even if A is included in a loop in the provided set of modules to sort.
+Note that circular dependency can also trigger a failure depending on the value configured in the circularDependencyStrategy of your link:../settings/conf.html#circularDependencyStrategy[settings]
+
+*__since 2.0__* When you are specifying root or leaf modules you can limit the resulting list to only direct dependencies of the roots modules or to modules that directly depends on your leaf modules.
+
+*__since 2.0__* You can also specify a restartFrom modules. The difference with root or leaf, is that you get a list starting at the restartFrom module followed by all the modules that would be after if the parameter would not be there (even if there is no dependency between the restartFrom and the following module).
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|reference|the reference of the path to set|Yes
+|ivyfilepath|the relative path from files to order to corresponding ivy files|No. Defaults to ${ivy.buildlist.ivyfilepath}
+|root|*__since 2.0__* the names of the modules which should be considered as the root of the buildlist.
+*__since 1.3__* Was limited to only one module name before 2.0.|No. Defaults to no root (all modules are used in the build list)
+|excluderoot|*__since 1.3__* true if the root defined should be excluded from the list|No. Defaults to false
+|leaf|*__since 2.0__* the names of the modules which should be considered as the leaf of the buildlist.
+*__since 1.4.1__* Was limited to only one module name before 2.0.|No. Defaults to no leaf (all modules are used in the build list)
+|onlydirectdep|*__since 2.0__* true if the
+resulting list should be restricted to direct dependencies of root modules or modules that directly depends on the leaf modules.
+
+This field is ignored when neither root neither leaf is filled.
+ |No. Defaults to no false
+|delimiter|*__since 2.0__* delimiter to use when specifying multiple module names in the root and leaf properties.|No. Defaults to the comma (,) character.
+|excludeleaf|*__since 1.4.1__* true if the leaf defined should be excluded from the list|No. Defaults to false
+|haltonerror|true to halt the build when an invalid ivy file is encountered, false to continue|No. Defaults to true
+|skipbuildwithoutivy|Deprecated, use onMissingDescriptor instead. true to skip files of the fileset with no corresponding ivy file, false otherwise. If false the file with no corresponding ivy file will be considered as independent of the other and put at the beginning of the built filelist.|No. Defaults to false
+|onMissingDescriptor|*__since 2.0__* Specify the action to take when no module descriptor file is found for a file of the fileset. Possible values are:
+
+
+* head +
+put at the head of the built filelist.
+
+* tail +
+put at the tail of the built filelist.
+
+* skip +
+skip the file, which won't be put in the build filelist at all.
+
+* warn +
+warn and put at the head of the build filelist.
+
+* fail +
+halt the build with a failure.
+
+ |No. Defaults to 'head'
+|reverse|true to obtain the list in the reverse order, i.e. from the most dependent to the least one|No. Defaults to default false
+|restartFrom|*__since 2.0__* The name of the module which should be considered as the starting point in the buildlist. This allows for the build to be started at any point in the dependency chain.
+|No. Defaults to '*' meaning no restart point (all modules are used in the build list).
+|settingsRef|*__since 2.0__* A reference to the ivy settings that must be used by this task|No, 'ivy.instance' is taken by default.
+|=======
+
+
+
+=== Parameters specified as nested elements
+
+
+==== fileset
+
+FileSets are used to select sets of files to order.
+
+== Examples
+
+
+[source]
+----
+
+ <ivy:buildlist reference="build-path">
+ <fileset dir="projects" includes="**/build.xml"/>
+ </ivy:buildlist>
+
+----
+
+Builds a list of build.xml files sorted according to the ivy.xml files found at the same level (the default value for ivyfilepath is ivy.xml).
+
+This list can then be used like that:
+
+[source]
+----
+
+ <subant target="build" buildpathref="build-path" />
+
+----
+
+
+'''
+
+
+[source]
+----
+
+ <ivy:buildlist reference="build-path" ivyfilepath="ivy/ivy.xml" reverse="true">
+ <fileset dir="projects" includes="**/build.xml"/>
+ </ivy:buildlist>
+
+----
+
+Builds a list of build.xml files sorted according to the ivy.xml files found in an ivy directory relative to those build files. The list is sorted from the most dependent to the least one.
+
+'''
+
+
+[source]
+----
+
+ <ivy:buildlist reference="build-path" ivyfilepath="ivy/ivy.xml" root="myapp">
+ <fileset dir="projects" includes="**/build.xml"/>
+ </ivy:buildlist>
+
+----
+
+Builds a list of build.xml files sorted according to the ivy.xml files found in an ivy directory relative to those build files. Only build.xml files of modules which are dependencies of myapp (either direct or transitive) are put in the result list.
+
+'''
+
+
+[source]
+----
+
+ <ivy:buildlist reference="build-path" ivyfilepath="ivy/ivy.xml" leaf="mymodule">
+ <fileset dir="projects" includes="**/build.xml"/>
+ </ivy:buildlist>
+
+----
+
+Builds a list of build.xml files sorted according to the ivy.xml files found in an ivy directory relative to those build files. Only build.xml files of modules which have dependencies (direct or transitive) on mymodule are put in the result list.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/buildnumber.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildnumber.adoc b/asciidoc/use/buildnumber.adoc
new file mode 100644
index 0000000..d8fee6d
--- /dev/null
+++ b/asciidoc/use/buildnumber.adoc
@@ -0,0 +1,137 @@
+
+*__since 1.4__*
+The buildnumber task is similar to the ant buildnumber task, except that it uses ivy repository to find what is the latest version and calculate a new one for you.
+
+When called it sets four properties according to what has been found.
+These properties are:
+
+
+* ivy.revision +
+ the last revision found in the repository
+
+* ivy.new.revision +
+ the new revision calculated from the last one (see below)
+
+* ivy.build.number +
+ the build number found in the repository
+
+* ivy.new.build.number +
+ the new build number calculated from the last one, usually with +1
+
+
+build numbers are always numbers (composed of digit characters only).
+ivy.revision can be not set if no revision was found
+ivy.build.number can be not set if no revision was found or if no number was found in it
+ivy.new.build.number can be not set if the default new revision to use when no revision is found do not contain any number
+
+The new revision is calculated using a somewhat complex to explain but very easy to use algorithm, depending on which latest version you asked.
+
+Indeed you can ask for a new revision based upon the latest found for a particular prefix (the revision asked), then the new revision will be the one immediately after with only the prefix in common. If no prefix is set the very latest version is searched.
+
+Examples (suppose the latest version of the module is 1.3.1):
+
+[]
+|=======
+
+|1.3|1.3.1|1.3.2|1|2
+|1|1.3.1|1.4|3|4
+|2|not set|2.0|not set|0
+||1.3.1|1.3.2|1|2
+|=======
+
+Note that when asking for revision 1, you can get a revision 10.0. To avoid that you can use 1. as revision asked, but in this case ivy won't find revision 1 if its the latest one, and it will thus give 1.0 as new revision. The solution to this problem is to use versions with always the same number of parts (for instance 1.0.0 instead of 1).
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the organisation of the module for which a new build number should be calculated|Yes
+|module|the name of the module for which a new build number should be calculated|Yes
+|branch|the branch of the module for which a new build number should be calculated|No, defaults to the default branch for this module
+|revision|the revision prefix for which a new build number should be calculated|No, defaults to no prefix (will find the latest version)
+|default|the default revision to assume when no revision prefix is asked and no revision is found|No, defaults to 0
+|defaultBuildNumber|the default build number to use for the first revision|No, defaults to 0
+|revSep|the revision separator to use when no matching revision is found, to separate the revision prefix from the build number|No, defaults to '.'
+|prefix|the prefix to use for the property names set (will be __prefix__.revision, __prefix__.new.revision, ...)|No, defaults to ivy
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*.|No, 'ivy.instance' is taken by default.
+|resolver|the name of the resolver to use for build number calculation *__(since 2.1)__*|No, all available resolvers will be used by default.
+|=======
+
+
+== Examples
+
+Here is how it can be used (suppose 1.3.1 is the latest version of ivy in the repository):
+
+[source]
+----
+
+<ivy:buildnumber organisation="apache" module="ivy" />
+
+----
+
+will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as new build number
+
+
+'''
+
+
+[source]
+----
+
+<ivy:buildnumber organisation="apache" module="ivy" revision="1.3" />
+
+----
+
+will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as new build number
+
+
+'''
+
+
+[source]
+----
+
+<ivy:buildnumber organisation="apache" module="ivy" revision="1.2" />
+
+----
+
+will set 1.2 as revision, 1.2.1 as new revision, no build number and 1 as new build number
+
+
+'''
+
+
+[source]
+----
+
+<ivy:buildnumber organisation="apache" module="ivy" revision="1." />
+
+----
+
+will set 1.3.1 as revision, 1.4 as new revision, 3 as build number and 4 as new build number
+
+
+'''
+
+
+[source]
+----
+
+<ivy:buildnumber organisation="apache" module="ivy" revision="3." />
+
+----
+
+will set no revision, 3.0 as new revision, no build number and 0 as new build number
+
+
+'''
+
+
+[source]
+----
+
+<ivy:buildnumber organisation="apache" module="ivy" revision="1.4-RC" defaultBuildNumber="1" revSep=""/>
+
+----
+
+If called while no release candidate is in the repository, will set ivy.revision to 1.4-RC1. Then it will increment each time, 1.4-RC2, 1.4-RC3, and so on.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/buildobr.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildobr.adoc b/asciidoc/use/buildobr.adoc
new file mode 100644
index 0000000..32d7798
--- /dev/null
+++ b/asciidoc/use/buildobr.adoc
@@ -0,0 +1,93 @@
+
+*__since 2.3__* From a set of jar artifacts, this task generates an OBR (OSGi Bundle Repository) descriptor. It could be then used by the link:../resolver/obr.html[obr resolver].
+
+The set of jars which will be described by the OBR can be defined in 4 exclusive ways:
+
+
+* via an Ivy resolver: every jar listed by the resolver will be taken into account +
+
+* by defining a root directory: every jar found recursively in that folder will be taken into account +
+
+* via the name of an Ivy cache: every artifact contained in the cache will be taken into account +
+
+* *__since 2.4__* via a resolve: this task is a link:../use/postresolvetask.html[post resolve task] (with all the behaviour and attributes common to all post resolve tasks), thus ever artifact which has been resolved will be taken into account; it is especially useful for building a link:../osgi/target-platform.html[target platform] +
+
+
+NB: among every listed files or artifacts, only the actually OSGi bundles will be described by the OBR descriptor; the other files are ignored.
+
+
+== Attributes
+
+
+*__since 2.4__* This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|out|the location of the descriptor file to generate|Yes
+|resolverName|the name of the resolver from which the jars should be to gathered|No
+|cacheName|the name of the cache from which the jars should be to gathered|No
+|baseDir|the folder into which the jars should be gather recursively|No
+|sourceType|if used as a post resolve task, 'sourceType' define the type of artifacts which should be considered as source artifacts (defaults to 'source,sources,src')|No
+|encoding|The encoding of the resulting xml file|No. Defaults to `UTF-8`
+|indent|Specify if the xml result file should be indented|No. Defaults to `true`
+|quiet|Log as debug rather than warning the rejected jars as they are illformed|No. Defaults to `false`
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+ <ivy:buildobr baseDir="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true" />
+
+----
+
+Builds an indented OBR descriptor from an Eclipse install, with their path relative to the Eclipse install.
+
+
+'''
+
+
+[source]
+----
+
+ <ivy:configure file="ivysettings.xml" />
+ <ivy:buildobr resolverName="my-file-resolver" out="${basedir}/target/repo-eclipse.xml" />
+
+----
+
+Configure an Ivy settings and builds an OBR descriptor from jars resolved by the defined resolver.
+
+
+'''
+
+
+[source]
+----
+
+ <ivy:configure file="ivysettings.xml" />
+ <ivy:buildobr cacheName="my-cache" out="${basedir}/target/repo-eclipse.xml" />
+
+----
+
+Configure an Ivy settings and builds an OBR descriptor from jars contained in the defined cache.
+
+
+'''
+
+
+[source]
+----
+
+ <ivy:configure file="ivysettings.xml" />
+ <ivy:resolve file="ivy.xml" />
+ <ivy:buildobr out="${basedir}/target-platform-obr.xml" />
+
+----
+
+Launch a resolve and then build an obr.xml describing the resolved artifacts.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/cachefileset.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cachefileset.adoc b/asciidoc/use/cachefileset.adoc
new file mode 100644
index 0000000..3f83669
--- /dev/null
+++ b/asciidoc/use/cachefileset.adoc
@@ -0,0 +1,37 @@
+
+Constructs an ant fileset consisting of artifacts in ivy cache for a configuration (*__since 1.2__*).
+
+
+This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks. Note that this task
+does not rely on retrieve, because built fileset is made of artifacts direcly in ivy cache.
+
+
+Please prefer the use of retrieve + standard ant path creation, which make your build
+more independent from ivy (once artifacts are properly retrieved, ivy is not required any more).
+
+
+Built fileset is registered in ant with a given id, and can thus be used like any other ant fileset using
+refid.
+
+
+=== Limitation
+
+A fileset, in Ant, requires a base directory from within which the files are included/excluded. The cachefileset task, in Ivy, internally tries to determine a common base directory across all the resolved artifacts' files that have been downloaded in the Ivy repository cache(s). Given that Ivy can be configured to consist multiple repository caches and each one can potentially be on a different filesystem root, there are times, when cachefileset cannot determine a common base directory for these resolved artifacts. The cachefileset throws an exception in such cases.
+
+
+=== Alternative task
+
+If cachefileset doesn't fit the need of your use case (maybe due to the limitations noted above), the link:../use/resources.html[resources] task could be an alternative task to use in certain cases.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|setid|the id to reference the built fileset|Yes
+|conf|a comma separated list of the configurations to put in the created path|No. Defaults to the configurations resolved by the last resolve call, or * if no resolve was explicitly called
+|type|comma separated list of artifact types to accept in the path, * for all|No. Defaults to *
+|settingsRef|*__(since 2.0)__* A reference to the ivy settings that must be used by this task|No, 'ivy.instance' is taken by default.
+|=======
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/cachepath.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cachepath.adoc b/asciidoc/use/cachepath.adoc
new file mode 100644
index 0000000..4a84b82
--- /dev/null
+++ b/asciidoc/use/cachepath.adoc
@@ -0,0 +1,61 @@
+
+Constructs an ant path consisting of artifacts in ivy cache (or origin location with depending on useOrigin setting) for a resolved module configuration.
+
+This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+If you want to make your build more independent from Ivy, you could consider using the link:../use/retrieve.html[retrieve task]. Once the artifacts are properly retrieved, you can use standard Ant path creation which makes Ivy not necessary any more.
+
+Built path is registered in ant with a given id, and can thus be used like any other ant path using refid.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|pathid|the id to reference the built path|Yes
+|conf|a comma separated list of the configurations to put in the created path|No. Defaults to the configurations resolved by the last resolve call, or * if no resolve was explicitly called
+|type|comma separated list of artifact types to accept in the path, * for all (*__since 1.2__*)|No. Defaults to *
+|settingsRef|*__(since 2.0)__* A reference to the ivy settings that must be used by this task|No, 'ivy.instance' is taken by default.
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<cachepath pathid="default.classpath" conf="default" />
+
+----
+
+Construct an ant path composed of all artifacts being part of the default configuration obtained through the last resolve call.
+
+
+'''
+
+
+
+[source]
+----
+
+<cachepath pathid="default.classpath" conf="default" useOrigin="true" />
+
+----
+
+Same as before but will use the original location for local artifacts, and the cache location for other artifacts.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:cachepath organisation="emma" module="emma" revision="2.0.4217" inline="true" conf="ant" pathid="emma.classpath"/>
+<taskdef resource="emma_ant.properties" classpathref="emma.classpath" />
+
+----
+
+Resolves the emma module in version 2.0.4217, constructs an ant path with the corresponding artifacts, and then define the emma tasks using this path.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/checkdepsupdate.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/checkdepsupdate.adoc b/asciidoc/use/checkdepsupdate.adoc
new file mode 100644
index 0000000..1b7b6bc
--- /dev/null
+++ b/asciidoc/use/checkdepsupdate.adoc
@@ -0,0 +1,69 @@
+
+Display dependency updates on the console. This task can also show transitive dependencies updates and detect missing or new dependencies if you update dependencies.
+
+This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+Please prefer the use of retrieve + standard ant path creation, which make your build more independent from ivy (once artifacts are properly retrieved, ivy is not required any more).
+
+
+== Attributes
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|revisionToCheck|target revision to check|No. Defaults to 'latest.integration'
+|download|specify if artifact should be downloaded when new updates are found|No. Defaults to 'false'
+|checkIfChanged|When set to true, the resolve will compare the result with the last resolution done on this module, with those configurations in order to define the property ivy.deps.changed. Put it to false may provides slightly better performance.|No, default to 'false'
+|showTransitive|set to true if you want to see potential updates on transitive dependencies|No. Defaults to 'false'
+|=======
+
+
+
+== Example
+
+Suppose we have two dependencies one called __mydep__ in revision 1.0 and one called __myotherdependency__ in revision 2.0.
+__mydep__ has a transitive dependency on __mytransitivedependency__ in revision 2.2.
+
+Then:
+
+[source]
+----
+
+<checkdepsupdate />
+
+----
+
+will display the following updates in the console:
+
+[source]
+----
+
+Dependencies updates available :
+ mycompany#mydep 1.0 -> 2.0
+ mycompany#myotherdependency 2.0 -> 2.2
+
+----
+
+Same example with transitive dependencies :
+
+[source]
+----
+
+<checkdepsupdate showTransitive="true" />
+
+----
+
+will display the following updates in the console:
+
+[source]
+----
+
+Dependencies updates available :
+ mycompany#mydep 1.0 -> 2.0
+ mycompany#myotherdependency 2.0 -> 2.2
+ mycompany##mytransitivedependency (transitive) 2.2 -> 2.4
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/cleancache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cleancache.adoc b/asciidoc/use/cleancache.adoc
new file mode 100644
index 0000000..8118572
--- /dev/null
+++ b/asciidoc/use/cleancache.adoc
@@ -0,0 +1,49 @@
+
+*__since 2.0__*
+Cleans the Ivy cache.
+
+This task is roughly equivalent to:
+
+[source]
+----
+
+<delete dir="${ivy.cache.dir}" />
+
+----
+
+Using the regular Ant delete task is more flexible, since it allows to specify the files to delete. But it requires an Ivy settings to be loaded, and settings scoping is possible only by using suffixed ant property for the cache directory.
+
+This task loads the Ivy settings as any other post settings task, and allows easy scoping with the attribute settingsRef.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|settingsRef|A reference to the ivy settings that must be used by this task|No, 'ivy.instance' is taken by default.
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:cleancache />
+
+----
+
+Cleans the cache directory as defined in the loaded settings (by default ~/.ivy2/cache)
+
+
+[source]
+----
+
+<ivy:cleancache settingsRef="mysettings"/>
+
+----
+
+Cleans the cache directory as defined in the loaded settings identified as 'mysettings'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/configure.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/configure.adoc b/asciidoc/use/configure.adoc
new file mode 100644
index 0000000..772ca1a
--- /dev/null
+++ b/asciidoc/use/configure.adoc
@@ -0,0 +1,90 @@
+
+The configure task is used to configure ivy with an xml settings file.
+
+
+See link:../settings.html[Settings Files] for details about the settings file itself.
+
+
+
+*__since 2.0__* The file loaded used to be called configuration file in versions prior to 2.0. The name 'settings' and the use of the ivy.settings.file is new to 2.0.
+
+*__since 2.0__* It is also possible to configure Ivy with the link:../use/settings.html[settings] declaration. The difference with this task is that when using the settings declaration, the configuration of Ivy will be done when the settings are first needed (for instance when you do a resolve), while the configure task will perform a configuration of Ivy instantly, which makes it easier to see the problem if something goes wrong.
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|settingsId|The settings id useable in the settingsRef attributes of the ivy task that needs a setting. Note that the ivy tasks will search by default for the settings with the id "ivy.instance", which is the default value.|No, defaults to "ivy.instance"
+|file|path to the settings file to use|No. If a file is provided, url is ignored. If none are provided, then it attempts to find a file at ${ivy.settings.file}, and if this file does not exist, it uses ${ivy.settings.url} *__(since 2.3)__* or a link:../samples/ivysettings-default.xml[default settings file]
+|url|url of the settings file to use
+|override|Specify what to do when another settings with the same id has already been loaded.
+* true +
+ the current settings will take precedence over any previously defined setting with this id
+* false +
+ the current settings will not override a previously defined setting with this id
+* notallowed +
+an error is raised if a settings has already been defined with this id|No, defaults to "notallowed"
+|host|http authentication host|No, unless authentication is required
+|realm|http authentication realm
+|username|http authentication user name
+|passwd|http authentication password
+|=======
+
+
+=== HTTP Authentication
+
+If any of the url you use in ivy (especially in dependency resolvers) need http
+authentication, then you have to provide the host, realm, username and passwd
+attributes of the configure task. These settings will then be used in any
+further call to ivy tasks.
+
+
+
+*Since 1.4:*
+It's also possible to configure authentication settings for multiple urls. This can be done with the <credentials> subelements. See the examples for more details.
+
+
+=== Examples
+
+
+==== Simplest settings
+
+
+[source]
+----
+<ivy:configure />
+----
+
+Use either ${ivy.settings.file} if it exists, or the link:../samples/ivysettings-default.xml[default settings file]
+
+==== Configure with a file
+
+
+[source]
+----
+<ivy:configure file="myconffile.xml" />
+----
+
+
+==== Configure with an url
+
+
+[source]
+----
+<ivy:configure url="http://mysite.com/myconffile.xml" />
+----
+
+
+==== Configure multiple URLs which require autentication
+
+
+[source]
+----
+
+<ivy:configure file="path/to/my/ivysettings.xml">
+ <credentials host="myhost.com" realm="My Realm" username="myuser" passwd="mypasswd" />
+ <credentials host="yourhost.com" realm="Your Realm" username="myuser" passwd="myotherpasswd" />
+</ivy:configure>
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/convertmanifest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/convertmanifest.adoc b/asciidoc/use/convertmanifest.adoc
new file mode 100644
index 0000000..d216653
--- /dev/null
+++ b/asciidoc/use/convertmanifest.adoc
@@ -0,0 +1,24 @@
+
+*__since 2.3__* Convert a MANIFEST.MF into an ivy.ml file
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|manifest|the location of the MANIFEST.MF to convert|Yes
+|ivyFile|the location of the ivy.xml file to generate|Yes
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+ <ivy:convertmanifest manifest="META-INF/MANIFEST.MF" ivyFile="ivy.xml" />
+
+----
+
+Just converts a manifest into an ivy.xml file.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/convertpom.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/convertpom.adoc b/asciidoc/use/convertpom.adoc
new file mode 100644
index 0000000..eef69d1
--- /dev/null
+++ b/asciidoc/use/convertpom.adoc
@@ -0,0 +1,24 @@
+
+*__since 2.1__* Convert pom.xml into an ivy.xml
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|pomFile|the location of the pom.xml to convert|Yes
+|ivyFile|the location of the ivy.xml to generate|Yes
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+ <ivy:convertpom pomFile="pom.xml" ivyFile="ivy.xml" />
+
+----
+
+Just convert an pom.xml file into an ivy.xml.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/deliver.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/deliver.adoc b/asciidoc/use/deliver.adoc
new file mode 100644
index 0000000..eb50b55
--- /dev/null
+++ b/asciidoc/use/deliver.adoc
@@ -0,0 +1,112 @@
+
+Deliver a resolved descriptor of the current module, and possibly perform a recursive delivery of dependencies.
+
+This task does two main things:
+
+=== Generate a resolved ivy file
+
+This task generates a resolved descriptor of the current module, based upon the last resolve done. The resolved ivy file contains updated information about the delivered module, such as revision and status.
+
+Moreover, all included configurations' files are included in the ivy file, and variables are replaced by their values.
+
+Finally, in the resolved ivy file, dynamic revisions are replaced by the static ones that have been found during the resolve step, so the ivy file can be used later safely to obtain the same dependencies (providing that a revision uniquely identifies a module, which should be the case for proper ivy use).
+
+*__since 1.3__* The replacement of dynamic revisions by static ones can be turned off, so that dynamic revisions are kept in the ivy file. This is an exception to the recommended standard that published module descriptors be fully resolved, so use it with caution.
+
+
+=== do recursive delivery
+
+This is done only if a deliver target is given to the deliver task.
+
+If a deliver target is set, then it is called (via an antcall) for each dependency which has not a suffisant status compared to the deliver status set for this task. This means that if you deliver an integration revision, no recursive delivery will be done.
+
+If you deliver a milestone or a release revision, deliver target will be called with each integration dependency.
+
+The deliver target is called with the following properties available:
+
+
+* dependency.name +
+the name of the dependency to recursively deliver
+
+* dependency.published.status +
+the status to which the dependency should be delivered
+
+* dependency.published.version +
+the revision to which the dependency should be delivered
+
+* dependency.version +
+the revision of the dependency that should be delivered (the one that was retrieved during last resolve)
+
+Both
+[source]
+----
+dependency.published.status
+----
+
+and
+[source]
+----
+dependency.published.version
+----
+
+can be either asked to the user through ant input tasks (default behaviour), or be always the same for the whole recursive delivery process if the following properties are set:
+
+
+* recursive.delivery.status +
+set to the status to which all dependencies requiring to be delivered will be
+
+* recursive.delivery.version +
+set to the version to which all dependencies requiring to be delivered will be
+
+
+Usually the deliver target itself triggers an another ant build (using ant task) even if this is up to you to decide.
+
+The delivered ivy file will update its dependency revisions with those given here.
+
+
+=== deliver and publish
+
+The deliver task is most of the time not called explicitly, but rather called automatically by the link:../use/publish.html[publish] task. So, when shall the deliver task be called explictly? When you actually need to separate what is performed by the deliver task (see above), from what is performed by the publish task, i.e. upload a module to a repository.
+
+And this can be particularly useful if you want to process the generated ivy file before uploading it (if you want to add automatically more information like an SCM tag used, the user who performed the release, ...).
+
+It can also be useful if you want to trigger a recursive delivery and then ensure that you get the recursively delivered modules as dependencies. In this case your build order may look like this:
+- ivy:configure
+- ivy:resolve
+- ivy:deliver with recursive delivery
+- ivy:resolve again with the ivy file generated by the recursive delivery
+- do your build stuff (compile, jar, whatever)
+- ivy:publish
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|deliverpattern|the pattern to use for ivy file delivery|No. Defaults to ${ivy.deliver.ivy.pattern}
+|pubrevision|the revision to use for the publication|No. Defaults to ${ivy.deliver.revision} if set, or the revision resolved if set, or a timestamp
+|pubbranch|the branch to use for the publication|No. Defaults to ${ivy.deliver.branch} if set, or the branch resolved if set, or nothing (branch info won't be updated)
+|pubdate|the publication date to use for the publication. This date should be either 'now', or a date given with the following pattern: yyyyMMddHHmmss|No. Defaults to 'now'
+|status|the status to use for the publication|No. Defaults to ${ivy.status}
+|delivertarget|the target to call for recursive delivery|No. No recursive delivery is done by default
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|replacedynamicrev|true to replace dynamic revisions by static ones in the delivered file, false to avoid this replacement *__(since 1.3)__*|No. Defaults to true
+|replaceForcedRev|true to replace revisions (static or dynamic) by the revision of the resolver in link:../settings/resolvers.html#common[forced mode], false to avoid this replacement *__(since 2.2)__*|No. Defaults to false
+|merge|if a descriptor link:../ivyfile/extends.html[extends] a parent, merge the inherited information directly into the delivered descriptor. The __extends__ element itself will be commented out in the delivered descriptor. *__(since 2.2)__*|No. Defaults to true.
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|conf|comma-separated list of configurations to include in the delivered file. Accepts wildcards. *__(since 2.0)__*|No. Defaults to all configurations
+|generateRevConstraint|true to automatically generate a 'revConstraint' attribute in the deliverd file (see the link:../ivyfile/dependency.html[dependency] page for more info about this attribute), false to never generate this attribute *__(since 2.1.0)__*|No. Defaults to true
+|=======
+
+
+
+== Example
+
+Deliver an ivy file without the private configurations:
+
+[source]
+----
+
+<deliver conf="*(public)" />
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/dependencytree.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/dependencytree.adoc b/asciidoc/use/dependencytree.adoc
new file mode 100644
index 0000000..b6aa874
--- /dev/null
+++ b/asciidoc/use/dependencytree.adoc
@@ -0,0 +1,51 @@
+
+Display a dependency tree on the console.
+
+This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+Please prefer the use of retrieve + standard ant path creation, which make your build more independent from ivy (once artifacts are properly retrieved, ivy is not required any more).
+
+
+== Attributes
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|showEvicted|specify if evicted modules should be printed|No. Defaults to false
+|conf|a comma separated list of the configurations to take in consideration in the dependency tree|No. Defaults to the configurations resolved by the last resolve call, or * if no resolve was explicitly called
+|haltonfailure|true to halt the build on ivy failure, false to continue|No. Defaults to true
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|settingsRef|A reference to the ivy settings that must be used by this task *(since 2.0)*|No, 'ivy.instance' is taken by default.
+|overwrite|Overwrite the value of the property if it already exist *(since 2.0)*. Before 2.0, the properties were always overwritten.|No, 'false' by default.
+|=======
+
+
+
+== Example
+
+Suppose we have two dependencies one called __mydep__ in revision 2.0 and one called __myotherdependency__ in revision 2.2.
+__mydep__ has a transitive dependency on __mytransitivedependency__ in revision 2.2.
+
+Then:
+
+[source]
+----
+
+<dependencytree />
+
+----
+
+will display the following tree in the console:
+
+[source]
+----
+
+Dependency tree for foobar
++- org#mydep;2.0
+ \- org#mytransitivedependency;2.2
+\- org#myotherdependency;2.2");
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/findrevision.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/findrevision.adoc b/asciidoc/use/findrevision.adoc
new file mode 100644
index 0000000..92bedf2
--- /dev/null
+++ b/asciidoc/use/findrevision.adoc
@@ -0,0 +1,48 @@
+
+*__since 1.4__*
+Finds the latest revision of a module matching a given version constraint.
+
+A version constraint is what is used when declaring a link:../ivyfile/dependency.html[dependency] on a module.
+If the module is not found the property is not set.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the organisation of the module to find|Yes
+|module|the the name of the module to find|Yes
+|branch|the branch of the module to find|No, defaults to the default branch for the given module
+|revision|the revision constraint to apply|Yes
+|property|the property to set with the found revision|No, defaults to ivy.revision
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:findrevision organisation="apache" module="ivy" revision="latest.integration"/>
+
+----
+
+finds the latest version of ivy available in the repository and sets the property ivy.revision according to what was found.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:findrevision organisation="apache" module="ivy" revision="1.0+"/>
+
+----
+
+same as above but only with 1.0 sub versions.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/fixdeps.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/fixdeps.adoc b/asciidoc/use/fixdeps.adoc
new file mode 100644
index 0000000..53a10ad
--- /dev/null
+++ b/asciidoc/use/fixdeps.adoc
@@ -0,0 +1,80 @@
+
+*__since 2.4__*
+The `fixdeps` task serializes transitively resolved dependencies into an ivy.xml file.
+
+The dependencies declared in an ivy.xml can be specified as range of revisions. And the transitive dependencies too. As new versions of modules can be added to the repository anytime, resolved versions of ranges can change over time. It is then safer to resolve a range once and stick with the resolved revision. This way a resolve process is highly reproductible.
+
+It is especially useful in a very dynamic environment like the link:../osgi.html[OSGi] one.
+
+In a multi project environment some dependencies still need to be maintained loose: the one between the projects. These dependencies, as soon as they are declared in the original ivy.xml, can be kept from being fixed. In order to do so, use the inner element `keep`.
+
+The recommended setup is then to:
+
+
+* have an `ivy-spec.xml` in your project which specifies the dependencies, with ranges if needed +
+
+* have an Ant target which resolve the `ivy-spec.xml` and call `fixdeps` to generate an `ivy.xml`. This target should then only be called after `ivy-spec.xml` is modified. The generated `ivy.xml` can safely be shared in a version control repository (svn, git,...). +
+
+* make the entire build workflow based on the resolve of the generated `ivy.xml` +
+
+
+This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|tofile|The location of the ivy file to generate|Yes
+|=======
+
+
+
+== Child elements
+
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Element|Description|Cardinality
+|keep|declares a dependency to keep from being fixed, and keep its original declaration from the original ivy.xml
+
+These elements takes two attributes:
+* org +
+ the organization
+* module +
+the name of the module|0..n
+|=======
+
+
+
+== Examples
+
+
+
+[source]
+----
+
+<ivy:fixdeps tofile="ivy-fixed.xml" />
+
+----
+
+Simple fix of some dependencies.
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:fixdeps tofile="ivy-fixed.xml">
+ <keep org="com.acme" module="mymodule" />
+</ivy:fixdeps>
+
+----
+
+Fix of the dependencies but keep the dependency on `com.acme#mymodule` as defined in the original ivy.xml.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/info.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/info.adoc b/asciidoc/use/info.adoc
new file mode 100644
index 0000000..1233575
--- /dev/null
+++ b/asciidoc/use/info.adoc
@@ -0,0 +1,172 @@
+
+*__since 1.4__*
+The info task ease the access to some essential data contained in an ivy file without performing a dependency resolution.
+
+The information is retrieved by setting ant properties:
+
+[options="header",cols="15%,50%"]
+|=======
+|Property|Description
+|ivy.organisation|The organisation of the module, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed.
+|ivy.module|The name of the module, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed.
+|ivy.branch|The branch of the module if any, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed.
+|ivy.revision|The revision of the module, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed.
+|ivy.status|The status of the module, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed.
+|ivy.publication|The publication time of the module, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed. *__(Since 2.2)__*
+|ivy.extra.__[any extra attribute]__|Corresponding extra attribute value, as found in the link:../ivyfile/info.html[info] tag of the ivy file parsed
+|ivy.configurations|A comma separated list of configurations of the module, as declared in the link:../ivyfile/configurations.html[configurations] section
+|ivy.public.configurations|A comma separated list of public configurations of the module, as declared in the link:../ivyfile/configurations.html[configurations] section
+|ivy.configuration.__[config name]__.desc|For each configuration with a description, a property is created containing this description. *__(Since 2.2)__*
+|ivy.artifact.__[index]__.name|For each published artifact, a property is created containing its name. *__(Since 2.2)__*
+|ivy.artifact.__[index]__.type|For each published artifact, a property is created containing its type. *__(Since 2.2)__*
+|ivy.artifact.__[index]__.ext|For each published artifact, a property is created containing its ext. *__(Since 2.2)__*
+|ivy.artifact.__[index]__.conf|For each published artifact, a property is created containing its conf. *__(Since 2.2)__*
+|ivy.artifact.__[index]__.extra.__[any extra attribute]__|For each extra attribute of the published artifact, a property is created containing its name. *__(Since 2.2)__*
+|=======
+
+
+
+*__since 2.0__*
+
+Since Ivy 2.0 this task has been enhanced to allow you to retrieve information about ivy modules in a repository. Instead of specifying a local ivy file you may specify the organisation, module, revision pattern and (optionally) the branch of the ivy module in the repository you wish to retrieve the information for.
+
+The revision pattern is what is used when declaring a link:../ivyfile/dependency.html[dependency] on a module, identical to how the link:findrevision.html[findrevision] task works. In fact this task can now be used in place of the findrevision task.
+
+If no matching module is found then no property values are set.
+
+You may now also set the property attribute to change the first part of the property names that are set by this task e.g. if you set the property attribute to 'mymodule' this task will set the ant properties __mymodule.organisation__, __mymodule.module__, __mymodule.revision__ etc.
+
+*__since 2.2__*
+
+Since Ivy 2.2 this task has been enhanced to also retrieve detailed information about the module's published artifacts, as well as the publication time.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|file|the ivy file to parse|Yes, if you wish to parse an ivy file.
+No, if you are retrieving information about a module from an ivy repository.
+|organisation|the organisation of the module to find *__(since 2.0)__*|No, if you wish to parse an ivy file.
+Yes, if you are retrieving information about a module from an ivy repository.
+|module|the the name of the module to find *__(since 2.0)__*|No, if you wish to parse an ivy file.
+Yes, if you are retrieving information about a module from an ivy repository.
+|branch|the branch of the module to find *__(since 2.0)__*|No, defaults to the default branch for the given module if you are retrieving information about a module from an ivy repository.
+|revision|the revision constraint to apply *__(since 2.0)__*|No, if you wish to parse an ivy file.
+Yes, if you are retrieving information about a module from an ivy repository.
+|property|the name to use as the base of the property names set by this task *__(since 2.0)__*|No, will default to 'ivy' if not set.
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|=======
+
+
+== Examples
+
+Given this ivy.xml file:
+
+[source]
+----
+
+<ivy-module version="1.0" xmlns:e="http://ant.apache.org/ivy/extra">
+ <info organisation="apache"
+ module="info-all"
+ branch="trunk"
+ revision="1.0"
+ status="release"
+ e:myextraatt="myvalue"
+ />
+ <configurations>
+ <conf name="default" />
+ <conf name="test" />
+ <conf name="private" visibility="private"/>
+ </configurations>
+ <publications>
+ <artifact name="thing1" type="jar" ext="jar" conf="default" e:data="main"/>
+ <artifact name="thing2" type="jar" ext="jar" conf="default" e:data="client"/>
+ </publications>
+ <dependencies>
+ <dependency org="org1" name="mod1.2" rev="2.0"/>
+ </dependencies>
+</ivy-module>
+
+----
+
+
+[source]
+----
+
+<ivy:info file="${basedir}/path/to/ivy.xml" />
+
+----
+
+Parses ${basedir}/path/to/ivy.xml and set properties as described above accordingly:
+
+[source]
+----
+
+ivy.organisation=apache
+ivy.module=info-all
+ivy.branch=trunk
+ivy.revision=1.0
+ivy.status=release
+ivy.extra.myextraatt=myvalue
+ivy.configurations=default, test, private
+ivy.public.configurations=default, test
+ivy.artifact.1.name=thing1
+ivy.artifact.1.type=jar
+ivy.artifact.1.ext=jar
+ivy.artifact.1.conf=default
+ivy.artifact.1.extra.data=main
+ivy.artifact.2.name=thing2
+ivy.artifact.2.type=jar
+ivy.artifact.2.ext=jar
+ivy.artifact.2.conf=default
+ivy.artifact.2.extra.data=client
+
+----
+
+Given the same ivy module in a repository:
+
+[source]
+----
+
+<ivy:info organisation="apache" module="info-all" revision="1.0" />
+
+----
+
+will set the exact same set of properties as above. Using:
+
+[source]
+----
+
+<ivy:info organisation="apache" module="info-all" revision="1.0" property="infotest"/>
+
+----
+
+will set:
+
+[source]
+----
+
+infotest.organisation=apache
+infotest.module=info-all
+infotest.branch=trunk
+infotest.revision=1.0
+infotest.status=release
+infotest.extra.myextraatt=myvalue
+infotest.configurations=default, test, private
+infotest.public.configurations=default, test
+infotest.artifact.1.name=thing1
+infotest.artifact.1.type=jar
+infotest.artifact.1.ext=jar
+infotest.artifact.1.conf=default
+infotest.artifact.1.extra.data=main
+infotest.artifact.2.name=thing2
+infotest.artifact.2.type=jar
+infotest.artifact.2.ext=jar
+infotest.artifact.2.conf=default
+infotest.artifact.2.extra.data=client
+
+----
+
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/install.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/install.adoc b/asciidoc/use/install.adoc
new file mode 100644
index 0000000..e469a44
--- /dev/null
+++ b/asciidoc/use/install.adoc
@@ -0,0 +1,42 @@
+
+Installs a module and all its dependencies in a resolver. *__since 1.3__*
+
+The module to install should be available in a resolver, and will be installed in another resolver which should support publish.
+
+This is particularly useful for users who only have a private repository, and want to benefit from public repositories from time to time. In this case, when a module is missing in the private repository, a call to install let download the module from a public repository not usually used for dependency resolution, and install it and its dependencies in the private repository.
+
+For more details about this task and its usage see the link:../tutorial/build-repository.html[build repository tutorial]
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|from|the name of the resolver in which the module must be found|Yes
+|to|the name of the resolver in which the module must be installed|Yes
+|organisation|the name of the organisation of the module to install|Yes
+|module|the name of the module to install|Yes
+|branch|the branch of the module to install *__since 2.0__*|No, defaults to default branch with exact matcher, '*' with any other matcher
+|revision|the revision of the module to install|Yes
+|type|the type(s) of artefact(s) to install. You can give multiple values separated by commas|No, defaults to '*' meaning all types
+|conf|the configurations to install. Only the dependencies of the specified configurations will be installed. *__since 2.3__*|No, defaults to '*' meaning all configurations
+|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No. Defaults to default ivy value (as configured in configuration file)
+|overwrite|true to override modules already present in the destination resolver, false otherwise|No, defaults to false
+|transitive|true to install the module and all its transitive dependencies, false to install only the module|No, defaults to false
+|matcher|the name of the matcher to use to find the modules to install|No, defaults to exact
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|haltonfailure|true to fail build on unresolved dependencies *__since 2.0__*|No, defaults to true
+|installOriginalMetadata|true to install original metadata (if available). If the module has been originally resolved from a m2 repository, the original metadata is the original POM file *__since 2.4__*|No, defaults to false
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:install organisation="apache" module="commons-lang" revision="2.0" from="ivyrep" to="myfsresolver"/>
+
+----
+
+Installs the module commons-lang from apache in revision 2.0 in the resolver myfsresolver. The module is found in the resolver named 'ivyrep'.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/use/listmodules.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/listmodules.adoc b/asciidoc/use/listmodules.adoc
new file mode 100644
index 0000000..6864a04
--- /dev/null
+++ b/asciidoc/use/listmodules.adoc
@@ -0,0 +1,56 @@
+
+*__since 1.4__*
+Finds the list of modules in the repository matching some criteria and set a corresponding list of properties in ant.
+
+The criteria is set by given patterns matching the organisation, name branch and revision of the modules to find.
+
+To know if a module matches the criteria ivy will use the configured link:../concept.html#matcher[pattern matcher].
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|organisation|the pattern matching the organisation of the modules to list|Yes
+|module|the pattern matching the name of the modules to list|Yes
+|branch|the pattern matching the branch of the modules to list|No, defaults to '*'
+|revision|the pattern matching the revision of the modules to list|Yes
+|matcher|the name of the pattern matcher to use for matching the modules fields|No. Defaults to exactOrRegexp.
+|property|the pattern of the property to set when a module is found|Yes
+|value|The pattern of the value to set when a module is found|Yes
+|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No, 'ivy.instance' is taken by default.
+|resolver|The name of the resolver to use for searching the modules *__(since 2.2.0)__*|No, all available resolvers will be used by default.
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<ivy:listmodules organisation="apache" module="ivy" revision="*" property="ivy.[revision]" value="found"/>
+
+----
+
+will find all revisions of the module ivy in the org apache, and create one property for each revision found, the name of the property depending on the revision, the value being always 'found'
+
+
+'''
+
+
+
+[source]
+----
+
+<ivy:listmodules organisation="*" module="ivy*" revision="1.0" matcher="glob" property="modules.[module]" value="[organisation]"/>
+
+----
+
+use the glob matcher to find all modules which name starts with ivy with revision 1.0, and sets for each a property with module name found and organisation for value.
+Example:
+modules.ivy=apache
+modules.ivyde=apache
+modules.ivytools=ivytools
\ No newline at end of file