Author: maartenc
Date: Thu Sep 17 22:00:52 2009
New Revision: 816393
URL: http://svn.apache.org/viewvc?rev=816393&view=rev
Log:
Merged some changes for the 2.1.0 release from trunk into 2.1.x branch
Modified:
ant/ivy/core/branches/2.1.x/ (props changed)
ant/ivy/core/branches/2.1.x/CHANGES.txt
ant/ivy/core/branches/2.1.x/doc/use/buildlist.html
ant/ivy/core/branches/2.1.x/doc/use/resolve.html
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/util/url/HttpClientHandler.java
Propchange: ant/ivy/core/branches/2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 22:00:52 2009
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442-791013
+/ant/ivy/core/trunk:695737,696014-696031,696442-791013,800226-801820,805347-811637
Modified: ant/ivy/core/branches/2.1.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/CHANGES.txt?rev=816393&r1=816392&r2=816393&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.1.x/CHANGES.txt Thu Sep 17 22:00:52 2009
@@ -88,6 +88,11 @@
Jaroslaw Wypychowski
Aleksey Zhukov
+ 2.1.0
+=====================================
+- DOCUMENTATION: little improvement of the documentations of the ivy:buildlist
and ivy:resolve Ant tasks.
+- FIX: Credentials were not set properly for URLs that require authentication
when using HttpClient.
+
2.1.0-rc2
=====================================
- DOCUMENTATION: not all attributes of publish task are documented (IVY-963)
(thanks to Jon Schneider)
Modified: ant/ivy/core/branches/2.1.x/doc/use/buildlist.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/doc/use/buildlist.html?rev=816393&r1=816392&r2=816393&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/doc/use/buildlist.html (original)
+++ ant/ivy/core/branches/2.1.x/doc/use/buildlist.html Thu Sep 17 22:00:52 2009
@@ -77,7 +77,7 @@
</ul>
</td><td>No. Defaults to 'head'</td></tr>
<tr><td>reverse</td><td>true to obtain the list in the reverse order, i.e.
from the most dependent to the least one</td><td>No. Defaults to default
false</td></tr>
- <tr><td>restartFrom</td><td><span class="since">since 2.0</span> The name
of the module which should be considered as the starting point in the
buildlist. This allows for the build to be started at any point in the
dependency chain. <br/></td><td>No. Defaults to no restart point (all modules
are used in the build list).</td></tr>
+ <tr><td>restartFrom</td><td><span class="since">since 2.0</span> The name
of the module which should be considered as the starting point in the
buildlist. This allows for the build to be started at any point in the
dependency chain. <br/></td><td>No. Defaults to '*' meaning no restart point
(all modules are used in the build list).</td></tr>
<tr><td>settingsRef</td><td><span class="since">since 2.0</span> A
reference to the ivy settings that must be used by this task</td><td>No,
'ivy.instance' is taken by default.</td></tr>
</tbody>
</table>
Modified: ant/ivy/core/branches/2.1.x/doc/use/resolve.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/doc/use/resolve.html?rev=816393&r1=816392&r2=816393&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/doc/use/resolve.html (original)
+++ ant/ivy/core/branches/2.1.x/doc/use/resolve.html Thu Sep 17 22:00:52 2009
@@ -156,7 +156,7 @@
<li>quiet</li> disable all usual messages, making the whole resolve process
quiet unless errors occur
</ul></td><td>No, defaults to 'default'.</td></tr>
- <tr><td>checkIfChanged</td><td>When set to true, the resolve will compare
the result with the last resolution done on this module, with those
configurations</td><td>No, default to 'true'</td></tr>
+ <tr><td>checkIfChanged</td><td>When set to true, the resolve will compare
the result with the last resolution done on this module, with those
configurations in order to define the property ivy.deps.changed. Put it to
false may provides slightly better performance.</td><td>No, default to
'true'</td></tr>
</tbody>
Modified:
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/util/url/HttpClientHandler.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/util/url/HttpClientHandler.java?rev=816393&r1=816392&r2=816393&view=diff
==============================================================================
---
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/util/url/HttpClientHandler.java
(original)
+++
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/util/url/HttpClientHandler.java
Thu Sep 17 22:00:52 2009
@@ -295,7 +295,7 @@
Credentials c = getCredentials(url);
if (c != null) {
Message.debug("found credentials for " + url + ": " + c);
- httpClient.getState().setProxyCredentials(
+ httpClient.getState().setCredentials(
new AuthScope(c.getHost(), AuthScope.ANY_PORT, c.getRealm()),
new NTCredentials(c.getUserName(), c.getPasswd(),
HostUtil.getLocalHostName(), c.getRealm()));
