Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move to package o.a.a.r redback module redback-system 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310918 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-07 23:19:30 +00:00
parent 73f15c6bc7
commit 2ce3e9371f
18 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
View File

@ -74,9 +74,9 @@ import org.apache.commons.lang.StringUtils;
import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.context.IndexingContext;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.codehaus.plexus.taskqueue.TaskQueueException; import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

6
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
View File

@ -29,9 +29,9 @@ import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.slf4j.Logger; import org.slf4j.Logger;

2
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
View File

@ -21,9 +21,9 @@ package org.apache.archiva.security;
import java.util.List; import java.util.List;
import org.apache.archiva.redback.system.check.EnvironmentCheck;
import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.system.check.EnvironmentCheck;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaXworkUser.java
View File

@ -22,8 +22,8 @@ package org.apache.archiva.security;
import java.util.Map; import java.util.Map;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.system.SecuritySystemConstants;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
/** /**

6
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
View File

@ -30,9 +30,9 @@ import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ServletAuthenticator.java
View File

@ -27,7 +27,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
/** /**
* @version * @version

2
archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
View File

@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.redback.rbac.UserAssignment; import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.junit.Before; import org.junit.Before;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

4
archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
View File

@ -25,8 +25,8 @@ import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.easymock.MockControl; import org.easymock.MockControl;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

2
archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
View File

@ -27,7 +27,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd" http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true"> default-lazy-init="true">
<bean name="securitySystem#testable" class="org.codehaus.plexus.redback.system.DefaultSecuritySystem"> <bean name="securitySystem#testable" class="org.apache.archiva.redback.system.DefaultSecuritySystem">
<property name="userManager" ref="userManager#memory"/> <property name="userManager" ref="userManager#memory"/>
<property name="keyManager" ref="keyManager#memory"/> <property name="keyManager" ref="keyManager#memory"/>
</bean> </bean>

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
View File

@ -43,7 +43,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
View File

@ -25,13 +25,13 @@ import org.apache.archiva.configuration.ConfigurationNames;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.role.RoleManagerException;
import org.apache.archiva.redback.system.check.EnvironmentCheck;
import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.UserAssignment; import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManager;
import org.codehaus.plexus.redback.system.check.EnvironmentCheck;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener; import org.codehaus.plexus.registry.RegistryListener;

6
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
View File

@ -32,9 +32,9 @@ import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.AuthorizationResult; import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.users.jdo.JdoUser; import org.codehaus.plexus.redback.users.jdo.JdoUser;
import java.util.ArrayList; import java.util.ArrayList;

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -153,7 +153,7 @@
PLXREDBACK-81 bad role hint, redefining here until redback alpha-2 is released. PLXREDBACK-81 bad role hint, redefining here until redback alpha-2 is released.
<component> <component>
<role>org.codehaus.plexus.redback.system.check.EnvironmentCheck</role> <role>org.apache.archiva.redback.system.check.EnvironmentCheck</role>
<role-hint>locked-admin-check</role-hint> <role-hint>locked-admin-check</role-hint>
<implementation>org.codehaus.redback.integration.checks.security.LockedAdminEnvironmentCheck</implementation> <implementation>org.codehaus.redback.integration.checks.security.LockedAdminEnvironmentCheck</implementation>
<description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked <description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -174,7 +174,7 @@
PLXREDBACK-81 bad role hint, redefining here until redback alpha-2 is released. PLXREDBACK-81 bad role hint, redefining here until redback alpha-2 is released.
<component> <component>
<role>org.codehaus.plexus.redback.system.check.EnvironmentCheck</role> <role>org.apache.archiva.redback.system.check.EnvironmentCheck</role>
<role-hint>locked-admin-check</role-hint> <role-hint>locked-admin-check</role-hint>
<implementation>org.codehaus.redback.integration.checks.security.LockedAdminEnvironmentCheck</implementation> <implementation>org.codehaus.redback.integration.checks.security.LockedAdminEnvironmentCheck</implementation>
<description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked <description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked

2
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
View File

@ -82,7 +82,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java
View File

@ -32,7 +32,7 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;

8
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
View File

@ -30,10 +30,10 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.AuthorizationResult; import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.apache.archiva.redback.keys.memory.MemoryKeyManager; import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
import org.apache.archiva.redback.policy.DefaultUserSecurityPolicy; import org.apache.archiva.redback.policy.DefaultUserSecurityPolicy;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.DefaultSecuritySystem; import org.apache.archiva.redback.system.DefaultSecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.memory.MemoryUserManager; import org.apache.archiva.redback.users.memory.MemoryUserManager;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
View File

@ -41,8 +41,8 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.security.ServletAuthenticator; import org.apache.archiva.security.ServletAuthenticator;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.memory.SimpleUser; import org.apache.archiva.redback.users.memory.SimpleUser;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;