diff options
Diffstat (limited to 'redback-rbac/redback-rbac-role-manager/src')
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/DefaultRoleManager.java) | 10 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/RoleManager.java) | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/RoleManagerException.java) | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/DefaultRoleModelProcessor.java) | 6 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessor.java) | 4 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/DefaultRoleTemplateProcessor.java) | 6 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessor.java) | 4 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorException.java) | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/util/RoleModelUtils.java) | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/validator/DefaultRoleModelValidator.java) | 6 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java (renamed from redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/validator/RoleModelValidator.java) | 4 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java (renamed from redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/AbstractRoleManagerTest.java) | 5 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java (renamed from redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/JpoxRoleManagerTest.java) | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java (renamed from redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/RoleManagerTest.java) | 2 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java (renamed from redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessorTest.java) | 7 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java (renamed from redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorTest.java) | 7 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java (renamed from redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/validator/RoleModelValidatorTest.java) | 4 | ||||
| -rw-r--r-- | redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml | 11 | ||||
| -rwxr-xr-x | redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml | 11 |
20 files changed, 48 insertions, 51 deletions
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/DefaultRoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java index 25167afc2..0839c21db 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/DefaultRoleManager.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role; +package org.apache.archiva.redback.role; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,7 @@ 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.processor.RoleModelProcessor; import org.apache.commons.lang.SystemUtils; import org.apache.archiva.redback.rbac.Resource; import org.codehaus.plexus.redback.role.model.ModelApplication; @@ -30,10 +31,9 @@ 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.codehaus.plexus.redback.role.processor.RoleModelProcessor; -import org.codehaus.plexus.redback.role.template.RoleTemplateProcessor; -import org.codehaus.plexus.redback.role.util.RoleModelUtils; -import org.codehaus.plexus.redback.role.validator.RoleModelValidator; +import org.apache.archiva.redback.role.template.RoleTemplateProcessor; +import org.apache.archiva.redback.role.util.RoleModelUtils; +import org.apache.archiva.redback.role.validator.RoleModelValidator; import org.codehaus.plexus.util.IOUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/RoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java index 99ec02c8f..495d2a3ab 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/RoleManager.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role; +package org.apache.archiva.redback.role; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/RoleManagerException.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java index 0c7e76406..c02af3302 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/RoleManagerException.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role; +package org.apache.archiva.redback.role; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java index ded258c96..87947272a 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/DefaultRoleModelProcessor.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.processor; +package org.apache.archiva.redback.role.processor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,14 +25,14 @@ 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.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.codehaus.plexus.redback.role.util.RoleModelUtils; +import org.apache.archiva.redback.role.util.RoleModelUtils; import org.codehaus.plexus.util.dag.CycleDetectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java index 26544c7cd..e014ae08c 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessor.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.processor; +package org.apache.archiva.redback.role.processor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.role.processor; * under the License. */ -import org.codehaus.plexus.redback.role.RoleManagerException; +import org.apache.archiva.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.model.RedbackRoleModel; /** diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java index 4d2362cc1..3ab2901ef 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/DefaultRoleTemplateProcessor.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.template; +package org.apache.archiva.redback.role.template; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,7 @@ 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.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; @@ -33,7 +33,7 @@ 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.codehaus.plexus.redback.role.util.RoleModelUtils; +import org.apache.archiva.redback.role.util.RoleModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java index 02d9d21fe..ea3e543a9 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessor.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.template; +package org.apache.archiva.redback.role.template; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.role.template; * under the License. */ -import org.codehaus.plexus.redback.role.RoleManagerException; +import org.apache.archiva.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.model.RedbackRoleModel; /** diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorException.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java index 8a651c702..672e37ebb 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorException.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.template; +package org.apache.archiva.redback.role.template; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/util/RoleModelUtils.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java index 04d2b6a97..d89872238 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/util/RoleModelUtils.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.util; +package org.apache.archiva.redback.role.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/validator/DefaultRoleModelValidator.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java index 453ed2981..bd0fa895b 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/validator/DefaultRoleModelValidator.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/DefaultRoleModelValidator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.validator; +package org.apache.archiva.redback.role.validator; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package org.codehaus.plexus.redback.role.validator; import java.util.ArrayList; import java.util.List; -import org.codehaus.plexus.redback.role.RoleManagerException; +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; @@ -29,7 +29,7 @@ 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.codehaus.plexus.redback.role.util.RoleModelUtils; +import org.apache.archiva.redback.role.util.RoleModelUtils; import org.codehaus.plexus.util.dag.CycleDetectedException; import org.springframework.stereotype.Service; diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/validator/RoleModelValidator.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java index 2bb0d724c..7e18209d4 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/codehaus/plexus/redback/role/validator/RoleModelValidator.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/validator/RoleModelValidator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.validator; +package org.apache.archiva.redback.role.validator; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.role.validator; * under the License. */ -import org.codehaus.plexus.redback.role.RoleManagerException; +import org.apache.archiva.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.model.RedbackRoleModel; import java.util.List; diff --git a/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml index 408e9c9b6..73c41059c 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml @@ -29,6 +29,6 @@ <context:annotation-config /> <context:component-scan - base-package="org.codehaus.plexus.redback.role"/> + base-package="org.apache.archiva.redback.role"/> </beans>
\ No newline at end of file diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/AbstractRoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java index 79d945b92..fa2493207 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/AbstractRoleManagerTest.java +++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role; +package org.apache.archiva.redback.role; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,10 @@ 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.codehaus.plexus.redback.role.util.RoleModelUtils; +import org.apache.archiva.redback.role.util.RoleModelUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/JpoxRoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java index 14ab43a9a..69ff5c823 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/JpoxRoleManagerTest.java +++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role; +package org.apache.archiva.redback.role; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/RoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java index cf59289d8..47db0dcf9 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/RoleManagerTest.java +++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role; +package org.apache.archiva.redback.role; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java index 27e65dc8c..20a8d26df 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/processor/RoleModelProcessorTest.java +++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.processor; +package org.apache.archiva.redback.role.processor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,10 +23,11 @@ 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.codehaus.plexus.redback.role.RoleManagerException; +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.codehaus.plexus.redback.role.validator.RoleModelValidator; +import org.apache.archiva.redback.role.validator.RoleModelValidator; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java index 5e2828300..b042a0574 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/template/RoleTemplateProcessorTest.java +++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.template; +package org.apache.archiva.redback.role.template; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,12 @@ 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.codehaus.plexus.redback.role.processor.RoleModelProcessor; -import org.codehaus.plexus.redback.role.util.RoleModelUtils; +import org.apache.archiva.redback.role.processor.RoleModelProcessor; +import org.apache.archiva.redback.role.util.RoleModelUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/validator/RoleModelValidatorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java index 9297991f8..30b317f40 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/codehaus/plexus/redback/role/validator/RoleModelValidatorTest.java +++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/validator/RoleModelValidatorTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.role.validator; +package org.apache.archiva.redback.role.validator; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,7 @@ package org.codehaus.plexus.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.junit.Before; @@ -29,7 +30,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.inject.Inject; -import javax.inject.Named; import java.io.File; import java.util.List; diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml index a9cf45fa1..fdaa6dea5 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml @@ -20,27 +20,24 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd" + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" default-lazy-init="true"> - <bean name="roleModelProcessor" class="org.codehaus.plexus.redback.role.processor.DefaultRoleModelProcessor"> + <bean name="roleModelProcessor" class="org.apache.archiva.redback.role.processor.DefaultRoleModelProcessor"> <property name="rbacManager" ref="rBACManager#jdo"/> </bean> <alias name="roleModelProcessor" alias="roleModelProcessor#jpox"/> - <bean name="roleTemplateProcessor" class="org.codehaus.plexus.redback.role.template.DefaultRoleTemplateProcessor"> + <bean name="roleTemplateProcessor" class="org.apache.archiva.redback.role.template.DefaultRoleTemplateProcessor"> <property name="rbacManager" ref="rBACManager#jdo"/> </bean> <alias name="roleTemplateProcessor" alias="roleTemplateProcessor#jpox"/> - <bean name="roleManager" class="org.codehaus.plexus.redback.role.DefaultRoleManager"> + <bean name="roleManager" class="org.apache.archiva.redback.role.DefaultRoleManager"> <property name="modelValidator" ref="roleModelValidator"/> <property name="modelProcessor" ref="roleModelProcessor#jpox"/> <property name="templateProcessor" ref="roleTemplateProcessor#jpox"/> diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml index 4c7a8d698..fbc7e06ae 100755 --- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml @@ -20,11 +20,8 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd" + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" default-lazy-init="false"> @@ -51,7 +48,7 @@ <alias name="commons-configuration" alias="test-conf"/> - <bean name="roleManager" class="org.codehaus.plexus.redback.role.DefaultRoleManager"> + <bean name="roleManager" class="org.apache.archiva.redback.role.DefaultRoleManager"> <property name="modelValidator" ref="roleModelValidator"/> <property name="modelProcessor" ref="modelProcessor#memory"/> <property name="templateProcessor" ref="templateProcessor#memory"/> @@ -60,13 +57,13 @@ - <bean name="modelProcessor#memory" class="org.codehaus.plexus.redback.role.processor.DefaultRoleModelProcessor"> + <bean name="modelProcessor#memory" class="org.apache.archiva.redback.role.processor.DefaultRoleModelProcessor"> <property name="rbacManager" ref="rBACManager#memory"/> </bean> - <bean name="templateProcessor#memory" class="org.codehaus.plexus.redback.role.template.DefaultRoleTemplateProcessor"> + <bean name="templateProcessor#memory" class="org.apache.archiva.redback.role.template.DefaultRoleTemplateProcessor"> <property name="rbacManager" ref="rBACManager#memory"/> </bean> |