Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package move to o.a.a.r module redback-keys-api 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310880 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-07 21:51:32 +00:00
parent e17a252b36
commit eec9033b6b
38 changed files with 106 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.management;
*/ */
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;

7
redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
View File

@ -34,11 +34,10 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import org.apache.archiva.redback.management.DataManagementTool; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.jdo.AuthenticationKeyDatabase; import org.codehaus.plexus.redback.keys.jdo.AuthenticationKeyDatabase;
import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxReader; import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxReader;
import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxWriter; import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxWriter;

7
redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
View File

@ -21,12 +21,11 @@ package org.apache.archiva.redback.management;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory; import org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory;
import org.apache.archiva.redback.management.DataManagementTool; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang.SystemUtils;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.rbac.Permission; import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
View File

@ -19,7 +19,7 @@ package org.codehaus.redback.integration.mail;
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
/** /**
* Mail generator component. * Mail generator component.

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
View File

@ -19,7 +19,7 @@ package org.codehaus.redback.integration.mail;
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import java.util.Collection; import java.util.Collection;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
View File

@ -34,7 +34,7 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.UserValidationSettings; import org.codehaus.plexus.redback.policy.UserValidationSettings;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
View File

@ -19,13 +19,13 @@ package org.codehaus.redback.integration.mail;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.velocity.VelocityContext; import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
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;

8
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
View File

@ -24,10 +24,10 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.CookieSettings; import org.codehaus.plexus.redback.policy.CookieSettings;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;

7
redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
View File

@ -21,11 +21,10 @@ package org.codehaus.redback.integration.mail;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.ehcache.CacheManager; import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.jdo.JdoFactory; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.jpox.SchemaTool; import org.jpox.SchemaTool;
import org.junit.Before; import org.junit.Before;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
View File

@ -19,10 +19,10 @@ package org.codehaus.redback.rest.services;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey; import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
import org.codehaus.plexus.redback.keys.memory.MemoryAuthenticationKey; import org.codehaus.plexus.redback.keys.memory.MemoryAuthenticationKey;
import org.codehaus.plexus.redback.keys.memory.MemoryKeyManager; import org.codehaus.plexus.redback.keys.memory.MemoryKeyManager;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
View File

@ -20,8 +20,8 @@ package org.codehaus.redback.rest.services;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException; import org.codehaus.plexus.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.codehaus.plexus.redback.policy.PasswordRuleViolations;

8
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
View File

@ -21,16 +21,16 @@ package org.codehaus.redback.rest.services;
import net.sf.ehcache.CacheManager; import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.cache.Cache; import org.codehaus.plexus.cache.Cache;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.codehaus.plexus.redback.policy.PasswordEncoder;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
View File

@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.struts2.action;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants; import org.apache.archiva.redback.authentication.AuthenticationConstants;
@ -28,9 +29,8 @@ import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
View File

@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.struts2.action;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
View File

@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.struts2.action;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.RoleManagerException;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
View File

@ -21,7 +21,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import com.opensymphony.xwork2.Preparable; import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.management.DataManagementTool; import org.apache.archiva.redback.management.DataManagementTool;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Resource; import org.codehaus.plexus.redback.rbac.Resource;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
View File

@ -22,11 +22,11 @@ package org.codehaus.plexus.redback.struts2.interceptor;
import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor; import com.opensymphony.xwork2.interceptor.Interceptor;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
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.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
View File

@ -87,13 +87,13 @@
</requirements> </requirements>
</component> </component>
<component> <component>
<role>org.codehaus.plexus.redback.keys.KeyManager</role> <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>cached</role-hint> <role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation> <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
<description>CachedKeyManager</description> <description>CachedKeyManager</description>
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.redback.keys.KeyManager</role> <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>memory</role-hint> <role-hint>memory</role-hint>
<field-name>keyImpl</field-name> <field-name>keyImpl</field-name>
</requirement> </requirement>

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
View File

@ -87,13 +87,13 @@
</requirements> </requirements>
</component> </component>
<component> <component>
<role>org.codehaus.plexus.redback.keys.KeyManager</role> <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>cached</role-hint> <role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation> <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
<description>CachedKeyManager</description> <description>CachedKeyManager</description>
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.redback.keys.KeyManager</role> <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>memory</role-hint> <role-hint>memory</role-hint>
<field-name>keyImpl</field-name> <field-name>keyImpl</field-name>
</requirement> </requirement>

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
View File

@ -122,13 +122,13 @@
</bean> </bean>
<!-- <!--
<component> <component>
<role>org.codehaus.plexus.redback.keys.KeyManager</role> <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>cached</role-hint> <role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation> <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
<description>CachedKeyManager</description> <description>CachedKeyManager</description>
<requirements> <requirements>
<requirement> <requirement>
<role>org.codehaus.plexus.redback.keys.KeyManager</role> <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>memory</role-hint> <role-hint>memory</role-hint>
<field-name>keyImpl</field-name> <field-name>keyImpl</field-name>
</requirement> </requirement>

8
redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java
View File

@ -24,10 +24,10 @@ 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.authentication.Authenticator; import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;

2
redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java → redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.keys; package org.apache.archiva.redback.keys;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

31
redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java → redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.keys; package org.apache.archiva.redback.keys;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -31,23 +31,30 @@ import java.util.Date;
*/ */
public interface AuthenticationKey public interface AuthenticationKey
{ {
public Date getDateCreated(); Date getDateCreated();
public Date getDateExpires();
public String getForPrincipal(); Date getDateExpires();
public String getKey();
String getForPrincipal();
String getKey();
/** /**
* A String representation of what the purpose of existence is for this key. * A String representation of what the purpose of existence is for this key.
* * <p/>
* Examples: "selfservice password reset", "inter system communications", "remember me" * Examples: "selfservice password reset", "inter system communications", "remember me"
* *
* @return * @return
*/ */
public String getPurpose(); String getPurpose();
public void setDateCreated( Date dateCreated ); void setDateCreated( Date dateCreated );
public void setDateExpires( Date dateExpires );
public void setForPrincipal( String forPrincipal ); void setDateExpires( Date dateExpires );
public void setKey( String key );
public void setPurpose( String requestedFrom ); void setForPrincipal( String forPrincipal );
void setKey( String key );
void setPurpose( String requestedFrom );
} }

2
redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java → redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.keys; package org.apache.archiva.redback.keys;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java → redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.keys; package org.apache.archiva.redback.keys;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java → redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.keys; package org.apache.archiva.redback.keys;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,6 +16,8 @@ package org.codehaus.plexus.redback.keys;
* limitations under the License. * limitations under the License.
*/ */
import org.apache.archiva.redback.keys.KeyManagerException;
/** /**
* KeyNotFoundException * KeyNotFoundException
* *

6
redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java → redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.keys; package org.apache.archiva.redback.keys;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -22,6 +22,10 @@ package org.codehaus.plexus.redback.keys;
import java.util.List; import java.util.List;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException;
public class KeyManagerTest public class KeyManagerTest
extends TestCase extends TestCase

11
redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
View File

@ -21,16 +21,15 @@ package org.codehaus.plexus.redback.keys.cached;
import java.util.List; import java.util.List;
import javax.annotation.Resource;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.codehaus.plexus.cache.Cache; import org.codehaus.plexus.cache.Cache;
import org.codehaus.plexus.redback.keys.AbstractKeyManager; import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

2
redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
View File

@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.keys.cached;
*/ */
import net.sf.ehcache.CacheManager; import net.sf.ehcache.CacheManager;
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerTestCase; import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
import org.junit.Before; import org.junit.Before;

8
redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
View File

@ -19,14 +19,14 @@ package org.codehaus.plexus.redback.keys.jdo;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.jdo.JdoFactory; import org.codehaus.plexus.jdo.JdoFactory;
import org.codehaus.plexus.jdo.PlexusJdoUtils; import org.codehaus.plexus.jdo.PlexusJdoUtils;
import org.codehaus.plexus.jdo.PlexusObjectNotFoundException; import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
import org.codehaus.plexus.jdo.PlexusStoreException; import org.codehaus.plexus.jdo.PlexusStoreException;
import org.codehaus.plexus.redback.keys.AbstractKeyManager; import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.jpox.PersistenceManagerFactoryImpl; import org.jpox.PersistenceManagerFactoryImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
View File

@ -50,10 +50,10 @@
<name>JdoAuthenticationKey</name> <name>JdoAuthenticationKey</name>
<version>1.0.0+</version> <version>1.0.0+</version>
<interfaces> <interfaces>
<interface>org.codehaus.plexus.redback.keys.AuthenticationKey</interface> <interface>org.apache.archiva.redback.keys.AuthenticationKey</interface>
</interfaces> </interfaces>
<description> <description>
@plexus.component role="org.codehaus.plexus.redback.keys.AuthenticationKey" @plexus.component role="org.apache.archiva.redback.keys.AuthenticationKey"
role-hint="jdo" role-hint="jdo"
</description> </description>
<fields> <fields>

2
redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
View File

@ -19,8 +19,8 @@ package org.codehaus.plexus.redback.keys.jdo;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerTestCase; import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
import org.jpox.SchemaTool; import org.jpox.SchemaTool;
import org.junit.Before; import org.junit.Before;

2
redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.keys.memory;
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import java.util.Date; import java.util.Date;

8
redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
View File

@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.keys.memory;
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.keys.AbstractKeyManager; import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
View File

@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.keys.memory;
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerTestCase; import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
import org.junit.Before; import org.junit.Before;

4
redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java
View File

@ -17,6 +17,10 @@ package org.codehaus.plexus.redback.keys;
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;

2
redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
View File

@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.system;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.keys.KeyManager;
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.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
@ -30,7 +31,6 @@ import org.apache.archiva.redback.authorization.AuthorizationDataSource;
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.apache.archiva.redback.authorization.Authorizer; import org.apache.archiva.redback.authorization.Authorizer;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;

2
redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
View File

@ -24,7 +24,7 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
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.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;