You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/12 19:56:30 UTC
svn commit: r584216 -
/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Author: joakime
Date: Fri Oct 12 10:56:29 2007
New Revision: 584216
URL: http://svn.apache.org/viewvc?rev=584216&view=rev
Log:
Removing BidirectionalRepositoryLayoutFactory usage.
Replacing with more reliable ManagedRepositoryContent operations.
Cleaning up logging output.
Using new ManagedRepositoryContent.toFile( ArchivaArtifact ) method.
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?rev=584216&r1=584215&r2=584216&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java Fri Oct 12 10:56:29 2007
@@ -21,9 +21,6 @@
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
@@ -32,11 +29,13 @@
import org.apache.maven.archiva.database.ObjectNotFoundException;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.model.Keys;
import org.apache.maven.archiva.model.RepositoryProblem;
import org.apache.maven.archiva.reporting.artifact.CorruptArtifactReport;
-import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
-import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+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.content.ManagedLegacyRepositoryContent;
import org.apache.maven.archiva.repository.project.ProjectModelException;
import org.apache.maven.archiva.repository.project.ProjectModelFilter;
import org.apache.maven.archiva.repository.project.ProjectModelReader;
@@ -77,12 +76,7 @@
/**
* @plexus.requirement
*/
- private ArchivaConfiguration archivaConfiguration;
-
- /**
- * @plexus.requirement
- */
- private BidirectionalRepositoryLayoutFactory layoutFactory;
+ private RepositoryContentFactory repositoryFactory;
/**
* @plexus.requirement role-hint="model400"
@@ -143,11 +137,11 @@
return;
}
- File artifactFile = toFile( artifact );
- AbstractRepositoryConfiguration repo = getRepository( artifact );
+ ManagedRepositoryContent repo = getRepository( artifact );
+ File artifactFile = repo.toFile( artifact );
ProjectModelReader reader = project400Reader;
- if ( StringUtils.equals( "legacy", repo.getLayout() ) )
+ if ( repo instanceof ManagedLegacyRepositoryContent )
{
reader = project300Reader;
}
@@ -170,16 +164,16 @@
// Resolve the project model
model = effectiveModelFilter.filter( model );
- if ( isValidModel( model, artifact ) )
+ if ( isValidModel( model, repo, artifact ) )
{
- getLogger().info( "Add project model " + model + " to database." );
+ getLogger().info( "Adding project model to database - " + Keys.toKey( model ) );
dao.getProjectModelDAO().saveProjectModel( model );
}
else
{
getLogger().warn(
- "Invalid or corrupt pom. Project model " + model + " was not added in the database." );
+ "Invalid or corrupt pom. Project model not added to database - " + Keys.toKey( model ) );
}
}
@@ -219,29 +213,18 @@
}
}
- private ManagedRepositoryConfiguration getRepository( ArchivaArtifact artifact )
+ private ManagedRepositoryContent getRepository( ArchivaArtifact artifact )
+ throws ConsumerException
{
String repoId = artifact.getModel().getRepositoryId();
- return archivaConfiguration.getConfiguration().findManagedRepositoryById( repoId );
- }
-
- private File toFile( ArchivaArtifact artifact )
- {
- ManagedRepositoryConfiguration repoConfig = getRepository( artifact );
-
- BidirectionalRepositoryLayout layout = null;
-
try
{
- layout = layoutFactory.getLayout( artifact );
+ return repositoryFactory.getManagedRepositoryContent( repoId );
}
- catch ( LayoutException e )
+ catch ( RepositoryException e )
{
- getLogger().warn( "Unable to determine layout of " + artifact + ": " + e.getMessage(), e );
- return null;
+ throw new ConsumerException( "Unable to process project model: " + e.getMessage(), e );
}
-
- return new File( repoConfig.getLocation(), layout.toPath( artifact ) );
}
public String getDescription()
@@ -260,24 +243,10 @@
return true;
}
- private String toPath( ArchivaArtifact artifact )
- {
- try
- {
- BidirectionalRepositoryLayout layout = layoutFactory.getLayout( artifact );
- return layout.toPath( artifact );
- }
- catch ( LayoutException e )
- {
- getLogger().warn( "Unable to calculate path for artifact: " + artifact );
- return null;
- }
- }
-
- private boolean isValidModel( ArchivaProjectModel model, ArchivaArtifact artifact )
+ private boolean isValidModel( ArchivaProjectModel model, ManagedRepositoryContent repo, ArchivaArtifact artifact )
throws ConsumerException
{
- File artifactFile = toFile( artifact );
+ File artifactFile = repo.toFile( artifact );
if ( !artifact.getArtifactId().equalsIgnoreCase( model.getArtifactId() ) )
{
@@ -324,9 +293,11 @@
private void addProblem( ArchivaArtifact artifact, String msg )
throws ConsumerException
{
+ ManagedRepositoryContent repo = getRepository( artifact );
+
RepositoryProblem problem = new RepositoryProblem();
problem.setRepositoryId( artifact.getModel().getRepositoryId() );
- problem.setPath( toPath( artifact ) );
+ problem.setPath( repo.toPath( artifact ) );
problem.setGroupId( artifact.getGroupId() );
problem.setArtifactId( artifact.getArtifactId() );
problem.setVersion( artifact.getVersion() );