ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb WeblogicDeploymentTool.java
Date Fri, 29 Jun 2001 09:55:35 GMT
conor       01/06/29 02:55:35

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        WeblogicDeploymentTool.java
  Log:
  EJBJar now reports errors when weblogic ejbc fails rather than continuing
  
  PR:	1254
  
  Revision  Changes    Path
  1.25      +4 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  
  Index: WeblogicDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- WeblogicDeploymentTool.java	2001/06/25 15:17:36	1.24
  +++ WeblogicDeploymentTool.java	2001/06/29 09:55:33	1.25
  @@ -409,19 +409,17 @@
                   classpath = getCombinedClasspath();
               }
               
  +            javaTask.setFork(true);
               if (classpath != null) {
                   javaTask.setClasspath(classpath);
  -                javaTask.setFork(true);
               }
  -            else {
  -                javaTask.setFork(true);
  -            }
  -            
   
               log("Calling " + ejbcClassName + " for " + sourceJar.toString(),
                             Project.MSG_VERBOSE);
   
  -            javaTask.execute();
  +            if (javaTask.executeJava() != 0) {
  +                throw new BuildException("Ejbc reported an error");
  +            }
           }
           catch (Exception e) {
               // Have to catch this because of the semantics of calling main()
  
  
  

Mime
View raw message