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 [4/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/repository/legacy/resolver/conflict/ConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -30,7 +30,7 @@ import org.apache.maven.artifact.resolve
  */
 public interface ConflictResolver
 {
-    static String ROLE = ConflictResolver.class.getName();
+    String ROLE = ConflictResolver.class.getName();
 
     /**
      * Determines which of the specified versions of an artifact to use when there are conflicting declarations.
@@ -41,6 +41,5 @@ public interface ConflictResolver
      *         this conflict cannot be resolved
      * @since 3.0
      */
-    ResolutionNode resolveConflict( ResolutionNode node1,
-                                    ResolutionNode node2 );
+    ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 );
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -1,7 +1,5 @@
 package org.apache.maven.repository.legacy.resolver.conflict;
 
-import org.codehaus.plexus.component.annotations.Component;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import org.codehaus.plexus.component.ann
  * under the License.
  */
 
+import org.codehaus.plexus.component.annotations.Component;
+
 /**
  * The default conflict resolver that delegates to the nearest strategy.
  *
@@ -30,7 +30,7 @@ import org.codehaus.plexus.component.ann
  * @deprecated As of 3.0, use a specific implementation instead, e.g. {@link NearestConflictResolver}
  */
 @Deprecated
-@Component(role=ConflictResolver.class)
+@Component( role = ConflictResolver.class )
 public class DefaultConflictResolver
     extends NearestConflictResolver
 {

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java Sat Jun 26 23:16:18 2010
@@ -36,17 +36,16 @@ import org.codehaus.plexus.personality.p
  * @todo you don't need the container in here with the active maps (jvz).
  * @since 3.0
  */
-@Component(role=ConflictResolverFactory.class) 
+@Component( role = ConflictResolverFactory.class )
 public class DefaultConflictResolverFactory
-    implements ConflictResolverFactory,
-    Contextualizable
+    implements ConflictResolverFactory, Contextualizable
 {
     // fields -----------------------------------------------------------------
 
     /**
      * The plexus container used to obtain instances from.
      */
-	@Requirement
+    @Requirement
     private PlexusContainer container;
 
     // ConflictResolverFactory methods ----------------------------------------

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -30,7 +30,7 @@ import org.codehaus.plexus.component.ann
  * @version $Id$
  * @since 3.0
  */
-@Component(role=ConflictResolver.class, hint="farthest")
+@Component( role = ConflictResolver.class, hint = "farthest" )
 public class FarthestConflictResolver
     implements ConflictResolver
 {
@@ -41,8 +41,7 @@ public class FarthestConflictResolver
     *      org.apache.maven.artifact.resolver.ResolutionNode)
     */
 
-    public ResolutionNode resolveConflict( ResolutionNode node1,
-                                           ResolutionNode node2 )
+    public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
     {
         return node1.getDepth() >= node2.getDepth() ? node1 : node2;
     }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -31,7 +31,7 @@ import org.codehaus.plexus.component.ann
  * @version $Id$
  * @since 3.0
  */
-@Component(role=ConflictResolver.class, hint="nearest")
+@Component( role = ConflictResolver.class, hint = "nearest" )
 public class NearestConflictResolver
     implements ConflictResolver
 {
@@ -42,8 +42,7 @@ public class NearestConflictResolver
     *      org.apache.maven.artifact.resolver.ResolutionNode)
     */
 
-    public ResolutionNode resolveConflict( ResolutionNode node1,
-                                           ResolutionNode node2 )
+    public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
     {
         return node1.getDepth() <= node2.getDepth() ? node1 : node2;
     }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -33,7 +33,7 @@ import org.codehaus.plexus.component.ann
  * @see ArtifactVersion#compareTo(Object)
  * @since 3.0
  */
-@Component(role=ConflictResolver.class, hint="newest")
+@Component( role = ConflictResolver.class, hint = "newest" )
 public class NewestConflictResolver
     implements ConflictResolver
 {
@@ -44,8 +44,7 @@ public class NewestConflictResolver
     *      org.apache.maven.artifact.resolver.ResolutionNode)
     */
 
-    public ResolutionNode resolveConflict( ResolutionNode node1,
-                                           ResolutionNode node2 )
+    public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
     {
         try
         {

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -33,7 +33,7 @@ import org.codehaus.plexus.component.ann
  * @see ArtifactVersion#compareTo(Object)
  * @since 3.0
  */
-@Component(role=ConflictResolver.class, hint="oldest")
+@Component( role = ConflictResolver.class, hint = "oldest" )
 public class OldestConflictResolver
     implements ConflictResolver
 {
@@ -44,8 +44,7 @@ public class OldestConflictResolver
     *      org.apache.maven.artifact.resolver.ResolutionNode)
     */
 
-    public ResolutionNode resolveConflict( ResolutionNode node1,
-                                           ResolutionNode node2 )
+    public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
     {
         try
         {

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java Sat Jun 26 23:16:18 2010
@@ -36,7 +36,7 @@ public interface ArtifactTransformationM
 
     /**
      * Take in a artifact and return the transformed artifact for locating in the remote repository. If no
-     * transformation has occured the original artifact is returned.
+     * transformation has occurred the original artifact is returned.
      *
      * @param artifact           Artifact to be transformed.
      * @param request the repositories to check
@@ -47,18 +47,19 @@ public interface ArtifactTransformationM
 
     /**
      * Take in a artifact and return the transformed artifact for locating in the remote repository. If no
-     * transformation has occured the original artifact is returned.
+     * transformation has occurred the original artifact is returned.
      *
      * @param artifact           Artifact to be transformed.
      * @param remoteRepositories the repositories to check
      * @param localRepository    the local repository
      */
-    void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+    void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
+                              ArtifactRepository localRepository )
         throws ArtifactResolutionException, ArtifactNotFoundException;
 
     /**
      * Take in a artifact and return the transformed artifact for locating in the local repository. If no
-     * transformation has occured the original artifact is returned.
+     * transformation has occurred the original artifact is returned.
      *
      * @param artifact        Artifact to be transformed.
      * @param localRepository the local repository it will be stored in
@@ -67,14 +68,15 @@ public interface ArtifactTransformationM
         throws ArtifactInstallationException;
 
     /**
-     * Take in a artifact and return the transformed artifact for distributing toa remote repository. If no
-     * transformation has occured the original artifact is returned.
+     * Take in a artifact and return the transformed artifact for distributing to a remote repository. If no
+     * transformation has occurred the original artifact is returned.
      *
      * @param artifact         Artifact to be transformed.
      * @param remoteRepository the repository to deploy to
      * @param localRepository  the local repository the metadata is stored in
      */
-    void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository, ArtifactRepository localRepository )
+    void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+                                 ArtifactRepository localRepository )
         throws ArtifactDeploymentException;
 
     List getArtifactTransformations();

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java Sat Jun 26 23:16:18 2010
@@ -34,11 +34,11 @@ import org.codehaus.plexus.component.ann
 /**
  * @author Jason van Zyl
  */
-@Component(role=ArtifactTransformationManager.class)
+@Component( role = ArtifactTransformationManager.class )
 public class DefaultArtifactTransformationManager
     implements ArtifactTransformationManager
 {
-    @Requirement(role=ArtifactTransformation.class, hints={"release", "latest", "snapshot"})
+    @Requirement( role = ArtifactTransformation.class, hints = { "release", "latest", "snapshot" } )
     private List<ArtifactTransformation> artifactTransformations;
 
     public void transformForResolve( Artifact artifact, RepositoryRequest request )
@@ -50,8 +50,7 @@ public class DefaultArtifactTransformati
         }
     }
 
-    public void transformForResolve( Artifact artifact,
-                                     List<ArtifactRepository> remoteRepositories,
+    public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
                                      ArtifactRepository localRepository )
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
@@ -61,8 +60,7 @@ public class DefaultArtifactTransformati
         }
     }
 
-    public void transformForInstall( Artifact artifact,
-                                     ArtifactRepository localRepository )
+    public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
         throws ArtifactInstallationException
     {
         for ( ArtifactTransformation transform : artifactTransformations )
@@ -71,8 +69,7 @@ public class DefaultArtifactTransformati
         }
     }
 
-    public void transformForDeployment( Artifact artifact,
-                                        ArtifactRepository remoteRepository,
+    public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
                                         ArtifactRepository localRepository )
         throws ArtifactDeploymentException
     {

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java Sat Jun 26 23:16:18 2010
@@ -28,7 +28,7 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.codehaus.plexus.component.annotations.Component;
 
-@Component(role=ArtifactTransformation.class, hint="latest")
+@Component( role = ArtifactTransformation.class, hint = "latest" )
 public class LatestArtifactTransformation
     extends AbstractVersionTransformation
 {
@@ -56,21 +56,18 @@ public class LatestArtifactTransformatio
         }
     }
 
-    public void transformForInstall( Artifact artifact,
-                                     ArtifactRepository localRepository )
+    public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
     {
         // metadata is added via addPluginArtifactMetadata
     }
 
-    public void transformForDeployment( Artifact artifact,
-                                        ArtifactRepository remoteRepository,
+    public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
                                         ArtifactRepository localRepository )
     {
         // metadata is added via addPluginArtifactMetadata
     }
 
-    protected String constructVersion( Versioning versioning,
-                                       String baseVersion )
+    protected String constructVersion( Versioning versioning, String baseVersion )
     {
         return versioning.getLatest();
     }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java Sat Jun 26 23:16:18 2010
@@ -36,7 +36,7 @@ import org.codehaus.plexus.component.ann
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */
-@Component(role=ArtifactTransformation.class, hint="release") 
+@Component( role = ArtifactTransformation.class, hint = "release" )
 public class ReleaseArtifactTransformation
     extends AbstractVersionTransformation
 {
@@ -65,16 +65,14 @@ public class ReleaseArtifactTransformati
         }
     }
 
-    public void transformForInstall( Artifact artifact,
-                                     ArtifactRepository localRepository )
+    public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
     {
         ArtifactMetadata metadata = createMetadata( artifact );
 
         artifact.addMetadata( metadata );
     }
 
-    public void transformForDeployment( Artifact artifact,
-                                        ArtifactRepository remoteRepository,
+    public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
                                         ArtifactRepository localRepository )
     {
         ArtifactMetadata metadata = createMetadata( artifact );
@@ -96,8 +94,7 @@ public class ReleaseArtifactTransformati
         return new ArtifactRepositoryMetadata( artifact, versioning );
     }
 
-    protected String constructVersion( Versioning versioning,
-                                       String baseVersion )
+    protected String constructVersion( Versioning versioning, String baseVersion )
     {
         return versioning.getRelease();
     }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java Sat Jun 26 23:16:18 2010
@@ -43,7 +43,7 @@ import org.codehaus.plexus.util.StringUt
  * @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
  * @version $Id$
  */
-@Component(role=ArtifactTransformation.class, hint="snapshot")
+@Component( role = ArtifactTransformation.class, hint = "snapshot" )
 public class SnapshotTransformation
     extends AbstractVersionTransformation
 {
@@ -71,8 +71,7 @@ public class SnapshotTransformation
         }
     }
 
-    public void transformForInstall( Artifact artifact,
-                                     ArtifactRepository localRepository )
+    public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
     {
         if ( artifact.isSnapshot() )
         {
@@ -84,8 +83,7 @@ public class SnapshotTransformation
         }
     }
 
-    public void transformForDeployment( Artifact artifact,
-                                        ArtifactRepository remoteRepository,
+    public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
                                         ArtifactRepository localRepository )
         throws ArtifactDeploymentException
     {
@@ -126,8 +124,7 @@ public class SnapshotTransformation
         return deploymentTimestamp;
     }
 
-    protected String constructVersion( Versioning versioning,
-                                       String baseVersion )
+    protected String constructVersion( Versioning versioning, String baseVersion )
     {
         String version = null;
         Snapshot snapshot = versioning.getSnapshot();
@@ -146,8 +143,7 @@ public class SnapshotTransformation
         return version;
     }
 
-    private int resolveLatestSnapshotBuildNumber( Artifact artifact,
-                                                  ArtifactRepository localRepository,
+    private int resolveLatestSnapshotBuildNumber( Artifact artifact, ArtifactRepository localRepository,
                                                   ArtifactRepository remoteRepository )
         throws RepositoryMetadataResolutionException
     {

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java Sat Jun 26 23:16:18 2010
@@ -1,5 +1,24 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.util.Collection;
 
 import org.apache.maven.artifact.Artifact;
@@ -7,15 +26,15 @@ import org.apache.maven.artifact.Artifac
 
 /**
  * Artifact Metadata that is resolved independent of Artifact itself.
- * 
+ *
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
  */
 public class ArtifactMetadata
 {
-	/** 
-	 * standard glorified artifact coordinates
-	 */
+    /**
+     * standard glorified artifact coordinates
+     */
     protected String groupId;
     protected String artifactId;
     protected String version;
@@ -23,12 +42,12 @@ public class ArtifactMetadata
     protected ArtifactScopeEnum artifactScope;
     protected String classifier;
 
-    /** 
+    /**
      * explanation: why this MD was chosen over it's siblings
-     * in the resulting structure (classpath for now) 
+     * in the resulting structure (classpath for now)
      */
     protected String why;
-    
+
     /** dependencies of the artifact behind this metadata */
     protected Collection<ArtifactMetadata> dependencies;
 
@@ -37,7 +56,7 @@ public class ArtifactMetadata
 
     /** is metadata found anywhere */
     protected boolean resolved = false;
-    
+
     /** does the actual artifact for this metadata exists */
     protected boolean artifactExists = false;
     /** artifact URI */
@@ -45,93 +64,69 @@ public class ArtifactMetadata
 
     /** error message  */
     private String error;
-    
+
     //------------------------------------------------------------------
     /**
-     * 
+     *
      */
     public ArtifactMetadata( String name )
     {
-    	if( name == null )
-    		return;
-    	int ind1 = name.indexOf(':');
-    	int ind2 = name.lastIndexOf(':');
-    	
-    	if( ind1 == -1 || ind2 == -1 )
-    		return;
-    	
-		this.groupId = name.substring(0, ind1);
-    	if( ind1 == ind2 )
-    	{
-    		this.artifactId = name.substring(ind1+1);
-    	}
-    	else
-    	{
-    		this.artifactId = name.substring( ind1+1, ind2 );
-    		this.version    = name.substring( ind2+1 );
-    	}
-    }
-    
-    //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId,
-                             String name,
-                             String version )
+        if ( name == null )
+        {
+            return;
+        }
+        int ind1 = name.indexOf( ':' );
+        int ind2 = name.lastIndexOf( ':' );
+
+        if ( ind1 == -1 || ind2 == -1 )
+        {
+            return;
+        }
+
+        this.groupId = name.substring( 0, ind1 );
+        if ( ind1 == ind2 )
+        {
+            this.artifactId = name.substring( ind1 + 1 );
+        }
+        else
+        {
+            this.artifactId = name.substring( ind1 + 1, ind2 );
+            this.version = name.substring( ind2 + 1 );
+        }
+    }
+
+    // ------------------------------------------------------------------
+    public ArtifactMetadata( String groupId, String name, String version )
     {
         this( groupId, name, version, null );
     }
     //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId,
-                             String name,
-                             String version,
-                             String type )
+    public ArtifactMetadata( String groupId, String name, String version, String type )
     {
         this( groupId, name, version, type, null );
     }
 
     //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId,
-                             String name,
-                             String version,
-                             String type,
-                             ArtifactScopeEnum artifactScope )
+    public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope )
     {
         this( groupId, name, version, type, artifactScope, null );
     }
 
     //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId,
-                             String name,
-                             String version,
-                             String type,
-                             ArtifactScopeEnum artifactScope,
+    public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
                              String classifier )
     {
         this( groupId, name, version, type, artifactScope, classifier, null );
     }
     //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId,
-                             String name,
-                             String version,
-                             String type,
-                             ArtifactScopeEnum artifactScope,
-                             String classifier
-                             , String artifactUri
-                             )
+    public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
+                             String classifier, String artifactUri )
     {
         this( groupId, name, version, type, artifactScope, classifier, artifactUri, null, true, null );
     }
     //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId
-    						, String name
-                             , String version
-                             , String type
-                             , ArtifactScopeEnum artifactScope
-                             , String classifier
-                             , String artifactUri
-                             , String why
-                             , boolean resolved
-                             , String error
-                             )
+    public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
+                             String classifier, String artifactUri, String why, boolean resolved, String error )
     {
         this.groupId = groupId;
         this.artifactId = name;
@@ -145,29 +140,12 @@ public class ArtifactMetadata
         this.error = error;
     }
     //------------------------------------------------------------------
-    public ArtifactMetadata( String groupId
-    						, String name
-                             , String version
-                             , String type
-                             , String scopeString
-                             , String classifier
-                             , String artifactUri
-                             , String why
-                             , boolean resolved
-                             , String error
-                             )
-    {
-        this( groupId
-        	, name
-        	, version
-        	, type
-    		, scopeString == null ? ArtifactScopeEnum.DEFAULT_SCOPE : ArtifactScopeEnum.valueOf(scopeString)
-    		, classifier
-    		, artifactUri
-    		, why
-    		, resolved
-    		, error
-    		);
+    public ArtifactMetadata( String groupId, String name, String version, String type, String scopeString,
+                             String classifier, String artifactUri, String why, boolean resolved, String error )
+    {
+        this( groupId, name, version, type,
+              scopeString == null ? ArtifactScopeEnum.DEFAULT_SCOPE : ArtifactScopeEnum.valueOf( scopeString ),
+              classifier, artifactUri, why, resolved, error );
     }
 
     //------------------------------------------------------------------
@@ -265,10 +243,7 @@ public class ArtifactMetadata
 
     public void setScope( String scope )
     {
-        this.artifactScope = scope == null
-            ? ArtifactScopeEnum.DEFAULT_SCOPE
-            : ArtifactScopeEnum.valueOf( scope )
-            ;
+        this.artifactScope = scope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : ArtifactScopeEnum.valueOf( scope );
     }
 
     public String getClassifier()
@@ -310,62 +285,62 @@ public class ArtifactMetadata
     {
         return artifactScope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : artifactScope;
     }
-    
+
     public boolean isArtifactExists()
-	{
-		return artifactExists;
-	}
-
-	public void setArtifactExists(boolean artifactExists)
-	{
-		this.artifactExists = artifactExists;
-	}
-	
-	
+    {
+        return artifactExists;
+    }
+
+    public void setArtifactExists(boolean artifactExists)
+    {
+        this.artifactExists = artifactExists;
+    }
+
+
     public Collection<ArtifactMetadata> getDependencies()
-	{
-		return dependencies;
-	}
-
-	public void setDependencies(Collection<ArtifactMetadata> dependencies)
-	{
-		this.dependencies = dependencies;
-	}
-
-	public String getArtifactUri()
-	{
-		return artifactUri;
-	}
-
-	public void setArtifactUri(String artifactUri)
-	{
-		this.artifactUri = artifactUri;
-	}
+    {
+        return dependencies;
+    }
+
+    public void setDependencies(Collection<ArtifactMetadata> dependencies)
+    {
+        this.dependencies = dependencies;
+    }
+
+    public String getArtifactUri()
+    {
+        return artifactUri;
+    }
+
+    public void setArtifactUri(String artifactUri)
+    {
+        this.artifactUri = artifactUri;
+    }
+
 
-	
     public String getWhy()
-	{
-		return why;
-	}
-	public void setWhy(String why)
-	{
-		this.why = why;
-	}
-	//-------------------------------------------------------------------
-	public String getError()
-	{
-		return error;
-	}
-	public void setError(String error)
-	{
-		this.error = error;
-	}
-	public boolean isError()
-	{
-		return error == null;
-	}
-	//------------------------------------------------------------------
-	public String getDependencyConflictId()
+    {
+        return why;
+    }
+    public void setWhy(String why)
+    {
+        this.why = why;
+    }
+    //-------------------------------------------------------------------
+    public String getError()
+    {
+        return error;
+    }
+    public void setError(String error)
+    {
+        this.error = error;
+    }
+    public boolean isError()
+    {
+        return error == null;
+    }
+    //------------------------------------------------------------------
+    public String getDependencyConflictId()
     {
         return groupId + ":" + artifactId;
     }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java Sat Jun 26 23:16:18 2010
@@ -34,7 +34,7 @@ import org.apache.maven.artifact.Artifac
 public class ClasspathContainer
 implements Iterable<ArtifactMetadata>
 {
-	private List<ArtifactMetadata> classpath;
+    private List<ArtifactMetadata> classpath;
 
     private ArtifactScopeEnum scope;
 

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java Sat Jun 26 23:16:18 2010
@@ -1,11 +1,29 @@
 package org.apache.maven.repository.metadata;
 
-import org.apache.maven.artifact.ArtifactScopeEnum;
+/*
+ * 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.ArtifactScopeEnum;
 
 /**
  * Helper class to conver an Md Graph into some form of a classpath
- * 
+ *
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
  */
@@ -16,15 +34,13 @@ public interface ClasspathTransformation
     /**
      * Transform Graph into a Collection of metadata objects that
      * could serve as a classpath for a particular scope
-     * 
+     *
      * @param dirtyGraph - dependency graph
      * @param scope - which classpath to extract
      * @param resolve - whether to resolve artifacts.
-     * @return Collection of metadata objects in the linked subgraph of the graph which 
+     * @return Collection of metadata objects in the linked subgraph of the graph which
      *             contains the graph.getEntry() vertice
      */
-    ClasspathContainer transform( MetadataGraph dirtyGraph,
-                                  ArtifactScopeEnum scope,
-                                  boolean resolve)
-    throws MetadataGraphTransformationException;
+    ClasspathContainer transform( MetadataGraph dirtyGraph, ArtifactScopeEnum scope, boolean resolve )
+        throws MetadataGraphTransformationException;
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java Sat Jun 26 23:16:18 2010
@@ -34,9 +34,9 @@ import org.codehaus.plexus.component.ann
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
  */
-@Component(role=ClasspathTransformation.class)
+@Component( role = ClasspathTransformation.class )
 public class DefaultClasspathTransformation
-implements ClasspathTransformation
+    implements ClasspathTransformation
 {
     @Requirement
     GraphConflictResolver conflictResolver;
@@ -136,7 +136,7 @@ implements ClasspathTransformation
 //                        }
 //                    );
 
-            List<MetadataGraphEdge> exits = graph.getExcidentEdges(node);
+            List<MetadataGraphEdge> exits = graph.getExcidentEdges( node );
 
             if ( exits != null && exits.size() > 0 )
             {

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java Sat Jun 26 23:16:18 2010
@@ -29,20 +29,20 @@ import org.codehaus.plexus.component.ann
  *
  * @version $Id$
  */
-@Component(role=GraphConflictResolutionPolicy.class)
+@Component( role = GraphConflictResolutionPolicy.class )
 public class DefaultGraphConflictResolutionPolicy
-implements GraphConflictResolutionPolicy
+    implements GraphConflictResolutionPolicy
 {
     /**
      * artifact, closer to the entry point, is selected
      */
-    @Configuration(name="closer-first", value="true")
+    @Configuration( name = "closer-first", value = "true" )
     private boolean closerFirst = true;
 
     /**
      * newer artifact is selected
      */
-    @Configuration(name="newer-first", value="true")
+    @Configuration( name = "newer-first", value = "true" )
     private boolean newerFirst = true;
 
     public MetadataGraphEdge apply( MetadataGraphEdge e1, MetadataGraphEdge e2 )

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -29,18 +29,18 @@ import org.codehaus.plexus.component.ann
 
 /**
  * Default conflict resolver.Implements closer newer first policy by default, but could be configured via plexus
- * 
+ *
  * @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
  * @version $Id$
  */
-@Component(role=GraphConflictResolver.class)
+@Component( role = GraphConflictResolver.class )
 public class DefaultGraphConflictResolver
     implements GraphConflictResolver
 {
     /**
      * artifact, closer to the entry point, is selected
      */
-    @Requirement(role=GraphConflictResolutionPolicy.class)     
+    @Requirement( role = GraphConflictResolutionPolicy.class )
     protected GraphConflictResolutionPolicy policy;
 
     // -------------------------------------------------------------------------------------
@@ -49,20 +49,30 @@ public class DefaultGraphConflictResolve
         throws GraphConflictResolutionException
     {
         if ( policy == null )
+        {
             throw new GraphConflictResolutionException( "no GraphConflictResolutionPolicy injected" );
+        }
 
         if ( graph == null )
+        {
             return null;
+        }
 
         final MetadataGraphVertex entry = graph.getEntry();
         if ( entry == null )
+        {
             return null;
+        }
 
         if ( graph.isEmpty() )
+        {
             throw new GraphConflictResolutionException( "graph with an entry, but not vertices do not exist" );
+        }
 
         if ( graph.isEmptyEdges() )
+        {
             return null; // no edges - nothing to worry about
+        }
 
         final TreeSet<MetadataGraphVertex> vertices = graph.getVertices();
 
@@ -70,7 +80,9 @@ public class DefaultGraphConflictResolve
         {
             // edge case - single vertex graph
             if ( vertices.size() == 1 )
+            {
                 return new MetadataGraph( entry );
+            }
 
             final ArtifactScopeEnum requestedScope = ArtifactScopeEnum.checkScope( scope );
 
@@ -138,7 +150,9 @@ public class DefaultGraphConflictResolve
     private MetadataGraph findLinkedSubgraph( MetadataGraph g )
     {
         if ( g.getVertices().size() == 1 )
+        {
             return g;
+        }
 
         List<MetadataGraphVertex> visited = new ArrayList<MetadataGraphVertex>( g.getVertices().size() );
         visit( g.getEntry(), visited, g );
@@ -149,11 +163,15 @@ public class DefaultGraphConflictResolve
         for ( MetadataGraphVertex v : g.getVertices() )
         {
             if ( !visited.contains( v ) )
+            {
                 dropList.add( v );
+            }
         }
 
         if ( dropList.size() < 1 )
+        {
             return g;
+        }
 
         // now - drop vertices
         TreeSet<MetadataGraphVertex> vertices = g.getVertices();
@@ -169,7 +187,9 @@ public class DefaultGraphConflictResolve
     private void visit( MetadataGraphVertex from, List<MetadataGraphVertex> visited, MetadataGraph graph )
     {
         if ( visited.contains( from ) )
+        {
             return;
+        }
 
         visited.add( from );
 
@@ -185,16 +205,21 @@ public class DefaultGraphConflictResolve
     }
 
     // -------------------------------------------------------------------------------------
-    private MetadataGraphEdge cleanEdges( MetadataGraphVertex v, List<MetadataGraphEdge> edges, ArtifactScopeEnum scope )
+    private MetadataGraphEdge cleanEdges( MetadataGraphVertex v, List<MetadataGraphEdge> edges,
+                                          ArtifactScopeEnum scope )
     {
         if ( edges == null || edges.isEmpty() )
+        {
             return null;
+        }
 
         if ( edges.size() == 1 )
         {
             MetadataGraphEdge e = edges.get( 0 );
             if ( scope.encloses( e.getScope() ) )
+            {
                 return e;
+            }
 
             return null;
         }
@@ -204,12 +229,18 @@ public class DefaultGraphConflictResolve
         for ( MetadataGraphEdge e : edges )
         {
             if ( !scope.encloses( e.getScope() ) )
+            {
                 continue;
+            }
 
             if ( res == null )
+            {
                 res = e;
+            }
             else
+            {
                 res = policy.apply( e, res );
+            }
         }
 
         return res;

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java Sat Jun 26 23:16:18 2010
@@ -1,34 +1,52 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.
+ */
+
 /**
- * 
+ *
  * @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
- * 
+ *
  * @version $Id$
  */
-
 public class GraphConflictResolutionException
-extends Exception
+    extends Exception
 {
-	private static final long serialVersionUID = 2677613140287940255L;
+    private static final long serialVersionUID = 2677613140287940255L;
 
-	public GraphConflictResolutionException()
-	{
-	}
-
-	public GraphConflictResolutionException(String message)
-	{
-		super(message);
-	}
-
-	public GraphConflictResolutionException(Throwable cause)
-	{
-		super(cause);
-	}
-
-	public GraphConflictResolutionException(String message, Throwable cause)
-	{
-		super(message, cause);
-	}
+    public GraphConflictResolutionException()
+    {
+    }
+
+    public GraphConflictResolutionException( String message )
+    {
+        super( message );
+    }
+
+    public GraphConflictResolutionException( Throwable cause )
+    {
+        super( cause );
+    }
+
+    public GraphConflictResolutionException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
 
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java Sat Jun 26 23:16:18 2010
@@ -1,21 +1,36 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.
+ */
 
 /**
- *  MetadataGraph edge selection policy. Complements 
+ *  MetadataGraph edge selection policy. Complements
  *  GraphConflictResolver by being injected into it
- * 
+ *
  * @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
- * 
+ *
  * @version $Id$
  */
 
 public interface GraphConflictResolutionPolicy
 {
-    static String ROLE = GraphConflictResolutionPolicy.class.getName();
+    String ROLE = GraphConflictResolutionPolicy.class.getName();
 
-    public MetadataGraphEdge apply( 
-			  MetadataGraphEdge e1
-			, MetadataGraphEdge e2
-			);
+    MetadataGraphEdge apply( MetadataGraphEdge e1, MetadataGraphEdge e2 );
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java Sat Jun 26 23:16:18 2010
@@ -22,7 +22,7 @@ package org.apache.maven.repository.meta
 import org.apache.maven.artifact.ArtifactScopeEnum;
 
 /**
- * Resolves conflicts in the supplied dependency graph. 
+ * Resolves conflicts in the supplied dependency graph.
  * Different implementations will implement different conflict resolution policies.
  *
  * @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
@@ -30,20 +30,20 @@ import org.apache.maven.artifact.Artifac
  */
 public interface GraphConflictResolver
 {
-    static String ROLE = GraphConflictResolver.class.getName();
+    String ROLE = GraphConflictResolver.class.getName();
 
     /**
      * Cleanses the supplied graph by leaving only one directed versioned edge\
-     * between any two nodes, if multiple exists. Uses scope relationships, defined 
+     * between any two nodes, if multiple exists. Uses scope relationships, defined
      * in <code>ArtifactScopeEnum</code>
      *
      * @param graph the "dirty" graph to be simplified via conflict resolution
      * @param scope scope for which the graph should be resolved
-     * 
+     *
      * @return resulting "clean" graph for the specified scope
-     * 
+     *
      * @since 3.0
      */
     MetadataGraph resolveConflicts( MetadataGraph graph, ArtifactScopeEnum scope )
-    throws GraphConflictResolutionException;
+        throws GraphConflictResolutionException;
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java Sat Jun 26 23:16:18 2010
@@ -33,7 +33,6 @@ import org.apache.maven.artifact.Artifac
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
  */
-
 public class MetadataGraph
 {
     public static final int DEFAULT_VERTICES = 32;
@@ -79,7 +78,7 @@ public class MetadataGraph
      * construct a single vertex
      */
     public MetadataGraph( MetadataGraphVertex entry )
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         checkVertex( entry );
         checkVertices( 1 );
@@ -95,7 +94,7 @@ public class MetadataGraph
      * construct graph from a "dirty" tree
      */
     public MetadataGraph( MetadataTreeNode tree )
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         this( tree, false, false );
     }
@@ -109,7 +108,7 @@ public class MetadataGraph
      *
      */
     public MetadataGraph( MetadataTreeNode tree, boolean versionedVertices, boolean scopedVertices )
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         if ( tree == null )
         {
@@ -129,12 +128,8 @@ public class MetadataGraph
         processTreeNodes( null, tree, 0, 0 );
     }
     //------------------------------------------------------------------------
-    private void processTreeNodes(   MetadataGraphVertex parentVertex
-                               , MetadataTreeNode node
-                               , int depth
-                               , int pomOrder
-                            )
-    throws MetadataResolutionException
+    private void processTreeNodes( MetadataGraphVertex parentVertex, MetadataTreeNode node, int depth, int pomOrder )
+        throws MetadataResolutionException
     {
         if ( node == null )
         {
@@ -150,7 +145,8 @@ public class MetadataGraph
         if ( parentVertex != null ) // then create the edge
         {
             ArtifactMetadata md = node.getMd();
-            MetadataGraphEdge e = new MetadataGraphEdge( md.version, md.resolved, md.artifactScope, md.artifactUri, depth, pomOrder );
+            MetadataGraphEdge e =
+                new MetadataGraphEdge( md.version, md.resolved, md.artifactScope, md.artifactUri, depth, pomOrder );
             addEdge( parentVertex, vertex, e );
         }
         else
@@ -275,7 +271,7 @@ public class MetadataGraph
     }
     //------------------------------------------------------------------------
     private static void checkVertex( MetadataGraphVertex v )
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         if ( v == null )
         {
@@ -288,7 +284,7 @@ public class MetadataGraph
     }
     //------------------------------------------------------------------------
     private static void checkEdge( MetadataGraphEdge e )
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         if ( e == null )
         {
@@ -318,7 +314,7 @@ public class MetadataGraph
     }
     //------------------------------------------------------------------------
     public MetadataGraph addEdge( MetadataGraphVertex vFrom, MetadataGraphVertex vTo, MetadataGraphEdge e )
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         checkVertex( vFrom );
         checkVertex( vTo );

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java Sat Jun 26 23:16:18 2010
@@ -1,12 +1,30 @@
 package org.apache.maven.repository.metadata;
 
-import org.apache.maven.artifact.ArtifactScopeEnum;
+/*
+ * 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.ArtifactScopeEnum;
 
 /**
- * metadata graph edge - combination of version, scope and depth define 
+ * metadata graph edge - combination of version, scope and depth define
  * an edge in the graph
- * 
+ *
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
  */
@@ -19,24 +37,19 @@ public class MetadataGraphEdge
     int               pomOrder = -1;
     boolean           resolved = true;
     String            artifactUri;
-    
+
     /**
      * capturing where this link came from
      * and where it is linked to.
-     * 
+     *
      *   In the first implementation only source used for explanatory function
      */
     MetadataGraphVertex  source;
     MetadataGraphVertex  target;
 
     //----------------------------------------------------------------------------
-    public MetadataGraphEdge( String version
-    						, boolean resolved
-                            , ArtifactScopeEnum scope
-                            , String artifactUri
-                            , int depth
-                            , int pomOrder
-                            )
+    public MetadataGraphEdge( String version, boolean resolved, ArtifactScopeEnum scope, String artifactUri, int depth,
+                              int pomOrder )
     {
         super();
         this.version = version;
@@ -50,16 +63,13 @@ public class MetadataGraphEdge
     /**
      * helper for equals
      */
-    private static boolean objectsEqual( Object o1,
-                                         Object o2 )
+    private static boolean objectsEqual( Object o1, Object o2 )
     {
         if ( o1 == null && o2 == null )
         {
             return true;
         }
-        if ( ( o1 == null && o2 != null )
-            || ( o1 != null && o2 == null )
-            )
+        if ( ( o1 == null && o2 != null ) || ( o1 != null && o2 == null ) )
         {
             return false;
         }
@@ -76,14 +86,10 @@ public class MetadataGraphEdge
         if ( o instanceof MetadataGraphEdge )
         {
             MetadataGraphEdge e = (MetadataGraphEdge) o;
-            
-            return
-                objectsEqual( version, e.version )
-                && ArtifactScopeEnum.checkScope(scope).getScope().equals( 
-                		ArtifactScopeEnum.checkScope(e.scope).getScope()
-                														)
-                && depth == e.depth
-                ;
+
+            return objectsEqual( version, e.version )
+                && ArtifactScopeEnum.checkScope( scope ).getScope().equals( ArtifactScopeEnum.checkScope( e.scope ).getScope() )
+                && depth == e.depth;
         }
         return false;
     }
@@ -124,57 +130,60 @@ public class MetadataGraphEdge
 		return resolved;
 	}
 
-	public void setResolved(boolean resolved)
-	{
-		this.resolved = resolved;
-	}
+    public void setResolved( boolean resolved )
+    {
+        this.resolved = resolved;
+    }
 
-	public int getPomOrder()
-	{
-		return pomOrder;
-	}
+    public int getPomOrder()
+    {
+        return pomOrder;
+    }
 
-	public void setPomOrder(int pomOrder)
-	{
-		this.pomOrder = pomOrder;
-	}
+    public void setPomOrder( int pomOrder )
+    {
+        this.pomOrder = pomOrder;
+    }
+
+    public String getArtifactUri()
+    {
+        return artifactUri;
+    }
+
+    public void setArtifactUri( String artifactUri )
+    {
+        this.artifactUri = artifactUri;
+    }
+
+    public MetadataGraphVertex getSource()
+    {
+        return source;
+    }
+
+    public void setSource( MetadataGraphVertex source )
+    {
+        this.source = source;
+    }
+
+    public MetadataGraphVertex getTarget()
+    {
+        return target;
+    }
+
+    public void setTarget( MetadataGraphVertex target )
+    {
+        this.target = target;
+    }
 
-	public String getArtifactUri()
-	{
-		return artifactUri;
-	}
-	public void setArtifactUri(String artifactUri)
-	{
-		this.artifactUri = artifactUri;
-	}
-	
-	public MetadataGraphVertex getSource()
-	{
-		return source;
-	}
-	public void setSource(MetadataGraphVertex source)
-	{
-		this.source = source;
-	}
-	public MetadataGraphVertex getTarget()
-	{
-		return target;
-	}
-	public void setTarget(MetadataGraphVertex target)
-	{
-		this.target = target;
-	}
 	@Override
-	public String toString()
-	{
-		return "[ " 
-				+ "FROM:("+( source==null?"no source":(source.md==null?"no source MD":source.md.toString()) )+") "
-				+ "TO:("+( target==null?"no target":(target.md==null?"no target MD":target.md.toString()) )+") "
-					+"version="+version
-					+", scope="+(scope == null ? "null" : scope.getScope())
-					+", depth="+depth+"]"
-				;
-	}
+    public String toString()
+    {
+        return "[ " + "FROM:("
+            + ( source == null ? "no source" : ( source.md == null ? "no source MD" : source.md.toString() ) ) + ") "
+            + "TO:(" + ( target == null ? "no target" : ( target.md == null ? "no target MD" : target.md.toString() ) )
+            + ") " + "version=" + version + ", scope=" + ( scope == null ? "null" : scope.getScope() ) + ", depth="
+            + depth + "]";
+    }
     //----------------------------------------------------------------------------
     //----------------------------------------------------------------------------
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java Sat Jun 26 23:16:18 2010
@@ -1,5 +1,24 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.
+ */
+
 /**
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
@@ -9,23 +28,23 @@ public class MetadataGraphTransformation
 {
 	private static final long serialVersionUID = -4029897098314019152L;
 
-	public MetadataGraphTransformationException()
-	{
-	}
-
-	public MetadataGraphTransformationException(String message)
-	{
-		super(message);
-	}
-
-	public MetadataGraphTransformationException(Throwable cause)
-	{
-		super(cause);
-	}
-
-	public MetadataGraphTransformationException(String message, Throwable cause)
-	{
-		super(message, cause);
-	}
+    public MetadataGraphTransformationException()
+    {
+    }
+
+    public MetadataGraphTransformationException( String message )
+    {
+        super( message );
+    }
+
+    public MetadataGraphTransformationException( Throwable cause )
+    {
+        super( cause );
+    }
+
+    public MetadataGraphTransformationException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
 
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java Sat Jun 26 23:16:18 2010
@@ -1,13 +1,32 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.util.Collection;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
 /**
- * 
+ *
  * @author Jason van Zyl
- *  
+ *
  */
 public class MetadataResolution
 {
@@ -22,33 +41,31 @@ public class MetadataResolution
         this.artifactMetadata = artifactMetadata;
     }
     //-------------------------------------------------------------------
-    public MetadataResolution( ArtifactMetadata artifactMetadata,
-    		Collection<ArtifactRepository> metadataRepositories )
+    public MetadataResolution( ArtifactMetadata artifactMetadata, Collection<ArtifactRepository> metadataRepositories )
     {
-    	this( artifactMetadata );
+        this( artifactMetadata );
         this.metadataRepositories = metadataRepositories;
     }
     //-------------------------------------------------------------------
-	public Collection<ArtifactRepository> getMetadataRepositories()
-	{
-		return metadataRepositories;
-	}
-
-	public void setMetadataRepositories(
-			Collection<ArtifactRepository> metadataRepositories)
-	{
-		this.metadataRepositories = metadataRepositories;
-	}
-    //-------------------------------------------------------------------
-	public ArtifactMetadata getArtifactMetadata()
-	{
-		return artifactMetadata;
-	}
-
-	public void setArtifactMetadata(ArtifactMetadata artifactMetadata)
-	{
-		this.artifactMetadata = artifactMetadata;
-	}
+    public Collection<ArtifactRepository> getMetadataRepositories()
+    {
+        return metadataRepositories;
+    }
+
+    public void setMetadataRepositories( Collection<ArtifactRepository> metadataRepositories )
+    {
+        this.metadataRepositories = metadataRepositories;
+    }
+    //-------------------------------------------------------------------
+    public ArtifactMetadata getArtifactMetadata()
+    {
+        return artifactMetadata;
+    }
+
+    public void setArtifactMetadata(ArtifactMetadata artifactMetadata)
+    {
+        this.artifactMetadata = artifactMetadata;
+    }
     //-------------------------------------------------------------------
     //-------------------------------------------------------------------
 }

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java Sat Jun 26 23:16:18 2010
@@ -1,5 +1,24 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.
+ */
+
 public class MetadataResolutionException
     extends Exception
 {
@@ -21,8 +40,7 @@ public class MetadataResolutionException
         // TODO Auto-generated constructor stub
     }
 
-    public MetadataResolutionException( String message,
-                                        Throwable cause )
+    public MetadataResolutionException( String message, Throwable cause )
     {
         super( message, cause );
         // TODO Auto-generated constructor stub

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java Sat Jun 26 23:16:18 2010
@@ -1,10 +1,28 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.util.List;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
-
 /** @author Oleg Gusakov */
 public class MetadataResolutionRequest
 {
@@ -18,8 +36,7 @@ public class MetadataResolutionRequest
     }
 
     //--------------------------------------------------------------------
-    public MetadataResolutionRequest( ArtifactMetadata query,
-                                      ArtifactRepository localRepository,
+    public MetadataResolutionRequest( ArtifactMetadata query, ArtifactRepository localRepository,
                                       List<ArtifactRepository> remoteRepositories )
     {
         this.query = query;

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java Sat Jun 26 23:16:18 2010
@@ -1,5 +1,24 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.
+ */
+
 public enum MetadataResolutionRequestTypeEnum
 {
       tree( 1 )

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java Sat Jun 26 23:16:18 2010
@@ -61,20 +61,20 @@ public class MetadataResolutionResult
     }
 
     public void initTreeProcessing( PlexusContainer plexus )
-    throws ComponentLookupException
+        throws ComponentLookupException
     {
         classpathTransformation = (ClasspathTransformation) plexus.lookup( ClasspathTransformation.class );
         conflictResolver = (GraphConflictResolver) plexus.lookup( GraphConflictResolver.class );
     }
     //----------------------------------------------------------------------------
     public MetadataGraph getGraph()
-    throws MetadataResolutionException
+        throws MetadataResolutionException
     {
         return treeRoot == null ? null : new MetadataGraph( treeRoot );
     }
     //----------------------------------------------------------------------------
     public MetadataGraph getGraph( ArtifactScopeEnum scope )
-    throws MetadataResolutionException, GraphConflictResolutionException
+        throws MetadataResolutionException, GraphConflictResolutionException
     {
         if ( treeRoot == null )
         {
@@ -90,7 +90,7 @@ public class MetadataResolutionResult
     }
     //----------------------------------------------------------------------------
     public MetadataGraph getGraph( MetadataResolutionRequestTypeEnum requestType )
-    throws MetadataResolutionException, GraphConflictResolutionException
+        throws MetadataResolutionException, GraphConflictResolutionException
     {
         if ( requestType == null )
         {
@@ -139,7 +139,7 @@ public class MetadataResolutionResult
     }
     //----------------------------------------------------------------------------
     public ClasspathContainer getClasspath( ArtifactScopeEnum scope )
-    throws MetadataGraphTransformationException, MetadataResolutionException
+        throws MetadataGraphTransformationException, MetadataResolutionException
     {
         if ( classpathTransformation == null )
         {
@@ -157,7 +157,7 @@ public class MetadataResolutionResult
 
     //----------------------------------------------------------------------------
     public MetadataTreeNode getClasspathTree( ArtifactScopeEnum scope )
-    throws MetadataGraphTransformationException, MetadataResolutionException
+        throws MetadataGraphTransformationException, MetadataResolutionException
     {
         ClasspathContainer cpc = getClasspath( scope );
         if ( cpc == null )

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java Sat Jun 26 23:16:18 2010
@@ -41,15 +41,12 @@ public class MetadataRetrievalException
         this( null, cause, null );
     }
 
-    public MetadataRetrievalException( String message,
-                                       Throwable cause )
+    public MetadataRetrievalException( String message, Throwable cause )
     {
         this( message, cause, null );
     }
 
-    public MetadataRetrievalException( String message,
-                                       Throwable cause,
-                                       ArtifactMetadata artifact )
+    public MetadataRetrievalException( String message, Throwable cause, ArtifactMetadata artifact )
     {
         super( message, cause );
 

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java Sat Jun 26 23:16:18 2010
@@ -34,6 +34,7 @@ public interface MetadataSource
 {
     String ROLE = MetadataSource.class.getName();
 
-    MetadataResolution retrieve( ArtifactMetadata artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+    MetadataResolution retrieve( ArtifactMetadata artifact, ArtifactRepository localRepository,
+                                 List<ArtifactRepository> remoteRepositories )
         throws MetadataRetrievalException;
 }
\ No newline at end of file

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java Sat Jun 26 23:16:18 2010
@@ -1,14 +1,33 @@
 package org.apache.maven.repository.metadata;
 
+/*
+ * 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.Artifact;
 import org.apache.maven.artifact.ArtifactScopeEnum;
+
 /**
  * metadata [dirty] Tree
- * 
+ *
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  *
  */
-
 public class MetadataTreeNode
 {
     ArtifactMetadata md; // this node
@@ -21,44 +40,38 @@ public class MetadataTreeNode
     MetadataTreeNode[] children; // of cause
 
     public int getNChildren()
-	{
-		return nChildren;
-	}
-
-	public void setNChildren(int children)
-	{
-		nChildren = children;
-	}
+    {
+        return nChildren;
+    }
+
+    public void setNChildren( int children )
+    {
+        nChildren = children;
+    }
 
-	//------------------------------------------------------------------------
+    //------------------------------------------------------------------------
     public MetadataTreeNode()
     {
     }
     //------------------------------------------------------------------------
-    public MetadataTreeNode( ArtifactMetadata md,
-                             MetadataTreeNode parent,
-                             boolean resolved,
-                             ArtifactScopeEnum scope )
+    public MetadataTreeNode( ArtifactMetadata md, MetadataTreeNode parent, boolean resolved, ArtifactScopeEnum scope )
     {
         if ( md != null )
         {
-            md.setArtifactScope( ArtifactScopeEnum.checkScope(scope) );
-            md.setResolved(resolved);
+            md.setArtifactScope( ArtifactScopeEnum.checkScope( scope ) );
+            md.setResolved( resolved );
         }
 
         this.md = md;
         this.parent = parent;
     }
     //------------------------------------------------------------------------
-    public MetadataTreeNode( Artifact af,
-                             MetadataTreeNode parent,
-                             boolean resolved,
-                             ArtifactScopeEnum scope
-                           )
+    public MetadataTreeNode( Artifact af, MetadataTreeNode parent, boolean resolved, ArtifactScopeEnum scope )
     {
         this( new ArtifactMetadata( af ), parent, resolved, scope );
     }
-    //------------------------------------------------------------------------
+
+    // ------------------------------------------------------------------------
     public void addChild( int index, MetadataTreeNode kid )
     {
         if ( kid == null )
@@ -66,17 +79,21 @@ public class MetadataTreeNode
             return;
         }
 
-        if( children == null )
-        	children = new MetadataTreeNode[nChildren];
-        
+        if ( children == null )
+        {
+            children = new MetadataTreeNode[nChildren];
+        }
+
         children[index % nChildren] = kid;
     }
+
     //------------------------------------------------------------------
     @Override
     public String toString()
     {
         return md == null ? "no metadata" : md.toString();
     }
+
     //------------------------------------------------------------------
     public String graphHash()
         throws MetadataResolutionException
@@ -84,8 +101,7 @@ public class MetadataTreeNode
         if ( md == null )
         {
             throw new MetadataResolutionException( "treenode without metadata, parent: "
-                + ( parent == null ? "null" : parent.toString() )
-            );
+                + ( parent == null ? "null" : parent.toString() ) );
         }
 
         return md.groupId + ":" + md.artifactId;