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

Upgrading bidirlayout usage to RepoContent usage to eliminate bugs around missing content from bad layout routines. 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@585574 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-10-17 16:56:51 +00:00
parent acdff6dcc1
commit b8ec325b49
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
View File

@ -31,8 +31,10 @@ import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory;
import org.apache.maven.archiva.indexer.RepositoryIndexException;
import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
import org.apache.maven.archiva.repository.RepositoryContentFactory;
import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@ -81,28 +83,26 @@ public class IndexContentConsumer
*/
private FileTypes filetypes;
/**
* @plexus.requirement
*/
private RepositoryContentFactory repositoryFactory;
/**
* @plexus.requirement role-hint="lucene"
*/
private RepositoryContentIndexFactory indexFactory;
/**
* @plexus.requirement
*/
private BidirectionalRepositoryLayoutFactory layoutFactory;
private List<String> propertyNameTriggers = new ArrayList<String>();
private List<String> includes = new ArrayList<String>();
private RepositoryContentIndex index;
private ManagedRepositoryConfiguration repository;
private ManagedRepositoryContent repository;
private File repositoryDir;
private BidirectionalRepositoryLayout repositoryLayout;
public String getId()
{
return this.id;
@ -128,21 +128,18 @@ public class IndexContentConsumer
return this.includes;
}
public void beginScan( ManagedRepositoryConfiguration repository )
public void beginScan( ManagedRepositoryConfiguration repo )
throws ConsumerException
{
this.repository = repository;
this.repositoryDir = new File( repository.getLocation() );
this.index = indexFactory.createFileContentIndex( repository );
try
{
this.repositoryLayout = layoutFactory.getLayout( this.repository.getLayout() );
this.repository = repositoryFactory.getManagedRepositoryContent( repo.getId() );
this.repositoryDir = new File( repository.getRepoRoot() );
this.index = indexFactory.createFileContentIndex( repository.getRepository() );
}
catch ( LayoutException e )
catch ( RepositoryException e )
{
throw new ConsumerException(
"Unable to initialize consumer due to unknown repository layout: " + e.getMessage(), e );
throw new ConsumerException( "Unable to start IndexContentConsumer: " + e.getMessage(), e );
}
}
@ -160,7 +157,8 @@ public class IndexContentConsumer
// Test for possible artifact reference syntax.
try
{
ArchivaArtifact artifact = this.repositoryLayout.toArtifact( path );
ArtifactReference ref = repository.toArtifactReference( path );
ArchivaArtifact artifact = new ArchivaArtifact( ref );
record.setArtifact( artifact );
}
catch ( LayoutException e )