maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/verifier ProjectVerifier.java
Date Mon, 02 Dec 2002 03:15:49 GMT
jvanzyl     2002/12/01 19:15:49

  Modified:    src/java/org/apache/maven/verifier ProjectVerifier.java
  Log:
  o correcting logic that was preventing files from being downloaded from the remote repos.
thanks for those who reported the problem.
  
  Revision  Changes    Path
  1.3       +4 -20     jakarta-turbine-maven/src/java/org/apache/maven/verifier/ProjectVerifier.java
  
  Index: ProjectVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/verifier/ProjectVerifier.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProjectVerifier.java	2 Dec 2002 02:07:44 -0000	1.2
  +++ ProjectVerifier.java	2 Dec 2002 03:15:49 -0000	1.3
  @@ -345,8 +345,7 @@
                       continue;
                   }
   
  -                if ( getContext().getOnline().booleanValue() && !hasFailedDownload(
artifact.getUrlPath() )
  -                    && !getRemoteFile( artifact.getUrlPath(), destinationFile )
)
  +                if ( !getRemoteFile( artifact.getUrlPath(), destinationFile ) )
                   {
                       failedDownloads.put( artifact.getUrlPath(), Boolean.TRUE );
                       warnings.append( "-------------------------------------"
  @@ -368,21 +367,6 @@
       }
   
       /**
  -     * @return true if the specified file has previously failed to download
  -     * @param remoteFile the file to be checked
  -     */
  -    private boolean hasFailedDownload( String remoteFile )
  -    {
  -        boolean failed = false;
  -        if ( failedDownloads.get( remoteFile ) != null
  -            && failedDownloads.get( remoteFile ) == Boolean.TRUE )
  -        {
  -            failed = true;
  -        }
  -        return failed;
  -    }
  -
  -    /**
        * Retrieve a <code>remoteFile</code> from the maven remote repositories
        * and store it at <code>localFile</code>
        * @param remoteFile the file name to retrieve from the repositories
  @@ -391,7 +375,7 @@
        */
       private boolean getRemoteFile( String remoteFile, File localFile )
       {
  -        if ( getContext().getOnline().booleanValue() )
  +        if ( getContext().getOnline().booleanValue() == false )
           {
               return false;
           }
  @@ -399,7 +383,7 @@
           boolean gotFile = false;
           Iterator i = getContext().getMavenRepoRemote().iterator();
   
  -        while ( !gotFile && i.hasNext() )
  +        while ( gotFile == false && i.hasNext() )
           {
               String remoteRepo = (String) i.next();
   
  
  
  

Mime
View raw message