You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/07/06 13:47:29 UTC

svn commit: r553877 - in /incubator/ivy/site: ./ history/

Author: xavier
Date: Fri Jul  6 06:47:28 2007
New Revision: 553877

URL: http://svn.apache.org/viewvc?view=rev&rev=553877
Log:
fix broken links

Added:
    incubator/ivy/site/.project   (with props)
    incubator/ivy/site/history.html   (with props)
Modified:
    incubator/ivy/site/build.xml
    incubator/ivy/site/config.js
    incubator/ivy/site/download.html
    incubator/ivy/site/faq.html
    incubator/ivy/site/features.html
    incubator/ivy/site/history/1.3.1.html
    incubator/ivy/site/history/1.3.html
    incubator/ivy/site/history/1.4-RC1.html
    incubator/ivy/site/history/1.4-RC2.html
    incubator/ivy/site/history/1.4.html
    incubator/ivy/site/index.html
    incubator/ivy/site/links.html
    incubator/ivy/site/m2comparison.html
    incubator/ivy/site/mailing-lists.html
    incubator/ivy/site/toc.json
    incubator/ivy/site/write-doc.html

Added: incubator/ivy/site/.project
URL: http://svn.apache.org/viewvc/incubator/ivy/site/.project?view=auto&rev=553877
==============================================================================
--- incubator/ivy/site/.project (added)
+++ incubator/ivy/site/.project Fri Jul  6 06:47:28 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ivy-site</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Propchange: incubator/ivy/site/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ivy/site/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/site/build.xml?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/build.xml (original)
+++ incubator/ivy/site/build.xml Fri Jul  6 06:47:28 2007
@@ -25,7 +25,8 @@
             description="--> Generates site for publication">
 		<!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache Ant 1.7 -->
         <copy todir="${target.dir}">
-	        <fileset dir="${basedir}" includes="images/**,style/**,samples/**,js/**" />
+	        <fileset dir="${basedir}" 
+	        	includes="images/**,style/**,samples/**,js/**,schemas/**,presentations/**,history/*/images/**,history/*/samples/**" />
         </copy>
         <xooki:generate destDir="${target.dir}" checkUpToDate="true">
 			<fileset dir="${basedir}">

Modified: incubator/ivy/site/config.js
URL: http://svn.apache.org/viewvc/incubator/ivy/site/config.js?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/config.js (original)
+++ incubator/ivy/site/config.js Fri Jul  6 06:47:28 2007
@@ -2,6 +2,7 @@
 	jira: {ids: ['IVY'], url: 'http://issues.apache.org/jira'}, 
 	shortcuts: {
 		svn: {pre: 'https://svn.apache.org/repos/asf/incubator/ivy/core/trunk/'},
-		ant: {pre: xooki.c.relativeRoot+'use/', post:'.html'}
+		ant: {pre: xooki.c.relativeRoot+'history/trunk/use/', post:'.html'},
+		doc: {pre: xooki.c.relativeRoot+'history/trunk/', post:'.html'}
 	}
 }, xooki.c, false);

Modified: incubator/ivy/site/download.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/download.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/download.html (original)
+++ incubator/ivy/site/download.html Fri Jul  6 06:47:28 2007
@@ -89,24 +89,24 @@
 We highly recommend to verify the PGP signature, though.
 
 <h2>Latest stable version (not Apache)</h2>
-The latest stable version of Ivy is <a href="doc/releasenotes/1.4.1.html">1.4.1</a>, and is not an Apache incubating release, but a release done while Ivy was still hosted by jayasoft:
+The latest stable version of Ivy is <a href="history/1.4.1.html">1.4.1</a>, and is not an Apache incubating release, but a release done while Ivy was still hosted by jayasoft:
 <ul>
 <li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-bin.zip">binaries</a></li>
 <li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip">sources</a></li>
 <li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-doc.zip">documentation</a></li>
 </ul>
 
-To have a quick overview of some of the changes in this version, check the <a href="doc/releasenotes/1.4.html">1.4.1 release notes</a> page.
+To have a quick overview of some of the changes in this version, check the <a href="history/1.4.html">1.4.1 release notes</a> page.
 
 You can also download ivy jar and ivy.xml alone directly from the jayasoft site (useful especially for easy ant setup) using the following pattern:
 http://www.jayasoft.org/downloads/ivy/[revision]/[artifact]-[revision].[ext]
 
-This is used to auto install Ivy from internet, in the <a href="doc/tutorial.html">first tutorial</a>. Take a look at these examples if you want such an auto install feature in your own builds.
+This is used to auto install Ivy from internet, in the [[doc:tutorial first tutorial]]. Take a look at these examples if you want such an auto install feature in your own builds.
 The xsd for ivy files of the version is also available online at:
 http://www.jayasoft.org/downloads/ivy/[revision]/ivy.xsd
 
-To have info about the different kind of distributions, see <a href="choose-distrib.html">that page</a>.
-For previous version information and download, see the <a href="doc/releasenotes.html">release notes page</a> in the documentation.
+To have info about the different kind of distributions, see [[choose-distrib that page]].
+For previous version information and download, see the [[history history page]].
 </textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: incubator/ivy/site/faq.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/faq.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/faq.html (original)
+++ incubator/ivy/site/faq.html Fri Jul  6 06:47:28 2007
@@ -37,7 +37,7 @@
 <h2><a name="why-should-i-use-ivy"></a>Why should I use Ivy ?</h2>
 <p>If you are convinced of using a dependencies manager, you may wonder why using Ivy and not another tool. We are not able to answer this question without being biased, but have a look at Ivy <a href="features.html">features</a> and the [[m2comparison product comparison]] we provide, and you will certainly see that Ivy is one of the best dependencies manager currently available ;-)</p>
 <h2><a name="how-does-ivy-differ-from-maven-2"></a>How does Ivy differ from Maven2 ?</h2>
-<p>The answer to this question is too long, so it deserves its own page <a href="doc/m2comparison.html">here</a>.</p>
+<p>The answer to this question is too long, so it deserves its own page <a href="m2comparison.html">here</a>.</p>
 <h1>Ivy in use</h1>
 <h2><a name="i-dont-understand-whats-happening"></a>I don't understand what's happening...</h2>
 <p>The first thing to do when you don't understand what's going wrong is to try to change the message level. If you use ant, you can use the -debug or -verbose options to get more detailed messages and better understand what's happening.</p>
@@ -56,16 +56,16 @@
 <p>Finally, you can check if the files were not downloaded but corrupted<br />
 (Ivy has no md5 checking for the moment) by checking your lib directory and opening<br />
 the jars if any with an unzip program.</p>
-<p>If you still have problems post on the <a href="forum/core.html">forum</a><br />
+<p>If you still have problems post on the [[mailing-lists]]<br />
 mentioning your OS, your version of ant, your version of ivy, your configuration file<br />
 and your ivy file.</p>
 <h2><a name="ivy-fails-to-get-an-artifact"></a>Ivy fails to get an artifact / ivy file on my http server. What's wrong?</h2>
 <p>The first thing to do is to ensure the setting is correct. Ivy should log the url it tried, copy this url and paste it in your favorite browser, and verify you get no error.</p>
 <p>If this is ok, check if you don't need any proxy setting nor authentication. For proxy setting, you can use for instance this:<br />
 <code>set ANT_OPTS=-Dhttp.proxyHost=myproxy -Dhttp.proxyPort=3128</code><br />
-For authentication, fill in the appropriate data at <a href="doc/use/configure.html">configuration</a> time.</p>
+For authentication, fill in the appropriate data at [[doc:use/configure configuration]] time.</p>
 <p>If you still have no idea of what is wrong, then I suggest to use commons-httpclient if it isn't already the case (you should just put commons-httpclient in you classpath), and then <a href="http://jakarta.apache.org/commons/httpclient/logging.html">turn on the debug logging</a>.</p>
-<p>You will then have very detailed information on how your url is handled. If you still have problem, ask for help on the <a href="forum/core.html">forum</a>.</p>
+<p>You will then have very detailed information on how your url is handled. If you still have problem, ask for help on the [[mailing-lists]].</p>
 <h2><a name="getting-rid-of-lib-directory"></a>What if I do not want to put my library files in the lib directory ? </h2>
 <p>No problem, you just have to set an ant property:</p>
 <code><property name="ivy.lib.dir" value="pathtomylibdir"/></code>
@@ -91,7 +91,7 @@
 You write ivy files to describe the dependencies of your module, independently of how you retrieve them.<br />
 Then you configure ivy to indicate where it can find your dependencies. Thus you can easily share your ivy files, even if you have internal dependencies which are not resolved the same way in your environment as in the target development environment. You just need to write two configuration files, one in your default development environment, and one in the target development environment with the <b>same ivy files</b>. </p>
 <h2><a name="how-do-i-separate-dependencies"></a>How do I separate the dependencies I need at xxx time and the one I need at yyy time ?</h2>
-<p>Ivy uses a concept called <i>configurations</i> to handle this, and many more. As explained in the <a href="doc/terminology.html">terminology page</a>, a <i>configuration</i> of your module can be thought as a way to use your module (<i>note: this has nothing to do with the configuration of ivy itself, through the use of configuration file</i>). You can describe what dependencies are needed in each configuration. </p>
+<p>Ivy uses a concept called <i>configurations</i> to handle this, and many more. As explained in the [[doc:terminology terminology page]], a <i>configuration</i> of your module can be thought as a way to use your module (<i>note: this has nothing to do with the configuration of ivy itself, through the use of configuration file</i>). You can describe what dependencies are needed in each configuration. </p>
 <p>Moreover, because the dependencies are modules too, they can also have configurations. What is extremely powerful with ivy is that you can define configurations mapping, i.e. which conf of the dependency is needed in which conf of your module. Thus what is needed at 'runtime' of a dependency can be needed for 'test' of your module.</p>
 <p>Finally, the configurations are unlimited, defined in each module, and can extend each other. This contributes a lot to ivy flexibility.</p>
 <h2><a name="no-artifact"></a>Can I write an ivy file for a module with no artifact at all ?</h2>

Modified: incubator/ivy/site/features.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/features.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/features.html (original)
+++ incubator/ivy/site/features.html Fri Jul  6 06:47:28 2007
@@ -31,13 +31,13 @@
 <p>Of course, Ivy is integrated with the most popular build management system for Java projects. But the integration goes way beyond common Ant integration. Indeed Ivy has been designed with Ant integration and design principles in mind. If you have Ant skills, you already have Ivy skills! The plugin mechanism in Ivy follows the same design as Ant, you will find macrodef and files import in Ivy configuration, many things with which Ant users are already familiar with.<br/>
 And since Ivy is now an Apache project, we are getting even closer to Ant development.</p>
 <h1>Simple to use</h1>
-<p>For simple cases, Ivy is easy to use. Declare your dependencies, and that's all. See the <a href="doc/tutorial/start.html">quick start tutorial</a> to check yourself, it should take less than 5 minutes!</p>
+<p>For simple cases, Ivy is easy to use. Declare your dependencies, and that's all. See the [[doc:tutorial/start quick start tutorial]] to check yourself, it should take less than 5 minutes!</p>
 <p>Ivy can therefore be used to bring the dependency management feature of maven to Ant build files, for those of you who already use Ant and who do not want to setup a maven project. But Ivy does not stop there, it provides many more great features!</p>
 <h1>Clean dependency reports</h1>
 <p>Ivy is able to produce mainly two kind of reports: HTML reports and graph reports. HTML reports gives you a good understanding of what Ivy did, and which dependencies your project depends upon. The graph reports let you have a good overview of the transitive dependencies (see below) and conflicts in your project.</p>
 <p>Here are some samples of what Ivy generates for you:<br />
 <center><br />
-<a href="samples/ivy-sample-xslt.xml"><img src="images/ivyfile-small.png" title="browsable ivy file through simple xslt"/></a> <a href="images/hibgraph.png" alt="ivyfile"><img src="images/hibgraph-small.png" title="full dependency graph"/></a> <a href="samples/jayasoft-ivyrep-example-default.html" alt="graph"><img src="images/report-small.png" title="detailed dependency report" alt="report"/></a><br />
+<a href="history/trunk/samples/ivy-sample-xslt.xml"><img src="images/ivyfile-small.png" title="browsable ivy file through simple xslt"/></a> <a href="images/hibgraph.png" alt="ivyfile"><img src="images/hibgraph-small.png" title="full dependency graph"/></a> <a href="history/trunk/samples/jayasoft-ivyrep-example-default.html" alt="graph"><img src="images/report-small.png" title="detailed dependency report" alt="report"/></a><br />
 </center></p>
 <h1>Non intrusive</h1>
 <p>Ivy most common use is to resolve dependencies and copy them in the lib dir of your project. Once copied, your build does not depend on Ivy any more. Thus you can easily migrate existing builds using the lib dir pattern to store dependencies. Moreover, you can easily deliver your project with its dependencies so that the build file does not depend on Ivy.</p>
@@ -45,15 +45,15 @@
 <p>With Ivy, you usually do not have to adapt your project to Ivy structure, Ivy will conform to your environment.</p>
 <p>Even though Ivy comes with a lots of default values to work out of the box, you can change many things in Ivy. Of course, the dependencies repositories possibilities covers a lot of uses (file system, URL based, repository chaining, ...). But that's not all. You can change the way Ivy finds latest versions of your dependencies, you can change of conflict manager, you can choose if you want Ivy to copy dependencies in your project libs or use them directly from Ivy cache, ...</p>
 <h1>Easily extensible</h1>
-<p>When Ivy does not do what you want out of the box, you can often extend it to solve your problem. For instance, you can plug your own repository (like Scott Haug did for a svn repository now available in Ivy tools). But you can also define your own latest strategy and your own conflict manager. See <a href="doc/extend.html">how to extend Ivy</a> in the reference doc. </p>
-<p>Since Ivy 1.4 you can even define very easily your own metadata on your modules, with <a href="doc/concept.html#extra">extra attributes</a>.</p>
+<p>When Ivy does not do what you want out of the box, you can often extend it to solve your problem. For instance, you can plug your own repository (like Scott Haug did for a svn repository now available in Ivy tools). But you can also define your own latest strategy and your own conflict manager. See [[doc:extend how to extend Ivy]] in the reference doc. </p>
+<p>Since Ivy 1.4 you can even define very easily your own metadata on your modules, with [[doc:concept extra attributes]].</p>
 <h1>High performances</h1>
 <p>In Ivy, performances have been taken in consideration from the beginning. It uses a cache to avoid downloading twice a dependency, its strong conflict management system has been thought to avoid downloading a dependency if not necessary, all configuration and Ivy file parsing are done using SAX for maximum performance, and so on...</p>
 <h1>Transitive dependencies</h1>
 <p>Imagine you have a component that you often reuse in your software development. Imagine that this component has dependencies as well. Then with classical dependency management, each time you use this component in your software you have to declare it as a dependency, but also all its dependencies.</p>
 <p>With Ivy it's different: you simply write a dependency file once for the component, declaring its own dependencies, then anytime you want to use this component you simply have to declare a dependency on it.</p>
 <p>And this is even more powerful if the component your software depends on changes of dependencies during its own development. Then, without Ivy, you have to maintain all your components dependencies declaration each time the dependencies of this component change. With Ivy, you update the Ivy file of the component and that's it !</p>
-<p><i>If you want to quickly start using this feature or simply see it in action with real world examples, check the official repository: <a href="ivyrep.html">ivyrep</a></i></p>
+<p><i>If you want to quickly start using this feature or simply see it in action with real world examples, check the official repository: <a href="http://ivyrep.jayasoft.org/">ivyrep</a></i></p>
 <h1>Strong conflict management</h1>
 <p>The problem with transitive dependencies is that it's sometimes difficult to know exactly which version of a dependency you get, because several modules are depending on it in different versions. Ivy provides a strong and flexible conflict management engine, which let you easily choose which version should be evicted or kept if its default behaviour does not fit your needs. </p>
 <p>It is also fully integrated with transitive dependencies management, which means that conflicts are solved for each dependency before being solved for your whole module. This  ensures that problematic conflicts will only need to solved in the dependency they are encountered.</p>
@@ -68,7 +68,7 @@
 <h1>Pluggable module descriptor parsers</h1>
 <p>Ivy is able to use Ivy files as module descriptors, but also maven2 POMs, or even your own module descriptors! This can help you move softly from an existing repository of modules to an Ivy managed one.</p>
 <h1>Unique enterprise features</h1>
-<p>Ivy is the only dependency management tool to support powerful features such as repository namespace and building through the install task. A <a href="doc/tutorial/build-repository.html">tutorial</a> is dedicated to this feature, and show you how you can build your own repository importing data from public one, and converting heterogeneous repositories into a stable and homogeneous one.</p>
+<p>Ivy is the only dependency management tool to support powerful features such as repository namespace and building through the install task. A [[doc:tutorial/build-repository tutorial]] is dedicated to this feature, and show you how you can build your own repository importing data from public one, and converting heterogeneous repositories into a stable and homogeneous one.</p>
 <h1>Heavily tested</h1>
 <p>Ivy benefits from a lot of unit tests checked at each code modification. It is also under heavy testing by the community itself, and bugs reported by the community are often fixed in only a few days.</p>
 <h1>Supported by several tools</h1>

Added: incubator/ivy/site/history.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/history.html?view=auto&rev=553877
==============================================================================
--- incubator/ivy/site/history.html (added)
+++ incubator/ivy/site/history.html Fri Jul  6 06:47:28 2007
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
+	<script type="text/javascript" src="xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+You can find here the whole history of Ivy versions.
+
+The history is decomposed in streams, corresponding to major versions.
+
+Versions prior to 2.x were released by Jayasoft, and are not endorsed by the Apache Software Foundation.
+</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

Propchange: incubator/ivy/site/history.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ivy/site/history/1.3.1.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/history/1.3.1.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/history/1.3.1.html (original)
+++ incubator/ivy/site/history/1.3.1.html Fri Jul  6 06:47:28 2007
@@ -42,10 +42,6 @@
 <a href="http://www.jayasoft.org/downloads/ivy/1.3.1/ivy-doc-1.3.1.zip">ivy-doc-1.3.1.zip</a> (1.6MB) (New! Easily browsable offline)
 <a href="http://www.jayasoft.org/downloads/ivy/1.3.1/ivy-1.3.1.jar">ivy-1.3.1.jar</a>
 
-<em>Note: the zips distributed here before 2006-04-14 didn't include ivy.xml for ivy itself. This is now fixed, for those who want to get it you can find it here:
-<a href="./downloads/ivy/1.3.1/ivy-1.3.1.xml">ivy-1.3.1.xml</a>
-</em>
-
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: incubator/ivy/site/history/1.3.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/history/1.3.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/history/1.3.html (original)
+++ incubator/ivy/site/history/1.3.html Fri Jul  6 06:47:28 2007
@@ -28,8 +28,6 @@
 <h1>Changes log</h1>
 Ivy 1.3-RC3 has been promoted to 1.3 on 2006-03-17.
 
-For known bugs and limitations please see http://jira.jayasoft.org/
-
 For detailed list of changes since 1.2a, please see changes of the three release candidates below.
 
 <h1>Downloads</h1>

Modified: incubator/ivy/site/history/1.4-RC1.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/history/1.4-RC1.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/history/1.4-RC1.html (original)
+++ incubator/ivy/site/history/1.4-RC1.html Fri Jul  6 06:47:28 2007
@@ -26,7 +26,7 @@
 <body>
 	<textarea id="xooki-source">
 Here are the release notes of version 1.4-RC1.
-A new and noteworthy section is available on <a href="../../doc/releasenotes/1.4.html">version 1.4 page</a>.
+A new and noteworthy section is available on <a href="1.4.html">version 1.4 page</a>.
 
 You can download it here:
 <ul><li><a href="http://www.jayasoft.org/downloads/ivy/1.4-RC1/ivy-1.4-RC1-bin.zip">binaries</a></li>

Modified: incubator/ivy/site/history/1.4-RC2.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/history/1.4-RC2.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/history/1.4-RC2.html (original)
+++ incubator/ivy/site/history/1.4-RC2.html Fri Jul  6 06:47:28 2007
@@ -26,7 +26,7 @@
 <body>
 	<textarea id="xooki-source">
 Here are the release notes of version 1.4-RC2.
-A new and noteworthy section is available on <a href="../../doc/releasenotes/1.4.html">version 1.4 page</a>.
+A new and noteworthy section is available on <a href="1.4.html">version 1.4 page</a>.
 
 You can download it here:
 <ul><li><a href="http://www.jayasoft.org/downloads/ivy/1.4-RC2/ivy-1.4-RC2-bin.zip">binaries</a></li>

Modified: incubator/ivy/site/history/1.4.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/history/1.4.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/history/1.4.html (original)
+++ incubator/ivy/site/history/1.4.html Fri Jul  6 06:47:28 2007
@@ -53,15 +53,15 @@
 <li>open a console in this directory and run "ant". That's it!</li>
 </ol>
 If you have any trouble, check the <a href="../../faq.html">FAQ</a>, it may be related to your internet connection (proxy anyone?).
-Want to try more tutorials? Check the <a href="../../doc/tutorial.html">tutorials</a> page in the documentation.
+Want to try more tutorials? Check the [[doc:tutorial tutorials]] page in the documentation.
 <h2>Offline documentation greatly improved</h2>
 The offline documentation has been greatly improved, and is now a real copy of the online documentation, with all the navigation between pages as on the online version. Continue to use the online version when you can to have the latest updated version with user comments.
 <h2>Documentation update</h2>
 As usual, the documentation has been extensively updated with to reflect the new features. Some are still missing, but we will finish the update before the 1.4 release.
 
-Moreover, more examples have been added, more links between the pages, and some very useful pages have been added like the <a href="../../doc/bestpractices.html">best practices</a> one.
+Moreover, more examples have been added, more links between the pages, and some very useful pages have been added like the [[doc:bestpractices best practices]] one.
 <h1>Core features</h1>
-<h2><a href="../../doc/concept.html#extra">Extra attributes</a></h2>
+<h2>[[doc:concept Extra attributes]]</h2>
 Several tags in ivy xml files are now extensible with 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 for example.
@@ -87,9 +87,9 @@
 ${repository.dir}/[organisation]/[module]/[color]/[revision]/[artifact].[ext]
 </code>
 
-Note that in order to use extra attributes, you will need to disable ivy file validation, since your files won't fulffill anymore the official ivy xsd. See the <a href="../../doc/configuration/conf.html">configuration doc page</a> to see how to disable validation.
+Note that in order to use extra attributes, you will need to disable ivy file validation, since your files won't fulffill anymore the official ivy xsd. See the [[doc:configuration/conf configuration doc page]] to see how to disable validation.
 
-<h2><a href="../../doc/ivyfile/dependency.html">Version matchers</a></h2>
+<h2>[[doc:ivyfile/dependency Version matchers]]</h2>
 Ivy now rely on a new concept to specify which version of a dependency should be used: pluggable version matchers.
 This means that you can define your own way to match a dependency version.
 
@@ -111,7 +111,7 @@
 </code>
 Matches any revision greater than 1.0 and lower than 2.0, inclusive.
 
-<h2><a href="../../doc/ivyfile/dependency-artifact.html">URL attribute on artifact to improve ease of use</a></h2>
+<h2>[[doc:ivyfile/dependency-artifact URL attribute on artifact to improve ease of use]]</h2>
 The artifact tag used when declaring a dependency now supports an url attribute. Even if this should be used only in very special cases (because it derrogates to the standard repository management), it can be useful, well, in very special cases :-)
 
 Example:
@@ -121,7 +121,7 @@
 </dependency>
 </code>
 
-<h2><a href="../../doc/ivyfile/conf.html">Module configurations enhancements</a></h2>
+<h2>[[doc:ivyfile/conf Module configurations enhancements]]</h2>
 Several improvements have been made on the module configurations:
 <ul><li>It is now possible to disable transitivity for a whole configuration.
 
@@ -143,7 +143,7 @@
 </code></li>
 </ul>
 
-<h2><a href="../../doc/concept.html#event">Events and triggers</a></h2>
+<h2>[[doc:concept Events and triggers]]</h2>
 Ivy now fires events all along the dependency resolution process, which can be listened and which can trigger events.
 
 Example:
@@ -156,7 +156,7 @@
 Triggers an ant build just before resolving a dependency with a latest.integration revision.
 
 <h1>New Resolvers</h1>
-<h2><a href="../../doc/resolver/vfs.html">vfs</a></h2>
+<h2>[[doc:resolver/vfs vfs]]</h2>
 The new vfs resolver leverages the work from <a href="http://jakarta.apache.org/commons/vfs/">apache commons vfs</a> to give a uniform access to a set of different file systems including ftp, sftp, webdav, zip, ...
 
 Example:
@@ -167,7 +167,7 @@
 </vfs>
 </code>
 
-<h2><a href="../../doc/resolver/ssh.html">ssh</a> and <a href="../../doc/resolver/sftp.html">sftp</a></h2>
+<h2>[[doc:resolver/ssh ssh]] and [[doc:resolver/sftp sftp]]</h2>
 The new ssh and sftp resolvers allow, as their name suggest, to access a repository using ssh or sftp. The secured nature of ssh and its wide spread implementation on most *nix servers makes these resolvers very good candidate in an enterprise environment.
 
 Example:
@@ -179,7 +179,7 @@
 </code>
 
 <h1>Configuration files</h1>
-<h2><a href="../../doc/configuration/statuses.html">Configurable statuses</a></h2>
+<h2>[[doc:configuration/statuses Configurable statuses]]</h2>
 The list of statuses available in module files is now configurable.
 
 Example:
@@ -190,7 +190,7 @@
   <status name="bronze" integration="true"/>
 </statuses>
 </code>
-<h2><a href="../../doc/configuration/module.html">Per module settings</a></h2>
+<h2>[[doc:configuration/module Per module settings]]</h2>
 It is now possible possible to configure conflict-manager per module set.
 
 Example:
@@ -199,7 +199,7 @@
   <module organisation="jayasoft" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
 </modules>
 </code>
-<h2><a href="../../doc/concept#checksum.html">Checksums</a></h2>
+<h2>[[doc:concept Checksums]]</h2>
 Ivy now allow to use checksums to verify the correctness of a downloaded file.
 
 For the moment Ivy supports md5 and sha1 algorithm.
@@ -213,14 +213,14 @@
 During publish, all listed checksum algorithms are computed and uploaded.
 
 By default checksum algorithms are "sha1, md5".
-<h2><a href="../../doc/configuration/resolvers#common.html">Fail when no module descriptor is found</a></h2>
+<h2>[[doc:configuration/resolvers Fail when no module descriptor is found]]</h2>
 By default when ivy doesn't find a module descriptor for a module, it lloks for an artifact, and if it finds one it assumes a default module descriptor. 
 It is now possible to configure this behaviour per resolver, by setting the allownomd attribute to false you can force the use of a module descriptor, and fail if none is found. This is also useful to improve performances on a resolver for which you know you will always have module descriptors.
 <h2>System properties</h2>
 All java system properties are now available as ivy variables in your configuration files.
 Thus you can now easily define the default cache relative to user home (using ${user.home}), or access any specific property set via the standard java system property mechanism.
 
-<h2><a href="../../doc/configuration/resolvers#common.html">Changing pattern</a></h2>
+<h2>[[doc:configuration/resolvers Changing pattern]]</h2>
 You can now define a changingPattern and a changingMatcher to configure a set of revisions which should always be considered as changing one (artifacts are checked to see if they are up to date).
 
 The pattern and the matcher name are attributes available on all built-in resolvers.
@@ -231,7 +231,7 @@
 </code>
 will consider all modules with a revision ending by SNAPSHOT to be changing revisions.
 
-<h2><a href="../../doc/configuration/classpath.html">Customisable classpath</a></h2>
+<h2>[[doc:configuration/classpath Customisable classpath]]</h2>
 You can now add jars to use to load plugins directly in ivy configuration, so that you can easily use your plugins in several execution environment (ant, standalone, IDE plugin, ...).
 
 Example:
@@ -246,7 +246,7 @@
 </code>
 
 <h1>Ant tasks</h1>
-<h2><a href="../../doc/use/repreport.html">repreport</a></h2>
+<h2>[[doc:use/repreport repreport]]</h2>
 A new repreport task allows to generate reports directly from your repository. The graph generation is the most interesting one, it can gives you a good overview of the dependencies between of all your modules available in your repository, or restrict this graph to just the modules from this organisation, and so on.
 
 Example:
@@ -255,7 +255,7 @@
 will generate a graphml of dependencies with all modules in the organisation "myorg"
 </code>
 
-<h2><a href="../../doc/use/artifactreport.html">artifactreport</a></h2>
+<h2>[[doc:use/artifactreport artifactreport]]</h2>
 A new artifactreport task has been introduced to easily generate an xml report with artifacts resolved, with useful information such as their original location. This report is particularly well suited for generating IDE classpaths (see also the <a href="../../links.html">links</a> page for higher IDE integration via plugins).
 
 The generated report looks like this:
@@ -265,23 +265,26 @@
   <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>
+        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>
+        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>
   </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>
+        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>
 </code>
 
-<h2><a href="../../doc/use/info.html">info</a></h2>
+<h2>[[doc:use/info info]]</h2>
 The new info task eases the access to some essential data contained in an ivy file without performing a dependency resolution.
 
 Example:
@@ -289,7 +292,7 @@
 <ivy:info file="${basedir}/path/to/ivy.xml" />
 </code>
 
-<h2><a href="../../doc/use/listmodules.html">listmodules</a></h2>
+<h2>[[doc:use/listmodules listmodules]]</h2>
 The new listmodules task let you list modules available in the repository and set ant properties accordingly.
 
 Example:
@@ -297,27 +300,27 @@
 <ivy:listmodules organisation="jayasoft" module="ivy" revision="*" property="ivy.[revision]" value=="found"/>
 </code>
 
-<h2><a href="../../doc/use/findrevision.html">findrevision</a></h2>
+<h2>[[doc:use/findrevision findrevision]]</h2>
 This new task sets an ant property with the latest revision found for a given module matching a given revision constraint.
 
 <code type="xml">
 <ivy:findrevision organisation="jayasoft" module="ivy" revision="1.0+"/>
 </code>
 
-<h2><a href="../../doc/use/resolve.html">useOrigin</a></h2>
+<h2>[[doc:use/resolve useOrigin]]</h2>
 The resolve, cachepath, and retrieve tasks now supports a new useOrigin attribute, which allow to use the original location of local artifacts instead of their location in ivy cache. Used directly on a resolve or when no resolve has been done, it will avoid the copy of the artifact to the cache, and use directly the artifact from its original location.
 
 <code type="xml">
 <cachepath pathid="default.classpath" conf="default" useOrigin="true" />
 </code>
-<h2><a href="../../doc/use/resolve.html">Disable transitive dependencies on resolve</a></h2>
+<h2>[[doc:use/resolve Disable transitive dependencies on resolve]]</h2>
 You can now disable transitive dependencies on resolve.
 
 Example:
 <code type="xml">
 <ivy:resolve file="path/to/ivy.xml" transitive="false" />
 </code>
-<h2><a href="../../doc/use/retrieve.html">Synchronization feature in retrieve</a></h2>
+<h2>[[doc:use/retrieve Synchronization feature in retrieve]]</h2>
 The retrieve task can now performs a real synchronization of the destination directory, instead of a simple copy.
 
 Example:

Modified: incubator/ivy/site/index.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/index.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/index.html (original)
+++ incubator/ivy/site/index.html Fri Jul  6 06:47:28 2007
@@ -30,9 +30,9 @@
 <tr style="font-size:xx-large;"><td colspan="4"><span style="font-size:xx-large;">The agile dependency manager</span></td></tr>
 <tr><td colspan="4" style="font-size:large; padding: 1cm 0 0.7cm 0;">Ivy is a popular dependency manager focusing on flexibility and simplicity.<br/>
 Find out more about its unique <a href="features.html">enterprise features</a>, what <a href="testimonials.html">people say about it</a>,<br/>
-and <a href="doc.html">how it can improve your build system!</a></td></tr>
-<tr class="homeitems"><td><a href="download.html"><img src="images/ivy-dl-2.0.0-alpha-1.png"/></a></td><td><a href="doc.html"><img src="images/ivy-book.png"/></a></td><td><a href="demo.html"><img src="images/ivy-demo.png"/></a></td><td><a href="mailing-lists.html"><img src="images/ivy-forum.png"/></a></td></tr>
-<tr class="homeitems"><td><a href="download.html">download</a></td><td><a href="doc.html">documentation<br/>& tutorials</a></td><td><a href="demo.html">demo</a></td><td><a href="mailing-lists.html">share your experience</a></td></tr>
+and [[doc:index how it can improve your build system!]]</td></tr>
+<tr class="homeitems"><td><a href="download.html"><img src="images/ivy-dl-2.0.0-alpha-1.png"/></a></td><td>[[doc:index <img src="images/ivy-book.png"/>]]</td><td><a href="demo.html"><img src="images/ivy-demo.png"/></a></td><td><a href="mailing-lists.html"><img src="images/ivy-forum.png"/></a></td></tr>
+<tr class="homeitems"><td><a href="download.html">download</a></td><td>[[doc:index documentation<br/>& tutorials]]</td><td><a href="demo.html">demo</a></td><td><a href="mailing-lists.html">share your experience</a></td></tr>
 </table>
 <hr/><a href="">Latest News</a><table border="0" cellpadding="5">
 <tr><td>05/03/2007</td><td><a href="presentations/apache-con-2007/">slides</a> from ApacheCon EU 2007 are available!</td></tr>

Modified: incubator/ivy/site/links.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/links.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/links.html (original)
+++ incubator/ivy/site/links.html Fri Jul  6 06:47:28 2007
@@ -46,22 +46,20 @@
 <p>Here is a list of the ivy related tools and plugins we are aware of that can be found over the net.</p>
 <p>Feel free to post on the forum to ask for your tool to be added here.</p>
 <ul>
-<li><a href="http://www.ivytools.org/">ivytools.org</a></li>
+<li><a href="http://ivytools.sourceforge.net/">ivytools.org</a></li>
 <p> This sourceforge project aims to gather community contributed tools and plugins for ivy.</p>
 <li><a href="http://incubator.apache.org/ivy/ivyde/">IvyDE</a></li>
 <p> A plugin for eclipse which helps writing ivy files by bringing powerful code completion and wizards, and also let you add a classpath container keeping your eclipse project classpath in sync with the dependencies ivy resolves.</p>
-<li><a href="http://ivycruise.jayasoft.org/">IvyCruise</a></li>
+<li><a href="http://www.jaya.free.fr/ivycruise.html">IvyCruise</a></li>
 <p> This set of plugins for cruise control let you integrate ivy with this famous continuous integration server.</p>
 <li><a href="http://plugins.intellij.net/plugin/?id=141">IvyDependencyImportor</a></li>
 <p> is a plugin for intellij IDEA, which let you import all the libs described in the ivy.xml to the current module library.</p>
 <li><a href="http://plugins.intellij.net/plugin/?id=140">IVY for IDEA</a></li>
 <p> is another plugin for intellij IDEA, which reads IDEA module settings such as classpath and source directories from IVY setup.</p>
-<li><a href="http://www.ivytools.org/ivy+svn.html">Ivy+SVN</a></li>
+<li><a href="http://ivytools.sourceforge.net/ivy+svn.html">Ivy+SVN</a></li>
 <p> This is a subversion dependency resolver for ivy.</p>
 <li><a href="http://wiki.hippo.nl/display/OS/SAnt+build+system">SAnt</a></li>
 <p> SAnt (Shared Ant) is an experimental build system based on Ant and Ivy, primarily developpedd as part of the hippo project.</p>
-<li><a href="http://dehora.net/code/antant/readme.html">AntAnt</a></li>
-<p> AntAnt is an ant project generator (generates an ant project skeleton), which uses ivy for dependency management.</p>
 <li><a href="http://www.fnogol.de/archives/2006/08/21/generate-applicationxml-from-ivyxml-for-packaging-an-ear/">Generate application.xml from ivy.xml for packaging an ear</a></li>
 <p> is an entry on Philipp Meier's weblog which explain how he used ivy and xslt to generate his application.xml files.</p>
 <li><a href="http://www.ribomation.com/riboutils/eartask/">EAR ant task</a></li>
@@ -77,7 +75,7 @@
 <p>Chris gives a good idea of how to use ivy, cruise control and nant in a dotnet project environment</p>
 <li><a href="http://weblogs.java.net/blog/dcengija/archive/2006/04/configuring_ivy.html">Integrating Ivy and luntbuild</a></li>
 <p>Davor Cengija on his blog explain how he integrates Ivy in luntbuild, an open source continuous integration server</p>
-<li><a href="doc/articles/ease-multi-module.html">Easing multi module development</a></li>
+<li><a href="http://www.jaya.free.fr/ivy/doc/articles/ease-multi-module.html">Easing multi module development</a></li>
 <p>Johan stuyts, the author of SAnt, also contributed a nice article on his view of how to use Ivy on a multi module environment.</p>
 <li><a href="http://www-128.ibm.com/developerworks/java/library/j-ap10106/index.html?ca=dgr-jw01SmellyScripts">Remove the smell from your build scripts</a></li>
 <p>This article is not related to Ivy, but to build script in general, but we thought it may be worth for Ivy users to read it.

Modified: incubator/ivy/site/m2comparison.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/m2comparison.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/m2comparison.html (original)
+++ incubator/ivy/site/m2comparison.html Fri Jul  6 06:47:28 2007
@@ -66,7 +66,7 @@
 With maven2, conflict management is quite simple: the principle is to get the nearest definition. So if your module depends on foo 1.0, none of your dependencies will ever manage to get foo 1.1 without a change in your own dependency declaration. It may be ok in some cases, it may not in others...
 
 <h1>Flexibility</h1>
-In ivy many things can be <a href="../doc/configuration.html">configured</a>, and many others can be <a href="../doc/extend.html">plugged in</a>: dependency resolvers, conflict manager, module descriptor parser, latest revision strategy, ... Maven2 also offers repository pluggability, but not much more as far as we know. Moreover, repository configuration seems to be less flexible than with ivy.
+In ivy many things can be [[doc:configuration configured]], and many others can be [[doc:extend plugged in]]: dependency resolvers, conflict manager, module descriptor parser, latest revision strategy, ... Maven2 also offers repository pluggability, but not much more as far as we know. Moreover, repository configuration seems to be less flexible than with ivy.
 
 <h1>Public Repositories</h1>
 Maven2 comes out of the box configured to use ibiblio maven2 repository, which contains <strong>a lot</strong> of modules (both artifacts and module descriptors). The only problem some may face is that module descriptors are not always checked, so some are not really well written.

Modified: incubator/ivy/site/mailing-lists.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/mailing-lists.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/mailing-lists.html (original)
+++ incubator/ivy/site/mailing-lists.html Fri Jul  6 06:47:28 2007
@@ -89,7 +89,6 @@
 </table>
 <table cellpadding="10">
 <tr><td>
-<a href="http://mail-archives.apache.org/mod_mbox/incubator-ivy-commit/">Apache Archive</a>
 </td><td>
 <a href="http://mail-archive.com/ivy-commit%40incubator.apache.org/">mail-archive.com</a>
 </td><td>

Modified: incubator/ivy/site/toc.json
URL: http://svn.apache.org/viewvc/incubator/ivy/site/toc.json?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/toc.json (original)
+++ incubator/ivy/site/toc.json Fri Jul  6 06:47:28 2007
@@ -74,7 +74,6 @@
       {
         "id":"history",
         "title":"History",
-        "isAbstract":true,
         "children": [
             {
               "id":"2.x",

Modified: incubator/ivy/site/write-doc.html
URL: http://svn.apache.org/viewvc/incubator/ivy/site/write-doc.html?view=diff&rev=553877&r1=553876&r2=553877
==============================================================================
--- incubator/ivy/site/write-doc.html (original)
+++ incubator/ivy/site/write-doc.html Fri Jul  6 06:47:28 2007
@@ -59,7 +59,7 @@
 </code>
 Very helpful to avoid escaping all xml with lt and gt.
 
-Finally, URLs are automatically recognized and convert to links, jira issues like IVY-202 are recognized too, and you can use a neat format to reference any ant ivy ant task like [[ant:import]], or also reference svn page easily like [[svn:build.xml this link to build.xml]]. And you can also link to another page by providing its id (i.e. its url without the base and the .html) like the [[index]] or the [[history/trunk/index]]. 
+Finally, URLs are automatically recognized and convert to links, jira issues like IVY-202 are recognized too, and you can use a neat format to reference any ant ivy ant task like [[ant:install]], or also reference svn page easily like [[svn:build.xml this link to build.xml]]. And you can also link to another page by providing its id (i.e. its url without the base and the .html) like the [[index]] or the [[history/trunk/index]]. 
 
 Feel free to edit this page to get a good overview of what is possible.