ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm CCMCheck.java CCMCheckin.java CCMCreateTask.java CCMReconfigure.java Continuus.java
Date Sun, 16 Dec 2001 00:37:34 GMT
donaldp     01/12/15 16:37:34

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCheck.java CCMCheckin.java CCMCreateTask.java
                        CCMReconfigure.java Continuus.java
  Log:
  BuildException -> TaskException
  
  Removed uneeded imports.
  
  Processed code through style formatter.
  
  Revision  Changes    Path
  1.3       +5 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
  
  Index: CCMCheck.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CCMCheck.java	2001/12/15 14:55:57	1.2
  +++ CCMCheck.java	2001/12/16 00:37:34	1.3
  @@ -6,8 +6,9 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.ccm;
  +
   import java.io.File;
  -import org.apache.tools.ant.BuildException;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
   
  @@ -88,7 +89,6 @@
           return _file;
       }
   
  -
       /**
        * Get the value of task.
        *
  @@ -99,17 +99,16 @@
           return _task;
       }
   
  -
       /**
        * Executes the task. <p>
        *
        * Builds a command line to execute ccm and then calls Exec's run method to
        * execute the command line. </p>
        *
  -     * @exception BuildException Description of Exception
  +     * @exception TaskException Description of Exception
        */
       public void execute()
  -        throws BuildException
  +        throws TaskException
       {
           Commandline commandLine = new Commandline();
           Project aProj = getProject();
  @@ -127,10 +126,9 @@
           if( result != 0 )
           {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException( msg );
  +            throw new TaskException( msg );
           }
       }
  -
   
       /**
        * Check the command line options.
  
  
  
  1.2       +1 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java
  
  Index: CCMCheckin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CCMCheckin.java	2001/12/15 12:06:25	1.1
  +++ CCMCheckin.java	2001/12/16 00:37:34	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.ccm;
  +
   import java.util.Date;
   
   /**
  
  
  
  1.3       +17 -18    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
  
  Index: CCMCreateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CCMCreateTask.java	2001/12/15 14:55:57	1.2
  +++ CCMCreateTask.java	2001/12/16 00:37:34	1.3
  @@ -6,17 +6,17 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.ccm;
  +
   import java.io.BufferedReader;
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.io.OutputStream;
  -import org.apache.tools.ant.BuildException;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   
  -
   /**
    * Task allows to create new ccm task and set it as the default
    *
  @@ -108,7 +108,9 @@
        * @exception IOException Description of Exception
        */
       public void setProcessInputStream( OutputStream param1 )
  -        throws IOException { }
  +        throws IOException
  +    {
  +    }
   
       /**
        * read the output stream to retrieve the new task number.
  @@ -138,12 +140,12 @@
           {
               log( "error procession stream , null pointer exception", Project.MSG_ERR );
               npe.printStackTrace();
  -            throw new BuildException( npe.getClass().getName() );
  +            throw new TaskException( npe.getClass().getName() );
           }// end of catch
           catch( Exception e )
           {
               log( "error procession stream " + e.getMessage(), Project.MSG_ERR );
  -            throw new BuildException( e.getMessage() );
  +            throw new TaskException( e.getMessage() );
           }// end of try-catch
   
       }
  @@ -188,7 +190,6 @@
           this.task = v;
       }
   
  -
       /**
        * Get the value of comment.
        *
  @@ -199,7 +200,6 @@
           return comment;
       }
   
  -
       /**
        * Get the value of platform.
        *
  @@ -210,7 +210,6 @@
           return platform;
       }
   
  -
       /**
        * Get the value of release.
        *
  @@ -221,7 +220,6 @@
           return release;
       }
   
  -
       /**
        * Get the value of resolver.
        *
  @@ -242,7 +240,6 @@
           return subSystem;
       }
   
  -
       /**
        * Get the value of task.
        *
  @@ -253,17 +250,16 @@
           return task;
       }
   
  -
       /**
        * Executes the task. <p>
        *
        * Builds a command line to execute ccm and then calls Exec's run method to
        * execute the command line. </p>
        *
  -     * @exception BuildException Description of Exception
  +     * @exception TaskException Description of Exception
        */
       public void execute()
  -        throws BuildException
  +        throws TaskException
       {
           Commandline commandLine = new Commandline();
           Project aProj = getProject();
  @@ -280,7 +276,7 @@
           if( result != 0 )
           {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException( msg );
  +            throw new TaskException( msg );
           }
   
           //create task ok, set this task as the default one
  @@ -295,7 +291,7 @@
           if( result != 0 )
           {
               String msg = "Failed executing: " + commandLine2.toString();
  -            throw new BuildException( msg);
  +            throw new TaskException( msg );
           }
   
       }
  @@ -307,12 +303,15 @@
        * @exception IOException Description of Exception
        */
       public void start()
  -        throws IOException { }
  +        throws IOException
  +    {
  +    }
   
       /**
        */
  -    public void stop() { }
  -
  +    public void stop()
  +    {
  +    }
   
       /**
        * Check the command line options.
  
  
  
  1.3       +5 -9      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
  
  Index: CCMReconfigure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CCMReconfigure.java	2001/12/15 14:55:57	1.2
  +++ CCMReconfigure.java	2001/12/16 00:37:34	1.3
  @@ -6,11 +6,11 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.ccm;
  -import org.apache.tools.ant.BuildException;
  +
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
   
  -
   /**
    * Task allows to reconfigure a project, recurcively or not
    *
  @@ -84,7 +84,6 @@
           return project;
       }
   
  -
       /**
        * Get the value of recurse.
        *
  @@ -95,7 +94,6 @@
           return recurse;
       }
   
  -
       /**
        * Get the value of verbose.
        *
  @@ -106,17 +104,16 @@
           return verbose;
       }
   
  -
       /**
        * Executes the task. <p>
        *
        * Builds a command line to execute ccm and then calls Exec's run method to
        * execute the command line. </p>
        *
  -     * @exception BuildException Description of Exception
  +     * @exception TaskException Description of Exception
        */
       public void execute()
  -        throws BuildException
  +        throws TaskException
       {
           Commandline commandLine = new Commandline();
           Project aProj = getProject();
  @@ -133,10 +130,9 @@
           if( result != 0 )
           {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException( msg );
  +            throw new TaskException( msg );
           }
       }
  -
   
       /**
        * Check the command line options.
  
  
  
  1.3       +3 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  
  Index: Continuus.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Continuus.java	2001/12/15 14:55:57	1.2
  +++ Continuus.java	2001/12/16 00:37:34	1.3
  @@ -6,7 +6,8 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.ccm;
  -import org.apache.tools.ant.BuildException;
  +
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
  @@ -14,7 +15,6 @@
   import org.apache.tools.ant.taskdefs.LogStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   
  -
   /**
    * A base class for creating tasks for executing commands on Continuus 5.1 <p>
    *
  @@ -58,7 +58,6 @@
       private String _ccmDir = "";
       private String _ccmAction = "";
   
  -
       /**
        * Set the directory where the ccm executable is located
        *
  @@ -107,7 +106,6 @@
           return toReturn;
       }
   
  -
       protected int run( Commandline cmd, ExecuteStreamHandler handler )
       {
           try
  @@ -120,7 +118,7 @@
           }
           catch( java.io.IOException e )
           {
  -            throw new BuildException( "Error", e );
  +            throw new TaskException( "Error", e );
           }
       }
   
  
  
  

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