You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/11/02 07:55:43 UTC
svn commit: r709848 - in /maven/mercury/trunk:
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/
mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/
mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mer...
Author: ogusakov
Date: Sat Nov 1 23:55:42 2008
New Revision: 709848
URL: http://svn.apache.org/viewvc?rev=709848&view=rev
Log:
http://jira.codehaus.org/browse/MERCURY-17
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlat.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java Sat Nov 1 23:55:42 2008
@@ -9,7 +9,7 @@
*/
public enum ArtifactScopeEnum
{
- compile( 1 ), test( 2 ), runtime( 3 ), provided( 4 ), system( 5 );
+ compile( 1 ), test( 2 ), runtime( 3 ), provided( 4 ), system( 5 ), none(-1);
public static final ArtifactScopeEnum DEFAULT_SCOPE = compile;
@@ -61,6 +61,10 @@
{
return Artifact.SCOPE_PROVIDED;
}
+ else if ( id == 5 )
+ {
+ return Artifact.SCOPE_SYSTEM;
+ }
else
{
return Artifact.SCOPE_SYSTEM;
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Sat Nov 1 23:55:42 2008
@@ -47,7 +47,6 @@
LocalRepositoryM2 localRepo;
RemoteRepositoryM2 remoteRepo;
List<Repository> reps;
- DependencyProcessor processor;
VirtualRepositoryReader vReader;
@@ -78,11 +77,9 @@
// RemoteRepositoryM2 centralRepo = new RemoteRepositoryM2(central);
// reps.add(centralRepo);
- processor = new MavenDependencyProcessor();
-
- depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, null, null, null, reps, processor );
+ depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, null, null, null, reps );
- vReader = new VirtualRepositoryReader( reps, processor );
+ vReader = new VirtualRepositoryReader( reps );
}
//----------------------------------------------------------------------------------------------
@Override
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java Sat Nov 1 23:55:42 2008
@@ -30,7 +30,8 @@
server = new Server( "test", new File("./target/test-classes/repo").toURL() );
repo = new LocalRepositoryM2( server );
- reader = repo.getReader( mdProcessor );
+ repo.setDependencyProcessor( mdProcessor );
+ reader = repo.getReader();
super.setUp();
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java Sat Nov 1 23:55:42 2008
@@ -39,8 +39,6 @@
FileUtil.copy( new File("./target/test-classes/repo"), targetDirectory, true );
FileUtil.delete( new File(targetDirectory, "org") );
- mdProcessor = new MetadataProcessorMock();
-
query = new ArrayList<ArtifactBasicMetadata>();
server = new Server( "test", targetDirectory.toURL() );
@@ -58,7 +56,10 @@
server.setWriterStreamVerifierFactories(factories);
repo = new LocalRepositoryM2( server );
- reader = repo.getReader( mdProcessor );
+ mdProcessor = new MetadataProcessorMock();
+ repo.setDependencyProcessor( mdProcessor );
+
+ reader = repo.getReader();
writer = repo.getWriter();
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java Sat Nov 1 23:55:42 2008
@@ -68,7 +68,8 @@
rr = new RemoteRepositoryM2( "testRepo", server );
mdProcessor = new MetadataProcessorMock();
- reader = rr.getReader( new MetadataProcessorMock() );
+ rr.setDependencyProcessor( mdProcessor );
+ reader = rr.getReader();
localRepoBase = File.createTempFile( "local", "repo" );
localRepoBase.delete();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java Sat Nov 1 23:55:42 2008
@@ -66,8 +66,8 @@
repo = new RemoteRepositoryM2( "testRepo", server );
((RemoteRepository)repo).setUpdatePolicy( up );
-
- reader = repo.getReader( new MetadataProcessorMock() );
+ repo.setDependencyProcessor( new MetadataProcessorMock() );
+ reader = repo.getReader();
_cacheBase = new File( _testBase, VirtualRepositoryReader.METADATA_CACHE_DIR );
_cacheBase.delete();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java Sat Nov 1 23:55:42 2008
@@ -55,7 +55,8 @@
server = new Server( "test", new URL("http://localhost:"+_port+"/repo") );
repo = new RemoteRepositoryM2( "testRepo", server );
- reader = repo.getReader( new MetadataProcessorMock() );
+ repo.setDependencyProcessor( mdProcessor );
+ reader = repo.getReader();
}
//-------------------------------------------------------------------------
@Override
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java Sat Nov 1 23:55:42 2008
@@ -92,7 +92,8 @@
factories.add( new SHA1VerifierFactory(false,false) );
server.setWriterStreamVerifierFactories(factories);
- reader = repo.getReader( mdProcessor );
+ repo.setDependencyProcessor( mdProcessor );
+ reader = repo.getReader();
writer = repo.getWriter();
setSnapshots();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java Sat Nov 1 23:55:42 2008
@@ -59,19 +59,21 @@
_query = new ArrayList<ArtifactBasicMetadata>();
+ DependencyProcessor mdProcessor = new MetadataProcessorMock();
+
Server server = new Server( "testRemoteRepo", new URL("http://localhost:"+_port+"/repo") );
_remoteRepo = new RemoteRepositoryM2( server );
_remoteRepo.setUpdatePolicy( new RepositoryUpdateIntervalPolicy("interval2").setInterval( 2000L ) );
+ _remoteRepo.setDependencyProcessor( mdProcessor );
_localRepo = new LocalRepositoryM2( "testLocalRepo", _localRepoBase );
+ _localRepo.setDependencyProcessor( mdProcessor );
List<Repository> reps = new ArrayList<Repository>();
reps.add( _remoteRepo );
reps.add( _localRepo );
-
- DependencyProcessor mdProcessor = new MetadataProcessorMock();
- _vr = new VirtualRepositoryReader( reps, mdProcessor );
+ _vr = new VirtualRepositoryReader( reps );
}
//-------------------------------------------------------------------------
@Override
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java Sat Nov 1 23:55:42 2008
@@ -32,12 +32,11 @@
, final List<Comparator<MetadataTreeNode>> comparators
, final Map<String,ArtifactListProcessor> processors
, final Collection<Repository> repositories
- , final DependencyProcessor processor
)
throws RepositoryException
{
if( JAVA_DEPENDENCY_MODEL.equals( dependencyModel ) )
- return new DependencyTreeBuilder( filters, comparators, processors, repositories, processor );
+ return new DependencyTreeBuilder( filters, comparators, processors, repositories );
throw new IllegalArgumentException( _lang.getMessage( "dependency.model.not.implemented", dependencyModel ) );
}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Sat Nov 1 23:55:42 2008
@@ -61,7 +61,6 @@
, List<Comparator<MetadataTreeNode>> comparators
, Map<String,ArtifactListProcessor> processors
, Collection<Repository> repositories
- , DependencyProcessor processor
)
throws RepositoryException
{
@@ -80,7 +79,7 @@
if( processors != null )
_processors = processors;
- this._reader = new VirtualRepositoryReader( repositories, processor );
+ this._reader = new VirtualRepositoryReader( repositories );
}
//------------------------------------------------------------------------
public MetadataTreeNode buildTree( ArtifactBasicMetadata startMD )
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Sat Nov 1 23:55:42 2008
@@ -42,11 +42,12 @@
{
processor = new MetadataProcessorMock();
localRepo = new LocalRepositoryM2( "local", repoDir );
+ localRepo.setDependencyProcessor( new MetadataProcessorMock() );
reps = new ArrayList<Repository>(4);
reps.add( localRepo );
- mt = new DependencyTreeBuilder( null, null, null, reps, processor );
+ mt = new DependencyTreeBuilder( null, null, null, reps );
}
//----------------------------------------------------------------------------------------------
@Override
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Sat Nov 1 23:55:42 2008
@@ -159,7 +159,7 @@
if( Util.isEmpty( repos ) )
throw new RepositoryException( _lang.getMessage( "null.repo" ) );
- VirtualRepositoryReader vr = new VirtualRepositoryReader( repos, DependencyProcessor.NULL_PROCESSOR );
+ VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
ArtifactResults ar = vr.readArtifacts( artifacts );
if( ar.hasExceptions() )
@@ -213,7 +213,6 @@
public List<ArtifactMetadata> resolve(
List<Repository> repos,
- DependencyProcessor dependencyProcessor,
ArtifactScopeEnum scope,
List<ArtifactBasicMetadata> artifacts
)
@@ -227,7 +226,7 @@
try
{
- DependencyBuilder depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, null, null, null, repos, dependencyProcessor );
+ DependencyBuilder depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, null, null, null, repos );
MetadataTreeNode root = depBuilder.buildTree( artifacts.get(0) );
List<ArtifactMetadata> res = depBuilder.resolveConflicts( root, scope );
@@ -241,13 +240,12 @@
}
public List<ArtifactMetadata> resolve( List<Repository> repos
- , DependencyProcessor dependencyProcessor
, ArtifactScopeEnum scope
, ArtifactBasicMetadata... artifacts
)
throws RepositoryException
{
- return resolve( repos, dependencyProcessor, scope, Arrays.asList( artifacts ) );
+ return resolve( repos, scope, Arrays.asList( artifacts ) );
}
//---------------------------------------------------------------
//---------------------------------------------------------------
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java Sat Nov 1 23:55:42 2008
@@ -147,14 +147,12 @@
* @throws PlexusMercuryException
*/
public List<? extends ArtifactBasicMetadata> resolve( List<Repository> repos
- , DependencyProcessor dependencyProcessor
, ArtifactScopeEnum scope
, ArtifactBasicMetadata... artifacts
)
throws RepositoryException;
public List<? extends ArtifactBasicMetadata> resolve( List<Repository> repos
- , DependencyProcessor dependencyProcessor
, ArtifactScopeEnum scope
, List<ArtifactBasicMetadata> artifacts
)
Modified: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Sat Nov 1 23:55:42 2008
@@ -169,7 +169,7 @@
ArtifactBasicMetadata bmd = new ArtifactBasicMetadata( artifactId );
- List<ArtifactBasicMetadata> res = (List<ArtifactBasicMetadata>)pm.resolve( repos, new MavenDependencyProcessor(), ArtifactScopeEnum.compile, bmd );
+ List<ArtifactBasicMetadata> res = (List<ArtifactBasicMetadata>)pm.resolve( repos, ArtifactScopeEnum.compile, bmd );
System.out.println("Resolved as "+res);
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java Sat Nov 1 23:55:42 2008
@@ -80,7 +80,7 @@
* @return default reader or null, if none exists
* @throws RepositoryException
*/
- RepositoryReader getReader( DependencyProcessor processor )
+ RepositoryReader getReader()
throws RepositoryException;
/**
@@ -89,7 +89,7 @@
* @return reader instance for the specified protocol
* @throws NonExistentProtocolException if protocol not supported
*/
- RepositoryReader getReader( DependencyProcessor processor, String protocol )
+ RepositoryReader getReader( String protocol )
throws RepositoryException;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlat.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlat.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlat.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlat.java Sat Nov 1 23:55:42 2008
@@ -32,18 +32,18 @@
return directory;
}
//----------------------------------------------------------------------------------
- public RepositoryReader getReader( DependencyProcessor processor )
+ public RepositoryReader getReader()
{
if( reader == null )
- reader = new LocalRepositoryReaderFlat( this, processor );
+ reader = new LocalRepositoryReaderFlat( this, getDependencyProcessor() );
return reader;
}
//----------------------------------------------------------------------------------
// TODO oleg: what happens in multi-threaded execution??
- public RepositoryReader getReader( DependencyProcessor processor, String protocol )
+ public RepositoryReader getReader( String protocol )
{
- return getReader(processor);
+ return getReader();
}
//----------------------------------------------------------------------------------
// TODO oleg: what happens in multi-threaded execution??
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml Sat Nov 1 23:55:42 2008
@@ -9,6 +9,11 @@
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <maven.version>3.0-SNAPSHOT</maven.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
@@ -31,6 +36,11 @@
<artifactId>mercury-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-mercury</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java Sat Nov 1 23:55:42 2008
@@ -2,7 +2,7 @@
import java.io.File;
-import org.apache.maven.mercury.builder.api.DependencyProcessor;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.LocalRepository;
import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
@@ -36,6 +36,8 @@
setDirectory( new File( server.getURL().getFile() ) );
this.server = server;
this.metadataName = METADATA_NAME;
+
+ setDependencyProcessor( new MavenDependencyProcessor() );
}
//----------------------------------------------------------------------------------
public LocalRepositoryM2( String id, File directory )
@@ -43,6 +45,8 @@
super( id, DEFAULT_REPOSITORY_TYPE );
setDirectory( directory );
this.metadataName = METADATA_NAME;
+
+ setDependencyProcessor( new MavenDependencyProcessor() );
}
//----------------------------------------------------------------------------------
public LocalRepositoryM2( String id, File directory, String type )
@@ -50,6 +54,8 @@
super( id, type );
setDirectory( directory );
this.metadataName = METADATA_NAME;
+
+ setDependencyProcessor( new MavenDependencyProcessor() );
}
//----------------------------------------------------------------------------------
public File getDirectory()
@@ -57,18 +63,18 @@
return directory;
}
//----------------------------------------------------------------------------------
- public RepositoryReader getReader( DependencyProcessor processor )
+ public RepositoryReader getReader()
{
if( reader == null )
- reader = new LocalRepositoryReaderM2( this, processor );
+ reader = new LocalRepositoryReaderM2( this, getDependencyProcessor() );
return reader;
}
//----------------------------------------------------------------------------------
// TODO oleg: what happens in multi-threaded execution??
- public RepositoryReader getReader( DependencyProcessor processor, String protocol )
+ public RepositoryReader getReader( String protocol )
{
- return getReader(processor);
+ return getReader();
}
//----------------------------------------------------------------------------------
// TODO oleg: what happens in multi-threaded execution??
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Sat Nov 1 23:55:42 2008
@@ -350,6 +350,10 @@
, System.getenv()
, System.getProperties()
);
+for(ArtifactBasicMetadata d : deps )
+{
+ System.out.println("======> "+d.getScope() );
+}
ror = ArtifactBasicResults.add( ror, bmd, deps );
}
catch( MetadataReaderException e )
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml Sat Nov 1 23:55:42 2008
@@ -9,6 +9,11 @@
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <maven.version>3.0-SNAPSHOT</maven.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
@@ -30,5 +35,10 @@
<artifactId>mercury-repo-local-m2</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-mercury</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java Sat Nov 1 23:55:42 2008
@@ -1,5 +1,6 @@
package org.apache.maven.mercury.repository.remote.m2;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.LocalRepository;
@@ -32,6 +33,7 @@
{
super( id, DEFAULT_REPOSITORY_TYPE );
this._server = server;
+ setDependencyProcessor( new MavenDependencyProcessor() );
}
//----------------------------------------------------------------------------------
public Server getServer()
@@ -39,16 +41,16 @@
return _server;
}
//----------------------------------------------------------------------------------
- public RepositoryReader getReader( DependencyProcessor processor )
+ public RepositoryReader getReader()
throws RepositoryException
{
- return new RemoteRepositoryReaderM2( this, processor );
+ return new RemoteRepositoryReaderM2( this, getDependencyProcessor() );
}
//----------------------------------------------------------------------------------
- public RepositoryReader getReader( DependencyProcessor processor, String protocol )
+ public RepositoryReader getReader( String protocol )
throws RepositoryException
{
- return getReader(processor);
+ return getReader();
}
//----------------------------------------------------------------------------------
public RepositoryWriter getWriter()
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java Sat Nov 1 23:55:42 2008
@@ -74,7 +74,7 @@
_repo = repo;
- _reader = _repo.getReader( DependencyProcessor.NULL_PROCESSOR );
+ _reader = _repo.getReader();
try
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java Sat Nov 1 23:55:42 2008
@@ -62,22 +62,15 @@
private RepositoryWriter _localRepositoryWriter;
- private DependencyProcessor _processor;
-
RepositoryMetadataCache _mdCache;
private Map<String,ArtifactListProcessor> _processors;
private boolean _initialized = false;
//----------------------------------------------------------------------------------------------------------------------------
- public VirtualRepositoryReader( Collection<Repository> repositories, DependencyProcessor processor )
+ public VirtualRepositoryReader( Collection<Repository> repositories )
throws RepositoryException
{
- if( processor == null )
- this._processor = DependencyProcessor.NULL_PROCESSOR;
- else
- this._processor = processor;
-
if( ! Util.isEmpty( repositories ) )
this._repositories.addAll( repositories );
}
@@ -85,18 +78,12 @@
private VirtualRepositoryReader(
LocalRepository localRepository
, Collection<RemoteRepository> remoteRepositories
- , DependencyProcessor processor
)
throws RepositoryException
{
if( _localRepository == null )
throw new RepositoryException( "null local repo" );
- if( processor == null )
- throw new RepositoryException( "null metadata processor" );
-
- this._processor = processor;
-
this._localRepository = localRepository;
this._repositories.add( localRepository );
@@ -153,7 +140,7 @@
if( ! r.isLocal() )
continue;
- RepositoryReader rr = r.getReader(_processor);
+ RepositoryReader rr = r.getReader();
rr.setMetadataReader( this );
@@ -161,7 +148,7 @@
if( ! r.isReadOnly() )
{
- _localRepository = (LocalRepository)r.getReader(_processor).getRepository();
+ _localRepository = (LocalRepository)r.getReader().getRepository();
_localRepositoryWriter = _localRepository.getWriter();
if( _mdCache == null )
@@ -184,7 +171,7 @@
if( r.isLocal() )
continue;
- RepositoryReader rr = r.getReader(_processor);
+ RepositoryReader rr = r.getReader();
if( _mdCache != null )
rr.setMetadataCache( _mdCache );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java?rev=709848&r1=709847&r2=709848&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java Sat Nov 1 23:55:42 2008
@@ -63,7 +63,7 @@
rl.add( _localRepo );
rl.add( _remoteRepo );
- _vr = new VirtualRepositoryReader( rl, DependencyProcessor.NULL_PROCESSOR );
+ _vr = new VirtualRepositoryReader( rl );
}
public void testReadSnapshot()