From 8af86cd884b34ecfa98c6a42d2975fdd45c48fff Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 8 Oct 2007 22:07:39 +0000 Subject: [PATCH] Finishing the Repository split work that brett started. ArchivaRepository has been removed from model. This work was needed before repository layout/detection proposal work is started. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@582987 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-consumer-api/pom.xml | 4 + .../consumers/RepositoryContentConsumer.java | 4 +- .../ArtifactMissingChecksumsConsumer.java | 10 +- .../consumers/core/AutoRemoveConsumer.java | 6 +- .../consumers/core/AutoRenameConsumer.java | 6 +- .../core/MetadataUpdaterConsumer.java | 10 +- .../core/ValidateChecksumConsumer.java | 6 +- .../repository/AbstractRepositoryPurge.java | 8 +- ...eanupReleasedSnapshotsRepositoryPurge.java | 6 +- .../repository/DaysOldRepositoryPurge.java | 6 +- .../repository/RepositoryPurgeConsumer.java | 5 +- .../RetentionCountRepositoryPurge.java | 6 +- .../AbstractRepositoryPurgeTest.java | 44 +++-- .../RepositoryPurgeConsumerTest.xml | 15 -- .../ArtifactUpdateDatabaseConsumer.java | 10 +- .../lucene/IndexArtifactConsumer.java | 11 +- .../lucene/IndexContentConsumer.java | 10 +- .../DefaultLegacyRepositoryConverter.java | 22 +-- .../LegacyConverterArtifactConsumer.java | 4 +- .../converter/RepositoryConverterTest.java | 14 +- .../indexer/RepositoryContentIndex.java | 4 +- .../RepositoryContentIndexFactory.java | 8 +- .../functors/BytecodeIndexTransformer.java | 6 +- .../functors/FileContentIndexTransformer.java | 6 +- .../functors/HashcodesIndexTransformer.java | 6 +- ...serAllowedToSearchRepositoryPredicate.java | 4 +- .../lucene/LuceneRepositoryContentIndex.java | 8 +- .../LuceneRepositoryContentIndexFactory.java | 13 +- .../search/DefaultCrossRepositorySearch.java | 3 +- .../indexer/AbstractIndexerTestCase.java | 23 +-- .../indexer/bytecode/BytecodeIndexTest.java | 4 +- .../indexer/bytecode/BytecodeSearchTest.java | 4 +- .../indexer/hashcodes/HashcodesIndexTest.java | 4 +- .../hashcodes/HashcodesSearchTest.java | 4 +- .../DefaultCrossRepositorySearchTest.java | 16 +- .../archiva/model/ArchivaRepository.java | 137 ---------------- .../src/main/mdo/archiva-base.xml | 129 +-------------- .../DefaultRepositoryProxyConnectors.java | 145 ++++++++++------- .../maven/archiva/proxy/ProxyConnector.java | 15 +- .../proxy/RepositoryProxyConnectors.java | 12 +- .../archiva/proxy/AbstractProxyTestCase.java | 85 +++++----- .../apache/maven/archiva/proxy/AllTests.java | 48 ------ .../proxy/CacheFailuresTransferTest.java | 4 +- .../proxy/ManagedDefaultTransferTest.java | 19 +-- .../maven/archiva/proxy/WagonDelegate.java | 2 +- .../ArchivaConfigurationAdaptor.java | 67 -------- .../connector/RepositoryConnector.java | 11 +- .../repository/metadata/MetadataTools.java | 47 +++--- .../project/ProjectModelResolverFactory.java | 17 +- ... => ManagedRepositoryProjectResolver.java} | 12 +- .../scanner/DefaultRepositoryScanner.java | 77 ++++----- .../scanner/RepositoryContentConsumers.java | 153 ++++++------------ .../scanner/RepositoryScanStatistics.java | 144 +++++++++++++++++ .../repository/scanner/RepositoryScanner.java | 22 +-- .../scanner/RepositoryScannerInstance.java | 28 ++-- .../functors/TriggerBeginScanClosure.java | 6 +- .../AbstractRepositoryLayerTestCase.java | 54 +++++++ ...BidirectionalRepositoryLayoutTestCase.java | 18 ++- .../metadata/MetadataToolsTest.java | 119 ++++++++------ .../EffectiveProjectModelFilterTest.java | 13 +- .../scanner/InvalidScanConsumer.java | 4 +- .../repository/scanner/KnownScanConsumer.java | 4 +- .../RepositoryContentConsumerUtilTest.java | 8 +- .../scanner/RepositoryScannerTest.java | 34 ++-- .../scanner/SampleKnownConsumer.java | 4 +- .../archiva/cli/AbstractProgressConsumer.java | 4 +- .../apache/maven/archiva/cli/ArchivaCli.java | 12 +- .../archiva/cli/ProjectReaderConsumer.java | 8 +- .../maven/archiva/database/ArchivaDAO.java | 2 - .../maven/archiva/database/RepositoryDAO.java | 71 -------- .../archiva/database/jdo/JdoArchivaDAO.java | 11 -- .../database/jdo/JdoRepositoryDAO.java | 118 -------------- .../database/jdo/JdoArchivaDAOTest.java | 3 +- .../database/jdo/JdoRepositoryDAOTest.java | 96 ----------- .../artifact/LocationArtifactsConsumer.java | 16 +- ...ArchivaRepositoryScanningTaskExecutor.java | 32 ++-- ...ArchivaDatabaseUpdateTaskExecutorTest.java | 29 ++-- ...ivaRepositoryScanningTaskExecutorTest.java | 36 ++--- .../src/test/resources/archiva-test.xml | 10 +- ...hivaRepositoryScanningTaskExecutorTest.xml | 5 +- .../web/repository/ProxiedDavServer.java | 23 +-- .../archiva/web/startup/ArchivaStartup.java | 4 +- ...tion.java => SecuritySynchronization.java} | 48 +----- .../archiva/web/tags/DownloadArtifact.java | 29 +++- .../admin/repositories/ArchivaDAOStub.java | 9 +- 85 files changed, 881 insertions(+), 1443 deletions(-) delete mode 100644 archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java delete mode 100644 archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java delete mode 100644 archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java rename archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/{RepositoryProjectResolver.java => ManagedRepositoryProjectResolver.java} (84%) create mode 100644 archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanStatistics.java create mode 100644 archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java delete mode 100644 archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDAO.java delete mode 100644 archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java delete mode 100644 archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java rename archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/{ConfigurationSynchronization.java => SecuritySynchronization.java} (62%) diff --git a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index ea0716c02..5a2abf85b 100644 --- a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -29,6 +29,10 @@ jar + + org.apache.maven.archiva + archiva-configuration + org.apache.maven.archiva archiva-model diff --git a/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java b/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java index 005423f23..56dae57ef 100644 --- a/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java +++ b/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.consumers; * under the License. */ -import org.apache.maven.archiva.model.ArchivaRepository; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import java.util.List; @@ -58,7 +58,7 @@ public interface RepositoryContentConsumer extends BaseConsumer * @param repository the repository that this consumer is being used for. * @throws ConsumerException if there was a problem with using the provided repository with the consumer. */ - public void beginScan( ArchivaRepository repository ) throws ConsumerException; + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException; /** *

diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java index 0760ad973..41c43293f 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java @@ -21,10 +21,10 @@ package org.apache.maven.archiva.consumers.core; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.FileTypes; +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.KnownRepositoryContentConsumer; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.codehaus.plexus.digest.ChecksumFile; import org.codehaus.plexus.digest.Digester; @@ -99,7 +99,7 @@ public class ArtifactMissingChecksumsConsumer private static final String TYPE_CHECKSUM_CANNOT_CREATE = "checksum-create-failure"; - private ArchivaRepository repository; + private ManagedRepositoryConfiguration repository; private File repositoryDir; @@ -124,13 +124,13 @@ public class ArtifactMissingChecksumsConsumer return false; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { this.repository = repository; - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); - String layoutName = repository.getModel().getLayoutName(); + String layoutName = repository.getLayout(); if ( !bidirectionalLayoutMap.containsKey( layoutName ) ) { throw new ConsumerException( "Unable to process repository with layout [" + layoutName + diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java index b3d032002..d8f84be2e 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java @@ -21,10 +21,10 @@ package org.apache.maven.archiva.consumers.core; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.FileTypes; +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.KnownRepositoryContentConsumer; -import org.apache.maven.archiva.model.ArchivaRepository; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.codehaus.plexus.registry.Registry; @@ -88,10 +88,10 @@ public class AutoRemoveConsumer return false; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); } public void completeScan() diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java index b1004a80d..f373946a3 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java @@ -19,10 +19,10 @@ package org.apache.maven.archiva.consumers.core; * under the License. */ +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.KnownRepositoryContentConsumer; -import org.apache.maven.archiva.model.ArchivaRepository; import org.codehaus.plexus.util.FileUtils; import java.io.File; @@ -90,10 +90,10 @@ public class AutoRenameConsumer return false; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); } public void completeScan() diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java index b1be25012..21af9d294 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java @@ -22,10 +22,10 @@ package org.apache.maven.archiva.consumers.core; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.FileTypes; +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.KnownRepositoryContentConsumer; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.ProjectReference; import org.apache.maven.archiva.model.VersionedReference; @@ -93,7 +93,7 @@ public class MetadataUpdaterConsumer private static final String TYPE_METADATA_IO = "metadata-io-warning"; - private ArchivaRepository repository; + private ManagedRepositoryConfiguration repository; private File repositoryDir; @@ -118,14 +118,14 @@ public class MetadataUpdaterConsumer this.includes = includes; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { this.repository = repository; - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); try { - this.repositoryLayout = layoutFactory.getLayout( repository.getLayoutType() ); + this.repositoryLayout = layoutFactory.getLayout( repository.getLayout() ); } catch ( LayoutException e ) { diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java index 318d97857..cb3032847 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java @@ -19,10 +19,10 @@ package org.apache.maven.archiva.consumers.core; * under the License. */ +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.KnownRepositoryContentConsumer; -import org.apache.maven.archiva.model.ArchivaRepository; import org.codehaus.plexus.digest.ChecksumFile; import org.codehaus.plexus.digest.Digester; import org.codehaus.plexus.digest.DigesterException; @@ -96,10 +96,10 @@ public class ValidateChecksumConsumer return false; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); } public void completeScan() diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java index 5bfd82675..ccbd0ebad 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java @@ -20,11 +20,11 @@ package org.apache.maven.archiva.consumers.core.repository; */ import org.apache.commons.lang.StringUtils; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.ArtifactDAO; import org.apache.maven.archiva.indexer.RepositoryIndexException; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.FilenameParts; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -39,13 +39,13 @@ import java.io.FilenameFilter; public abstract class AbstractRepositoryPurge implements RepositoryPurge { - protected ArchivaRepository repository; + protected ManagedRepositoryConfiguration repository; protected BidirectionalRepositoryLayout layout; protected ArtifactDAO artifactDao; - public AbstractRepositoryPurge( ArchivaRepository repository, BidirectionalRepositoryLayout layout, + public AbstractRepositoryPurge( ManagedRepositoryConfiguration repository, BidirectionalRepositoryLayout layout, ArtifactDAO artifactDao ) { this.repository = repository; @@ -81,7 +81,7 @@ public abstract class AbstractRepositoryPurge { artifactFiles[i].delete(); - String[] artifactPathParts = artifactFiles[i].getAbsolutePath().split( repository.getUrl().getPath() ); + String[] artifactPathParts = artifactFiles[i].getAbsolutePath().split( repository.getLocation() ); String artifactPath = artifactPathParts[artifactPathParts.length - 1]; if ( !artifactPath.toUpperCase().endsWith( "SHA1" ) && !artifactPath.toUpperCase().endsWith( "MD5" ) ) { diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java index 6a629cb16..227c19f8a 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java @@ -22,8 +22,8 @@ package org.apache.maven.archiva.consumers.core.repository; import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.common.utils.VersionComparator; import org.apache.maven.archiva.common.utils.VersionUtil; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArtifactDAO; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.model.ArchivaRepositoryMetadata; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.FilenameParts; @@ -53,7 +53,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge private RepositoryMetadataReader metadataReader; - public CleanupReleasedSnapshotsRepositoryPurge( ArchivaRepository repository, BidirectionalRepositoryLayout layout, + public CleanupReleasedSnapshotsRepositoryPurge( ManagedRepositoryConfiguration repository, BidirectionalRepositoryLayout layout, ArtifactDAO artifactDao ) { super( repository, layout, artifactDao ); @@ -65,7 +65,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge { try { - File artifactFile = new File( repository.getUrl().getPath(), path ); + File artifactFile = new File( repository.getLocation(), path ); if ( !artifactFile.exists() ) { diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java index 14e0f0a8e..e092f4ba5 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java @@ -21,8 +21,8 @@ package org.apache.maven.archiva.consumers.core.repository; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.common.utils.VersionUtil; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArtifactDAO; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.FilenameParts; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -40,7 +40,7 @@ public class DaysOldRepositoryPurge { private int daysOlder; - public DaysOldRepositoryPurge( ArchivaRepository repository, BidirectionalRepositoryLayout layout, + public DaysOldRepositoryPurge( ManagedRepositoryConfiguration repository, BidirectionalRepositoryLayout layout, ArtifactDAO artifactDao, int daysOlder ) { super( repository, layout, artifactDao ); @@ -52,7 +52,7 @@ public class DaysOldRepositoryPurge { try { - File artifactFile = new File( repository.getUrl().getPath(), path ); + File artifactFile = new File( repository.getLocation(), path ); if ( !artifactFile.exists() ) { diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index c40916fce..6a6df7c67 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -26,7 +26,6 @@ import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer; import org.apache.maven.archiva.consumers.ConsumerException; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.maven.archiva.database.ArchivaDAO; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -116,13 +115,13 @@ public class RepositoryPurgeConsumer return this.includes; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { BidirectionalRepositoryLayout repositoryLayout; try { - repositoryLayout = layoutFactory.getLayout( repository.getLayoutType() ); + repositoryLayout = layoutFactory.getLayout( repository.getLayout() ); } catch ( LayoutException e ) { diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java index 76456bf95..7c7e6eb19 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java @@ -20,8 +20,8 @@ package org.apache.maven.archiva.consumers.core.repository; */ import org.apache.maven.archiva.common.utils.VersionUtil; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArtifactDAO; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.FilenameParts; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -42,7 +42,7 @@ public class RetentionCountRepositoryPurge { private int retentionCount; - public RetentionCountRepositoryPurge( ArchivaRepository repository, BidirectionalRepositoryLayout layout, + public RetentionCountRepositoryPurge( ManagedRepositoryConfiguration repository, BidirectionalRepositoryLayout layout, ArtifactDAO artifactDao, int retentionCount ) { super( repository, layout, artifactDao ); @@ -54,7 +54,7 @@ public class RetentionCountRepositoryPurge { try { - File artifactFile = new File( repository.getUrl().getPath(), path ); + File artifactFile = new File( repository.getLocation(), path ); if ( !artifactFile.exists() ) { diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java index 5e2251b73..a7d93195b 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java @@ -19,12 +19,10 @@ package org.apache.maven.archiva.consumers.core.repository; * under the License. */ -import org.apache.maven.archiva.common.utils.PathUtil; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.ArtifactDAO; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.DefaultBidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -33,8 +31,6 @@ import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; import org.codehaus.plexus.jdo.JdoFactory; import org.jpox.SchemaTool; -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; import java.io.File; import java.net.URL; import java.util.Date; @@ -43,6 +39,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import javax.jdo.PersistenceManager; +import javax.jdo.PersistenceManagerFactory; + /** * @author Maria Odea Ching */ @@ -53,33 +52,27 @@ public abstract class AbstractRepositoryPurgeTest public static final String TEST_REPO_NAME = "Test Repository"; - public static final String TEST_REPO_URL = getBasedir() + "/target/test/test-repo/"; + public static final String TEST_REPO_LOCATION = getBasedir() + "/target/test/test-repo/"; public static final int TEST_RETENTION_COUNT = 2; public static final int TEST_DAYS_OLDER = 30; - public static final String PATH_TO_BY_DAYS_OLD_ARTIFACT = - "org/apache/maven/plugins/maven-install-plugin/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar"; + public static final String PATH_TO_BY_DAYS_OLD_ARTIFACT = "org/apache/maven/plugins/maven-install-plugin/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar"; - public static final String PATH_TO_BY_DAYS_OLD_METADATA_DRIVEN_ARTIFACT = - "org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar"; + public static final String PATH_TO_BY_DAYS_OLD_METADATA_DRIVEN_ARTIFACT = "org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar"; - public static final String PATH_TO_BY_RETENTION_COUNT_ARTIFACT = - "org/jruby/plugins/jruby-rake-plugin/1.0RC1-SNAPSHOT/jruby-rake-plugin-1.0RC1-20070504.153317-1.jar"; + public static final String PATH_TO_BY_RETENTION_COUNT_ARTIFACT = "org/jruby/plugins/jruby-rake-plugin/1.0RC1-SNAPSHOT/jruby-rake-plugin-1.0RC1-20070504.153317-1.jar"; - public static final String PATH_TO_BY_RETENTION_COUNT_POM = - "org/codehaus/castor/castor-anttasks/1.1.2-SNAPSHOT/castor-anttasks-1.1.2-20070506.163513-2.pom"; + public static final String PATH_TO_BY_RETENTION_COUNT_POM = "org/codehaus/castor/castor-anttasks/1.1.2-SNAPSHOT/castor-anttasks-1.1.2-20070506.163513-2.pom"; - public static final String PATH_TO_RELEASED_SNAPSHOT = - "org/apache/maven/plugins/maven-plugin-plugin/2.3-SNAPSHOT/maven-plugin-plugin-2.3-SNAPSHOT.jar"; + public static final String PATH_TO_RELEASED_SNAPSHOT = "org/apache/maven/plugins/maven-plugin-plugin/2.3-SNAPSHOT/maven-plugin-plugin-2.3-SNAPSHOT.jar"; - public static final String PATH_TO_HIGHER_SNAPSHOT_EXISTS = - "org/apache/maven/plugins/maven-source-plugin/2.0.3-SNAPSHOT/maven-source-plugin-2.0.3-SNAPSHOT.jar"; + public static final String PATH_TO_HIGHER_SNAPSHOT_EXISTS = "org/apache/maven/plugins/maven-source-plugin/2.0.3-SNAPSHOT/maven-source-plugin-2.0.3-SNAPSHOT.jar"; private ManagedRepositoryConfiguration config; - private ArchivaRepository repo; + private ManagedRepositoryConfiguration repo; private BidirectionalRepositoryLayout layout; @@ -131,7 +124,7 @@ public abstract class AbstractRepositoryPurgeTest System.setProperty( (String) entry.getKey(), (String) entry.getValue() ); } - URL jdoFileUrls[] = new URL[]{getClass().getResource( "/org/apache/maven/archiva/model/package.jdo" )}; + URL jdoFileUrls[] = new URL[] { getClass().getResource( "/org/apache/maven/archiva/model/package.jdo" ) }; if ( ( jdoFileUrls == null ) || ( jdoFileUrls[0] == null ) ) { @@ -141,8 +134,8 @@ public abstract class AbstractRepositoryPurgeTest File propsFile = null; // intentional boolean verbose = true; - SchemaTool.deleteSchemaTables( jdoFileUrls, new URL[]{}, propsFile, verbose ); - SchemaTool.createSchemaTables( jdoFileUrls, new URL[]{}, propsFile, verbose, null ); + SchemaTool.deleteSchemaTables( jdoFileUrls, new URL[] {}, propsFile, verbose ); + SchemaTool.createSchemaTables( jdoFileUrls, new URL[] {}, propsFile, verbose, null ); PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory(); @@ -165,7 +158,7 @@ public abstract class AbstractRepositoryPurgeTest config.setId( TEST_REPO_ID ); config.setName( TEST_REPO_NAME ); config.setDaysOlder( TEST_DAYS_OLDER ); - config.setLocation( TEST_REPO_URL ); + config.setLocation( TEST_REPO_LOCATION ); config.setReleases( true ); config.setSnapshots( true ); config.setRetentionCount( TEST_RETENTION_COUNT ); @@ -173,11 +166,14 @@ public abstract class AbstractRepositoryPurgeTest return config; } - public ArchivaRepository getRepository() + public ManagedRepositoryConfiguration getRepository() { if ( repo == null ) { - repo = new ArchivaRepository( TEST_REPO_ID, TEST_REPO_NAME, PathUtil.toUrl( TEST_REPO_URL ) ); + repo = new ManagedRepositoryConfiguration(); + repo.setId( TEST_REPO_ID ); + repo.setName( TEST_REPO_NAME ); + repo.setLocation( TEST_REPO_LOCATION ); } return repo; diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.xml b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.xml index 4f1a11fe3..a87217f3b 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.xml +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.xml @@ -197,10 +197,6 @@ org.apache.maven.archiva.database.ProjectModelDAO jdo - - org.apache.maven.archiva.database.RepositoryDAO - jdo - org.apache.maven.archiva.database.RepositoryProblemDAO jdo @@ -229,17 +225,6 @@ - - org.apache.maven.archiva.database.RepositoryDAO - jdo - org.apache.maven.archiva.database.jdo.JdoRepositoryDAO - - - org.apache.maven.archiva.database.jdo.JdoAccess - archiva - - - org.apache.maven.archiva.database.RepositoryProblemDAO jdo diff --git a/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java b/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java index 600b9596b..bbba3dd84 100644 --- a/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java +++ b/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java @@ -22,13 +22,13 @@ package org.apache.maven.archiva.consumers.database; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.FileTypes; +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.KnownRepositoryContentConsumer; import org.apache.maven.archiva.database.ArchivaDAO; import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -103,7 +103,7 @@ public class ArtifactUpdateDatabaseConsumer */ private Digester digestMd5; - private ArchivaRepository repository; + private ManagedRepositoryConfiguration repository; private File repositoryDir; @@ -136,15 +136,15 @@ public class ArtifactUpdateDatabaseConsumer return this.includes; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { this.repository = repository; - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); try { - this.layout = layoutFactory.getLayout( repository.getModel().getLayoutName() ); + this.layout = layoutFactory.getLayout( repository.getLayout() ); } catch ( LayoutException e ) { diff --git a/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java b/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java index 067f0f6fe..612ef5ecf 100644 --- a/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java +++ b/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java @@ -31,8 +31,6 @@ import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; import org.apache.maven.archiva.indexer.RepositoryIndexException; import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; -import org.apache.maven.archiva.repository.ArchivaConfigurationAdaptor; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; @@ -184,17 +182,16 @@ public class IndexArtifactConsumer Iterator it = configuration.getConfiguration().getManagedRepositories().iterator(); while ( it.hasNext() ) { - ManagedRepositoryConfiguration repoconfig = it.next(); + ManagedRepositoryConfiguration repository = it.next(); - ArchivaRepository repository = ArchivaConfigurationAdaptor.toArchivaRepository( repoconfig ); IndexedRepositoryDetails pnl = new IndexedRepositoryDetails(); - pnl.path = repository.getUrl().getPath(); - pnl.layout = (BidirectionalRepositoryLayout) this.bidirectionalLayoutMap.get( repoconfig.getLayout() ); + pnl.path = repository.getLocation(); + pnl.layout = (BidirectionalRepositoryLayout) this.bidirectionalLayoutMap.get( repository.getLayout() ); pnl.index = indexFactory.createHashcodeIndex( repository ); - this.repositoryMap.put( repoconfig.getId(), pnl ); + this.repositoryMap.put( repository.getId(), pnl ); } } } diff --git a/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java b/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java index 7be8b164a..aefaba8ad 100644 --- a/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java +++ b/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java @@ -22,6 +22,7 @@ package org.apache.maven.archiva.consumers.lucene; import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.FileTypes; +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.KnownRepositoryContentConsumer; @@ -30,7 +31,6 @@ 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.model.ArchivaRepository; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -97,7 +97,7 @@ public class IndexContentConsumer private RepositoryContentIndex index; - private ArchivaRepository repository; + private ManagedRepositoryConfiguration repository; private File repositoryDir; @@ -128,16 +128,16 @@ public class IndexContentConsumer return this.includes; } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { this.repository = repository; - this.repositoryDir = new File( repository.getUrl().getPath() ); + this.repositoryDir = new File( repository.getLocation() ); this.index = indexFactory.createFileContentIndex( repository ); try { - this.repositoryLayout = layoutFactory.getLayout( this.repository.getLayoutType() ); + this.repositoryLayout = layoutFactory.getLayout( this.repository.getLayout() ); } catch ( LayoutException e ) { diff --git a/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java index b72afbed2..f4c3dcf2b 100644 --- a/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java +++ b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java @@ -21,8 +21,8 @@ package org.apache.maven.archiva.converter.legacy; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.common.utils.PathUtil; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.converter.RepositoryConversionException; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.repository.RepositoryException; import org.apache.maven.archiva.repository.scanner.RepositoryScanner; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -72,23 +72,13 @@ public class DefaultLegacyRepositoryConverter { try { - String legacyRepositoryUrl = PathUtil.toUrl( legacyRepositoryDirectory ); String defaultRepositoryUrl = PathUtil.toUrl( repositoryDirectory ); - // workaround for spaces non converted by PathUtils in wagon - // TODO: remove it when PathUtils will be fixed - if ( legacyRepositoryUrl.indexOf( "%20" ) >= 0 ) - { - legacyRepositoryUrl = StringUtils.replace( legacyRepositoryUrl, "%20", " " ); - } - if ( defaultRepositoryUrl.indexOf( "%20" ) >= 0 ) - { - defaultRepositoryUrl = StringUtils.replace( defaultRepositoryUrl, "%20", " " ); - } - - ArchivaRepository legacyRepository = new ArchivaRepository( "legacy", "Legacy Repository", - legacyRepositoryUrl ); - legacyRepository.getModel().setLayoutName( "legacy" ); + ManagedRepositoryConfiguration legacyRepository = new ManagedRepositoryConfiguration(); + legacyRepository.setId( "legacy"); + legacyRepository.setName( "Legacy Repository" ); + legacyRepository.setLocation( legacyRepositoryDirectory.getAbsolutePath() ); + legacyRepository.setLayout( "legacy" ); ArtifactRepository repository = artifactRepositoryFactory.createArtifactRepository( "default", defaultRepositoryUrl, diff --git a/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java index a30146a6a..fe83b6ec3 100644 --- a/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java +++ b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java @@ -19,12 +19,12 @@ package org.apache.maven.archiva.converter.legacy; * under the License. */ +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.KnownRepositoryContentConsumer; import org.apache.maven.archiva.converter.artifact.ArtifactConversionException; import org.apache.maven.archiva.converter.artifact.ArtifactConverter; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -79,7 +79,7 @@ public class LegacyConverterArtifactConsumer includes.add( "**/*.war" ); } - public void beginScan( ArchivaRepository repository ) + public void beginScan( ManagedRepositoryConfiguration repository ) throws ConsumerException { diff --git a/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java index e5bfc4441..70a5ca1ff 100644 --- a/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java +++ b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java @@ -20,9 +20,8 @@ package org.apache.maven.archiva.converter; */ import org.apache.commons.io.FileUtils; -import org.apache.maven.archiva.common.utils.PathUtil; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; @@ -49,7 +48,7 @@ public class RepositoryConverterTest { private ArtifactRepository sourceRepository; - private ArchivaRepository targetRepository; + private ManagedRepositoryConfiguration targetRepository; private LegacyRepositoryConverter repositoryConverter; @@ -77,8 +76,11 @@ public class RepositoryConverterTest File targetBase = getTestFile( "target/test-target-repository" ); copyDirectoryStructure( getTestFile( "src/test/target-repository" ), targetBase ); - targetRepository = new ArchivaRepository( "target", "Target Repo", PathUtil.toUrl( targetBase ) ); - targetRepository.getModel().setLayoutName( "default" ); + targetRepository = new ManagedRepositoryConfiguration(); + targetRepository.setId( "target" ); + targetRepository.setName( "Target Repo" ); + targetRepository.setLocation( targetBase.getAbsolutePath() ); + targetRepository.setLayout( "default" ); repositoryConverter = (LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.ROLE, "default" ); @@ -144,7 +146,7 @@ public class RepositoryConverterTest throws IOException, RepositoryConversionException { File legacyRepoDir = new File( sourceRepository.getBasedir() ); - File destRepoDir = new File( targetRepository.getUrl().getPath() ); + File destRepoDir = new File( targetRepository.getLocation() ); List excludes = new ArrayList(); repositoryConverter.convertLegacyRepository( legacyRepoDir, destRepoDir, excludes ); } diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndex.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndex.java index 984c861f8..b45f5727a 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndex.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndex.java @@ -22,9 +22,9 @@ package org.apache.maven.archiva.indexer; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.Searchable; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.lucene.LuceneEntryConverter; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord; -import org.apache.maven.archiva.model.ArchivaRepository; import java.io.File; import java.util.Collection; @@ -116,7 +116,7 @@ public interface RepositoryContentIndex * * @return the repository that this index belongs to. */ - ArchivaRepository getRepository(); + ManagedRepositoryConfiguration getRepository(); /** * Get the analyzer in use for this index. diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndexFactory.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndexFactory.java index fa80e2d8d..2eb796eed 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndexFactory.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndexFactory.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.indexer; * under the License. */ -import org.apache.maven.archiva.model.ArchivaRepository; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; /** * Obtain an index instance. @@ -34,7 +34,7 @@ public interface RepositoryContentIndexFactory * @param repository the repository to create the content index from. * @return the index instance */ - RepositoryContentIndex createBytecodeIndex( ArchivaRepository repository ); + RepositoryContentIndex createBytecodeIndex( ManagedRepositoryConfiguration repository ); /** * Method to create an instance of the file content index. @@ -42,7 +42,7 @@ public interface RepositoryContentIndexFactory * @param repository the repository to create the file content index from. * @return the index instance */ - RepositoryContentIndex createFileContentIndex( ArchivaRepository repository ); + RepositoryContentIndex createFileContentIndex( ManagedRepositoryConfiguration repository ); /** * Method to create an instance of the hashcode index. @@ -50,5 +50,5 @@ public interface RepositoryContentIndexFactory * @param repository the repository to create the content index from. * @return the index instance */ - RepositoryContentIndex createHashcodeIndex( ArchivaRepository repository ); + RepositoryContentIndex createHashcodeIndex( ManagedRepositoryConfiguration repository ); } diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/BytecodeIndexTransformer.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/BytecodeIndexTransformer.java index 53e0b0043..5d232aef5 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/BytecodeIndexTransformer.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/BytecodeIndexTransformer.java @@ -20,8 +20,8 @@ package org.apache.maven.archiva.indexer.functors; */ import org.apache.commons.collections.Transformer; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; -import org.apache.maven.archiva.model.ArchivaRepository; /** * BytecodeIndexTransformer @@ -41,9 +41,9 @@ public class BytecodeIndexTransformer public Object transform( Object input ) { - if ( input instanceof ArchivaRepository ) + if ( input instanceof ManagedRepositoryConfiguration ) { - return indexFactory.createBytecodeIndex( (ArchivaRepository) input ); + return indexFactory.createBytecodeIndex( (ManagedRepositoryConfiguration) input ); } return input; diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/FileContentIndexTransformer.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/FileContentIndexTransformer.java index 311eb92ac..2b20cbf2e 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/FileContentIndexTransformer.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/FileContentIndexTransformer.java @@ -20,8 +20,8 @@ package org.apache.maven.archiva.indexer.functors; */ import org.apache.commons.collections.Transformer; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; -import org.apache.maven.archiva.model.ArchivaRepository; /** * FileContentIndexTransformer @@ -41,9 +41,9 @@ public class FileContentIndexTransformer public Object transform( Object input ) { - if ( input instanceof ArchivaRepository ) + if ( input instanceof ManagedRepositoryConfiguration ) { - return indexFactory.createFileContentIndex( (ArchivaRepository) input ); + return indexFactory.createFileContentIndex( (ManagedRepositoryConfiguration) input ); } return input; diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/HashcodesIndexTransformer.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/HashcodesIndexTransformer.java index 56258608a..6101e8891 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/HashcodesIndexTransformer.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/HashcodesIndexTransformer.java @@ -20,8 +20,8 @@ package org.apache.maven.archiva.indexer.functors; */ import org.apache.commons.collections.Transformer; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; -import org.apache.maven.archiva.model.ArchivaRepository; /** * HashcodesIndexTransformer @@ -41,9 +41,9 @@ public class HashcodesIndexTransformer public Object transform( Object input ) { - if ( input instanceof ArchivaRepository ) + if ( input instanceof ManagedRepositoryConfiguration ) { - return indexFactory.createHashcodeIndex( (ArchivaRepository) input ); + return indexFactory.createHashcodeIndex( (ManagedRepositoryConfiguration) input ); } return input; diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java index 7ecac1fe3..528de940d 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java @@ -20,7 +20,7 @@ package org.apache.maven.archiva.indexer.functors; */ import org.apache.commons.collections.Predicate; -import org.apache.maven.archiva.model.ArchivaRepository; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; /** * UserAllowedToSearchRepositoryPredicate @@ -35,7 +35,7 @@ public class UserAllowedToSearchRepositoryPredicate { boolean satisfies = false; - if ( object instanceof ArchivaRepository ) + if ( object instanceof ManagedRepositoryConfiguration ) { // TODO: perform check here. satisfies = true; // Everyone is allowed! (for now) diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java index 5fcfa10e5..8793682fa 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java @@ -29,10 +29,10 @@ import org.apache.lucene.index.TermEnum; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Searchable; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.RepositoryContentIndex; import org.apache.maven.archiva.indexer.RepositoryIndexException; import org.apache.maven.archiva.indexer.RepositoryIndexSearchException; -import org.apache.maven.archiva.model.ArchivaRepository; import java.io.File; import java.io.IOException; @@ -64,9 +64,9 @@ public class LuceneRepositoryContentIndex */ private LuceneIndexHandlers indexHandlers; - private ArchivaRepository repository; + private ManagedRepositoryConfiguration repository; - public LuceneRepositoryContentIndex( ArchivaRepository repository, File indexDir, LuceneIndexHandlers handlers ) + public LuceneRepositoryContentIndex( ManagedRepositoryConfiguration repository, File indexDir, LuceneIndexHandlers handlers ) { this.repository = repository; this.indexLocation = indexDir; @@ -399,7 +399,7 @@ public class LuceneRepositoryContentIndex return this.indexHandlers.getId(); } - public ArchivaRepository getRepository() + public ManagedRepositoryConfiguration getRepository() { return repository; } diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java index de6b8626d..8564bd74a 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java @@ -27,7 +27,6 @@ import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; import org.apache.maven.archiva.indexer.bytecode.BytecodeHandlers; import org.apache.maven.archiva.indexer.filecontent.FileContentHandlers; import org.apache.maven.archiva.indexer.hashcodes.HashcodesHandlers; -import org.apache.maven.archiva.model.ArchivaRepository; import java.io.File; @@ -46,19 +45,19 @@ public class LuceneRepositoryContentIndexFactory */ private ArchivaConfiguration configuration; - public RepositoryContentIndex createBytecodeIndex( ArchivaRepository repository ) + public RepositoryContentIndex createBytecodeIndex( ManagedRepositoryConfiguration repository ) { File indexDir = toIndexDir( repository, "bytecode" ); return new LuceneRepositoryContentIndex( repository, indexDir, new BytecodeHandlers() ); } - public RepositoryContentIndex createFileContentIndex( ArchivaRepository repository ) + public RepositoryContentIndex createFileContentIndex( ManagedRepositoryConfiguration repository ) { File indexDir = toIndexDir( repository, "filecontent" ); return new LuceneRepositoryContentIndex( repository, indexDir, new FileContentHandlers() ); } - public RepositoryContentIndex createHashcodeIndex( ArchivaRepository repository ) + public RepositoryContentIndex createHashcodeIndex( ManagedRepositoryConfiguration repository ) { File indexDir = toIndexDir( repository, "hashcodes" ); return new LuceneRepositoryContentIndex( repository, indexDir, new HashcodesHandlers() ); @@ -71,7 +70,7 @@ public class LuceneRepositoryContentIndexFactory * @param indexId the id of the index * @return the directory to put the index into. */ - private File toIndexDir( ArchivaRepository repository, String indexId ) + private File toIndexDir( ManagedRepositoryConfiguration repository, String indexId ) { // Attempt to get the specified indexDir in the configuration first. ManagedRepositoryConfiguration repoConfig = @@ -81,7 +80,7 @@ public class LuceneRepositoryContentIndexFactory if ( repoConfig == null ) { // No configured index dir, use the repository path instead. - String repoPath = repository.getUrl().getPath(); + String repoPath = repository.getLocation(); indexDir = new File( repoPath, ".index/" + indexId + "/" ); } else @@ -90,7 +89,7 @@ public class LuceneRepositoryContentIndexFactory String repoPath = repoConfig.getIndexDir(); if ( StringUtils.isBlank( repoPath ) ) { - repoPath = repository.getUrl().getPath(); + repoPath = repository.getLocation(); if ( !repoPath.endsWith( "/" ) ) { repoPath += "/"; diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java index c98d2500a..3021ab2a5 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java @@ -41,7 +41,6 @@ import org.apache.maven.archiva.indexer.hashcodes.HashcodesKeys; import org.apache.maven.archiva.indexer.lucene.LuceneEntryConverter; import org.apache.maven.archiva.indexer.lucene.LuceneQuery; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord; -import org.apache.maven.archiva.repository.ArchivaConfigurationAdaptor; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; @@ -330,7 +329,7 @@ public class DefaultCrossRepositorySearch { if ( repo.isScanned() ) { - localIndexedRepositories.add( ArchivaConfigurationAdaptor.toArchivaRepository( repo ) ); + localIndexedRepositories.add( repo ); } } } diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java index a670a1619..3aaec0272 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java @@ -19,7 +19,6 @@ package org.apache.maven.archiva.indexer; * under the License. */ -import org.apache.commons.lang.StringUtils; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; import org.apache.maven.archiva.configuration.ArchivaConfiguration; @@ -27,7 +26,6 @@ import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.lucene.LuceneIndexHandlers; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -73,7 +71,7 @@ public abstract class AbstractIndexerTestCase } public abstract RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, - ArchivaRepository repository ); + ManagedRepositoryConfiguration repository ); public abstract LuceneIndexHandlers getIndexHandler(); @@ -86,14 +84,14 @@ public abstract class AbstractIndexerTestCase (RepositoryContentIndexFactory) lookup( RepositoryContentIndexFactory.class .getName(), "lucene" ); - ArchivaRepository repository = createTestIndex( getIndexName() ); + ManagedRepositoryConfiguration repository = createTestIndex( getIndexName() ); index = createIndex( indexFactory, repository ); indexHandlers = getIndexHandler(); } - private ArchivaRepository createTestIndex( String indexName ) + private ManagedRepositoryConfiguration createTestIndex( String indexName ) throws Exception { File repoDir = new File( getBasedir(), "src/test/managed-repository" ); @@ -106,10 +104,8 @@ public abstract class AbstractIndexerTestCase assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() ); - String repoUri = "file://" + StringUtils.replace( repoDir.getAbsolutePath(), "\\", "/" ); - - ArchivaRepository repository = - new ArchivaRepository( TEST_DEFAULT_REPO_ID, TEST_DEFAULT_REPOSITORY_NAME, repoUri ); + ManagedRepositoryConfiguration repository = createRepository( TEST_DEFAULT_REPO_ID, + TEST_DEFAULT_REPOSITORY_NAME, repoDir ); File indexLocation = new File( testIndexesDir, "/index-" + indexName + "-" + getName() + "/" ); @@ -228,4 +224,13 @@ public abstract class AbstractIndexerTestCase writer.optimize(); writer.close(); } + + protected ManagedRepositoryConfiguration createRepository( String id, String name, File location ) + { + ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration(); + repo.setId( id ); + repo.setName( name ); + repo.setLocation( location.getAbsolutePath() ); + return repo; + } } diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java index c0db8e536..a4bba0f41 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java @@ -19,13 +19,13 @@ package org.apache.maven.archiva.indexer.bytecode; * under the License. */ +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.AbstractIndexCreationTestCase; import org.apache.maven.archiva.indexer.RepositoryContentIndex; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; import org.apache.maven.archiva.indexer.lucene.LuceneIndexHandlers; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import java.io.File; import java.util.Map; @@ -48,7 +48,7 @@ public class BytecodeIndexTest extends AbstractIndexCreationTestCase return new BytecodeHandlers(); } - public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ArchivaRepository repository ) + public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ManagedRepositoryConfiguration repository ) { return indexFactory.createBytecodeIndex( repository ); } diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeSearchTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeSearchTest.java index 46c0ca84f..2dba5a4b2 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeSearchTest.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeSearchTest.java @@ -22,13 +22,13 @@ package org.apache.maven.archiva.indexer.bytecode; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.AbstractSearchTestCase; import org.apache.maven.archiva.indexer.ArtifactKeys; import org.apache.maven.archiva.indexer.RepositoryContentIndex; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; import org.apache.maven.archiva.indexer.lucene.LuceneIndexHandlers; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import java.io.File; import java.util.HashMap; @@ -54,7 +54,7 @@ public class BytecodeSearchTest extends AbstractSearchTestCase return new BytecodeHandlers(); } - public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ArchivaRepository repository ) + public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ManagedRepositoryConfiguration repository ) { return indexFactory.createBytecodeIndex( repository ); } diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesIndexTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesIndexTest.java index 2bb635078..6f03d560d 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesIndexTest.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesIndexTest.java @@ -19,13 +19,13 @@ package org.apache.maven.archiva.indexer.hashcodes; * under the License. */ +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.AbstractIndexCreationTestCase; import org.apache.maven.archiva.indexer.RepositoryContentIndex; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; import org.apache.maven.archiva.indexer.lucene.LuceneIndexHandlers; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; /** * HashcodesIndexTest @@ -45,7 +45,7 @@ public class HashcodesIndexTest extends AbstractIndexCreationTestCase return new HashcodesHandlers(); } - public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ArchivaRepository repository ) + public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ManagedRepositoryConfiguration repository ) { return indexFactory.createHashcodeIndex( repository ); } diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesSearchTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesSearchTest.java index 18a688f03..b0d7b71ab 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesSearchTest.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesSearchTest.java @@ -22,13 +22,13 @@ package org.apache.maven.archiva.indexer.hashcodes; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.AbstractSearchTestCase; import org.apache.maven.archiva.indexer.ArtifactKeys; import org.apache.maven.archiva.indexer.RepositoryContentIndex; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; import org.apache.maven.archiva.indexer.lucene.LuceneIndexHandlers; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; import java.io.File; import java.util.HashMap; @@ -54,7 +54,7 @@ public class HashcodesSearchTest extends AbstractSearchTestCase return new HashcodesHandlers(); } - public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ArchivaRepository repository ) + public RepositoryContentIndex createIndex( RepositoryContentIndexFactory indexFactory, ManagedRepositoryConfiguration repository ) { return indexFactory.createHashcodeIndex( repository ); } diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java index 40c9e054b..fef16cba7 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java @@ -19,7 +19,6 @@ package org.apache.maven.archiva.indexer.search; * under the License. */ -import org.apache.commons.lang.StringUtils; import org.apache.lucene.search.Hits; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; @@ -29,7 +28,6 @@ import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.indexer.MockConfiguration; import org.apache.maven.archiva.indexer.RepositoryContentIndex; import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory; -import org.apache.maven.archiva.model.ArchivaRepository; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -62,10 +60,7 @@ public class DefaultCrossRepositorySearchTest assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() ); - String repoUri = "file://" + StringUtils.replace( repoDir.getAbsolutePath(), "\\", "/" ); - - ArchivaRepository repository = - new ArchivaRepository( TEST_DEFAULT_REPO_ID, TEST_DEFAULT_REPOSITORY_NAME, repoUri ); + ManagedRepositoryConfiguration repository = createRepository( TEST_DEFAULT_REPO_ID, TEST_DEFAULT_REPOSITORY_NAME, repoDir ); File indexLocation = new File( "target/index-crossrepo-" + getName() + "/" ); @@ -168,4 +163,13 @@ public class DefaultCrossRepositorySearchTest assertEquals( "Search Result Hits", hitCount, results.getHits().size() ); } + + protected ManagedRepositoryConfiguration createRepository( String id, String name, File location ) + { + ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration(); + repo.setId( id ); + repo.setName( name ); + repo.setLocation( location.getAbsolutePath() ); + return repo; + } } diff --git a/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java b/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java deleted file mode 100644 index a0149d727..000000000 --- a/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.apache.maven.archiva.model; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * ArchivaRepository - * - * @author Joakim Erdfelt - * @version $Id$ - */ -public class ArchivaRepository -{ - private ArchivaRepositoryModel model; - - private RepositoryURL url; - - protected boolean blacklisted; - - /** - * Construct a Repository. - * - * @param id the unique identifier for this repository. - * @param name the name for this repository. - * @param url the base URL for this repository (this should point to the top level URL for the entire repository) - * @param layout the layout technique for this repository. - */ - public ArchivaRepository( String id, String name, String url ) - { - model = new ArchivaRepositoryModel(); - - model.setId( id ); - model.setName( name ); - setUrl( new RepositoryURL( url ) ); - } - - /** - * Construct a Repository. - * - * @param model the model to use - */ - public ArchivaRepository( ArchivaRepositoryModel model ) - { - this.model = model; - - this.url = new RepositoryURL( model.getUrl() ); - } - - public String getId() - { - return model.getId(); - } - - public void setUrl( RepositoryURL url ) - { - this.url = url; - model.setUrl( url.getUrl() ); - } - - public RepositoryURL getUrl() - { - return this.url; - } - - public void setUsername(String username) - { - this.model.setRepositoryUsername(username); - } - - public void setPassword(String password) - { - this.model.setRepositoryPassword(password); - } - - public ArchivaRepositoryModel getModel() - { - return this.model; - } - - public boolean isBlacklisted() - { - return blacklisted; - } - - public void setBlacklisted( boolean blacklisted ) - { - this.blacklisted = blacklisted; - } - - public String getLayoutType() - { - return this.model.getLayoutName(); - } - - public String getName() - { - return this.model.getName(); - } - - public String getUsername() - { - return model.getRepositoryUsername(); - } - - public String getPassword() - { - return model.getRepositoryPassword(); - } - - public String toString() - { - StringBuffer sb = new StringBuffer(); - - sb.append( "ArchivaRepository[" ); - sb.append( this.model.getId() ).append( "," ); - sb.append( this.model.getUrl() ); - sb.append( "]" ); - - return sb.toString(); - } -} diff --git a/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-base/archiva-model/src/main/mdo/archiva-base.xml index a2b13a15d..663cc4f71 100644 --- a/archiva-base/archiva-model/src/main/mdo/archiva-base.xml +++ b/archiva-base/archiva-model/src/main/mdo/archiva-base.xml @@ -25,7 +25,7 @@ This object is not serialized to the Database. - + artifacts 1.0.0+ @@ -93,7 +94,7 @@ |_| \_\___| .__/ \___/|___/_|\__\___/|_| \__, | |_| |___/ --> - + - - + + testRepo Archiva Test Repository - file://${basedir}/src/test/repositories/default-repository + ${basedir}/src/test/repositories/default-repository default true false true 0 0 * * ? - - + + diff --git a/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.xml b/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.xml index aa04d5931..cd6fbe9fb 100644 --- a/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.xml +++ b/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.xml @@ -33,9 +33,8 @@ dao - org.apache.maven.archiva.database.RepositoryDAO - jdo - repositoryDAO + org.apache.maven.archiva.configuration.ArchivaConfiguration + archivaConfiguration org.apache.maven.archiva.repository.scanner.RepositoryScanner diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java index 0233e3d71..f56968c45 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java @@ -22,13 +22,11 @@ package org.apache.maven.archiva.web.repository; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.maven.archiva.model.ArchivaRepository; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.ProjectReference; import org.apache.maven.archiva.model.VersionedReference; import org.apache.maven.archiva.proxy.ProxyException; import org.apache.maven.archiva.proxy.RepositoryProxyConnectors; -import org.apache.maven.archiva.repository.ArchivaConfigurationAdaptor; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory; import org.apache.maven.archiva.repository.layout.LayoutException; @@ -38,21 +36,21 @@ import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.Model; import org.apache.maven.model.Relocation; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import org.apache.maven.wagon.ResourceDoesNotExistException; import org.codehaus.plexus.webdav.AbstractDavServerComponent; import org.codehaus.plexus.webdav.DavServerComponent; import org.codehaus.plexus.webdav.DavServerException; import org.codehaus.plexus.webdav.servlet.DavServerRequest; import org.codehaus.plexus.webdav.util.WebdavMethodUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; + /** * ProxiedDavServer * @@ -91,9 +89,7 @@ public class ProxiedDavServer private BidirectionalRepositoryLayout layout; - private ManagedRepositoryConfiguration repositoryConfiguration; - - private ArchivaRepository managedRepository; + private ManagedRepositoryConfiguration managedRepository; public String getPrefix() { @@ -122,14 +118,11 @@ public class ProxiedDavServer Configuration config = archivaConfiguration.getConfiguration(); - repositoryConfiguration = config.findManagedRepositoryById( getPrefix() ); - - managedRepository = - ArchivaConfigurationAdaptor.toArchivaRepository( repositoryConfiguration ); + managedRepository = config.findManagedRepositoryById( getPrefix() ); try { - layout = layoutFactory.getLayout( managedRepository.getLayoutType() ); + layout = layoutFactory.getLayout( managedRepository.getLayout() ); } catch ( LayoutException e ) { @@ -332,6 +325,6 @@ public class ProxiedDavServer public ManagedRepositoryConfiguration getRepositoryConfiguration() { - return repositoryConfiguration; + return managedRepository; } } diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java index 20246eda6..74070ed3a 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java @@ -42,7 +42,7 @@ public class ArchivaStartup /** * @plexus.requirement role-hint="default" */ - private ConfigurationSynchronization configSync; + private SecuritySynchronization securitySync; /** * @plexus.requirement role-hint="default" @@ -61,7 +61,7 @@ public class ArchivaStartup try { - configSync.startup(); + securitySync.startup(); resolverFactory.startup(); taskScheduler.startup(); } diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ConfigurationSynchronization.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java similarity index 62% rename from archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ConfigurationSynchronization.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java index 267219808..234e5f0e2 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ConfigurationSynchronization.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java @@ -20,15 +20,9 @@ package org.apache.maven.archiva.web.startup; */ import org.apache.maven.archiva.common.ArchivaException; -import org.apache.maven.archiva.common.utils.PathUtil; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.maven.archiva.database.ArchivaDAO; -import org.apache.maven.archiva.database.ArchivaDatabaseException; -import org.apache.maven.archiva.database.ObjectNotFoundException; -import org.apache.maven.archiva.model.ArchivaRepository; -import org.apache.maven.archiva.repository.ArchivaConfigurationAdaptor; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManagerException; @@ -42,19 +36,14 @@ import java.util.List; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="org.apache.maven.archiva.web.startup.ConfigurationSynchronization" + * + * @plexus.component role="org.apache.maven.archiva.web.startup.SecuritySynchronization" * role-hint="default" - * @todo consider whether we really need these in the database or not */ -public class ConfigurationSynchronization +public class SecuritySynchronization extends AbstractLogEnabled implements RegistryListener { - /** - * @plexus.requirement role-hint="jdo" - */ - private ArchivaDAO dao; - /** * @plexus.requirement role-hint="default" */ @@ -82,37 +71,6 @@ public class ConfigurationSynchronization { for ( ManagedRepositoryConfiguration repoConfig : repos ) { - try - { - try - { - ArchivaRepository repository = dao.getRepositoryDAO().getRepository( repoConfig.getId() ); - // Found repository. Update it. - - repository.getModel().setName( repoConfig.getName() ); - repository.getModel().setUrl( PathUtil.toUrl( repoConfig.getLocation() ) ); - repository.getModel().setLayoutName( repoConfig.getLayout() ); - repository.getModel().setCreationSource( "configuration" ); - repository.getModel().setReleasePolicy( repoConfig.isReleases() ); - repository.getModel().setSnapshotPolicy( repoConfig.isSnapshots() ); - - dao.getRepositoryDAO().saveRepository( repository ); - } - catch ( ObjectNotFoundException e ) - { - // Add the repository to the database. - getLogger().info( "Adding repository configuration to DB: " + repoConfig ); - ArchivaRepository drepo = ArchivaConfigurationAdaptor.toArchivaRepository( repoConfig ); - drepo.getModel().setCreationSource( "configuration" ); - dao.getRepositoryDAO().saveRepository( drepo ); - } - } - catch ( ArchivaDatabaseException e ) - { - // Log error. - getLogger().error( "Unable to add configured repositories to the database: " + e.getMessage(), e ); - } - // manage roles for repositories try { diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java index 21092cafe..db73fb0cf 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java @@ -22,29 +22,32 @@ package org.apache.maven.archiva.web.tags; import com.opensymphony.webwork.WebWorkException; import com.opensymphony.webwork.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; + import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; +import org.apache.maven.archiva.configuration.ArchivaConfiguration; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArchivaDAO; import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.Constraint; import org.apache.maven.archiva.database.ObjectNotFoundException; import org.apache.maven.archiva.database.constraints.ArtifactsRelatedConstraint; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaRepository; 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.codehaus.plexus.component.repository.exception.ComponentLookupException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; import java.io.IOException; import java.io.Writer; import java.text.DecimalFormat; import java.util.Iterator; import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.PageContext; + /** * DownloadArtifact * @@ -60,6 +63,11 @@ public class DownloadArtifact * @plexus.requirement role-hint="jdo" */ private ArchivaDAO dao; + + /** + * @plexus.requirement + */ + private ArchivaConfiguration archivaConfiguration; /** * @plexus.requirement @@ -110,8 +118,8 @@ public class DownloadArtifact if ( relatedArtifacts != null ) { String repoId = ( (ArchivaArtifact) relatedArtifacts.get( 0 ) ).getModel().getRepositoryId(); - ArchivaRepository repo = dao.getRepositoryDAO().getRepository( repoId ); - BidirectionalRepositoryLayout layout = layoutFactory.getLayout( repo.getLayoutType() ); + ManagedRepositoryConfiguration repo = findRepository( repoId ); + BidirectionalRepositoryLayout layout = layoutFactory.getLayout( repo.getLayout() ); String prefix = req.getContextPath() + "/repository/" + repoId; @@ -150,18 +158,23 @@ public class DownloadArtifact return super.end( writer, body ); } + private ManagedRepositoryConfiguration findRepository( String repoId ) + { + return archivaConfiguration.getConfiguration().findManagedRepositoryById( repoId ); + } + private void appendError( StringBuffer sb, Exception e ) { /* do nothing */ } - private void appendMini( StringBuffer sb, String prefix, ArchivaRepository repo, + private void appendMini( StringBuffer sb, String prefix, ManagedRepositoryConfiguration repo, BidirectionalRepositoryLayout layout, List relatedArtifacts ) { /* do nothing */ } - private void appendNormal( StringBuffer sb, String prefix, ArchivaRepository repo, + private void appendNormal( StringBuffer sb, String prefix, ManagedRepositoryConfiguration repo, BidirectionalRepositoryLayout layout, List relatedArtifacts ) { /* diff --git a/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java b/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java index 3b522e782..2c464c4f7 100644 --- a/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java +++ b/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java @@ -1,11 +1,9 @@ package org.apache.maven.archiva.web.action.admin.repositories; -import junit.framework.Assert; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.database.ArchivaDAO; import org.apache.maven.archiva.database.ArtifactDAO; import org.apache.maven.archiva.database.ProjectModelDAO; -import org.apache.maven.archiva.database.RepositoryDAO; import org.apache.maven.archiva.database.RepositoryProblemDAO; import org.apache.maven.archiva.database.SimpleConstraint; import org.apache.maven.archiva.model.RepositoryContentStatistics; @@ -14,6 +12,8 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import junit.framework.Assert; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -72,11 +72,6 @@ public class ArchivaDAOStub throw new UnsupportedOperationException( "query not implemented for stub" ); } - public RepositoryDAO getRepositoryDAO() - { - throw new UnsupportedOperationException( "query not implemented for stub" ); - } - public RepositoryProblemDAO getRepositoryProblemDAO() { throw new UnsupportedOperationException( "query not implemented for stub" ); -- 2.39.5