stevel      2002/08/10 00:06:24

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
                        JasperC.java
  Log:
  here is the bugfix. concatSystemClasspath returns a new classpath, so if 
jasperc was in ant's lib it got lost along with everything else.
  
  Revision  Changes    Path
  1.11      +5 -1      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
  
  Index: JasperC.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JasperC.java      25 Jul 2002 15:21:16 -0000      1.10
  +++ JasperC.java      10 Aug 2002 07:06:24 -0000      1.11
  @@ -104,10 +104,13 @@
               // REVISIT. ugly. 
               Java java = (Java) (getProject().createTask("java"));
               if (getJspc().getClasspath() != null) {
  +                getProject().log("using user supplied classpath: 
"+getJspc().getClasspath(),
  +                    Project.MSG_DEBUG);
                   java.setClasspath(getJspc().getClasspath());
               } else {
                   Path classpath=new Path(getProject());
  -                classpath.concatSystemClasspath();
  +                classpath=classpath.concatSystemClasspath("only");
  +                getProject().log("using system classpath: "+classpath, 
Project.MSG_DEBUG);
                   java.setClasspath(classpath);
               }
               java.setDir(getProject().getBaseDir());
  @@ -121,6 +124,7 @@
               //we are forking here to be sure that if JspC calls
               //System.exit() it doesn't halt the build
               java.setFork(true);
  +            java.setTaskName("jasperc");
               java.execute();
               return true;
           } catch (Exception ex) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to