You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/07 23:51:34 UTC
svn commit: r1310880 - in /archiva/redback/redback-core/trunk:
redback-data-management/src/main/java/org/apache/archiva/redback/management/
redback-data-management/src/test/java/org/apache/archiva/redback/management/
redback-integrations/redback-common...
Author: olamy
Date: Sat Apr 7 21:51:32 2012
New Revision: 1310880
URL: http://svn.apache.org/viewvc?rev=1310880&view=rev
Log:
package move to o.a.a.r module redback-keys-api
Added:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
- copied, changed from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
- copied, changed from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
- copied, changed from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
- copied, changed from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
- copied, changed from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
- copied, changed from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java
Removed:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/
archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/codehaus/
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
Modified: archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java (original)
+++ archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java Sat Apr 7 21:51:32 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.manag
*/
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.RbacManagerException;
Modified: archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java (original)
+++ archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java Sat Apr 7 21:51:32 2012
@@ -34,11 +34,10 @@ import java.util.Map;
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.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
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.RedbackKeyManagementJdoStaxWriter;
Modified: archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java Sat Apr 7 21:51:32 2012
@@ -21,12 +21,11 @@ package org.apache.archiva.redback.manag
import junit.framework.TestCase;
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.commons.lang.SystemUtils;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java Sat Apr 7 21:51:32 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration
* under the License.
*/
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
/**
* Mail generator component.
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java Sat Apr 7 21:51:32 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration
* under the License.
*/
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
import java.util.Collection;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java Sat Apr 7 21:51:32 2012
@@ -34,7 +34,7 @@ import javax.mail.internet.InternetAddre
import javax.mail.internet.MimeMessage;
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.UserValidationSettings;
import org.codehaus.plexus.redback.system.SecuritySystem;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java Sat Apr 7 21:51:32 2012
@@ -19,13 +19,13 @@ package org.codehaus.redback.integration
* under the License.
*/
+import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.archiva.redback.configuration.UserConfiguration;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java Sat Apr 7 21:51:32 2012
@@ -24,10 +24,10 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-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.keys.KeyNotFoundException;
+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.codehaus.plexus.redback.policy.CookieSettings;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java Sat Apr 7 21:51:32 2012
@@ -21,11 +21,10 @@ package org.codehaus.redback.integration
import junit.framework.TestCase;
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.JdoFactory;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.jpox.SchemaTool;
import org.junit.Before;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java Sat Apr 7 21:51:32 2012
@@ -19,10 +19,10 @@ package org.codehaus.redback.rest.servic
* under the License.
*/
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.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
import org.codehaus.plexus.redback.keys.memory.MemoryAuthenticationKey;
import org.codehaus.plexus.redback.keys.memory.MemoryKeyManager;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java Sat Apr 7 21:51:32 2012
@@ -20,8 +20,8 @@ package org.codehaus.redback.rest.servic
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java Sat Apr 7 21:51:32 2012
@@ -21,16 +21,16 @@ package org.codehaus.redback.rest.servic
import net.sf.ehcache.CacheManager;
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.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.cache.Cache;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-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.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java Sat Apr 7 21:51:32 2012
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.stru
* under the License.
*/
+import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.users.User;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
@@ -28,9 +29,8 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.apache.archiva.redback.configuration.UserConfiguration;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java Sat Apr 7 21:51:32 2012
@@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.stru
* under the License.
*/
+import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java Sat Apr 7 21:51:32 2012
@@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.stru
* under the License.
*/
+import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java Sat Apr 7 21:51:32 2012
@@ -21,7 +21,7 @@ package org.codehaus.plexus.redback.stru
import com.opensymphony.xwork2.Preparable;
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.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.Resource;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java Sat Apr 7 21:51:32 2012
@@ -22,11 +22,11 @@ package org.codehaus.plexus.redback.stru
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
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.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml Sat Apr 7 21:51:32 2012
@@ -87,13 +87,13 @@
</requirements>
</component>
<component>
- <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+ <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
<description>CachedKeyManager</description>
<requirements>
<requirement>
- <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+ <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>memory</role-hint>
<field-name>keyImpl</field-name>
</requirement>
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml Sat Apr 7 21:51:32 2012
@@ -87,13 +87,13 @@
</requirements>
</component>
<component>
- <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+ <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
<description>CachedKeyManager</description>
<requirements>
<requirement>
- <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+ <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>memory</role-hint>
<field-name>keyImpl</field-name>
</requirement>
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml Sat Apr 7 21:51:32 2012
@@ -122,13 +122,13 @@
</bean>
<!--
<component>
- <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+ <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>cached</role-hint>
<implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
<description>CachedKeyManager</description>
<requirements>
<requirement>
- <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+ <role>org.apache.archiva.redback.keys.KeyManager</role>
<role-hint>memory</role-hint>
<field-name>keyImpl</field-name>
</requirement>
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java Sat Apr 7 21:51:32 2012
@@ -24,10 +24,10 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-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.keys.KeyNotFoundException;
+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.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User;
Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java (from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java&r1=1310877&r2=1310880&rev=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java Sat Apr 7 21:51:32 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java (from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java&r1=1310877&r2=1310880&rev=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java Sat Apr 7 21:51:32 2012
@@ -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
@@ -22,32 +22,39 @@ package org.codehaus.plexus.redback.keys
import java.util.Date;
/**
- * AuthenticationKey is an object representing a key established to
+ * AuthenticationKey is an object representing a key established to
* automatically authenticate a user without the user providing typical
- * login credentials.
+ * login credentials.
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public interface AuthenticationKey
{
- public Date getDateCreated();
- public Date getDateExpires();
- public String getForPrincipal();
- public String getKey();
-
+ Date getDateCreated();
+
+ Date getDateExpires();
+
+ String getForPrincipal();
+
+ String getKey();
+
/**
* A String representation of what the purpose of existence is for this key.
- *
+ * <p/>
* Examples: "selfservice password reset", "inter system communications", "remember me"
- *
+ *
* @return
*/
- public String getPurpose();
-
- public void setDateCreated( Date dateCreated );
- public void setDateExpires( Date dateExpires );
- public void setForPrincipal( String forPrincipal );
- public void setKey( String key );
- public void setPurpose( String requestedFrom );
+ String getPurpose();
+
+ void setDateCreated( Date dateCreated );
+
+ void setDateExpires( Date dateExpires );
+
+ void setForPrincipal( String forPrincipal );
+
+ void setKey( String key );
+
+ void setPurpose( String requestedFrom );
}
Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java (from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java&r1=1310877&r2=1310880&rev=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java Sat Apr 7 21:51:32 2012
@@ -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
Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java (from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java&r1=1310877&r2=1310880&rev=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java Sat Apr 7 21:51:32 2012
@@ -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
Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java (from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java&r1=1310877&r2=1310880&rev=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java Sat Apr 7 21:51:32 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,6 +16,8 @@ package org.codehaus.plexus.redback.keys
* limitations under the License.
*/
+import org.apache.archiva.redback.keys.KeyManagerException;
+
/**
* KeyNotFoundException
*
Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java (from r1310877, archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java&r1=1310877&r2=1310880&rev=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java Sat Apr 7 21:51:32 2012
@@ -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
@@ -22,6 +22,10 @@ package org.codehaus.plexus.redback.keys
import java.util.List;
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
extends TestCase
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java Sat Apr 7 21:51:32 2012
@@ -21,16 +21,15 @@ package org.codehaus.plexus.redback.keys
import java.util.List;
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.redback.keys.AbstractKeyManager;
-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.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AbstractKeyManager;
+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.springframework.stereotype.Service;
/**
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java Sat Apr 7 21:51:32 2012
@@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.keys
*/
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.junit.Before;
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java Sat Apr 7 21:51:32 2012
@@ -19,14 +19,14 @@ package org.codehaus.plexus.redback.keys
* under the License.
*/
+import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.jdo.JdoFactory;
import org.codehaus.plexus.jdo.PlexusJdoUtils;
import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
import org.codehaus.plexus.jdo.PlexusStoreException;
-import org.codehaus.plexus.redback.keys.AbstractKeyManager;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AbstractKeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.util.StringUtils;
import org.jpox.PersistenceManagerFactoryImpl;
import org.springframework.stereotype.Service;
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo Sat Apr 7 21:51:32 2012
@@ -50,10 +50,10 @@
<name>JdoAuthenticationKey</name>
<version>1.0.0+</version>
<interfaces>
- <interface>org.codehaus.plexus.redback.keys.AuthenticationKey</interface>
+ <interface>org.apache.archiva.redback.keys.AuthenticationKey</interface>
</interfaces>
<description>
- @plexus.component role="org.codehaus.plexus.redback.keys.AuthenticationKey"
+ @plexus.component role="org.apache.archiva.redback.keys.AuthenticationKey"
role-hint="jdo"
</description>
<fields>
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java Sat Apr 7 21:51:32 2012
@@ -19,8 +19,8 @@ package org.codehaus.plexus.redback.keys
* under the License.
*/
+import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
-import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
import org.jpox.SchemaTool;
import org.junit.Before;
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java Sat Apr 7 21:51:32 2012
@@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.keys
* under the License.
*/
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
import java.util.Date;
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java Sat Apr 7 21:51:32 2012
@@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.keys
* under the License.
*/
-import org.codehaus.plexus.redback.keys.AbstractKeyManager;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+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;
import org.codehaus.plexus.util.StringUtils;
import org.springframework.stereotype.Service;
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java Sat Apr 7 21:51:32 2012
@@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.keys
* 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.junit.Before;
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java Sat Apr 7 21:51:32 2012
@@ -17,6 +17,10 @@ package org.codehaus.plexus.redback.keys
*/
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.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
Modified: archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java (original)
+++ archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java Sat Apr 7 21:51:32 2012
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.syst
* under the License.
*/
+import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
@@ -30,7 +31,6 @@ import org.apache.archiva.redback.author
import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.AuthorizationResult;
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.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
Modified: archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java?rev=1310880&r1=1310879&r2=1310880&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java (original)
+++ archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java Sat Apr 7 21:51:32 2012
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authorization.AuthorizationException;
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.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;