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

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
index 1a080bd7c7789530c6e59e8eaafbd4444796f3f0..f1655a9b653fe0113983f0df6f705f3cabf696f2 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
@@ -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

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
index 6518dba93c3239cb125a1a78d1f849fc596f4ad1..28496becaae1f592b3b256f92d8bc70a86d42a47 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
@@ -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;

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
index 3f23336eff360a83a2c1aa3d74a393d3b2bf5541..15bd4c5d74fff9810f2220280c42a233be9ea3dd 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
@@ -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;

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
index cd365e197bdc9775509a2b2d7170e31e53c7b963..282efe83509e0178a677a2053affc2bffa64e38d 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
@@ -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;

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java
index d450c7200f445c2b6260813d5acf0b88a6629b86..34e9482583d2e85c6a809e4dbeffad41a231895f 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java
@@ -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 ) )
             {

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
index 0839c21db1eebffd016c541389775a5d4250038b..3fad22d08f787129c912ee0a0bb4a04bcad736aa 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
index 495d2a3ab1ad02b4676b78324eacdcaa3feb6fe1..c2cdaf6b88e4d99fb13245a73a80118e78563c40 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
@@ -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;
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
index 87947272a71839675aecbbb55e4c19c3a842374b..67af32130b68a70c2e9fcc0226a2b37332c41949 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
index e014ae08c102766bfe6891f41bd0cec04a1ac7a4..50c4ba0b7f7fc2f44c6c1a987a29d2c0423531c3 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
@@ -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:

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
index 3ab2901efaaa3b3ba46b71fcabca85611d54cec1..aea52934bf77587614d34e7949d97c8be0cae9a2 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
index ea3e543a9573e07acb84317b8f6f3ea8a724b8cb..ec2388748eb77fd59c294ea58894a1a9cadc71a9 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
@@ -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:

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
index d898722383362add3b88cd1f329abaff857207a7..0214a6c60ac8175bbbc65522344f8730fabdd221 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java
index bd0fa895b7e5cb189a73c1a550b80517991ab7b5..926478269f06909a0e83c460834744a3b0619660 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java
@@ -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 )

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java
index 7e18209d46225824a8b050468ebe1dda38c50091..7c580be6afbe0796b87b56004dd493e0f52720d9 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java
@@ -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;
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/mdo/redback-role-profiles.mdo b/redback-rbac/redback-rbac-role-manager/src/main/mdo/redback-role-profiles.mdo
index 00d872157da8f43cdf6866eadfd90e7568ccfaef..01b108af6b2375faa71ec518569d141431416f6a 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/mdo/redback-role-profiles.mdo
+++ b/redback-rbac/redback-rbac-role-manager/src/main/mdo/redback-role-profiles.mdo
@@ -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>
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java
index fa249320704ca3669fd51fe1b133e1e3cbef3609..c62df8d57b1ed95e1ff7dba4bab53887940cb76b 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
index 20a8d26dfb691c1958256cfed6ba37384576a8e4..af60d52d52221585d4fa0d77de685744578dc354 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
index b042a05748f8b31409e4609264b63c2ce351c3e0..74e524e8058b787eb7c131184a3432f274efc2bf 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
@@ -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;

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java
index 30b317f4069a7068d7931d28a4b297f24a554444..f957e24f04b407beebab6c55ffd57c73e3f6a241 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java
@@ -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;