ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r696806 - in /ant/ivy/core/branches/2.0.x: CHANGES.txt src/java/org/apache/ivy/ant/IvyAntVariableContainer.java src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java
Date Thu, 18 Sep 2008 21:14:29 GMT
Author: maartenc
Date: Thu Sep 18 14:14:28 2008
New Revision: 696806

URL: http://svn.apache.org/viewvc?rev=696806&view=rev
Log:
FIX: Environment properties in ivy settings are no longer resolved (IVY-907)

Modified:
    ant/ivy/core/branches/2.0.x/CHANGES.txt
    ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
    ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java

Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=696806&r1=696805&r2=696806&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.0.x/CHANGES.txt Thu Sep 18 14:14:28 2008
@@ -80,6 +80,7 @@
 - DOCUMENTATION: Filesystem resolver: talks about "patterns" but does not mention these must
become absolute file paths (IVY-910)
 
 - FIX: Cannot configure items with java.io.File attributes (IVY-905)
+- FIX: Environment properties in ivy settings are no longer resolved (IVY-907)
 
 
    2.0.0-rc1

Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java?rev=696806&r1=696805&r2=696806&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java (original)
+++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java Thu
Sep 18 14:14:28 2008
@@ -52,7 +52,7 @@
     public void setVariable(String varName, String value, boolean overwrite) {
         if (overwrite) {
             Message.debug("setting '" + varName + "' to '" + value + "'");
-            overwrittenProperties.put(varName, value);
+            overwrittenProperties.put(varName, substitute(value));
         } else {
             super.setVariable(varName, value, overwrite);
         }

Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java?rev=696806&r1=696805&r2=696806&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java
(original)
+++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java
Thu Sep 18 14:14:28 2008
@@ -59,7 +59,7 @@
         }
     }
 
-    private String substitute(String value) {
+    protected String substitute(String value) {
         return IvyPatternHelper.substituteVariables(value, this);
     }
 



Mime
View raw message