Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1282] make the creation consumer read from storage so we get consistent metadata creation 

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@889061 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-12-10 02:29:30 +00:00
parent b884896763
commit a3a67162c5
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
View File

@ -40,10 +40,6 @@
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-api</artifactId>
</dependency>
<dependency> <!-- FIXME: temporary coupling to file based repo -->
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-file</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>

26
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
View File

@ -31,6 +31,8 @@ import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataResolverException;
import org.apache.archiva.metadata.repository.storage.StorageMetadataResolver;
import org.apache.maven.archiva.common.utils.VersionUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
@ -94,6 +96,15 @@ public class ArchivaMetadataCreationConsumer
*/
private MetadataRepository metadataRepository;
/**
* FIXME: this needs to be configurable based on storage type, and availability of proxy module
* ... could be a different type since we need methods to modify the storage metadata, which would also allow more
* appropriate methods to pass in the already determined repository configuration, for example, instead of the ID
*
* @plexus.requirement role-hint="maven2"
*/
private StorageMetadataResolver storageResolver;
private static final Logger log = LoggerFactory.getLogger( ArchivaMetadataCreationConsumer.class );
public String getId()
@ -150,8 +161,18 @@ public class ArchivaMetadataCreationConsumer
project.setNamespace( artifact.getGroupId() );
project.setId( artifact.getArtifactId() );
ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
versionMetadata.setId( VersionUtil.getBaseVersion( artifact.getVersion() ) );
// TODO: maybe not too efficient since it may have already been read and stored for this artifact
ProjectVersionMetadata versionMetadata = null;
try
{
versionMetadata =
storageResolver.getProjectVersion( repository.getId(), artifact.getGroupId(), artifact.getArtifactId(),
VersionUtil.getBaseVersion( artifact.getVersion() ) );
}
catch ( MetadataResolverException e )
{
throw new ConsumerException( e.getMessage(), e );
}
ArtifactMetadata artifactMeta = new ArtifactMetadata();
artifactMeta.setRepositoryId( repository.getId() );
@ -181,7 +202,6 @@ public class ArchivaMetadataCreationConsumer
log.error( "Error attempting to get SHA-1 checksum for " + file + ": " + e.getMessage() );
}
// TODO: read the POM and fill in the rest of the information
// TODO: transaction
// read the metadata and update it if it is newer or doesn't exist