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

add component decl to get around PLXREDBACK-82 and activate the environment checker to unlock admin accounts on restart again 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@541103 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jesse McConnell 2007-05-23 22:23:14 +00:00
parent ba431ab8e5
commit 503dc28855
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
View File

@ -210,6 +210,29 @@
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler> <lifecycle-handler>basic</lifecycle-handler>
</component> </component>
<!--
PLXREDBACK-81 bad role hint, redefining here until redback alpha-2 is released.
-->
<component>
<role>org.codehaus.plexus.redback.system.check.EnvironmentCheck</role>
<role-hint>locked-admin-check</role-hint>
<implementation>org.codehaus.plexus.redback.xwork.checks.security.LockedAdminEnvironmentCheck</implementation>
<description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked
and unlocks them on startup.</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.users.UserManager</role>
<role-hint>cached</role-hint>
<field-name>userManager</field-name>
</requirement>
<requirement>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role-hint>cached</role-hint>
<field-name>rbacManager</field-name>
</requirement>
</requirements>
</component>
</components> </components>
<lifecycle-handler-manager implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager"> <lifecycle-handler-manager implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager">

2
archiva-web/archiva-webapp/src/main/resources/xwork.xml
View File

@ -36,10 +36,12 @@
<interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/> <interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/>
<interceptor name="redbackAutoLogin" class="redbackAutoLoginInterceptor"/> <interceptor name="redbackAutoLogin" class="redbackAutoLoginInterceptor"/>
<interceptor name="redbackPolicyEnforcement" class="redbackPolicyEnforcementInterceptor"/> <interceptor name="redbackPolicyEnforcement" class="redbackPolicyEnforcementInterceptor"/>
<interceptor name="redbackEnvironmentChecker" class="redbackEnvironmentCheckInterceptor"/>
<interceptor name="paramFilter" class="com.opensymphony.xwork.interceptor.ParameterFilterInterceptor" /> <interceptor name="paramFilter" class="com.opensymphony.xwork.interceptor.ParameterFilterInterceptor" />
<interceptor-stack name="configuredArchivaStack"> <interceptor-stack name="configuredArchivaStack">
<interceptor-ref name="redbackForceAdminUser"/> <interceptor-ref name="redbackForceAdminUser"/>
<interceptor-ref name="redbackEnvironmentChecker"/>
<interceptor-ref name="redbackAutoLogin"/> <interceptor-ref name="redbackAutoLogin"/>
<interceptor-ref name="defaultStack"/> <interceptor-ref name="defaultStack"/>
<interceptor-ref name="paramFilter"> <interceptor-ref name="paramFilter">