Author: epunzalan
Date: Thu Mar 2 19:23:32 2006
New Revision: 382635
URL: http://svn.apache.org/viewcvs?rev=382635&view=rev
Log:
PR: MRM-99
Submitted by: Maria Odea Ching
Applied patch to use RepositoryIndexSearchLayer for searching in packages
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java?rev=382635&r1=382634&r2=382635&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
Thu Mar 2 19:23:32 2006
@@ -24,9 +24,10 @@
import org.apache.maven.repository.indexing.RepositoryIndexException;
import org.apache.maven.repository.indexing.RepositoryIndexSearchException;
import org.apache.maven.repository.indexing.RepositoryIndexingFactory;
-import org.apache.maven.repository.indexing.RepositoryIndex;
+import org.apache.maven.repository.indexing.RepositoryIndexSearchLayer;
import org.apache.maven.repository.indexing.query.SinglePhraseQuery;
import org.apache.maven.repository.manager.web.job.Configuration;
+import org.apache.maven.repository.indexing.RepositoryIndex;
import java.io.File;
import java.net.MalformedURLException;
@@ -45,6 +46,8 @@
private String md5;
+ private List searchResult;
+
/**
* @plexus.requirement
*/
@@ -60,8 +63,6 @@
*/
private Configuration configuration;
- private List artifacts;
-
public String execute()
throws MalformedURLException, RepositoryIndexException,
RepositoryIndexSearchException
{
@@ -94,9 +95,9 @@
ArtifactRepositoryIndex index = factory.createArtifactRepositoryIndex(
indexPath, repository );
- DefaultRepositoryIndexSearcher searcher =
factory.createDefaultRepositoryIndexSearcher( index );
+ RepositoryIndexSearchLayer searchLayer =
factory.createRepositoryIndexSearchLayer( index );
- artifacts = searcher.search( new SinglePhraseQuery( key, searchTerm )
);
+ searchResult = searchLayer.searchAdvanced( new SinglePhraseQuery( key,
searchTerm ) );
return SUCCESS;
}
@@ -111,8 +112,8 @@
this.md5 = md5;
}
- public List getArtifacts()
+ public List getSearchResult()
{
- return artifacts;
+ return searchResult;
}
}
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=382635&r1=382634&r2=382635&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Thu Mar 2 19:23:32 2006
@@ -26,17 +26,23 @@
<%@ include file="form.jspf" %>
-<table>
+<table border="1px" cellspacing="0">
<tr>
<th>Group ID</th>
<th>Artifact ID</th>
<th>Version</th>
</tr>
- <ww:iterator value="artifacts">
+ <ww:iterator value="searchResult">
<tr>
- <td><ww:property value="groupId"/></td>
- <td><ww:property value="artifactId"/></td>
- <td><ww:property value="version"/></td>
+ <td valign="top">
+ <ww:property value="Artifact.getGroupId()"/>
+ </td>
+ <td valign="top">
+ <ww:property value="Artifact.getArtifactId()"/>
+ </td>
+ <td valign="top">
+ <ww:property value="Artifact.getVersion()"/>
+ </td>
</tr>
</ww:iterator>
</table>
