Author: oching
Date: Tue Oct 16 00:45:27 2007
New Revision: 585068
URL: http://svn.apache.org/viewvc?rev=585068&view=rev
Log:
removed usage of BidirectionalRepositoryLayout in database cleanup consumers,
made use of the ManagedRepositoryContent instead
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.xml
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.xml
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.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/DatabaseCleanupRemoveArtifactConsumer.java?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
Tue Oct 16 00:45:27 2007
@@ -28,9 +28,6 @@
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.BidirectionalRepositoryLayout;
-import org.apache.maven.archiva.repository.layout.LayoutException;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
import java.util.List;
import java.io.File;
@@ -64,11 +61,6 @@
* @plexus.requirement role-hint="jdo"
*/
private ArtifactDAO artifactDAO;
-
- /**
- * @plexus.requirement
- */
- private BidirectionalRepositoryLayoutFactory layoutFactory;
/**
* @plexus.requirement
@@ -98,9 +90,9 @@
{
ManagedRepositoryContent repositoryContent =
repositoryFactory.getManagedRepositoryContent(
artifact.getModel().getRepositoryId() );
-
- File file = new File( repositoryContent.getRepoRoot(), toPath(
artifact ) );
-
+
+ File file = new File( repositoryContent.getRepoRoot(),
repositoryContent.toPath( artifact ) );
+
if( !file.exists() )
{
artifactDAO.deleteArtifact( artifact );
@@ -136,30 +128,9 @@
{
this.artifactDAO = artifactDAO;
}
-
- public void setBidirectionalRepositoryLayoutFactory(
BidirectionalRepositoryLayoutFactory layoutFactory )
- {
- this.layoutFactory = layoutFactory;
- }
public void setRepositoryFactory( RepositoryContentFactory
repositoryFactory )
{
this.repositoryFactory = repositoryFactory;
- }
-
- 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;
- }
- }
-
+ }
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.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/DatabaseCleanupRemoveProjectConsumer.java?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
Tue Oct 16 00:45:27 2007
@@ -28,14 +28,10 @@
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.BidirectionalRepositoryLayout;
-import org.apache.maven.archiva.repository.layout.LayoutException;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
import org.apache.maven.archiva.database.ProjectModelDAO;
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import java.util.List;
-import java.util.ArrayList;
import java.io.File;
/**
@@ -68,11 +64,6 @@
* @plexus.requirement role-hint="jdo"
*/
private ProjectModelDAO projectModelDAO;
-
- /**
- * @plexus.requirement
- */
- private BidirectionalRepositoryLayoutFactory layoutFactory;
/**
* @plexus.requirement
@@ -108,8 +99,8 @@
ManagedRepositoryContent repositoryContent =
repositoryFactory.getManagedRepositoryContent(
artifact.getModel().getRepositoryId() );
- File file = new File( repositoryContent.getRepoRoot(), toPath(
artifact ) );
-
+ File file = new File( repositoryContent.getRepoRoot(),
repositoryContent.toPath( artifact ) );
+
if( !file.exists() )
{
ArchivaProjectModel projectModel =
projectModelDAO.getProjectModel(
@@ -144,30 +135,10 @@
{
return false;
}
-
- 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;
- }
- }
-
+
public void setProjectModelDAO( ProjectModelDAO projectModelDAO )
{
this.projectModelDAO = projectModelDAO;
- }
-
- public void setBidirectionalRepositoryLayoutFactory(
BidirectionalRepositoryLayoutFactory layoutFactory )
- {
- this.layoutFactory = layoutFactory;
}
public void setRepositoryFactory( RepositoryContentFactory
repositoryFactory )
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
Tue Oct 16 00:45:27 2007
@@ -25,7 +25,6 @@
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.repository.RepositoryContentFactory;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaArtifactModel;
import org.apache.maven.archiva.model.ArchivaProjectModel;
@@ -39,8 +38,6 @@
extends PlexusTestCase
{
ArchivaConfiguration archivaConfig;
-
- BidirectionalRepositoryLayoutFactory layoutFactory;
RepositoryContentFactory repositoryFactory;
@@ -73,9 +70,6 @@
repo.setLocation( new File( getBasedir(),
"src/test/resources/test-repo" ).toString() );
archivaConfig.save( configuration );
-
- // set bidirectional repository layout factory
- layoutFactory = (BidirectionalRepositoryLayoutFactory) lookup(
BidirectionalRepositoryLayoutFactory.class );
repositoryFactory = (RepositoryContentFactory) lookup(
RepositoryContentFactory.class );
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.java?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.java
Tue Oct 16 00:45:27 2007
@@ -50,8 +50,6 @@
dbCleanupRemoveArtifactConsumer.setArtifactDAO( artifactDAOMock );
-
dbCleanupRemoveArtifactConsumer.setBidirectionalRepositoryLayoutFactory(
layoutFactory );
-
dbCleanupRemoveArtifactConsumer.setRepositoryFactory(
repositoryFactory );
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.java?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.java
Tue Oct 16 00:45:27 2007
@@ -51,8 +51,6 @@
dbCleanupRemoveProjectConsumer.setProjectModelDAO( projectModelDAOMock
);
-
dbCleanupRemoveProjectConsumer.setBidirectionalRepositoryLayoutFactory(
layoutFactory );
-
dbCleanupRemoveProjectConsumer.setRepositoryFactory( repositoryFactory
);
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.xml?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumerTest.xml
Tue Oct 16 00:45:27 2007
@@ -21,24 +21,6 @@
<component-set>
<components>
<component>
- <role>org.apache.maven.archiva.consumers.DatabaseCleanupConsumer</role>
- <role-hint>not-present-remove-db-artifact</role-hint>
-
<implementation>org.apache.maven.archiva.consumers.database.DatabaseCleanupRemoveArtifactConsumer</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
- <role-hint>database-cleanup</role-hint>
- </requirement>
- <requirement>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.archiva.database.ArtifactDAO</role>
- <role-hint>jdo</role-hint>
- </requirement>
- </requirements>
- </component>
- <component>
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
<role-hint>database-cleanup</role-hint>
<implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
@@ -59,25 +41,6 @@
config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
</properties>
</configuration>
- </component>
- <component>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory</role>
-
<implementation>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
- <role-hint>database-cleanup</role-hint>
- </requirement>
- <requirement>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout</role>
- <field-name>layouts</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.archiva.repository.layout.DefaultBidirectionalRepositoryLayout</implementation>
</component>
<component>
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.xml?rev=585068&r1=585067&r2=585068&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumerTest.xml
Tue Oct 16 00:45:27 2007
@@ -42,25 +42,6 @@
</properties>
</configuration>
</component>
- <component>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory</role>
-
<implementation>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
- <role-hint>database-cleanup</role-hint>
- </requirement>
- <requirement>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout</role>
- <field-name>layouts</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
-
<role>org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.archiva.repository.layout.DefaultBidirectionalRepositoryLayout</implementation>
- </component>
<component>
<role>org.apache.maven.archiva.repository.RepositoryContentFactory</role>
