[prev in list] [next in list] [prev in thread] [next in thread] 

List:       maven-dev
Subject:    cvs commit: maven-new/core/src/java/org/apache/maven/artifact/satisfy DefaultDependencySatisfier.jav
From:       michal () apache ! org
Date:       2003-05-30 10:13:26
[Download RAW message or body]

michal      2003/05/30 03:13:26

  Modified:    core/src/java/org/apache/maven/artifact/satisfy
                        DefaultDependencySatisfier.java
  Log:
  added special threatment for unsatisfied overriden deps
  
  Revision  Changes    Path
  1.8       +12 -5     \
maven-new/core/src/java/org/apache/maven/artifact/satisfy/DefaultDependencySatisfier.java
  
  Index: DefaultDependencySatisfier.java
  ===================================================================
  RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/satisfy/DefaultDependencySatisfier.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultDependencySatisfier.java	29 May 2003 20:26:22 -0000	1.7
  +++ DefaultDependencySatisfier.java	30 May 2003 10:13:26 -0000	1.8
  @@ -129,6 +129,7 @@
                   I18NUtils.getMessage( "remote.repository.disabled.warning" ) );
           }
   
  +        List failedOverridenDependencies = new ArrayList();
           for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
           {
               Artifact artifact = (Artifact) i.next();
  @@ -137,12 +138,10 @@
               if ( artifact.exists() == false )
               {
                   
  -                // I think that we should stop here as this means
  -                // the user has made an error and build cannot continue
  +                
                   if (artifact.isFileOverridden())
                   {
  -                   String msg = "";
  -                   throw new UnsatisfiedDependencyException( msg );
  +                   failedOverridenDependencies.add( artifact );   
                      
                   }
                   failedDependencies.add( artifact );
  @@ -171,6 +170,14 @@
               }
           }
   
  +        // If we have ovveriden dependicies which failed
  +        // we will not make any attempt to downaloed them        
  +        if ( failedOverridenDependencies.isEmpty() == false )
  +        {
  +            throw new UnsatisfiedDependencyException(
  +                          createUnsatisfiedDependenciesMessage( failedDependencies \
) );  +        
  +        }
           // If we have any failed dependencies then we will attempt to download
           // them for the user if the remote repository is enabled.
           if ( failedDependencies.isEmpty() == false && remoteRepoEnabled && online \
)  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]