Author: gscokart
Date: Tue Jun 12 03:18:45 2007
New Revision: 546449
URL: http://svn.apache.org/viewvc?view=rev&rev=546449
Log:
remove warning message and clarify that in the doc
Modified:
incubator/ivy/core/trunk/build.xml
incubator/ivy/core/trunk/doc/doc/use/settings.html
Modified: incubator/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=546449&r1=546448&r2=546449
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Tue Jun 12 03:18:45 2007
@@ -46,7 +46,7 @@
</classpath>
</taskdef>
- <ivy:settings />
+ <ivy:settings id="ivy.instance"/>
</target>
<target name="install" depends="jar" description="build Ivy and install
it in Ivy home for consecutive builds">
Modified: incubator/ivy/core/trunk/doc/doc/use/settings.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/use/settings.html?view=diff&rev=546449&r1=546448&r2=546449
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/use/settings.html (original)
+++ incubator/ivy/core/trunk/doc/doc/use/settings.html Tue Jun 12 03:18:45 2007
@@ -37,9 +37,9 @@
<tr><th class="ant-att">Attribute</th><th
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
</thead>
<tbody>
- <tr><td>id</td><td>A reference id that can be reused in the ivy task.
Note that the ivy tasks take the value "ivy.instance" by
default.</td><td></td></tr>
+ <tr><td>id</td><td>The settings id useable in the refId attributes of the
ivy task that needs a setting. Note that the ivy tasks will search by default
for the settings with the id "ivy.instance".</td><td>Yes</td></tr>
<tr><td>file</td><td>path to the settings file to use</td>
- <td rowspan="2">No. If a file is provided, url is ignored. If none are
provided, then it attempts to find a file at ${ivy.settings.file}, and if this
file does not exist, it uses a <a
href="./misc/ivy/samples/ivysettings-default.xml">default settings
file</a></td></tr>
+ <td rowspan="2">No. If a file is provided, url is ignored. If none are
provided, then it attempts to find a file at ${ivy.settings.file}, and if this
file does not exist, it uses a <a href="../tutorial/defaultconf.html">default
settings file</a></td></tr>
<tr><td>url</td><td>url of the settings file to use</td></tr>
<tr><td>host</td><td>http authentication host</td><td rowspan="4">No,
unless authentication is required</td></tr>
<tr><td>realm</td><td>http authentication realm</td></tr>
@@ -60,13 +60,13 @@
<h2>Examples</h2>
<h3>Simplest settings</h3>
-<code><ivy:settings/></code>
+<code><ivy:settings id="ivy.instance"/></code>
Use either ${ivy.settings.file} if it exists, or the <a
href="./misc/ivy/samples/ivysettings-default.xml">default settings file</a><br>
-This simplest setting is implicit. If you don't declare any settings with the
id <i>ivy.instance</i>, this declaration is used by default.
+This simplest setting is implicit.
<h3>Configure with a file</h3>
-<code><ivy:settings file="myconffile.xml" /></code>
+<code><ivy:settings id="ivy.instance" file="mysettings.xml" /></code>
<h3>Configure with an url</h3>
-<code><ivy:settings url="http://mysite.com/myconffile.xml"; /></code>
+<code><ivy:settings id="ivy.instance" url="http://mysite.com/mysettings.xml";
/></code>
<h3>Configure multiple URLs which require autentication</h3>
<code>
<ivy:settings id="authenticated.settings" file="path/to/my/ivysettings.xml">
@@ -74,7 +74,13 @@
<credentials host="yourhost.com" realm="Your Realm" username="myuser"
passwd="myotherpasswd" />
</ivy:configure>
</code>
- </textarea>
+<h3>Configure 2 different settings</h3>
+You can use multiple ivy settings during a build. In that case, every ivy
task has specify the settings that it mmust use.
+<code>
+ <ivy:settings id="ivy.normal.settings" file="normal_settings.xml" />
+ <ivy:settings id="ivy.release.settings" file="release_settings.xml" />
+</code>
+</textarea>
<script type="text/javascript">xooki.postProcess();</script>
</body>
</html>
