Author: oching
Date: Thu Jan 8 02:14:02 2009
New Revision: 732674
URL: http://svn.apache.org/viewvc?rev=732674&view=rev
Log:
fix some problems in invoking search service
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/SearchService.java
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/SearchService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/SearchService.java?rev=732674&r1=732673&r2=732674&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/SearchService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/SearchService.java
Thu Jan 8 02:14:02 2009
@@ -27,7 +27,7 @@
import com.atlassian.xmlrpc.ServiceObject;
-...@serviceobject("Search")
+...@serviceobject("SearchService")
public interface SearchService
{
/*
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java?rev=732674&r1=732673&r2=732674&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
Thu Jan 8 02:14:02 2009
@@ -20,7 +20,6 @@
*/
import java.io.Serializable;
-import java.util.Date;
import com.atlassian.xmlrpc.ServiceBean;
import com.atlassian.xmlrpc.ServiceBeanField;
@@ -39,22 +38,22 @@
private String type;
- private Date whenGathered;
+ //private Date whenGathered;
public Artifact()
{
}
- public Artifact( String repositoryId, String groupId, String artifactId,
String version,
- String type, Date whenGathered )
+ public Artifact( String repositoryId, String groupId, String artifactId,
String version, String type )
+// String type, Date whenGathered )
{
this.repositoryId = repositoryId;
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
this.type = type;
- this.whenGathered = whenGathered;
+ //this.whenGathered = whenGathered;
}
public String getGroupId()
@@ -77,10 +76,10 @@
return type;
}
- public Date getWhenGathered()
+ /*public Date getWhenGathered()
{
return whenGathered;
- }
+ }*/
@ServiceBeanField( "groupId" )
public void setGroupId( String groupId )
@@ -106,11 +105,11 @@
this.type = type;
}
- @ServiceBeanField( "whenGathered" )
+ /*...@servicebeanfield( "whenGathered" )
public void setWhenGathered( Date whenGathered )
{
this.whenGathered = whenGathered;
- }
+ }*/
public String getRepositoryId()
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java?rev=732674&r1=732673&r2=732674&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
Thu Jan 8 02:14:02 2009
@@ -23,6 +23,8 @@
import java.util.List;
import org.apache.archiva.web.xmlrpc.api.AdministrationService;
+import org.apache.archiva.web.xmlrpc.api.SearchService;
+import org.apache.archiva.web.xmlrpc.api.beans.Artifact;
import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository;
import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository;
@@ -117,6 +119,23 @@
System.out.println( "\nDeleted artifact
'javax.activation:activation:1.1' from repository 'internal' : " +
( (Boolean) success ).booleanValue() );
*/
+
+ /* quick search */
+ /*
+ * NOTE: before enabling & invoking search service, make sure that
the artifacts you're searching
+ * for has been indexed already in order to get results
+ *
+ SearchService searchService = binder.bind( SearchService.class,
new URL( args[0] ), authnInfo );
+ List<Artifact> artifacts = searchService.quickSearch( "org" );
+
+ System.out.println( "\n************ Search Results for 'org'
*************" );
+ for( Artifact artifact : artifacts )
+ {
+ System.out.println( "Artifact: " + artifact.getGroupId() + ":"
+ artifact.getArtifactId() +
+ ":" + artifact.getVersion() );
+ }
+ */
+
}
catch ( BindingException e )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java?rev=732674&r1=732673&r2=732674&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
Thu Jan 8 02:14:02 2009
@@ -29,6 +29,7 @@
import org.apache.archiva.web.xmlrpc.api.beans.Dependency;
import org.apache.archiva.web.xmlrpc.security.XmlRpcUserRepositories;
import org.apache.maven.archiva.database.ArchivaDAO;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.database.ObjectNotFoundException;
import org.apache.maven.archiva.database.browsing.BrowsingResults;
@@ -102,16 +103,28 @@
for( SearchResultHit hit : hits )
{
ArtifactDAO artifactDAO = archivaDAO.getArtifactDAO();
- ArchivaArtifact pomArtifact = artifactDAO.getArtifact(
- hit.getGroupId(), hit.getArtifactId(),
hit.getVersion(), "", "pom" );
-
- if( pomArtifact != null )
+ try
+ {
+ ArchivaArtifact pomArtifact = artifactDAO.getArtifact(
+ hit.getGroupId(), hit.getArtifactId(),
hit.getVersion(), "", "pom" );
+
+ if( pomArtifact != null )
+ {
+ Artifact artifact = new Artifact(
pomArtifact.getModel().getRepositoryId(), pomArtifact.getGroupId(),
pomArtifact.getArtifactId(), pomArtifact.getVersion(),
+ pomArtifact.getType() );
+ //pomArtifact.getType(),
pomArtifact.getModel().getWhenGathered() );
+ artifacts.add( artifact );
+ }
+ else
+ {
+ continue;
+ }
+ }
+ catch ( ObjectNotFoundException e )
{
- Artifact artifact = new Artifact(
pomArtifact.getModel().getRepositoryId(), pomArtifact.getGroupId(),
pomArtifact.getArtifactId(), pomArtifact.getVersion(),
- pomArtifact.getType(),
pomArtifact.getModel().getWhenGathered() );
- artifacts.add( artifact );
+ continue;
}
- else
+ catch ( ArchivaDatabaseException e )
{
continue;
}
@@ -137,8 +150,8 @@
for( ArchivaArtifact archivaArtifact : artifacts )
{
Artifact artifact = new Artifact(
archivaArtifact.getModel().getRepositoryId(),
archivaArtifact.getModel().getGroupId(),
- archivaArtifact.getModel().getArtifactId(),
archivaArtifact.getModel().getVersion(), archivaArtifact.getType(),
- archivaArtifact.getModel().getWhenGathered() );
+ archivaArtifact.getModel().getArtifactId(),
archivaArtifact.getModel().getVersion(), archivaArtifact.getType() );
+ //archivaArtifact.getModel().getWhenGathered() );
results.add( artifact );
}
@@ -157,8 +170,8 @@
for( String version : results.getVersions() )
{
ArchivaArtifact pomArtifact = artifactDAO.getArtifact( groupId,
artifactId, version, "", "pom" );
- Artifact artifact = new Artifact( "", groupId, artifactId,
version, pomArtifact.getType(),
- pomArtifact.getModel().getWhenGathered() );
+ Artifact artifact = new Artifact( "", groupId, artifactId,
version, pomArtifact.getType() );
+ //pomArtifact.getModel().getWhenGathered() );
artifacts.add( artifact );
}
@@ -222,7 +235,9 @@
List<ArchivaProjectModel> dependees = repoBrowsing.getUsedBy( "",
observableRepos, "org.apache.archiva", "archiva-test", "1.0" );
for( ArchivaProjectModel model : dependees )
{
- Artifact artifact = new Artifact( "", model.getGroupId(),
model.getArtifactId(), model.getVersion(), "", model.getWhenIndexed() );
+ Artifact artifact =
+ new Artifact( "", model.getGroupId(), model.getArtifactId(),
model.getVersion(), "" );
+ //model.getWhenIndexed() );
artifacts.add( artifact );
}
