ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional BeanShellScriptTest.java
Date Thu, 21 Nov 2002 10:06:13 GMT
bodewig     2002/11/21 02:06:13

  Modified:    .        build.xml
               src/etc/testcases/taskdefs/optional script.xml
  Added:       src/testcases/org/apache/tools/ant/taskdefs/optional
                        BeanShellScriptTest.java
  Log:
  Add a test that shows that <script> can use beanshell.
  
  ... and disable it as Apache BSF now supports beanshell, but beanshell
  doesn't seem to support Apache BSF yet.
  
  Revision  Changes    Path
  1.335     +8 -0      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.334
  retrieving revision 1.335
  diff -u -r1.334 -r1.335
  --- build.xml	21 Nov 2002 08:49:37 -0000	1.334
  +++ build.xml	21 Nov 2002 10:06:12 -0000	1.335
  @@ -292,6 +292,7 @@
       <exclude name="**/GetTest.java" if="offline"/>
     </patternset>
     <patternset id="teststhatfail">
  +    <exclude name="${optional.package}/BeanShellScriptTest.java"/>
     </patternset>
   
     <!--
  @@ -525,6 +526,9 @@
       <available property="rhino.present"
                  classname="org.mozilla.javascript.Scriptable"
                  classpathref="classpath"/>
  +    <available property="beanshell.present"
  +               classname="bsh.StringUtil"
  +               classpathref="classpath"/>
     </target>
   
   
  @@ -1499,6 +1503,10 @@
                      unless="bsf.present"/>
             <exclude name="${optional.package}/RhinoScriptTest.java"
                      unless="rhino.present"/>
  +          <exclude name="${optional.package}/BeanShellScriptTest.java"
  +                   unless="bsf.present"/>
  +          <exclude name="${optional.package}/BeanShellScriptTest.java"
  +                   unless="beanshell.present"/>
   
             <!-- fail if testcases can be loaded from the system classloader -->
             <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
  
  
  
  1.2       +7 -0      jakarta-ant/src/etc/testcases/taskdefs/optional/script.xml
  
  Index: script.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/optional/script.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- script.xml	21 Nov 2002 08:49:37 -0000	1.1
  +++ script.xml	21 Nov 2002 10:06:13 -0000	1.2
  @@ -39,4 +39,11 @@
     </target>
   
     <target name="example2" depends="sub1,sub2"/>
  +
  +  <target name="useBeanshell">
  +    <script language="beanshell"><![CDATA[
  +       self.log("I'm here", org.apache.tools.ant.Project.MSG_INFO);
  +    ]]></script>
  +  </target>
  +
   </project>
  
  
  
  1.2       +81 -0     jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/BeanShellScriptTest.java
  
  
  
  

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


Mime
View raw message