Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package move to o.a.a.r module redback-rback-model 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310899 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-07 22:34:36 +00:00
parent 12919d4171
commit d8b7884675
94 changed files with 321 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
View File

@ -21,8 +21,8 @@ package org.apache.archiva.redback.management;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import javax.xml.stream.XMLStreamException;
import java.io.File;

14
redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
View File

@ -36,18 +36,18 @@ import javax.xml.stream.XMLStreamException;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.jdo.AuthenticationKeyDatabase;
import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxReader;
import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxWriter;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.rbac.jdo.RbacDatabase;
import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;

10
redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
View File

@ -23,14 +23,14 @@ import junit.framework.TestCase;
import org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.UserManager;
import org.apache.commons.lang.SystemUtils;
import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.tests.utils.RBACDefaults;
import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.util.FileUtils;

6
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java
View File

@ -19,13 +19,13 @@ package org.codehaus.redback.integration.checks.security;
* under the License.
*/
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.system.SecuritySession;

6
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
View File

@ -19,10 +19,10 @@ package org.codehaus.redback.integration.checks.security;
* under the License.
*/
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.system.check.EnvironmentCheck;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java
View File

@ -22,7 +22,7 @@ package org.codehaus.redback.integration.interceptor;
import java.util.ArrayList;
import java.util.List;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
/**
* SecureActionBundle:

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java
View File

@ -19,8 +19,8 @@ package org.codehaus.redback.integration.model;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Role;
/**
* EditRoleDetails - Existing user Role Details.

8
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java
View File

@ -18,12 +18,12 @@ package org.codehaus.redback.integration.reports;
* specific language governing permissions and limitations
* under the License.
*/
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.UserManager;
import org.apache.commons.lang.StringEscapeUtils;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User;
import org.codehaus.redback.integration.util.RoleSorter;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java
View File

@ -21,7 +21,7 @@ package org.codehaus.redback.integration.util;
import java.util.Comparator;
import org.codehaus.plexus.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Operation;
/**
* OperationSorter

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java
View File

@ -21,7 +21,7 @@ package org.codehaus.redback.integration.util;
import java.util.Comparator;
import org.codehaus.plexus.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Permission;
/**
* PermissionSorter

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java
View File

@ -21,7 +21,7 @@ package org.codehaus.redback.integration.util;
import java.util.Comparator;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
/**
* ResourceSorter

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java
View File

@ -21,7 +21,7 @@ package org.codehaus.redback.integration.util;
import java.util.Comparator;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Role;
/**
* RoleSorter

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java
View File

@ -21,7 +21,7 @@ package org.codehaus.redback.integration.util;
import java.util.Comparator;
import org.codehaus.plexus.redback.rbac.TemplatedRole;
import org.apache.archiva.redback.rbac.TemplatedRole;
/**
* TemplatedRoleSorter

8
redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/RedbackRealm.java
View File

@ -25,12 +25,12 @@ import java.util.Set;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.users.UserManager;
import org.jsecurity.authc.AuthenticationException;
import org.jsecurity.authc.AuthenticationInfo;

12
redback-integrations/redback-jsecurity/src/test/java/org/codehaus/redback/jsecurity/RedbackRealmTest.java
View File

@ -21,13 +21,13 @@ package org.codehaus.redback.jsecurity;
import junit.framework.TestCase;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.UserManager;
import org.jsecurity.authc.IncorrectCredentialsException;
import org.jsecurity.authc.UsernamePasswordToken;

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Operation.java
View File

@ -40,7 +40,7 @@ public class Operation
// no op
}
public Operation( org.codehaus.plexus.redback.rbac.Operation operation )
public Operation( org.apache.archiva.redback.rbac.Operation operation )
{
this.name = operation.getName();
this.description = operation.getDescription();

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Permission.java
View File

@ -44,7 +44,7 @@ public class Permission
// no op
}
public Permission( org.codehaus.plexus.redback.rbac.Permission permission )
public Permission( org.apache.archiva.redback.rbac.Permission permission )
{
this.name = permission.getName();
this.description = permission.getDescription();

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Resource.java
View File

@ -40,7 +40,7 @@ public class Resource
// no op
}
public Resource( org.codehaus.plexus.redback.rbac.Resource resource )
public Resource( org.apache.archiva.redback.rbac.Resource resource )
{
this.identifier = resource.getIdentifier();
this.pattern = resource.isPattern();

4
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Role.java
View File

@ -99,7 +99,7 @@ public class Role
this.name = name;
}
public Role( org.codehaus.plexus.redback.rbac.Role role )
public Role( org.apache.archiva.redback.rbac.Role role )
{
this.name = role.getName();
this.description = role.getDescription();
@ -114,7 +114,7 @@ public class Role
}
else
{
for ( org.codehaus.plexus.redback.rbac.Permission p : role.getPermissions() )
for ( org.apache.archiva.redback.rbac.Permission p : role.getPermissions() )
{
this.permissions.add( new Permission( p ) );
}

80
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
View File

@ -18,15 +18,15 @@ package org.codehaus.redback.rest.services;
* under the License.
*/
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
@ -248,12 +248,12 @@ public class DefaultRoleManagementService
}
try
{
List<org.codehaus.plexus.redback.rbac.Role> roles =
List<org.apache.archiva.redback.rbac.Role> roles =
filterAssignableRoles( rbacManager.getEffectivelyAssignedRoles( username ) );
List<Role> effectivelyAssignedRoles = new ArrayList<Role>( roles.size() );
for ( org.codehaus.plexus.redback.rbac.Role r : roles )
for ( org.apache.archiva.redback.rbac.Role r : roles )
{
effectivelyAssignedRoles.add( new Role( r ) );
}
@ -293,7 +293,7 @@ public class DefaultRoleManagementService
{
try
{
List<org.codehaus.plexus.redback.rbac.Role> roles = rbacManager.getAllRoles();
List<org.apache.archiva.redback.rbac.Role> roles = rbacManager.getAllRoles();
if ( roles == null )
{
@ -304,7 +304,7 @@ public class DefaultRoleManagementService
List<Role> res = new ArrayList<Role>( roles.size() );
for ( org.codehaus.plexus.redback.rbac.Role r : roles )
for ( org.apache.archiva.redback.rbac.Role r : roles )
{
res.add( new Role( r ) );
}
@ -322,7 +322,7 @@ public class DefaultRoleManagementService
{
try
{
List<org.codehaus.plexus.redback.rbac.Role> roles = rbacManager.getAllRoles();
List<org.apache.archiva.redback.rbac.Role> roles = rbacManager.getAllRoles();
if ( roles == null )
{
@ -333,7 +333,7 @@ public class DefaultRoleManagementService
List<Role> res = new ArrayList<Role>( roles.size() );
for ( org.codehaus.plexus.redback.rbac.Role r : roles )
for ( org.apache.archiva.redback.rbac.Role r : roles )
{
res.add( getRole( r.getName() ) );
}
@ -346,12 +346,12 @@ public class DefaultRoleManagementService
}
}
private List<org.codehaus.plexus.redback.rbac.Role> filterAssignableRoles(
Collection<org.codehaus.plexus.redback.rbac.Role> roles )
private List<org.apache.archiva.redback.rbac.Role> filterAssignableRoles(
Collection<org.apache.archiva.redback.rbac.Role> roles )
{
List<org.codehaus.plexus.redback.rbac.Role> assignableRoles =
new ArrayList<org.codehaus.plexus.redback.rbac.Role>( roles.size() );
for ( org.codehaus.plexus.redback.rbac.Role r : roles )
List<org.apache.archiva.redback.rbac.Role> assignableRoles =
new ArrayList<org.apache.archiva.redback.rbac.Role>( roles.size() );
for ( org.apache.archiva.redback.rbac.Role r : roles )
{
if ( r.isAssignable() )
{
@ -366,10 +366,10 @@ public class DefaultRoleManagementService
{
try
{
org.codehaus.plexus.redback.rbac.Role rbacRole = rbacManager.getRole( roleName );
org.apache.archiva.redback.rbac.Role rbacRole = rbacManager.getRole( roleName );
Role role = new Role( rbacRole );
Map<String, org.codehaus.plexus.redback.rbac.Role> parentRoles = rbacManager.getParentRoles( rbacRole );
Map<String, org.apache.archiva.redback.rbac.Role> parentRoles = rbacManager.getParentRoles( rbacRole );
for ( String parentRoleName : parentRoles.keySet() )
{
role.getParentRoleNames().add( parentRoleName );
@ -445,7 +445,7 @@ public class DefaultRoleManagementService
{
try
{
org.codehaus.plexus.redback.rbac.Role rbacRole = rbacManager.getRole( roleName );
org.apache.archiva.redback.rbac.Role rbacRole = rbacManager.getRole( roleName );
rbacRole.setDescription( description );
rbacManager.saveRole( rbacRole );
}
@ -570,7 +570,7 @@ public class DefaultRoleManagementService
rbacManager.saveUserAssignment( assignment );
}
List<org.codehaus.plexus.redback.rbac.Role> allRoles =
List<org.apache.archiva.redback.rbac.Role> allRoles =
filterRolesForCurrentUserAccess( rbacManager.getAllRoles() );
List<ModelApplication> modelApplications = roleManager.getModel().getApplications();
@ -584,7 +584,7 @@ public class DefaultRoleManagementService
applicationRoles.setDescription( modelApplication.getDescription() );
applicationRoles.setName( modelApplication.getId() );
Collection<org.codehaus.plexus.redback.rbac.Role> appRoles =
Collection<org.apache.archiva.redback.rbac.Role> appRoles =
filterApplicationRoles( modelApplication, allRoles, modelApplication.getTemplates() );
applicationRoles.setGlobalRoles( toRoleNames( appRoles ) );
@ -690,10 +690,10 @@ public class DefaultRoleManagementService
// Internal methods
//----------------------------------------------------------------
private org.codehaus.plexus.redback.rbac.Role isInList( String roleName,
Collection<org.codehaus.plexus.redback.rbac.Role> roles )
private org.apache.archiva.redback.rbac.Role isInList( String roleName,
Collection<org.apache.archiva.redback.rbac.Role> roles )
{
for ( org.codehaus.plexus.redback.rbac.Role role : roles )
for ( org.apache.archiva.redback.rbac.Role role : roles )
{
if ( roleName.equals( role.getName() ) )
{
@ -703,17 +703,17 @@ public class DefaultRoleManagementService
return null;
}
private Collection<org.codehaus.plexus.redback.rbac.Role> filterApplicationRoles( ModelApplication application,
List<org.codehaus.plexus.redback.rbac.Role> allRoles,
private Collection<org.apache.archiva.redback.rbac.Role> filterApplicationRoles( ModelApplication application,
List<org.apache.archiva.redback.rbac.Role> allRoles,
List<ModelTemplate> applicationTemplates )
{
Set<org.codehaus.plexus.redback.rbac.Role> applicationRoles =
new HashSet<org.codehaus.plexus.redback.rbac.Role>();
Set<org.apache.archiva.redback.rbac.Role> applicationRoles =
new HashSet<org.apache.archiva.redback.rbac.Role>();
List<ModelRole> roles = application.getRoles();
for ( ModelRole modelRole : roles )
{
org.codehaus.plexus.redback.rbac.Role r = isInList( modelRole.getName(), allRoles );
org.apache.archiva.redback.rbac.Role r = isInList( modelRole.getName(), allRoles );
if ( r != null )
{
applicationRoles.add( r );
@ -724,7 +724,7 @@ public class DefaultRoleManagementService
for ( ModelTemplate modelTemplate : applicationTemplates )
{
for ( org.codehaus.plexus.redback.rbac.Role r : allRoles )
for ( org.apache.archiva.redback.rbac.Role r : allRoles )
{
if ( StringUtils.startsWith( r.getName(),
modelTemplate.getNamePrefix() + modelTemplate.getDelimiter() ) )
@ -751,11 +751,11 @@ public class DefaultRoleManagementService
return false;
}
private List<String> toRoleNames( Collection<org.codehaus.plexus.redback.rbac.Role> roles )
private List<String> toRoleNames( Collection<org.apache.archiva.redback.rbac.Role> roles )
{
List<String> names = new ArrayList<String>( roles.size() );
for ( org.codehaus.plexus.redback.rbac.Role r : roles )
for ( org.apache.archiva.redback.rbac.Role r : roles )
{
names.add( r.getName() );
}
@ -788,12 +788,12 @@ public class DefaultRoleManagementService
}
private Set<String> discoverResources( List<ModelTemplate> applicationTemplates,
Collection<org.codehaus.plexus.redback.rbac.Role> roles )
Collection<org.apache.archiva.redback.rbac.Role> roles )
{
Set<String> resources = new HashSet<String>();
for ( ModelTemplate modelTemplate : applicationTemplates )
{
for ( org.codehaus.plexus.redback.rbac.Role role : roles )
for ( org.apache.archiva.redback.rbac.Role role : roles )
{
String roleName = role.getName();
if ( roleName.startsWith( modelTemplate.getNamePrefix() ) )
@ -814,11 +814,11 @@ public class DefaultRoleManagementService
*
* @param roleList
* @return
* @throws org.codehaus.plexus.redback.rbac.RbacManagerException
* @throws org.apache.archiva.redback.rbac.RbacManagerException
*
*/
protected List<org.codehaus.plexus.redback.rbac.Role> filterRolesForCurrentUserAccess(
List<org.codehaus.plexus.redback.rbac.Role> roleList )
protected List<org.apache.archiva.redback.rbac.Role> filterRolesForCurrentUserAccess(
List<org.apache.archiva.redback.rbac.Role> roleList )
throws RedbackServiceException
{
RedbackRequestInformation redbackRequestInformation = RedbackAuthenticationThreadLocal.get();
@ -829,8 +829,8 @@ public class DefaultRoleManagementService
}
String currentUser = redbackRequestInformation.getUser().getUsername();
List<org.codehaus.plexus.redback.rbac.Role> filteredRoleList =
new ArrayList<org.codehaus.plexus.redback.rbac.Role>();
List<org.apache.archiva.redback.rbac.Role> filteredRoleList =
new ArrayList<org.apache.archiva.redback.rbac.Role>();
try
{
Map<String, List<Permission>> assignedPermissionMap = rbacManager.getAssignedPermissionMap( currentUser );
@ -864,7 +864,7 @@ public class DefaultRoleManagementService
// we should have a list of resourceGrants now, this will provide us with the information necessary to restrict
// the role list
for ( org.codehaus.plexus.redback.rbac.Role role : roleList )
for ( org.apache.archiva.redback.rbac.Role role : roleList )
{
int delimiterIndex = role.getName().indexOf( delimiter );
for ( String resourceIdentifier : resourceGrants )

12
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
View File

@ -24,6 +24,8 @@ import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
@ -35,10 +37,8 @@ import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.system.SecuritySystem;
@ -733,11 +733,11 @@ public class DefaultUserService
{
try
{
Set<org.codehaus.plexus.redback.rbac.Permission> permissions =
Set<org.apache.archiva.redback.rbac.Permission> permissions =
rbacManager.getAssignedPermissions( userName );
// FIXME return guest permissions !!
List<Permission> userPermissions = new ArrayList<Permission>( permissions.size() );
for ( org.codehaus.plexus.redback.rbac.Permission p : permissions )
for ( org.apache.archiva.redback.rbac.Permission p : permissions )
{
Permission permission = new Permission();
permission.setName( p.getName() );

2
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java
View File

@ -19,9 +19,9 @@ package org.codehaus.redback.rest.services;
* under the License.
*/
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.redback.rest.api.services.UserService;

12
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
View File

@ -19,13 +19,13 @@ package org.codehaus.plexus.redback.struts2.action;
* under the License.
*/
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.model.UserCredentials;
@ -170,7 +170,7 @@ public abstract class AbstractUserCredentialsAction
*
* @param roleList
* @return
* @throws org.codehaus.plexus.redback.rbac.RbacManagerException
* @throws org.apache.archiva.redback.rbac.RbacManagerException
*
*/
protected List<Role> filterRolesForCurrentUserAccess( List<Role> roleList )

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;

11
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java
View File

@ -19,13 +19,12 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
@ -128,7 +127,7 @@ public class AssignmentsAction
* Duplicate role assignment needs to be taken care of.
*
* @throws RbacManagerException
* @throws RbacObjectNotFoundException
* @throws org.apache.archiva.redback.rbac.RbacObjectNotFoundException
*/
@SuppressWarnings( "unchecked" )
public String show()

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
View File

@ -20,11 +20,11 @@ package org.codehaus.plexus.redback.struts2.action.admin;
*/
import com.opensymphony.xwork2.Preparable;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.management.DataManagementTool;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.users.UserManager;
import org.codehaus.redback.integration.interceptor.SecureAction;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
View File

@ -19,13 +19,13 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringEscapeUtils;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.users.UserManager;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java
View File

@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java
View File

@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java
View File

@ -27,7 +27,7 @@ import javax.inject.Inject;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java
View File

@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java
View File

@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.codehaus.plexus.util.StringUtils;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java
View File

@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java
View File

@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.registry.Registry;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java
View File

@ -22,7 +22,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import java.util.Arrays;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.users.User;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java
View File

@ -19,13 +19,13 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.codehaus.plexus.redback.struts2.action.CancellableAction;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java
View File

@ -20,14 +20,14 @@ package org.codehaus.plexus.redback.struts2.action.admin;
*/
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.codehaus.plexus.redback.struts2.action.CancellableAction;
import org.codehaus.plexus.redback.system.DefaultSecuritySession;
@ -70,7 +70,7 @@ public class UserEditAction
private RBACManager rbacManager;
/**
* A List of {@link org.codehaus.plexus.redback.rbac.Role} objects.
* A List of {@link org.apache.archiva.redback.rbac.Role} objects.
*/
private List<Role> effectivelyAssignedRoles;

12
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java
View File

@ -19,15 +19,15 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserManager;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/model/ApplicationRoleDetails.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.struts2.model;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java
View File

@ -22,14 +22,14 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.StrutsSpringTestCase;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.system.SecuritySession;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
View File

@ -23,12 +23,12 @@ import com.google.common.collect.Lists;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxy;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails;
import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java
View File

@ -22,14 +22,14 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import com.opensymphony.xwork2.Action;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
View File

@ -21,13 +21,13 @@
<component-set>
<components>
<component>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.rbac.cached.CachedRbacManager</implementation>
<description>CachedRbacManager is a wrapped RBACManager with caching.</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>memory</role-hint>
<field-name>rbacImpl</field-name>
</requirement>

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
View File

@ -21,13 +21,13 @@
<component-set>
<components>
<component>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.rbac.cached.CachedRbacManager</implementation>
<description>CachedRbacManager is a wrapped RBACManager with caching.</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>memory</role-hint>
<field-name>rbacImpl</field-name>
</requirement>

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
View File

@ -44,13 +44,13 @@
<!--
<component>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.rbac.cached.CachedRbacManager</implementation>
<description>CachedRbacManager is a wrapped RBACManager with caching.</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.rbac.RBACManager</role>
<role>org.apache.archiva.redback.rbac.RBACManager</role>
<role-hint>memory</role-hint>
<field-name>rbacImpl</field-name>
</requirement>

8
redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java
View File

@ -19,6 +19,9 @@ package org.codehaus.plexus.redback.authorization.rbac;
* under the License.
*/
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authorization.AuthorizationDataSource;
import org.apache.archiva.redback.authorization.AuthorizationException;
@ -27,10 +30,7 @@ import org.apache.archiva.redback.authorization.Authorizer;
import org.apache.archiva.redback.authorization.NotAuthorizedException;
import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluationException;
import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluator;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.slf4j.Logger;

4
redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
View File

@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.authorization.rbac.evaluator;
* under the License.
*/
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Permission;
import org.springframework.stereotype.Service;
import javax.inject.Inject;

2
redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.authorization.rbac.evaluator;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Permission;
/**

6
redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
View File

@ -20,9 +20,9 @@ package org.codehaus.plexus.redback.authorization.rbac.evaluator;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.memory.MemoryOperation;
import org.codehaus.plexus.redback.rbac.memory.MemoryPermission;
import org.codehaus.plexus.redback.rbac.memory.MemoryResource;

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/AbstractRBACManager.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/AbstractRole.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/AbstractUserAssignment.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractUserAssignment.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
import java.util.List;

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/Operation.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/Permission.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RBACManager.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RBACManagerListener.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManagerListener.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RBACObjectAssertions.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RbacManagerException.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacManagerException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RbacObjectInvalidException.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectInvalidException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RbacObjectNotFoundException.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectNotFoundException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RbacPermanentException.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacPermanentException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/RbacSecurityViolation.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacSecurityViolation.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2004 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/Resource.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/Role.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Copyright 2001-2006 The Apache Software Foundation.

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/TemplatedRole.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/TemplatedRole.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
redback-rbac/redback-rbac-model/src/main/java/org/codehaus/plexus/redback/rbac/UserAssignment.java → redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.rbac;
package org.apache.archiva.redback.rbac;
import java.util.List;

24
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManager.java
View File

@ -19,17 +19,17 @@ package org.codehaus.plexus.redback.rbac.cached;
* under the License.
*/
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.RBACManagerListener;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.cache.Cache;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RBACManagerListener;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -160,7 +160,7 @@ public class CachedRbacManager
}
/**
* @see org.codehaus.plexus.redback.rbac.RBACManager#getAllAssignableRoles()
* @see org.apache.archiva.redback.rbac.RBACManager#getAllAssignableRoles()
*/
public List<Role> getAllAssignableRoles()
throws RbacManagerException, RbacObjectNotFoundException
@ -205,7 +205,7 @@ public class CachedRbacManager
}
/**
* @see org.codehaus.plexus.redback.rbac.RBACManager#getAssignedPermissionMap(java.lang.String)
* @see org.apache.archiva.redback.rbac.RBACManager#getAssignedPermissionMap(java.lang.String)
*/
@SuppressWarnings( "unchecked" )
public Map getAssignedPermissionMap( String principal )

4
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
View File

@ -19,9 +19,7 @@ package org.codehaus.plexus.redback.rbac.cached;
* under the License.
*/
import net.sf.ehcache.CacheManager;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.tests.AbstractRbacManagerPerformanceTestCase;
import org.junit.After;
import org.junit.Before;

2
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerTest.java
View File

@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.rbac.cached;
*/
import net.sf.ehcache.CacheManager;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase;
import org.junit.Before;

24
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/codehaus/plexus/redback/rbac/jdo/JdoRbacManager.java
View File

@ -19,18 +19,18 @@ package org.codehaus.plexus.redback.rbac.jdo;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.AbstractRBACManager;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManagerListener;
import org.codehaus.plexus.redback.rbac.RBACObjectAssertions;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.RbacPermanentException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.AbstractRBACManager;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.RBACManagerListener;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.RbacPermanentException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACObjectAssertions;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;

10
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/codehaus/plexus/redback/rbac/jdo/JdoTool.java
View File

@ -19,12 +19,12 @@ package org.codehaus.plexus.redback.rbac.jdo;
* under the License.
*/
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManagerListener;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.jdo.JdoFactory;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManagerListener;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.util.StringUtils;
import org.springframework.stereotype.Service;

22
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
View File

@ -85,9 +85,9 @@
<name>JdoRole</name>
<version>1.0.0+</version>
<interfaces>
<interface>org.codehaus.plexus.redback.rbac.Role</interface>
<interface>org.apache.archiva.redback.rbac.Role</interface>
</interfaces>
<superClass>org.codehaus.plexus.redback.rbac.AbstractRole</superClass>
<superClass>org.apache.archiva.redback.rbac.AbstractRole</superClass>
<fields>
<field jpox.primary-key="true" jpox.value-strategy="off">
<name>name</name>
@ -127,7 +127,7 @@
jpox.dependent="false"
java.generate-break="false"
java.generate-create="false"
zjava.use-interface="org.codehaus.plexus.redback.rbac.Role">
zjava.use-interface="org.apache.archiva.redback.rbac.Role">
<type>String</type>
<multiplicity>*</multiplicity>
</association>
@ -146,7 +146,7 @@
java.init="field"
java.generate-break="false"
java.generate-create="false"
java.use-interface="org.codehaus.plexus.redback.rbac.Permission">
java.use-interface="org.apache.archiva.redback.rbac.Permission">
<type>JdoPermission</type>
<multiplicity>*</multiplicity>
</association>
@ -160,7 +160,7 @@
<name>JdoPermission</name>
<version>1.0.0+</version>
<interfaces>
<interface>org.codehaus.plexus.redback.rbac.Permission</interface>
<interface>org.apache.archiva.redback.rbac.Permission</interface>
</interfaces>
<fields>
<field jpox.primary-key="true" jpox.value-strategy="off">
@ -189,7 +189,7 @@
<version>1.0.0+</version>
<association stash.part="true"
xml.reference="true"
java.use-interface="org.codehaus.plexus.redback.rbac.Operation"
java.use-interface="org.apache.archiva.redback.rbac.Operation"
jpox.dependent="false">
<type>JdoOperation</type>
<multiplicity>1</multiplicity>
@ -202,7 +202,7 @@
<version>1.0.0+</version>
<association stash.part="true"
xml.reference="true"
java.use-interface="org.codehaus.plexus.redback.rbac.Resource"
java.use-interface="org.apache.archiva.redback.rbac.Resource"
jpox.dependent="false">
<type>JdoResource</type>
<multiplicity>1</multiplicity>
@ -217,7 +217,7 @@
<name>JdoOperation</name>
<version>1.0.0+</version>
<interfaces>
<interface>org.codehaus.plexus.redback.rbac.Operation</interface>
<interface>org.apache.archiva.redback.rbac.Operation</interface>
</interfaces>
<fields>
<field jpox.primary-key="true" jpox.value-strategy="off">
@ -259,7 +259,7 @@
In RBAC terms, this is the entity which an operation is associated with that which permissions are based on.
</description>
<interfaces>
<interface>org.codehaus.plexus.redback.rbac.Resource</interface>
<interface>org.apache.archiva.redback.rbac.Resource</interface>
</interfaces>
<fields>
<field jpox.primary-key="true" jpox.value-strategy="off">
@ -298,9 +298,9 @@
<description>binding of a principal to a role</description>
<version>1.0.0+</version>
<interfaces>
<interface>org.codehaus.plexus.redback.rbac.UserAssignment</interface>
<interface>org.apache.archiva.redback.rbac.UserAssignment</interface>
</interfaces>
<superClass>org.codehaus.plexus.redback.rbac.AbstractUserAssignment</superClass>
<superClass>org.apache.archiva.redback.rbac.AbstractUserAssignment</superClass>
<fields>
<field jpox.primary-key="true" jpox.value-strategy="off">
<name>principal</name>

4
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/codehaus/plexus/redback/rbac/jdo/JdoRbacManagerTest.java
View File

@ -20,10 +20,10 @@ package org.codehaus.plexus.redback.rbac.jdo;
*/
import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.apache.archiva.redback.common.jdo.test.StoreManagerDebug;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase;
import org.jpox.AbstractPersistenceManagerFactory;
import org.jpox.SchemaTool;

4
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/codehaus/plexus/redback/rbac/jdo/RbacJdoModelStaxTest.java
View File

@ -31,8 +31,8 @@ import javax.xml.stream.XMLStreamException;
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;

2
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryOperation.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Operation;
/**
* MemoryOperation

6
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryPermission.java
View File

@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Permission;
/**
* MemoryPermission

24
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryRbacManager.java
View File

@ -19,18 +19,18 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.AbstractRBACManager;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RBACObjectAssertions;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.rbac.RbacPermanentException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.AbstractRBACManager;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RBACObjectAssertions;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RbacPermanentException;
import org.codehaus.plexus.util.StringUtils;
import org.springframework.stereotype.Service;

2
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryResource.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Resource;
/**
* MemoryResource

6
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryRole.java
View File

@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.AbstractRole;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.AbstractRole;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Role;
import java.util.ArrayList;
import java.util.List;

4
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryUserAssignment.java
View File

@ -19,8 +19,8 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.AbstractUserAssignment;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.AbstractUserAssignment;
import org.apache.archiva.redback.rbac.UserAssignment;
import java.util.ArrayList;
import java.util.List;

4
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/codehaus/plexus/redback/rbac/memory/MemoryRbacManagerTest.java
View File

@ -19,9 +19,7 @@ package org.codehaus.plexus.redback.rbac.memory;
* under the License.
*/
import net.sf.ehcache.CacheManager;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase;
import org.junit.Before;

10
redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/DefaultRoleManager.java
View File

@ -19,12 +19,12 @@ package org.codehaus.plexus.redback.role;
* under the License.
*/
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.commons.lang.SystemUtils;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate;

12
redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/DefaultRoleModelProcessor.java
View File

@ -19,12 +19,12 @@ package org.codehaus.plexus.redback.role.processor;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelOperation;

12
redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/DefaultRoleTemplateProcessor.java
View File

@ -19,12 +19,12 @@ package org.codehaus.plexus.redback.role.template;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelOperation;

10
redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/AbstractRoleManagerTest.java
View File

@ -20,11 +20,11 @@ package org.codehaus.plexus.redback.role;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.role.model.ModelPermission;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.codehaus.plexus.redback.role.util.RoleModelUtils;

8
redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/JpoxRoleManagerTest.java
View File

@ -19,12 +19,8 @@ package org.codehaus.plexus.redback.role;
* under the License.
*/
import net.sf.ehcache.CacheManager;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.jdo.JdoRbacManager;
import org.codehaus.plexus.redback.rbac.jdo.JdoTool;
import org.jpox.SchemaTool;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@ -34,10 +30,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import java.io.File;
import java.net.URL;
import java.util.Map;
import java.util.Properties;
/**
* RoleManagerTest:

2
redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/RoleManagerTest.java
View File

@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.role;
*/
import net.sf.ehcache.CacheManager;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RBACManager;
import org.junit.Before;
import javax.inject.Inject;

6
redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessorTest.java
View File

@ -20,9 +20,9 @@ package org.codehaus.plexus.redback.role.processor;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.role.model.io.stax.RedbackRoleModelStaxReader;

6
redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorTest.java
View File

@ -20,9 +20,9 @@ package org.codehaus.plexus.redback.role.template;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.role.model.io.stax.RedbackRoleModelStaxReader;

14
redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/AbstractRbacManagerPerformanceTestCase.java
View File

@ -19,13 +19,13 @@ package org.codehaus.plexus.redback.tests;
* under the License.
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Operation;
import org.codehaus.plexus.redback.tests.utils.RBACDefaults;
import org.junit.Test;
import org.junit.runner.RunWith;

16
redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/AbstractRbacManagerTestCase.java
View File

@ -17,14 +17,14 @@ package org.codehaus.plexus.redback.tests;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacPermanentException;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RbacPermanentException;
import org.codehaus.plexus.redback.tests.utils.RBACDefaults;
import org.junit.Test;
import org.junit.runner.RunWith;

8
redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/RbacManagerEventTracker.java
View File

@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.tests;
* under the License.
*/
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManagerListener;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RBACManagerListener;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import java.util.ArrayList;
import java.util.List;

10
redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/utils/RBACDefaults.java
View File

@ -16,11 +16,11 @@ package org.codehaus.plexus.redback.tests.utils;
* limitations under the License.
*/
import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Role;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
public class RBACDefaults
{