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

package change for redback-rbac-role-manager generated classes 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311407 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-09 20:06:31 +00:00
parent 2651e1ca51
commit d5640c38c8
19 changed files with 89 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
View File

@ -19,9 +19,9 @@ package org.apache.archiva.redback.integration.util;
* under the License.
*/
import java.util.Comparator;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import java.util.Comparator;
/**
* ModelTemplateSorter

6
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
View File

@ -25,13 +25,13 @@ import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.role.RoleManagerException;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.ModelTemplate;
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.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.apache.archiva.redback.integration.util.RoleSorter;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
View File

@ -23,11 +23,11 @@ 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.role.RoleManager;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.model.ApplicationRoleDetails;
import org.apache.archiva.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;

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

@ -21,8 +21,8 @@ package org.apache.archiva.redback.struts2.action.admin;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.role.RoleConstants;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java
View File

@ -20,9 +20,9 @@ package org.apache.archiva.redback.struts2.model;
*/
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;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.ModelTemplate;
import java.util.ArrayList;
import java.util.Collection;
@ -50,7 +50,7 @@ public class ApplicationRoleDetails
private List<List<RoleTableCell>> table;
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
public ApplicationRoleDetails( ModelApplication application, Collection<Role> effectivelyAssignedRoles,
Collection<Role> allAssignedRoles, List<Role> assignableRoles )
{
@ -104,7 +104,7 @@ public class ApplicationRoleDetails
availableRoles = new ArrayList<String>();
for ( Iterator<ModelRole> i = applicationRoles.iterator(); i.hasNext(); )
{
ModelRole role = i.next();
ModelRole role = i.next();
if ( isInList( role.getName(), allAssignedRoles ) )
{

10
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
View File

@ -23,14 +23,14 @@ 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.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.processor.RoleModelProcessor;
import org.apache.commons.lang.SystemUtils;
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;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.template.RoleTemplateProcessor;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.apache.archiva.redback.role.validator.RoleModelValidator;

2
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.role;
* under the License.
*/
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import java.net.URL;

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

@ -26,12 +26,12 @@ 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.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelOperation;
import org.codehaus.plexus.redback.role.model.ModelPermission;
import org.codehaus.plexus.redback.role.model.ModelResource;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelOperation;
import org.apache.archiva.redback.role.model.ModelPermission;
import org.apache.archiva.redback.role.model.ModelResource;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.slf4j.Logger;

2
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.role.processor;
*/
import org.apache.archiva.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
/**
* RoleModelValidator:

14
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
View File

@ -26,13 +26,13 @@ import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelOperation;
import org.codehaus.plexus.redback.role.model.ModelPermission;
import org.codehaus.plexus.redback.role.model.ModelResource;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelOperation;
import org.apache.archiva.redback.role.model.ModelPermission;
import org.apache.archiva.redback.role.model.ModelResource;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.role.template;
*/
import org.apache.archiva.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
/**
* RoleModelValidator:

12
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
View File

@ -19,12 +19,12 @@ package org.apache.archiva.redback.role.util;
* under the License.
*/
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelOperation;
import org.codehaus.plexus.redback.role.model.ModelResource;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelOperation;
import org.apache.archiva.redback.role.model.ModelResource;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;

76
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java
View File

@ -18,29 +18,29 @@ package org.apache.archiva.redback.role.validator;
* specific language governing permissions and limitations
* under the License.
*/
import java.util.ArrayList;
import java.util.List;
import org.apache.archiva.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelOperation;
import org.codehaus.plexus.redback.role.model.ModelPermission;
import org.codehaus.plexus.redback.role.model.ModelResource;
import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.ModelApplication;
import org.apache.archiva.redback.role.model.ModelOperation;
import org.apache.archiva.redback.role.model.ModelPermission;
import org.apache.archiva.redback.role.model.ModelResource;
import org.apache.archiva.redback.role.model.ModelRole;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* DefaultRoleModelValidator: validates completeness of the model
*
* @author: Jesse McConnell <jesse@codehaus.org>
* @version: $Id$
*
*/
@Service("roleModelValidator")
@Service( "roleModelValidator" )
public class DefaultRoleModelValidator
implements RoleModelValidator
{
@ -79,7 +79,7 @@ public class DefaultRoleModelValidator
{
if ( validationErrors == null )
{
validationErrors = new ArrayList<String>(0);
validationErrors = new ArrayList<String>( 0 );
}
validationErrors.add( error );
@ -88,10 +88,10 @@ public class DefaultRoleModelValidator
/**
* FIXME this should be taken care of by <required/> in modello, figure out why its not
* in the meantime, implement the basics
*
*
* @param model
*/
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
private void validateRequiredStructure( RedbackRoleModel model )
{
// validate model has name
@ -222,7 +222,7 @@ public class DefaultRoleModelValidator
*
* @param model
*/
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
private void validateOperationClosure( RedbackRoleModel model )
{
List<String> operationIdList = RoleModelUtils.getOperationIdList( model );
@ -239,7 +239,7 @@ public class DefaultRoleModelValidator
if ( !operationIdList.contains( permission.getOperation() ) )
{
addValidationError( "missing operation: " + permission.getOperation() + " in permission "
+ permission.getId() );
+ permission.getId() );
}
}
}
@ -255,7 +255,7 @@ public class DefaultRoleModelValidator
if ( !operationIdList.contains( permission.getOperation() ) )
{
addValidationError( "missing operation: " + permission.getOperation() + " in permission "
+ permission.getId() );
+ permission.getId() );
}
}
}
@ -263,7 +263,7 @@ public class DefaultRoleModelValidator
}
}
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
private void validateResourceClosure( RedbackRoleModel model )
{
List<String> resourceIdList = RoleModelUtils.getResourceIdList( model );
@ -278,7 +278,7 @@ public class DefaultRoleModelValidator
if ( !resourceIdList.contains( permission.getResource() ) )
{
addValidationError( "missing operation: " + permission.getResource() + " in permission "
+ permission.getId() );
+ permission.getId() );
}
}
}
@ -286,7 +286,7 @@ public class DefaultRoleModelValidator
}
}
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
private void validateChildRoleClosure( RedbackRoleModel model )
{
List<String> roleIdList = RoleModelUtils.getRoleIdList( model );
@ -300,8 +300,8 @@ public class DefaultRoleModelValidator
{
if ( !roleIdList.contains( childRoleId ) )
{
addValidationError( "missing role id: " + childRoleId + " in child roles of role "
+ role.getId() );
addValidationError(
"missing role id: " + childRoleId + " in child roles of role " + role.getId() );
}
}
}
@ -315,8 +315,8 @@ public class DefaultRoleModelValidator
{
if ( !roleIdList.contains( childRoleId ) )
{
addValidationError( "missing role id: " + childRoleId + " in child roles of template "
+ template.getId() );
addValidationError(
"missing role id: " + childRoleId + " in child roles of template " + template.getId() );
}
}
}
@ -324,7 +324,7 @@ public class DefaultRoleModelValidator
}
}
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
private void validateParentRoleClosure( RedbackRoleModel model )
{
List roleIdList = RoleModelUtils.getRoleIdList( model );
@ -339,8 +339,8 @@ public class DefaultRoleModelValidator
{
if ( !roleIdList.contains( parentRoleId ) )
{
addValidationError( "missing role id: " + parentRoleId + " in parent roles of role "
+ role.getId() );
addValidationError(
"missing role id: " + parentRoleId + " in parent roles of role " + role.getId() );
}
}
}
@ -355,7 +355,7 @@ public class DefaultRoleModelValidator
if ( !roleIdList.contains( parentRoleId ) )
{
addValidationError( "missing role id: " + parentRoleId + " in parent roles of template "
+ template.getId() );
+ template.getId() );
}
}
}
@ -363,7 +363,7 @@ public class DefaultRoleModelValidator
}
}
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
private void validateTemplateClosure( RedbackRoleModel model )
{
List templateIdList = RoleModelUtils.getTemplateIdList( model );
@ -381,8 +381,9 @@ public class DefaultRoleModelValidator
{
if ( !templateIdList.contains( parentTemplateId ) )
{
addValidationError( "missing template id: " + parentTemplateId
+ " in parent templates of template " + template.getId() );
addValidationError(
"missing template id: " + parentTemplateId + " in parent templates of template "
+ template.getId() );
}
}
}
@ -393,8 +394,9 @@ public class DefaultRoleModelValidator
{
if ( !templateIdList.contains( childTemplateId ) )
{
addValidationError( "missing template id: " + childTemplateId
+ " in child templates of template " + template.getId() );
addValidationError(
"missing template id: " + childTemplateId + " in child templates of template "
+ template.getId() );
}
}
}
@ -413,7 +415,7 @@ public class DefaultRoleModelValidator
/**
* We are not allowed to have cycles between roles, this method is to detect and raise a red flag when that happens.
*
*
* @param model
*/
private void validateNoRoleCycles( RedbackRoleModel model )
@ -429,13 +431,13 @@ public class DefaultRoleModelValidator
}
/**
* We are not allowed to have cycles between template either, this method is to detect and
* We are not allowed to have cycles between template either, this method is to detect and
* raise a red flag when that happens. Templates are a bit more complex since they have both
* child and parent roles, as well as runtime parent and child templates
*
* <p/>
* the id should be sufficient to test cycles here even though in runtime the id's do not need to be
* unique since it is the binding of a namePrefix and a resource that makes them unique
*
*
* @param model
*/
private void validateNoTemplateCycles( RedbackRoleModel model )

2
redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.role.validator;
*/
import org.apache.archiva.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import java.util.List;

2
redback-rbac/redback-rbac-role-manager/src/main/mdo/redback-role-profiles.mdo
View File

@ -25,7 +25,7 @@
<defaults>
<default>
<key>package</key>
<value>org.codehaus.plexus.redback.role.model</value>
<value>org.apache.archiva.redback.role.model</value>
</default>
</defaults>

5
redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java
View File

@ -25,9 +25,8 @@ 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.apache.archiva.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.model.ModelPermission;
import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.model.ModelPermission;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.junit.Test;
import org.junit.runner.RunWith;

5
redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
View File

@ -24,9 +24,8 @@ 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.role.RoleManagerException;
import org.apache.archiva.redback.role.processor.RoleModelProcessor;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.validator.RoleModelValidator;
import org.junit.Before;
import org.junit.Test;

7
redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
View File

@ -23,10 +23,9 @@ import junit.framework.TestCase;
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.role.template.RoleTemplateProcessor;
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;
import org.apache.archiva.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.processor.RoleModelProcessor;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.junit.Test;

5
redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java
View File

@ -20,9 +20,8 @@ package org.apache.archiva.redback.role.validator;
*/
import junit.framework.TestCase;
import org.apache.archiva.redback.role.validator.RoleModelValidator;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import org.apache.archiva.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;