Browse Source

really add setbeans attribute to scriptmapper/filter/condition. PR 47336

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@783050 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 16 years ago
parent
commit
18141ca0aa
6 changed files with 36 additions and 3 deletions
  1. +4
    -0
      WHATSNEW
  2. +1
    -1
      docs/manual/CoreTasks/conditions.html
  3. +1
    -1
      docs/manual/CoreTypes/filterchain.html
  4. +1
    -1
      docs/manual/CoreTypes/mapper.html
  5. +15
    -0
      src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java
  6. +14
    -0
      src/main/org/apache/tools/ant/types/optional/ScriptFilter.java

+ 4
- 0
WHATSNEW View File

@@ -375,6 +375,10 @@ Fixed bugs:
filter ended with a begin token.
Bugzilla Report 47306.

* <scriptmapper>, <scriptfilter> and <scriptcondition> didn't support
the setbeans attribute.
Bugzilla Report 47336.

Other changes:
--------------
* A HostInfo task was added performing information on hosts, including info on


+ 1
- 1
docs/manual/CoreTasks/conditions.html View File

@@ -513,7 +513,7 @@ an explanation of scripts and dependencies.
<tr>
<td valign="top">setbeans</td>
<td valign="top">whether to have all properties, references and targets as
global variables in the script.</td>
global variables in the script. <em>since Ant 1.8.0</em></td>
<td valign="top" align="center">No, default is "true".</td>
</tr>
<tr>


+ 1
- 1
docs/manual/CoreTypes/filterchain.html View File

@@ -1400,7 +1400,7 @@ Must be a supported Apache BSF or JSR 223 language</td>
<tr>
<td valign="top">setbeans</td>
<td valign="top">whether to have all properties, references and targets as
global variables in the script.</td>
global variables in the script. <em>since Ant 1.8.0</em></td>
<td valign="top" align="center">No, default is "true".</td>
</tr>
<tr>


+ 1
- 1
docs/manual/CoreTypes/mapper.html View File

@@ -799,7 +799,7 @@ an explanation of scripts and dependencies.
<tr>
<td valign="top">setbeans</td>
<td valign="top">whether to have all properties, references and targets as
global variables in the script.</td>
global variables in the script. <em>since Ant 1.8.0</em></td>
<td valign="top" align="center">No, default is "true".</td>
</tr>
<tr>


+ 15
- 0
src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java View File

@@ -141,4 +141,19 @@ public abstract class AbstractScriptComponent extends ProjectComponent {
protected void executeScript(String execName) {
getRunner().executeScript(execName);
}

/**
* Set the setbeans attribute.
* If this is true, &lt;script&gt; will create variables in the
* script instance for all
* properties, targets and references of the current project.
* It this is false, only the project and self variables will
* be set.
* The default is true.
* @param setBeans the value to set.
* @since Ant 1.8.0
*/
public void setSetBeans(boolean setBeans) {
helper.setSetBeans(setBeans);
}
}

+ 14
- 0
src/main/org/apache/tools/ant/types/optional/ScriptFilter.java View File

@@ -165,4 +165,18 @@ public class ScriptFilter extends TokenFilter.ChainableReaderFilter {
helper.setClasspathRef(r);
}

/**
* Set the setbeans attribute.
* If this is true, &lt;script&gt; will create variables in the
* script instance for all
* properties, targets and references of the current project.
* It this is false, only the project and self variables will
* be set.
* The default is true.
* @param setBeans the value to set.
* @since Ant 1.8.0
*/
public void setSetBeans(boolean setBeans) {
helper.setSetBeans(setBeans);
}
}

Loading…
Cancel
Save