svn commit: r1171623 - in /archiva/trunk: archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java

[olamy]

Author: olamy
Date: Fri Sep 16 15:25:45 2011
New Revision: 1171623

URL: http://svn.apache.org/viewvc?rev=1171623&view=rev
Log:
more search snippet links

Modified:
    archiva/trunk/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm
    
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-docs/src/site/apt/adminguide/webservices/rest.apt.vm
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm?rev=1171623&r1=1171622&r2=1171623&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm 
(original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm 
Fri Sep 16 15:25:45 2011
@@ -30,6 +30,7 @@ Using REST Services
 
   Starting version 1.4, you can use some REST Services to manage your Apache 
Archiva instance and Search artifacts.
   All samples here will use Apache CXF REST client API. By the way you can use 
some others REST client frameworks.
+  NOTE: a wadl is available in your Archiva instance : 
http(s)://ip:port/..//restServices/application.wadl
 
 * Search Service
 
@@ -41,3 +42,24 @@ Using REST Services
    Get a Search Service Client :
 
 
%{snippet|id=cxf-searchservice-creation|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java}
+
+   Quick Search
+
+%{snippet|id=quick-search|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java}
+
+   Search Artifacts Version : to search all availables version with a groupId 
and artifactId and packaging (if empty jar is used)
+
+%{snippet|id=searchservice-artifact-versions|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java}
+
+  Search Service with a classifier :
+
+%{snippet|id=searchservice-with-classifier|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java}
+
+  Search Service with a classifier :
+
+%{snippet|id=searchservice-with-classifier|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java}
+
+  To know all the possible options, you can refer to the javadoc of 
SearchRequest class.
+
+
+

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=1171623&r1=1171622&r2=1171623&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:25:45 2011
@@ -55,7 +55,8 @@ public class SearchServiceTest
 
         // START SNIPPET: quick-search
         List<Artifact> artifacts = searchService.quickSearch( 
"commons-logging" );
-        // return all artifacts with groupId OR artifactId
+        // return all artifacts with groupId OR artifactId OR version OR 
packaging OR className
+        // NOTE : only artifacts with classifier empty are returned
         // START SNIPPET: quick-search
 
         assertNotNull( artifacts );
@@ -111,12 +112,14 @@ public class SearchServiceTest
 
         SearchService searchService = getSearchService( authorizationHeader );
 
+        // START SNIPPET: searchservice-with-classifier
         SearchRequest searchRequest = new SearchRequest();
         searchRequest.setGroupId( "commons-logging" );
         searchRequest.setArtifactId( "commons-logging" );
         searchRequest.setClassifier( "sources" );
 
         List<Artifact> artifacts = searchService.searchArtifacts( 
searchRequest );
+        // END SNIPPET: searchservice-with-classifier
 
         assertNotNull( artifacts );
         assertTrue( " not 2 results for commons-logging search but " + 
artifacts.size() + ":" + artifacts,
@@ -142,8 +145,10 @@ public class SearchServiceTest
 
         SearchService searchService = getSearchService( authorizationHeader );
 
+        // START SNIPPET: searchservice-with-osgi
         SearchRequest searchRequest = new SearchRequest();
         searchRequest.setBundleSymbolicName( 
"org.apache.karaf.features.command" );
+        // END SNIPPET: searchservice-with-osgi
 
         List<Artifact> artifacts = searchService.searchArtifacts( 
searchRequest );