incubator-ivy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r536488 [1/19] - in /incubator/ivy/core/trunk: ./ doc/ doc/doc/ doc/doc/configuration/ doc/doc/configuration/macrodef/ doc/doc/configuration/namespace/ doc/doc/ivyfile/ doc/doc/releasenotes/ doc/doc/resolver/ doc/doc/tutorial/ doc/doc/tutor...
Date Wed, 09 May 2007 10:58:16 GMT
Author: xavier
Date: Wed May  9 03:58:10 2007
New Revision: 536488

URL: http://svn.apache.org/viewvc?view=rev&rev=536488
Log:
FIX: EOL in the doc pages (IVY-470)

Modified:
    incubator/ivy/core/trunk/CHANGES.txt
    incubator/ivy/core/trunk/build.xml
    incubator/ivy/core/trunk/doc/choose-distrib.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/config.json   (contents, props changed)
    incubator/ivy/core/trunk/doc/conflict-solving-algo.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/demo.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ant.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/appendix.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/bestpractices.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/concept.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/classpath.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/conflict-managers.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/include.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/latest-strategies.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/macrodef.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/macrodef/attribute.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/module.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/modules.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/namespace.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/namespace/dest.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/namespace/fromtosystem.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/namespace/rule.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/namespace/src.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/namespaces.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/outputters.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/parsers.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/properties.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/property.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/resolvers.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/status.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/statuses.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/triggers.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/typedef.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/configuration/version-matchers.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/dev.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/extend.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/install.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/intro.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude-conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/artifact-exclude.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/artifact.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/configurations.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/conflicts.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependencies.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact-conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include-conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/dependency.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/description.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/include.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/info.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/ivyauthor.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/license.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/manager.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/mapped.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/publications.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/ivyfile/repository.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/m2comparison.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/moreexamples.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/principle.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/reference.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.5.1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.5.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.6.1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.6.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.7.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.8.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/0.9.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.0-rc1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.0-rc2.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.0-rc3.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.0.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.2a.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.3-rc1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.3-rc2.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.3-rc3.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.3.1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.3.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.4-RC1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.4-RC2.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.4.1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/1.4.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/2.0.0-alpha-1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/releasenotes/2.0.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/chain.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/dual.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/filesystem.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/ibiblio.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/ivyrep.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/sftp.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/ssh.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/url.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/resolver/vfs.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/standalone.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/terminology.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/build-repository.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/build-repository/advanced1.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/build-repository/advanced2.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/build-repository/basic.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/conf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/defaultconf.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/dual.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/ivyrep.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/multi-project.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/multiple.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/multiproject.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/tutorial/start.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/artifactproperty.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/artifactreport.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/buildlist.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/buildnumber.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/cachefileset.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/cachepath.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/configure.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/deliver.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/findrevision.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/info.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/install.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/listmodules.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/postresolvetask.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/publish.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/report.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/repreport.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/resolve.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/retrieve.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/use/var.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/doc/yed.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/download.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/faq.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/features.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/get-involved.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/homeTemplate.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/index.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/issues.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/ivyrep.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/license.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/links.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/mailing-lists.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/printTemplate.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/template.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/testimonials.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/toc.json   (contents, props changed)
    incubator/ivy/core/trunk/doc/wiki.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/write-doc.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/xooki/blankPageTpl.html   (contents, props changed)
    incubator/ivy/core/trunk/doc/xooki/messages.json   (contents, props changed)

Modified: incubator/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Wed May  9 03:58:10 2007
@@ -50,6 +50,7 @@
 
 - IMPROVEMENT: Allow "main" parameters to be passed directly (instead of using -args flag) (IVY-480) (thanks to Archie Cobbs)
 
+- FIX: EOL in the doc pages (IVY-470)
 - FIX: Cache is storing ArtifactOrigin properties with no guarantee of unicity and types telescope during resolve. (IVY-430) (thanks to Stephane Bailliez)
 - FIX: ivy:install ant task does not fail on error (IVY-475) (thanks to Jeffrey Blatttman)
 - FIX: Credentials are shown in build log even if debug is not enabled (IVY-486) (thanks to Gilles Scokart)

Modified: incubator/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Wed May  9 03:58:10 2007
@@ -422,5 +422,13 @@
 		</javadoc>
 	</target>
 
-
+	<target name="fixcrlf">
+		<fixcrlf srcdir="${doc.src.dir}" includes="**/*.html,**/*.json" excludes="samples/**,presentations/**" eol="lf" />
+		<apply executable="svn">
+			<arg value="propset"/>
+			<arg value="svn:eol-style"/>
+			<arg value='"LF"'/>
+			<fileset dir="${doc.src.dir}" includes="**/*.html,**/*.json" excludes="samples/**,presentations/**" />
+		</apply>
+	</target>
 </project>

Modified: incubator/ivy/core/trunk/doc/choose-distrib.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/choose-distrib.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/choose-distrib.html (original)
+++ incubator/ivy/core/trunk/doc/choose-distrib.html Wed May  9 03:58:10 2007
@@ -1,41 +1,41 @@
-<!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">
-Each distribution of ivy contains samples. The documentation is packaged separately due to its size. It corresponds to a snapshot of the online documentation at the time of the release. Prefer the site itself if you want to have an updated and commented version of the documentation.
-With each version of ivy, you can find:
-<h2>binary distribution</h2>
-Containing ivy jars, dependencies and samples.
-This is the recommended version if you just want to use ivy. It requires at least a jre 1.4+ to run, and it is recommended to use it from ant (1.5.1+, 1.6.2+ recommended).
-<h2>sources</h2>
-Ready to be build with ant 1.6.0 or greater and ... ivy 1.4-RC1+. Yes, ivy eats its own dog food, and needs a binary version of itself to be build. Note that you will also need to have an internet access during build in order to ivy to download dependencies from ibiblio.
-This is the recommended version if you want to build ivy yourself and see it in action at the same time.
-<i>Note:</i> version 1.6.0 of ant is required here because the build file use its namespace feature to import ivy tasks.
-<h2>documentation</h2>
-Full ivy documentation easily browsable offline, packaged as a zip.</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
+	<script type="text/javascript" src="xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+Each distribution of ivy contains samples. The documentation is packaged separately due to its size. It corresponds to a snapshot of the online documentation at the time of the release. Prefer the site itself if you want to have an updated and commented version of the documentation.
+With each version of ivy, you can find:
+<h2>binary distribution</h2>
+Containing ivy jars, dependencies and samples.
+This is the recommended version if you just want to use ivy. It requires at least a jre 1.4+ to run, and it is recommended to use it from ant (1.5.1+, 1.6.2+ recommended).
+<h2>sources</h2>
+Ready to be build with ant 1.6.0 or greater and ... ivy 1.4-RC1+. Yes, ivy eats its own dog food, and needs a binary version of itself to be build. Note that you will also need to have an internet access during build in order to ivy to download dependencies from ibiblio.
+This is the recommended version if you want to build ivy yourself and see it in action at the same time.
+<i>Note:</i> version 1.6.0 of ant is required here because the build file use its namespace feature to import ivy tasks.
+<h2>documentation</h2>
+Full ivy documentation easily browsable offline, packaged as a zip.</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/config.json
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/config.json?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/config.json (original)
+++ incubator/ivy/core/trunk/doc/config.json Wed May  9 03:58:10 2007
@@ -1,7 +1,7 @@
-{debug:true, 
-	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.root+'doc/use/', post:'.html'}
-	}
-}
+{debug:true, 
+	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.root+'doc/use/', post:'.html'}
+	}
+}

Propchange: incubator/ivy/core/trunk/doc/config.json
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/conflict-solving-algo.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/conflict-solving-algo.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/conflict-solving-algo.html (original)
+++ incubator/ivy/core/trunk/doc/conflict-solving-algo.html Wed May  9 03:58:10 2007
@@ -1,115 +1,115 @@
-<!--
-   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>
-Here are some explanations about the conflict management algorithm in Ivy.<br/><br/>
-
-First, one should have a good understanding on how Ivy resolves dependencies, and especially
-transitive dependencies.<br/><br/>
-
-During the resolve process, ivy visits each module of the dependency graph. <br/>
-Let's call each module a <b>node</b>, including the module we are trying to resolve dependencies for.<br/><br/>
-
-Each node should be able to give a conflict manager for a particular ModuleId.<br/>
-Let's name it <b>node.cm(mid)</b>.<br/><br/>
-
-Each node should be able to matain a map from ModuleId to a resolved Collection of nodes.<br/>
-This resolved collection will never contain any evicted node FOR the concerned node as far
-as ivy knows, dependening on where it is in graph visit.<br/>
-Let's call this map resolved, and the corresponding resolved collection <b>node.resolved(mid)</b>.<br/><br/>
-
-During the visit, ivy should always know from which node it came to visit another node. Let's call
-the first node from which ivy came <b>node.parent</b>. Note that this concept is slightly different from
-node parent, since a node can have several parents in the graph, but there is also one <b>node.parent</b>
-during the visit.<br/><br/>
-
-Let's say that a conflict manager is able to filter a collection of nodes to return only those
-that are not evicted. Let's call that <b>cm.resolveConflicts(collection)</b>.<br/><br/>
-
-Let's call <b>node.dependencies</b> the collection of direct dependencies of a node.<br/><br/>
-
-Let's call <b>node.revision</b> the module revision id of a node.<br/><br/>
-
-And now for the algo. This algo attempts to evict nodes on the fly, i.e. during the ivy visit,
-to minimize the number of resolved modules, and thus the number of ivy files to download.<br/><br/>
-
-It is presented in a very simplified description language, far away from the whole real complexity,
-but giving a good understanding of how it works. In particular, it completely hides some complexity due
-to configurations management.<br/><br/>
-
-<pre>
-resolve(node) {
-	node.resolved(node.mid) = <i>collection</i>(node);
-	resolveConflict(node, node.parent, empty);
-	if (!node.evicted && !node.alreadyResolved) {
-		node.loadData();
-		resolveConflict(node, node.parent, empty);
-		if (!node.evicted) {
-			// actually do resolve
-			foreach (dep in node.dependencies) {
-				resolve(dep);
-			}
-		}
-	}
-}
-
-resolveConflict(node, parent, toevict) {
-	if (node.revision.exact && parent.resolved(node.mid).revision.contains(node.revision)) { 
-		// exact revision already in resolved
-		// => job already done
-		return;
-	}
-	if (parent.resolved(node.mid).containsAny(toevict)) {
-		// parent.resolved(node.mid) is not up to date:
-		// recompute resolved from all sub nodes
-		resolved = parent.cm(node.mid).resolveConflicts(
-		                                 parent.dependencies.resolved(node.mid));
-	} else {
-		resolved = parent.cm(node.mid).resolveConflicts(<i>collection</i>(node, parent.resolved(node.mid)));
-	}
-	if (resolved.contains(node)) {
-		// node has been selected for the current parent
-		// we update its eviction... but it can still be evicted by parent !
-		node.evicted = false;
-		
-		// handle previously selected nodes that are now evicted by this new node
-		toevict = parent.resolved(node.mid) - resolved;
-		foreach (te in toevict) {
-			te.evicted = true;
-		}
-		
-		// it's very important to update resolved BEFORE recompute parent call
-		// to allow it to recompute its resolved collection with correct data
-		// if necessary
-		parent.resolved(node.mid) = resolved; 
-		if (parent.parent != null) {
-			resolveConflict(node, parent.parent, toevict);
-		}
-	} else {
-		// node has been evicted for the current parent
-		
-		// it's time to update parent resolved with found resolved...
-		// if they have not been recomputed, it does not change anything
-		parent.resolved(node.mid) = resolved; 
-		
-		node.evicted = true;
-	}
-}
-
-</pre>
-</html>
+<!--
+   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>
+Here are some explanations about the conflict management algorithm in Ivy.<br/><br/>
+
+First, one should have a good understanding on how Ivy resolves dependencies, and especially
+transitive dependencies.<br/><br/>
+
+During the resolve process, ivy visits each module of the dependency graph. <br/>
+Let's call each module a <b>node</b>, including the module we are trying to resolve dependencies for.<br/><br/>
+
+Each node should be able to give a conflict manager for a particular ModuleId.<br/>
+Let's name it <b>node.cm(mid)</b>.<br/><br/>
+
+Each node should be able to matain a map from ModuleId to a resolved Collection of nodes.<br/>
+This resolved collection will never contain any evicted node FOR the concerned node as far
+as ivy knows, dependening on where it is in graph visit.<br/>
+Let's call this map resolved, and the corresponding resolved collection <b>node.resolved(mid)</b>.<br/><br/>
+
+During the visit, ivy should always know from which node it came to visit another node. Let's call
+the first node from which ivy came <b>node.parent</b>. Note that this concept is slightly different from
+node parent, since a node can have several parents in the graph, but there is also one <b>node.parent</b>
+during the visit.<br/><br/>
+
+Let's say that a conflict manager is able to filter a collection of nodes to return only those
+that are not evicted. Let's call that <b>cm.resolveConflicts(collection)</b>.<br/><br/>
+
+Let's call <b>node.dependencies</b> the collection of direct dependencies of a node.<br/><br/>
+
+Let's call <b>node.revision</b> the module revision id of a node.<br/><br/>
+
+And now for the algo. This algo attempts to evict nodes on the fly, i.e. during the ivy visit,
+to minimize the number of resolved modules, and thus the number of ivy files to download.<br/><br/>
+
+It is presented in a very simplified description language, far away from the whole real complexity,
+but giving a good understanding of how it works. In particular, it completely hides some complexity due
+to configurations management.<br/><br/>
+
+<pre>
+resolve(node) {
+	node.resolved(node.mid) = <i>collection</i>(node);
+	resolveConflict(node, node.parent, empty);
+	if (!node.evicted && !node.alreadyResolved) {
+		node.loadData();
+		resolveConflict(node, node.parent, empty);
+		if (!node.evicted) {
+			// actually do resolve
+			foreach (dep in node.dependencies) {
+				resolve(dep);
+			}
+		}
+	}
+}
+
+resolveConflict(node, parent, toevict) {
+	if (node.revision.exact && parent.resolved(node.mid).revision.contains(node.revision)) { 
+		// exact revision already in resolved
+		// => job already done
+		return;
+	}
+	if (parent.resolved(node.mid).containsAny(toevict)) {
+		// parent.resolved(node.mid) is not up to date:
+		// recompute resolved from all sub nodes
+		resolved = parent.cm(node.mid).resolveConflicts(
+		                                 parent.dependencies.resolved(node.mid));
+	} else {
+		resolved = parent.cm(node.mid).resolveConflicts(<i>collection</i>(node, parent.resolved(node.mid)));
+	}
+	if (resolved.contains(node)) {
+		// node has been selected for the current parent
+		// we update its eviction... but it can still be evicted by parent !
+		node.evicted = false;
+		
+		// handle previously selected nodes that are now evicted by this new node
+		toevict = parent.resolved(node.mid) - resolved;
+		foreach (te in toevict) {
+			te.evicted = true;
+		}
+		
+		// it's very important to update resolved BEFORE recompute parent call
+		// to allow it to recompute its resolved collection with correct data
+		// if necessary
+		parent.resolved(node.mid) = resolved; 
+		if (parent.parent != null) {
+			resolveConflict(node, parent.parent, toevict);
+		}
+	} else {
+		// node has been evicted for the current parent
+		
+		// it's time to update parent resolved with found resolved...
+		// if they have not been recomputed, it does not change anything
+		parent.resolved(node.mid) = resolved; 
+		
+		node.evicted = true;
+	}
+}
+
+</pre>
+</html>

Propchange: incubator/ivy/core/trunk/doc/conflict-solving-algo.html
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/ivy/core/trunk/doc/demo.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/demo.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/demo.html (original)
+++ incubator/ivy/core/trunk/doc/demo.html Wed May  9 03:58:10 2007
@@ -1,31 +1,31 @@
-<!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">
-The Ivy demo is not available yet. Come back later or contribute a new demo!</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
+	<script type="text/javascript" src="xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+The Ivy demo is not available yet. Come back later or contribute a new demo!</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc.html (original)
+++ incubator/ivy/core/trunk/doc/doc.html Wed May  9 03:58:10 2007
@@ -1,76 +1,76 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
-	<script type="text/javascript" src="xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-Welcome to the official Ivy documentation.
-
-<h1>What is Ivy?</h1>
-Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies. It is characterized by the following:
-<ol>
-<li>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.</li>
-
-<li>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.</li>
-</ol>
-Ivy is open source and released under a very permissive <a href="license.html">license</a>.
-Ivy has a lot of powerful [[features]], the most popular and useful being its flexibily, integration with ant, and its strong transitive dependencies management engine.
-The transitive dependencies management is a feature which let you get dependencies of your dependencies, transitively. In order to address this problematic ivy needs to find metadata about your modules, usually in an <a href="doc/ivyfile.html">ivy file</a>. To find these metadata and your dependencies artifacts (usually jars), Ivy can be configured to use a lot of different <a href="doc/configuration/resolvers.html">repositories</a>.
-
-<h1>About this doc</h1>
-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 <a href="http://incubator.apache.org/ivy/doc.html">online version</a> for latest updates.
-
-You can also browse this documentation offline either by downloading the documentation distribution, or by checking out the doc directory from svn. This documentation uses <a href="http://xooki.sourceforge.net/">xooki</a> as documentation engine, so you can very easily [[get-involved edit it and submit patches]] when you browse it from source.
-
-The online version of this documentation is updated periodically, especially when new features are added during development. So if you find something documented here not available in your version of ivy, it may be because it is available only with the latest <a href="download.html">download</a>.
-
-If you want to view the whole documentation in a single printer-friendly page, please use the <a href="doc.html?action=print">printer-friendly link</a> at the bottom of any documentation page in the online documentation, and you will get a printer friendly version of the current page and all its sub pages.
-
-<h1>Other places to go</h1>
-Check Ivy <a href="features.html">features</a>. 
-Read our <a href="faq.html">FAQ</a>.
-Ask for help on our <a href="mailing-lists.html">mailing lists</a>.
-Report bug or feature request in our <a href="issues.html">issue tracking system</a>.
-Check <a href="links.html">external tools and resources</a>.
-
-<h1>Overview</h1>
-This documentation is decomposed in 3 main parts:
-<ul>
-  <li><a href="doc/tutorial.html">Tutorials</a></li> 
-The tutorials is the best way to begin to play with ivy. You will easily and quickly learn the basics of Ivy.
-  <li><a href="doc/reference.html">Reference</a></li> 
-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 give an overview on how ivy works internally. 
-It's also in the reference doc that you will find all you always dreamed to know about ivy configuration, ivy files, and ivy use (especially with ant).
-  <li><a href="doc/appendix.html">Appendix</a></li> 
-The appendix section contains a bunch of Ivy related information which is not part of Ivy reference doc.
-</ul>
-
-You will also find here interesting pages like [[doc/bestpractices]], the [[faq]] or the [[links]] pages.
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
+	<script type="text/javascript" src="xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+Welcome to the official Ivy documentation.
+
+<h1>What is Ivy?</h1>
+Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies. It is characterized by the following:
+<ol>
+<li>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.</li>
+
+<li>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.</li>
+</ol>
+Ivy is open source and released under a very permissive <a href="license.html">license</a>.
+Ivy has a lot of powerful [[features]], the most popular and useful being its flexibily, integration with ant, and its strong transitive dependencies management engine.
+The transitive dependencies management is a feature which let you get dependencies of your dependencies, transitively. In order to address this problematic ivy needs to find metadata about your modules, usually in an <a href="doc/ivyfile.html">ivy file</a>. To find these metadata and your dependencies artifacts (usually jars), Ivy can be configured to use a lot of different <a href="doc/configuration/resolvers.html">repositories</a>.
+
+<h1>About this doc</h1>
+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 <a href="http://incubator.apache.org/ivy/doc.html">online version</a> for latest updates.
+
+You can also browse this documentation offline either by downloading the documentation distribution, or by checking out the doc directory from svn. This documentation uses <a href="http://xooki.sourceforge.net/">xooki</a> as documentation engine, so you can very easily [[get-involved edit it and submit patches]] when you browse it from source.
+
+The online version of this documentation is updated periodically, especially when new features are added during development. So if you find something documented here not available in your version of ivy, it may be because it is available only with the latest <a href="download.html">download</a>.
+
+If you want to view the whole documentation in a single printer-friendly page, please use the <a href="doc.html?action=print">printer-friendly link</a> at the bottom of any documentation page in the online documentation, and you will get a printer friendly version of the current page and all its sub pages.
+
+<h1>Other places to go</h1>
+Check Ivy <a href="features.html">features</a>. 
+Read our <a href="faq.html">FAQ</a>.
+Ask for help on our <a href="mailing-lists.html">mailing lists</a>.
+Report bug or feature request in our <a href="issues.html">issue tracking system</a>.
+Check <a href="links.html">external tools and resources</a>.
+
+<h1>Overview</h1>
+This documentation is decomposed in 3 main parts:
+<ul>
+  <li><a href="doc/tutorial.html">Tutorials</a></li> 
+The tutorials is the best way to begin to play with ivy. You will easily and quickly learn the basics of Ivy.
+  <li><a href="doc/reference.html">Reference</a></li> 
+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 give an overview on how ivy works internally. 
+It's also in the reference doc that you will find all you always dreamed to know about ivy configuration, ivy files, and ivy use (especially with ant).
+  <li><a href="doc/appendix.html">Appendix</a></li> 
+The appendix section contains a bunch of Ivy related information which is not part of Ivy reference doc.
+</ul>
+
+You will also find here interesting pages like [[doc/bestpractices]], the [[faq]] or the [[links]] pages.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/ant.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ant.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ant.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ant.html Wed May  9 03:58:10 2007
@@ -1,155 +1,155 @@
-<!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: 1};</script>	
-	<script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-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 <b>1.6.0</b> or superior, you just have to add ivy namespace to your project (<code>xmlns:ivy="antlib:org.apache.ivy.ant"</code> 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 follow <a href="http://www.jayasoft.org/node/233.html">this tip</a> given by colin sampaleanu.
-
-If you use ant <b>1.5.1</b> or superior, you have to define the tasks you use in your build file. For instance:
-<code>
-  <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"/>
-</code>
-<em>Note: the tasks listed above are non exhaustive. For a complete list of tasks with the corresponding classes, see the [[svn:src/java/org/apache/ivy/ant/antlib.xml antlib.xml]] file in svn or the version you use.</em>
-
-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.
-<h1>Calling ivy from ant: first steps</h1>
-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:
-<code>
-<ivy:retrieve />
-</code>
-This calls ivy with default values, which might be ok in several projects. In fact, it is equivalent to:
-<code type="xml">
-<target name="resolve">
-    <ivy:configure />
-    
-    <ivy:resolve file="${ivy.dep.file}" conf="${ivy.configurations}" />
-    
-    <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${ivy.configurations}" />
-</target>
-</code>
-
-Those 3 tasks follow the 3 main steps of ivy retrieving dependencies process:
-<ul>
-<li>First the configure task tells it how it can find dependencies giving it a path to an <a href="../doc/configuration.html">xml configuration file</a>.</li> 
-<li>Then the resolve task actually resolve dependencies described by an <a href="../doc/ivyfile.html">ivy file</a>, and put those dependencies in the ivy cache (a directory configured in the configuration file).</li>
-<li>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.</li>
-</ul>
-
-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:
-<code>
-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
-</code>
-<em>For the latest version of these properties, you can check the [[svn:src/java/org/apache/ivy/ivy.properties svn version]].</em>
-
-<h1>Ivy tasks attributes : generalities</h1>
-Some tasks attributes values may be given through different places. The three possible places are :
-<ol>
-<li>task attribute</li>
-<li>ivy instance</li>
-<li>project property</li>
-</ol>
-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.
-
-<h1>Usual cycle of main tasks</h1>
-<center><img src="../images/main-tasks.png" /></center>
-<h1>Example</h1>
-Here is a more complete example of build file using ivy:
-
-<code type="xml">
-<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>
-</code>
-
-All ivy tasks are documented in the following pages.
-
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
+	<script type="text/javascript" src="../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+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 <b>1.6.0</b> or superior, you just have to add ivy namespace to your project (<code>xmlns:ivy="antlib:org.apache.ivy.ant"</code> 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 follow <a href="http://www.jayasoft.org/node/233.html">this tip</a> given by colin sampaleanu.
+
+If you use ant <b>1.5.1</b> or superior, you have to define the tasks you use in your build file. For instance:
+<code>
+  <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"/>
+</code>
+<em>Note: the tasks listed above are non exhaustive. For a complete list of tasks with the corresponding classes, see the [[svn:src/java/org/apache/ivy/ant/antlib.xml antlib.xml]] file in svn or the version you use.</em>
+
+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.
+<h1>Calling ivy from ant: first steps</h1>
+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:
+<code>
+<ivy:retrieve />
+</code>
+This calls ivy with default values, which might be ok in several projects. In fact, it is equivalent to:
+<code type="xml">
+<target name="resolve">
+    <ivy:configure />
+    
+    <ivy:resolve file="${ivy.dep.file}" conf="${ivy.configurations}" />
+    
+    <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${ivy.configurations}" />
+</target>
+</code>
+
+Those 3 tasks follow the 3 main steps of ivy retrieving dependencies process:
+<ul>
+<li>First the configure task tells it how it can find dependencies giving it a path to an <a href="../doc/configuration.html">xml configuration file</a>.</li> 
+<li>Then the resolve task actually resolve dependencies described by an <a href="../doc/ivyfile.html">ivy file</a>, and put those dependencies in the ivy cache (a directory configured in the configuration file).</li>
+<li>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.</li>
+</ul>
+
+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:
+<code>
+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
+</code>
+<em>For the latest version of these properties, you can check the [[svn:src/java/org/apache/ivy/ivy.properties svn version]].</em>
+
+<h1>Ivy tasks attributes : generalities</h1>
+Some tasks attributes values may be given through different places. The three possible places are :
+<ol>
+<li>task attribute</li>
+<li>ivy instance</li>
+<li>project property</li>
+</ol>
+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.
+
+<h1>Usual cycle of main tasks</h1>
+<center><img src="../images/main-tasks.png" /></center>
+<h1>Example</h1>
+Here is a more complete example of build file using ivy:
+
+<code type="xml">
+<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>
+</code>
+
+All ivy tasks are documented in the following pages.
+
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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

Modified: incubator/ivy/core/trunk/doc/doc/appendix.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/appendix.html?view=diff&rev=536488&r1=536487&r2=536488
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/appendix.html (original)
+++ incubator/ivy/core/trunk/doc/doc/appendix.html Wed May  9 03:58:10 2007
@@ -1,32 +1,32 @@
-<!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: 1};</script>	
-	<script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-	<textarea id="xooki-source">
-This section is the home of a bunch of appendixes to ivy main documentation.
-	</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
+	<script type="text/javascript" src="../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+This section is the home of a bunch of appendixes to ivy main documentation.
+	</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>

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



Mime
View raw message