You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/15 15:05:43 UTC
svn commit: r1433423 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-configuration/src/main/mdo/
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/
archiva-base/archiva-repos...
Author: olamy
Date: Tue Jan 15 14:05:43 2013
New Revision: 1433423
URL: http://svn.apache.org/viewvc?rev=1433423&view=rev
Log:
fix compilation
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1433423&r1=1433422&r2=1433423&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Tue Jan 15 14:05:43 2013
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java?rev=1433423&r1=1433422&r2=1433423&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java Tue Jan 15 14:05:43 2013
@@ -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 );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1433423&r1=1433422&r2=1433423&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Tue Jan 15 14:05:43 2013
@@ -97,7 +97,7 @@ public class DefaultRedbackRuntimeConfig
}
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 DefaultRedbackRuntimeConfig
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 DefaultRedbackRuntimeConfig
}
// 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 );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java?rev=1433423&r1=1433422&r2=1433423&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java Tue Jan 15 14:05:43 2013
@@ -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." );