Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.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/RemoteRepositoryReaderM2.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
(original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Sat Mar 7 01:38:52 2009
@@ -32,8 +32,8 @@
import java.util.TreeSet;
import org.apache.maven.mercury.artifact.Artifact;
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.artifact.Quality;
import org.apache.maven.mercury.artifact.QualityEnum;
@@ -77,7 +77,6 @@
import org.apache.maven.mercury.util.Util;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
-import org.mortbay.log.Log;
/**
* implementation of M2 remote repository reader. Actual Transport (protocol, URL) [should]
come from RemoteRepository
@@ -181,7 +180,7 @@
}
// ---------------------------------------------------------------------------------------------------------------
- private final ArtifactLocation calculateLocation( String root, ArtifactBasicMetadata
bmd, AbstractRepOpResult res )
+ private final ArtifactLocation calculateLocation( String root, ArtifactMetadata bmd,
AbstractRepOpResult res )
throws RepositoryException, MetadataReaderException, MetadataException
{
ArtifactLocation loc = new ArtifactLocation( root, bmd );
@@ -248,7 +247,7 @@
}
// ---------------------------------------------------------------------------------------------------------------
- private Collection<String> getCachedSnapshots( ArtifactBasicMetadata bmd, ArtifactLocation
loc )
+ private Collection<String> getCachedSnapshots( ArtifactMetadata bmd, ArtifactLocation
loc )
throws MetadataCacheException, RepositoryException, MetadataReaderException, MetadataException
{
RepositoryGAVMetadata gavm = null;
@@ -305,7 +304,7 @@
}
// ---------------------------------------------------------------------------------------------------------------
- private boolean findLatestSnapshot( ArtifactBasicMetadata bmd, ArtifactLocation loc,
AbstractRepOpResult res )
+ private boolean findLatestSnapshot( ArtifactMetadata bmd, ArtifactLocation loc, AbstractRepOpResult
res )
throws MetadataReaderException, MetadataException, RemoteRepositoryM2OperationException
{
DefaultArtifactVersion dav = new DefaultArtifactVersion( loc.getVersion() );
@@ -354,7 +353,7 @@
/**
* TODO og: parallelize as soon as code stabilizes
*/
- public ArtifactResults readArtifacts( Collection<ArtifactBasicMetadata> query )
+ public ArtifactResults readArtifacts( Collection<ArtifactMetadata> query )
throws RepositoryException
{
if ( query == null || query.size() < 1 )
@@ -362,7 +361,7 @@
ArtifactResults res = new ArtifactResults();
- for ( ArtifactBasicMetadata bmd : query )
+ for ( ArtifactMetadata bmd : query )
{
try
{
@@ -388,7 +387,7 @@
}
// ---------------------------------------------------------------------------------------------------------------
- public void readArtifact( ArtifactBasicMetadata bmd, ArtifactResults res )
+ public void readArtifact( ArtifactMetadata bmd, ArtifactResults res )
throws IOException, RepositoryException, MetadataReaderException, MetadataException
{
DefaultArtifact da = bmd instanceof DefaultArtifact ? (DefaultArtifact) bmd : new
DefaultArtifact( bmd );
@@ -441,7 +440,7 @@
/**
*
*/
- public ArtifactBasicResults readDependencies( Collection<ArtifactBasicMetadata>
query )
+ public ArtifactBasicResults readDependencies( Collection<ArtifactMetadata> query
)
throws RepositoryException
{
if ( query == null || query.size() < 1 )
@@ -449,11 +448,11 @@
ArtifactBasicResults ror = new ArtifactBasicResults( 16 );
- for ( ArtifactBasicMetadata bmd : query )
+ for ( ArtifactMetadata bmd : query )
{
try
{
- List<ArtifactBasicMetadata> deps =
+ List<ArtifactMetadata> deps =
_mdProcessor.getDependencies( bmd, _mdReader == null ? this : _mdReader,
System.getenv(),
System.getProperties() );
ror.add( bmd, deps );
@@ -470,7 +469,7 @@
}
// ---------------------------------------------------------------------------------------------------------------
- private TreeSet<String> getCachedVersions( ArtifactLocation loc, ArtifactBasicMetadata
bmd, AbstractRepOpResult res )
+ private TreeSet<String> getCachedVersions( ArtifactLocation loc, ArtifactMetadata
bmd, AbstractRepOpResult res )
throws MetadataException, MetadataReaderException, MetadataCacheException
{
RepositoryGAMetadata gam = null;
@@ -633,7 +632,7 @@
if ( foundSnapshot )
{
boolean snFound = false;
- ArtifactBasicMetadata snMd = new ArtifactBasicMetadata( bmd.toString() );
+ ArtifactMetadata snMd = new ArtifactMetadata( bmd.toString() );
snMd.setVersion( v );
ArtifactLocation snLoc = new ArtifactLocation( loc.getPrefix(), snMd );
try
@@ -698,7 +697,7 @@
/**
* direct metadata search, no redirects, first attempt
*/
- public ArtifactBasicResults readVersions( Collection<ArtifactBasicMetadata> query
)
+ public ArtifactBasicResults readVersions( Collection<ArtifactMetadata> query )
throws RepositoryException
{
if ( query == null || query.size() < 1 )
@@ -708,7 +707,7 @@
String root = _repo.getServer().getURL().toString();
- for ( ArtifactBasicMetadata bmd : query )
+ for ( ArtifactMetadata bmd : query )
{
ArtifactLocation loc = new ArtifactLocation( root, bmd );
@@ -785,7 +784,7 @@
if ( found != null )
{
- ArtifactBasicMetadata vmd = new ArtifactBasicMetadata();
+ ArtifactMetadata vmd = new ArtifactMetadata();
vmd.setGroupId( bmd.getGroupId() );
vmd.setArtifactId( bmd.getArtifactId() );
vmd.setClassifier( bmd.getClassifier() );
@@ -819,7 +818,7 @@
if ( !versionQuery.includes( version ) )
continue;
- ArtifactBasicMetadata vmd = new ArtifactBasicMetadata();
+ ArtifactMetadata vmd = new ArtifactMetadata();
vmd.setGroupId( bmd.getGroupId() );
vmd.setArtifactId( bmd.getArtifactId() );
vmd.setClassifier( bmd.getClassifier() );
@@ -835,18 +834,18 @@
}
// ---------------------------------------------------------------------------------------------------------------
- public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type
)
+ public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type )
throws MetadataReaderException
{
return readRawData( bmd, classifier, type, false );
}
// ---------------------------------------------------------------------------------------------------------------
- public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type,
boolean exempt )
+ public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type, boolean
exempt )
throws MetadataReaderException
{
byte[] res = null;
- ArtifactBasicMetadata mod = null;
+ ArtifactMetadata mod = null;
// if( _log.isDebugEnabled() )
// _log.debug( "reading "+bmd+" from " + _repo.getId() );
@@ -854,7 +853,7 @@
// only cache poms at the moment
if ( _mdCache != null && "pom".equals( type ) )
{
- mod = new ArtifactBasicMetadata();
+ mod = new ArtifactMetadata();
mod.setGroupId( bmd.getGroupId() );
mod.setArtifactId( bmd.getArtifactId() );
mod.setVersion( ArtifactLocation.calculateVersionDir( bmd.getVersion() ) );
@@ -879,7 +878,7 @@
}
mod =
- new ArtifactBasicMetadata( bmd.getGroupId() + ":" + bmd.getArtifactId() + ":"
+ bmd.getVersion() + ":"
+ new ArtifactMetadata( bmd.getGroupId() + ":" + bmd.getArtifactId() + ":" + bmd.getVersion()
+ ":"
+ ( classifier == null ? "" : classifier ) + ":" + ( type == null ? bmd.getType()
: type ) );
// ArtifactLocation loc = new ArtifactLocation( "", mod );
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=751167&r1=751166&r2=751167&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 Mar 7 01:38:52 2009
@@ -42,7 +42,6 @@
import org.apache.maven.mercury.repository.api.RemoteRepository;
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.api.RepositoryException;
-import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
import org.apache.maven.mercury.repository.api.RepositoryGAVMetadata;
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.api.RepositoryWriter;
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=751167&r1=751166&r2=751167&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 Mar 7 01:38:52 2009
@@ -29,16 +29,12 @@
import java.util.TreeSet;
import org.apache.maven.mercury.artifact.Artifact;
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.Quality;
import org.apache.maven.mercury.artifact.api.ArtifactListProcessor;
import org.apache.maven.mercury.artifact.api.ArtifactListProcessorException;
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
import org.apache.maven.mercury.artifact.version.MetadataVersionComparator;
-import org.apache.maven.mercury.artifact.version.VersionException;
-import org.apache.maven.mercury.artifact.version.VersionRange;
-import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
import org.apache.maven.mercury.event.EventGenerator;
@@ -270,7 +266,7 @@
}
// ----------------------------------------------------------------------------------------------------------------------------
- public ArtifactBasicResults readVersions( Collection<ArtifactBasicMetadata> query
)
+ public ArtifactBasicResults readVersions( Collection<ArtifactMetadata> query )
throws IllegalArgumentException, RepositoryException
{
if ( query == null )
@@ -295,7 +291,7 @@
GenericEvent eventRead = null;
- List<ArtifactBasicMetadata> qList = new ArrayList<ArtifactBasicMetadata>(
query.size() );
+ List<ArtifactMetadata> qList = new ArrayList<ArtifactMetadata>( query.size()
);
qList.addAll( query );
for ( RepositoryReader rr : _repositoryReaders )
@@ -327,9 +323,9 @@
if ( repoRes != null && repoRes.hasResults() )
{
- for ( ArtifactBasicMetadata key : repoRes.getResults().keySet() )
+ for ( ArtifactMetadata key : repoRes.getResults().keySet() )
{
- List<ArtifactBasicMetadata> rorRes = repoRes.getResult(
key );
+ List<ArtifactMetadata> rorRes = repoRes.getResult( key
);
if ( tp != null )
{
@@ -350,7 +346,7 @@
continue;
}
- for ( ArtifactBasicMetadata bmd : rorRes )
+ for ( ArtifactMetadata bmd : rorRes )
{
bmd.setTracker( rr );
}
@@ -433,25 +429,25 @@
return;
}
- Map<ArtifactBasicMetadata, List<ArtifactBasicMetadata> > m = res.getResults();
+ Map<ArtifactMetadata, List<ArtifactMetadata> > m = res.getResults();
- for ( ArtifactBasicMetadata key : m.keySet() )
+ for ( ArtifactMetadata key : m.keySet() )
{
processSingletons( key, res.getResult( key ) );
}
}
- private void processSingletons( ArtifactBasicMetadata key, List<ArtifactBasicMetadata>
res )
+ private void processSingletons( ArtifactMetadata key, List<ArtifactMetadata> res
)
{
if ( Util.isEmpty( res ) || !DefaultArtifactVersion.isVirtual( key.getVersion() )
)
{
return;
}
- TreeSet<ArtifactBasicMetadata> ts = new TreeSet<ArtifactBasicMetadata>(
- new Comparator<ArtifactBasicMetadata>()
+ TreeSet<ArtifactMetadata> ts = new TreeSet<ArtifactMetadata>(
+ new Comparator<ArtifactMetadata>()
{
- public int compare( ArtifactBasicMetadata o1, ArtifactBasicMetadata
o2 )
+ public int compare( ArtifactMetadata o1, ArtifactMetadata o2
)
{
DefaultArtifactVersion av1 = new DefaultArtifactVersion(
o1.getVersion() );
DefaultArtifactVersion av2 = new DefaultArtifactVersion(
o2.getVersion() );
@@ -463,7 +459,7 @@
);
ts.addAll( res );
- ArtifactBasicMetadata single = ts.last();
+ ArtifactMetadata single = ts.last();
res.clear();
@@ -471,7 +467,7 @@
}
//----------------------------------------------------------------------------------------------------------------------------
- public ArtifactMetadata readDependencies( ArtifactBasicMetadata bmd )
+ public ArtifactMetadata readDependencies( ArtifactMetadata bmd )
throws IllegalArgumentException, RepositoryException
{
if ( bmd == null )
@@ -491,7 +487,7 @@
init();
- List<ArtifactBasicMetadata> query = new ArrayList<ArtifactBasicMetadata>(
1 );
+ List<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>( 1
);
query.add( bmd );
ArtifactMetadata md = new ArtifactMetadata( bmd );
@@ -581,13 +577,13 @@
/**
* split query into repository buckets
*/
- private Map<RepositoryReader, List<ArtifactBasicMetadata>> sortByRepo( Collection<?
extends ArtifactBasicMetadata> query )
+ private Map<RepositoryReader, List<ArtifactMetadata>> sortByRepo( Collection<?
extends ArtifactMetadata> query )
{
- HashMap<RepositoryReader, List<ArtifactBasicMetadata>> res = null;
+ HashMap<RepositoryReader, List<ArtifactMetadata>> res = null;
- List<ArtifactBasicMetadata> rejects = null;
+ List<ArtifactMetadata> rejects = null;
- for ( ArtifactBasicMetadata bmd : query )
+ for ( ArtifactMetadata bmd : query )
{
Object tracker = bmd.getTracker();
@@ -598,14 +594,14 @@
if ( res == null )
{
- res = new HashMap<RepositoryReader, List<ArtifactBasicMetadata>>();
+ res = new HashMap<RepositoryReader, List<ArtifactMetadata>>();
}
- List<ArtifactBasicMetadata> rl = res.get( rr );
+ List<ArtifactMetadata> rl = res.get( rr );
if ( rl == null )
{
- rl = new ArrayList<ArtifactBasicMetadata>();
+ rl = new ArrayList<ArtifactMetadata>();
res.put( rr, rl );
}
@@ -616,7 +612,7 @@
{
if ( rejects == null )
{
- rejects = new ArrayList<ArtifactBasicMetadata>();
+ rejects = new ArrayList<ArtifactMetadata>();
}
rejects.add( bmd );
@@ -627,7 +623,7 @@
{
if ( res == null )
{
- res = new HashMap<RepositoryReader, List<ArtifactBasicMetadata>>();
+ res = new HashMap<RepositoryReader, List<ArtifactMetadata>>();
}
res.put( RepositoryReader.NULL_READER, rejects );
@@ -637,7 +633,7 @@
}
// ----------------------------------------------------------------------------------------------------------------------------
- public ArtifactResults readArtifacts( Collection<? extends ArtifactBasicMetadata>
query )
+ public ArtifactResults readArtifacts( Collection<? extends ArtifactMetadata> query
)
throws RepositoryException
{
GenericEvent event = null;
@@ -656,9 +652,9 @@
return res;
}
- Map<RepositoryReader, List<ArtifactBasicMetadata>> buckets = sortByRepo(
query );
+ Map<RepositoryReader, List<ArtifactMetadata>> buckets = sortByRepo(
query );
- List<ArtifactBasicMetadata> leftovers = buckets == null ? null : buckets.get(
RepositoryReader.NULL_READER );
+ List<ArtifactMetadata> leftovers = buckets == null ? null : buckets.get(
RepositoryReader.NULL_READER );
if ( buckets == null )
{
@@ -690,7 +686,7 @@
EVENT_READ_ARTIFACTS_FROM_REPO_QUALIFIED, repoId
);
}
- List<ArtifactBasicMetadata> rrQuery = buckets.get( rr );
+ List<ArtifactMetadata> rrQuery = buckets.get( rr );
ArtifactResults rrRes = rr.readArtifacts( rrQuery );
@@ -703,7 +699,7 @@
if ( rrRes.hasResults() )
{
- for ( ArtifactBasicMetadata bm : rrRes.getResults().keySet() )
+ for ( ArtifactMetadata bm : rrRes.getResults().keySet() )
{
List<Artifact> al = rrRes.getResults( bm );
@@ -735,15 +731,15 @@
// then process unqualified virtuals
if ( !Util.isEmpty( leftovers ) )
{
- List<ArtifactBasicMetadata> virtuals = null;
+ List<ArtifactMetadata> virtuals = null;
- for ( ArtifactBasicMetadata md : leftovers )
+ for ( ArtifactMetadata md : leftovers )
{
if ( DefaultArtifactVersion.isVirtual( md.getVersion() ) )
{
if ( virtuals == null )
{
- virtuals = new ArrayList<ArtifactBasicMetadata>();
+ virtuals = new ArrayList<ArtifactMetadata>();
}
virtuals.add( md );
@@ -763,11 +759,11 @@
{
if ( virtRes.hasResults() )
{
- Map<ArtifactBasicMetadata, ArtifactBasicMetadata> sMap
= new HashMap<ArtifactBasicMetadata, ArtifactBasicMetadata>();
+ Map<ArtifactMetadata, ArtifactMetadata> sMap = new HashMap<ArtifactMetadata,
ArtifactMetadata>();
- for ( ArtifactBasicMetadata md : virtRes.getResults().keySet()
)
+ for ( ArtifactMetadata md : virtRes.getResults().keySet() )
{
- ArtifactBasicMetadata v = virtRes.getResult( md ).get( 0
);
+ ArtifactMetadata v = virtRes.getResult( md ).get( 0 );
virtuals.add( v );
sMap.put( v, md );
}
@@ -778,10 +774,10 @@
{
if ( ares.hasResults() )
{
- Map<ArtifactBasicMetadata, List<Artifact>>
aresMap = ares.getResults();
+ Map<ArtifactMetadata, List<Artifact>> aresMap
= ares.getResults();
// remap
- for ( ArtifactBasicMetadata md : aresMap.keySet() )
+ for ( ArtifactMetadata md : aresMap.keySet() )
{
res.add( sMap.get( md ), aresMap.get( md ).get( 0
) );
}
@@ -839,7 +835,7 @@
}
else if ( rrRes.hasResults() )
{
- for ( ArtifactBasicMetadata bm : rrRes.getResults().keySet()
)
+ for ( ArtifactMetadata bm : rrRes.getResults().keySet() )
{
List<Artifact> al = rrRes.getResults( bm );
@@ -887,13 +883,13 @@
// ----------------------------------------------------------------------------------------------------------------------------
// MetadataReader implementation
// ----------------------------------------------------------------------------------------------------------------------------
- public byte[] readMetadata( ArtifactBasicMetadata bmd )
+ public byte[] readMetadata( ArtifactMetadata bmd )
throws MetadataReaderException
{
return readMetadata( bmd, false );
}
- public byte[] readMetadata( ArtifactBasicMetadata bmd, boolean exempt )
+ public byte[] readMetadata( ArtifactMetadata bmd, boolean exempt )
throws MetadataReaderException
{
if ( LOG.isDebugEnabled() )
@@ -909,13 +905,13 @@
// ----------------------------------------------------------------------------------------------------------------------------
// MetadataReader implementation
// ----------------------------------------------------------------------------------------------------------------------------
- public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type
)
+ public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type )
throws MetadataReaderException
{
return readRawData( bmd, classifier, type, false );
}
- public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type,
boolean exempt )
+ public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type, boolean
exempt )
throws MetadataReaderException
{
@@ -942,7 +938,7 @@
event = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_RAW,
eventTag );
}
- ArtifactBasicMetadata bmdQuery = bmd;
+ ArtifactMetadata bmdQuery = bmd;
try
{
@@ -963,9 +959,9 @@
if ( Quality.SNAPSHOT_QUALITY.equals( vq ) )
{
- List<ArtifactBasicMetadata> query = new ArrayList<ArtifactBasicMetadata>(
1 );
+ List<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>(
1 );
- ArtifactBasicMetadata nBmd = new ArtifactBasicMetadata( bmd.toString() );
+ ArtifactMetadata nBmd = new ArtifactMetadata( bmd.toString() );
if( !Util.isEmpty( type ))
nBmd.setType( type );
@@ -988,10 +984,10 @@
if ( vRes.hasResults( nBmd ) )
{
- List<ArtifactBasicMetadata> versions = vRes.getResult( nBmd
);
+ List<ArtifactMetadata> versions = vRes.getResult( nBmd );
- TreeSet<ArtifactBasicMetadata> snapshots =
- new TreeSet<ArtifactBasicMetadata>( new MetadataVersionComparator()
);
+ TreeSet<ArtifactMetadata> snapshots =
+ new TreeSet<ArtifactMetadata>( new MetadataVersionComparator()
);
snapshots.addAll( versions );
bmdQuery = snapshots.last();
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=751167&r1=751166&r2=751167&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 Mar 7 01:38:52 2009
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
import org.apache.maven.mercury.artifact.Artifact;
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.event.MercuryEvent;
import org.apache.maven.mercury.event.MercuryEventListener;
@@ -148,8 +148,8 @@
public void testReadSnapshot()
throws Exception
{
- ArtifactBasicMetadata bmd = new ArtifactBasicMetadata( _artifactCoordSn );
- List<ArtifactBasicMetadata> q = new ArrayList<ArtifactBasicMetadata>();
+ ArtifactMetadata bmd = new ArtifactMetadata( _artifactCoordSn );
+ List<ArtifactMetadata> q = new ArrayList<ArtifactMetadata>();
q.add( bmd );
ArtifactResults res = _vr.readArtifacts( q );
@@ -162,7 +162,7 @@
assertTrue( res.hasResults( bmd ) );
- Map<ArtifactBasicMetadata, List<Artifact>> m = res.getResults();
+ Map<ArtifactMetadata, List<Artifact>> m = res.getResults();
List<Artifact> al = m.get( bmd );
@@ -191,7 +191,7 @@
public void testWrite()
throws Exception
{
- Artifact a = new DefaultArtifact( new ArtifactBasicMetadata( "a:a:1.0:text:txt" )
);
+ Artifact a = new DefaultArtifact( new ArtifactMetadata( "a:a:1.0:text:txt" ) );
File bin = File.createTempFile( "vr-", "-test.txt" );
bin.deleteOnExit();
FileUtil.writeRawData( bin, "test" );
@@ -213,8 +213,8 @@
public void testReadRelease()
throws Exception
{
- ArtifactBasicMetadata bmd = new ArtifactBasicMetadata( _artifactCoordRelease );
- List<ArtifactBasicMetadata> q = new ArrayList<ArtifactBasicMetadata>();
+ ArtifactMetadata bmd = new ArtifactMetadata( _artifactCoordRelease );
+ List<ArtifactMetadata> q = new ArrayList<ArtifactMetadata>();
q.add( bmd );
Listener l = new Listener();
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java
Sat Mar 7 01:38:52 2009
@@ -21,8 +21,6 @@
import java.util.Map;
-import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
-
import org.mortbay.io.Buffer;
import org.mortbay.jetty.client.HttpClient;
import org.mortbay.jetty.client.HttpExchange;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
Sat Mar 7 01:38:52 2009
@@ -27,13 +27,12 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
-
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
+import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
import org.apache.maven.mercury.spi.http.client.ObservableInputStream;
import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
Sat Mar 7 01:38:52 2009
@@ -28,13 +28,12 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
-
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
+import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
import org.apache.maven.mercury.spi.http.client.ObservableOutputStream;
import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
Sat Mar 7 01:38:52 2009
@@ -30,8 +30,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
-
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.crypto.api.StreamVerifier;
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
@@ -39,6 +37,7 @@
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
+import org.apache.maven.mercury.spi.http.client.HttpServletResponse;
import org.apache.maven.mercury.spi.http.client.SecureSender;
import org.apache.maven.mercury.spi.http.validate.Validator;
import org.apache.maven.mercury.transport.api.Binding;
|