ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/util ScriptRunner.java
Date Thu, 12 Feb 2004 11:47:05 GMT
peterreilly    2004/02/12 03:47:05

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional Tag:
                        ANT_16_BRANCH Script.java
               src/main/org/apache/tools/ant/taskdefs/optional/script Tag:
                        ANT_16_BRANCH ScriptDef.java
               src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
                        ScriptRunner.java
  Log:
  sync with HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.24.2.5  +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
  
  Index: Script.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
  retrieving revision 1.24.2.4
  retrieving revision 1.24.2.5
  diff -u -r1.24.2.4 -r1.24.2.5
  --- Script.java	9 Feb 2004 22:12:24 -0000	1.24.2.4
  +++ Script.java	12 Feb 2004 11:47:05 -0000	1.24.2.5
  @@ -58,7 +58,7 @@
           runner.addBean("project", getProject());
           runner.addBean("self", this);
   
  -        runner.executeScript("<ANT>");
  +        runner.executeScript("ANT");
       }
   
       /**
  
  
  
  No                   revision
  No                   revision
  1.7.2.4   +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
  
  Index: ScriptDef.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- ScriptDef.java	9 Feb 2004 22:12:36 -0000	1.7.2.3
  +++ ScriptDef.java	12 Feb 2004 11:47:05 -0000	1.7.2.4
  @@ -314,7 +314,7 @@
           runner.addBean("attributes", attributes);
           runner.addBean("elements", elements);
           runner.addBean("project", getProject());
  -        runner.executeScript("scriptdef <" + name + ">");
  +        runner.executeScript("scriptdef_" + name);
       }
   
   
  
  
  
  No                   revision
  No                   revision
  1.1.2.6   +13 -0     ant/src/main/org/apache/tools/ant/util/ScriptRunner.java
  
  Index: ScriptRunner.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/ScriptRunner.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- ScriptRunner.java	9 Feb 2004 22:12:43 -0000	1.1.2.5
  +++ ScriptRunner.java	12 Feb 2004 11:47:05 -0000	1.1.2.6
  @@ -33,6 +33,19 @@
    * @author Conor MacNeill
    */
   public class ScriptRunner {
  +
  +    // Register Groovy ourselves, since BSF does not
  +    // natively support it (yet).
  +    // This "hack" can be removed once BSF has been
  +    // modified to support Groovy or more dynamic
  +    // registration.
  +    static {
  +        BSFManager.registerScriptingEngine(
  +            "groovy",
  +            "org.codehaus.groovy.bsf.GroovyEngine",
  +            new String[] {"groovy", "gy"});
  +    }
  +
       /** Script language */
       private String language;
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message