From 00d581599b07b10fa4a7d70d78ba286db493e82b Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Sat, 23 Apr 2005 15:02:01 +0000 Subject: [PATCH] move MavenMetadataSource to maven-project from maven-core git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164391 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/artifact/ant/AbstractArtifactTask.java | 2 +- .../java/org/apache/maven/artifact/ant/DependenciesTask.java | 2 +- .../main/java/org/apache/maven/artifact/ant/DeployTask.java | 4 ++-- .../main/java/org/apache/maven/artifact/ant/InstallTask.java | 4 ++-- .../java/org/apache/maven/plugin/DefaultPluginManager.java | 2 +- .../apache/maven/project}/artifact/MavenMetadataSource.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename {maven-core/src/main/java/org/apache/maven => maven-project/src/main/java/org/apache/maven/project}/artifact/MavenMetadataSource.java (98%) diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java index b125f662b8..d68bcac07c 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java @@ -46,7 +46,7 @@ public abstract class AbstractArtifactTask { ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, repository.getLayout() ); - return new ArtifactRepository( "remote", repository.getUrl(), repository.getAuthentication(), repositoryLayout ); + return new ArtifactRepository( "remote", repository.getUrl(), repositoryLayout ); } protected Object lookup( String role ) diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java index edbaae13a6..714b5bf179 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java @@ -17,7 +17,6 @@ package org.apache.maven.artifact.ant; */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.MavenMetadataSource; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -26,6 +25,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.types.Path; diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java index 4e062e6178..331aa9a373 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java @@ -21,7 +21,7 @@ import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.deployer.ArtifactDeployer; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.metadata.MavenMetadata; +import org.apache.maven.artifact.metadata.ProjectArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.MavenProjectBuilder; import org.apache.tools.ant.BuildException; @@ -58,7 +58,7 @@ public class DeployTask boolean isPomArtifact = "pom".equals( pom.getPackaging() ); if ( !isPomArtifact ) { - ArtifactMetadata metadata = new MavenMetadata( artifact, pom.getFile() ); + ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom.getFile() ); artifact.addMetadata( metadata ); } diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java index 45e73769bd..caeaa6445f 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java @@ -21,7 +21,7 @@ import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.installer.ArtifactInstaller; import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.metadata.MavenMetadata; +import org.apache.maven.artifact.metadata.ProjectArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.MavenProjectBuilder; import org.apache.tools.ant.BuildException; @@ -55,7 +55,7 @@ public class InstallTask boolean isPomArtifact = "pom".equals( pom.getPackaging() ); if ( !isPomArtifact ) { - ArtifactMetadata metadata = new MavenMetadata( artifact, pom.getFile() ); + ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom.getFile() ); artifact.addMetadata( metadata ); } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index f55a40ed2f..3ea30a7e1a 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -17,7 +17,6 @@ package org.apache.maven.plugin; */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.MavenMetadataSource; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; @@ -34,6 +33,7 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.project.path.PathTranslator; import org.codehaus.plexus.ArtifactEnabledContainer; import org.codehaus.plexus.ArtifactEnabledContainerException; diff --git a/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java similarity index 98% rename from maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java rename to maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 1194572cb4..afb51e3741 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java +++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -1,4 +1,4 @@ -package org.apache.maven.artifact; +package org.apache.maven.project.artifact; /* * Copyright 2001-2005 The Apache Software Foundation. @@ -21,9 +21,9 @@ import org.apache.maven.artifact.factory.DefaultArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.layout.ArtifactPathFormatException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolver; +import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader;