Author: jmcconnell
Date: Wed May 23 15:23:14 2007
New Revision: 541103
URL: http://svn.apache.org/viewvc?view=rev&rev=541103
Log:
add component decl to get around PLXREDBACK-82 and activate the environment
checker to unlock admin accounts on restart again
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=541103&r1=541102&r2=541103
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Wed May 23 15:23:14 2007
@@ -210,6 +210,29 @@
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</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>
<lifecycle-handler-manager
implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager">
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=541103&r1=541102&r2=541103
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
(original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
Wed May 23 15:23:14 2007
@@ -36,10 +36,12 @@
<interceptor name="redbackSecureActions"
class="redbackSecureActionInterceptor"/>
<interceptor name="redbackAutoLogin"
class="redbackAutoLoginInterceptor"/>
<interceptor name="redbackPolicyEnforcement"
class="redbackPolicyEnforcementInterceptor"/>
+ <interceptor name="redbackEnvironmentChecker"
class="redbackEnvironmentCheckInterceptor"/>
<interceptor name="paramFilter"
class="com.opensymphony.xwork.interceptor.ParameterFilterInterceptor" />
<interceptor-stack name="configuredArchivaStack">
<interceptor-ref name="redbackForceAdminUser"/>
+ <interceptor-ref name="redbackEnvironmentChecker"/>
<interceptor-ref name="redbackAutoLogin"/>
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="paramFilter">
