Author: epunzalan
Date: Tue Jan 3 01:55:29 2006
New Revision: 365594
URL: http://svn.apache.org/viewcvs?rev=365594&view=rev
Log:
Updated ArtifactRepositoryIndexSearcher to use factory
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java?rev=365594&r1=365593&r2=365594&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
Tue Jan 3 01:55:29 2006
@@ -33,8 +33,6 @@
/**
* This class searches the index for existing artifacts that contains the
* specified query string.
- *
- * @plexus.component
role="org.apache.maven.repository.indexing.RepositoryIndexSearcher"
role-hint="artifact"
*/
public class ArtifactRepositoryIndexSearcher
implements RepositoryIndexSearcher
@@ -47,10 +45,15 @@
private static final String VERSION = "version";
- /**
- * @plexus.requirement
- */
private ArtifactFactory factory;
+
+ private ArtifactRepositoryIndex index;
+
+ public ArtifactRepositoryIndexSearcher( ArtifactRepositoryIndex index,
ArtifactFactory factory )
+ {
+ this.factory = factory;
+ this.index = index;
+ }
/**
* Search the artifact that contains the query string in the specified
@@ -59,7 +62,7 @@
* @param queryString
* @param searchField
*/
- public List search( RepositoryIndex index, String queryString, String
searchField )
+ public List search( String queryString, String searchField )
throws RepositoryIndexSearchException
{
List artifactList = new ArrayList();
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java?rev=365594&r1=365593&r2=365594&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java
Tue Jan 3 01:55:29 2006
@@ -17,6 +17,7 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.repository.digest.Digester;
@@ -31,9 +32,12 @@
/** @plexus.requirement */
private Digester digester;
- public ArtifactRepositoryIndexSearcher
createArtifactRepositoryIndexSearcher(ArtifactRepositoryIndex index)
+ /** @plexus.requirement */
+ private ArtifactFactory artifactFactory;
+
+ public ArtifactRepositoryIndexSearcher
createArtifactRepositoryIndexSearcher( ArtifactRepositoryIndex index )
{
- return null;
+ return new ArtifactRepositoryIndexSearcher( index, artifactFactory );
}
public ArtifactRepositoryIndex createArtifactRepositoryIndex( String
indexPath, ArtifactRepository repository )
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java?rev=365594&r1=365593&r2=365594&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java
Tue Jan 3 01:55:29 2006
@@ -23,8 +23,6 @@
*/
public interface RepositoryIndexSearcher
{
- String ROLE = RepositoryIndexSearcher.class.getName();
-
/**
* Search the artifact that contains the query string in the specified
* search field.
@@ -33,6 +31,6 @@
* @param queryString
* @param searchField
*/
- List search( RepositoryIndex index, String queryString, String searchField
)
+ List search( String queryString, String searchField )
throws RepositoryIndexSearchException;
}
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=365594&r1=365593&r2=365594&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
Tue Jan 3 01:55:29 2006
@@ -162,36 +162,34 @@
createTestIndex();
RepositoryIndexingFactory factory = (RepositoryIndexingFactory)
lookup( RepositoryIndexingFactory.ROLE );
- ArtifactRepositoryIndex indexer = indexer =
factory.createArtifactRepositoryIndex( indexPath, repository );
+ ArtifactRepositoryIndex indexer =
factory.createArtifactRepositoryIndex( indexPath, repository );
+ RepositoryIndexSearcher repoSearcher =
factory.createArtifactRepositoryIndexSearcher( indexer );
- RepositoryIndexSearcher repoSearcher =
- (RepositoryIndexSearcher) lookup( RepositoryIndexSearcher.ROLE,
"artifact" );
-
- List artifacts = repoSearcher.search( indexer, "test", GROUPID );
+ List artifacts = repoSearcher.search( "test", GROUPID );
assertEquals( 1, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "test", ARTIFACTID );
+ artifacts = repoSearcher.search( "test", ARTIFACTID );
assertEquals( 1, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "1.0", VERSION );
+ artifacts = repoSearcher.search( "1.0", VERSION );
assertEquals( 1, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "App", CLASSES );
+ artifacts = repoSearcher.search( "App", CLASSES );
assertEquals( 1, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "groupId", PACKAGES );
+ artifacts = repoSearcher.search( "groupId", PACKAGES );
assertEquals( 1, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "pom.xml", FILES );
+ artifacts = repoSearcher.search( "pom.xml", FILES );
assertEquals( 3, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "org.apache.maven", GROUPID
);
+ artifacts = repoSearcher.search( "org.apache.maven", GROUPID );
assertEquals( 2, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "maven-artifact", ARTIFACTID
);
+ artifacts = repoSearcher.search( "maven-artifact", ARTIFACTID );
assertEquals( 1, artifacts.size() );
- artifacts = repoSearcher.search( indexer, "2", VERSION );
+ artifacts = repoSearcher.search( "2", VERSION );
assertEquals( 2, artifacts.size() );
indexer.close();
