You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ev...@apache.org on 2007/03/15 22:29:56 UTC
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/
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;