[MRM-1779] pom artifacts cannot be searched on Archiva 1.4-M4

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1525882 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
index 3ec7502e1cd74e456270d4f317eeea4d5d5ba75d..554208cc3d013c3b3fc38bcfb3ca69b9b1a4327c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
@@ -123,7 +123,7 @@ public class MavenRepositorySearch
 
         // we retun only artifacts without classifier in quick search, olamy cannot find a way to say with this field empty
         // FIXME  cannot find a way currently to setup this in constructQuery !!!
-        return search( limits, q, indexingContextIds, NoClassifierArtifactInfoFilter.LIST, selectedRepos, false );
+        return search( limits, q, indexingContextIds, NoClassifierArtifactInfoFilter.LIST, selectedRepos, true );
 
     }
 

diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
index c35958aed3b368571724c395e8b372eb4e6487c5..ef81635f5a38ded0877cc4d5e711fc00b9219f64 100644 (file)
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
@@ -208,6 +208,13 @@ public abstract class AbstractMavenRepositorySearch
         {
             assertTrue( "file not exists " + artifactFile.getPath(), artifactFile.exists() );
             ArtifactContext ac = artifactContextProducer.getArtifactContext( context, artifactFile );
+
+            if ( artifactFile.getPath().endsWith( ".pom" ) )
+            {
+                ac.getArtifactInfo().fextension = "pom";
+                ac.getArtifactInfo().packaging = "pom";
+                ac.getArtifactInfo().classifier = "pom";
+            }
             nexusIndexer.addArtifactToIndex( ac, context );
             context.updateTimestamp( true );
         }

diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
index 344a39c2e0cb29e0acadd5e9472c0b028e9e144d..87b4ff1cad50c9eb039a64c1df7f1bab90db2ac2 100644 (file)
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
@@ -85,6 +85,10 @@ public class MavenRepositorySearchTest
 
         files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
             + "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
+
+        files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
+            + "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom" ) );
+
         files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
             + "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar" ) );
 

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
index 699d3f76f69cf6592fe35ad32dc1fc76159e15b9..3fc0981e9ab764d29c1878dca05cd2960111b0fe 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
@@ -160,6 +160,14 @@ public class ArchivaIndexingTaskExecutor
 
                     if ( ac != null )
                     {
+                        // MRM-1779 pom must be indexed too
+                        // TODO make that configurable?
+                        if ( artifactFile.getPath().endsWith( ".pom" ) )
+                        {
+                            ac.getArtifactInfo().fextension = "pom";
+                            ac.getArtifactInfo().packaging = "pom";
+                            ac.getArtifactInfo().classifier = "pom";
+                        }
                         if ( indexingTask.getAction().equals( ArtifactIndexingTask.Action.ADD ) )
                         {
                             //IndexSearcher s = context.getIndexSearcher();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
index f920e2d8f51b9ec93d7a4bf1b72edb684a3e610a..9e03ae75b2721c227e8718f437c0698abb096e16 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
@@ -1951,7 +1951,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","select2","knockout","kno
     this.classifier=ko.observable();
 
     //private boolean includePomArtifacts = false;
-    this.includePomArtifacts=ko.observable(false);
+    this.includePomArtifacts=ko.observable(true);
 
     this.classifier=ko.observable();
   }