Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml?rev=705848&r1=705847&r2=705848&view=diff ============================================================================== --- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml (original) +++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml Fri Oct 17 23:45:02 2008 @@ -68,9 +68,12 @@ <role-hint>default</role-hint> <implementation>org.apache.maven.archiva.webdav.DefaultDavServerManager</implementation> <description>DefaultDavServerManager</description> - <configuration> - <provider-hint>proxied</provider-hint> - </configuration> + <requirements> + <requirement> + <role>org.apache.maven.archiva.webdav.DavServerComponent</role> + <role-hint>proxied</role-hint> + </requirement> + </requirements> </component> <component> @@ -99,174 +102,74 @@ <component> <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role> <role-hint>default</role-hint> - <implementation>org.apache.maven.archiva.web.repository.StubRepositoryContentConsumers</implementation> + <implementation>org.apache.maven.archiva.webdav.StubRepositoryContentConsumers</implementation> </component> - - <!-- TODO: shouldn't need so many components just to use in-memory - is flaky since these are auto-generated --> + <component> <role>org.codehaus.plexus.redback.system.SecuritySystem</role> <role-hint>default</role-hint> <implementation>org.codehaus.plexus.redback.system.DefaultSecuritySystem</implementation> - <requirements> - <requirement> - <role>org.codehaus.plexus.redback.authentication.AuthenticationManager</role> - <field-name>authnManager</field-name> - </requirement> - <requirement> - <role>org.codehaus.plexus.redback.authorization.Authorizer</role> - <role-hint>rbac</role-hint> - <field-name>authorizer</field-name> - </requirement> - <requirement> - <role>org.codehaus.plexus.redback.users.UserManager</role> - <role-hint>memory</role-hint> - <field-name>userManager</field-name> - </requirement> - <requirement> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> - <role-hint>memory</role-hint> - <field-name>keyManager</field-name> - </requirement> - <requirement> - <role>org.codehaus.plexus.redback.policy.UserSecurityPolicy</role> - <field-name>policy</field-name> - </requirement> - </requirements> </component> - - <component> - <role>org.codehaus.plexus.redback.authentication.Authenticator</role> - <role-hint>user-manager</role-hint> - <implementation>org.codehaus.plexus.redback.authentication.users.UserManagerAuthenticator</implementation> + + <component> + <role>org.apache.maven.archiva.webdav.ArchivaDavResourceFactory</role> + <implementation>org.apache.maven.archiva.webdav.ArchivaDavResourceFactory</implementation> <requirements> <requirement> - <role>org.codehaus.plexus.redback.users.UserManager</role> - <role-hint>memory</role-hint> - <field-name>userManager</field-name> - </requirement> - <requirement> - <role>org.codehaus.plexus.redback.policy.UserSecurityPolicy</role> - <field-name>securityPolicy</field-name> - </requirement> - </requirements> - </component> - - <component> - <role>org.codehaus.plexus.redback.authentication.Authenticator</role> - <role-hint>keystore</role-hint> - <implementation>org.codehaus.plexus.redback.authentication.keystore.KeyStoreAuthenticator</implementation> - <requirements> - <requirement> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> - <role-hint>memory</role-hint> - <field-name>keystore</field-name> - </requirement> - <requirement> - <role>org.codehaus.plexus.redback.users.UserManager</role> - <role-hint>memory</role-hint> - <field-name>userManager</field-name> + <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role> + <field-name>archivaConfiguration</field-name> </requirement> - </requirements> - </component> - - <component> - <role>org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluator</role> - <role-hint>default</role-hint> - <implementation>org.codehaus.plexus.redback.authorization.rbac.evaluator.DefaultPermissionEvaluator - </implementation> - <requirements> <requirement> - <role>org.codehaus.plexus.redback.users.UserManager</role> - <role-hint>memory</role-hint> - <field-name>userManager</field-name> - </requirement> - </requirements> - </component> - - <component> - <role>org.codehaus.plexus.redback.authorization.Authorizer</role> - <role-hint>rbac</role-hint> - <implementation>org.codehaus.plexus.redback.authorization.rbac.RbacAuthorizer</implementation> - <requirements> + <role>org.apache.maven.archiva.repository.RepositoryContentFactory</role> + <field-name>repositoryFactory</field-name> + </requirement> <requirement> - <role>org.codehaus.plexus.redback.rbac.RBACManager</role> - <role-hint>memory</role-hint> - <field-name>manager</field-name> + <role>org.apache.maven.archiva.repository.content.RepositoryRequest</role> + <field-name>repositoryRequest</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.users.UserManager</role> - <role-hint>memory</role-hint> - <field-name>userManager</field-name> + <role>org.apache.maven.archiva.proxy.RepositoryProxyConnectors</role> + <field-name>connectors</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluator</role> - <role-hint>default</role-hint> - <field-name>evaluator</field-name> + <role>org.apache.maven.archiva.repository.metadata.MetadataTools</role> + <field-name>metadataTools</field-name> </requirement> - </requirements> - </component> - - <component> - <role>org.codehaus.plexus.redback.role.RoleManager</role> - <role-hint>default</role-hint> - <implementation>org.codehaus.plexus.redback.role.DefaultRoleManager</implementation> - <instantiation-strategy>singleton</instantiation-strategy> - <requirements> <requirement> - <role>org.codehaus.plexus.redback.role.merger.RoleModelMerger</role> - <role-hint>default</role-hint> - <field-name>modelMerger</field-name> + <role>org.apache.maven.archiva.security.ServletAuthenticator</role> + <field-name>servletAuth</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.role.validator.RoleModelValidator</role> - <role-hint>default</role-hint> - <field-name>modelValidator</field-name> + <role>org.apache.maven.archiva.webdav.util.MimeTypes</role> + <field-name>mimeTypes</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.role.processor.RoleModelProcessor</role> - <role-hint>default</role-hint> - <field-name>modelProcessor</field-name> + <role>org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator</role> + <role-hint>basic</role-hint> + <field-name>httpAuth</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.role.template.RoleTemplateProcessor</role> + <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role> <role-hint>default</role-hint> - <field-name>templateProcessor</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.rbac.RBACManager</role> - <role-hint>memory</role-hint> - <field-name>rbacManager</field-name> + <role>org.codehaus.plexus.digest.ChecksumFile</role> + <field-name>checksum</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.PlexusContainer</role> - <field-name>container</field-name> + <role>org.codehaus.plexus.digest.Digester</role> + <role-hint>sha1</role-hint> + <field-name>digestSha1</field-name> </requirement> - </requirements> - </component> - - <component> - <role>org.codehaus.plexus.redback.role.processor.RoleModelProcessor</role> - <role-hint>default</role-hint> - <implementation>org.codehaus.plexus.redback.role.processor.DefaultRoleModelProcessor</implementation> - <requirements> <requirement> - <role>org.codehaus.plexus.redback.rbac.RBACManager</role> - <role-hint>memory</role-hint> - <field-name>rbacManager</field-name> + <role>org.codehaus.plexus.digest.Digester</role> + <role-hint>md5</role-hint> + <field-name>digestMd5</field-name> </requirement> - </requirements> - </component> - - <component> - <role>org.codehaus.plexus.redback.role.template.RoleTemplateProcessor</role> - <role-hint>default</role-hint> - <implementation>org.codehaus.plexus.redback.role.template.DefaultRoleTemplateProcessor</implementation> - <requirements> <requirement> - <role>org.codehaus.plexus.redback.rbac.RBACManager</role> - <role-hint>memory</role-hint> - <field-name>rbacManager</field-name> - </requirement> + <role>org.apache.maven.archiva.security.ArchivaXworkUser</role> + <field-name>archivaXworkUser</field-name> + </requirement> </requirements> </component> </components>
Modified: archiva/branches/archiva-struts2/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/pom.xml?rev=705848&r1=705847&r2=705848&view=diff ============================================================================== --- archiva/branches/archiva-struts2/pom.xml (original) +++ archiva/branches/archiva-struts2/pom.xml Fri Oct 17 23:45:02 2008 @@ -64,7 +64,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-3</version> + <version>1.0-alpha-4</version> <executions> <execution> <goals> @@ -206,6 +206,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>1.2</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl104-over-slf4j</artifactId> <scope>test</scope>
