Browse Source

bind all effective properties to script* tasks/types

master
Matt Benson 3 years ago
parent
commit
3d83934603
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      src/main/org/apache/tools/ant/util/ScriptRunnerBase.java

+ 5
- 2
src/main/org/apache/tools/ant/util/ScriptRunnerBase.java View File

@@ -27,6 +27,8 @@ import java.nio.charset.Charset;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;


import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
@@ -332,8 +334,9 @@ public abstract class ScriptRunnerBase {
*/ */
public void bindToComponent(ProjectComponent component) { public void bindToComponent(ProjectComponent component) {
project = component.getProject(); project = component.getProject();
addBeans(project.getProperties());
addBeans(project.getUserProperties());

addBeans(project.getPropertyNames().stream()
.collect(Collectors.toMap(Function.identity(), project::getProperty)));
addBeans(project.getCopyOfTargets()); addBeans(project.getCopyOfTargets());
addBeans(project.getCopyOfReferences()); addBeans(project.getCopyOfReferences());
addBean("project", project); addBean("project", project);


Loading…
Cancel
Save