fix compilation

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1433423 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index a9a393b7cc03658108a52b27ea4cc6ab05d8ccbd..31c57cd65b2a7dfadce449422c0b6ced90abe6e9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -1496,8 +1496,8 @@
           </association>
         </field>
         <field>
-          <name>authorizerImpls</name>
-          <description>The authorizer impls to use.</description>
+          <name>rbacManagerImpls</name>
+          <description>The RBAC Manager impls to use.</description>
           <version>1.4.0+</version>
           <association>
             <type>String</type>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
index ac47544c967ac4ddfdecb61c18511f2449f2fdce..fe4a450110f1ce590510d20458c265c9cf01394f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
@@ -40,9 +40,9 @@ public class RedbackRuntimeConfiguration
     private List<String> userManagerImpls = new ArrayList<String>();
 
     /**
-     * Field authorizerImpls.
+     * Field rbacManagerImpls.
      */
-    private java.util.List<String> authorizerImpls;
+    private java.util.List<String> rbacManagerImpls;
 
     private LdapConfiguration ldapConfiguration;
 
@@ -158,14 +158,14 @@ public class RedbackRuntimeConfiguration
         this.usersCacheConfiguration = usersCacheConfiguration;
     }
 
-    public List<String> getAuthorizerImpls()
+    public List<String> getRbacManagerImpls()
     {
-        return authorizerImpls;
+        return rbacManagerImpls;
     }
 
-    public void setAuthorizerImpls( List<String> authorizerImpls )
+    public void setRbacManagerImpls( List<String> rbacManagerImpls )
     {
-        this.authorizerImpls = authorizerImpls;
+        this.rbacManagerImpls = rbacManagerImpls;
     }
 
     @Override
@@ -174,7 +174,7 @@ public class RedbackRuntimeConfiguration
         final StringBuilder sb = new StringBuilder();
         sb.append( "RedbackRuntimeConfiguration" );
         sb.append( "{userManagerImpls=" ).append( userManagerImpls );
-        sb.append( ", authorizerImpls=" ).append( authorizerImpls );
+        sb.append( ", rbacManagerImpls=" ).append( rbacManagerImpls );
         sb.append( ", ldapConfiguration=" ).append( ldapConfiguration );
         sb.append( ", migratedFromRedbackConfiguration=" ).append( migratedFromRedbackConfiguration );
         sb.append( ", configurationProperties=" ).append( configurationProperties );

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index 73f04ac0f46e5736d39cd5fca5242ab5ae29cde3..6dc5b0def027b89c2aa037a25fed0c3b573cbc79 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -97,7 +97,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
                 }
 
                 String authorizerImpls =
-                    userConfiguration.getConcatenatedList( UserConfigurationKeys.AUTHORIZER_IMPL, "rbac" );
+                    userConfiguration.getConcatenatedList( UserConfigurationKeys.RBAC_MANAGER_IMPL, "cached" );
 
                 if ( StringUtils.isNotEmpty( authorizerImpls ) )
                 {
@@ -106,12 +106,12 @@ public class DefaultRedbackRuntimeConfigurationAdmin
                         String[] impls = StringUtils.split( authorizerImpls, ',' );
                         for ( String impl : impls )
                         {
-                            redbackRuntimeConfiguration.getAuthorizerImpls().add( impl );
+                            redbackRuntimeConfiguration.getRbacManagerImpls().add( impl );
                         }
                     }
                     else
                     {
-                        redbackRuntimeConfiguration.getAuthorizerImpls().add( userManagerImpl );
+                        redbackRuntimeConfiguration.getRbacManagerImpls().add( userManagerImpl );
                     }
                 }
 
@@ -154,11 +154,11 @@ public class DefaultRedbackRuntimeConfigurationAdmin
             }
 
             // we ensure authorizerImpls is not empty if so put
-            if ( redbackRuntimeConfiguration.getAuthorizerImpls().isEmpty() )
+            if ( redbackRuntimeConfiguration.getRbacManagerImpls().isEmpty() )
             {
                 log.info(
                     "redbackRuntimeConfiguration with empty authorizerImpls so force at least rbac implementation !" );
-                redbackRuntimeConfiguration.getAuthorizerImpls().add( "rbac" );
+                redbackRuntimeConfiguration.getRbacManagerImpls().add( "rbac" );
                 updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration );
             }
 

diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
index 1dfd4cdb5dcd61f801f83f195e89acc4d774c2af..c39ca27539d9a7a8ba40063a6a5f58ee7984db3d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
@@ -21,6 +21,7 @@ package org.apache.archiva.security;
 
 import java.util.List;
 
+import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.system.check.EnvironmentCheck;
 import org.apache.archiva.security.common.ArchivaRoleConstants;
 import org.apache.archiva.redback.rbac.RBACManager;
@@ -32,20 +33,19 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
- * ArchivaStandardRolesCheck tests for the existance of expected / standard roles and permissions. 
- *
- *
+ * ArchivaStandardRolesCheck tests for the existance of expected / standard roles and permissions.
  */
 @Service("environmentCheck#archiva-required-roles")
 public class ArchivaStandardRolesCheck
     implements EnvironmentCheck
 {
     private Logger log = LoggerFactory.getLogger( ArchivaStandardRolesCheck.class );
-    
+
     /**
      *
      */
-    @Inject @Named(value = "rbacManager#cached")
+    @Inject
+    @Named(value = "rbacManager#cached")
     private RBACManager rbacManager;
 
     /**
@@ -57,36 +57,35 @@ public class ArchivaStandardRolesCheck
     {
         if ( !checked )
         {
-            String expectedRoles[] = new String[] {
-                ArchivaRoleConstants.SYSTEM_ADMINISTRATOR_ROLE,
+            String expectedRoles[] = new String[]{ ArchivaRoleConstants.SYSTEM_ADMINISTRATOR_ROLE,
                 ArchivaRoleConstants.GLOBAL_REPOSITORY_MANAGER_ROLE,
-                ArchivaRoleConstants.GLOBAL_REPOSITORY_OBSERVER_ROLE,
-                ArchivaRoleConstants.GUEST_ROLE,
-                ArchivaRoleConstants.REGISTERED_USER_ROLE,
-                ArchivaRoleConstants.USER_ADMINISTRATOR_ROLE };
+                ArchivaRoleConstants.GLOBAL_REPOSITORY_OBSERVER_ROLE, ArchivaRoleConstants.GUEST_ROLE,
+                ArchivaRoleConstants.REGISTERED_USER_ROLE, ArchivaRoleConstants.USER_ADMINISTRATOR_ROLE };
 
             log.info( "Checking the existance of required roles." );
 
             for ( String roleName : expectedRoles )
             {
-                if ( !rbacManager.roleExists( roleName ) )
+                try
+                {
+                    if ( !rbacManager.roleExists( roleName ) )
+                    {
+                        violations.add( "Unable to validate the existances of the '" + roleName + "' role." );
+                    }
+                }
+                catch ( RbacManagerException e )
                 {
+                    log.warn( "fail to verify existence of role '{}'", roleName );
                     violations.add( "Unable to validate the existances of the '" + roleName + "' role." );
                 }
             }
 
-            String expectedOperations[] = new String[] {
-                ArchivaRoleConstants.OPERATION_MANAGE_USERS,
-                ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION,
-                ArchivaRoleConstants.OPERATION_REGENERATE_INDEX,
-                ArchivaRoleConstants.OPERATION_RUN_INDEXER,
-                ArchivaRoleConstants.OPERATION_ACCESS_REPORT,
-                ArchivaRoleConstants.OPERATION_ADD_REPOSITORY,
-                ArchivaRoleConstants.OPERATION_DELETE_REPOSITORY,
-                ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS,
-                ArchivaRoleConstants.OPERATION_EDIT_REPOSITORY,
-                ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD,
-                ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS,
+            String expectedOperations[] = new String[]{ ArchivaRoleConstants.OPERATION_MANAGE_USERS,
+                ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION, ArchivaRoleConstants.OPERATION_REGENERATE_INDEX,
+                ArchivaRoleConstants.OPERATION_RUN_INDEXER, ArchivaRoleConstants.OPERATION_ACCESS_REPORT,
+                ArchivaRoleConstants.OPERATION_ADD_REPOSITORY, ArchivaRoleConstants.OPERATION_DELETE_REPOSITORY,
+                ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS, ArchivaRoleConstants.OPERATION_EDIT_REPOSITORY,
+                ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD, ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS,
                 "archiva-guest" };
 
             log.info( "Checking the existance of required operations." );