Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-303] Fix errors at startup by defining some role-hints required by the new plexus 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@518759 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Emmanuel Venisse 2007-03-15 21:29:55 +00:00
parent 6b453788e4
commit 8c8ba57852
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiva-security/src/main/resources/META-INF/plexus/components.xml
View File

@ -48,6 +48,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
<requirement> <requirement>
<role>org.codehaus.plexus.PlexusContainer</role> <role>org.codehaus.plexus.PlexusContainer</role>
@ -62,6 +63,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
<requirement> <requirement>
<role>org.codehaus.plexus.PlexusContainer</role> <role>org.codehaus.plexus.PlexusContainer</role>
@ -76,6 +78,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
<requirement> <requirement>
<role>org.codehaus.plexus.PlexusContainer</role> <role>org.codehaus.plexus.PlexusContainer</role>
@ -90,6 +93,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
<requirement> <requirement>
<role>org.codehaus.plexus.PlexusContainer</role> <role>org.codehaus.plexus.PlexusContainer</role>
@ -104,6 +108,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
<requirement> <requirement>
<role>org.codehaus.plexus.PlexusContainer</role> <role>org.codehaus.plexus.PlexusContainer</role>
@ -118,6 +123,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
</requirements> </requirements>
</component> </component>
@ -128,6 +134,7 @@
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.security.rbac.RBACManager</role> <role>org.codehaus.plexus.security.rbac.RBACManager</role>
<role-hint>cached</role-hint>
</requirement> </requirement>
</requirements> </requirements>
</component> </component>

2
archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
View File

@ -49,7 +49,7 @@ public class BrowseAction
extends PlexusActionSupport extends PlexusActionSupport
{ {
/** /**
* @plexus.requirement * @plexus.requirement role-hint="lucene"
*/ */
private RepositoryArtifactIndexFactory factory; private RepositoryArtifactIndexFactory factory;

2
archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
View File

@ -64,7 +64,7 @@ public class SearchAction
private Collection searchResults; private Collection searchResults;
/** /**
* @plexus.requirement * @plexus.requirement role-hint="lucene"
*/ */
private RepositoryArtifactIndexFactory factory; private RepositoryArtifactIndexFactory factory;

4
archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
View File

@ -94,12 +94,12 @@ public class ShowArtifactAction
private ArchivaConfiguration archivaConfiguration; private ArchivaConfiguration archivaConfiguration;
/** /**
* @plexus.requirement * @plexus.requirement role-hint="lucene"
*/ */
private RepositoryArtifactIndexFactory factory; private RepositoryArtifactIndexFactory factory;
/** /**
* @plexus.requirement * @plexus.requirement role-hint="maven"
*/ */
private ArtifactMetadataSource artifactMetadataSource; private ArtifactMetadataSource artifactMetadataSource;