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/07/30 01:27:01 UTC
svn commit: r680879 - in
/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury: ./
repository/api/ repository/local/m2/ repository/remote/m2/
Author: ogusakov
Date: Tue Jul 29 16:27:00 2008
New Revision: 680879
URL: http://svn.apache.org/viewvc?rev=680879&view=rev
Log:
small optimization - moving readMetadata() into abstract class as it's the same in all implementations
Added:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java (contents, props changed)
- copied, changed from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java (contents, props changed)
- copied, changed from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java
- copied, changed from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java (contents, props changed)
- copied, changed from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
- copied, changed from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java (contents, props changed)
- copied, changed from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java (from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java&r1=680875&r2=680879&rev=680879&view=diff
==============================================================================
(empty)
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java (from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java&r1=680875&r2=680879&rev=680879&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java Tue Jul 29 16:27:00 2008
@@ -146,6 +146,11 @@
{
return artifactId + "-" + version + (classifier == null ? "" :"-"+classifier);
}
+
+ public String getBaseName( String classifier )
+ {
+ return artifactId + "-" + version + (classifier == null ? "" :"-"+classifier);
+ }
public String getCheckedType()
{
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java (from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java&r1=680875&r2=680879&rev=680879&view=diff
==============================================================================
(empty)
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java (from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java&r1=680875&r2=680879&rev=680879&view=diff
==============================================================================
(empty)
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java (from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java&r1=680875&r2=680879&rev=680879&view=diff
==============================================================================
(empty)
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java (from r680875, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java&r1=680875&r2=680879&rev=680879&view=diff
==============================================================================
(empty)
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java?rev=680879&r1=680878&r2=680879&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java Tue Jul 29 16:27:00 2008
@@ -1,5 +1,7 @@
package org.apache.maven.mercury.repository.api;
+import org.apache.maven.mercury.ArtifactBasicMetadata;
+
/**
* This is to keep MetadataProcessor for all readers
@@ -9,7 +11,7 @@
*
*/
public abstract class AbstracRepositoryReader
-implements RepositoryReader
+implements RepositoryReader, MetadataReader
{
protected MetadataProcessor _mdProcessor;
@@ -23,4 +25,10 @@
return _mdProcessor;
}
+ public byte[] readMetadata( ArtifactBasicMetadata bmd )
+ throws MetadataProcessingException
+ {
+ return readRawData( bmd, "", "pom" );
+ }
+
}
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java?rev=680879&r1=680878&r2=680879&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java Tue Jul 29 16:27:00 2008
@@ -16,11 +16,12 @@
* read content pointed by bmd. It will return POM bytes regardless of actual bmd type
*
* @param bmd coordinates
+ * @param classifier - replaces the getClassifier() from bmd if not null
* @param type - replaces the getType() from bmd if not null
* @return
* @throws MetadataProcessingException
*/
- public byte [] readRawData( ArtifactBasicMetadata bmd, String type )
+ public byte [] readRawData( ArtifactBasicMetadata bmd, String classifier, String type )
throws MetadataProcessingException;
/**
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java?rev=680879&r1=680878&r2=680879&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java Tue Jul 29 16:27:00 2008
@@ -18,6 +18,7 @@
*
*/
public class VirtualRepositoryReader
+implements MetadataReader
{
//----------------------------------------------------------------------------------------------------------------------------
private List<Repository> _repositories = new ArrayList<Repository>(8);
@@ -163,5 +164,37 @@
return null;
}
//----------------------------------------------------------------------------------------------------------------------------
+ /* (non-Javadoc)
+ * @see org.apache.maven.mercury.repository.api.MetadataReader#readMetadata(org.apache.maven.mercury.ArtifactBasicMetadata)
+ */
+ public byte[] readMetadata( ArtifactBasicMetadata bmd )
+ throws MetadataProcessingException
+ {
+ return readRawData( bmd, "", "pom" );
+ }
+ //----------------------------------------------------------------------------------------------------------------------------
+ /* (non-Javadoc)
+ * @see org.apache.maven.mercury.repository.api.MetadataReader#readRawData(org.apache.maven.mercury.ArtifactBasicMetadata, java.lang.String)
+ */
+ public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type )
+ throws MetadataProcessingException
+ {
+ if( bmd == null )
+ throw new IllegalArgumentException("null bmd supplied");
+
+ init();
+
+ byte [] res = null;
+
+ for( RepositoryReader rr : _repositoryReaders )
+ {
+ res = rr.readRawData( bmd, classifier, type );
+ if( res != null )
+ return res;
+ }
+
+ return null;
+ }
+ //----------------------------------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------------------------------
}
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=680879&r1=680878&r2=680879&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Tue Jul 29 16:27:00 2008
@@ -174,18 +174,12 @@
return res;
}
//---------------------------------------------------------------------------------------------------------------
- public byte[] readMetadata( ArtifactBasicMetadata bmd )
- throws MetadataProcessingException
- {
- return readRawData( bmd, "pom" );
- }
- //---------------------------------------------------------------------------------------------------------------
- public byte[] readRawData( ArtifactBasicMetadata bmd, String type )
+ public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type )
throws MetadataProcessingException
{
String bmdPath = bmd.getGroupId().replace( '.', '/' )+"/"+bmd.getArtifactId()+"/"+bmd.getVersion();
- File pomFile = new File( _repoDir, bmdPath+"/"+bmd.getBaseName()+'.' + (type == null ? bmd.getType() : type ) );
+ File pomFile = new File( _repoDir, bmdPath+"/"+bmd.getBaseName(classifier)+'.' + (type == null ? bmd.getType() : type ) );
if( ! pomFile.exists() )
return null;
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=680879&r1=680878&r2=680879&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Tue Jul 29 16:27:00 2008
@@ -221,19 +221,13 @@
return res;
}
//---------------------------------------------------------------------------------------------------------------
- public byte[] readMetadata( ArtifactBasicMetadata bmd )
- throws MetadataProcessingException
- {
- return readRawData( bmd, "pom" );
- }
- //---------------------------------------------------------------------------------------------------------------
- public byte[] readRawData( ArtifactBasicMetadata bmd, String type )
+ public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type )
throws MetadataProcessingException
{
String bmdPath = bmd.getGroupId().replace( '.', '/' )
+ '/'+bmd.getArtifactId()
+ '/'+bmd.getVersion()
- + '/'+bmd.getBaseName()
+ + '/'+bmd.getBaseName(classifier)
+ '.' + (type == null ? bmd.getType() : type )
;