You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/06/06 09:06:06 UTC
svn commit: r412022 - in /maven/repository-manager/trunk:
maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/
maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/
maven-repository-utils/src/main/ja...
Author: brett
Date: Tue Jun 6 00:06:05 2006
New Revision: 412022
URL: http://svn.apache.org/viewvc?rev=412022&view=rev
Log:
refactor discoverer to remove large section of duplicated code
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java (with props)
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
maven/repository-manager/trunk/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java Tue Jun 6 00:06:05 2006
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import java.io.File;
+import java.io.FileReader;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
/**
@@ -33,7 +33,7 @@
* @author Brett Porter
*/
public abstract class AbstractArtifactDiscoverer
- extends AbstractLogEnabled
+ extends AbstractDiscoverer
{
/**
* Standard patterns to exclude from discovery as they are not artifacts.
@@ -42,11 +42,7 @@
"**/*.MD5", "**/*.sha1", "**/*.SHA1", "**/*snapshot-version", "*/website/**", "*/licenses/**", "*/licences/**",
"**/.htaccess", "**/*.html", "**/*.asc", "**/*.txt", "**/*.xml", "**/README*", "**/CHANGELOG*", "**/KEYS*"};
- private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
- private List excludedPaths = new ArrayList();
-
- private List kickedOutPaths = new ArrayList();
+ protected static final String POM = ".pom";
/**
* Scan the repository for artifact paths.
@@ -56,57 +52,84 @@
return scanForArtifactPaths( repositoryBase, blacklistedPatterns, null, STANDARD_DISCOVERY_EXCLUDES );
}
- /**
- * Scan the repository for artifact paths.
- */
- protected String[] scanForArtifactPaths( File repositoryBase, String blacklistedPatterns, String[] includes,
- String[] excludes )
+ protected abstract Artifact buildArtifactFromPath( String path, ArtifactRepository repository );
+
+ public List discoverArtifacts( ArtifactRepository repository, String blacklistedPatterns, boolean includeSnapshots )
{
- List allExcludes = new ArrayList();
- allExcludes.addAll( FileUtils.getDefaultExcludesAsList() );
- if ( excludes != null )
+ if ( !"file".equals( repository.getProtocol() ) )
{
- allExcludes.addAll( Arrays.asList( excludes ) );
+ throw new UnsupportedOperationException( "Only filesystem repositories are supported" );
}
- if ( blacklistedPatterns != null && blacklistedPatterns.length() > 0 )
- {
- allExcludes.addAll( Arrays.asList( blacklistedPatterns.split( "," ) ) );
- }
+ File repositoryBase = new File( repository.getBasedir() );
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( repositoryBase );
- if ( includes != null )
- {
- scanner.setIncludes( includes );
- }
- scanner.setExcludes( (String[]) allExcludes.toArray( EMPTY_STRING_ARRAY ) );
+ List artifacts = new ArrayList();
- scanner.scan();
+ String[] artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
- excludedPaths.addAll( Arrays.asList( scanner.getExcludedFiles() ) );
+ for ( int i = 0; i < artifactPaths.length; i++ )
+ {
+ String path = artifactPaths[i];
- return scanner.getIncludedFiles();
- }
+ Artifact artifact = buildArtifactFromPath( path, repository );
+ if ( artifact != null )
+ {
+ if ( includeSnapshots || !artifact.isSnapshot() )
+ {
+ artifacts.add( artifact );
+ }
+ }
+ else
+ {
+ addKickedOutPath( path );
+ }
+ }
- /**
- * Add a path to the list of files that were kicked out due to being invalid.
- *
- * @param path the path to add
- * @todo add a reason
- */
- protected void addKickedOutPath( String path )
- {
- kickedOutPaths.add( path );
+ return artifacts;
}
- public Iterator getExcludedPathsIterator()
+ public List discoverStandalonePoms( ArtifactRepository repository, String blacklistedPatterns,
+ boolean includeSnapshots )
{
- return excludedPaths.iterator();
- }
+ List artifacts = new ArrayList();
- public Iterator getKickedOutPathsIterator()
- {
- return kickedOutPaths.iterator();
+ File repositoryBase = new File( repository.getBasedir() );
+
+ String[] artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
+
+ for ( int i = 0; i < artifactPaths.length; i++ )
+ {
+ String path = artifactPaths[i];
+
+ if ( path.toLowerCase().endsWith( POM ) )
+ {
+ Artifact pomArtifact = buildArtifactFromPath( path, repository );
+ if ( pomArtifact != null )
+ {
+ pomArtifact.setFile( new File( repositoryBase, path ) );
+ }
+
+ MavenXpp3Reader mavenReader = new MavenXpp3Reader();
+ String filename = repositoryBase.getAbsolutePath() + "/" + path;
+ try
+ {
+ Model model = mavenReader.read( new FileReader( filename ) );
+ if ( ( pomArtifact != null ) && ( "pom".equals( model.getPackaging() ) ) )
+ {
+ if ( includeSnapshots || !pomArtifact.isSnapshot() )
+ {
+ artifacts.add( model );
+ }
+ }
+ }
+ catch ( Exception e )
+ {
+ getLogger().info( "error reading file: " + filename );
+ e.printStackTrace();
+ }
+ }
+ }
+
+ return artifacts;
}
}
Added: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java?rev=412022&view=auto
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java (added)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java Tue Jun 6 00:06:05 2006
@@ -0,0 +1,86 @@
+package org.apache.maven.repository.discovery;
+
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * TODO [!]: Description.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ */
+public class AbstractDiscoverer
+ extends AbstractLogEnabled
+{
+ private List kickedOutPaths = new ArrayList();
+
+ /**
+ * @plexus.requirement
+ */
+ protected ArtifactFactory artifactFactory;
+
+ private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+ private List excludedPaths = new ArrayList();
+
+ /**
+ * Add a path to the list of files that were kicked out due to being invalid.
+ *
+ * @param path the path to add
+ * @todo add a reason
+ */
+ protected void addKickedOutPath( String path )
+ {
+ kickedOutPaths.add( path );
+ }
+
+ public Iterator getKickedOutPathsIterator()
+ {
+ return kickedOutPaths.iterator();
+ }
+
+ /**
+ * Scan the repository for artifact paths.
+ */
+ protected String[] scanForArtifactPaths( File repositoryBase, String blacklistedPatterns, String[] includes,
+ String[] excludes )
+ {
+ List allExcludes = new ArrayList();
+ allExcludes.addAll( FileUtils.getDefaultExcludesAsList() );
+ if ( excludes != null )
+ {
+ allExcludes.addAll( Arrays.asList( excludes ) );
+ }
+
+ if ( blacklistedPatterns != null && blacklistedPatterns.length() > 0 )
+ {
+ allExcludes.addAll( Arrays.asList( blacklistedPatterns.split( "," ) ) );
+ }
+
+ DirectoryScanner scanner = new DirectoryScanner();
+ scanner.setBasedir( repositoryBase );
+ if ( includes != null )
+ {
+ scanner.setIncludes( includes );
+ }
+ scanner.setExcludes( (String[]) allExcludes.toArray( EMPTY_STRING_ARRAY ) );
+
+ scanner.scan();
+
+ excludedPaths.addAll( Arrays.asList( scanner.getExcludedFiles() ) );
+
+ return scanner.getIncludedFiles();
+ }
+
+ public Iterator getExcludedPathsIterator()
+ {
+ return excludedPaths.iterator();
+ }
+}
Propchange: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java Tue Jun 6 00:06:05 2006
@@ -17,117 +17,22 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.repository.ArtifactUtils;
-import java.io.File;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Artifact discoverer for the new repository layout (Maven 2.0+).
*
* @author John Casey
* @author Brett Porter
- * @plexus.component role="org.apache.maven.repository.discovery.ArtifactDiscoverer" role-hint="org.apache.maven.repository.discovery.DefaultArtifactDiscoverer"
+ * @plexus.component role="org.apache.maven.repository.discovery.ArtifactDiscoverer" role-hint="default"
*/
public class DefaultArtifactDiscoverer
extends AbstractArtifactDiscoverer
implements ArtifactDiscoverer
{
- private final static String POM = ".pom";
-
- /**
- * @plexus.requirement
- */
- private ArtifactFactory artifactFactory;
-
- public List discoverArtifacts( ArtifactRepository repository, String blacklistedPatterns, boolean includeSnapshots )
- {
- if ( !"file".equals( repository.getProtocol() ) )
- {
- throw new UnsupportedOperationException( "Only filesystem repositories are supported" );
- }
-
- File repositoryBase = new File( repository.getBasedir() );
-
- List artifacts = new ArrayList();
-
- String[] artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
-
- for ( int i = 0; i < artifactPaths.length; i++ )
- {
- String path = artifactPaths[i];
-
- Artifact artifact = ArtifactUtils.buildArtifact( repositoryBase, path, repository, artifactFactory );
-
- if ( artifact != null )
- {
- if ( includeSnapshots || !artifact.isSnapshot() )
- {
- artifacts.add( artifact );
- }
- }
- else
- {
- addKickedOutPath( path );
- }
- }
-
- return artifacts;
- }
-
- public List discoverStandalonePoms( ArtifactRepository repository, String blacklistedPatterns,
- boolean convertSnapshots )
+ protected Artifact buildArtifactFromPath( String path, ArtifactRepository repository )
{
- List artifacts = new ArrayList();
-
- File repositoryBase = new File( repository.getBasedir() );
-
- String[] artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
-
- for ( int i = 0; i < artifactPaths.length; i++ )
- {
- String path = artifactPaths[i];
-
- if ( path.toLowerCase().endsWith( POM ) )
- {
- Artifact pomArtifact = ArtifactUtils.buildArtifact( path, artifactFactory );
- if ( pomArtifact != null )
- {
- pomArtifact.setFile( new File( repositoryBase, path ) );
- }
-
- MavenXpp3Reader mavenReader = new MavenXpp3Reader();
- String filename = repositoryBase.getAbsolutePath() + "/" + path;
- try
- {
- Model model = mavenReader.read( new FileReader( filename ) );
- if ( ( model != null ) && ( "pom".equals( model.getPackaging() ) ) )
- {
- artifacts.add( model );
- }
- /*if ( ( pomArtifact != null ) && ( "pom".equals( model.getPackaging() ) ) )
- {
- if ( convertSnapshots || !pomArtifact.isSnapshot() )
- {
- artifacts.add( pomArtifact );
- }
- }
- */
- }
- catch ( Exception e )
- {
- getLogger().info( "error reading file: " + filename );
- e.printStackTrace();
- }
- }
- }
-
- return artifacts;
+ return ArtifactUtils.buildArtifact( path, repository, artifactFactory );
}
}
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java Tue Jun 6 00:06:05 2006
@@ -17,7 +17,6 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
@@ -46,14 +45,9 @@
* @plexus.component role="org.apache.maven.repository.discovery.MetadataDiscoverer" role-hint="org.apache.maven.repository.discovery.DefaultMetadataDiscoverer"
*/
public class DefaultMetadataDiscoverer
- extends AbstractArtifactDiscoverer
+ extends AbstractDiscoverer
implements MetadataDiscoverer
{
- /**
- * @plexus.requirement
- */
- private ArtifactFactory artifactFactory;
-
/**
* Standard patterns to include in discovery of metadata files.
*/
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java Tue Jun 6 00:06:05 2006
@@ -17,110 +17,32 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.repository.ArtifactUtils;
import java.io.File;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.List;
/**
* Artifact discoverer for the legacy repository layout (Maven 1.x).
*
* @author John Casey
* @author Brett Porter
- * @plexus.component role="org.apache.maven.repository.discovery.ArtifactDiscoverer" role-hint="org.apache.maven.repository.discovery.LegacyArtifactDiscoverer"
+ * @plexus.component role="org.apache.maven.repository.discovery.ArtifactDiscoverer" role-hint="legacy"
*/
public class LegacyArtifactDiscoverer
extends AbstractArtifactDiscoverer
implements ArtifactDiscoverer
{
- private final static String POM = ".pom";
-
- private final static String DELIM = "\\";
-
- /**
- * @plexus.requirement
- */
- private ArtifactFactory artifactFactory;
-
- public List discoverArtifacts( ArtifactRepository repository, String blacklistedPatterns, boolean includeSnapshots )
- {
- List artifacts = new ArrayList();
-
- File repositoryBase = new File( repository.getBasedir() );
- String[] artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
-
- for ( int i = 0; i < artifactPaths.length; i++ )
- {
- String path = artifactPaths[i];
-
- Artifact artifact = ArtifactUtils.buildArtifactFromLegacyPath( path, artifactFactory );
- if ( artifact != null )
- {
- artifact.setRepository( repository );
- artifact.setFile( new File( repositoryBase, path ) );
-
- if ( includeSnapshots || !artifact.isSnapshot() )
- {
- artifacts.add( artifact );
- }
- }
- else
- {
- addKickedOutPath( path );
- }
- }
-
- return artifacts;
- }
-
- public List discoverStandalonePoms( ArtifactRepository repository, String blacklistedPatterns,
- boolean convertSnapshots )
+ protected Artifact buildArtifactFromPath( String path, ArtifactRepository repository )
{
- List artifacts = new ArrayList();
+ Artifact artifact = ArtifactUtils.buildArtifactFromLegacyPath( path, artifactFactory );
- File repositoryBase = new File( repository.getBasedir() );
-
- String[] artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
-
- for ( int i = 0; i < artifactPaths.length; i++ )
+ if ( artifact != null )
{
- String path = artifactPaths[i];
-
- if ( path.toLowerCase().endsWith( POM ) )
- {
- Artifact pomArtifact = ArtifactUtils.buildArtifactFromLegacyPath( path, artifactFactory );
- if ( pomArtifact != null )
- {
- pomArtifact.setFile( new File( repositoryBase, path ) );
- }
-
- MavenXpp3Reader mavenReader = new MavenXpp3Reader();
- String filename = repositoryBase.getAbsolutePath() + DELIM + path;
- try
- {
- Model model = mavenReader.read( new FileReader( filename ) );
- if ( ( pomArtifact != null ) && ( "pom".equals( model.getPackaging() ) ) )
- {
- if ( convertSnapshots || !pomArtifact.isSnapshot() )
- {
- artifacts.add( pomArtifact );
- }
- }
- }
- catch ( Exception e )
- {
- getLogger().info( "error reading file: " + filename );
- e.printStackTrace();
- }
- }
+ artifact.setRepository( repository );
+ artifact.setFile( new File( repository.getBasedir(), path ) );
}
- return artifacts;
+ return artifact;
}
}
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java Tue Jun 6 00:06:05 2006
@@ -52,8 +52,7 @@
{
super.setUp();
- discoverer = (ArtifactDiscoverer) lookup( ArtifactDiscoverer.ROLE,
- "org.apache.maven.repository.discovery.DefaultArtifactDiscoverer" );
+ discoverer = (ArtifactDiscoverer) lookup( ArtifactDiscoverer.ROLE, "default" );
factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java Tue Jun 6 00:06:05 2006
@@ -49,8 +49,7 @@
{
super.setUp();
- discoverer = (ArtifactDiscoverer) lookup( ArtifactDiscoverer.ROLE,
- "org.apache.maven.repository.discovery.LegacyArtifactDiscoverer" );
+ discoverer = (ArtifactDiscoverer) lookup( ArtifactDiscoverer.ROLE, "legacy" );
factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
Modified: maven/repository-manager/trunk/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java?rev=412022&r1=412021&r2=412022&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java (original)
+++ maven/repository-manager/trunk/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java Tue Jun 6 00:06:05 2006
@@ -39,21 +39,19 @@
/**
* Method used to build an artifact and then set its repository and file fields with the proper values
*
- * @param repositoryBase the base directory of the repository
* @param path the path of the artifact relative from the repository base directory
* @param repository the repository where the artifact can be found
* @param artifactFactory the artifactFactory to build the Artifact object when the given path is a valid artifact path
* @return Artifact object if the given path represents an artifact path, otherwise, returns null
*/
- public static Artifact buildArtifact( File repositoryBase, String path, ArtifactRepository repository,
- ArtifactFactory artifactFactory )
+ public static Artifact buildArtifact( String path, ArtifactRepository repository, ArtifactFactory artifactFactory )
{
Artifact artifact = buildArtifact( path, artifactFactory );
if ( artifact != null )
{
artifact.setRepository( repository );
- artifact.setFile( new File( repositoryBase, path ) );
+ artifact.setFile( new File( repository.getBasedir(), path ) );
}
return artifact;