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

5 files changed, 12 insertions, 12 deletions

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 1a080bd7c..f1655a9b6 100644
--- 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 6518dba93..28496beca 100644
--- 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 3f23336ef..15bd4c5d7 100644
--- 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 cd365e197..282efe835 100644
--- 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 d450c7200..34e948258 100644
--- 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 ) )
             {