Browse Source

Make sure system properties as accessible in subbuilds in the

inheritAll=false case as well.

Submitted by:	Craeg K. Strong <cstrong@arielpartners.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269487 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
9092eca069
2 changed files with 15 additions and 7 deletions
  1. +11
    -7
      src/main/org/apache/tools/ant/Project.java
  2. +4
    -0
      src/main/org/apache/tools/ant/taskdefs/Ant.java

+ 11
- 7
src/main/org/apache/tools/ant/Project.java View File

@@ -212,13 +212,7 @@ public class Project {
throw new BuildException("Can't load default datatype list");
}

Properties systemP = System.getProperties();
Enumeration e = systemP.keys();
while (e.hasMoreElements()) {
Object name = e.nextElement();
String value = systemP.get(name).toString();
this.setProperty(name.toString(), value);
}
setSystemProperties();
}

public void setSystemLoader(ClassLoader systemLoader) {
@@ -383,6 +377,16 @@ public class Project {
log("Detected OS: " + System.getProperty("os.name"), MSG_VERBOSE);
}

public void setSystemProperties() {
Properties systemP = System.getProperties();
Enumeration e = systemP.keys();
while (e.hasMoreElements()) {
Object name = e.nextElement();
String value = systemP.get(name).toString();
this.setProperty(name.toString(), value);
}
}

public void addTaskDefinition(String taskName, Class taskClass) {
String msg = " +User task: " + taskName + " " + taskClass.getName();
log(msg, MSG_DEBUG);


+ 4
- 0
src/main/org/apache/tools/ant/taskdefs/Ant.java View File

@@ -166,6 +166,10 @@ public class Ant extends Task {
}
else {
prop1 = project.getUserProperties();

// set Java built-in properties separately,
// b/c we won't inherit them.
project.setSystemProperties();
}
e = prop1.keys();


Loading…
Cancel
Save