ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JavaTest.java
Date Fri, 29 Aug 2003 13:05:06 GMT
antoine     2003/08/29 06:05:06

  Modified:    docs/manual/CoreTasks java.html
               src/main/org/apache/tools/ant/taskdefs Java.java
               src/testcases/org/apache/tools/ant/taskdefs JavaTest.java
  Log:
  Rollback temporarily the setting of new permissions when failonerror="true"
  and fork="false"
  
  Revision  Changes    Path
  1.23      +3 -2      ant/docs/manual/CoreTasks/java.html
  
  Index: java.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- java.html	28 Aug 2003 13:46:33 -0000	1.22
  +++ java.html	29 Aug 2003 13:05:06 -0000	1.23
  @@ -88,7 +88,7 @@
     <tr>
       <td valign="top">failonerror</td>
       <td valign="top">Stop the buildprocess if the command exits with a
  -      returncode other than 0. Default is "false"(see <a href="#failonerror">note</a>)</td>
  +      returncode other than 0. Default is "false"<!--(see <a href="#failonerror">note)--></a></td>
       <td align="center" valign="top">No</td>
     </tr>
     <tr>
  @@ -220,12 +220,13 @@
   <p>When the permission RuntimePermission exitVM has not been granted (or has
   been revoked) the System.exit() call will be intercepted 
   and treated like indicated in <i>failonerror</i>.</p>
  +<!--
   <p><a name="failonerror"/>
   If you specify <code>failonerror=&quot;true&quot;</code> and you do
not specify permissions,
   a set of default permissions will be added to your java invocation making sure that
   a non zero return code will lead to a <code>BuildException</code>.
   </p>
  -
  +-->
   <p>Settings will be ignored if fork is enabled.</p>
   
   <p><em>since Ant 1.6</em>.</p>
  
  
  
  1.72      +2 -1      ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Java.java	28 Aug 2003 13:46:33 -0000	1.71
  +++ Java.java	29 Aug 2003 13:05:06 -0000	1.72
  @@ -180,12 +180,13 @@
                   log("bootclasspath ignored when same JVM is used.",
                       Project.MSG_WARN);
               }
  -
  +            /*
               if (perm == null && failOnError == true) {
                   perm = new Permissions();
                   log("running " + this.cmdl.getClassname()
                       + " with default permissions (exit forbidden)", Project.MSG_VERBOSE);
               }
  +            */
               log("Running in same VM " + cmdl.describeJavaCommand(),
                   Project.MSG_VERBOSE);
           }
  
  
  
  1.16      +2 -1      ant/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
  
  Index: JavaTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JavaTest.java	28 Aug 2003 13:46:33 -0000	1.15
  +++ JavaTest.java	29 Aug 2003 13:05:06 -0000	1.16
  @@ -195,7 +195,7 @@
           executeTarget("testResultPropertyNonZeroNoFork");
            assertEquals("-1",project.getProperty("exitcode"));
        }
  -
  +    /*
       public void testRunFailWithFailOnError() {
           expectBuildExceptionContaining("testRunFailWithFailOnError",
               "non zero return code",
  @@ -205,6 +205,7 @@
       public void testRunSuccessWithFailOnError() {
           executeTarget("testRunSuccessWithFailOnError");
       }
  +    */
       public void testSpawn() {
           FileUtils fileutils  = FileUtils.newFileUtils();
           File logFile = fileutils.createTempFile("spawn","log", project.getBaseDir());
  
  
  

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


Mime
View raw message