dion        02/05/20 17:03:30

  Modified:    src/java/org/apache/maven/struts Struts10WarValidator.java
  Log:
  Added missing IOException handling
  
  Revision  Changes    Path
  1.2       +16 -5     
jakarta-turbine-maven/src/java/org/apache/maven/struts/Struts10WarValidator.java
  
  Index: Struts10WarValidator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/struts/Struts10WarValidator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Struts10WarValidator.java 20 May 2002 23:57:28 -0000      1.1
  +++ Struts10WarValidator.java 21 May 2002 00:03:30 -0000      1.2
  @@ -54,6 +54,8 @@
    * <http://www.apache.org/>.
    */
   
  +import java.io.IOException;
  +
   import org.apache.maven.j2ee.WarValidator;
   import org.apache.maven.j2ee.ValidationEvent;
   
  @@ -66,7 +68,7 @@
    * </ol>
    *
    * @author  dion
  - * @version $Id: Struts10WarValidator.java,v 1.1 2002/05/20 23:57:28 dion Exp $
  + * @version $Id: Struts10WarValidator.java,v 1.2 2002/05/21 00:03:30 dion Exp $
    */
   public class Struts10WarValidator extends WarValidator
   {
  @@ -85,10 +87,19 @@
        */
       protected void validateWarContents()
       {
  -        super.validateWarContents();
  -        Struts10WarFile strutsWar = new Struts10WarFile(getWarFileName());
  -        strutsWar.setConfig(getConfig());
  -        validateStrutsConfig(strutsWar);
  +        try 
  +        {
  +            super.validateWarContents();
  +            Struts10WarFile strutsWar = new Struts10WarFile(getWarFileName());
  +            strutsWar.setConfig(getConfig());
  +            validateStrutsConfig(strutsWar);
  +        }
  +        catch (IOException ioe)
  +        {
  +            ioe.printStackTrace();
  +            getBroadcaster().fireErrorEvent(new ValidationEvent(this, 
  +                getWarFileName(), "Error reading struts war file"));
  +        }
       }
       
       /** Getter for Struts config location within the war (no leading slash).
  
  
  

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

Reply via email to