You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/08 15:18:50 UTC

cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant CactifyTask.java

cmlenz      2003/05/08 06:18:50

  Modified:    integration/ant/src/java/org/apache/cactus/integration/ant
                        Tag: CACTUS_14_ANT_BRANCH CactifyTask.java
  Log:
  - Only add a <lib> fileset if a JAr containing the class was found
  - Don't terminate the build if jspRedirector.jsp was not found, just log a warning
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +4 -4      jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/Attic/CactifyTask.java
  
  Index: CactifyTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/Attic/CactifyTask.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- CactifyTask.java	1 May 2003 13:39:26 -0000	1.1.2.6
  +++ CactifyTask.java	8 May 2003 13:18:50 -0000	1.1.2.7
  @@ -300,13 +300,13 @@
           if (file != null)
           {
               jar.setFile(file);
  +            addLib(jar);
           }
           else
           {
               log("Could not find JAR containing class " + theClassName,
                   Project.MSG_WARN);
           }
  -        addLib(jar);
       }
   
       /**
  @@ -327,8 +327,8 @@
           }
           catch (IOException e)
           {
  -            throw new BuildException(
  -                "Could not copy the JSP redirector", e);
  +            log("Could not copy the JSP redirector (" + e.getMessage() + ")",
  +                Project.MSG_WARN);
           }
           FileSet fileSet = new FileSet();
           fileSet.setFile(jspRedirectorFile);
  
  
  

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