From: Brett Porter <brett@apache.org>
Date: Thu, 19 Mar 2009 00:24:45 +0000 (+0000)
Subject: fix test descriptors for recent changes
X-Git-Tag: archiva-1.2~23
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5ce444a9c3e453a5cc3b56927cfba1afd46f041;p=archiva.git

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 81cbaa5ea..33d36e729 100644
--- 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 740b5df8a..3fb09c13b 100644
--- 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 f32a77d10..43bdc35d8 100644
--- 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>