You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2009/02/10 06:35:13 UTC
svn commit: r742859 [1/2] - in /archiva/trunk/archiva-modules:
archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/
archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/o...
Author: jdumay
Date: Tue Feb 10 05:35:05 2009
New Revision: 742859
URL: http://svn.apache.org/viewvc?rev=742859&view=rev
Log:
MRM-1081 - Archiva model should be updated so that the ARTIFACT table includes repositoryId as a primary key
* Updated so that repositoryId is part of the primary key for an artifact
* removed old search API classes as they needed to be brought over to the new API and doing so would be a waste of time
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/stubs/LuceneRepositoryContentIndexFactoryStub.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/stubs/LuceneRepositoryContentIndexStub.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/ArtifactKeys.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndex.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndexEventListener.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryContentIndexFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/bytecode/BytecodeAnalyzer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/bytecode/BytecodeEntryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/bytecode/BytecodeHandlers.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/bytecode/BytecodeKeys.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecord.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentAnalyzer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentHandlers.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentKeys.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesAnalyzer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesEntryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesHandlers.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesKeys.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecord.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneDocumentMaker.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneEntryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexHandlers.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentRecord.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/analyzers/ArtifactIdTokenizer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/analyzers/ClassnameTokenizer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/analyzers/FilenamesTokenizer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/analyzers/GroupIdTokenizer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/analyzers/VersionTokenizer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/CrossRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractSearchTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/RepositoryContentIndexEventListenerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/AllTests.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeSearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/AllTests.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesIndexTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecordLoader.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesSearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/AllTests.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/FileContentIndexPopulator.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/IndexPopulator.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListener.java
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAO.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListenerTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByChecksumConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsRelatedConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatisticsTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderArtifactsByAgeConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderSnapshotArtifactsByAgeConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryContentStatisticsByRepositoryConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueFieldConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueGroupIdConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueVersionConstraintTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseUpdaterTest.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/test/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGeneratorTest.java
archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/stubs/ArtifactDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArtifactDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/ArtifactDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java Tue Feb 10 05:35:05 2009
@@ -89,7 +89,7 @@
ArchivaArtifact artifact =
new ArchivaArtifact( reference.getGroupId(), reference.getArtifactId(), reference.getVersion(),
- reference.getClassifier(), reference.getType() );
+ reference.getClassifier(), reference.getType(), repository.getId() );
for ( RepositoryListener listener : listeners )
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java Tue Feb 10 05:35:05 2009
@@ -165,7 +165,7 @@
ArchivaArtifact artifact =
new ArchivaArtifact( artifactRef.getGroupId(), artifactRef.getArtifactId(), artifactRef.getVersion(),
- artifactRef.getClassifier(), artifactRef.getType() );
+ artifactRef.getClassifier(), artifactRef.getType(), repository.getId() );
for ( String version : snapshotVersions )
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java Tue Feb 10 05:35:05 2009
@@ -145,6 +145,6 @@
protected ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String type )
{
- return new ArchivaArtifact( groupId, artifactId, version, null, type );
+ return new ArchivaArtifact( groupId, artifactId, version, null, type, TEST_REPO_ID );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java Tue Feb 10 05:35:05 2009
@@ -39,17 +39,14 @@
{
private ArchivaConfiguration archivaConfiguration;
- private MockControl listenerControl;
-
public static final String PATH_TO_RELEASED_SNAPSHOT_IN_DIFF_REPO =
"org/apache/archiva/released-artifact-in-diff-repo/1.0-SNAPSHOT/released-artifact-in-diff-repo-1.0-SNAPSHOT.jar";
public static final String PATH_TO_HIGHER_SNAPSHOT_EXISTS_IN_SAME_REPO = "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_RELEASED_SNAPSHOT_IN_SAME_REPO = "org/apache/maven/plugins/maven-plugin-plugin/2.3-SNAPSHOT/maven-plugin-plugin-2.3-SNAPSHOT.jar";
-
- private RepositoryListener listener;
+ @Override
protected void setUp()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java Tue Feb 10 05:35:05 2009
@@ -227,7 +227,8 @@
artifact.getArtifactId(),
artifact.getVersion(),
artifact.getClassifier(),
- artifact.getType() );
+ artifact.getType(),
+ repository.getId());
return liveArtifact;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java Tue Feb 10 05:35:05 2009
@@ -105,7 +105,6 @@
File indexDirectory = null;
if( indexDir != null && !"".equals( indexDir ) )
{
- //indexDirectory = new File( managedRepository, repository.getIndexDir() );
indexDirectory = new File( repository.getIndexDir() );
}
else
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java Tue Feb 10 05:35:05 2009
@@ -22,12 +22,6 @@
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer;
-import org.apache.maven.archiva.indexer.RepositoryContentIndex;
-import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory;
-import org.apache.maven.archiva.indexer.RepositoryIndexException;
-import org.apache.maven.archiva.indexer.bytecode.BytecodeRecord;
-import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
-import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
import org.apache.maven.archiva.repository.RepositoryContentFactory;
@@ -56,11 +50,11 @@
* @plexus.configuration default-value="Remove indexed content if not present on filesystem."
*/
private String description;
-
- /**
- * @plexus.requirement role-hint="lucene"
- */
- private RepositoryContentIndexFactory repoIndexFactory;
+//
+// /**
+// * @plexus.requirement role-hint="lucene"
+// */
+// private RepositoryContentIndexFactory repoIndexFactory;
/**
* @plexus.requirement
@@ -97,32 +91,32 @@
if( !file.exists() )
{
- RepositoryContentIndex bytecodeIndex = repoIndexFactory.createBytecodeIndex( repoContent.getRepository() );
- RepositoryContentIndex hashcodesIndex = repoIndexFactory.createHashcodeIndex( repoContent.getRepository() );
- RepositoryContentIndex fileContentIndex =
- repoIndexFactory.createFileContentIndex( repoContent.getRepository() );
-
- FileContentRecord fileContentRecord = new FileContentRecord();
- fileContentRecord.setFilename( repoContent.toPath( artifact ) );
- fileContentIndex.deleteRecord( fileContentRecord );
-
- HashcodesRecord hashcodesRecord = new HashcodesRecord();
- hashcodesRecord.setArtifact( artifact );
- hashcodesIndex.deleteRecord( hashcodesRecord );
+// RepositoryContentIndex bytecodeIndex = repoIndexFactory.createBytecodeIndex( repoContent.getRepository() );
+// RepositoryContentIndex hashcodesIndex = repoIndexFactory.createHashcodeIndex( repoContent.getRepository() );
+// RepositoryContentIndex fileContentIndex =
+// repoIndexFactory.createFileContentIndex( repoContent.getRepository() );
- BytecodeRecord bytecodeRecord = new BytecodeRecord();
- bytecodeRecord.setArtifact( artifact );
- bytecodeIndex.deleteRecord( bytecodeRecord );
+// FileContentRecord fileContentRecord = new FileContentRecord();
+// fileContentRecord.setFilename( repoContent.toPath( artifact ) );
+// fileContentIndex.deleteRecord( fileContentRecord );
+//
+// HashcodesRecord hashcodesRecord = new HashcodesRecord();
+// hashcodesRecord.setArtifact( artifact );
+// hashcodesIndex.deleteRecord( hashcodesRecord );
+//
+// BytecodeRecord bytecodeRecord = new BytecodeRecord();
+// bytecodeRecord.setArtifact( artifact );
+// bytecodeIndex.deleteRecord( bytecodeRecord );
}
}
catch ( RepositoryException e )
{
throw new ConsumerException( "Can't run index cleanup consumer: " + e.getMessage() );
}
- catch ( RepositoryIndexException e )
- {
- throw new ConsumerException( e.getMessage() );
- }
+// catch ( RepositoryIndexException e )
+// {
+// throw new ConsumerException( e.getMessage() );
+// }
}
public String getDescription()
@@ -140,11 +134,6 @@
return false;
}
- public void setRepositoryIndexFactory( RepositoryContentIndexFactory repoIndexFactory )
- {
- this.repoIndexFactory = repoIndexFactory;
- }
-
public void setRepositoryContentFactory( RepositoryContentFactory repoFactory )
{
this.repoFactory = repoFactory;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java Tue Feb 10 05:35:05 2009
@@ -1,76 +1,76 @@
-package org.apache.maven.archiva.consumers.lucene;
-
-/*
- * 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.
- */
-
-import org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArchivaArtifactModel;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-
-/**
- * LuceneCleanupRemoveIndexedConsumerTest
- *
- * @version
- */
-public class LuceneCleanupRemoveIndexedConsumerTest
- extends PlexusInSpringTestCase
-{
- private DatabaseCleanupConsumer luceneCleanupRemoveIndexConsumer;
-
- public void setUp()
- throws Exception
- {
- super.setUp();
-
- luceneCleanupRemoveIndexConsumer = (DatabaseCleanupConsumer)
- lookup( DatabaseCleanupConsumer.class, "lucene-cleanup" );
- }
-
- public void testIfArtifactExists()
- throws Exception
- {
- ArchivaArtifact artifact = createArtifact(
- "org.apache.maven.archiva", "archiva-lucene-cleanup", "1.0", "jar" );
-
- luceneCleanupRemoveIndexConsumer.processArchivaArtifact( artifact );
- }
-
- public void testIfArtifactDoesNotExist()
- throws Exception
- {
- ArchivaArtifact artifact = createArtifact(
- "org.apache.maven.archiva", "deleted-artifact", "1.0", "jar" );
-
- luceneCleanupRemoveIndexConsumer.processArchivaArtifact( artifact );
- }
-
- private ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String type )
- {
- ArchivaArtifactModel model = new ArchivaArtifactModel();
- model.setGroupId( groupId );
- model.setArtifactId( artifactId );
- model.setVersion( version );
- model.setType( type );
- model.setRepositoryId( "test-repo" );
-
- return new ArchivaArtifact( model );
- }
-
-}
+//package org.apache.maven.archiva.consumers.lucene;
+//
+///*
+// * 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.
+// */
+//
+//import org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer;
+//import org.apache.maven.archiva.model.ArchivaArtifact;
+//import org.apache.maven.archiva.model.ArchivaArtifactModel;
+//import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+//
+///**
+// * LuceneCleanupRemoveIndexedConsumerTest
+// *
+// * @version
+// */
+//public class LuceneCleanupRemoveIndexedConsumerTest
+// extends PlexusInSpringTestCase
+//{
+// private DatabaseCleanupConsumer luceneCleanupRemoveIndexConsumer;
+//
+// public void setUp()
+// throws Exception
+// {
+// super.setUp();
+//
+// luceneCleanupRemoveIndexConsumer = (DatabaseCleanupConsumer)
+// lookup( DatabaseCleanupConsumer.class, "lucene-cleanup" );
+// }
+//
+// public void testIfArtifactExists()
+// throws Exception
+// {
+// ArchivaArtifact artifact = createArtifact(
+// "org.apache.maven.archiva", "archiva-lucene-cleanup", "1.0", "jar" );
+//
+// luceneCleanupRemoveIndexConsumer.processArchivaArtifact( artifact );
+// }
+//
+// public void testIfArtifactDoesNotExist()
+// throws Exception
+// {
+// ArchivaArtifact artifact = createArtifact(
+// "org.apache.maven.archiva", "deleted-artifact", "1.0", "jar" );
+//
+// luceneCleanupRemoveIndexConsumer.processArchivaArtifact( artifact );
+// }
+//
+// private ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String type )
+// {
+// ArchivaArtifactModel model = new ArchivaArtifactModel();
+// model.setGroupId( groupId );
+// model.setArtifactId( artifactId );
+// model.setVersion( version );
+// model.setType( type );
+// model.setRepositoryId( "test-repo" );
+//
+// return new ArchivaArtifact( model );
+// }
+//
+//}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Tue Feb 10 05:35:05 2009
@@ -83,24 +83,6 @@
</check>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>merge</id>
- <goals>
- <goal>merge-descriptors</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
- <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java Tue Feb 10 05:35:05 2009
@@ -19,13 +19,6 @@
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.indexer.bytecode.BytecodeRecord;
-import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
-import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord;
-import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -56,95 +49,6 @@
{
hits.put( id, hit );
}
-
- public void addHit( LuceneRepositoryContentRecord record )
- {
- if ( record instanceof FileContentRecord )
- {
- FileContentRecord filecontent = (FileContentRecord) record;
- addFileContentHit( filecontent );
- }
- else if ( record instanceof HashcodesRecord )
- {
- HashcodesRecord hashcodes = (HashcodesRecord) record;
- addHashcodeHit( hashcodes );
- }
- else if ( record instanceof BytecodeRecord )
- {
- BytecodeRecord bytecode = (BytecodeRecord) record;
- addBytecodeHit( bytecode );
- }
- }
-
- private void addBytecodeHit( BytecodeRecord bytecode )
- {
- String key = toKey( bytecode.getArtifact() );
-
- SearchResultHit hit = (SearchResultHit) this.hits.get( key );
-
- if ( hit == null )
- {
- hit = new SearchResultHit();
- }
-
- hit.setRepositoryId( bytecode.getRepositoryId() );
- hit.setArtifact( bytecode.getArtifact() );
- hit.setContext( null ); // TODO: provide context on why this is a valuable hit.
-
- this.hits.put( key, hit );
- }
-
- private String toKey( ArchivaArtifact artifact )
- {
- StringBuffer key = new StringBuffer();
-
- key.append( StringUtils.defaultString( artifact.getModel().getRepositoryId() ) ).append( ":" );
- key.append( StringUtils.defaultString( artifact.getGroupId() ) ).append( ":" );
- key.append( StringUtils.defaultString( artifact.getArtifactId() ) ).append( ":" );
- key.append( StringUtils.defaultString( artifact.getVersion() ) );
-
- return key.toString();
- }
-
- private void addHashcodeHit( HashcodesRecord hashcodes )
- {
- String key = toKey( hashcodes.getArtifact() );
-
- SearchResultHit hit = (SearchResultHit) this.hits.get( key );
-
- if ( hit == null )
- {
- hit = new SearchResultHit();
- }
-
- hit.setArtifact( hashcodes.getArtifact() );
- hit.setContext( null ); // TODO: provide context on why this is a valuable hit.
-
- hits.put( key, hit );
- }
-
- public void addFileContentHit( FileContentRecord filecontent )
- {
- final String key = filecontent.getPrimaryKey();
- SearchResultHit hit = hits.get( key );
- if ( hit == null )
- {
- // Only need to worry about this hit if it is truely new.
- hit = new SearchResultHit();
-
- hit.setRepositoryId( filecontent.getRepositoryId() );
- hit.setUrl( filecontent.getRepositoryId() + "/" + filecontent.getFilename() );
- hit.setContext( null ); // TODO: handle context + highlight later.
-
- // Test for possible artifact reference ...
- if( filecontent.getArtifact() != null )
- {
- hit.setArtifact( filecontent.getArtifact() );
- }
-
- this.hits.put( key, hit );
- }
- }
/**
* Get the list of {@link SearchResultHit} objects.
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java Tue Feb 10 05:35:05 2009
@@ -106,6 +106,11 @@
public String type = "";
/**
+ * The Repository Id (JPOX Requires this remain public)
+ */
+ public String repositoryId = "";
+
+ /**
* Default Constructor. Required by JPOX.
*/
public AbstractArtifactKey()
@@ -126,19 +131,22 @@
version = parts[2];
classifier = parts[3];
type = parts[4];
+ repositoryId = parts[5];
}
/**
* Get the String representation of this object. - Required by JPOX.
*/
+ @Override
public String toString()
{
- return StringUtils.join( new String[] { groupId, artifactId, version, classifier, type }, ':' );
+ return StringUtils.join( new String[] { groupId, artifactId, version, classifier, type, repositoryId }, ':' );
}
/**
* Get the hashcode for this object's values - Required by JPOX.
*/
+ @Override
public int hashCode()
{
final int PRIME = 31;
@@ -148,12 +156,14 @@
result = PRIME * result + ( ( version == null ) ? 0 : version.hashCode() );
result = PRIME * result + ( ( classifier == null ) ? 0 : classifier.hashCode() );
result = PRIME * result + ( ( type == null ) ? 0 : type.hashCode() );
+ result = PRIME * result + ( ( repositoryId == null ) ? 0 : repositoryId.hashCode() );
return result;
}
/**
* Get the equals for this object's values - Required by JPOX.
*/
+ @Override
public boolean equals( Object obj )
{
if ( this == obj )
@@ -233,6 +243,18 @@
return false;
}
+ if ( repositoryId == null )
+ {
+ if ( other.repositoryId != null )
+ {
+ return false;
+ }
+ }
+ else if ( !repositoryId.equals( other.repositoryId ) )
+ {
+ return false;
+ }
+
return true;
}
@@ -286,4 +308,13 @@
}
}
+ public void setRepositoryId( String repositoryId )
+ {
+ this.repositoryId = "";
+
+ if ( StringUtils.isNotBlank(repositoryId) )
+ {
+ this.repositoryId = repositoryId;
+ }
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java Tue Feb 10 05:35:05 2009
@@ -36,7 +36,7 @@
private String baseVersion;
public ArchivaArtifact( String groupId, String artifactId, String version,
- String classifier, String type )
+ String classifier, String type, String repositoryId )
{
if ( empty( groupId ) )
{
@@ -62,6 +62,12 @@
+ Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
}
+ if ( empty( repositoryId ) )
+ {
+ throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty repositoryId ["
+ + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
+ }
+
model = new ArchivaArtifactModel();
model.setGroupId( groupId );
@@ -70,6 +76,7 @@
model.setClassifier( StringUtils.defaultString( classifier ) );
model.setType( type );
model.setSnapshot( VersionUtil.isSnapshot( version ) );
+ model.setRepositoryId(repositoryId);
this.baseVersion = VersionUtil.getBaseVersion( version );
}
@@ -81,9 +88,9 @@
this.baseVersion = VersionUtil.getBaseVersion( model.getVersion() );
}
- public ArchivaArtifact( ArtifactReference ref )
+ public ArchivaArtifact( ArtifactReference ref, String repositoryId )
{
- this( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType() );
+ this( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType(), repositoryId );
}
public ArchivaArtifactModel getModel()
@@ -131,6 +138,11 @@
return StringUtils.isNotEmpty( model.getClassifier() );
}
+ public String getRepositoryId()
+ {
+ return model.getRepositoryId();
+ }
+
@Override
public int hashCode()
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Tue Feb 10 05:35:05 2009
@@ -299,11 +299,14 @@
The type of artifact.
</description>
</field>
- <field stash.maxSize="50">
+ <field stash.maxSize="50"
+ jpox.primary-key="true"
+ jpox.value-strategy="off"
+ jpox.persistence-modifier="persistent">
<name>repositoryId</name>
- <identifier>false</identifier>
+ <identifier>true</identifier>
<version>1.0.0+</version>
- <required>false</required>
+ <required>true</required>
<type>String</type>
<description>
The repository associated with this content.
@@ -513,6 +516,19 @@
The type of artifact.
</description>
</field>
+ <field stash.maxSize="50"
+ jpox.primary-key="true"
+ jpox.value-strategy="off"
+ jpox.persistence-modifier="persistent">
+ <name>repositoryId</name>
+ <identifier>true</identifier>
+ <version>1.0.0+</version>
+ <required>true</required>
+ <type>String</type>
+ <description>
+ The repository associated with this content.
+ </description>
+ </field>
<field>
<name>checksumBytecode</name>
<identifier>false</identifier>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java Tue Feb 10 05:35:05 2009
@@ -51,7 +51,7 @@
throws ProjectModelException
{
ArchivaArtifact artifact = new ArchivaArtifact( reference.getGroupId(), reference.getArtifactId(), reference
- .getVersion(), "", "pom" );
+ .getVersion(), "", "pom", repository.getId() );
File repoFile = repository.toFile( artifact );
Modified: archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java Tue Feb 10 05:35:05 2009
@@ -52,10 +52,10 @@
*/
public ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String classifier,
- String type );
+ String type, String repositoryId );
public ArchivaArtifact getArtifact( String groupId, String artifactId, String version, String classifier,
- String type )
+ String type, String repositoryId )
throws ObjectNotFoundException, ArchivaDatabaseException;
public List /*<ArchivaArtifact>*/queryArtifacts( Constraint constraint )
Modified: archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListener.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListener.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListener.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListener.java Tue Feb 10 05:35:05 2009
@@ -42,14 +42,12 @@
{
ArchivaArtifact queriedArtifact =
artifactDAO.getArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getClassifier(), artifact.getType() );
+ artifact.getClassifier(), artifact.getType() , repository.getId());
artifactDAO.deleteArtifact( queriedArtifact );
}
catch ( ArchivaDatabaseException e )
{
// ignored
}
-
- // TODO [MRM-37]: re-run the database consumers to clean up
}
}
Modified: archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java Tue Feb 10 05:35:05 2009
@@ -65,7 +65,7 @@
*/
private DatabaseUpdater dbUpdater;
- public BrowsingResults getRoot( String principle, List<String> observableRepositoryIds )
+ public BrowsingResults getRoot( final String principle, final List<String> observableRepositoryIds )
{
List<String> groups = dao.query( new UniqueGroupIdConstraint( observableRepositoryIds ) );
@@ -77,8 +77,8 @@
return results;
}
- public BrowsingResults selectArtifactId( String principle, List<String> observableRepositoryIds, String groupId,
- String artifactId )
+ public BrowsingResults selectArtifactId( final String principle, final List<String> observableRepositoryIds, final String groupId,
+ final String artifactId )
{
// NOTE: No group Id or artifact Id's should be returned here.
List<String> versions = dao.query( new UniqueVersionConstraint( observableRepositoryIds, groupId, artifactId ) );
@@ -93,7 +93,7 @@
return results;
}
- public BrowsingResults selectGroupId( String principle, List<String> observableRepositoryIds, String groupId )
+ public BrowsingResults selectGroupId( final String principle, final List<String> observableRepositoryIds, final String groupId )
{
List<String> groups = dao.query( new UniqueGroupIdConstraint( observableRepositoryIds, groupId ) );
List<String> artifacts = dao.query( new UniqueArtifactIdConstraint( observableRepositoryIds, groupId ) );
@@ -110,14 +110,13 @@
return results;
}
- public ArchivaProjectModel selectVersion( String principle, List<String> observableRepositoryIds, String groupId,
- String artifactId, String version )
+ public ArchivaProjectModel selectVersion( final String principle, final List<String> observableRepositoryIds, final String groupId,
+ final String artifactId, final String version )
throws ObjectNotFoundException, ArchivaDatabaseException
{
ArchivaArtifact pomArtifact = getArtifact( principle, observableRepositoryIds, groupId, artifactId, version );
ArchivaProjectModel model;
- version = pomArtifact.getVersion();
if ( !pomArtifact.getModel().isProcessed() )
{
@@ -125,13 +124,13 @@
dbUpdater.updateUnprocessed( pomArtifact );
}
- model = getProjectModel( groupId, artifactId, version );
+ model = getProjectModel( groupId, artifactId, pomArtifact.getVersion() );
return model;
}
- public String getRepositoryId( String principle, List<String> observableRepositoryIds, String groupId,
- String artifactId, String version )
+ public String getRepositoryId( final String principle, final List<String> observableRepositoryIds, final String groupId,
+ final String artifactId, final String version )
throws ObjectNotFoundException, ArchivaDatabaseException
{
ArchivaArtifact pomArchivaArtifact =
@@ -140,21 +139,25 @@
return pomArchivaArtifact.getModel().getRepositoryId();
}
- private ArchivaArtifact getArtifact( String principle, List<String> observableRepositoryIds, String groupId,
- String artifactId, String version )
+ private ArchivaArtifact getArtifact( final String principal, final List<String> observableRepositoryIds, final String groupId,
+ final String artifactId, final String version )
throws ObjectNotFoundException, ArchivaDatabaseException
{
ArchivaArtifact pomArtifact = null;
- try
- {
- pomArtifact = dao.getArtifactDAO().getArtifact( groupId, artifactId, version, null, "pom" );
- }
- catch ( ObjectNotFoundException e )
+ for (final String repositoryId : observableRepositoryIds)
{
- pomArtifact = handleGenericSnapshots( groupId, artifactId, version, pomArtifact );
+ try
+ {
+ pomArtifact = dao.getArtifactDAO().getArtifact( groupId, artifactId, version, null, "pom", repositoryId );
+ }
+ catch ( ObjectNotFoundException e )
+ {
+ pomArtifact = handleGenericSnapshots( groupId, artifactId, version, repositoryId );
+ }
}
+
if ( pomArtifact == null )
{
throw new ObjectNotFoundException( "Unable to find artifact [" + Keys.toKey( groupId, artifactId, version )
@@ -170,12 +173,12 @@
{
throw new ObjectNotFoundException( "Unable to find artifact " + Keys.toKey( groupId, artifactId, version )
+ " in observable repository [" + StringUtils.join( observableRepositoryIds.iterator(), ", " )
- + "] for user " + principle );
+ + "] for user " + principal );
}
}
- public List<ArchivaProjectModel> getUsedBy( String principle, List<String> observableRepositoryIds, String groupId,
- String artifactId, String version )
+ public List<ArchivaProjectModel> getUsedBy( final String principle, final List<String> observableRepositoryIds, final String groupId,
+ final String artifactId, final String version )
throws ArchivaDatabaseException
{
ProjectsByArtifactUsageConstraint constraint = new ProjectsByArtifactUsageConstraint( groupId, artifactId,
@@ -208,7 +211,7 @@
*
* @param versions
*/
- private void processSnapshots( List<String> versions )
+ private void processSnapshots( final List<String> versions )
{
Map<String, String> snapshots = new HashMap<String, String>();
@@ -248,10 +251,11 @@
* @param pomArtifact
* @throws ArchivaDatabaseException
*/
- private ArchivaArtifact handleGenericSnapshots( String groupId, String artifactId, String version,
- ArchivaArtifact pomArtifact )
+ private ArchivaArtifact handleGenericSnapshots( final String groupId, final String artifactId, final String version, final String repositoryId )
throws ArchivaDatabaseException
{
+ ArchivaArtifact result = null;
+
if ( VersionUtil.isGenericSnapshot( version ) )
{
List<String> versions = dao.query( new UniqueVersionConstraint( groupId, artifactId ) );
@@ -263,14 +267,11 @@
if ( VersionUtil.getBaseVersion( uniqueVersion ).equals( version ) )
{
log.info( "Retrieving artifact with version " + uniqueVersion );
- pomArtifact = dao.getArtifactDAO().getArtifact( groupId, artifactId, uniqueVersion, null, "pom" );
-
- return pomArtifact;
+ result = dao.getArtifactDAO().getArtifact( groupId, artifactId, uniqueVersion, null, "pom", repositoryId );
}
}
}
-
- return null;
+ return result;
}
/**
Modified: archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAO.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAO.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAO.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAO.java Tue Feb 10 05:35:05 2009
@@ -49,24 +49,24 @@
/* .\ Archiva Artifact \. _____________________________________________________________ */
public ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String classifier,
- String type )
+ String type, String repositoryId )
{
ArchivaArtifact artifact;
try
{
- artifact = getArtifact( groupId, artifactId, version, classifier, type );
+ artifact = getArtifact( groupId, artifactId, version, classifier, type, repositoryId );
}
catch ( ArchivaDatabaseException e )
{
- artifact = new ArchivaArtifact( groupId, artifactId, version, classifier, type );
+ artifact = new ArchivaArtifact( groupId, artifactId, version, classifier, type, repositoryId );
}
return artifact;
}
public ArchivaArtifact getArtifact( String groupId, String artifactId, String version, String classifier,
- String type )
+ String type, String repositoryId )
throws ObjectNotFoundException, ArchivaDatabaseException
{
ArchivaArtifactModelKey key = new ArchivaArtifactModelKey();
@@ -75,6 +75,7 @@
key.setVersion( version );
key.setClassifier( classifier );
key.setType( type );
+ key.setRepositoryId( repositoryId );
ArchivaArtifactModel model = (ArchivaArtifactModel) jdo.getObjectById( ArchivaArtifactModel.class, key, null );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java Tue Feb 10 05:35:05 2009
@@ -54,6 +54,7 @@
protected ArchivaDAO dao;
+ @Override
protected void setUp()
throws Exception
{
@@ -186,7 +187,7 @@
protected ArtifactReference toArtifactReference( String id )
{
String parts[] = StringUtils.splitPreserveAllTokens( id, ':' );
- assertEquals( "Should have 5 parts [" + id + "]", 5, parts.length );
+ assertEquals( "Should have 6 parts [" + id + "]", 6, parts.length );
ArtifactReference ref = new ArtifactReference();
ref.setGroupId( parts[0] );
@@ -194,7 +195,7 @@
ref.setVersion( parts[2] );
ref.setClassifier( parts[3] );
ref.setType( parts[4] );
-
+
assertTrue( "Group ID should not be blank [" + id + "]", StringUtils.isNotBlank( ref.getGroupId() ) );
assertTrue( "Artifact ID should not be blank [" + id + "]", StringUtils.isNotBlank( ref.getArtifactId() ) );
assertTrue( "Version should not be blank [" + id + "]", StringUtils.isNotBlank( ref.getVersion() ) );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListenerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListenerTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListenerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListenerTest.java Tue Feb 10 05:35:05 2009
@@ -22,6 +22,7 @@
import java.util.Date;
import java.util.List;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
import org.apache.maven.archiva.repository.events.RepositoryListener;
@@ -54,7 +55,7 @@
public ArchivaArtifact createArtifact( String artifactId, String version, ArtifactDAO artifactDao )
{
ArchivaArtifact artifact =
- artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version, "", "jar" );
+ artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version, "", "jar", "testable_repo" );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( "testable_repo" );
return artifact;
@@ -70,16 +71,20 @@
artifactDao.saveArtifact( artifact );
assertEquals( artifact, artifactDao.getArtifact( "org.apache.maven.archiva.test", "test-artifact", "1.0", null,
- "jar" ) );
+ "jar", "testable_repo" ) );
- artifact = new ArchivaArtifact( "org.apache.maven.archiva.test", "test-artifact", "1.0", null, "jar" );
+ artifact = new ArchivaArtifact( "org.apache.maven.archiva.test", "test-artifact", "1.0", null, "jar", "testable_repo" );
ManagedRepositoryContent repository =
(ManagedRepositoryContent) lookup( ManagedRepositoryContent.class.getName(), "default" );
+ ManagedRepositoryConfiguration configuration = new ManagedRepositoryConfiguration();
+ configuration.setId("testable_repo");
+ repository.setRepository(configuration);
+
listener.deleteArtifact( repository, artifact );
try
{
- artifactDao.getArtifact( "org.apache.maven.archiva.test", "test-artifact", "1.0", null, "jar" );
+ artifactDao.getArtifact( "org.apache.maven.archiva.test", "test-artifact", "1.0", null, "jar", "testable_repo" );
fail( "Should not find artifact" );
}
catch ( ObjectNotFoundException e )
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java Tue Feb 10 05:35:05 2009
@@ -51,7 +51,7 @@
public ArchivaArtifact createArtifact( String groupId, String artifactId, String version )
{
- ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, "", "jar" );
+ ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, "", "jar", "central" );
artifact.getModel().setLastModified( new Date() ); // mandatory field.
artifact.getModel().setRepositoryId( "central" );
return artifact;
@@ -141,6 +141,7 @@
}
}
+ @Override
protected void setUp()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -40,6 +40,7 @@
public static final String TEST_REPO = "test-repo";
+ @Override
public void setUp()
throws Exception
{
@@ -51,7 +52,7 @@
private ArchivaArtifact createArtifact( String groupId, String artifactId, String version )
{
- ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, null, "jar" );
+ ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, null, "jar", TEST_REPO );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( TEST_REPO );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByChecksumConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByChecksumConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByChecksumConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByChecksumConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -49,7 +49,7 @@
private ArtifactDAO artifactDao;
-
+ @Override
protected void setUp()
throws Exception
{
@@ -62,7 +62,7 @@
public ArchivaArtifact createArtifact( String artifactId, String version )
{
ArchivaArtifact artifact =
- artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version, "", "jar" );
+ artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version, "", "jar", "testable_repo" );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( "testable_repo" );
return artifact;
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -49,7 +49,7 @@
private ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String type )
{
- ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, null, type );
+ ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, null, type, "test-repo" );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( "test-repo" );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -38,7 +38,7 @@
public ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String whenProcessed )
throws Exception
{
- ArchivaArtifact artifact = dao.getArtifactDAO().createArtifact( groupId, artifactId, version, "", "jar" );
+ ArchivaArtifact artifact = dao.getArtifactDAO().createArtifact( groupId, artifactId, version, "", "jar", "testrepo" );
assertNotNull( "Artifact should not be null.", artifact );
Date dateWhenProcessed = null;
@@ -88,6 +88,7 @@
}
}
+ @Override
protected void setUp()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsRelatedConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsRelatedConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsRelatedConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsRelatedConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -51,7 +51,7 @@
public ArchivaArtifact createArtifact( String artifactId, String version, String classifier, String type )
{
ArchivaArtifact artifact = artifactDao.createArtifact( TEST_GROUPID, artifactId, version,
- classifier, type );
+ classifier, type, "testable_repo" );
Calendar cal = Calendar.getInstance();
artifact.getModel().setLastModified( cal.getTime() );
artifact.getModel().setRepositoryId( "testable_repo" );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatisticsTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatisticsTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatisticsTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatisticsTest.java Tue Feb 10 05:35:05 2009
@@ -46,6 +46,7 @@
return stats;
}
+ @Override
protected void setUp()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderArtifactsByAgeConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderArtifactsByAgeConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderArtifactsByAgeConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderArtifactsByAgeConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -50,7 +50,7 @@
public ArchivaArtifact createArtifact( String artifactId, String version, int daysOld )
{
ArchivaArtifact artifact = artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version,
- "", "jar" );
+ "", "jar", "testable_repo" );
Calendar cal = Calendar.getInstance();
cal.add( Calendar.DAY_OF_MONTH, ( -1 ) * daysOld );
artifact.getModel().setLastModified( cal.getTime() );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderSnapshotArtifactsByAgeConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderSnapshotArtifactsByAgeConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderSnapshotArtifactsByAgeConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/OlderSnapshotArtifactsByAgeConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -50,7 +50,7 @@
public ArchivaArtifact createArtifact( String artifactId, String version, int daysOld )
{
ArchivaArtifact artifact = artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version,
- "", "jar" );
+ "", "jar", "testable_repo" );
Calendar cal = Calendar.getInstance();
cal.add( Calendar.DAY_OF_MONTH, ( -1 ) * daysOld );
artifact.getModel().setLastModified( cal.getTime() );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -38,6 +38,7 @@
public class ProjectsByArtifactUsageConstraintTest
extends AbstractArchivaDatabaseTestCase
{
+ @Override
protected void setUp()
throws Exception
{
@@ -80,7 +81,7 @@
ArtifactReference ref = toArtifactReference( id );
ArchivaArtifact artifact = new ArchivaArtifact( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref
- .getClassifier(), ref.getType() );
+ .getClassifier(), ref.getType(), "testable_repo" );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( "testable_repo" );
return artifact;
@@ -90,17 +91,17 @@
throws Exception
{
saveModel( "org.apache.maven.archiva:archiva-configuration:1.0",
- new String[] { "org.codehaus.plexus:plexus-digest:1.0::jar" } );
+ new String[] { "org.codehaus.plexus:plexus-digest:1.0::jar:" } );
saveModel( "org.apache.maven.archiva:archiva-common:1.0", new String[] {
- "org.codehaus.plexus:plexus-digest:1.0::jar",
- "junit:junit:3.8.1::jar" } );
+ "org.codehaus.plexus:plexus-digest:1.0::jar:",
+ "junit:junit:3.8.1::jar:" } );
ArchivaArtifact artifact;
- artifact = toArtifact( "org.foo:bar:4.0::jar" );
+ artifact = toArtifact( "org.foo:bar:4.0::jar:" );
assertConstraint( 0, new ProjectsByArtifactUsageConstraint( artifact ) );
- artifact = toArtifact( "org.codehaus.plexus:plexus-digest:1.0::jar" );
+ artifact = toArtifact( "org.codehaus.plexus:plexus-digest:1.0::jar:testable_repo" );
assertConstraint( 2, new ProjectsByArtifactUsageConstraint( artifact ) );
}
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -38,6 +38,7 @@
{
private ArtifactDAO artifactDao;
+ @Override
protected void setUp()
throws Exception
{
@@ -50,7 +51,7 @@
public ArchivaArtifact createArtifact( String artifactId, String version, int daysOld )
{
ArchivaArtifact artifact = artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version,
- "", "jar" );
+ "", "jar", "testable_repo" );
Calendar cal = Calendar.getInstance();
cal.add( Calendar.DAY_OF_MONTH, ( -1 ) * daysOld );
artifact.getModel().setLastModified( cal.getTime() );
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryContentStatisticsByRepositoryConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryContentStatisticsByRepositoryConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryContentStatisticsByRepositoryConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryContentStatisticsByRepositoryConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -47,6 +47,7 @@
return stats;
}
+ @Override
protected void setUp()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -53,7 +53,7 @@
public ArchivaArtifact createArtifact( String groupId, String artifactId, String version )
{
- ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, "", "jar" );
+ ArchivaArtifact artifact = artifactDao.createArtifact( groupId, artifactId, version, "", "jar", "testable_repo" );
artifact.getModel().setLastModified( new Date() ); // mandatory field.
artifact.getModel().setRepositoryId( "testable_repo" );
return artifact;
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueFieldConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueFieldConstraintTest.java?rev=742859&r1=742858&r2=742859&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueFieldConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueFieldConstraintTest.java Tue Feb 10 05:35:05 2009
@@ -61,7 +61,7 @@
public ArchivaArtifact createArtifact( String groupId )
{
- ArchivaArtifact artifact = artifactDao.createArtifact( groupId, "artifactId", "version", "classifier", "jar" );
+ ArchivaArtifact artifact = artifactDao.createArtifact( groupId, "artifactId", "version", "classifier", "jar", "testrepo" );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( "repoId" );