You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/12 15:21:04 UTC

cvs commit: jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ant Load.java

donaldp     02/05/12 06:21:04

  Modified:    merlin/src/java/org/apache/excalibur/merlin/ant Load.java
  Log:
  Remove unused variable
  
  Revision  Changes    Path
  1.2       +30 -30    jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ant/Load.java
  
  Index: Load.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ant/Load.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Load.java	10 May 2002 17:53:10 -0000	1.1
  +++ Load.java	12 May 2002 13:21:04 -0000	1.2
  @@ -23,7 +23,7 @@
   import org.apache.tools.ant.types.Path;
   
   /**
  - * A service loader task.  Loads a series a blocks as supporting services, 
  + * A service loader task.  Loads a series a blocks as supporting services,
    * supporting libraries, and runs a target component.</p>
    * @author Stephen McConnell <mc...@osm.net>
    */
  @@ -47,7 +47,7 @@
        * Adds a set of files (nested fileset attribute).
        * @param set the file set
        */
  -    public void addFileset(FileSet set) 
  +    public void addFileset(FileSet set)
       {
           m_filesets.addElement(set);
       }
  @@ -56,7 +56,7 @@
        * Creates a nested arg element.
        * @return Commandline.Argument a new command line argument
        */
  -    public Commandline.Argument createArg() 
  +    public Commandline.Argument createArg()
       {
           return m_cmd.createArgument();
       }
  @@ -65,13 +65,13 @@
        * Sets the classpath to the supplied path.
        * @param path the classpath
        */
  -    public void setClasspath(Path path) 
  +    public void setClasspath(Path path)
       {
  -        if (m_classpath == null) 
  +        if (m_classpath == null)
           {
               m_classpath = path;
           }
  -        else 
  +        else
           {
               m_classpath.append(path);
           }
  @@ -81,9 +81,9 @@
        * Creates a new classpath.
        * @return the classpath path
        */
  -    public Path createClasspath() 
  +    public Path createClasspath()
       {
  -        if (m_classpath == null) 
  +        if (m_classpath == null)
           {
               m_classpath = new Path(project);
           }
  @@ -94,44 +94,44 @@
        * Sets the target class.
        * @param target the name of the target service implementation class
        */
  -    public void setTarget( String target ) 
  +    public void setTarget( String target )
       {
           m_target = target;
       }
   
       /**
        * Set the log priority.
  -     * @param level the logging level corresponding to one of INFO, ERROR, WARN, 
  +     * @param level the logging level corresponding to one of INFO, ERROR, WARN,
        *   or DEBUG
        */
  -    public void setPriority( String level ) 
  +    public void setPriority( String level )
       {
           m_priority = level;
       }
   
       /**
        * Set the disposal policy.
  -     * @param policy a value of TRUE or FALSE defining the disposal policy 
  +     * @param policy a value of TRUE or FALSE defining the disposal policy
        */
  -    public void setDisposal( String policy ) 
  +    public void setDisposal( String policy )
       {
           m_policy = policy;
       }
   
       /**
        * Set the verbose policy.
  -     * @param value String boolean equivalent 
  +     * @param value String boolean equivalent
        */
  -    public void setVerbose( String value ) 
  +    public void setVerbose( String value )
       {
           m_verbose = value;
       }
   
       /**
        * Set the configuration file.
  -     * @param value the path to a configuration file 
  +     * @param value the path to a configuration file
        */
  -    public void setConfiguration( String value ) 
  +    public void setConfiguration( String value )
       {
           m_config = value;
       }
  @@ -141,10 +141,10 @@
        * Performs execution as an Ant target.
        * @exception BuildException indicates a build faliure
        */
  -    public void execute() throws BuildException 
  +    public void execute() throws BuildException
       {
   
  -        // 
  +        //
           // add the classpath
           //
   
  @@ -162,7 +162,7 @@
           Commandline toExecute = (Commandline)m_cmd.clone();
           toExecute.setExecutable("java");
   
  -        // 
  +        //
           // declare the service loader class
           //
   
  @@ -172,7 +172,7 @@
           // preprocess the fileset into a vector of file arguments
           //
   
  -        for (int i=0; i<m_filesets.size(); i++) 
  +        for (int i=0; i<m_filesets.size(); i++)
           {
               final FileSet fs = (FileSet) m_filesets.elementAt(i);
               final File base = fs.getDir( project );
  @@ -187,27 +187,27 @@
   
   
           // add the target parameter
  -    
  +
           toExecute.createArgument().setValue( "-target" );
           toExecute.createArgument().setValue( m_target );
  -        
  +
           // add the priority parameter
  -    
  +
           toExecute.createArgument().setValue( "-priority");
           toExecute.createArgument().setValue( m_priority );
  -        
  +
           // add the policy parameter
  -    
  +
           toExecute.createArgument().setValue( "-disposal");
           toExecute.createArgument().setValue( m_policy );
  -        
  +
           // add the verbose parameter
  -    
  +
           toExecute.createArgument().setValue( "-verbose");
           toExecute.createArgument().setValue( m_verbose );
   
           // add the config parameter
  -    
  +
           if( m_config != null )
           {
               toExecute.createArgument().setValue( "-configuration");
  @@ -220,7 +220,7 @@
               m_exe.setWorkingDirectory( new File(System.getProperty("user.dir")));
   
               m_exe.setCommandline(toExecute.getCommandline());
  -            int ret = m_exe.execute();
  +            m_exe.execute();
           }
           catch( Throwable e )
           {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>