You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/11/17 22:02:09 UTC
svn commit: r1203364 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/
archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/
archiva-web/archiva-r...
Author: olamy
Date: Thu Nov 17 21:02:08 2011
New Revision: 1203364
URL: http://svn.apache.org/viewvc?rev=1203364&view=rev
Log:
not return pom artifacts when searching artifacts
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.zip
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom (with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java?rev=1203364&r1=1203363&r2=1203364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java Thu Nov 17 21:02:08 2011
@@ -457,6 +457,10 @@ public class NexusRepositorySearch
for ( ArtifactInfo artifactInfo : artifactInfos )
{
+ if ( StringUtils.equalsIgnoreCase( "pom", artifactInfo.fextension ) )
+ {
+ continue;
+ }
String id = SearchUtil.getHitId( artifactInfo.groupId, artifactInfo.artifactId, artifactInfo.classifier,
artifactInfo.packaging );
Map<String, SearchResultHit> hitsMap = results.getHitsMap();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java?rev=1203364&r1=1203363&r2=1203364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java Thu Nov 17 21:02:08 2011
@@ -310,6 +310,34 @@ public class SearchServiceTest
deleteTestRepo( testRepoId );
}
+ @Test
+ /**
+ * test we don't return 2 artifacts pom + zip one
+ */
+ public void getSearchArtifactsWithOnlyClassifier()
+ throws Exception
+ {
+
+ String testRepoId = "test-repo";
+ // force guest user creation if not exists
+ if ( getUserService( authorizationHeader ).getGuestUser() == null )
+ {
+ assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
+ }
+
+ createAndIndexRepo( testRepoId, "src/test/repo-with-classifier-only" );
+
+ SearchService searchService = getSearchService( authorizationHeader );
+
+ SearchRequest searchRequest =
+ new SearchRequest( "org.foo", "studio-all-update-site", null, null, null, Arrays.asList( "test-repo" ) );
+
+ List<Artifact> artifacts = searchService.searchArtifacts( searchRequest );
+ log.info( "artifacts:" + artifacts );
+ assertEquals( 1, artifacts.size() );
+ deleteTestRepo( testRepoId );
+ }
+
private void createAndIndexRepo( String testRepoId, String repoPath )
throws Exception
{
@@ -317,13 +345,6 @@ public class SearchServiceTest
{
getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( testRepoId, false );
}
- //File targetRepo = new File( "target/test-origin-repo" );
- //if ( targetRepo.exists() )
- //{
- // FileUtils.deleteDirectory( targetRepo );
- //}
- //assertFalse( targetRepo.exists() );
- //FileUtils.copyDirectory( new File( "src/test/repo-with-osgi" ), targetRepo );
ManagedRepository managedRepository = new ManagedRepository();
managedRepository.setId( testRepoId );
@@ -340,7 +361,6 @@ public class SearchServiceTest
getRepositoriesService( authorizationHeader ).scanRepositoryNow( testRepoId, true );
- //return targetRepo;
}
private void deleteTestRepo( String id )
Added: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt?rev=1203364&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt Thu Nov 17 21:02:08 2011
@@ -0,0 +1,2 @@
+foo
+bar
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom?rev=1203364&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom Thu Nov 17 21:02:08 2011
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.foo</groupId>
+ <artifactId>release-description</artifactId>
+ <version>5.0.0</version>
+</project>
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/release-description/5.0.0/release-description-5.0.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.zip
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0-Patch_20110802_bug1234_v1_fixedAbugInTheStudioGui.zip?rev=1203364&view=auto
==============================================================================
(empty)
Added: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom?rev=1203364&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom Thu Nov 17 21:02:08 2011
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.foo</groupId>
+ <artifactId>studio-all-update-site</artifactId>
+ <version>5.0.0</version>
+</project>
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-classifier-only/org/foo/studio-all-update-site/5.0.0/studio-all-update-site-5.0.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision