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 Thu, 30 May 2002 13:22:49 GMT
conor       02/05/30 06:22:49

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
                        ANT_15_BRANCH WeblogicDeploymentTool.java
  Log:
  Fix NPE in <ejbjar> when no classpath is specified.
  
  PR:	9217
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.25 +140 -135  jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.24
  retrieving revision 1.263.2.25
  diff -u -w -u -r1.263.2.24 -r1.263.2.25
  --- WHATSNEW	29 May 2002 11:13:20 -0000	1.263.2.24
  +++ WHATSNEW	30 May 2002 13:22:48 -0000	1.263.2.25
  @@ -219,6 +219,11 @@
     the Jakarta-BCEL library rather than reflection, meaning bean classes are
     no longer loaded into Ant's JVM. 
   
  +* <ejbjar> under Weblogic attempts to use the ejbc20 compiler for 2.0 beans
  +  based on the deployment descriptor's DTD reference. Under weblogic 7.00 Beta
  +  this ejbc class has been deprecated. To avoid the deprecation warning use
  +  ejbcclass="weblogic.ejbc".
  +
   * <available> has a new attribute named ignoreSystemClasses.
   
   * New task <cvschangelog/> generates an XML report of changes that occur
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.40.2.1  +10 -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.40
  retrieving revision 1.40.2.1
  diff -u -w -u -r1.40 -r1.40.2.1
  --- WeblogicDeploymentTool.java	30 Apr 2002 14:40:04 -0000	1.40
  +++ WeblogicDeploymentTool.java	30 May 2002 13:22:49 -0000	1.40.2.1
  @@ -493,8 +493,12 @@
                   }
               }
               
  +            Path combinedClasspath = getCombinedClasspath();
  +            if (combinedClasspath != null
  +                 && combinedClasspath.toString().trim().length() > 0) {
               javaTask.createArg().setValue("-classpath");
  -            javaTask.createArg().setPath(getCombinedClasspath());
  +                javaTask.createArg().setPath(combinedClasspath);
  +            }
               
               javaTask.createArg().setValue(sourceJar.getPath());
               javaTask.createArg().setValue(destJar.getPath());
  
  
  

--
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