fix test descriptors for recent changes

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755799 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
index 81cbaa5eadbb86bddd40be982898c4b1b7d48e62..33d36e72954ab64009a67fb559235ff434b19b58 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
@@ -27,11 +27,6 @@
           <role-hint>testable</role-hint>
           <field-name>securitySystem</field-name>
         </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.redback.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
-          <field-name>rbacManager</field-name>
-        </requirement>
         <requirement>
           <role>org.codehaus.plexus.redback.role.RoleManager</role>
           <role-hint>default</role-hint>

diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
index 740b5df8a95f45879ac362bbac05e80beb8385e3..3fb09c13b25603d0c6f1ce3da030b9b661951874 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
@@ -13,11 +13,6 @@
           <role-hint>testable</role-hint>
           <field-name>securitySystem</field-name>
         </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.redback.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
-          <field-name>rbacManager</field-name>
-        </requirement>
         <requirement>
           <role>org.codehaus.plexus.redback.role.RoleManager</role>
           <role-hint>default</role-hint>

diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/RoleManagerTest.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/RoleManagerTest.xml
index f32a77d10db1ab8d9239352717818c7d4529ca0a..43bdc35d83720e96b2b5815f493c904c6f2f5485 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/RoleManagerTest.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/RoleManagerTest.xml
@@ -69,32 +69,5 @@
         </requirement>
       </requirements>
     </component>
-  
-    <component>
-      <role>org.apache.maven.archiva.security.SecurityStartup</role>
-      <implementation>org.apache.maven.archiva.security.SecurityStartup</implementation>
-      <description>SecurityStartup</description>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.redback.role.RoleManager</role>
-          <role-hint>default</role-hint>
-          <field-name>roleManager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.redback.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
-          <field-name>rbacManager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.redback.system.check.EnvironmentCheck</role>
-          <field-name>checkers</field-name>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
-          <field-name>archivaConfiguration</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    
   </components>
 </component-set>