From: Edwin L. Punzalan <epunzalan@apache.org>
Date: Thu, 23 Feb 2006 02:32:31 +0000 (+0000)
Subject: PR: MRM-38
X-Git-Tag: archiva-0.9-alpha-1~916
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=550c936a33fc782ec02e4348ffc52ffc48965e29;p=archiva.git

PR: MRM-38

Reverted to previous revision bec prev patch is incorrect

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

diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml
index d3df67b13..6dc4c77fe 100644
--- a/maven-repository-webapp/pom.xml
+++ b/maven-repository-webapp/pom.xml
@@ -25,11 +25,6 @@
       <!-- TODO: actually, just exclude from WAR plugin -->
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-quartz</artifactId>
-      <version>1.0-alpha-2-SNAPSHOT</version>
-    </dependency>
   </dependencies>
   <build>
     <finalName>maven-repository-webapp</finalName>
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
index 75d05a357..5f6acc812 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
+++ b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/PackageSearchAction.java
@@ -21,11 +21,11 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.repository.indexing.ArtifactRepositoryIndex;
-import org.apache.maven.repository.indexing.DefaultRepositoryIndexSearcher;
 import org.apache.maven.repository.indexing.RepositoryIndexException;
 import org.apache.maven.repository.indexing.RepositoryIndexSearchException;
 import org.apache.maven.repository.indexing.RepositoryIndexingFactory;
-import org.codehaus.plexus.scheduler.Scheduler;
+import org.apache.maven.repository.indexing.DefaultRepositoryIndexSearcher;
+import org.apache.maven.repository.indexing.query.SinglePhraseQuery;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -44,11 +44,6 @@ public class PackageSearchAction
 
     private String md5;
 
-    /**
-     * @plexus.requirement
-     */
-    private Scheduler scheduler;
-
     /**
      * @plexus.requirement
      */
@@ -97,6 +92,8 @@ public class PackageSearchAction
 
         DefaultRepositoryIndexSearcher searcher = factory.createDefaultRepositoryIndexSearcher( index );
 
+        artifacts = searcher.search( new SinglePhraseQuery( key, searchTerm ) );
+
         return SUCCESS;
     }
 
diff --git a/maven-repository-webapp/src/main/resources/plexus/components.xml b/maven-repository-webapp/src/main/resources/plexus/components.xml
deleted file mode 100644
index f3f6415ef..000000000
--- a/maven-repository-webapp/src/main/resources/plexus/components.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>com.opensymphony.xwork.ActionSupport</role>
-      <role-hint>index</role-hint>
-      <implementation>org.apache.maven.repository.manager.web.action.PackageSearchAction</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.scheduler.Scheduler</role>
-      <implementation>org.codehaus.plexus.scheduler.DefaultScheduler</implementation>
-      <configuration>
-        <properties>
-          <property>
-            <name>org.quartz.scheduler.instanceName</name>
-            <value>repositoryScheduler</value>
-          </property>
-          <property>
-            <name>org.quartz.threadPool.class</name>
-            <value>org.quartz.simpl.SimpleThreadPool</value>
-          </property>
-          <property>
-            <name>org.quartz.threadPool.threadCount</name>
-            <value>15</value>
-          </property>
-          <property>
-            <name>org.quartz.threadPool.threadPriority</name>
-            <value>4</value>
-          </property>
-          <property>
-            <name>org.quartz.jobStore.class</name>
-            <value>org.quartz.simpl.RAMJobStore</value>
-          </property>
-        </properties>
-      </configuration>
-    </component>
-  </components>
-</component-set>