maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject [1/50] git commit: o Accounted for API refactoring
Date Mon, 18 Mar 2013 21:47:29 GMT
o Accounted for API refactoring


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/18b81002
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/18b81002
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/18b81002

Branch: refs/heads/master
Commit: 18b81002cd9df995bd47719f6cda3a1a9cd6daea
Parents: 82b345e
Author: Benjamin Bentmann <bentmann@apache.org>
Authored: Fri Dec 30 22:16:02 2011 +0100
Committer: Benjamin Bentmann <bentmann@apache.org>
Committed: Fri Dec 30 22:16:02 2011 +0100

----------------------------------------------------------------------
 .../internal/DefaultArtifactDescriptorReader.java  |    3 +--
 .../internal/DefaultVersionRangeResolver.java      |    3 +--
 .../internal/DefaultVersionResolver.java           |    3 +--
 .../artifact/deployer/DefaultArtifactDeployer.java |    4 ++--
 .../installer/DefaultArtifactInstaller.java        |    4 ++--
 .../DefaultPluginDependenciesResolver.java         |    7 +++----
 .../internal/DefaultPluginPrefixResolver.java      |    3 +--
 .../internal/DefaultPluginVersionResolver.java     |    3 +--
 .../maven/project/DefaultProjectBuilder.java       |    3 +--
 .../DefaultProjectDependenciesResolver.java        |    5 ++---
 10 files changed, 15 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 21daabf..f6d6a45 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -80,7 +80,6 @@ import org.eclipse.aether.spi.log.Logger;
 import org.eclipse.aether.spi.log.LoggerFactory;
 import org.eclipse.aether.spi.log.NullLoggerFactory;
 import org.eclipse.aether.transfer.ArtifactNotFoundException;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.artifact.DefaultArtifact;
 import org.eclipse.aether.util.artifact.DefaultArtifactType;
 import org.eclipse.aether.util.listener.DefaultRepositoryEvent;
@@ -269,7 +268,7 @@ public class DefaultArtifactDescriptorReader
                            ArtifactDescriptorResult result )
         throws ArtifactDescriptorException
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( request.getTrace(), request );
+        RequestTrace trace = RequestTrace.newChild( request.getTrace(), request );
 
         Set<String> visited = new LinkedHashSet<String>();
         for ( Artifact artifact = request.getArtifact();; )

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 1362557..6fbe2e4 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -56,7 +56,6 @@ import org.eclipse.aether.spi.locator.ServiceLocator;
 import org.eclipse.aether.spi.log.Logger;
 import org.eclipse.aether.spi.log.LoggerFactory;
 import org.eclipse.aether.spi.log.NullLoggerFactory;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.listener.DefaultRepositoryEvent;
 import org.eclipse.aether.util.metadata.DefaultMetadata;
 import org.eclipse.aether.util.version.GenericVersionScheme;
@@ -210,7 +209,7 @@ public class DefaultVersionRangeResolver
     private Map<String, ArtifactRepository> getVersions( RepositorySystemSession session,
VersionRangeResult result,
                                                          VersionRangeRequest request )
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( request.getTrace(), request );
+        RequestTrace trace = RequestTrace.newChild( request.getTrace(), request );
 
         Map<String, ArtifactRepository> versionIndex = new HashMap<String, ArtifactRepository>();
 

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 1e0e353..f8a5e30 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -67,7 +67,6 @@ import org.eclipse.aether.spi.log.Logger;
 import org.eclipse.aether.spi.log.LoggerFactory;
 import org.eclipse.aether.spi.log.NullLoggerFactory;
 import org.eclipse.aether.util.ConfigUtils;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.listener.DefaultRepositoryEvent;
 import org.eclipse.aether.util.metadata.DefaultMetadata;
 
@@ -169,7 +168,7 @@ public class DefaultVersionResolver
     public VersionResult resolveVersion( RepositorySystemSession session, VersionRequest
request )
         throws VersionResolutionException
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( request.getTrace(), request );
+        RequestTrace trace = RequestTrace.newChild( request.getTrace(), request );
 
         Artifact artifact = request.getArtifact();
 

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 3f3478d..5905e08 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -39,12 +39,12 @@ import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.RequestTrace;
 import org.eclipse.aether.deployment.DeployRequest;
 import org.eclipse.aether.deployment.DeployResult;
 import org.eclipse.aether.deployment.DeploymentException;
 import org.eclipse.aether.metadata.MergeableMetadata;
 import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.artifact.SubArtifact;
 
 @Component( role = ArtifactDeployer.class, instantiationStrategy = "per-lookup" )
@@ -84,7 +84,7 @@ public class DefaultArtifactDeployer
 
         DeployRequest request = new DeployRequest();
 
-        request.setTrace( DefaultRequestTrace.newChild( null, legacySupport.getSession().getCurrentProject()
) );
+        request.setTrace( RequestTrace.newChild( null, legacySupport.getSession().getCurrentProject()
) );
 
         org.eclipse.aether.artifact.Artifact mainArtifact = RepositoryUtils.toArtifact( artifact
);
         mainArtifact = mainArtifact.setFile( source );

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
index cf31d2c..aa924e8 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
@@ -38,9 +38,9 @@ import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.RequestTrace;
 import org.eclipse.aether.installation.InstallRequest;
 import org.eclipse.aether.installation.InstallationException;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.artifact.SubArtifact;
 
 /**
@@ -77,7 +77,7 @@ public class DefaultArtifactInstaller
 
         InstallRequest request = new InstallRequest();
 
-        request.setTrace( DefaultRequestTrace.newChild( null, legacySupport.getSession().getCurrentProject()
) );
+        request.setTrace( RequestTrace.newChild( null, legacySupport.getSession().getCurrentProject()
) );
 
         org.eclipse.aether.artifact.Artifact mainArtifact = RepositoryUtils.toArtifact( artifact
);
         mainArtifact = mainArtifact.setFile( source );

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index c90634a..e14f838 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -51,7 +51,6 @@ import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
 import org.eclipse.aether.util.DefaultRepositorySystemSession;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.artifact.DefaultArtifact;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.filter.AndDependencyFilter;
@@ -93,7 +92,7 @@ public class DefaultPluginDependenciesResolver
     public Artifact resolve( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession
session )
         throws PluginResolutionException
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( null, plugin );
+        RequestTrace trace = RequestTrace.newChild( null, plugin );
 
         Artifact pluginArtifact = toArtifact( plugin, session );
 
@@ -140,7 +139,7 @@ public class DefaultPluginDependenciesResolver
                                    List<RemoteRepository> repositories, RepositorySystemSession
session )
         throws PluginResolutionException
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( null, plugin );
+        RequestTrace trace = RequestTrace.newChild( null, plugin );
 
         if ( pluginArtifact == null )
         {
@@ -187,7 +186,7 @@ public class DefaultPluginDependenciesResolver
             DependencyRequest depRequest = new DependencyRequest( request, resolutionFilter
);
             depRequest.setTrace( trace );
 
-            request.setTrace( DefaultRequestTrace.newChild( trace, depRequest ) );
+            request.setTrace( RequestTrace.newChild( trace, depRequest ) );
 
             node = repoSystem.collectDependencies( pluginSession, request ).getRoot();
 

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
index 7790265..a5533f2 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
@@ -49,7 +49,6 @@ import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.resolution.MetadataRequest;
 import org.eclipse.aether.resolution.MetadataResult;
 import org.eclipse.aether.util.DefaultRepositorySystemSession;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.listener.DefaultRepositoryEvent;
 import org.eclipse.aether.util.metadata.DefaultMetadata;
 
@@ -163,7 +162,7 @@ public class DefaultPluginPrefixResolver
 
     private PluginPrefixResult resolveFromRepository( PluginPrefixRequest request )
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( null, request );
+        RequestTrace trace = RequestTrace.newChild( null, request );
 
         List<MetadataRequest> requests = new ArrayList<MetadataRequest>();
 

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index 3e8c2b8..290e8e7 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -52,7 +52,6 @@ import org.eclipse.aether.repository.ArtifactRepository;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.resolution.MetadataRequest;
 import org.eclipse.aether.resolution.MetadataResult;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.listener.DefaultRepositoryEvent;
 import org.eclipse.aether.util.metadata.DefaultMetadata;
 import org.eclipse.aether.util.version.GenericVersionScheme;
@@ -114,7 +113,7 @@ public class DefaultPluginVersionResolver
     private PluginVersionResult resolveFromRepository( PluginVersionRequest request )
         throws PluginVersionResolutionException
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( null, request );
+        RequestTrace trace = RequestTrace.newChild( null, request );
 
         DefaultPluginVersionResult result = new DefaultPluginVersionResult();
 

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 8c206bf..07bf354 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -59,7 +59,6 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.util.DefaultRequestTrace;
 
 /**
  */
@@ -241,7 +240,7 @@ public class DefaultProjectBuilder
 
         ModelBuildingRequest request = new DefaultModelBuildingRequest();
 
-        RequestTrace trace = DefaultRequestTrace.newChild( null, configuration ).newChild(
request );
+        RequestTrace trace = RequestTrace.newChild( null, configuration ).newChild( request
);
 
         ModelResolver resolver =
             new ProjectModelResolver( config.session, trace, repoSystem, repositoryManager,
config.repositories,

http://git-wip-us.apache.org/repos/asf/maven/blob/18b81002/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 22a8ff7..47f510b 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -47,7 +47,6 @@ import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.graph.DependencyVisitor;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.resolution.DependencyRequest;
-import org.eclipse.aether.util.DefaultRequestTrace;
 import org.eclipse.aether.util.artifact.ArtifactIdUtils;
 import org.eclipse.aether.util.artifact.JavaScopes;
 
@@ -68,7 +67,7 @@ public class DefaultProjectDependenciesResolver
     public DependencyResolutionResult resolve( DependencyResolutionRequest request )
         throws DependencyResolutionException
     {
-        RequestTrace trace = DefaultRequestTrace.newChild( null, request );
+        RequestTrace trace = RequestTrace.newChild( null, request );
 
         DefaultDependencyResolutionResult result = new DefaultDependencyResolutionResult();
 
@@ -146,7 +145,7 @@ public class DefaultProjectDependenciesResolver
         DependencyNode node;
         try
         {
-            collect.setTrace( DefaultRequestTrace.newChild( trace, depRequest ) );
+            collect.setTrace( RequestTrace.newChild( trace, depRequest ) );
             node = repoSystem.collectDependencies( session, collect ).getRoot();
             result.setDependencyGraph( node );
         }


Mime
View raw message