From: Brett Porter <brett@apache.org>
Date: Fri, 30 Dec 2005 08:37:14 +0000 (+0000)
Subject: generated descriptor
X-Git-Tag: archiva-0.9-alpha-1~1025
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fdc941efd53d9f376c3c8ed8fb2d8d25b5acd327;p=archiva.git

generated descriptor


git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@360037 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java b/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
index e7cfcc346..1f15beca1 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
+++ b/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
@@ -39,6 +39,8 @@ import java.util.zip.ZipFile;
  * Class used to index Artifact objects in a specified repository
  *
  * @author Edwin Punzalan
+ *
+ * @plexus.component role="org.apache.maven.repository.indexing.RepositoryIndex" role-hint="artifact" instantiation-strategy="per-lookup"
  */
 public class ArtifactRepositoryIndex
     extends AbstractRepositoryIndex
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java b/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
index 8760e16a9..95d2dda40 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
+++ b/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
@@ -24,7 +24,6 @@ import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -34,6 +33,8 @@ import java.util.List;
 /**
  * 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
@@ -46,8 +47,7 @@ public class ArtifactRepositoryIndexSearcher
 
     private static final String VERSION = "version";
 
-    private ArtifactRepository repository;
-
+    /** @plexus.requirement */
     private ArtifactFactory factory;
 
     /**
diff --git a/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml b/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 4cc04b397..000000000
--- a/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  ~ Copyright 2005-2006 The Apache Software Foundation.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.repository.indexing.RepositoryIndex</role>
-      <role-hint>artifact</role-hint>
-      <implementation>org.apache.maven.repository.indexing.ArtifactRepositoryIndex</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.repository.indexing.RepositoryIndexSearcher</role>
-      <role-hint>artifact</role-hint>
-      <implementation>org.apache.maven.repository.indexing.ArtifactRepositoryIndexSearcher</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>