svn commit: r1171622 - 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/

[olamy]

Author: olamy
Date: Fri Sep 16 15:24:54 2011
New Revision: 1171622

URL: http://svn.apache.org/viewvc?rev=1171622&view=rev
Log:
add more OSGI search fields

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.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=1171622&r1=1171621&r2=1171622&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
 Fri Sep 16 15:24:54 2011
@@ -186,11 +186,24 @@ public class NexusRepositorySearch
 
         if ( StringUtils.isNotBlank( searchFields.getBundleExportService() ) )
         {
-            q.add( indexer.constructQuery( OSGI.SYMBOLIC_NAME,
+            q.add( indexer.constructQuery( OSGI.EXPORT_SERVICE,
                                            new StringSearchExpression( 
searchFields.getBundleExportService() ) ),
                    Occur.MUST );
         }
 
+        if ( StringUtils.isNotBlank( searchFields.getBundleImportPackage() ) )
+        {
+            q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
+                                           new StringSearchExpression( 
searchFields.getBundleImportPackage() ) ),
+                   Occur.MUST );
+        }
+
+        if ( StringUtils.isNotBlank( searchFields.getBundleName() ) )
+        {
+            q.add( indexer.constructQuery( OSGI.NAME, new 
StringSearchExpression( searchFields.getBundleName() ) ),
+                   Occur.MUST );
+        }
+
         if ( StringUtils.isNotBlank( searchFields.getClassifier() ) )
         {
             q.add(

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java?rev=1171622&r1=1171621&r2=1171622&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
 Fri Sep 16 15:24:54 2011
@@ -77,6 +77,20 @@ public class SearchFields
     private String bundleExportPackage;
 
     /**
+     * contains osgi metadata import package if available
+     *
+     * @since 1.4
+     */
+    private String bundleImportPackage;
+
+    /**
+     * contains osgi metadata name if available
+     *
+     * @since 1.4
+     */
+    private String bundleName;
+
+    /**
      * contains osgi metadata Export-Service if available
      *
      * @since 1.4
@@ -212,6 +226,26 @@ public class SearchFields
         this.classifier = classifier;
     }
 
+    public String getBundleImportPackage()
+    {
+        return bundleImportPackage;
+    }
+
+    public void setBundleImportPackage( String bundleImportPackage )
+    {
+        this.bundleImportPackage = bundleImportPackage;
+    }
+
+    public String getBundleName()
+    {
+        return bundleName;
+    }
+
+    public void setBundleImportName( String bundleName )
+    {
+        this.bundleName = bundleName;
+    }
+
     @Override
     public String toString()
     {
@@ -226,6 +260,8 @@ public class SearchFields
         sb.append( ", bundleVersion='" ).append( bundleVersion ).append( '\'' 
);
         sb.append( ", bundleSymbolicName='" ).append( bundleSymbolicName 
).append( '\'' );
         sb.append( ", bundleExportPackage='" ).append( bundleExportPackage 
).append( '\'' );
+        sb.append( ", bundleImportPackage='" ).append( bundleImportPackage 
).append( '\'' );
+        sb.append( ", bundleName='" ).append( bundleName ).append( '\'' );
         sb.append( ", bundleExportService='" ).append( bundleExportService 
).append( '\'' );
         sb.append( ", classifier='" ).append( classifier ).append( '\'' );
         sb.append( '}' );

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=1171622&r1=1171621&r2=1171622&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
 Fri Sep 16 15:24:54 2011
@@ -53,7 +53,10 @@ public class SearchServiceTest
 
         SearchService searchService = getSearchService( authorizationHeader );
 
+        // START SNIPPET: quick-search
         List<Artifact> artifacts = searchService.quickSearch( 
"commons-logging" );
+        // return all artifacts with groupId OR artifactId
+        // START SNIPPET: quick-search
 
         assertNotNull( artifacts );
         assertTrue( " not 6 results for commons-logging search but " + 
artifacts.size() + ":" + artifacts,