You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/06/27 01:16:26 UTC

svn commit: r958295 [3/9] - in /maven/maven-3/trunk: maven-artifact/src/main/java/org/apache/maven/artifact/ maven-artifact/src/main/java/org/apache/maven/artifact/repository/ maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ ma...

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java Sat Jun 26 23:16:18 2010
@@ -63,10 +63,10 @@ public class StringSearchModelInterpolat
         throws ModelInterpolationException
     {
         interpolateObject( model, model, projectDir, config, debugEnabled );
-        
+
         return model;
     }
-    
+
     protected void interpolateObject( Object obj, Model model, File projectDir, ProjectBuilderConfiguration config,
                                       boolean debugEnabled )
         throws ModelInterpolationException
@@ -75,13 +75,13 @@ public class StringSearchModelInterpolat
         {
             List<ValueSource> valueSources = createValueSources( model, projectDir, config );
             List<InterpolationPostProcessor> postProcessors = createPostProcessors( model, projectDir, config );
-            
+
             InterpolateObjectAction action =
                 new InterpolateObjectAction( obj, valueSources, postProcessors, debugEnabled,
                                              this, getLogger() );
-            
+
             ModelInterpolationException error = AccessController.doPrivileged( action );
-            
+
             if ( error != null )
             {
                 throw error;
@@ -97,10 +97,10 @@ public class StringSearchModelInterpolat
     {
         StringSearchInterpolator interpolator = new StringSearchInterpolator();
         interpolator.setCacheAnswers( true );
-        
+
         return interpolator;
     }
-    
+
     private static final class InterpolateObjectAction implements PrivilegedAction<ModelInterpolationException>
     {
 
@@ -110,7 +110,7 @@ public class StringSearchModelInterpolat
         private final Logger logger;
         private final List<ValueSource> valueSources;
         private final List<InterpolationPostProcessor> postProcessors;
-        
+
         public InterpolateObjectAction( Object target, List<ValueSource> valueSources,
                                         List<InterpolationPostProcessor> postProcessors, boolean debugEnabled,
                                         StringSearchModelInterpolator modelInterpolator, Logger logger )
@@ -118,20 +118,20 @@ public class StringSearchModelInterpolat
             this.valueSources = valueSources;
             this.postProcessors = postProcessors;
             this.debugEnabled = debugEnabled;
-            
+
             this.interpolationTargets = new LinkedList<Object>();
             interpolationTargets.add( target );
-            
+
             this.modelInterpolator = modelInterpolator;
             this.logger = logger;
         }
 
         public ModelInterpolationException run()
         {
-            while( !interpolationTargets.isEmpty() )
+            while ( !interpolationTargets.isEmpty() )
             {
                 Object obj = interpolationTargets.removeFirst();
-                
+
                 try
                 {
                     traverseObjectWithParents( obj.getClass(), obj );
@@ -141,11 +141,11 @@ public class StringSearchModelInterpolat
                     return e;
                 }
             }
-            
+
             return null;
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings( "unchecked" )
         private void traverseObjectWithParents( Class<?> cls, Object target )
             throws ModelInterpolationException
         {
@@ -153,8 +153,8 @@ public class StringSearchModelInterpolat
             {
                 return;
             }
-            
-            
+
+
             if ( cls.isArray() )
             {
                 evaluateArray( target );
@@ -167,7 +167,7 @@ public class StringSearchModelInterpolat
                     fields = cls.getDeclaredFields();
                     fieldsByClass.put( cls, fields );
                 }
-                
+
                 for ( int i = 0; i < fields.length; i++ )
                 {
                     Class<?> type = fields[i].getType();
@@ -185,7 +185,7 @@ public class StringSearchModelInterpolat
                                     if ( value != null )
                                     {
                                         String interpolated = modelInterpolator.interpolateInternal( value, valueSources, postProcessors, debugEnabled );
-                                        
+
                                         if ( !interpolated.equals( value ) )
                                         {
                                             fields[i].set( target, interpolated );
@@ -202,23 +202,28 @@ public class StringSearchModelInterpolat
                                         {
                                             c.clear();
                                         }
-                                        catch( UnsupportedOperationException e )
+                                        catch ( UnsupportedOperationException e )
                                         {
                                             if ( debugEnabled && logger != null )
                                             {
-                                                logger.debug( "Skipping interpolation of field: " + fields[i] + " in: " + cls.getName() + "; it is an unmodifiable collection." );
+                                                logger.debug( "Skipping interpolation of field: " + fields[i] + " in: "
+                                                    + cls.getName() + "; it is an unmodifiable collection." );
                                             }
                                             continue;
                                         }
-                                        
+
                                         for ( Object value : originalValues )
                                         {
                                             if ( value != null )
                                             {
-                                                if( String.class == value.getClass() )
+                                                if ( String.class == value.getClass() )
                                                 {
-                                                    String interpolated = modelInterpolator.interpolateInternal( (String) value, valueSources, postProcessors, debugEnabled );
-                                                    
+                                                    String interpolated =
+                                                        modelInterpolator.interpolateInternal( (String) value,
+                                                                                               valueSources,
+                                                                                               postProcessors,
+                                                                                               debugEnabled );
+
                                                     if ( !interpolated.equals( value ) )
                                                     {
                                                         c.add( interpolated );
@@ -257,24 +262,31 @@ public class StringSearchModelInterpolat
                                         for ( Map.Entry<Object, Object> entry : m.entrySet() )
                                         {
                                             Object value = entry.getValue();
-                                            
+
                                             if ( value != null )
                                             {
-                                                if( String.class == value.getClass() )
+                                                if ( String.class == value.getClass() )
                                                 {
-                                                    String interpolated = modelInterpolator.interpolateInternal( (String) value, valueSources, postProcessors, debugEnabled );
-                                                    
+                                                    String interpolated =
+                                                        modelInterpolator.interpolateInternal( (String) value,
+                                                                                               valueSources,
+                                                                                               postProcessors,
+                                                                                               debugEnabled );
+
                                                     if ( !interpolated.equals( value ) )
                                                     {
                                                         try
                                                         {
                                                             entry.setValue( interpolated );
                                                         }
-                                                        catch( UnsupportedOperationException e )
+                                                        catch ( UnsupportedOperationException e )
                                                         {
                                                             if ( debugEnabled && logger != null )
                                                             {
-                                                                logger.debug( "Skipping interpolation of field: " + fields[i] + " (key: " + entry.getKey() + ") in: " + cls.getName() + "; it is an unmodifiable collection." );
+                                                                logger.debug( "Skipping interpolation of field: "
+                                                                    + fields[i] + " (key: " + entry.getKey() + ") in: "
+                                                                    + cls.getName()
+                                                                    + "; it is an unmodifiable collection." );
                                                             }
                                                             continue;
                                                         }
@@ -313,11 +325,13 @@ public class StringSearchModelInterpolat
                             }
                             catch ( IllegalArgumentException e )
                             {
-                                throw new ModelInterpolationException( "Failed to interpolate field: " + fields[i] + " on class: " + cls.getName(), e );
+                                throw new ModelInterpolationException( "Failed to interpolate field: " + fields[i]
+                                    + " on class: " + cls.getName(), e );
                             }
                             catch ( IllegalAccessException e )
                             {
-                                throw new ModelInterpolationException( "Failed to interpolate field: " + fields[i] + " on class: " + cls.getName(), e );
+                                throw new ModelInterpolationException( "Failed to interpolate field: " + fields[i]
+                                    + " on class: " + cls.getName(), e );
                             }
                         }
                         finally
@@ -326,7 +340,7 @@ public class StringSearchModelInterpolat
                         }
                     }
                 }
-                
+
                 traverseObjectWithParents( cls.getSuperclass(), target );
             }
         }
@@ -342,22 +356,22 @@ public class StringSearchModelInterpolat
             {
                 fieldIsPrimitiveByClass.put( fieldType, Boolean.valueOf( fieldType.isPrimitive() ) );
             }
-            
+
             if ( fieldIsPrimitiveByClass.get( fieldType ).booleanValue() )
             {
                 return false;
             }
-            
+
 //            if ( fieldType.isPrimitive() )
 //            {
 //                return false;
 //            }
-            
+
             if ( "parent".equals( field.getName() ) )
             {
                 return false;
             }
-            
+
             return true;
         }
 
@@ -365,15 +379,17 @@ public class StringSearchModelInterpolat
             throws ModelInterpolationException
         {
             int len = Array.getLength( target );
-            for( int i = 0; i < len; i++ )
+            for ( int i = 0; i < len; i++ )
             {
                 Object value = Array.get( target, i );
                 if ( value != null )
                 {
                     if ( String.class == value.getClass() )
                     {
-                        String interpolated = modelInterpolator.interpolateInternal( (String) value, valueSources, postProcessors, debugEnabled );
-                        
+                        String interpolated =
+                            modelInterpolator.interpolateInternal( (String) value, valueSources, postProcessors,
+                                                                   debugEnabled );
+
                         if ( !interpolated.equals( value ) )
                         {
                             Array.set( target, i, interpolated );

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java Sat Jun 26 23:16:18 2010
@@ -21,7 +21,6 @@ package org.apache.maven.project.path;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.model.Build;
@@ -31,7 +30,7 @@ import org.apache.maven.model.Resource;
 import org.codehaus.plexus.component.annotations.Component;
 
 @Deprecated
-@Component(role = PathTranslator.class)
+@Component( role = PathTranslator.class )
 public class DefaultPathTranslator
     implements PathTranslator
 {
@@ -49,27 +48,21 @@ public class DefaultPathTranslator
 
             build.setTestSourceDirectory( alignToBaseDirectory( build.getTestSourceDirectory(), basedir ) );
 
-            for ( Iterator i = build.getResources().iterator(); i.hasNext(); )
+            for ( Resource resource : build.getResources() )
             {
-                Resource resource = (Resource) i.next();
-
                 resource.setDirectory( alignToBaseDirectory( resource.getDirectory(), basedir ) );
             }
 
-            for ( Iterator i = build.getTestResources().iterator(); i.hasNext(); )
+            for ( Resource resource : build.getTestResources() )
             {
-                Resource resource = (Resource) i.next();
-
                 resource.setDirectory( alignToBaseDirectory( resource.getDirectory(), basedir ) );
             }
 
             if ( build.getFilters() != null )
             {
-                List filters = new ArrayList();
-                for ( Iterator i = build.getFilters().iterator(); i.hasNext(); )
+                List<String> filters = new ArrayList<String>();
+                for ( String filter : build.getFilters() )
                 {
-                    String filter = (String) i.next();
-
                     filters.add( alignToBaseDirectory( filter, basedir ) );
                 }
                 build.setFilters( filters );
@@ -183,27 +176,21 @@ public class DefaultPathTranslator
 
             build.setTestSourceDirectory( unalignFromBaseDirectory( build.getTestSourceDirectory(), basedir ) );
 
-            for ( Iterator i = build.getResources().iterator(); i.hasNext(); )
+            for ( Resource resource : build.getResources() )
             {
-                Resource resource = (Resource) i.next();
-
                 resource.setDirectory( unalignFromBaseDirectory( resource.getDirectory(), basedir ) );
             }
 
-            for ( Iterator i = build.getTestResources().iterator(); i.hasNext(); )
+            for ( Resource resource : build.getTestResources() )
             {
-                Resource resource = (Resource) i.next();
-
                 resource.setDirectory( unalignFromBaseDirectory( resource.getDirectory(), basedir ) );
             }
 
             if ( build.getFilters() != null )
             {
-                List filters = new ArrayList();
-                for ( Iterator i = build.getFilters().iterator(); i.hasNext(); )
+                List<String> filters = new ArrayList<String>();
+                for ( String filter : build.getFilters() )
                 {
-                    String filter = (String) i.next();
-
                     filters.add( unalignFromBaseDirectory( filter, basedir ) );
                 }
                 build.setFilters( filters );

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Sat Jun 26 23:16:18 2010
@@ -33,7 +33,7 @@ import org.codehaus.plexus.component.ann
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-@Component(role = ModelValidator.class )
+@Component( role = ModelValidator.class )
 @Deprecated
 public class DefaultModelValidator
     implements ModelValidator

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java Sat Jun 26 23:16:18 2010
@@ -31,7 +31,7 @@ public class ModelValidationResult
 {
 
     /** */
-    private final static String NEWLINE = System.getProperty( "line.separator" );
+    private static final String NEWLINE = System.getProperty( "line.separator" );
 
     /** */
     private List<String> messages;

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java Sat Jun 26 23:16:18 2010
@@ -31,7 +31,7 @@ import org.codehaus.plexus.util.StringUt
 @Component( role = MirrorSelector.class )
 public class DefaultMirrorSelector
     implements MirrorSelector
-{    
+{
 
     private static final String WILDCARD = "*";
 
@@ -67,7 +67,7 @@ public class DefaultMirrorSelector
      * This method checks if the pattern matches the originalRepository. Valid patterns: * =
      * everything external:* = everything not on the localhost and not file based. repo,repo1 = repo
      * or repo1 *,!repo1 = everything except repo1
-     * 
+     *
      * @param originalRepository to compare for a match.
      * @param pattern used for match. Currently only '*' is supported.
      * @return true if the repository is a match to this pattern.
@@ -122,7 +122,7 @@ public class DefaultMirrorSelector
 
     /**
      * Checks the URL to see if this repository refers to an external repository
-     * 
+     *
      * @param originalRepository
      * @return true if external.
      */
@@ -131,7 +131,8 @@ public class DefaultMirrorSelector
         try
         {
             URL url = new URL( originalRepository.getUrl() );
-            return !( url.getHost().equals( "localhost" ) || url.getHost().equals( "127.0.0.1" ) || url.getProtocol().equals( "file" ) );
+            return !( url.getHost().equals( "localhost" ) || url.getHost().equals( "127.0.0.1" )
+                            || url.getProtocol().equals( "file" ) );
         }
         catch ( MalformedURLException e )
         {
@@ -147,7 +148,7 @@ public class DefaultMirrorSelector
 
     /**
      * Checks whether the layouts configured for a mirror match with the layout of the repository.
-     * 
+     *
      * @param repoLayout The layout of the repository, may be {@code null}.
      * @param mirrorLayout The layouts supported by the mirror, may be {@code null}.
      * @return {@code true} if the layouts associated with the mirror match the layout of the original repository,

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java Sat Jun 26 23:16:18 2010
@@ -19,7 +19,6 @@ package org.apache.maven.repository;
  * under the License.
  */
 
-
 /**
  *
  *
@@ -37,7 +36,7 @@ public class MavenArtifactMetadata
     String classifier;
     String type;
     String scope;
-    
+
     transient Object datum;
 
     public String getGroupId()
@@ -109,14 +108,13 @@ public class MavenArtifactMetadata
     {
         this.scope = scope;
     }
-    
+
     @Override
     public String toString()
     {
-        return getGroupId()+":"+getArtifactId()+":"+getVersion()
-                +":" + (getClassifier() == null ? "" : getClassifier() )
-                +":" + (getType() == null ? DEFAULT_TYPE : getType() )
-        ;
+        return getGroupId() + ":" + getArtifactId() + ":" + getVersion() + ":"
+            + ( getClassifier() == null ? "" : getClassifier() ) + ":"
+            + ( getType() == null ? DEFAULT_TYPE : getType() );
     }
-    
+
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java Sat Jun 26 23:16:18 2010
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 /**
- * This is the main graph data structure used by the RepositorySystem to present tree and graph objects. 
+ * This is the main graph data structure used by the RepositorySystem to present tree and graph objects.
  *
  * @author Oleg Gusakov
  * @version $Id$
@@ -36,14 +36,14 @@ public class MetadataGraph
 
     /** entry point for tree-like structures */
     MetadataGraphNode entry;
-    
+
     public MetadataGraph( MetadataGraphNode entry )
     {
         this();
-        
+
         this.entry = entry;
     }
-    
+
     public MetadataGraph()
     {
         nodes = new ArrayList<MetadataGraphNode>( 64 );
@@ -56,38 +56,38 @@ public class MetadataGraph
 
     /**
      * find a node by the GAV (metadata)
-     * 
+     *
      * @param md
      * @return
      */
     public MetadataGraphNode findNode( MavenArtifactMetadata md )
     {
-        for( MetadataGraphNode mgn : nodes )
+        for ( MetadataGraphNode mgn : nodes )
         {
-            if( mgn.metadata.equals( md ) )
+            if ( mgn.metadata.equals( md ) )
             {
                 return mgn;
             }
         }
 
         MetadataGraphNode node = new MetadataGraphNode( md );
-        addNode( node );        
+        addNode( node );
         return node;
     }
-    
+
     /**
      * getter
-     * 
+     *
      * @return
      */
     public MetadataGraphNode getEntry()
     {
         return entry;
     }
-    
+
     /**
      * getter
-     * 
+     *
      * @return
      */
     public Collection<MetadataGraphNode> getNodes()

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java Sat Jun 26 23:16:18 2010
@@ -32,32 +32,32 @@ import java.util.List;
 public class MetadataGraphNode
 {
     /** node payload */
-    MavenArtifactMetadata   metadata;
+    MavenArtifactMetadata metadata;
 
     /** nodes, incident to this (depend on me) */
     List<MetadataGraphNode> inNodes;
-    
+
     /** nodes, exident to this (I depend on) */
     List<MetadataGraphNode> exNodes;
-    
+
     public MetadataGraphNode()
     {
         inNodes = new ArrayList<MetadataGraphNode>(4);
         exNodes = new ArrayList<MetadataGraphNode>(8);
     }
-    
+
     public MetadataGraphNode( MavenArtifactMetadata metadata )
     {
         this();
         this.metadata = metadata;
     }
-    
+
     public MetadataGraphNode addIncident( MetadataGraphNode node )
     {
         inNodes.add( node );
         return this;
     }
-    
+
     public MetadataGraphNode addExident( MetadataGraphNode node )
     {
         exNodes.add( node );
@@ -67,28 +67,36 @@ public class MetadataGraphNode
     @Override
     public boolean equals( Object obj )
     {
-        if( obj == null )
+        if ( obj == null )
+        {
             return false;
+        }
 
-        if( MetadataGraphNode.class.isAssignableFrom( obj.getClass() ) )
+        if ( MetadataGraphNode.class.isAssignableFrom( obj.getClass() ) )
         {
             MetadataGraphNode node2 = (MetadataGraphNode) obj;
-            
-            if( node2.metadata == null )
+
+            if ( node2.metadata == null )
+            {
                 return metadata == null;
-            
-            return metadata == null ? false: metadata.toString().equals( node2.metadata.toString() );
+            }
+
+            return metadata == null ? false : metadata.toString().equals( node2.metadata.toString() );
         }
         else
+        {
             return super.equals( obj );
+        }
     }
-    
+
     @Override
     public int hashCode()
     {
-        if( metadata == null )
+        if ( metadata == null )
+        {
             return super.hashCode();
-        
+        }
+
         return metadata.toString().hashCode();
     }
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java Sat Jun 26 23:16:18 2010
@@ -46,32 +46,33 @@ public class MetadataResolutionRequest
 
     private List<ArtifactRepository> remoteRepositories;
 
-    // This is like a filter but overrides all transitive versions 
+    // This is like a filter but overrides all transitive versions
     private Map managedVersionMap;
 
     /** result type - flat list; the default */
     private boolean asList = true;
-    
+
     /** result type - dirty tree */
     private boolean asDirtyTree = false;
-    
+
     /** result type - resolved tree */
     private boolean asResolvedTree = false;
-    
+
     /** result type - graph */
     private boolean asGraph = false;
-    
+
     public MetadataResolutionRequest()
-    {  
+    {
     }
-    
-    public MetadataResolutionRequest( MavenArtifactMetadata md, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )    
-    {        
+
+    public MetadataResolutionRequest( MavenArtifactMetadata md, ArtifactRepository localRepository,
+                                      List<ArtifactRepository> remoteRepositories )
+    {
         this.mad = md;
         this.localRepository = localRepository;
         this.remoteRepositories = remoteRepositories;
     }
-    
+
     public MavenArtifactMetadata getArtifactMetadata()
     {
         return mad;
@@ -141,7 +142,7 @@ public class MetadataResolutionRequest
                 .append( "localRepository: " ).append(  localRepository ).append(  "\n" )
                 .append( "remoteRepositories: " ).append(  remoteRepositories ).append(  "\n" )
                 ;
-        
+
         return sb.toString();
     }
 

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java Sat Jun 26 23:16:18 2010
@@ -30,8 +30,6 @@ import org.apache.maven.artifact.reposit
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.CyclicDependencyException;
 import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector;
-
 
 /**
  *
@@ -65,11 +63,11 @@ public class MetadataResolutionResult
     private Set<Artifact> requestedArtifacts;
 
     private Set<Artifact> artifacts;
-    
+
     private MetadataGraph dirtyTree;
-    
+
     private MetadataGraph resolvedTree;
-    
+
     private MetadataGraph resolvedGraph;
 
     public Artifact getOriginatingArtifact()
@@ -235,8 +233,10 @@ public class MetadataResolutionResult
 
     public MetadataResolutionResult addError( Exception e )
     {
-        if( exceptions == null )
+        if ( exceptions == null )
+        {
             initList( exceptions );
+        }
 
         exceptions.add( e );
 
@@ -353,5 +353,5 @@ public class MetadataResolutionResult
     {
         this.resolvedTree = resolvedTree;
     }
-    
+
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java Sat Jun 26 23:16:18 2010
@@ -35,25 +35,23 @@ public class VersionNotFoundException
     extends Exception
 {
     private Dependency dependency;
-    
+
     private String projectId;
     private File pomFile;
-    private InvalidVersionSpecificationException cause; 
+    private InvalidVersionSpecificationException cause;
 
-    public VersionNotFoundException( String projectId
-                                     , Dependency dependency
-                                     , File pomFile
-                                     , InvalidVersionSpecificationException cause 
-                                     )
+    public VersionNotFoundException( String projectId, Dependency dependency, File pomFile,
+                                     InvalidVersionSpecificationException cause )
     {
-        super( projectId+", "+formatLocationInPom( dependency )+ " " +dependency.getVersion()+", pom file "+pomFile, cause );
-        
+        super( projectId + ", " + formatLocationInPom( dependency ) + " " + dependency.getVersion() + ", pom file "
+            + pomFile, cause );
+
         this.projectId = projectId;
-        
+
         this.pomFile = pomFile;
-        
+
         this.cause = cause;
-        
+
         this.dependency = dependency;
     }
 
@@ -81,6 +79,6 @@ public class VersionNotFoundException
     {
         return cause;
     }
-    
-    
+
+
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java Sat Jun 26 23:16:18 2010
@@ -41,7 +41,7 @@ import org.codehaus.plexus.component.ann
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
-@Component(role=UpdateCheckManager.class)
+@Component( role = UpdateCheckManager.class )
 public class DefaultUpdateCheckManager
     extends AbstractLogEnabled
     implements UpdateCheckManager
@@ -390,7 +390,8 @@ public class DefaultUpdateCheckManager
                     }
                     catch ( IOException e )
                     {
-                        getLogger().debug( "Error releasing shared lock for resolution tracking file: " + touchfile, e );
+                        getLogger().debug( "Error releasing shared lock for resolution tracking file: " + touchfile,
+                                           e );
                     }
                 }
 

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Sat Jun 26 23:16:18 2010
@@ -53,8 +53,8 @@ import org.codehaus.plexus.util.FileUtil
 
 //TODO: remove the update check manager
 //TODO: separate into retriever and publisher
-//TODO: rmeove hardcoding of checksum logic
-@Component(role = WagonManager.class)
+//TODO: remove hardcoding of checksum logic
+@Component( role = WagonManager.class )
 public class DefaultWagonManager
     implements WagonManager
 {
@@ -74,8 +74,9 @@ public class DefaultWagonManager
 
     //
     // Retriever
-    //   
-    public void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener downloadMonitor, boolean force )
+    //
+    public void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener downloadMonitor,
+                             boolean force )
         throws TransferFailedException, ResourceDoesNotExistException
     {
         String remotePath = repository.pathOf( artifact );
@@ -138,7 +139,8 @@ public class DefaultWagonManager
         }
     }
 
-    public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener downloadMonitor, boolean force )
+    public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories,
+                             TransferListener downloadMonitor, boolean force )
         throws TransferFailedException, ResourceDoesNotExistException
     {
         TransferFailedException tfe = null;
@@ -195,7 +197,8 @@ public class DefaultWagonManager
         }
     }
 
-    public void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository repository, File destination, String checksumPolicy )
+    public void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository repository, File destination,
+                                     String checksumPolicy )
         throws TransferFailedException, ResourceDoesNotExistException
     {
         String remotePath = repository.pathOfRemoteRepositoryMetadata( metadata );
@@ -203,7 +206,8 @@ public class DefaultWagonManager
         getRemoteFile( repository, destination, remotePath, null, checksumPolicy, true );
     }
 
-    public void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository repository, File destination, String checksumPolicy )
+    public void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository repository,
+                                                             File destination, String checksumPolicy )
         throws TransferFailedException, ResourceDoesNotExistException
     {
         String remotePath = repository.pathOfRemoteRepositoryMetadata( metadata );
@@ -213,13 +217,13 @@ public class DefaultWagonManager
 
     /**
      * Deal with connecting to a wagon repository taking into account authentication and proxies.
-     * 
+     *
      * @param wagon
      * @param repository
      * @throws ConnectionException
      * @throws AuthenticationException
      */
-    private void connectWagon( Wagon wagon, ArtifactRepository repository ) 
+    private void connectWagon( Wagon wagon, ArtifactRepository repository )
         throws ConnectionException, AuthenticationException
     {
         if ( repository.getProxy() != null && logger.isDebugEnabled() )
@@ -235,7 +239,8 @@ public class DefaultWagonManager
         }
         else if ( repository.getAuthentication() != null )
         {
-            wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ) );
+            wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
+                           authenticationInfo( repository ) );
         }
         else if ( repository.getProxy() != null )
         {
@@ -245,16 +250,16 @@ public class DefaultWagonManager
         {
             wagon.connect( new Repository( repository.getId(), repository.getUrl() ) );
         }
-    }    
-    
+    }
+
     private AuthenticationInfo authenticationInfo( ArtifactRepository repository )
     {
         AuthenticationInfo ai = new AuthenticationInfo();
         ai.setUserName( repository.getAuthentication().getUsername() );
         ai.setPassword( repository.getAuthentication().getPassword() );
-        return ai;        
+        return ai;
     }
-    
+
     private ProxyInfo proxyInfo( ArtifactRepository repository )
     {
         ProxyInfo proxyInfo = new ProxyInfo();
@@ -263,11 +268,12 @@ public class DefaultWagonManager
         proxyInfo.setPort( repository.getProxy().getPort() );
         proxyInfo.setNonProxyHosts( repository.getProxy().getNonProxyHosts() );
         proxyInfo.setUserName( repository.getProxy().getUserName() );
-        proxyInfo.setPassword( repository.getProxy().getPassword() );            
+        proxyInfo.setPassword( repository.getProxy().getPassword() );
         return proxyInfo;
     }
-    
-    public void getRemoteFile( ArtifactRepository repository, File destination, String remotePath, TransferListener downloadMonitor, String checksumPolicy, boolean force )
+
+    public void getRemoteFile( ArtifactRepository repository, File destination, String remotePath,
+                               TransferListener downloadMonitor, String checksumPolicy, boolean force )
         throws TransferFailedException, ResourceDoesNotExistException
     {
         String protocol = repository.getProtocol();
@@ -297,7 +303,7 @@ public class DefaultWagonManager
         try
         {
             connectWagon( wagon, repository );
-            
+
             boolean firstRun = true;
             boolean retry = true;
 
@@ -407,7 +413,8 @@ public class DefaultWagonManager
                         catch ( ResourceDoesNotExistException md5TryException )
                         {
                             // this was a failed transfer, and we don't want to retry.
-                            handleChecksumFailure( checksumPolicy, "Error retrieving checksum file for " + remotePath, md5TryException );
+                            handleChecksumFailure( checksumPolicy, "Error retrieving checksum file for " + remotePath,
+                                                   md5TryException );
                         }
                     }
 
@@ -470,7 +477,8 @@ public class DefaultWagonManager
                 }
                 catch ( IOException e )
                 {
-                    throw new TransferFailedException( "Error copying temporary file to the final destination: " + e.getMessage(), e );
+                    throw new TransferFailedException( "Error copying temporary file to the final destination: "
+                        + e.getMessage(), e );
                 }
             }
         }
@@ -478,8 +486,9 @@ public class DefaultWagonManager
 
     //
     // Publisher
-    //    
-    public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository, TransferListener downloadMonitor )
+    //
+    public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository,
+                             TransferListener downloadMonitor )
         throws TransferFailedException
     {
         putRemoteFile( deploymentRepository, source, deploymentRepository.pathOf( artifact ), downloadMonitor );
@@ -492,7 +501,8 @@ public class DefaultWagonManager
         putRemoteFile( repository, source, repository.pathOfRemoteRepositoryMetadata( artifactMetadata ), null );
     }
 
-    public void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
+    public void putRemoteFile( ArtifactRepository repository, File source, String remotePath,
+                               TransferListener downloadMonitor )
         throws TransferFailedException
     {
         String protocol = repository.getProtocol();
@@ -521,7 +531,7 @@ public class DefaultWagonManager
         {
             checksums.put( CHECKSUM_IDS[i], addChecksumObserver( wagon, CHECKSUM_ALGORITHMS[i] ) );
         }
-        
+
         List<File> temporaryFiles = new ArrayList<File>();
 
         try
@@ -583,7 +593,7 @@ public class DefaultWagonManager
         {
             // MNG-4543
             cleanupTemporaryFiles( temporaryFiles );
-            
+
             // Remove every checksum listener
             for ( String aCHECKSUM_IDS : CHECKSUM_IDS )
             {
@@ -600,7 +610,7 @@ public class DefaultWagonManager
         }
     }
 
-    private void cleanupTemporaryFiles(List<File> files)
+    private void cleanupTemporaryFiles( List<File> files )
     {
         for ( File file : files )
         {
@@ -615,9 +625,9 @@ public class DefaultWagonManager
                     + e.getMessage() );
             }
         }
-       
+
     }
-    
+
     private ChecksumObserver addChecksumObserver( Wagon wagon, String algorithm )
         throws TransferFailedException
     {
@@ -648,7 +658,8 @@ public class DefaultWagonManager
         // otherwise it is ignore
     }
 
-    private void verifyChecksum( ChecksumObserver checksumObserver, File destination, File tempDestination, String remotePath, String checksumFileExtension, Wagon wagon )
+    private void verifyChecksum( ChecksumObserver checksumObserver, File destination, File tempDestination,
+                                 String remotePath, String checksumFileExtension, Wagon wagon )
         throws ResourceDoesNotExistException, TransferFailedException, AuthorizationException
     {
         try
@@ -666,7 +677,8 @@ public class DefaultWagonManager
             expectedChecksum = expectedChecksum.trim();
 
             // check for 'ALGO (name) = CHECKSUM' like used by openssl
-            if ( expectedChecksum.regionMatches( true, 0, "MD", 0, 2 ) || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
+            if ( expectedChecksum.regionMatches( true, 0, "MD", 0, 2 )
+                || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
             {
                 int lastSpacePos = expectedChecksum.lastIndexOf( ' ' );
                 expectedChecksum = expectedChecksum.substring( lastSpacePos + 1 );
@@ -693,7 +705,8 @@ public class DefaultWagonManager
             }
             else
             {
-                throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum + "'; remote = '" + expectedChecksum + "'" );
+                throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum
+                    + "'; remote = '" + expectedChecksum + "'" );
             }
         }
         catch ( IOException e )
@@ -732,8 +745,8 @@ public class DefaultWagonManager
         throws UnsupportedProtocolException
     {
         return getWagon( repository.getProtocol() );
-    }    
-    
+    }
+
     @Deprecated
     public Wagon getWagon( String protocol )
         throws UnsupportedProtocolException
@@ -758,5 +771,5 @@ public class DefaultWagonManager
 
         return wagon;
     }
-   
+
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java Sat Jun 26 23:16:18 2010
@@ -1,18 +1,22 @@
 package org.apache.maven.repository.legacy;
 
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.io.File;
@@ -70,7 +74,7 @@ import org.codehaus.plexus.util.StringUt
 /**
  * @author Jason van Zyl
  */
-@Component(role = RepositorySystem.class, hint = "default")
+@Component( role = RepositorySystem.class, hint = "default" )
 public class LegacyRepositorySystem
     implements RepositorySystem
 {
@@ -112,7 +116,8 @@ public class LegacyRepositorySystem
         return artifactFactory.createBuildArtifact( groupId, artifactId, version, packaging );
     }
 
-    public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, String classifier )
+    public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type,
+                                                  String classifier )
     {
         return artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
     }
@@ -134,7 +139,9 @@ public class LegacyRepositorySystem
             return null;
         }
 
-        Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), d.getClassifier(), d.getScope(), d.isOptional() );
+        Artifact artifact =
+            artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(),
+                                                      d.getClassifier(), d.getScope(), d.isOptional() );
 
         if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) && d.getSystemPath() != null )
         {
@@ -225,8 +232,11 @@ public class LegacyRepositorySystem
     public ArtifactRepository createLocalRepository( File localRepository )
         throws InvalidRepositoryException
     {
-        return createRepository( "file://" + localRepository.toURI().getRawPath(), RepositorySystem.DEFAULT_LOCAL_REPO_ID, true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, true,
-                                 ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
+        return createRepository( "file://" + localRepository.toURI().getRawPath(),
+                                 RepositorySystem.DEFAULT_LOCAL_REPO_ID, true,
+                                 ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, true,
+                                 ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
+                                 ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
     }
 
     public ArtifactRepository createDefaultRemoteRepository()
@@ -241,7 +251,9 @@ public class LegacyRepositorySystem
     public ArtifactRepository createLocalRepository( String url, String repositoryId )
         throws IOException
     {
-        return createRepository( canonicalFileUrl( url ), repositoryId, true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
+        return createRepository( canonicalFileUrl( url ), repositoryId, true,
+                                 ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, true,
+                                 ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
                                  ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
     }
 
@@ -278,15 +290,17 @@ public class LegacyRepositorySystem
     {
         /*
          * Probably is not worth it, but here I make sure I restore request
-         * to its original state. 
+         * to its original state.
          */
         try
         {
-            LocalArtifactRepository ideWorkspace = plexus.lookup( LocalArtifactRepository.class, LocalArtifactRepository.IDE_WORKSPACE );
+            LocalArtifactRepository ideWorkspace =
+                plexus.lookup( LocalArtifactRepository.class, LocalArtifactRepository.IDE_WORKSPACE );
 
             if ( request.getLocalRepository() instanceof DelegatingLocalArtifactRepository )
             {
-                DelegatingLocalArtifactRepository delegatingLocalRepository = (DelegatingLocalArtifactRepository) request.getLocalRepository();
+                DelegatingLocalArtifactRepository delegatingLocalRepository =
+                    (DelegatingLocalArtifactRepository) request.getLocalRepository();
 
                 LocalArtifactRepository orig = delegatingLocalRepository.getIdeWorspace();
 
@@ -304,7 +318,8 @@ public class LegacyRepositorySystem
             else
             {
                 ArtifactRepository localRepository = request.getLocalRepository();
-                DelegatingLocalArtifactRepository delegatingLocalRepository = new DelegatingLocalArtifactRepository( localRepository );
+                DelegatingLocalArtifactRepository delegatingLocalRepository =
+                    new DelegatingLocalArtifactRepository( localRepository );
                 delegatingLocalRepository.setIdeWorkspace( ideWorkspace );
                 request.setLocalRepository( delegatingLocalRepository );
                 try
@@ -370,7 +385,8 @@ public class LegacyRepositorySystem
 
         for ( List<ArtifactRepository> aliasedRepos : reposByKey.values() )
         {
-            List<ArtifactRepositoryPolicy> releasePolicies = new ArrayList<ArtifactRepositoryPolicy>( aliasedRepos.size() );
+            List<ArtifactRepositoryPolicy> releasePolicies =
+                new ArrayList<ArtifactRepositoryPolicy>( aliasedRepos.size() );
 
             for ( ArtifactRepository aliasedRepo : aliasedRepos )
             {
@@ -379,7 +395,8 @@ public class LegacyRepositorySystem
 
             ArtifactRepositoryPolicy releasePolicy = getEffectivePolicy( releasePolicies );
 
-            List<ArtifactRepositoryPolicy> snapshotPolicies = new ArrayList<ArtifactRepositoryPolicy>( aliasedRepos.size() );
+            List<ArtifactRepositoryPolicy> snapshotPolicies =
+                new ArrayList<ArtifactRepositoryPolicy>( aliasedRepos.size() );
 
             for ( ArtifactRepository aliasedRepo : aliasedRepos )
             {
@@ -390,8 +407,9 @@ public class LegacyRepositorySystem
 
             ArtifactRepository aliasedRepo = aliasedRepos.get( 0 );
 
-            ArtifactRepository effectiveRepository = 
-                createArtifactRepository( aliasedRepo.getId(), aliasedRepo.getUrl(), aliasedRepo.getLayout(), snapshotPolicy, releasePolicy );
+            ArtifactRepository effectiveRepository =
+                createArtifactRepository( aliasedRepo.getId(), aliasedRepo.getUrl(), aliasedRepo.getLayout(),
+                                          snapshotPolicy, releasePolicy );
 
             effectiveRepository.setAuthentication( aliasedRepo.getAuthentication() );
 
@@ -567,11 +585,12 @@ public class LegacyRepositorySystem
         //      List<ResolutionListener> listeners,
         //      List<ConflictResolver> conflictResolvers )
         //      ArtifactResolutionResult result = artifactCollector.
-        
+
         return null;
     }
 
-    public void retrieve( ArtifactRepository repository, File destination, String remotePath, ArtifactTransferListener transferListener )
+    public void retrieve( ArtifactRepository repository, File destination, String remotePath,
+                          ArtifactTransferListener transferListener )
         throws ArtifactTransferFailedException, ArtifactDoesNotExistException
     {
         try
@@ -590,7 +609,8 @@ public class LegacyRepositorySystem
         }
     }
 
-    public void publish( ArtifactRepository repository, File source, String remotePath, ArtifactTransferListener transferListener )
+    public void publish( ArtifactRepository repository, File source, String remotePath,
+                         ArtifactTransferListener transferListener )
         throws ArtifactTransferFailedException
     {
         try
@@ -609,7 +629,7 @@ public class LegacyRepositorySystem
     //
     public ArtifactRepository buildArtifactRepository( Repository repo )
         throws InvalidRepositoryException
-    {        
+    {
         if ( repo != null )
         {
             String id = repo.getId();
@@ -629,7 +649,7 @@ public class LegacyRepositorySystem
             ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
 
             ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases() );
-            
+
             return createArtifactRepository( id, url, layouts.get( repo.getLayout() ), snapshots, releases );
         }
         else
@@ -637,24 +657,33 @@ public class LegacyRepositorySystem
             return null;
         }
     }
-    
-    private ArtifactRepository createRepository( String url, String repositoryId, boolean releases, String releaseUpdates, boolean snapshots, String snapshotUpdates, String checksumPolicy )
+
+    private ArtifactRepository createRepository( String url, String repositoryId, boolean releases,
+                                                 String releaseUpdates, boolean snapshots, String snapshotUpdates,
+                                                 String checksumPolicy )
     {
-        ArtifactRepositoryPolicy snapshotsPolicy = new ArtifactRepositoryPolicy( snapshots, snapshotUpdates, checksumPolicy );
+        ArtifactRepositoryPolicy snapshotsPolicy =
+            new ArtifactRepositoryPolicy( snapshots, snapshotUpdates, checksumPolicy );
 
-        ArtifactRepositoryPolicy releasesPolicy = new ArtifactRepositoryPolicy( releases, releaseUpdates, checksumPolicy );
+        ArtifactRepositoryPolicy releasesPolicy =
+            new ArtifactRepositoryPolicy( releases, releaseUpdates, checksumPolicy );
 
         return createArtifactRepository( repositoryId, url, null, snapshotsPolicy, releasesPolicy );
     }
 
-    public ArtifactRepository createArtifactRepository( String repositoryId, String url, ArtifactRepositoryLayout repositoryLayout, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases )
+    public ArtifactRepository createArtifactRepository( String repositoryId, String url,
+                                                        ArtifactRepositoryLayout repositoryLayout,
+                                                        ArtifactRepositoryPolicy snapshots,
+                                                        ArtifactRepositoryPolicy releases )
     {
         if ( repositoryLayout == null )
         {
             repositoryLayout = layouts.get( "default" );
         }
 
-        ArtifactRepository artifactRepository = artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots, releases );
+        ArtifactRepository artifactRepository =
+            artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots,
+                                                                releases );
 
         return artifactRepository;
     }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java Sat Jun 26 23:16:18 2010
@@ -1,18 +1,22 @@
 package org.apache.maven.repository.legacy;
 
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.io.File;
@@ -21,7 +25,6 @@ import java.util.List;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.repository.ArtifactTransferListener;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.UnsupportedProtocolException;
@@ -41,26 +44,31 @@ public interface WagonManager
 
     //
     // Retriever
-    //        
+    //
     void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener transferListener, boolean force )
         throws TransferFailedException, ResourceDoesNotExistException;
 
-    void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener transferListener, boolean force )
+    void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories,
+                      TransferListener transferListener, boolean force )
         throws TransferFailedException, ResourceDoesNotExistException;
 
-    void getRemoteFile( ArtifactRepository repository, File destination, String remotePath, TransferListener downloadMonitor, String checksumPolicy, boolean force )
+    void getRemoteFile( ArtifactRepository repository, File destination, String remotePath,
+                        TransferListener downloadMonitor, String checksumPolicy, boolean force )
         throws TransferFailedException, ResourceDoesNotExistException;
 
-    void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository remoteRepository, File destination, String checksumPolicy )
+    void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository remoteRepository, File destination,
+                              String checksumPolicy )
         throws TransferFailedException, ResourceDoesNotExistException;
 
-    void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository remoteRepository, File file, String checksumPolicyWarn )
+    void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository remoteRepository,
+                                                      File file, String checksumPolicyWarn )
         throws TransferFailedException, ResourceDoesNotExistException;
 
     //
     // Deployer
     //
-    void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository, TransferListener downloadMonitor )
+    void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository,
+                      TransferListener downloadMonitor )
         throws TransferFailedException;
 
     void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java Sat Jun 26 23:16:18 2010
@@ -1,18 +1,22 @@
 package org.apache.maven.repository.legacy.repository;
 
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import org.apache.maven.artifact.UnknownRepositoryLayoutException;
@@ -36,12 +40,15 @@ public interface ArtifactRepositoryFacto
     ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId, boolean uniqueVersion )
         throws UnknownRepositoryLayoutException;
 
-    ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout layout, boolean uniqueVersion );
+    ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout layout,
+                                                           boolean uniqueVersion );
 
-    ArtifactRepository createArtifactRepository( String id, String url, String layoutId, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases )
+    ArtifactRepository createArtifactRepository( String id, String url, String layoutId,
+                                                 ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases )
         throws UnknownRepositoryLayoutException;
 
-    ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
+    ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout,
+                                                 ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
 
     void setGlobalUpdatePolicy( String snapshotPolicy );
 

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java Sat Jun 26 23:16:18 2010
@@ -33,7 +33,7 @@ import org.codehaus.plexus.component.ann
 /**
  * @author jdcasey
  */
-@Component(role=ArtifactRepositoryFactory.class)
+@Component( role = ArtifactRepositoryFactory.class )
 public class DefaultArtifactRepositoryFactory
     implements ArtifactRepositoryFactory
 {
@@ -42,7 +42,7 @@ public class DefaultArtifactRepositoryFa
 
     private String globalChecksumPolicy;
 
-    @Requirement(role=ArtifactRepositoryLayout.class)
+    @Requirement( role = ArtifactRepositoryLayout.class )
     private Map<String,ArtifactRepositoryLayout> repositoryLayouts;
 
     public ArtifactRepositoryLayout getLayout( String layoutId )
@@ -51,9 +51,7 @@ public class DefaultArtifactRepositoryFa
         return repositoryLayouts.get( layoutId );
     }
 
-    public ArtifactRepository createDeploymentArtifactRepository( String id,
-                                                                  String url,
-                                                                  String layoutId,
+    public ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId,
                                                                   boolean uniqueVersion )
         throws UnknownRepositoryLayoutException
     {
@@ -64,9 +62,7 @@ public class DefaultArtifactRepositoryFa
         return createDeploymentArtifactRepository( id, url, layout, uniqueVersion );
     }
 
-    private void checkLayout( String repositoryId,
-                              String layoutId,
-                              ArtifactRepositoryLayout layout )
+    private void checkLayout( String repositoryId, String layoutId, ArtifactRepositoryLayout layout )
         throws UnknownRepositoryLayoutException
     {
         if ( layout == null )
@@ -75,17 +71,14 @@ public class DefaultArtifactRepositoryFa
         }
     }
 
-    public ArtifactRepository createDeploymentArtifactRepository( String id,
-                                                                  String url,
+    public ArtifactRepository createDeploymentArtifactRepository( String id, String url,
                                                                   ArtifactRepositoryLayout repositoryLayout,
                                                                   boolean uniqueVersion )
     {
         return createArtifactRepository( id, url, repositoryLayout, null, null );
     }
 
-    public ArtifactRepository createArtifactRepository( String id,
-                                                        String url,
-                                                        String layoutId,
+    public ArtifactRepository createArtifactRepository( String id, String url, String layoutId,
                                                         ArtifactRepositoryPolicy snapshots,
                                                         ArtifactRepositoryPolicy releases )
         throws UnknownRepositoryLayoutException
@@ -97,8 +90,7 @@ public class DefaultArtifactRepositoryFa
         return createArtifactRepository( id, url, layout, snapshots, releases );
     }
 
-    public ArtifactRepository createArtifactRepository( String id,
-                                                        String url,
+    public ArtifactRepository createArtifactRepository( String id, String url,
                                                         ArtifactRepositoryLayout repositoryLayout,
                                                         ArtifactRepositoryPolicy snapshots,
                                                         ArtifactRepositoryPolicy releases )

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Sat Jun 26 23:16:18 2010
@@ -59,7 +59,7 @@ import org.codehaus.plexus.logging.Logge
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @author Jason van Zyl
  */
-@Component(role=LegacyArtifactCollector.class)
+@Component( role = LegacyArtifactCollector.class )
 public class DefaultLegacyArtifactCollector
     implements LegacyArtifactCollector
 {
@@ -87,13 +87,10 @@ public class DefaultLegacyArtifactCollec
         }
     }
 
-    public ArtifactResolutionResult collect( Set<Artifact> artifacts, 
-                                             Artifact originatingArtifact,
-                                             Map managedVersions, 
-                                             ArtifactRepository localRepository,
+    public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+                                             Map managedVersions, ArtifactRepository localRepository,
                                              List<ArtifactRepository> remoteRepositories,
-                                             ArtifactMetadataSource source, 
-                                             ArtifactFilter filter,
+                                             ArtifactMetadataSource source, ArtifactFilter filter,
                                              List<ResolutionListener> listeners,
                                              List<ConflictResolver> conflictResolvers )
     {
@@ -105,12 +102,9 @@ public class DefaultLegacyArtifactCollec
                         conflictResolvers );
     }
 
-    public ArtifactResolutionResult collect( Set<Artifact> artifacts, 
-                                             Artifact originatingArtifact,
-                                             Map managedVersions, 
-                                             ArtifactResolutionRequest repositoryRequest,
-                                             ArtifactMetadataSource source, 
-                                             ArtifactFilter filter,
+    public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+                                             Map managedVersions, ArtifactResolutionRequest repositoryRequest,
+                                             ArtifactMetadataSource source, ArtifactFilter filter,
                                              List<ResolutionListener> listeners,
                                              List<ConflictResolver> conflictResolvers )
     {
@@ -148,7 +142,8 @@ public class DefaultLegacyArtifactCollec
 
         try
         {
-            recurse( result, root, resolvedArtifacts, versionMap, repositoryRequest, source, filter, listeners, conflictResolvers );
+            recurse( result, root, resolvedArtifacts, versionMap, repositoryRequest, source, filter, listeners,
+                     conflictResolvers );
         }
         catch ( CyclicDependencyException e )
         {
@@ -187,7 +182,7 @@ public class DefaultLegacyArtifactCollec
                                 artifact.setDependencyTrail( node.getDependencyTrail() );
 
                                 set.add( node );
-                                
+
                                 // This is required right now.
                                 result.addArtifact( artifact );
                             }
@@ -242,15 +237,10 @@ public class DefaultLegacyArtifactCollec
         return versionMap;
     }
 
-    private void recurse( ArtifactResolutionResult result, 
-                          ResolutionNode node,
-                          Map<Object, List<ResolutionNode>> resolvedArtifacts, 
-                          ManagedVersionMap managedVersions,
-                          ArtifactResolutionRequest request,
-                          ArtifactMetadataSource source, 
-                          ArtifactFilter filter, 
-                          List<ResolutionListener> listeners,
-                          List<ConflictResolver> conflictResolvers )
+    private void recurse( ArtifactResolutionResult result, ResolutionNode node,
+                          Map<Object, List<ResolutionNode>> resolvedArtifacts, ManagedVersionMap managedVersions,
+                          ArtifactResolutionRequest request, ArtifactMetadataSource source, ArtifactFilter filter,
+                          List<ResolutionListener> listeners, List<ConflictResolver> conflictResolvers )
         throws ArtifactResolutionException
     {
         fireEvent( ResolutionListener.TEST_ARTIFACT, listeners, node );
@@ -324,13 +314,17 @@ public class DefaultLegacyArtifactCollec
                                         catch ( ArtifactMetadataRetrievalException e )
                                         {
                                             resetArtifact.setDependencyTrail( node.getDependencyTrail() );
-                                            throw new ArtifactResolutionException( "Unable to get dependency information: " + e.getMessage(), resetArtifact, request.getRemoteRepositories(), e );
+                                            throw new ArtifactResolutionException(
+                                                                                   "Unable to get dependency information: "
+                                                                                       + e.getMessage(), resetArtifact,
+                                                                                   request.getRemoteRepositories(), e );
                                         }
                                     }
                                     // end hack
 
                                     // MNG-2861: match version can return null
-                                    ArtifactVersion selectedVersion = resetArtifact.getVersionRange().matchVersion( resetArtifact.getAvailableVersions() );
+                                    ArtifactVersion selectedVersion =
+                                        resetArtifact.getVersionRange().matchVersion( resetArtifact.getAvailableVersions() );
                                     if ( selectedVersion != null )
                                     {
                                         resetArtifact.selectVersion( selectedVersion.toString() );
@@ -359,15 +353,19 @@ public class DefaultLegacyArtifactCollec
                         if ( resolved == null )
                         {
                             // TODO: add better exception that can detail the two conflicting artifacts
-                            ArtifactResolutionException are = new ArtifactResolutionException( "Cannot resolve artifact version conflict between " + previous.getArtifact().getVersion()
-                                                                                              + " and " + node.getArtifact().getVersion(), previous.getArtifact() ); 
+                            ArtifactResolutionException are =
+                                new ArtifactResolutionException( "Cannot resolve artifact version conflict between "
+                                    + previous.getArtifact().getVersion() + " and " + node.getArtifact().getVersion(),
+                                                                 previous.getArtifact() );
                             result.addVersionRangeViolation( are );
                         }
 
                         if ( ( resolved != previous ) && ( resolved != node ) )
                         {
                             // TODO: add better exception
-                            result.addVersionRangeViolation( new ArtifactResolutionException( "Conflict resolver returned unknown resolution node: ", resolved.getArtifact() ) );
+                            result.addVersionRangeViolation( new ArtifactResolutionException(
+                                                                                              "Conflict resolver returned unknown resolution node: ",
+                                                                                              resolved.getArtifact() ) );
                         }
 
                         // TODO: should this be part of mediation?
@@ -513,8 +511,9 @@ public class DefaultLegacyArtifactCollec
                                             {
                                                 throw new OverConstrainedVersionException(
                                                                                            "No versions are present in the repository for the artifact with a range "
-                                                                                               + versionRange, artifact,
-                                                                                               childRemoteRepositories );
+                                                                                               + versionRange,
+                                                                                           artifact,
+                                                                                           childRemoteRepositories );
                                             }
 
                                             throw new OverConstrainedVersionException( "Couldn't find a version in "
@@ -543,7 +542,7 @@ public class DefaultLegacyArtifactCollec
                             if ( parentArtifact != null && parentArtifact.getDependencyFilter() != null
                                 && !parentArtifact.getDependencyFilter().include( artifact ) )
                             {
-                                // MNG-3769: the [probably relocated] artifact is excluded. 
+                                // MNG-3769: the [probably relocated] artifact is excluded.
                                 // We could process exclusions on relocated artifact details in the
                                 // MavenMetadataSource.createArtifacts(..) step, BUT that would
                                 // require resolving the POM from the repository very early on in
@@ -601,7 +600,8 @@ public class DefaultLegacyArtifactCollec
         }
     }
 
-    private void manageArtifact( ResolutionNode node, ManagedVersionMap managedVersions, List<ResolutionListener> listeners )
+    private void manageArtifact( ResolutionNode node, ManagedVersionMap managedVersions,
+                                 List<ResolutionListener> listeners )
     {
         Artifact artifact = (Artifact) managedVersions.get( node.getKey() );
 
@@ -649,7 +649,8 @@ public class DefaultLegacyArtifactCollec
 
         /* farthest is runtime and nearest has lower priority, change to runtime */
         if ( Artifact.SCOPE_RUNTIME.equals( farthestArtifact.getScope() )
-            && ( Artifact.SCOPE_TEST.equals( nearestArtifact.getScope() ) || Artifact.SCOPE_PROVIDED.equals( nearestArtifact.getScope() ) ) )
+            && ( Artifact.SCOPE_TEST.equals( nearestArtifact.getScope() )
+                            || Artifact.SCOPE_PROVIDED.equals( nearestArtifact.getScope() ) ) )
         {
             updateScope = true;
         }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java Sat Jun 26 23:16:18 2010
@@ -26,7 +26,6 @@ import java.util.Set;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.RepositoryRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ResolutionListener;
@@ -44,24 +43,15 @@ import org.apache.maven.repository.legac
 public interface LegacyArtifactCollector
 {
 
-    ArtifactResolutionResult collect( Set<Artifact> artifacts,
-                                      Artifact originatingArtifact,
-                                      Map managedVersions,
-                                      ArtifactResolutionRequest repositoryRequest,
-                                      ArtifactMetadataSource source,
-                                      ArtifactFilter filter,
-                                      List<ResolutionListener> listeners,
+    ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions,
+                                      ArtifactResolutionRequest repositoryRequest, ArtifactMetadataSource source,
+                                      ArtifactFilter filter, List<ResolutionListener> listeners,
                                       List<ConflictResolver> conflictResolvers );
 
-    ArtifactResolutionResult collect( Set<Artifact> artifacts,
-                                      Artifact originatingArtifact,
-                                      Map managedVersions,
-                                      ArtifactRepository localRepository,
-                                      List<ArtifactRepository> remoteRepositories,
-                                      ArtifactMetadataSource source,
-                                      ArtifactFilter filter,
-                                      List<ResolutionListener> listeners,
-                                      List<ConflictResolver> conflictResolvers );
+    ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions,
+                                      ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
+                                      ArtifactMetadataSource source, ArtifactFilter filter,
+                                      List<ResolutionListener> listeners, List<ConflictResolver> conflictResolvers );
 
     // used by maven-dependency-tree and maven-dependency-plugin
     @Deprecated