diff options
| author | Jesse McConnell <jmcconnell@apache.org> | 2007-05-23 22:23:14 +0000 |
|---|---|---|
| committer | Jesse McConnell <jmcconnell@apache.org> | 2007-05-23 22:23:14 +0000 |
| commit | 503dc28855d77ea6a40f165a5446043beee9b86e (patch) | |
| tree | 2d1ba518fb82b5c9315f66a4c0b8bde46b77c502 | |
| parent | ba431ab8e5063eeb8d68503e5c6566172ee73d53 (diff) | |
| download | archiva-503dc28855d77ea6a40f165a5446043beee9b86e.tar.gz archiva-503dc28855d77ea6a40f165a5446043beee9b86e.zip | |
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
| -rw-r--r-- | archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml | 23 | ||||
| -rw-r--r-- | archiva-web/archiva-webapp/src/main/resources/xwork.xml | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index f4a3d1a5c..2c1320aef 100644 --- a/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -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"> diff --git a/archiva-web/archiva-webapp/src/main/resources/xwork.xml b/archiva-web/archiva-webapp/src/main/resources/xwork.xml index d2aedda30..73cc1bfb5 100644 --- a/archiva-web/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-web/archiva-webapp/src/main/resources/xwork.xml @@ -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"> |