Author: xavier
Date: Thu Mar 29 06:33:41 2007
New Revision: 523701
URL: http://svn.apache.org/viewvc?view=rev&rev=523701
Log:
target version is 2.0
Modified:
incubator/ivy/core/trunk/build.xml
incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html
incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html
incubator/ivy/core/trunk/doc/doc/terminology.html
incubator/ivy/core/trunk/doc/doc/use/buildlist.html
incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy14.java
Modified: incubator/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=523701&r1=523700&r2=523701
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Thu Mar 29 06:33:41 2007
@@ -60,7 +60,7 @@
ivy is in at least one of ant's lib dir or the local lib dir. -->
<taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
- <ivy:configure file="${basedir}/ivysettings.xml" /> <!-- not
necessary with Ivy 1.5+ -->
+ <ivy:configure file="${basedir}/ivysettings.xml" /> <!-- not
necessary with Ivy 2.0+ -->
</target>
Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html?view=diff&rev=523701&r1=523700&r2=523701
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-artifact.html Thu Mar
29 06:33:41 2007
@@ -45,7 +45,7 @@
<span class="since">since 1.4</span> It's possible to indicate the url at
which the artifact can be found. This is not mandatory, and even not
recommended with an enterprise repository. Note that Ivy will always look at
the location where the artifact should be and only use the url if it cannot be
found at the standard location in the repository.
-<span class="since">since 1.5</span> This feature can also be used for modules
having their own module descriptor, but which doesn't declare an artifact you
know that is published. Note that in this case artifacts declared to be
published by the dependency will be ignored, so do not forget to include all
artifacts you want.
+<span class="since">since 2.0</span> This feature can also be used for modules
having their own module descriptor, but which doesn't declare an artifact you
know that is published. Note that in this case artifacts declared to be
published by the dependency will be ignored, so do not forget to include all
artifacts you want.
<h1>Attributes</h1>
<table class="ivy-attributes">
Modified: incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html?view=diff&rev=523701&r1=523700&r2=523701
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html (original)
+++ incubator/ivy/core/trunk/doc/doc/ivyfile/dependency-include.html Thu Mar 29
06:33:41 2007
@@ -53,7 +53,7 @@
<td>No, defaults to .*</td></tr>
<tr><td>ext</td><td>the extension of the artifact of the dependency module
to add to the include list, or a regexp matching this name</td>
<td>No, defaults to type</td></tr>
- <tr><td>matcher</td><td>the matcher to use to match the modules to include
<span class="since">since 1.5</span></td>
+ <tr><td>matcher</td><td>the matcher to use to match the modules to include
<span class="since">since 2.0</span></td>
<td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in
1.3 and superior</td></tr>
<tr><td>conf</td><td>comma separated list of the master configurations in
which this artifact should be included.
'*' wildcard can be used to designate all configurations of this
module</td>
Modified: incubator/ivy/core/trunk/doc/doc/terminology.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/terminology.html?view=diff&rev=523701&r1=523700&r2=523701
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/terminology.html (original)
+++ incubator/ivy/core/trunk/doc/doc/terminology.html Thu Mar 29 06:33:41 2007
@@ -29,7 +29,7 @@
An ivy file is an xml file which is used to describe dependencies of a module
(see below). It is usually named ivy.xml.
<h2>Settings</h2>
Ivy settings files are xml files used to configure ivy to indicate where the
dependencies can be found and how.
-<em>Prior to Ivy 1.5, these files were called configuration files and usually
named ivyconf.xml. This resulted in a confusion between module configurations
and configuration files, so they have been renamed in settings files.
+<em>Prior to Ivy 2.0, these files were called configuration files and usually
named ivyconf.xml. This resulted in a confusion between module configurations
and configuration files, so they have been renamed in settings files.
If you happen to fall on an ivyconf file or something called a configuration
file, most of the time it's only a problem of update of the
doc/tutorial/article. Feel free to report any problem like this if you find
such inconsistencies in this documentation.</em>
<h2>Organisation</h2>
An organisation is either a company or a simple group of person
Modified: incubator/ivy/core/trunk/doc/doc/use/buildlist.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/use/buildlist.html?view=diff&rev=523701&r1=523700&r2=523701
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/use/buildlist.html (original)
+++ incubator/ivy/core/trunk/doc/doc/use/buildlist.html Thu Mar 29 06:33:41 2007
@@ -34,7 +34,7 @@
<span class="since">since 1.4</span> The ivy.sorted.modules property is set in
the ant at the end of the task with a comma separated list of ordered modules.
This can be useful for debug or information purpose.
-<span class="since">since 1.5</span> The root and leaf attributes can be a
delimited list of modules to use as roots. These modules, and all their
dependencies will be included in the build list.
+<span class="since">since 2.0</span> The root and leaf attributes can be a
delimited list of modules to use as roots. These modules, and all their
dependencies will be included in the build list.
<table class="ant">
<thead>
<tr><th class="ant-att">Attribute</th><th
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
@@ -43,10 +43,10 @@
<tr><td>reference</td><td>the reference of the path to set</td>
<td>Yes</td></tr>
<tr><td>ivyfilepath</td><td>the relative path from files to order to
corresponding ivy files</td><td>No. Defaults to
${ivy.buildlist.ivyfilepath}</td></tr>
- <tr><td>root</td><td><span class="since">since 1.5</span> the names of the
modules which should be considered as the root of the buildlist. <br/><span
class="since">since 1.3</span> Was limited to only one module name before
1.5.</td><td>No. Defaults to no root (all modules are used in the build
list)</td></tr>
+ <tr><td>root</td><td><span class="since">since 2.0</span> the names of the
modules which should be considered as the root of the buildlist. <br/><span
class="since">since 1.3</span> Was limited to only one module name before
2.0.</td><td>No. Defaults to no root (all modules are used in the build
list)</td></tr>
<tr><td>excluderoot</td><td><span class="since">since 1.3</span> true if
the root defined should be excluded from the list</td><td>No. Defaults to
false</td></tr>
- <tr><td>leaf</td><td><span class="since">since 1.5</span> the names of the
modules which should be considered as the leaf of the buildlist. <br/><span
class="since">since 1.4.1</span> Was limited to only one module name before
1.5.</td><td>No. Defaults to no leaf (all modules are used in the build
list)</td></tr>
- <tr><td>delimiter</td><td><span class="since">since 1.5</span> delimiter
to use when specifying multiple module names in the root and leaf
properties.</td><td>No. Defaults to the comma (,) character.</td></tr>
+ <tr><td>leaf</td><td><span class="since">since 2.0</span> the names of the
modules which should be considered as the leaf of the buildlist. <br/><span
class="since">since 1.4.1</span> Was limited to only one module name before
2.0.</td><td>No. Defaults to no leaf (all modules are used in the build
list)</td></tr>
+ <tr><td>delimiter</td><td><span class="since">since 2.0</span> delimiter
to use when specifying multiple module names in the root and leaf
properties.</td><td>No. Defaults to the comma (,) character.</td></tr>
<tr><td>excludeleaf</td><td><span class="since">since 1.4.1</span> true if
the leaf defined should be excluded from the list</td><td>No. Defaults to
false</td></tr>
<tr><td>haltonerror</td><td>true to halt the build when an invalid ivy
file is encountered, false to continue</td><td>No. Defaults to true</td></tr>
<tr><td>skipbuildwithoutivy</td><td>true to skip files of the fileset with
no corresponding ivy file, false otherwise. If false the file with no
corresponding ivy file will be considered as independent of the other and put
at the beginning of the built filelist.</td><td>No. Defaults to false</td></tr>
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy14.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy14.java?view=diff&rev=523701&r1=523700&r2=523701
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy14.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/Ivy14.java Thu Mar 29
06:33:41 2007
@@ -55,7 +55,7 @@
/**
* This class can be used for easy migration from Ivy 1.4 API.
*
- * Indeed, Ivy 1.5 API has changed substantially, so it can take time to
+ * Indeed, Ivy 2.0 API has changed substantially, so it can take time to
* migrate existing code using Ivy 1.4 API to the new API.
*
* Using this class it's really easy: replace your instance of Ivy by an
