ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder DefaultProjectBuilder.java
Date Tue, 12 Feb 2002 10:24:27 GMT
adammurdoch    02/02/12 02:24:27

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
                        DefaultProjectBuilder.java
  Log:
  Resolve path to referenced projects.
  Fixed some Javadoc.
  
  Revision  Changes    Path
  1.29      +8 -7      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
  
  Index: DefaultProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- DefaultProjectBuilder.java	7 Feb 2002 13:02:19 -0000	1.28
  +++ DefaultProjectBuilder.java	12 Feb 2002 10:24:27 -0000	1.29
  @@ -16,6 +16,7 @@
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.excalibur.util.StringUtil;
  +import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.avalon.framework.CascadingException;
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -33,7 +34,7 @@
    * Default implementation to construct project from a build file.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.28 $ $Date: 2002/02/07 13:02:19 $
  + * @version $Revision: 1.29 $ $Date: 2002/02/12 10:24:27 $
    */
   public class DefaultProjectBuilder
       extends AbstractLogEnabled
  @@ -310,19 +311,19 @@
               throw new Exception( message );
           }
   
  +        // Build the URL of the referenced projects
           final File baseDirectory = project.getBaseDirectory();
  -
  -        //TODO: standardize and migrate to Avalon-Excalibur.io
  -        final File file = new File( baseDirectory, location );
  -
  +        final File file = FileUtil.resolveFile( baseDirectory, location );
           final String systemID = file.toURL().toString();
  -        Project other = (Project)projects.get( systemID );
   
  +        // Locate the referenced project, building it if necessary
  +        Project other = (Project)projects.get( systemID );
           if( null == other )
           {
               other = build( file, projects );
           }
   
  +        // Add the reference
           project.addProject( name, other );
       }
   
  @@ -358,7 +359,7 @@
        * Build a target from configuration.
        *
        * @param project the project
  -     * @param task the Configuration
  +     * @param target the Configuration
        */
       private void buildTarget( final DefaultProject project, final Configuration target
)
           throws Exception
  
  
  

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