Return-Path: 
 <archiva-commits-return-726-apmail-maven-archiva-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org
Received: (qmail 15118 invoked from network); 15 Mar 2007 21:30:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Mar 2007 21:30:17 -0000
Received: (qmail 90410 invoked by uid 500); 15 Mar 2007 21:30:25 -0000
Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org
Received: (qmail 90371 invoked by uid 500); 15 Mar 2007 21:30:25 -0000
Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:archiva-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:archiva-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:archiva-commits@maven.apache.org>
List-Id: <archiva-commits.maven.apache.org>
Reply-To: archiva-dev@maven.apache.org
Delivered-To: mailing list archiva-commits@maven.apache.org
Received: (qmail 90360 invoked by uid 99); 15 Mar 2007 21:30:25 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2007 14:30:25 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2007 14:30:16 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 37DED1A9838; Thu, 15 Mar 2007 14:29:56 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r518759 - in /maven/archiva/trunk:
 archiva-security/src/main/resources/META-INF/plexus/
 archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/
Date: Thu, 15 Mar 2007 21:29:56 -0000
To: archiva-commits@maven.apache.org
From: evenisse@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070315212956.37DED1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: evenisse
Date: Thu Mar 15 14:29:55 2007
New Revision: 518759

URL: http://svn.apache.org/viewvc?view=rev&rev=518759
Log:
[MRM-303] Fix errors at startup by defining some role-hints required by the new plexus

Modified:
    maven/archiva/trunk/archiva-security/src/main/resources/META-INF/plexus/components.xml
    maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
    maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
    maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java

Modified: maven/archiva/trunk/archiva-security/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-security/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=518759&r1=518758&r2=518759
==============================================================================
--- maven/archiva/trunk/archiva-security/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/archiva/trunk/archiva-security/src/main/resources/META-INF/plexus/components.xml Thu Mar 15 14:29:55 2007
@@ -48,6 +48,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -62,6 +63,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -76,6 +78,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -90,6 +93,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -104,6 +108,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -118,6 +123,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
       </requirements>
     </component>
@@ -128,6 +134,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
       </requirements>
     </component>

Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?view=diff&rev=518759&r1=518758&r2=518759
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java Thu Mar 15 14:29:55 2007
@@ -49,7 +49,7 @@
     extends PlexusActionSupport
 {
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="lucene"
      */
     private RepositoryArtifactIndexFactory factory;
 

Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?view=diff&rev=518759&r1=518758&r2=518759
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java Thu Mar 15 14:29:55 2007
@@ -64,7 +64,7 @@
     private Collection searchResults;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="lucene"
      */
     private RepositoryArtifactIndexFactory factory;
 

Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java?view=diff&rev=518759&r1=518758&r2=518759
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java Thu Mar 15 14:29:55 2007
@@ -94,12 +94,12 @@
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="lucene"
      */
     private RepositoryArtifactIndexFactory factory;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="maven"
      */
     private ArtifactMetadataSource artifactMetadataSource;